Fix bug for ESNext as well

This moves the check earlier in the pipeline.

Author: sandersn

src/compiler/transformers/ts.ts

@@ -1873,6 +1873,9 @@ namespace ts {
         }
 
         function visitPropertyDeclaration(node: PropertyDeclaration) {
+            if (node.flags & NodeFlags.Ambient) {
+                return undefined;
+            }
             const updated = updateProperty(
                 node,
                 /*decorators*/ undefined,

src/compiler/transformers/utilities.ts

@@ -314,7 +314,7 @@ namespace ts {
      */
     function isInitializedOrStaticProperty(member: ClassElement, requireInitializer: boolean, isStatic: boolean) {
         return isPropertyDeclaration(member)
-            && (!!member.initializer || !requireInitializer && !(getOriginalNode(member).flags & NodeFlags.Ambient))
+            && (!!member.initializer || !requireInitializer)
             && hasStaticModifier(member) === isStatic;
     }
 

tests/baselines/reference/definePropertyESNext.js

@@ -0,0 +1,46 @@
+//// [definePropertyESNext.ts]
+var x: "p" = "p"
+class A {
+    a = 12
+    b
+    ["computed"] = 13
+    ;[x] = 14
+    m() { }
+    constructor(public readonly y: number) { }
+    declare notEmitted;
+}
+class B {
+}
+class C extends B {
+    z = this.ka
+    constructor(public ka: number) {
+        super()
+    }
+    ki = this.ka
+}
+
+
+//// [definePropertyESNext.js]
+var x = "p";
+class A {
+    y;
+    a = 12;
+    b;
+    ["computed"] = 13;
+    [x] = 14;
+    m() { }
+    constructor(y) {
+        this.y = y;
+    }
+}
+class B {
+}
+class C extends B {
+    ka;
+    z = this.ka;
+    constructor(ka) {
+        super();
+        this.ka = ka;
+    }
+    ki = this.ka;
+}

tests/baselines/reference/definePropertyESNext.symbols

@@ -0,0 +1,56 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts ===
+var x: "p" = "p"
+>x : Symbol(x, Decl(definePropertyESNext.ts, 0, 3))
+
+class A {
+>A : Symbol(A, Decl(definePropertyESNext.ts, 0, 16))
+
+    a = 12
+>a : Symbol(A.a, Decl(definePropertyESNext.ts, 1, 9))
+
+    b
+>b : Symbol(A.b, Decl(definePropertyESNext.ts, 2, 10))
+
+    ["computed"] = 13
+>["computed"] : Symbol(A["computed"], Decl(definePropertyESNext.ts, 3, 5))
+>"computed" : Symbol(A["computed"], Decl(definePropertyESNext.ts, 3, 5))
+
+    ;[x] = 14
+>[x] : Symbol(A[x], Decl(definePropertyESNext.ts, 5, 5))
+>x : Symbol(x, Decl(definePropertyESNext.ts, 0, 3))
+
+    m() { }
+>m : Symbol(A.m, Decl(definePropertyESNext.ts, 5, 13))
+
+    constructor(public readonly y: number) { }
+>y : Symbol(A.y, Decl(definePropertyESNext.ts, 7, 16))
+
+    declare notEmitted;
+>notEmitted : Symbol(A.notEmitted, Decl(definePropertyESNext.ts, 7, 46))
+}
+class B {
+>B : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
+}
+class C extends B {
+>C : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
+>B : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
+
+    z = this.ka
+>z : Symbol(C.z, Decl(definePropertyESNext.ts, 12, 19))
+>this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
+>this : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
+>ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
+
+    constructor(public ka: number) {
+>ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
+
+        super()
+>super : Symbol(B, Decl(definePropertyESNext.ts, 9, 1))
+    }
+    ki = this.ka
+>ki : Symbol(C.ki, Decl(definePropertyESNext.ts, 16, 5))
+>this.ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
+>this : Symbol(C, Decl(definePropertyESNext.ts, 11, 1))
+>ka : Symbol(C.ka, Decl(definePropertyESNext.ts, 14, 16))
+}
+

tests/baselines/reference/definePropertyESNext.types

@@ -0,0 +1,61 @@
+=== tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts ===
+var x: "p" = "p"
+>x : "p"
+>"p" : "p"
+
+class A {
+>A : A
+
+    a = 12
+>a : number
+>12 : 12
+
+    b
+>b : any
+
+    ["computed"] = 13
+>["computed"] : number
+>"computed" : "computed"
+>13 : 13
+
+    ;[x] = 14
+>[x] : number
+>x : "p"
+>14 : 14
+
+    m() { }
+>m : () => void
+
+    constructor(public readonly y: number) { }
+>y : number
+
+    declare notEmitted;
+>notEmitted : any
+}
+class B {
+>B : B
+}
+class C extends B {
+>C : C
+>B : B
+
+    z = this.ka
+>z : number
+>this.ka : number
+>this : this
+>ka : number
+
+    constructor(public ka: number) {
+>ka : number
+
+        super()
+>super() : void
+>super : typeof B
+    }
+    ki = this.ka
+>ki : number
+>this.ka : number
+>this : this
+>ka : number
+}
+

tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts

@@ -0,0 +1,21 @@
+// @target: esnext
+// @useDefineForClassFields: true
+var x: "p" = "p"
+class A {
+    a = 12
+    b
+    ["computed"] = 13
+    ;[x] = 14
+    m() { }
+    constructor(public readonly y: number) { }
+    declare notEmitted;
+}
+class B {
+}
+class C extends B {
+    z = this.ka
+    constructor(public ka: number) {
+        super()
+    }
+    ki = this.ka
+}