typescript-to-lua 1.33.0 → 1.33.2

package/dist/transformation/context/context.d.ts

@@ -59,6 +59,6 @@ export declare class TransformationContext {
     readonly usedLuaLibFeatures: Set<LuaLibFeature>;
     readonly scopeStack: Scope[];
     private lastScopeId;
-    pushScope(type: ScopeType): Scope;
+    pushScope(type: ScopeType, node: ts.Node): Scope;
     popScope(): Scope;
 }

package/dist/transformation/context/context.js

@@ -206,8 +206,8 @@ class TransformationContext {
     nextSymbolId() {
         return ++this.lastSymbolId;
     }
-    pushScope(type) {
-        const scope = { type, id: ++this.lastScopeId };
+    pushScope(type, node) {
+        const scope = { type, id: ++this.lastScopeId, node };
         this.scopeStack.push(scope);
         return scope;
     }

package/dist/transformation/utils/scope.d.ts

@@ -24,7 +24,7 @@ export declare enum LoopContinued {
 export interface Scope {
     type: ScopeType;
     id: number;
-    node?: ts.Node;
+    node: ts.Node;
     referencedSymbols?: Map<lua.SymbolId, ts.Node[]>;
     variableDeclarations?: lua.VariableDeclarationStatement[];
     functionDefinitions?: Map<lua.SymbolId, FunctionDefinitionInfo>;
@@ -44,9 +44,6 @@ export declare function findScope(context: TransformationContext, scopeTypes: Sc
 export declare function addScopeVariableDeclaration(scope: Scope, declaration: lua.VariableDeclarationStatement): void;
 export declare function hasReferencedUndefinedLocalFunction(context: TransformationContext, scope: Scope): boolean;
 export declare function hasReferencedSymbol(context: TransformationContext, scope: Scope, symbol: ts.Symbol): boolean | undefined;
-export declare function isFunctionScopeWithDefinition(scope: Scope): scope is Scope & {
-    node: ts.SignatureDeclaration;
-};
 export declare function separateHoistedStatements(context: TransformationContext, statements: lua.Statement[]): HoistingResult;
 export declare function performHoisting(context: TransformationContext, statements: lua.Statement[]): lua.Statement[];
 export {};

package/dist/transformation/utils/scope.js

@@ -8,7 +8,6 @@ exports.findScope = findScope;
 exports.addScopeVariableDeclaration = addScopeVariableDeclaration;
 exports.hasReferencedUndefinedLocalFunction = hasReferencedUndefinedLocalFunction;
 exports.hasReferencedSymbol = hasReferencedSymbol;
-exports.isFunctionScopeWithDefinition = isFunctionScopeWithDefinition;
 exports.separateHoistedStatements = separateHoistedStatements;
 exports.performHoisting = performHoisting;
 const ts = require("typescript");
@@ -76,7 +75,7 @@ function isHoistableFunctionDeclaredInScope(symbol, scopeNode) {
 // and thus will be hoisted above the current position.
 function hasReferencedUndefinedLocalFunction(context, scope) {
     var _a;
-    if (!scope.referencedSymbols || !scope.node) {
+    if (!scope.referencedSymbols) {
         return false;
     }
     for (const [symbolId, nodes] of scope.referencedSymbols) {
@@ -100,9 +99,6 @@ function hasReferencedSymbol(context, scope, symbol) {
     }
     return false;
 }
-function isFunctionScopeWithDefinition(scope) {
-    return scope.node !== undefined && ts.isFunctionLike(scope.node);
-}
 function separateHoistedStatements(context, statements) {
     const scope = peekScope(context);
     const allHoistedStatments = [];

package/dist/transformation/visitors/block.js

@@ -10,13 +10,13 @@ function transformBlockOrStatement(context, statement) {
     return context.transformStatements(ts.isBlock(statement) ? statement.statements : statement);
 }
 function transformScopeBlock(context, node, scopeType) {
-    context.pushScope(scopeType);
+    context.pushScope(scopeType, node);
     const statements = (0, scope_1.performHoisting)(context, context.transformStatements(node.statements));
     const scope = context.popScope();
     return [lua.createBlock(statements, node), scope];
 }
 const transformBlock = (node, context) => {
-    context.pushScope(scope_1.ScopeType.Block);
+    context.pushScope(scope_1.ScopeType.Block, node);
     const statements = (0, scope_1.performHoisting)(context, context.transformStatements(node.statements));
     context.popScope();
     return lua.createDoStatement(statements, node);

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

@@ -13,7 +13,7 @@ const decorators_1 = require("../decorators");
 function transformAccessor(context, node, className) {
     var _a;
     const [params, dot, restParam] = (0, function_1.transformParameters)(context, node.parameters, (0, lua_ast_1.createSelfIdentifier)());
-    const body = node.body ? (0, function_1.transformFunctionBody)(context, node.parameters, node.body, restParam)[0] : [];
+    const body = node.body ? (0, function_1.transformFunctionBody)(context, node.parameters, node.body, node, restParam)[0] : [];
     const accessorFunction = lua.createFunctionExpression(lua.createBlock(body), params, dot, lua.NodeFlags.Declaration);
     if ((_a = ts.getDecorators(node)) === null || _a === void 0 ? void 0 : _a.length) {
         return (0, decorators_1.createClassAccessorDecoratingExpression)(context, node, accessorFunction, className);

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

@@ -22,7 +22,7 @@ function transformConstructorDeclaration(context, statement, className, instance
         return undefined;
     }
     // Transform body
-    const scope = context.pushScope(scope_1.ScopeType.Function);
+    const scope = context.pushScope(scope_1.ScopeType.Function, statement);
     const body = (0, function_1.transformFunctionBodyContent)(context, statement.body);
     const [params, dotsLiteral, restParamName] = (0, function_1.transformParameters)(context, statement.parameters, (0, lua_ast_1.createSelfIdentifier)());
     // Make sure default parameters are assigned before fields are initialized

package/dist/transformation/visitors/conditional.js

@@ -44,7 +44,7 @@ const transformConditionalExpression = (expression, context) => {
 };
 exports.transformConditionalExpression = transformConditionalExpression;
 function transformIfStatement(statement, context) {
-    context.pushScope(scope_1.ScopeType.Conditional);
+    context.pushScope(scope_1.ScopeType.Conditional, statement);
     // Check if we need to add diagnostic about Lua truthiness
     checkOnlyTruthyCondition(statement.expression, context);
     const condition = context.transformExpression(statement.expression);
@@ -72,7 +72,7 @@ function transformIfStatement(statement, context) {
             }
         }
         else {
-            context.pushScope(scope_1.ScopeType.Conditional);
+            context.pushScope(scope_1.ScopeType.Conditional, statement);
             const elseStatements = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, statement.elseStatement));
             context.popScope();
             const elseBlock = lua.createBlock(elseStatements);

package/dist/transformation/visitors/function.d.ts

@@ -6,7 +6,7 @@ export declare function createCallableTable(functionExpression: lua.Expression):
 export declare function isFunctionTypeWithProperties(context: TransformationContext, functionType: ts.Type): boolean;
 export declare function transformFunctionBodyContent(context: TransformationContext, body: ts.ConciseBody): lua.Statement[];
 export declare function transformFunctionBodyHeader(context: TransformationContext, bodyScope: Scope, parameters: ts.NodeArray<ts.ParameterDeclaration>, spreadIdentifier?: lua.Identifier): lua.Statement[];
-export declare function transformFunctionBody(context: TransformationContext, parameters: ts.NodeArray<ts.ParameterDeclaration>, body: ts.ConciseBody, spreadIdentifier?: lua.Identifier, node?: ts.FunctionLikeDeclaration): [lua.Statement[], Scope];
+export declare function transformFunctionBody(context: TransformationContext, parameters: ts.NodeArray<ts.ParameterDeclaration>, body: ts.ConciseBody, node: ts.FunctionLikeDeclaration, spreadIdentifier?: lua.Identifier): [lua.Statement[], Scope];
 export declare function transformParameters(context: TransformationContext, parameters: ts.NodeArray<ts.ParameterDeclaration>, functionContext?: lua.Identifier): [lua.Identifier[], lua.DotsLiteral | undefined, lua.Identifier | undefined];
 export declare function transformFunctionToExpression(context: TransformationContext, node: ts.FunctionLikeDeclaration): [lua.Expression, Scope];
 export declare function transformFunctionLikeDeclaration(node: ts.FunctionLikeDeclaration, context: TransformationContext): lua.Expression;

package/dist/transformation/visitors/function.js

@@ -120,9 +120,8 @@ function transformFunctionBodyHeader(context, bodyScope, parameters, spreadIdent
     headerStatements.push(...bindingPatternDeclarations);
     return headerStatements;
 }
-function transformFunctionBody(context, parameters, body, spreadIdentifier, node) {
-    const scope = context.pushScope(scope_1.ScopeType.Function);
-    scope.node = node;
+function transformFunctionBody(context, parameters, body, node, spreadIdentifier) {
+    const scope = context.pushScope(scope_1.ScopeType.Function, node);
     let bodyStatements = transformFunctionBodyContent(context, body);
     if (node && (0, async_await_1.isAsyncFunction)(node)) {
         bodyStatements = [lua.createReturnStatement([(0, async_await_1.wrapInAsyncAwaiter)(context, bodyStatements)])];
@@ -191,7 +190,7 @@ function transformFunctionToExpression(context, node) {
         flags |= lua.NodeFlags.Declaration;
     }
     const [paramNames, dotsLiteral, spreadIdentifier] = transformParameters(context, node.parameters, functionContext);
-    const [transformedBody, functionScope] = transformFunctionBody(context, node.parameters, node.body, spreadIdentifier, node);
+    const [transformedBody, functionScope] = transformFunctionBody(context, node.parameters, node.body, node, spreadIdentifier);
     const functionExpression = lua.createFunctionExpression(lua.createBlock(transformedBody), paramNames, dotsLiteral, flags, node);
     return [
         node.asteriskToken

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

@@ -9,7 +9,7 @@ const utils_1 = require("./utils");
 const scope_1 = require("../../utils/scope");
 const transformForStatement = (statement, context) => {
     const result = [];
-    context.pushScope(scope_1.ScopeType.Loop);
+    context.pushScope(scope_1.ScopeType.Loop, statement);
     if (statement.initializer) {
         if (ts.isVariableDeclarationList(statement.initializer)) {
             (0, variable_declaration_1.checkVariableDeclarationList)(context, statement.initializer);

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

@@ -15,7 +15,7 @@ const block_1 = require("../block");
 const identifier_1 = require("../identifier");
 const variable_declaration_1 = require("../variable-declaration");
 function transformLoopBody(context, loop) {
-    context.pushScope(scope_1.ScopeType.Loop);
+    context.pushScope(scope_1.ScopeType.Loop, loop);
     const body = (0, scope_1.performHoisting)(context, (0, block_1.transformBlockOrStatement)(context, loop.statement));
     const scope = context.popScope();
     const scopeId = scope.id;
@@ -60,7 +60,7 @@ function getVariableDeclarationBinding(context, node) {
 }
 function transformForInitializer(context, initializer, block) {
     const valueVariable = lua.createIdentifier("____value");
-    context.pushScope(scope_1.ScopeType.LoopInitializer);
+    context.pushScope(scope_1.ScopeType.LoopInitializer, initializer);
     if (ts.isVariableDeclarationList(initializer)) {
         // Declaration of new variable
         const binding = getVariableDeclarationBinding(context, initializer);

package/dist/transformation/visitors/namespace.js

@@ -77,7 +77,7 @@ const transformModuleDeclaration = (node, context) => {
     context.currentNamespaces = node;
     // Transform moduleblock to block and visit it
     if (moduleHasEmittedBody(node)) {
-        context.pushScope(scope_1.ScopeType.Block);
+        context.pushScope(scope_1.ScopeType.Block, node);
         const statements = (0, scope_1.performHoisting)(context, context.transformStatements(ts.isModuleBlock(node.body) ? node.body.statements : node.body));
         context.popScope();
         result.push(lua.createDoStatement(statements));

package/dist/transformation/visitors/sourceFile.js

@@ -27,7 +27,7 @@ const transformSourceFileNode = (node, context) => {
         }
     }
     else {
-        context.pushScope(scope_1.ScopeType.File);
+        context.pushScope(scope_1.ScopeType.File, node);
         statements = (0, scope_1.performHoisting)(context, context.transformStatements(node.statements));
         context.popScope();
         if (context.isModule) {

package/dist/transformation/visitors/spread.js

@@ -28,7 +28,7 @@ function isOptimizedVarArgSpread(context, symbol, identifier) {
         return true;
     }
     // Scope must be a function scope associated with a real ts function
-    if (!(0, scope_1.isFunctionScopeWithDefinition)(scope)) {
+    if (!ts.isFunctionLike(scope.node)) {
         return false;
     }
     // Scope cannot be an async function

package/dist/transformation/visitors/switch.js

@@ -48,7 +48,7 @@ const coalesceCondition = (condition, conditionPrecedingStatements, switchVariab
     return { precedingStatements: [...conditionPrecedingStatements, ...precedingStatements], result: comparison };
 };
 const transformSwitchStatement = (statement, context) => {
-    const scope = context.pushScope(scope_1.ScopeType.Switch);
+    const scope = context.pushScope(scope_1.ScopeType.Switch, statement);
     // Give the switch and condition accumulator a unique name to prevent nested switches from acting up.
     const switchName = `____switch${scope.id}`;
     const conditionName = `____cond${scope.id}`;

package/package.json

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