Skip to content
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.

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

fix(53204): Bug: __runInitializers(this) is emitted before super() call #53268

Merged
merged 2 commits into from
Mar 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/compiler/transformers/esDecorators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
Expression,
ExpressionStatement,
findComputedPropertyNameCacheAssignment,
findSuperStatementIndex,
firstOrUndefined,
forEachEntry,
ForStatement,
Expand Down Expand Up @@ -1072,8 +1073,11 @@ export function transformESDecorators(context: TransformationContext): (x: Sourc
if (initializerStatements) {
const statements: Statement[] = [];
const nonPrologueStart = factory.copyPrologue(node.body.statements, statements, /*ensureUseStrict*/ false, visitor);
const superStatementIndex = findSuperStatementIndex(node.body.statements, nonPrologueStart);
const indexOfFirstStatementAfterSuper = superStatementIndex >= 0 ? superStatementIndex + 1 : undefined;
addRange(statements, visitNodes(node.body.statements, visitor, isStatement, nonPrologueStart, indexOfFirstStatementAfterSuper ? indexOfFirstStatementAfterSuper - nonPrologueStart : undefined));
addRange(statements, initializerStatements);
a-tarasyuk marked this conversation as resolved.
Show resolved Hide resolved
addRange(statements, visitNodes(node.body.statements, visitor, isStatement, nonPrologueStart));
addRange(statements, visitNodes(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
body = factory.createBlock(statements, /*multiLine*/ true);
setOriginalNode(body, node.body);
setTextRange(body, node.body);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
//// [esDecorators-classExpression-classSuper.7.ts]
class A {}
class B extends A {
public constructor() {
'inject';
super();
const a = 1;
const b = 1;
}

@foo
public m(): void {}
}

function foo(method: any, _context: any): any {
return function (this: any) {
method.call(this);
};
}

new B();


//// [esDecorators-classExpression-classSuper.7.js]
class A {
}
let B = (() => {
let _instanceExtraInitializers = [];
let _m_decorators;
return class B extends A {
static {
_m_decorators = [foo];
__esDecorate(this, null, _m_decorators, { kind: "method", name: "m", static: false, private: false, access: { has: obj => "m" in obj, get: obj => obj.m } }, null, _instanceExtraInitializers);
}
constructor() {
'inject';
super();
__runInitializers(this, _instanceExtraInitializers);
const a = 1;
const b = 1;
}
m() { }
};
})();
function foo(method, _context) {
return function () {
method.call(this);
};
}
new B();
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// @target: es2022
// @noEmitHelpers: true
// @noTypesAndSymbols: true

class A {}
class B extends A {
public constructor() {
'inject';
super();
const a = 1;
const b = 1;
}

@foo
public m(): void {}
}

function foo(method: any, _context: any): any {
return function (this: any) {
method.call(this);
};
}

new B();