call __runInitializers exclusively after super() call

microsoft · Mar 15, 2023 · 9ce2780 · 9ce2780
1 parent 71f24f3
commit 9ce2780
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/compiler/transformers/esDecorators.ts b/src/compiler/transformers/esDecorators.ts
@@ -36,6 +36,7 @@ import {
     Expression,
     ExpressionStatement,
     findComputedPropertyNameCacheAssignment,
+    findSuperStatementIndex,
     firstOrUndefined,
     forEachEntry,
     ForStatement,
@@ -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);
-                addRange(statements, visitNodes(node.body.statements, visitor, isStatement, nonPrologueStart));
+                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);
+                addRange(statements, visitNodes(node.body.statements, visitor, isStatement, indexOfFirstStatementAfterSuper));
                 body = factory.createBlock(statements, /*multiLine*/ true);
                 setOriginalNode(body, node.body);
                 setTextRange(body, node.body);

diff --git a/tests/baselines/reference/esDecorators-classExpression-classSuper.7.js b/tests/baselines/reference/esDecorators-classExpression-classSuper.7.js
@@ -2,7 +2,10 @@
 class A {}
 class B extends A {
 	public constructor() {
+		'inject';
 		super();
+		const a = 1;
+		const b = 1;
 	}
 
 	@foo
@@ -30,8 +33,11 @@ let B = (() => {
             __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() { }
     };

diff --git a/...ance/esDecorators/classExpression/classSuper/esDecorators-classExpression-classSuper.7.ts b/...ance/esDecorators/classExpression/classSuper/esDecorators-classExpression-classSuper.7.ts
@@ -5,7 +5,10 @@
 class A {}
 class B extends A {
 	public constructor() {
+		'inject';
 		super();
+		const a = 1;
+		const b = 1;
 	}
 
 	@foo