X Tutup
Skip to content

Fixes handling of statements before super call in subclass constructors #1592

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 2 commits into from
Oct 25, 2024
Merged

Fixes handling of statements before super call in subclass constructors #1592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df6f4c0
Fixes handling of statements before super call in subclass constructors
Gudine Oct 25, 2024
32e1fd1
Adds test for previous addition
Gudine Oct 25, 2024
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
23 changes: 11 additions & 12 deletions src/transformation/visitors/class/members/constructor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,22 @@ export function transformConstructorDeclaration(

const classInstanceFields = 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 there are field initializers and there is a super call somewhere,
// move super call and everything before it to between default assignments and initializers
if (
(constructorFieldsDeclarations.length > 0 || classInstanceFields.length > 0) &&
statement.body &&
statement.body.statements.length > 0
) {
const firstStatement = statement.body.statements[0];
if (
ts.isExpressionStatement(firstStatement) &&
ts.isCallExpression(firstStatement.expression) &&
firstStatement.expression.expression.kind === ts.SyntaxKind.SuperKeyword
) {
const superCall = body.shift();
if (superCall) {
bodyWithFieldInitializers.push(superCall);
}
const superIndex = statement.body.statements.findIndex(
s =>
ts.isExpressionStatement(s) &&
ts.isCallExpression(s.expression) &&
s.expression.expression.kind === ts.SyntaxKind.SuperKeyword
);

if (superIndex !== -1) {
bodyWithFieldInitializers.push(...body.splice(0, superIndex + 1));
}
}

Expand Down
21 changes: 21 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 @@ -181,6 +181,27 @@ test("SubclassConstructor", () => {
`.expectToMatchJsResult();
});

test("SubclassConstructorPropertyInitiailizationSuperOrder", () => {
util.testFunction`
class a {
field: number;
constructor(field: number) {
this.field = field;
}
}
class b extends a {
fieldDouble = this.field * 2;
constructor(field: number) {
const newField = field + 1;
super(newField);
}
}

const result = new b(10);
return [result.field, result.fieldDouble];
`.expectToMatchJsResult();
});

test("Subclass constructor across merged namespace", () => {
util.testModule`
namespace NS {
Expand Down
X Tutup