Put parameter property initialiser into defineProperty's value

sandersn · sandersn · commit ec7959091ad9 · 2019-11-11T14:38:28.000-08:00
diff --git a/src/compiler/transformers/classFields.ts b/src/compiler/transformers/classFields.ts
@@ -326,10 +326,6 @@ namespace ts {
             if (constructor) {
                 indexOfFirstStatement = addPrologueDirectivesAndInitialSuperCall(constructor, statements, visitor);
             }
-            if (useDefineForClassFields) {
-                addPropertyStatements(statements, properties, createThis());
-            }
-
             // Add the property initializers. Transforms this:
             //
             //  public x = 1;
@@ -341,23 +337,18 @@ namespace ts {
             //  }
             //
             if (constructor?.body) {
-                let parameterPropertyDeclarationCount = 0;
-                for (let i = indexOfFirstStatement; i < constructor.body.statements.length; i++) {
-                    if (isParameterPropertyDeclaration(getOriginalNode(constructor.body.statements[i]), constructor)) {
-                        parameterPropertyDeclarationCount++;
-                    }
-                    else {
-                        break;
-                    }
+                let afterParameterProperties = findIndex(constructor.body.statements, s => !isParameterPropertyDeclaration(getOriginalNode(s), constructor), indexOfFirstStatement);
+                if (afterParameterProperties === -1) {
+                    afterParameterProperties = constructor.body.statements.length;
                 }
-                if (parameterPropertyDeclarationCount > 0) {
-                    addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, indexOfFirstStatement, parameterPropertyDeclarationCount));
-                    indexOfFirstStatement += parameterPropertyDeclarationCount;
+                if (afterParameterProperties > indexOfFirstStatement) {
+                    if (!useDefineForClassFields) {
+                        addRange(statements, visitNodes(constructor.body.statements, visitor, isStatement, indexOfFirstStatement, afterParameterProperties - indexOfFirstStatement));
+                    }
+                    indexOfFirstStatement = afterParameterProperties;
                 }
             }
-            if (!useDefineForClassFields) {
-                addPropertyStatements(statements, properties, createThis());
-            }
+            addPropertyStatements(statements, properties, createThis());
 
             // Add existing statements, skipping the initial super call.
             if (constructor) {
@@ -427,7 +418,9 @@ namespace ts {
                 ? updateComputedPropertyName(property.name, getGeneratedNameForNode(property.name))
                 : property.name;
 
-            const initializer = property.initializer || emitAssignment ? visitNode(property.initializer, visitor, isExpression) : createVoidZero();
+            const initializer = property.initializer || emitAssignment ? visitNode(property.initializer, visitor, isExpression)
+                : hasModifier(getOriginalNode(property), ModifierFlags.ParameterPropertyModifier) && isIdentifier(propertyName) ? propertyName
+                : createVoidZero();
             if (emitAssignment) {
                 const memberAccess = createMemberAccessForPropertyName(receiver, propertyName, /*location*/ propertyName);
                 return createAssignment(memberAccess, initializer);
diff --git a/src/compiler/transformers/ts.ts b/src/compiler/transformers/ts.ts
@@ -900,13 +900,13 @@ namespace ts {
             if (parametersWithPropertyAssignments) {
                 for (const parameter of parametersWithPropertyAssignments) {
                     if (isIdentifier(parameter.name)) {
-                        members.push(aggregateTransformFlags(createProperty(
+                        members.push(setOriginalNode(aggregateTransformFlags(createProperty(
                             /*decorators*/ undefined,
                             /*modifiers*/ undefined,
                             parameter.name,
                             /*questionOrExclamationToken*/ undefined,
                             /*type*/ undefined,
-                            /*initializer*/ undefined)));
+                            /*initializer*/ undefined)), parameter));
                     }
                 }
             }
diff --git a/tests/baselines/reference/definePropertyES5.js b/tests/baselines/reference/definePropertyES5.js
@@ -1,12 +1,13 @@
 //// [definePropertyES5.ts]
 var x: "p" = "p"
 class A {
-    a = 12
+    a = this.y
     b
     ["computed"] = 13
     ;[x] = 14
     m() { }
     constructor(public readonly y: number) { }
+    z = this.y
 }
 
 
@@ -19,13 +20,13 @@ var A = /** @class */ (function () {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: y
         });
         Object.defineProperty(this, "a", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: 12
+            value: this.y
         });
         Object.defineProperty(this, "b", {
             enumerable: true,
@@ -45,7 +46,12 @@ var A = /** @class */ (function () {
             writable: true,
             value: 14
         });
-        this.y = y;
+        Object.defineProperty(this, "z", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: this.y
+        });
     }
     Object.defineProperty(A.prototype, "m", {
         enumerable: false,
diff --git a/tests/baselines/reference/definePropertyES5.symbols b/tests/baselines/reference/definePropertyES5.symbols
@@ -5,11 +5,14 @@ var x: "p" = "p"
 class A {
 >A : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
 
-    a = 12
+    a = this.y
 >a : Symbol(A.a, Decl(definePropertyES5.ts, 1, 9))
+>this.y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
+>this : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
+>y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
 
     b
->b : Symbol(A.b, Decl(definePropertyES5.ts, 2, 10))
+>b : Symbol(A.b, Decl(definePropertyES5.ts, 2, 14))
 
     ["computed"] = 13
 >["computed"] : Symbol(A["computed"], Decl(definePropertyES5.ts, 3, 5))
@@ -23,6 +26,12 @@ class A {
 >m : Symbol(A.m, Decl(definePropertyES5.ts, 5, 13))
 
     constructor(public readonly y: number) { }
+>y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
+
+    z = this.y
+>z : Symbol(A.z, Decl(definePropertyES5.ts, 7, 46))
+>this.y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
+>this : Symbol(A, Decl(definePropertyES5.ts, 0, 16))
 >y : Symbol(A.y, Decl(definePropertyES5.ts, 7, 16))
 }
 
diff --git a/tests/baselines/reference/definePropertyES5.types b/tests/baselines/reference/definePropertyES5.types
@@ -6,9 +6,11 @@ var x: "p" = "p"
 class A {
 >A : A
 
-    a = 12
+    a = this.y
 >a : number
->12 : 12
+>this.y : number
+>this : this
+>y : number
 
     b
 >b : any
@@ -27,6 +29,12 @@ class A {
 >m : () => void
 
     constructor(public readonly y: number) { }
+>y : number
+
+    z = this.y
+>z : number
+>this.y : number
+>this : this
 >y : number
 }
 
diff --git a/tests/baselines/reference/definePropertyESNext.js b/tests/baselines/reference/definePropertyESNext.js
@@ -11,10 +11,11 @@ class A {
 class B {
 }
 class C extends B {
-    z = 1
+    z = this.ka
     constructor(public ka: number) {
         super()
     }
+    ki = this.ka
 }
 
 
@@ -35,9 +36,10 @@ class B {
 }
 class C extends B {
     ka;
-    z = 1;
+    z = this.ka;
     constructor(ka) {
         super();
         this.ka = ka;
     }
+    ki = this.ka;
 }
diff --git a/tests/baselines/reference/definePropertyESNext.symbols b/tests/baselines/reference/definePropertyESNext.symbols
@@ -32,14 +32,22 @@ class C extends B {
 >C : Symbol(C, Decl(definePropertyESNext.ts, 10, 1))
 >B : Symbol(B, Decl(definePropertyESNext.ts, 8, 1))
 
-    z = 1
+    z = this.ka
 >z : Symbol(C.z, Decl(definePropertyESNext.ts, 11, 19))
+>this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 13, 16))
+>this : Symbol(C, Decl(definePropertyESNext.ts, 10, 1))
+>ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 13, 16))
 
     constructor(public ka: number) {
 >ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 13, 16))
 
         super()
 >super : Symbol(B, Decl(definePropertyESNext.ts, 8, 1))
     }
+    ki = this.ka
+>ki : Symbol(C.ki, Decl(definePropertyESNext.ts, 15, 5))
+>this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 13, 16))
+>this : Symbol(C, Decl(definePropertyESNext.ts, 10, 1))
+>ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 13, 16))
 }
 
