Fix isClass function undefined in Typescript 2.8

vuejs · Jul 7, 2019 · a592bbd · a592bbd
1 parent c9ed049
commit a592bbd
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 6 deletions.
diff --git a/server/src/modes/script/childComponents.ts b/server/src/modes/script/childComponents.ts
@@ -3,7 +3,8 @@ import {
   getLastChild,
   buildDocumentation,
   getNodeFromExportNode,
-  getClassDecoratorArgumentType
+  getClassDecoratorArgumentType,
+  isClassType
 } from './componentInfo';
 import { T_TypeScript } from '../../services/dependencyService';
 
@@ -25,7 +26,7 @@ export function getChildComponents(
   tagCasing = 'kebab'
 ): InternalChildComponent[] | undefined {
   let type = defaultExportType;
-  if (defaultExportType.isClass()) {
+  if (isClassType(tsModule, type)) {
     // get decorator argument type when class
     const classDecoratorArgumentType = getClassDecoratorArgumentType(tsModule, defaultExportType, checker);
     if (!classDecoratorArgumentType) {

diff --git a/server/src/modes/script/componentInfo.ts b/server/src/modes/script/componentInfo.ts
@@ -100,7 +100,7 @@ function getDefaultExportNode(
 
 function getProps(tsModule: T_TypeScript, defaultExportType: ts.Type, checker: ts.TypeChecker): PropInfo[] | undefined {
   const result: PropInfo[] = [];
-  if (defaultExportType.isClass()) {
+  if (isClassType(tsModule, defaultExportType)) {
     result.push.apply(result, getClassProps(defaultExportType) || []);
 
     const decoratorArgumentType = getClassDecoratorArgumentType(tsModule, defaultExportType, checker);
@@ -196,7 +196,7 @@ function getProps(tsModule: T_TypeScript, defaultExportType: ts.Type, checker: t
  */
 function getData(tsModule: T_TypeScript, defaultExportType: ts.Type, checker: ts.TypeChecker): DataInfo[] | undefined {
   const result: DataInfo[] = [];
-  if (defaultExportType.isClass()) {
+  if (isClassType(tsModule, defaultExportType)) {
     result.push.apply(result, getClassData(defaultExportType) || []);
 
     const decoratorArgumentType = getClassDecoratorArgumentType(tsModule, defaultExportType, checker);
@@ -261,7 +261,7 @@ function getComputed(
   checker: ts.TypeChecker
 ): ComputedInfo[] | undefined {
   const result: ComputedInfo[] = [];
-  if (defaultExportType.isClass()) {
+  if (isClassType(tsModule, defaultExportType)) {
     result.push.apply(result, getClassComputed(defaultExportType) || []);
 
     const decoratorArgumentType = getClassDecoratorArgumentType(tsModule, defaultExportType, checker);
@@ -345,7 +345,7 @@ function getMethods(
   checker: ts.TypeChecker
 ): MethodInfo[] | undefined {
   const result: MethodInfo[] = [];
-  if (defaultExportType.isClass()) {
+  if (isClassType(tsModule, defaultExportType)) {
     result.push.apply(result, getClassMethods(defaultExportType) || []);
 
     const decoratorArgumentType = getClassDecoratorArgumentType(tsModule, defaultExportType, checker);
@@ -429,6 +429,18 @@ export function getLastChild(d: ts.Declaration) {
   return children[children.length - 1];
 }
 
+export function isClassType (
+  tsModule: T_TypeScript,
+  type: ts.Type
+) {
+  if (type.isClass === undefined) {
+    return !!((type.flags & tsModule.TypeFlags.Object ? (type as ts.ObjectType).objectFlags : 0)
+    & tsModule.ObjectFlags.Class);
+  } else {
+    return type.isClass();
+  }
+}
+
 export function getClassDecoratorArgumentType(
   tsModule: T_TypeScript,
   type: ts.Type,