@luaIterator on array types (#479)

tomblind · web-flow · commit badd012205db · 2019-03-13T14:33:20.000-06:00
* enabling use of @luaIterator on Array types

* removing focustest
diff --git a/src/LuaTransformer.ts b/src/LuaTransformer.ts
@@ -2073,14 +2073,14 @@ export class LuaTransformer {
         // Transpile body
         const body = tstl.createBlock(this.transformLoopBody(statement));
 
-        if (tsHelper.isArrayType(this.checker.getTypeAtLocation(statement.expression), this.checker)) {
-            // Arrays
-            return this.transformForOfArrayStatement(statement, body);
-
-        } else if (tsHelper.isLuaIteratorType(statement.expression, this.checker)) {
+        if (tsHelper.isLuaIteratorType(statement.expression, this.checker)) {
             // LuaIterators
             return this.transformForOfLuaIteratorStatement(statement, body);
 
+        } else if (tsHelper.isArrayType(this.checker.getTypeAtLocation(statement.expression), this.checker)) {
+            // Arrays
+            return this.transformForOfArrayStatement(statement, body);
+
         } else {
             // TS Iterables
             return this.transformForOfIteratorStatement(statement, body);
diff --git a/test/unit/loops.spec.ts b/test/unit/loops.spec.ts
@@ -542,6 +542,27 @@ export class LuaLoopTests
         Expect(result).toBe("abc");
     }
 
+    @Test("forof array lua iterator")
+    public forofArrayLuaIterator(): void {
+        const code = `const arr = ["a", "b", "c"];
+            /** @luaIterator */
+            interface Iter extends Array<string> {}
+            function luaIter(): Iter {
+                let i = 0;
+                return (() => arr[i++]) as any;
+            }
+            let result = "";
+            for (let e of luaIter()) { result += e; }
+            return result;`;
+        const compilerOptions = {
+            luaLibImport: LuaLibImportKind.Require,
+            luaTarget: LuaTarget.Lua53,
+            target: ts.ScriptTarget.ES2015,
+        };
+        const result = util.transpileAndExecute(code, compilerOptions);
+        Expect(result).toBe("abc");
+    }
+
     @Test("forof lua iterator with existing variable")
     public forofLuaIteratorExistingVar(): void {
         const code = `const arr = ["a", "b", "c"];
