forked from microsoft/TypeScript
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Cherry-pick PR microsoft#35058 into release-3.7 (microsoft#35241)
Component commits: 8ae5a8c useDefineForClassFields skips emit of ambient properties Previously: ```ts class C { declare p } ``` would incorrectly emit ```js class C { constructor() { Object.defineProperty(this, "p", { enumerable: true, configurable: true, writable: true, value: void 0 }); } } ``` when useDefineForClassFields was turned on (for targets <ESNext). 0ec9c04 Fix bug for ESNext as well This moves the check earlier in the pipeline. e1aa034 update baselines
- Loading branch information
1 parent
b9d5231
commit d5bcb6f
Showing
11 changed files
with
196 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -6,6 +6,7 @@ class A { | |
["computed"] = 13 | ||
;[x] = 14 | ||
m() { } | ||
declare notEmitted: boolean; | ||
} | ||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -25,5 +25,8 @@ class A { | |
|
||
m() { } | ||
>m : () => void | ||
|
||
declare notEmitted: boolean; | ||
>notEmitted : boolean | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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)) | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,4 +7,5 @@ class A { | |
["computed"] = 13 | ||
;[x] = 14 | ||
m() { } | ||
declare notEmitted: boolean; | ||
} |
21 changes: 21 additions & 0 deletions
21
tests/cases/conformance/classes/propertyMemberDeclarations/definePropertyESNext.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
} |