added tsHelper.isDefaultArrayCallExpression()

TheLartians · TheLartians · commit 0c497e1abf5b · 2018-11-30T11:54:33.000+01:00
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -247,4 +247,47 @@ export class TSHelper {
         }
         return [false, null, null];
     }
+
+    public static isDefaultArrayCallExpression(node: ts.CallExpression,
+                                               transpileIdentifier: (identifier: ts.Identifier) => string ): boolean {
+        const expression = node.expression as ts.PropertyAccessExpression;
+        const expressionName = transpileIdentifier(expression.name);
+        switch (expressionName) {
+            case "concat":
+                return true;
+            case "push":
+                return true;
+            case "reverse":
+                return true;
+            case "shift":
+                return true;
+            case "unshift":
+                return true;
+            case "sort":
+                return true;
+            case "pop":
+                return true;
+            case "forEach":
+                return true;
+            case "indexOf":
+                return true;
+            case "map":
+                return true;
+            case "filter":
+                return true;
+            case "some":
+                return true;
+            case "every":
+                return true;
+            case "slice":
+                return true;
+            case "splice":
+                return true;
+            case "join":
+                return true;
+            default:
+                return false;
+        }
+    }
+
 }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1209,11 +1209,9 @@ export abstract class LuaTranspiler {
         }
 
         // if ownerType inherits from an array, use array calls where appropriate
-        if (tsHelper.isArrayType(ownerType, this.checker)) {
-            const transpiledExpression = this.transpileArrayCallExpression(node, true);
-            if (transpiledExpression !== "") {
-                return transpiledExpression;
-            }
+        if (tsHelper.isArrayType(ownerType, this.checker)
+            && tsHelper.isDefaultArrayCallExpression(node, expression => this.transpileIdentifier(expression))) {
+            return this.transpileArrayCallExpression(node);
         }
 
         // Get the type of the function
@@ -1312,7 +1310,7 @@ export abstract class LuaTranspiler {
         }
     }
 
-    public transpileArrayCallExpression(node: ts.CallExpression, noException?: boolean ): string {
+    public transpileArrayCallExpression(node: ts.CallExpression): string {
         const expression = node.expression as ts.PropertyAccessExpression;
         const params = this.transpileArguments(node.arguments);
         const caller = this.transpileExpression(expression.expression);
@@ -1356,7 +1354,6 @@ export abstract class LuaTranspiler {
                     return `table.concat(${caller}, ${params})`;
                 }
             default:
-                if (noException) { return ""; }
                 throw TSTLErrors.UnsupportedProperty("array", expressionName, node);
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -1209,11 +1209,9 @@ export abstract class LuaTranspiler {`
`1209`	`1209`	`}`
`1210`	`1210`
`1211`	`1211`	`// if ownerType inherits from an array, use array calls where appropriate`
`1212`		`- if (tsHelper.isArrayType(ownerType, this.checker)) {`
`1213`		`- const transpiledExpression = this.transpileArrayCallExpression(node, true);`
`1214`		`- if (transpiledExpression !== "") {`
`1215`		`- return transpiledExpression;`
`1216`		`- }`
	`1212`	`+ if (tsHelper.isArrayType(ownerType, this.checker)`
	`1213`	`+ && tsHelper.isDefaultArrayCallExpression(node, expression => this.transpileIdentifier(expression))) {`
	`1214`	`+ return this.transpileArrayCallExpression(node);`
`1217`	`1215`	`}`
`1218`	`1216`
`1219`	`1217`	`// Get the type of the function`
`@@ -1312,7 +1310,7 @@ export abstract class LuaTranspiler {`
`1312`	`1310`	`}`
`1313`	`1311`	`}`
`1314`	`1312`
`1315`		`- public transpileArrayCallExpression(node: ts.CallExpression, noException?: boolean ): string {`
	`1313`	`+ public transpileArrayCallExpression(node: ts.CallExpression): string {`
`1316`	`1314`	`const expression = node.expression as ts.PropertyAccessExpression;`
`1317`	`1315`	`const params = this.transpileArguments(node.arguments);`
`1318`	`1316`	`const caller = this.transpileExpression(expression.expression);`
`@@ -1356,7 +1354,6 @@ export abstract class LuaTranspiler {`
`1356`	`1354`	return `table.concat(${caller}, ${params})`;
`1357`	`1355`	`}`
`1358`	`1356`	`default:`
`1359`		`- if (noException) { return ""; }`
`1360`	`1357`	`throw TSTLErrors.UnsupportedProperty("array", expressionName, node);`
`1361`	`1358`	`}`
`1362`	`1359`	`}`