typescript-to-lua 1.31.1 → 1.31.3

package/dist/transformation/utils/function-context.js

@@ -111,7 +111,8 @@ function computeDeclarationContextType(context, signatureDeclaration) {
         ts.isConstructSignatureDeclaration(signatureDeclaration) ||
         ts.isConstructorDeclaration(signatureDeclaration) ||
         (signatureDeclaration.parent && ts.isPropertyDeclaration(signatureDeclaration.parent)) ||
-        (signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent))) {
+        (signatureDeclaration.parent && ts.isPropertySignature(signatureDeclaration.parent)) ||
+        (signatureDeclaration.parent && ts.isIndexSignatureDeclaration(signatureDeclaration.parent))) {
         // Class/interface methods only respect @noSelf on their parent
         const scopeDeclaration = (0, typescript_1.findFirstNodeAbove)(signatureDeclaration, (n) => ts.isClassDeclaration(n) || ts.isClassExpression(n) || ts.isInterfaceDeclaration(n));
         if (scopeDeclaration !== undefined && (0, annotations_1.getNodeAnnotations)(scopeDeclaration).has(annotations_1.AnnotationKind.NoSelf)) {

package/dist/transformation/visitors/call.js

@@ -110,7 +110,7 @@ function transformContextualCallExpression(context, node, args) {
             return lua.createCallExpression(expression, transformedArguments, node);
         }
     }
-    else if (ts.isIdentifier(left)) {
+    else if (ts.isIdentifier(left) || ts.isCallExpression(left)) {
         const callContext = context.isStrict ? ts.factory.createNull() : ts.factory.createIdentifier("_G");
         let expression;
         [expression, transformedArguments] = transformCallWithArguments(context, left, transformedArguments, argPrecedingStatements, callContext);

package/dist/transformation/visitors/class/index.js

@@ -143,7 +143,7 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
                 const iif = lua.createFunctionExpression(lua.createBlock(bodyStatements), [
                     lua.createIdentifier("self"),
                 ]);
-                const iife = lua.createCallExpression(iif, [className]);
+                const iife = lua.createCallExpression(iif, [localClassName]);
                 result.push(lua.createExpressionStatement(iife, member));
             }
         }
@@ -156,7 +156,7 @@ function transformClassLikeDeclaration(classDeclaration, context, nameOverride)
         if ((0, export_1.shouldBeExported)(classDeclaration)) {
             const exportExpression = (0, export_1.hasDefaultExportModifier)(classDeclaration)
                 ? (0, export_1.createDefaultExportExpression)(classDeclaration)
-                : (0, export_1.createExportedIdentifier)(context, className);
+                : (0, export_1.createExportedIdentifier)(context, localClassName);
             const classAssignment = lua.createAssignmentStatement(exportExpression, localClassName);
             result.push(classAssignment);
         }

package/dist/transformation/visitors/loops/for.js

@@ -6,8 +6,10 @@ const lua = require("../../../LuaAST");
 const preceding_statements_1 = require("../../utils/preceding-statements");
 const variable_declaration_1 = require("../variable-declaration");
 const utils_1 = require("./utils");
+const scope_1 = require("../../utils/scope");
 const transformForStatement = (statement, context) => {
     const result = [];
+    context.pushScope(scope_1.ScopeType.Loop);
     if (statement.initializer) {
         if (ts.isVariableDeclarationList(statement.initializer)) {
             (0, variable_declaration_1.checkVariableDeclarationList)(context, statement.initializer);
@@ -47,6 +49,7 @@ const transformForStatement = (statement, context) => {
     }
     // while (condition) do ... end
     result.push(lua.createWhileStatement(lua.createBlock(body), condition, statement));
+    context.popScope();
     return lua.createDoStatement(result, statement);
 };
 exports.transformForStatement = transformForStatement;

package/dist/transformation/visitors/loops/utils.js

@@ -28,10 +28,24 @@ function transformLoopBody(context, loop) {
         case scope_1.LoopContinued.WithRepeatBreak:
             const identifier = lua.createIdentifier(`__continue${scopeId}`);
             const literalTrue = lua.createBooleanLiteral(true);
+            // If there is a break in the body statements, do not include any code afterwards
+            const transformedBodyStatements = [];
+            let bodyBroken = false;
+            for (const statement of body) {
+                transformedBodyStatements.push(statement);
+                if (lua.isBreakStatement(statement)) {
+                    bodyBroken = true;
+                    break;
+                }
+            }
+            if (!bodyBroken) {
+                // Tell loop to continue if not broken
+                transformedBodyStatements.push(lua.createAssignmentStatement(identifier, literalTrue));
+            }
             return [
                 lua.createDoStatement([
                     lua.createVariableDeclarationStatement(identifier),
-                    lua.createRepeatStatement(lua.createBlock([...body, lua.createAssignmentStatement(identifier, literalTrue)]), literalTrue),
+                    lua.createRepeatStatement(lua.createBlock(transformedBodyStatements), literalTrue),
                     lua.createIfStatement(lua.createUnaryExpression(identifier, lua.SyntaxKind.NotOperator), lua.createBlock([lua.createBreakStatement()])),
                 ]),
             ];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.31.1",
+    "version": "1.31.3",
     "description": "A generic TypeScript to Lua transpiler. Write your code in TypeScript and publish Lua!",
     "repository": "https://github.com/TypeScriptToLua/TypeScriptToLua",
     "homepage": "https://typescripttolua.github.io/",