typescript-to-lua 1.3.2 → 1.3.3

package/dist/transformation/visitors/class/members/constructor.js

@@ -4,7 +4,6 @@ exports.transformConstructorDeclaration = exports.createConstructorName = export
 const ts = require("typescript");
 const lua = require("../../../../LuaAST");
 const lua_ast_1 = require("../../../utils/lua-ast");
-const preceding_statements_1 = require("../../../utils/preceding-statements");
 const scope_1 = require("../../../utils/scope");
 const function_1 = require("../../function");
 const identifier_1 = require("../../identifier");
@@ -30,7 +29,7 @@ function transformConstructorDeclaration(context, statement, className, instance
     const bodyWithFieldInitializers = (0, function_1.transformFunctionBodyHeader)(context, scope, statement.parameters, restParamName);
     // Check for field declarations in constructor
     const constructorFieldsDeclarations = statement.parameters.filter(p => p.modifiers !== undefined);
-    const [fieldsPrecedingStatements, classInstanceFields] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => (0, fields_1.transformClassInstanceFields)(context, instanceFields));
+    const classInstanceFields = (0, fields_1.transformClassInstanceFields)(context, instanceFields);
     // If there are field initializers and the first statement is a super call,
     // move super call between default assignments and initializers
     if ((constructorFieldsDeclarations.length > 0 || classInstanceFields.length > 0) &&
@@ -55,7 +54,6 @@ function transformConstructorDeclaration(context, statement, className, instance
         }
         // else { TypeScript error: A parameter property may not be declared using a binding pattern }
     }
-    bodyWithFieldInitializers.push(...fieldsPrecedingStatements);
     bodyWithFieldInitializers.push(...classInstanceFields);
     bodyWithFieldInitializers.push(...body);
     const block = lua.createBlock(bodyWithFieldInitializers);

package/dist/transformation/visitors/class/members/fields.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformStaticPropertyDeclaration = exports.transformClassInstanceFields = exports.createPropertyDecoratingExpression = void 0;
 const lua = require("../../../../LuaAST");
 const lua_ast_1 = require("../../../utils/lua-ast");
+const preceding_statements_1 = require("../../../utils/preceding-statements");
 const literal_1 = require("../../literal");
 const decorators_1 = require("../decorators");
 const method_1 = require("./method");
@@ -17,14 +18,17 @@ exports.createPropertyDecoratingExpression = createPropertyDecoratingExpression;
 function transformClassInstanceFields(context, instanceFields) {
     const statements = [];
     for (const f of instanceFields) {
-        // Get identifier
-        const fieldName = (0, literal_1.transformPropertyName)(context, f.name);
-        const value = f.initializer ? context.transformExpression(f.initializer) : undefined;
-        // self[fieldName]
-        const selfIndex = lua.createTableIndexExpression((0, lua_ast_1.createSelfIdentifier)(), fieldName);
-        // self[fieldName] = value
-        const assignClassField = lua.createAssignmentStatement(selfIndex, value, f);
-        statements.push(assignClassField);
+        const [precedingStatements, statement] = (0, preceding_statements_1.transformInPrecedingStatementScope)(context, () => {
+            // Get identifier
+            const fieldName = (0, literal_1.transformPropertyName)(context, f.name);
+            const value = f.initializer ? context.transformExpression(f.initializer) : undefined;
+            // self[fieldName]
+            const selfIndex = lua.createTableIndexExpression((0, lua_ast_1.createSelfIdentifier)(), fieldName);
+            // self[fieldName] = value
+            const assignClassField = lua.createAssignmentStatement(selfIndex, value, f);
+            return assignClassField;
+        });
+        statements.push(...precedingStatements, statement);
     }
     return statements;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-to-lua",
-    "version": "1.3.2",
+    "version": "1.3.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/",