Added isExplicitArrayType() method

TheLartians · TheLartians · commit 2f4495b5c001 · 2018-11-30T13:57:00.000+01:00
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -74,22 +74,21 @@ export class TSHelper {
                 && (typeNode as ts.UnionOrIntersectionTypeNode).types.some(this.isArrayTypeNode));
     }
 
-    public static isArrayType(type: ts.Type, checker: ts.TypeChecker, dontCheckBases?: boolean): boolean {
-        if (!dontCheckBases) {
-            // Check if type inherits from Array
-            const baseTypes = type.getBaseTypes();
-            if (baseTypes) {
-              for (const baseType of baseTypes) {
-                const baseTypeNode = checker.typeToTypeNode(baseType, undefined, ts.NodeBuilderFlags.InTypeAlias);
-                if (baseTypeNode && this.isArrayTypeNode(baseTypeNode)) { return true; }
-              }
-            }
-        }
-
+    public static isExplicitArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {
         const typeNode = checker.typeToTypeNode(type, undefined, ts.NodeBuilderFlags.InTypeAlias);
         return typeNode && this.isArrayTypeNode(typeNode);
     }
 
+    public static isArrayType(type: ts.Type, checker: ts.TypeChecker): boolean {
+        const baseTypes = type.getBaseTypes();
+        if (baseTypes) {
+          for (const baseType of baseTypes) {
+            if (this.isExplicitArrayType(baseType, checker)) { return true; }
+          }
+        }
+        return this.isExplicitArrayType(type, checker);
+    }
+
     public static isTupleReturnCall(node: ts.Node, checker: ts.TypeChecker): boolean {
         if (ts.isCallExpression(node)) {
             const type = checker.getTypeAtLocation(node.expression);
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1204,7 +1204,7 @@ export abstract class LuaTranspiler {
         }
 
         // if ownerType is a array, use only supported functions
-        if (tsHelper.isArrayType(ownerType, this.checker, true)) {
+        if (tsHelper.isExplicitArrayType(ownerType, this.checker)) {
             return this.transpileArrayCallExpression(node);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1204,7 +1204,7 @@ export abstract class LuaTranspiler {`
`1204`	`1204`	`}`
`1205`	`1205`
`1206`	`1206`	`// if ownerType is a array, use only supported functions`
`1207`		`- if (tsHelper.isArrayType(ownerType, this.checker, true)) {`
	`1207`	`+ if (tsHelper.isExplicitArrayType(ownerType, this.checker)) {`
`1208`	`1208`	`return this.transpileArrayCallExpression(node);`
`1209`	`1209`	`}`
`1210`	`1210`