allow non-default properties with derived array types (#308)

TheLartians · Perryvw · commit a11be62dc5de · 2018-12-18T10:58:17.000+01:00
* allow non-default properties with derived array types

* added length test case

* remove FocusTest
diff --git a/src/TSHelper.ts b/src/TSHelper.ts
@@ -20,6 +20,10 @@ const defaultArrayCallMethodNames = new Set<string>([
     "join",
 ]);
 
+const defaultArrayPropertyNames = new Set<string>([
+    "length",
+]);
+
 export class TSHelper {
 
     // Reverse lookup of enum key by value
@@ -308,4 +312,8 @@ export class TSHelper {
         return defaultArrayCallMethodNames.has(methodName);
     }
 
+    public static isDefaultArrayPropertyName(methodName: string): boolean {
+        return defaultArrayPropertyNames.has(methodName);
+    }
+
 }
diff --git a/src/Transpiler.ts b/src/Transpiler.ts
@@ -1387,7 +1387,11 @@ export abstract class LuaTranspiler {
             case ts.TypeFlags.StringLiteral:
                 return this.transpileStringProperty(node);
             case ts.TypeFlags.Object:
-                if (tsHelper.isArrayType(type, this.checker)) {
+                if (tsHelper.isExplicitArrayType(type, this.checker)) {
+                    return this.transpileArrayProperty(node);
+                }
+                if (tsHelper.isArrayType(type, this.checker)
+                    && tsHelper.isDefaultArrayPropertyName(this.transpileIdentifier(node.name))) {
                     return this.transpileArrayProperty(node);
                 }
         }
diff --git a/test/unit/array.spec.ts b/test/unit/array.spec.ts
@@ -39,16 +39,22 @@ export class ArrayTests {
         Expect(result).toBe(5);
     }
 
+    @TestCase("firstElement()", 3)
+    @TestCase("name", "array")
+    @TestCase("length", 1)
     @Test("Derived array access")
-    public derivedArrayAccess(): void {
-        const lua = `local arr = {firstElement=function(self) return self[1]; end};`
+    public derivedArrayAccess(member: string, expected: any): void {
+        const lua = `local arr = {name="array", firstElement=function(self) return self[1]; end};`
         +  util.transpileString(
-            `interface CustomArray<T> extends Array<T>{ firstElement():number; };
+            `interface CustomArray<T> extends Array<T>{
+                name:string,
+                firstElement():number;
+            };
             declare const arr: CustomArray<number>;
             arr[0] = 3;
-            return arr.firstElement();`
+            return arr.${member};`
         );
         const result = util.executeLua(lua);
-        Expect(result).toBe(3);
+        Expect(result).toBe(expected);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1387,7 +1387,11 @@ export abstract class LuaTranspiler {`
`1387`	`1387`	`case ts.TypeFlags.StringLiteral:`
`1388`	`1388`	`return this.transpileStringProperty(node);`
`1389`	`1389`	`case ts.TypeFlags.Object:`
`1390`		`- if (tsHelper.isArrayType(type, this.checker)) {`
	`1390`	`+ if (tsHelper.isExplicitArrayType(type, this.checker)) {`
	`1391`	`+ return this.transpileArrayProperty(node);`
	`1392`	`+ }`
	`1393`	`+ if (tsHelper.isArrayType(type, this.checker)`
	`1394`	`+ && tsHelper.isDefaultArrayPropertyName(this.transpileIdentifier(node.name))) {`
`1391`	`1395`	`return this.transpileArrayProperty(node);`
`1392`	`1396`	`}`
`1393`	`1397`	`}`