From 9c7731fdea83f5687290585ebf414eae62be713f Mon Sep 17 00:00:00 2001 From: Perryvw Date: Sat, 27 Dec 2025 11:15:24 +0100 Subject: [PATCH 1/3] Fix constructor scope breaking vararg spread optimization --- package-lock.json | 12 ++++++------ src/transformation/context/context.ts | 4 ++-- src/transformation/utils/scope.ts | 8 ++------ src/transformation/visitors/block.ts | 4 ++-- .../visitors/class/members/accessors.ts | 2 +- .../visitors/class/members/constructor.ts | 2 +- src/transformation/visitors/conditional.ts | 4 ++-- src/transformation/visitors/function.ts | 11 +++++------ src/transformation/visitors/loops/for.ts | 2 +- src/transformation/visitors/loops/utils.ts | 4 ++-- src/transformation/visitors/namespace.ts | 2 +- src/transformation/visitors/sourceFile.ts | 2 +- src/transformation/visitors/spread.ts | 10 ++-------- src/transformation/visitors/switch.ts | 2 +- test/unit/classes/classes.spec.ts | 14 ++++++++++++++ 15 files changed, 43 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index c731bfd48..f5ccdeac5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -862,9 +862,9 @@ } }, "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", - "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "version": "3.14.2", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", + "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "dev": true, "license": "MIT", "dependencies": { @@ -4486,9 +4486,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", + "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/transformation/context/context.ts b/src/transformation/context/context.ts index 79e385b2b..ad40d48c5 100644 --- a/src/transformation/context/context.ts +++ b/src/transformation/context/context.ts @@ -247,8 +247,8 @@ export class TransformationContext { public readonly scopeStack: Scope[] = []; private lastScopeId = 0; - public pushScope(type: ScopeType): Scope { - const scope = { type, id: ++this.lastScopeId }; + public pushScope(type: ScopeType, node: ts.Node): Scope { + const scope: Scope = { type, id: ++this.lastScopeId, node }; this.scopeStack.push(scope); return scope; } diff --git a/src/transformation/utils/scope.ts b/src/transformation/utils/scope.ts index 187504caf..fa66ee3e2 100644 --- a/src/transformation/utils/scope.ts +++ b/src/transformation/utils/scope.ts @@ -31,7 +31,7 @@ export enum LoopContinued { export interface Scope { type: ScopeType; id: number; - node?: ts.Node; + node: ts.Node; referencedSymbols?: Map; variableDeclarations?: lua.VariableDeclarationStatement[]; functionDefinitions?: Map; @@ -99,7 +99,7 @@ function isHoistableFunctionDeclaredInScope(symbol: ts.Symbol, scopeNode: ts.Nod // Checks for references to local functions which haven't been defined yet, // and thus will be hoisted above the current position. export function hasReferencedUndefinedLocalFunction(context: TransformationContext, scope: Scope) { - if (!scope.referencedSymbols || !scope.node) { + if (!scope.referencedSymbols) { return false; } for (const [symbolId, nodes] of scope.referencedSymbols) { @@ -127,10 +127,6 @@ export function hasReferencedSymbol(context: TransformationContext, scope: Scope return false; } -export function isFunctionScopeWithDefinition(scope: Scope): scope is Scope & { node: ts.SignatureDeclaration } { - return scope.node !== undefined && ts.isFunctionLike(scope.node); -} - export function separateHoistedStatements(context: TransformationContext, statements: lua.Statement[]): HoistingResult { const scope = peekScope(context); const allHoistedStatments: lua.Statement[] = []; diff --git a/src/transformation/visitors/block.ts b/src/transformation/visitors/block.ts index c0a2ad3a8..4eef4b6f8 100644 --- a/src/transformation/visitors/block.ts +++ b/src/transformation/visitors/block.ts @@ -12,14 +12,14 @@ export function transformScopeBlock( node: ts.Block, scopeType: ScopeType ): [lua.Block, Scope] { - context.pushScope(scopeType); + context.pushScope(scopeType, node); const statements = performHoisting(context, context.transformStatements(node.statements)); const scope = context.popScope(); return [lua.createBlock(statements, node), scope]; } export const transformBlock: FunctionVisitor = (node, context) => { - context.pushScope(ScopeType.Block); + context.pushScope(ScopeType.Block, node); const statements = performHoisting(context, context.transformStatements(node.statements)); context.popScope(); return lua.createDoStatement(statements, node); diff --git a/src/transformation/visitors/class/members/accessors.ts b/src/transformation/visitors/class/members/accessors.ts index 165d3fa88..017100056 100644 --- a/src/transformation/visitors/class/members/accessors.ts +++ b/src/transformation/visitors/class/members/accessors.ts @@ -15,7 +15,7 @@ function transformAccessor( className: lua.Identifier ): lua.Expression { const [params, dot, restParam] = transformParameters(context, node.parameters, createSelfIdentifier()); - const body = node.body ? transformFunctionBody(context, node.parameters, node.body, restParam)[0] : []; + const body = node.body ? transformFunctionBody(context, node.parameters, node.body, node, restParam)[0] : []; const accessorFunction = lua.createFunctionExpression( lua.createBlock(body), params, diff --git a/src/transformation/visitors/class/members/constructor.ts b/src/transformation/visitors/class/members/constructor.ts index 039e705f7..8bff2f4fc 100644 --- a/src/transformation/visitors/class/members/constructor.ts +++ b/src/transformation/visitors/class/members/constructor.ts @@ -28,7 +28,7 @@ export function transformConstructorDeclaration( } // Transform body - const scope = context.pushScope(ScopeType.Function); + const scope = context.pushScope(ScopeType.Function, statement); const body = transformFunctionBodyContent(context, statement.body); const [params, dotsLiteral, restParamName] = transformParameters( diff --git a/src/transformation/visitors/conditional.ts b/src/transformation/visitors/conditional.ts index b90c7e2db..6285a488d 100644 --- a/src/transformation/visitors/conditional.ts +++ b/src/transformation/visitors/conditional.ts @@ -76,7 +76,7 @@ export const transformConditionalExpression: FunctionVisitor, body: ts.ConciseBody, - spreadIdentifier?: lua.Identifier, - node?: ts.FunctionLikeDeclaration + node: ts.FunctionLikeDeclaration, + spreadIdentifier?: lua.Identifier ): [lua.Statement[], Scope] { - const scope = context.pushScope(ScopeType.Function); - scope.node = node; + const scope = context.pushScope(ScopeType.Function, node); let bodyStatements = transformFunctionBodyContent(context, body); if (node && isAsyncFunction(node)) { bodyStatements = [lua.createReturnStatement([wrapInAsyncAwaiter(context, bodyStatements)])]; @@ -258,8 +257,8 @@ export function transformFunctionToExpression( context, node.parameters, node.body, - spreadIdentifier, - node + node, + spreadIdentifier ); const functionExpression = lua.createFunctionExpression( diff --git a/src/transformation/visitors/loops/for.ts b/src/transformation/visitors/loops/for.ts index 0c272e225..5ae3bf0ea 100644 --- a/src/transformation/visitors/loops/for.ts +++ b/src/transformation/visitors/loops/for.ts @@ -9,7 +9,7 @@ import { ScopeType } from "../../utils/scope"; export const transformForStatement: FunctionVisitor = (statement, context) => { const result: lua.Statement[] = []; - context.pushScope(ScopeType.Loop); + context.pushScope(ScopeType.Loop, statement); if (statement.initializer) { if (ts.isVariableDeclarationList(statement.initializer)) { diff --git a/src/transformation/visitors/loops/utils.ts b/src/transformation/visitors/loops/utils.ts index 0997c6583..d7e4a3093 100644 --- a/src/transformation/visitors/loops/utils.ts +++ b/src/transformation/visitors/loops/utils.ts @@ -14,7 +14,7 @@ export function transformLoopBody( context: TransformationContext, loop: ts.WhileStatement | ts.DoStatement | ts.ForStatement | ts.ForOfStatement | ts.ForInOrOfStatement ): lua.Statement[] { - context.pushScope(ScopeType.Loop); + context.pushScope(ScopeType.Loop, loop); const body = performHoisting(context, transformBlockOrStatement(context, loop.statement)); const scope = context.popScope(); const scopeId = scope.id; @@ -79,7 +79,7 @@ export function transformForInitializer( ): lua.Identifier { const valueVariable = lua.createIdentifier("____value"); - context.pushScope(ScopeType.LoopInitializer); + context.pushScope(ScopeType.LoopInitializer, initializer); if (ts.isVariableDeclarationList(initializer)) { // Declaration of new variable diff --git a/src/transformation/visitors/namespace.ts b/src/transformation/visitors/namespace.ts index 743b52b62..49a3f2289 100644 --- a/src/transformation/visitors/namespace.ts +++ b/src/transformation/visitors/namespace.ts @@ -118,7 +118,7 @@ export const transformModuleDeclaration: FunctionVisitor = // Transform moduleblock to block and visit it if (moduleHasEmittedBody(node)) { - context.pushScope(ScopeType.Block); + context.pushScope(ScopeType.Block, node); const statements = performHoisting( context, context.transformStatements(ts.isModuleBlock(node.body) ? node.body.statements : node.body) diff --git a/src/transformation/visitors/sourceFile.ts b/src/transformation/visitors/sourceFile.ts index 4a0c62c6d..2fe860f53 100644 --- a/src/transformation/visitors/sourceFile.ts +++ b/src/transformation/visitors/sourceFile.ts @@ -26,7 +26,7 @@ export const transformSourceFileNode: FunctionVisitor = (node, co statements.push(lua.createExpressionStatement(errorCall)); } } else { - context.pushScope(ScopeType.File); + context.pushScope(ScopeType.File, node); statements = performHoisting(context, context.transformStatements(node.statements)); context.popScope(); diff --git a/src/transformation/visitors/spread.ts b/src/transformation/visitors/spread.ts index 9c8cb6feb..b10a0ae6e 100644 --- a/src/transformation/visitors/spread.ts +++ b/src/transformation/visitors/spread.ts @@ -6,13 +6,7 @@ import { FunctionVisitor, TransformationContext } from "../context"; import { getIterableExtensionKindForNode, IterableExtensionKind } from "../utils/language-extensions"; import { createUnpackCall } from "../utils/lua-ast"; import { LuaLibFeature, transformLuaLibFunction } from "../utils/lualib"; -import { - findScope, - hasReferencedSymbol, - hasReferencedUndefinedLocalFunction, - isFunctionScopeWithDefinition, - ScopeType, -} from "../utils/scope"; +import { findScope, hasReferencedSymbol, hasReferencedUndefinedLocalFunction, ScopeType } from "../utils/scope"; import { findFirstNonOuterParent, isAlwaysArrayType } from "../utils/typescript"; import { isMultiReturnCall } from "./language-extensions/multi"; import { isGlobalVarargConstant } from "./language-extensions/vararg"; @@ -34,7 +28,7 @@ export function isOptimizedVarArgSpread(context: TransformationContext, symbol: } // Scope must be a function scope associated with a real ts function - if (!isFunctionScopeWithDefinition(scope)) { + if (!ts.isFunctionLike(scope.node)) { return false; } diff --git a/src/transformation/visitors/switch.ts b/src/transformation/visitors/switch.ts index 2ceaedb39..cee8b7f57 100644 --- a/src/transformation/visitors/switch.ts +++ b/src/transformation/visitors/switch.ts @@ -73,7 +73,7 @@ const coalesceCondition = ( }; export const transformSwitchStatement: FunctionVisitor = (statement, context) => { - const scope = context.pushScope(ScopeType.Switch); + const scope = context.pushScope(ScopeType.Switch, statement); // Give the switch and condition accumulator a unique name to prevent nested switches from acting up. const switchName = `____switch${scope.id}`; diff --git a/test/unit/classes/classes.spec.ts b/test/unit/classes/classes.spec.ts index 40eccc05a..f9e04487c 100644 --- a/test/unit/classes/classes.spec.ts +++ b/test/unit/classes/classes.spec.ts @@ -909,3 +909,17 @@ test("get inherted __index member from super (DotA 2 inheritance) (#1537)", () = ) .expectToEqual("foo"); }); + +// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1673 +test("varag spread optimization in class constructor (#1673)", () => { + const lua = util.testModule` + class C { + constructor(...args: any[]) { + console.log(...args); + } + }` + .debug() + .getMainLuaCodeChunk(); + + expect(lua).not.toContain("table.unpack"); +}); From 41ae98253eeabc9b5f4ca2aa77ff1c0ff1f03da9 Mon Sep 17 00:00:00 2001 From: Perryvw Date: Sat, 27 Dec 2025 11:19:11 +0100 Subject: [PATCH 2/3] remove test debug --- test/unit/classes/classes.spec.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/unit/classes/classes.spec.ts b/test/unit/classes/classes.spec.ts index f9e04487c..6be5afcab 100644 --- a/test/unit/classes/classes.spec.ts +++ b/test/unit/classes/classes.spec.ts @@ -917,9 +917,7 @@ test("varag spread optimization in class constructor (#1673)", () => { constructor(...args: any[]) { console.log(...args); } - }` - .debug() - .getMainLuaCodeChunk(); + }`.getMainLuaCodeChunk(); expect(lua).not.toContain("table.unpack"); }); From 57f84a782ecd77f4fc8407fcb9f414237906ece0 Mon Sep 17 00:00:00 2001 From: Perryvw Date: Sat, 27 Dec 2025 11:23:11 +0100 Subject: [PATCH 3/3] fix typo in test name --- test/unit/classes/classes.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/classes/classes.spec.ts b/test/unit/classes/classes.spec.ts index 6be5afcab..f28c3b43d 100644 --- a/test/unit/classes/classes.spec.ts +++ b/test/unit/classes/classes.spec.ts @@ -911,7 +911,7 @@ test("get inherted __index member from super (DotA 2 inheritance) (#1537)", () = }); // https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1673 -test("varag spread optimization in class constructor (#1673)", () => { +test("vararg spread optimization in class constructor (#1673)", () => { const lua = util.testModule` class C { constructor(...args: any[]) {