More reliable mechanism for _this/_super simplification (#56130)

microsoft · Oct 24, 2023 · 8e37e4b · 8e37e4b
1 parent e5e7cbb
commit 8e37e4b
Show file tree

Hide file tree

Showing 38 changed files with 769 additions and 349 deletions.
diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts
@@ -1,5 +1,6 @@
 import {
     __String,
+    AccessorDeclaration,
     addRange,
     append,
     appendIfUnique,
@@ -1180,6 +1181,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
         mergeLexicalEnvironment,
         replaceModifiers,
         replaceDecoratorsAndModifiers,
+        replacePropertyName,
     };
 
     forEach(nodeFactoryPatchers, fn => fn(factory));
@@ -7149,6 +7151,26 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
             Debug.assertNever(node);
     }
 
+    function replacePropertyName<T extends AccessorDeclaration | MethodDeclaration | MethodSignature | PropertyDeclaration | PropertySignature | PropertyAssignment>(node: T, name: T["name"]): T;
+    function replacePropertyName(node: AccessorDeclaration | MethodDeclaration | MethodSignature | PropertyDeclaration | PropertySignature | PropertyAssignment, name: PropertyName) {
+        switch (node.kind) {
+            case SyntaxKind.GetAccessor:
+                return updateGetAccessorDeclaration(node, node.modifiers, name, node.parameters, node.type, node.body);
+            case SyntaxKind.SetAccessor:
+                return updateSetAccessorDeclaration(node, node.modifiers, name, node.parameters, node.body);
+            case SyntaxKind.MethodDeclaration:
+                return updateMethodDeclaration(node, node.modifiers, node.asteriskToken, name, node.questionToken, node.typeParameters, node.parameters, node.type, node.body);
+            case SyntaxKind.MethodSignature:
+                return updateMethodSignature(node, node.modifiers, name, node.questionToken, node.typeParameters, node.parameters, node.type);
+            case SyntaxKind.PropertyDeclaration:
+                return updatePropertyDeclaration(node, node.modifiers, name, node.questionToken ?? node.exclamationToken, node.type, node.initializer);
+            case SyntaxKind.PropertySignature:
+                return updatePropertySignature(node, node.modifiers, name, node.questionToken, node.type);
+            case SyntaxKind.PropertyAssignment:
+                return updatePropertyAssignment(node, name, node.initializer);
+        }
+    }
+
     function asNodeArray<T extends Node>(array: readonly T[]): NodeArray<T>;
     function asNodeArray<T extends Node>(array: readonly T[] | undefined): NodeArray<T> | undefined;
     function asNodeArray<T extends Node>(array: readonly T[] | undefined): NodeArray<T> | undefined {

diff --git a/src/compiler/transformers/es2015.ts b/src/compiler/transformers/es2015.ts
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
@@ -9080,6 +9080,10 @@ export interface NodeFactory {
      * Updates a node that may contain decorators or modifiers, replacing only the decorators and modifiers of the node.
      */
     replaceDecoratorsAndModifiers<T extends HasModifiers & HasDecorators>(node: T, modifiers: readonly ModifierLike[] | undefined): T;
+    /**
+     * Updates a node that contains a property name, replacing only the name of the node.
+     */
+    replacePropertyName<T extends AccessorDeclaration | MethodDeclaration | MethodSignature | PropertyDeclaration | PropertySignature | PropertyAssignment>(node: T, name: T["name"]): T;
 }
 
 /** @internal */

diff --git a/tests/baselines/reference/api/typescript.d.ts b/tests/baselines/reference/api/typescript.d.ts
@@ -8394,6 +8394,10 @@ declare namespace ts {
          * Updates a node that may contain decorators or modifiers, replacing only the decorators and modifiers of the node.
          */
         replaceDecoratorsAndModifiers<T extends HasModifiers & HasDecorators>(node: T, modifiers: readonly ModifierLike[] | undefined): T;
+        /**
+         * Updates a node that contains a property name, replacing only the name of the node.
+         */
+        replacePropertyName<T extends AccessorDeclaration | MethodDeclaration | MethodSignature | PropertyDeclaration | PropertySignature | PropertyAssignment>(node: T, name: T["name"]): T;
     }
     interface CoreTransformationContext {
         readonly factory: NodeFactory;

diff --git a/tests/baselines/reference/callWithSpread.js b/tests/baselines/reference/callWithSpread.js
@@ -136,8 +136,7 @@ var D = /** @class */ (function (_super) {
     __extends(D, _super);
     function D() {
         var _this = _super.call(this, 1, 2) || this;
-        _this = _super.apply(this, __spreadArray([1, 2], a, false)) || this;
-        return _this;
+        return _super.apply(this, __spreadArray([1, 2], a, false)) || this;
     }
     D.prototype.foo = function () {
         _super.prototype.foo.call(this, 1, 2);

diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing6.js
@@ -42,8 +42,7 @@ var Super = /** @class */ (function (_super) {
     function Super() {
         var _this = this;
         (function () { return _this; }); // No Error
-        _this = _super.call(this) || this;
-        return _this;
+        return _this = _super.call(this) || this;
     }
     return Super;
 }(Base));
diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing7.js
@@ -35,7 +35,7 @@ var Base = /** @class */ (function () {
 var Super = /** @class */ (function (_super) {
     __extends(Super, _super);
     function Super() {
-        var _this = _super.call(this, (function () { return _this; })) || this;
+        var _this = _super.call(this, (function () { return _this; })) || this; // No error
         return _this;
     }
     return Super;

diff --git a/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js b/tests/baselines/reference/checkSuperCallBeforeThisAccessing8.js
@@ -42,8 +42,7 @@ var Super = /** @class */ (function (_super) {
     function Super() {
         var _this = this;
         var that = _this;
-        _this = _super.call(this) || this;
-        return _this;
+        return _this = _super.call(this) || this;
     }
     return Super;
 }(Base));
diff --git a/tests/baselines/reference/classUpdateTests.js b/tests/baselines/reference/classUpdateTests.js
@@ -208,7 +208,7 @@ var I = /** @class */ (function (_super) {
 var J = /** @class */ (function (_super) {
     __extends(J, _super);
     function J(p1) {
-        var _this = _super.call(this) || this;
+        var _this = _super.call(this) || this; // NO ERROR
         _this.p1 = p1;
         return _this;
     }
@@ -228,7 +228,7 @@ var K = /** @class */ (function (_super) {
 var L = /** @class */ (function (_super) {
     __extends(L, _super);
     function L(p1) {
-        var _this = _super.call(this) || this;
+        var _this = _super.call(this) || this; // NO ERROR
         _this.p1 = p1;
         return _this;
     }

diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.js.map
diff --git a/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt b/tests/baselines/reference/derivedClassConstructorWithExplicitReturns01.sourcemap.txt
@@ -270,36 +270,27 @@ sourceFile:derivedClassConstructorWithExplicitReturns01.ts
 >>>        var _this = _super.call(this, a) || this;
 1->^^^^^^^^
 2 >        ^^^^^^^^^^^^
-3 >                    ^^^^^^^^^^^^^^^^^^
-4 >                                      ^
-5 >                                       ^
-6 >                                        ^^^^^^^^^
-7 >                                                 ^^^^->
-1->
-2 >        constructor(a = 100) {
-  >                
-3 >                    super(
-4 >                                      a
-5 >                                       )
-6 >                                        ;
-  >                                        
-  >                                                if (Math.random() < 0.5) {
-  >                                                    "You win!"
-  >                                                    return {
-  >                                                        cProp: 1,
-  >                                                        dProp: () => this,
-  >                                                        foo() { return "You win!!!!!" }
-  >                                                    };
-  >                                                }
-  >                                                else
-  >                                                    return null;
-  >                                            }
-1->Emitted(33, 9) Source(19, 5) + SourceIndex(0)
+3 >                    ^^^^^^
+4 >                          ^^^^^^^^^^^^
+5 >                                      ^
+6 >                                       ^
+7 >                                        ^^^^^^^^^
+8 >                                                 ^^^^->
+1->) {
+  >        
+2 >        
+3 >                    super
+4 >                          (
+5 >                                      a
+6 >                                       )
+7 >                                        ;
+1->Emitted(33, 9) Source(20, 9) + SourceIndex(0)
 2 >Emitted(33, 21) Source(20, 9) + SourceIndex(0)
-3 >Emitted(33, 39) Source(20, 15) + SourceIndex(0)
-4 >Emitted(33, 40) Source(20, 16) + SourceIndex(0)
-5 >Emitted(33, 41) Source(20, 17) + SourceIndex(0)
-6 >Emitted(33, 50) Source(32, 6) + SourceIndex(0)
+3 >Emitted(33, 27) Source(20, 14) + SourceIndex(0)
+4 >Emitted(33, 39) Source(20, 15) + SourceIndex(0)
+5 >Emitted(33, 40) Source(20, 16) + SourceIndex(0)
+6 >Emitted(33, 41) Source(20, 17) + SourceIndex(0)
+7 >Emitted(33, 50) Source(20, 18) + SourceIndex(0)
 ---
 >>>        _this.dProp = function () { return _this; };
 1->^^^^^^^^

diff --git a/tests/baselines/reference/derivedClassParameterProperties.js b/tests/baselines/reference/derivedClassParameterProperties.js
@@ -174,8 +174,7 @@ var Derived6 = /** @class */ (function (_super) {
         var _this = this;
         _this.a = 1;
         var b = 2;
-        _this = _super.call(this) || this;
-        return _this;
+        return _this = _super.call(this) || this;
     }
     return Derived6;
 }(Base));