Skip to content

Add support for class static initialization blocks #1451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Perryvw merged 9 commits into from
Jun 4, 2023
Merged

Add support for class static initialization blocks #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b8e76ad
Tests for new decorators
Perryvw May 28, 2023
57349d3
Rename old decorate function to DecorateLegacy
Perryvw May 29, 2023
e1cf251
Method decorators and partially accessor decorators rewritten
Perryvw May 29, 2023
b62db35
Modern decorators except field decorators working but with some regre…
Perryvw May 30, 2023
664a475
All decorators legacy and modern work, except for field decorators
Perryvw Jun 1, 2023
2717c34
Finalize property decorators
Perryvw Jun 3, 2023
ea94d24
Fix unit tests
Perryvw Jun 4, 2023
b123773
Add support for class static initialization blocks
Perryvw Jun 4, 2023
290c2c5
Merge branch 'master' into class-static-block
Perryvw Jun 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/transformation/visitors/class/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,15 @@ function transformClassLikeDeclaration(
lua.createExpressionStatement(createClassPropertyDecoratingExpression(context, member, className))
);
}
} else if (ts.isClassStaticBlockDeclaration(member)) {
if (member.body.statements.length > 0) {
const bodyStatements = context.transformStatements(member.body.statements);
const iif = lua.createFunctionExpression(lua.createBlock(bodyStatements), [
lua.createIdentifier("self"),
]);
const iife = lua.createCallExpression(iif, [className]);
result.push(lua.createExpressionStatement(iife, member));
}
}
}

Expand Down
19 changes: 19 additions & 0 deletions test/unit/classes/classes.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,3 +799,22 @@ test.each(['(this["bar"])', '((((this["bar"]))))'])("methods in parentheses pass
export const result = inst.foo();
`.expectToMatchJsResult();
});

// https://github.com/TypeScriptToLua/TypeScriptToLua/issues/1447
test("static initialization block (#1447)", () => {
util.testModule`
class A {
private static staticProperty1 = 3;
public static staticProperty2;
static {
this.staticProperty2 = this.staticProperty1 + 5;
}
public static staticProperty3;
static {
this.staticProperty3 = this.staticProperty1 + this.staticProperty2;
}
}
export const result1 = A.staticProperty2;
export const result2 = A.staticProperty3;
`.expectToMatchJsResult();
});