diff --git a/tests/baselines/reference/definePropertyESNext.types b/tests/baselines/reference/definePropertyESNext.types
@@ -36,9 +36,11 @@ class C extends B {
 >C : C
 >B : B
 
-    z = 1
+    z = this.ka
 >z : number
->1 : 1
+>this.ka : number
+>this : this
+>ka : number
 
     constructor(public ka: number) {
 >ka : number
@@ -47,5 +49,10 @@ class C extends B {
 >super() : void
 >super : typeof B
     }
+    ki = this.ka
+>ki : number
+>this.ka : number
+>this : this
+>ka : number
 }
 
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyES5.ts
@@ -2,10 +2,11 @@
 // @useDefineForClassFields: true
 var x: "p" = "p"
 class A {
-    a = 12
+    a = this.y
     b
     ["computed"] = 13
     ;[x] = 14
     m() { }
     constructor(public readonly y: number) { }
+    z = this.y
 }
diff --git a/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts b/tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts
@@ -12,8 +12,9 @@ class A {
 class B {
 }
 class C extends B {
-    z = 1
+    z = this.ka
     constructor(public ka: number) {
         super()
     }
+    ki = this.ka
 }

Original file line number	Diff line number	Diff line change
`@@ -900,13 +900,13 @@ namespace ts {`
`900`	`900`	`if (parametersWithPropertyAssignments) {`
`901`	`901`	`for (const parameter of parametersWithPropertyAssignments) {`
`902`	`902`	`if (isIdentifier(parameter.name)) {`
`903`		`- members.push(aggregateTransformFlags(createProperty(`
	`903`	`+ members.push(setOriginalNode(aggregateTransformFlags(createProperty(`
`904`	`904`	`/decorators/ undefined,`
`905`	`905`	`/modifiers/ undefined,`
`906`	`906`	`parameter.name,`
`907`	`907`	`/questionOrExclamationToken/ undefined,`
`908`	`908`	`/type/ undefined,`
`909`		`- /initializer/ undefined)));`
	`909`	`+ /initializer/ undefined)), parameter));`
`910`	`910`	`}`
`911`	`911`	`}`
`912`	`912`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,10 +11,11 @@ class A {`
`11`	`11`	`class B {`
`12`	`12`	`}`
`13`	`13`	`class C extends B {`
`14`		`- z = 1`
	`14`	`+ z = this.ka`
`15`	`15`	`constructor(public ka: number) {`
`16`	`16`	`super()`
`17`	`17`	`}`
	`18`	`+ ki = this.ka`
`18`	`19`	`}`
`19`	`20`
`20`	`21`
`@@ -35,9 +36,10 @@ class B {`
`35`	`36`	`}`
`36`	`37`	`class C extends B {`
`37`	`38`	`ka;`
`38`		`- z = 1;`
	`39`	`+ z = this.ka;`
`39`	`40`	`constructor(ka) {`
`40`	`41`	`super();`
`41`	`42`	`this.ka = ka;`
`42`	`43`	`}`
	`44`	`+ ki = this.ka;`
`43`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,11 @@`
`2`	`2`	`// @useDefineForClassFields: true`
`3`	`3`	`var x: "p" = "p"`
`4`	`4`	`class A {`
`5`		`- a = 12`
	`5`	`+ a = this.y`
`6`	`6`	`b`
`7`	`7`	`["computed"] = 13`
`8`	`8`	`;[x] = 14`
`9`	`9`	`m() { }`
`10`	`10`	`constructor(public readonly y: number) { }`
	`11`	`+ z = this.y`
`11`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,9 @@ class A {`
`12`	`12`	`class B {`
`13`	`13`	`}`
`14`	`14`	`class C extends B {`
`15`		`- z = 1`
	`15`	`+ z = this.ka`
`16`	`16`	`constructor(public ka: number) {`
`17`	`17`	`super()`
`18`	`18`	`}`
	`19`	`+ ki = this.ka`
`19`	`20`	`}`