";
+ > }
+ >
+ > @PropertyDecorator1
+ > @PropertyDecorator2(50)
+ > private x: string;
+ >
+ > @PropertyDecorator1
+ > @PropertyDecorator2(60)
+ > private static x1: number = 10;
>
- > set greetings(
- > @ParameterDecorator1
- > @ParameterDecorator2(90)
- > greetings: string) {
- > this.greeting = greetings;
- > }
- > }
-1 >Emitted(58, 8) Source(10, 7) + SourceIndex(0)
-2 >Emitted(58, 15) Source(10, 14) + SourceIndex(0)
-3 >Emitted(58, 16) Source(54, 2) + SourceIndex(0)
----
->>> return Greeter;
-1->^^^^
-2 > ^^^^^^^^^^^^^^
-1->
-2 > }
-1->Emitted(59, 5) Source(54, 1) + SourceIndex(0)
-2 >Emitted(59, 19) Source(54, 2) + SourceIndex(0)
----
->>>})();
-1 >^^^^^
-2 > ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^->
-1 >
-1 >Emitted(60, 6) Source(54, 2) + SourceIndex(0)
+ > private fn(
+ > @ParameterDecorator1
+ > @ParameterDecorator2(70)
+ > x: number) {
+ > return this.greeting;
+ > }
+ >
+ > @PropertyDecorator1
+ > @PropertyDecorator2(80)
+ > get greetings() {
+ > return this.greeting;
+ > }
+ >
+ > set greetings(
+ > @ParameterDecorator1
+ > @ParameterDecorator2(90)
+ > greetings: string) {
+ > this.greeting = greetings;
+ > }
+ > }
+1 >Emitted(57, 4) Source(10, 7) + SourceIndex(0)
+2 >Emitted(57, 11) Source(10, 14) + SourceIndex(0)
+3 >Emitted(57, 12) Source(54, 2) + SourceIndex(0)
---
>>>//# sourceMappingURL=sourceMapValidationDecorators.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
index d26c99df8fa68..839972402f431 100644
--- a/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
+++ b/tests/baselines/reference/staticAnonymousTypeNotReferencingTypeParameter.js
@@ -147,12 +147,9 @@ interface Array {
// This test case is a condensed version of Angular 2's ListWrapper. Prior to #7448
// this would cause the compiler to run out of memory.
function outer(x) {
- let Inner = (() => {
- class Inner {
- }
- Inner.y = x;
- return Inner;
- })();
+ class Inner {
+ }
+ Inner.y = x;
return Inner;
}
let y = outer(5).y;
diff --git a/tests/baselines/reference/staticClassProps.js b/tests/baselines/reference/staticClassProps.js
index 80ecefae21612..83affe0279c5e 100644
--- a/tests/baselines/reference/staticClassProps.js
+++ b/tests/baselines/reference/staticClassProps.js
@@ -11,11 +11,8 @@ class C
//// [staticClassProps.js]
-let C = (() => {
- class C {
- foo() {
- }
+class C {
+ foo() {
}
- C.z = 1;
- return C;
-})();
+}
+C.z = 1;
diff --git a/tests/baselines/reference/staticIndexSignature7.js b/tests/baselines/reference/staticIndexSignature7.js
index 6ef85b267004d..7a65eb787c283 100644
--- a/tests/baselines/reference/staticIndexSignature7.js
+++ b/tests/baselines/reference/staticIndexSignature7.js
@@ -13,12 +13,9 @@ class Y {
//// [staticIndexSignature7.js]
"use strict";
-let X = (() => {
- class X {
- }
- X.x = 12; // Should error, incompatible with index signature
- return X;
-})();
+class X {
+}
+X.x = 12; // Should error, incompatible with index signature
class Y {
static foo() { } // should error, incompatible with index signature
}
diff --git a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
index 0b6b5289bb328..0bd22dc998305 100644
--- a/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
+++ b/tests/baselines/reference/staticMemberAccessOffDerivedType1.js
@@ -17,9 +17,6 @@ class SomeBase {
return 2;
}
}
-let P = (() => {
- class P extends SomeBase {
- }
- P.SomeNumber = P.GetNumber();
- return P;
-})();
+class P extends SomeBase {
+}
+P.SomeNumber = P.GetNumber();
diff --git a/tests/baselines/reference/staticMemberInitialization.js b/tests/baselines/reference/staticMemberInitialization.js
index 56e49139dc76b..822ec9d04b14f 100644
--- a/tests/baselines/reference/staticMemberInitialization.js
+++ b/tests/baselines/reference/staticMemberInitialization.js
@@ -9,11 +9,8 @@ var c = new C();
var r = C.x;
//// [staticMemberInitialization.js]
-let C = (() => {
- class C {
- }
- C.x = 1;
- return C;
-})();
+class C {
+}
+C.x = 1;
var c = new C();
var r = C.x;
diff --git a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
index b66c0901ff6a4..37dcf65bf3567 100644
--- a/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
+++ b/tests/baselines/reference/staticMemberWithStringAndNumberNames.js
@@ -15,18 +15,15 @@ class C {
}
//// [staticMemberWithStringAndNumberNames.js]
-let C = (() => {
- class C {
- constructor() {
- this.x = C['foo'];
- this.x2 = C['0'];
- this.x3 = C[0];
- }
+class C {
+ constructor() {
+ this.x = C['foo'];
+ this.x2 = C['0'];
+ this.x3 = C[0];
}
- C["foo"] = 0;
- C[0] = 1;
- C.s = C['foo'];
- C.s2 = C['0'];
- C.s3 = C[0];
- return C;
-})();
+}
+C["foo"] = 0;
+C[0] = 1;
+C.s = C['foo'];
+C.s2 = C['0'];
+C.s3 = C[0];
diff --git a/tests/baselines/reference/staticPropSuper.js b/tests/baselines/reference/staticPropSuper.js
index c371000d0434d..661829e5c26cb 100644
--- a/tests/baselines/reference/staticPropSuper.js
+++ b/tests/baselines/reference/staticPropSuper.js
@@ -40,16 +40,13 @@ class E extends A {
//// [staticPropSuper.js]
class A {
}
-let B = (() => {
- class B extends A {
- constructor() {
- var x = 1; // should not error
- super();
- }
+class B extends A {
+ constructor() {
+ var x = 1; // should not error
+ super();
}
- B.s = 9;
- return B;
-})();
+}
+B.s = 9;
class C extends A {
constructor() {
this.p = 10;
diff --git a/tests/baselines/reference/statics.js b/tests/baselines/reference/statics.js
index c9909c0b29ba4..6499a88ef54ae 100644
--- a/tests/baselines/reference/statics.js
+++ b/tests/baselines/reference/statics.js
@@ -36,23 +36,20 @@ M.f();
//// [statics.js]
var M;
(function (M) {
- let C = (() => {
- class C {
- constructor(c1, c2, c3) {
- this.c1 = c1;
- this.c2 = c2;
- this.x = C.y + this.c1 + this.c2 + c3;
- this.g = (v) => C.f(this.x + C.y + v + this.c1 + this.c2 + C.pub);
- }
- static f(n) {
- return "wow: " + (n + C.y + C.pub + C.priv);
- }
+ class C {
+ constructor(c1, c2, c3) {
+ this.c1 = c1;
+ this.c2 = c2;
+ this.x = C.y + this.c1 + this.c2 + c3;
+ this.g = (v) => C.f(this.x + C.y + v + this.c1 + this.c2 + C.pub);
}
- C.priv = 2;
- C.pub = 3;
- C.y = C.priv;
- return C;
- })();
+ static f(n) {
+ return "wow: " + (n + C.y + C.pub + C.priv);
+ }
+ }
+ C.priv = 2;
+ C.pub = 3;
+ C.y = C.priv;
M.C = C;
var c = C.y;
function f() {
diff --git a/tests/baselines/reference/staticsInConstructorBodies.js b/tests/baselines/reference/staticsInConstructorBodies.js
index ccf5c159e5b7b..fc21c74b77d9c 100644
--- a/tests/baselines/reference/staticsInConstructorBodies.js
+++ b/tests/baselines/reference/staticsInConstructorBodies.js
@@ -9,12 +9,9 @@ class C {
}
//// [staticsInConstructorBodies.js]
-let C = (() => {
- class C {
- constructor() {
- }
- static m1() { } // ERROR
+class C {
+ constructor() {
}
- C.p1 = 0; // ERROR
- return C;
-})();
+ static m1() { } // ERROR
+}
+C.p1 = 0; // ERROR
diff --git a/tests/baselines/reference/staticsNotInScopeInClodule.js b/tests/baselines/reference/staticsNotInScopeInClodule.js
index c35a08a9576fd..9f1d2d2e08b07 100644
--- a/tests/baselines/reference/staticsNotInScopeInClodule.js
+++ b/tests/baselines/reference/staticsNotInScopeInClodule.js
@@ -10,12 +10,9 @@ module Clod {
}
//// [staticsNotInScopeInClodule.js]
-let Clod = (() => {
- class Clod {
- }
- Clod.x = 10;
- return Clod;
-})();
+class Clod {
+}
+Clod.x = 10;
(function (Clod) {
var p = x; // x isn't in scope here
})(Clod || (Clod = {}));
diff --git a/tests/baselines/reference/strictModeInConstructor.js b/tests/baselines/reference/strictModeInConstructor.js
index 930fb92883b3d..bce5397b8954e 100644
--- a/tests/baselines/reference/strictModeInConstructor.js
+++ b/tests/baselines/reference/strictModeInConstructor.js
@@ -89,34 +89,25 @@ class D extends A {
"use strict";
}
}
-let Bs = (() => {
- class Bs extends A {
- constructor() {
- "use strict"; // No error
- super();
- }
+class Bs extends A {
+ constructor() {
+ "use strict"; // No error
+ super();
}
- Bs.s = 9;
- return Bs;
-})();
-let Cs = (() => {
- class Cs extends A {
- constructor() {
- super(); // No error
- "use strict";
- }
+}
+Bs.s = 9;
+class Cs extends A {
+ constructor() {
+ super(); // No error
+ "use strict";
}
- Cs.s = 9;
- return Cs;
-})();
-let Ds = (() => {
- class Ds extends A {
- constructor() {
- var x = 1; // no Error
- super();
- "use strict";
- }
+}
+Cs.s = 9;
+class Ds extends A {
+ constructor() {
+ var x = 1; // no Error
+ super();
+ "use strict";
}
- Ds.s = 9;
- return Ds;
-})();
+}
+Ds.s = 9;
diff --git a/tests/baselines/reference/superAccess.js b/tests/baselines/reference/superAccess.js
index ee7351f607b84..33d1dfcac144f 100644
--- a/tests/baselines/reference/superAccess.js
+++ b/tests/baselines/reference/superAccess.js
@@ -16,16 +16,13 @@ class MyDerived extends MyBase {
}
//// [superAccess.js]
-let MyBase = (() => {
- class MyBase {
- constructor() {
- this.S2 = "test";
- this.f = () => 5;
- }
+class MyBase {
+ constructor() {
+ this.S2 = "test";
+ this.f = () => 5;
}
- MyBase.S1 = 5;
- return MyBase;
-})();
+}
+MyBase.S1 = 5;
class MyDerived extends MyBase {
foo() {
var l3 = super.S1; // Expected => Error: Only public instance methods of the base class are accessible via the 'super' keyword
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index b9209565a98da..0c3109a23c5c2 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -31,24 +31,21 @@ class P {
x() { }
static y() { }
}
-let Q = (() => {
- class Q extends P {
- // Super is not allowed in constructor args
- constructor(z = super., zz = super., zzz = () => super.) {
- super();
- this.z = z;
- this.xx = super.;
- }
- foo(zz = super.) {
- super.x();
- super.y(); // error
- }
- static bar(zz = super.) {
- super.x(); // error
- super.y();
- }
+class Q extends P {
+ // Super is not allowed in constructor args
+ constructor(z = super., zz = super., zzz = () => super.) {
+ super();
+ this.z = z;
+ this.xx = super.;
}
- Q.yy = super. // error for static initializer accessing super
- ; // error for static initializer accessing super
- return Q;
-})();
+ foo(zz = super.) {
+ super.x();
+ super.y(); // error
+ }
+ static bar(zz = super.) {
+ super.x(); // error
+ super.y();
+ }
+}
+Q.yy = super. // error for static initializer accessing super
+; // error for static initializer accessing super
diff --git a/tests/baselines/reference/superInStaticMembers1(target=es5).js b/tests/baselines/reference/superInStaticMembers1(target=es5).js
index ef9fbd19731e2..ac79d84cc1479 100644
--- a/tests/baselines/reference/superInStaticMembers1(target=es5).js
+++ b/tests/baselines/reference/superInStaticMembers1(target=es5).js
@@ -504,143 +504,131 @@ exports.default = default_1;
;
//// [locals.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = [
- (() => {
- var Reflect; // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- var [Reflect] = [null]; // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- class Reflect {
- } // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- function Reflect() { } // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- let Reflect;
- (function (Reflect) {
- })(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
- super.w();
- })(),
- (() => {
- super.w();
- })(),
- (() => {
- super.w();
- })(),
- (() => {
- ; // no collision
- super.w();
- })(),
- (() => {
- (class Reflect {
- }); // no collision
- super.w();
- })(),
- (() => {
- (function Reflect() { }); // no collision
- super.w();
- })(),
- ];
+class C extends B {
+}
+_a = C;
+C._ = [
(() => {
- var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ var Reflect; // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
- var [Reflect] = [null]; // collision (es2015-es2021 only)
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
- var Reflect; // collision (es2015-es2021 only)
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
class Reflect {
} // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
function Reflect() { } // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
let Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
super.w();
- })();
+ })(),
(() => {
super.w();
- })();
+ })(),
(() => {
super.w();
- })();
+ })(),
(() => {
+ ; // no collision
super.w();
- })();
+ })(),
(() => {
(class Reflect {
}); // no collision
super.w();
- })();
+ })(),
(() => {
(function Reflect() { }); // no collision
super.w();
- })();
- return C;
+ })(),
+];
+(() => {
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ var Reflect; // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ class Reflect {
+ } // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ function Reflect() { } // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ let Reflect;
+ (function (Reflect) {
+ })(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
+ super.w();
+})();
+(() => {
+ super.w();
+})();
+(() => {
+ super.w();
+})();
+(() => {
+ super.w();
+})();
+(() => {
+ (class Reflect {
+ }); // no collision
+ super.w();
+})();
+(() => {
+ (function Reflect() { }); // no collision
+ super.w();
})();
//// [varInContainingScopeStaticField1.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect = null; // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [varInContainingScopeStaticField2.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [varInContainingScopeStaticField3.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
var [Reflect] = [null]; // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [varInContainingScopeStaticBlock1.js]
"use strict";
var _a;
@@ -676,17 +664,14 @@ _a = C;
})();
//// [classDeclInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
class Reflect {
} // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [classDeclInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -701,16 +686,13 @@ _a = C;
})();
//// [funcDeclInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
function Reflect() { } // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [funcDeclInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -724,15 +706,12 @@ _a = C;
})();
//// [valueNamespaceInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [valueNamespaceInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -745,18 +724,15 @@ _a = C;
})();
//// [enumInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [enumInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -772,15 +748,12 @@ _a = C;
})();
//// [constEnumInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [constEnumInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -793,15 +766,12 @@ _a = C;
})();
//// [namespaceImportInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [namespaceImportInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -814,15 +784,12 @@ _a = C;
})();
//// [namedImportInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [namedImportInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -835,15 +802,12 @@ _a = C;
})();
//// [namedImportOfInterfaceInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [namedImportOfInterfaceInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -856,15 +820,12 @@ _a = C;
})();
//// [namedImportOfUninstantiatedNamespaceInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [namedImportOfUninstantiatedNamespaceInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -877,15 +838,12 @@ _a = C;
})();
//// [namedImportOfConstEnumInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [namedImportOfConstEnumInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -898,15 +856,12 @@ _a = C;
})();
//// [typeOnlyNamedImportInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [typeOnlyNamedImportInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -919,15 +874,12 @@ _a = C;
})();
//// [defaultImportInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [defaultImportInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -940,15 +892,12 @@ _a = C;
})();
//// [typeOnlyDefaultImportInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [typeOnlyDefaultImportInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -961,15 +910,12 @@ _a = C;
})();
//// [typeInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [typeInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -982,16 +928,13 @@ _a = C;
})();
//// [interfaceInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [interfaceInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -1005,16 +948,13 @@ _a = C;
})();
//// [uninstantiatedNamespaceInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [uninstantiatedNamespaceInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -1028,17 +968,14 @@ _a = C;
})();
//// [classExprInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
(class Reflect {
}); // no collision
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [classExprInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -1058,14 +995,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
(_a = class Reflect {
},
(() => {
- let C = (() => {
- var _b;
- class C extends B {
- }
- _b = C;
- C._ = super.w();
- return C;
- })();
+ var _b;
+ class C extends B {
+ }
+ _b = C;
+ C._ = super.w();
})(),
_a);
//// [inContainingClassExprStaticBlock.js]
@@ -1086,16 +1020,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
_a);
//// [funcExprInContainingScopeStaticField.js]
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() { }); // no collision
-let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
-})();
+class C extends B {
+}
+_a = C;
+C._ = super.w();
//// [funcExprInContainingScopeStaticBlock.js]
"use strict";
var _a;
@@ -1111,14 +1042,11 @@ _a = C;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() {
- let C = (() => {
- var _a;
- class C extends B {
- }
- _a = C;
- C._ = super.w();
- return C;
- })();
+ var _a;
+ class C extends B {
+ }
+ _a = C;
+ C._ = super.w();
});
//// [inContainingFuncExprStaticBlock.js]
"use strict";
diff --git a/tests/baselines/reference/targetEs6DecoratorMetadataImportNotElided.js b/tests/baselines/reference/targetEs6DecoratorMetadataImportNotElided.js
index 683c0ae0ed7ca..8e0fca5029de2 100644
--- a/tests/baselines/reference/targetEs6DecoratorMetadataImportNotElided.js
+++ b/tests/baselines/reference/targetEs6DecoratorMetadataImportNotElided.js
@@ -31,16 +31,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
import { Input, TemplateRef } from './deps';
-let MyComponent = (() => {
- class MyComponent {
- get ref() { return this._ref; }
- set ref(value) { this._ref = value; }
- }
- __decorate([
- Input(),
- __metadata("design:type", TemplateRef),
- __metadata("design:paramtypes", [TemplateRef])
- ], MyComponent.prototype, "ref", null);
- return MyComponent;
-})();
-export { MyComponent };
+export class MyComponent {
+ get ref() { return this._ref; }
+ set ref(value) { this._ref = value; }
+}
+__decorate([
+ Input(),
+ __metadata("design:type", TemplateRef),
+ __metadata("design:paramtypes", [TemplateRef])
+], MyComponent.prototype, "ref", null);
diff --git a/tests/baselines/reference/templateLiteralsAndDecoratorMetadata.js b/tests/baselines/reference/templateLiteralsAndDecoratorMetadata.js
index f6753a18c275d..949aa353a837a 100644
--- a/tests/baselines/reference/templateLiteralsAndDecoratorMetadata.js
+++ b/tests/baselines/reference/templateLiteralsAndDecoratorMetadata.js
@@ -20,16 +20,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
};
Object.defineProperty(exports, "__esModule", { value: true });
exports.Greeter = void 0;
-let Greeter = (() => {
- class Greeter {
- constructor() {
- this.greeting = `employee`; //template literals on this line cause the issue
- }
+class Greeter {
+ constructor() {
+ this.greeting = `employee`; //template literals on this line cause the issue
}
- __decorate([
- format("Hello, %s"),
- __metadata("design:type", String)
- ], Greeter.prototype, "greeting", void 0);
- return Greeter;
-})();
+}
exports.Greeter = Greeter;
+__decorate([
+ format("Hello, %s"),
+ __metadata("design:type", String)
+], Greeter.prototype, "greeting", void 0);
diff --git a/tests/baselines/reference/thisAndSuperInStaticMembers3.js b/tests/baselines/reference/thisAndSuperInStaticMembers3.js
index f0cb5d5c55e48..cdfd202fe5182 100644
--- a/tests/baselines/reference/thisAndSuperInStaticMembers3.js
+++ b/tests/baselines/reference/thisAndSuperInStaticMembers3.js
@@ -25,80 +25,77 @@ class C extends B {
}
//// [thisAndSuperInStaticMembers3.js]
-let C = (() => {
- var _a;
- class C extends B {
- constructor() {
- super(...arguments);
- // these should be unaffected
- Object.defineProperty(this, "x", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 1
- });
- Object.defineProperty(this, "y", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: this.x
- });
- Object.defineProperty(this, "z", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super.f()
- });
- }
+var _a;
+class C extends B {
+ constructor() {
+ super(...arguments);
+ // these should be unaffected
+ Object.defineProperty(this, "x", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 1
+ });
+ Object.defineProperty(this, "y", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: this.x
+ });
+ Object.defineProperty(this, "z", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super.f()
+ });
}
- _a = C;
- Object.defineProperty(C, "x", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: undefined
- });
- Object.defineProperty(C, "y1", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.x
- });
- Object.defineProperty(C, "y2", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.x()
- });
- Object.defineProperty(C, "y3", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a === null || _a === void 0 ? void 0 : _a.x()
- });
- Object.defineProperty(C, "y4", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a[("x")]()
- });
- Object.defineProperty(C, "y5", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a === null || _a === void 0 ? void 0 : _a[("x")]()
- });
- Object.defineProperty(C, "z3", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super.f()
- });
- Object.defineProperty(C, "z4", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super["f"]()
- });
- return C;
-})();
+}
+_a = C;
+Object.defineProperty(C, "x", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: undefined
+});
+Object.defineProperty(C, "y1", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a.x
+});
+Object.defineProperty(C, "y2", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a.x()
+});
+Object.defineProperty(C, "y3", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a === null || _a === void 0 ? void 0 : _a.x()
+});
+Object.defineProperty(C, "y4", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a[("x")]()
+});
+Object.defineProperty(C, "y5", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a === null || _a === void 0 ? void 0 : _a[("x")]()
+});
+Object.defineProperty(C, "z3", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super.f()
+});
+Object.defineProperty(C, "z4", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super["f"]()
+});
diff --git a/tests/baselines/reference/thisAndSuperInStaticMembers4.js b/tests/baselines/reference/thisAndSuperInStaticMembers4.js
index 57b5edc49e3be..f7abc92fb2a64 100644
--- a/tests/baselines/reference/thisAndSuperInStaticMembers4.js
+++ b/tests/baselines/reference/thisAndSuperInStaticMembers4.js
@@ -25,25 +25,22 @@ class C extends B {
}
//// [thisAndSuperInStaticMembers4.js]
-let C = (() => {
- var _a;
- class C extends B {
- constructor() {
- super(...arguments);
- // these should be unaffected
- this.x = 1;
- this.y = this.x;
- this.z = super.f();
- }
+var _a;
+class C extends B {
+ constructor() {
+ super(...arguments);
+ // these should be unaffected
+ this.x = 1;
+ this.y = this.x;
+ this.z = super.f();
}
- _a = C;
- C.x = undefined;
- C.y1 = _a.x;
- C.y2 = _a.x();
- C.y3 = _a === null || _a === void 0 ? void 0 : _a.x();
- C.y4 = _a[("x")]();
- C.y5 = _a === null || _a === void 0 ? void 0 : _a[("x")]();
- C.z3 = super.f();
- C.z4 = super["f"]();
- return C;
-})();
+}
+_a = C;
+C.x = undefined;
+C.y1 = _a.x;
+C.y2 = _a.x();
+C.y3 = _a === null || _a === void 0 ? void 0 : _a.x();
+C.y4 = _a[("x")]();
+C.y5 = _a === null || _a === void 0 ? void 0 : _a[("x")]();
+C.z3 = super.f();
+C.z4 = super["f"]();
diff --git a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
index 04666182a20f0..b4d2d0a8a08f2 100644
--- a/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
+++ b/tests/baselines/reference/thisInArrowFunctionInStaticInitializer1.js
@@ -11,15 +11,12 @@ class Vector {
}
//// [thisInArrowFunctionInStaticInitializer1.js]
+var _a;
function log(a) { }
-let Vector = (() => {
- var _a;
- class Vector {
- }
- _a = Vector;
- Vector.foo = () => {
- // 'this' should be allowed in a static initializer.
- log(_a);
- };
- return Vector;
-})();
+class Vector {
+}
+_a = Vector;
+Vector.foo = () => {
+ // 'this' should be allowed in a static initializer.
+ log(_a);
+};
diff --git a/tests/baselines/reference/thisInConstructorParameter2.js b/tests/baselines/reference/thisInConstructorParameter2.js
index ea4c28ca4daab..74aa1b3be8c46 100644
--- a/tests/baselines/reference/thisInConstructorParameter2.js
+++ b/tests/baselines/reference/thisInConstructorParameter2.js
@@ -14,18 +14,15 @@ class P {
}
//// [thisInConstructorParameter2.js]
-let P = (() => {
- var _a;
- class P {
- constructor(z = this, zz = this, zzz = (p = this) => this) {
- this.z = z;
- this.x = this;
- zzz = (p = this) => this;
- }
- foo(zz = this) { zz.x; }
- static bar(zz = this) { zz.y; }
+var _a;
+class P {
+ constructor(z = this, zz = this, zzz = (p = this) => this) {
+ this.z = z;
+ this.x = this;
+ zzz = (p = this) => this;
}
- _a = P;
- P.y = _a;
- return P;
-})();
+ foo(zz = this) { zz.x; }
+ static bar(zz = this) { zz.y; }
+}
+_a = P;
+P.y = _a;
diff --git a/tests/baselines/reference/thisInOuterClassBody.js b/tests/baselines/reference/thisInOuterClassBody.js
index bfabcf1b3c5a9..43599efe6977c 100644
--- a/tests/baselines/reference/thisInOuterClassBody.js
+++ b/tests/baselines/reference/thisInOuterClassBody.js
@@ -23,24 +23,21 @@ class Foo {
}
//// [thisInOuterClassBody.js]
-let Foo = (() => {
- var _a;
- class Foo {
- constructor() {
- this.x = this;
- }
- bar() {
- this.x; // 'this' is type 'Foo'
- var f = () => this.x; // 'this' should be type 'Foo' as well
- var p = this.y;
- return this;
- }
- static bar2() {
- var a = this.y;
- var b = this.x;
- }
+var _a;
+class Foo {
+ constructor() {
+ this.x = this;
}
- _a = Foo;
- Foo.y = _a;
- return Foo;
-})();
+ bar() {
+ this.x; // 'this' is type 'Foo'
+ var f = () => this.x; // 'this' should be type 'Foo' as well
+ var p = this.y;
+ return this;
+ }
+ static bar2() {
+ var a = this.y;
+ var b = this.x;
+ }
+}
+_a = Foo;
+Foo.y = _a;
diff --git a/tests/baselines/reference/thisInPropertyBoundDeclarations.js b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
index c1b8a6cf6d9cd..bba46b0a31c3e 100644
--- a/tests/baselines/reference/thisInPropertyBoundDeclarations.js
+++ b/tests/baselines/reference/thisInPropertyBoundDeclarations.js
@@ -70,19 +70,16 @@ class B {
}
//// [thisInPropertyBoundDeclarations.js]
-let Bug = (() => {
- class Bug {
- foo(name) {
- this.name = name;
- }
+class Bug {
+ foo(name) {
+ this.name = name;
}
- Bug.func = [
- (that, name) => {
- that.foo(name);
- }
- ];
- return Bug;
-})();
+}
+Bug.func = [
+ (that, name) => {
+ that.foo(name);
+ }
+];
// Valid use of this in a property bound decl
class A {
constructor() {
diff --git a/tests/baselines/reference/thisInStaticMethod1.js b/tests/baselines/reference/thisInStaticMethod1.js
index 0679e6316b6da..e7f279b652317 100644
--- a/tests/baselines/reference/thisInStaticMethod1.js
+++ b/tests/baselines/reference/thisInStaticMethod1.js
@@ -10,13 +10,10 @@ class foo {
var x = foo.bar();
//// [thisInStaticMethod1.js]
-let foo = (() => {
- class foo {
- static bar() {
- return this.x;
- }
+class foo {
+ static bar() {
+ return this.x;
}
- foo.x = 3;
- return foo;
-})();
+}
+foo.x = 3;
var x = foo.bar();
diff --git a/tests/baselines/reference/thisTypeAccessibility.js b/tests/baselines/reference/thisTypeAccessibility.js
index b8f770c1f5636..1d3a5ec202f30 100644
--- a/tests/baselines/reference/thisTypeAccessibility.js
+++ b/tests/baselines/reference/thisTypeAccessibility.js
@@ -65,19 +65,16 @@ function extension4(this: MyGenericClass, p: T) {
//// [thisTypeAccessibility.js]
-let MyClass = (() => {
- class MyClass {
- constructor() {
- this.p = 123;
- this.pp = 123;
- this.ppp = 123;
- }
+class MyClass {
+ constructor() {
+ this.p = 123;
+ this.pp = 123;
+ this.ppp = 123;
}
- MyClass.sp = 123;
- MyClass.spp = 123;
- MyClass.sppp = 123;
- return MyClass;
-})();
+}
+MyClass.sp = 123;
+MyClass.spp = 123;
+MyClass.sppp = 123;
class MyGenericClass {
}
MyClass.prototype.extension1 = function (p) {
diff --git a/tests/baselines/reference/thisTypeErrors.js b/tests/baselines/reference/thisTypeErrors.js
index 3a682f74c426d..8f207b6e7dad1 100644
--- a/tests/baselines/reference/thisTypeErrors.js
+++ b/tests/baselines/reference/thisTypeErrors.js
@@ -68,15 +68,12 @@ function f1(x) {
}
class C1 {
}
-let C2 = (() => {
- class C2 {
- static foo(x) {
- return undefined;
- }
+class C2 {
+ static foo(x) {
+ return undefined;
}
- C2.y = undefined;
- return C2;
-})();
+}
+C2.y = undefined;
var N1;
(function (N1) {
N1.y = this;
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddDecoratedNode.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddDecoratedNode.js
index 2eeb89ad0d589..697cd84925edc 100644
--- a/tests/baselines/reference/transformApi/transformsCorrectly.transformAddDecoratedNode.js
+++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformAddDecoratedNode.js
@@ -4,12 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-let Foo = (() => {
- class Foo {
- baz() { }
- }
- __decorate([
- Bar
- ], Foo.prototype, "baz", null);
- return Foo;
-})();
+class Foo {
+ baz() { }
+}
+__decorate([
+ Bar
+], Foo.prototype, "baz", null);
diff --git a/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js b/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js
index a1c10312c1159..ad78d222ceae2 100644
--- a/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js
+++ b/tests/baselines/reference/transformApi/transformsCorrectly.transformParameterProperty.js
@@ -7,14 +7,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
var __param = (this && this.__param) || function (paramIndex, decorator) {
return function (target, key) { decorator(target, key, paramIndex); }
};
-let Foo = (() => {
- let Foo = class Foo {
- constructor(x) {
- this.x = x;
- }
- };
- Foo = __decorate([
- __param(0, Dec)
- ], Foo);
- return Foo;
-})();
+let Foo = class Foo {
+ constructor(x) {
+ this.x = x;
+ }
+};
+Foo = __decorate([
+ __param(0, Dec)
+], Foo);
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js
index c0272a7e78912..5bd18cf37a18c 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).js
@@ -41,19 +41,16 @@ var __importStar = (this && this.__importStar) || (function () {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
const ng = __importStar(require("angular2/core"));
-let MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
-})();
+let MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+};
+MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+], MyClass1);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js
index c0272a7e78912..5bd18cf37a18c 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option (verbatimModuleSyntax=true).oldTranspile.js
@@ -41,19 +41,16 @@ var __importStar = (this && this.__importStar) || (function () {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
const ng = __importStar(require("angular2/core"));
-let MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
-})();
+let MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+};
+MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+], MyClass1);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
index c0272a7e78912..5bd18cf37a18c 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.js
@@ -41,19 +41,16 @@ var __importStar = (this && this.__importStar) || (function () {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
const ng = __importStar(require("angular2/core"));
-let MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
-})();
+let MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+};
+MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+], MyClass1);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js
index c0272a7e78912..5bd18cf37a18c 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with CommonJS option.oldTranspile.js
@@ -41,19 +41,16 @@ var __importStar = (this && this.__importStar) || (function () {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
const ng = __importStar(require("angular2/core"));
-let MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
-})();
+let MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+};
+MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+], MyClass1);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js
index 707c4e13b153f..1dabfbbe2b466 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.js
@@ -9,7 +9,7 @@ System.register(["angular2/core"], function (exports_1, context_1) {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
- var ng, MyClass1;
+ var _a, ng, MyClass1;
var __moduleName = context_1 && context_1.id;
return {
setters: [
@@ -18,19 +18,15 @@ System.register(["angular2/core"], function (exports_1, context_1) {
}
],
execute: function () {
- MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
- })();
+ MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+ };
+ MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+ ], MyClass1);
}
};
});
diff --git a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.js b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.js
index 707c4e13b153f..1dabfbbe2b466 100644
--- a/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.js
+++ b/tests/baselines/reference/transpile/Correctly serialize metadata when transpile with System option.oldTranspile.js
@@ -9,7 +9,7 @@ System.register(["angular2/core"], function (exports_1, context_1) {
var __metadata = (this && this.__metadata) || function (k, v) {
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
};
- var ng, MyClass1;
+ var _a, ng, MyClass1;
var __moduleName = context_1 && context_1.id;
return {
setters: [
@@ -18,19 +18,15 @@ System.register(["angular2/core"], function (exports_1, context_1) {
}
],
execute: function () {
- MyClass1 = (() => {
- var _a;
- let MyClass1 = class MyClass1 {
- constructor(_elementRef) {
- this._elementRef = _elementRef;
- }
- };
- MyClass1 = __decorate([
- fooexport,
- __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
- ], MyClass1);
- return MyClass1;
- })();
+ MyClass1 = class MyClass1 {
+ constructor(_elementRef) {
+ this._elementRef = _elementRef;
+ }
+ };
+ MyClass1 = __decorate([
+ fooexport,
+ __metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
+ ], MyClass1);
}
};
});
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
index a54a80ef6f277..b17219c66b8a1 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
@@ -1,23 +1,20 @@
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
exports.MyClass = void 0;
const db_1 = require("./db");
function someDecorator(target) {
return target;
}
-let MyClass = (() => {
- var _a;
- let MyClass = class MyClass {
- constructor(db) {
- this.db = db;
- this.db.doSomething();
- }
- };
- MyClass = __decorate([
- someDecorator,
- __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
- ], MyClass);
- return MyClass;
-})();
+let MyClass = class MyClass {
+ constructor(db) {
+ this.db = db;
+ this.db.doSomething();
+ }
+};
exports.MyClass = MyClass;
+MyClass = __decorate([
+ someDecorator,
+ __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
+], MyClass);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
index a54a80ef6f277..b17219c66b8a1 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
@@ -1,23 +1,20 @@
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
exports.MyClass = void 0;
const db_1 = require("./db");
function someDecorator(target) {
return target;
}
-let MyClass = (() => {
- var _a;
- let MyClass = class MyClass {
- constructor(db) {
- this.db = db;
- this.db.doSomething();
- }
- };
- MyClass = __decorate([
- someDecorator,
- __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
- ], MyClass);
- return MyClass;
-})();
+let MyClass = class MyClass {
+ constructor(db) {
+ this.db = db;
+ this.db.doSomething();
+ }
+};
exports.MyClass = MyClass;
+MyClass = __decorate([
+ someDecorator,
+ __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
+], MyClass);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index a54a80ef6f277..b17219c66b8a1 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
@@ -1,23 +1,20 @@
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
exports.MyClass = void 0;
const db_1 = require("./db");
function someDecorator(target) {
return target;
}
-let MyClass = (() => {
- var _a;
- let MyClass = class MyClass {
- constructor(db) {
- this.db = db;
- this.db.doSomething();
- }
- };
- MyClass = __decorate([
- someDecorator,
- __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
- ], MyClass);
- return MyClass;
-})();
+let MyClass = class MyClass {
+ constructor(db) {
+ this.db = db;
+ this.db.doSomething();
+ }
+};
exports.MyClass = MyClass;
+MyClass = __decorate([
+ someDecorator,
+ __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
+], MyClass);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
index a54a80ef6f277..b17219c66b8a1 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
@@ -1,23 +1,20 @@
"use strict";
+var _a;
Object.defineProperty(exports, "__esModule", { value: true });
exports.MyClass = void 0;
const db_1 = require("./db");
function someDecorator(target) {
return target;
}
-let MyClass = (() => {
- var _a;
- let MyClass = class MyClass {
- constructor(db) {
- this.db = db;
- this.db.doSomething();
- }
- };
- MyClass = __decorate([
- someDecorator,
- __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
- ], MyClass);
- return MyClass;
-})();
+let MyClass = class MyClass {
+ constructor(db) {
+ this.db = db;
+ this.db.doSomething();
+ }
+};
exports.MyClass = MyClass;
+MyClass = __decorate([
+ someDecorator,
+ __metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
+], MyClass);
//# sourceMappingURL=file.js.map
\ No newline at end of file
diff --git a/tests/baselines/reference/tsxDefaultImports.js b/tests/baselines/reference/tsxDefaultImports.js
index d8a9f1de0212d..fb16532cb77fd 100644
--- a/tests/baselines/reference/tsxDefaultImports.js
+++ b/tests/baselines/reference/tsxDefaultImports.js
@@ -20,12 +20,9 @@ var SomeEnum;
(function (SomeEnum) {
SomeEnum[SomeEnum["one"] = 0] = "one";
})(SomeEnum || (SomeEnum = {}));
-let SomeClass = (() => {
- class SomeClass {
- }
- SomeClass.E = SomeEnum;
- return SomeClass;
-})();
+class SomeClass {
+}
+SomeClass.E = SomeEnum;
exports.default = SomeClass;
//// [b.js]
"use strict";
diff --git a/tests/baselines/reference/tsxLibraryManagedAttributes.js b/tests/baselines/reference/tsxLibraryManagedAttributes.js
index 149113da69de4..853a13d2d173e 100644
--- a/tests/baselines/reference/tsxLibraryManagedAttributes.js
+++ b/tests/baselines/reference/tsxLibraryManagedAttributes.js
@@ -129,89 +129,71 @@ const aa = ;
//// [tsxLibraryManagedAttributes.jsx]
"use strict";
-let Component = (() => {
- class Component extends ReactComponent {
- }
- Component.propTypes = {
- foo: PropTypes.number,
- bar: PropTypes.node,
- baz: PropTypes.string.isRequired,
- };
- Component.defaultProps = {
- foo: 42,
- };
- return Component;
-})();
+class Component extends ReactComponent {
+}
+Component.propTypes = {
+ foo: PropTypes.number,
+ bar: PropTypes.node,
+ baz: PropTypes.string.isRequired,
+};
+Component.defaultProps = {
+ foo: 42,
+};
const a = ;
const b = ; // Error, missing required prop bar
const c = ;
const d = ; // Error, baz not a valid prop
const e = ; // bar is nullable/undefinable since it's not marked `isRequired`
const f = ; // Error, baz is _not_ nullable/undefinable since it's marked `isRequired`
-let JustPropTypes = (() => {
- class JustPropTypes extends ReactComponent {
- }
- JustPropTypes.propTypes = {
- foo: PropTypes.number,
- bar: PropTypes.node.isRequired,
- };
- return JustPropTypes;
-})();
+class JustPropTypes extends ReactComponent {
+}
+JustPropTypes.propTypes = {
+ foo: PropTypes.number,
+ bar: PropTypes.node.isRequired,
+};
const g = ;
const h = ; // error, wrong type
const i = ;
const j = ; // error, bar is required
-let JustDefaultProps = (() => {
- class JustDefaultProps extends ReactComponent {
- }
- JustDefaultProps.defaultProps = {
- foo: 42,
- };
- return JustDefaultProps;
-})();
+class JustDefaultProps extends ReactComponent {
+}
+JustDefaultProps.defaultProps = {
+ foo: 42,
+};
const k = ;
const l = ; // error, no prop named bar
const m = ; // error, wrong type
-let BothWithSpecifiedGeneric = (() => {
- class BothWithSpecifiedGeneric extends ReactComponent {
- }
- BothWithSpecifiedGeneric.propTypes = {
- foo: PropTypes.string,
- bar: PropTypes.node,
- baz: PropTypes.number.isRequired,
- };
- BothWithSpecifiedGeneric.defaultProps = {
- foo: "yo",
- };
- return BothWithSpecifiedGeneric;
-})();
+class BothWithSpecifiedGeneric extends ReactComponent {
+}
+BothWithSpecifiedGeneric.propTypes = {
+ foo: PropTypes.string,
+ bar: PropTypes.node,
+ baz: PropTypes.number.isRequired,
+};
+BothWithSpecifiedGeneric.defaultProps = {
+ foo: "yo",
+};
const n = ;
const o = ; // Error, missing required prop bar
const p = ;
const q = ; // Error, baz not a valid prop
const r = ; // bar is nullable/undefinable since it's not marked `isRequired`
const s = ; // Error, baz is _not_ nullable/undefinable since it's marked `isRequired`
-let JustPropTypesWithSpecifiedGeneric = (() => {
- class JustPropTypesWithSpecifiedGeneric extends ReactComponent {
- }
- JustPropTypesWithSpecifiedGeneric.propTypes = {
- foo: PropTypes.string,
- bar: PropTypes.node.isRequired,
- };
- return JustPropTypesWithSpecifiedGeneric;
-})();
+class JustPropTypesWithSpecifiedGeneric extends ReactComponent {
+}
+JustPropTypesWithSpecifiedGeneric.propTypes = {
+ foo: PropTypes.string,
+ bar: PropTypes.node.isRequired,
+};
const t = ;
const u = ; // error, wrong type
const v = ; // generic overrides propTypes required-ness, null isn't valid
const w = ; // error, bar is required
-let JustDefaultPropsWithSpecifiedGeneric = (() => {
- class JustDefaultPropsWithSpecifiedGeneric extends ReactComponent {
- }
- JustDefaultPropsWithSpecifiedGeneric.defaultProps = {
- foo: "no",
- };
- return JustDefaultPropsWithSpecifiedGeneric;
-})();
+class JustDefaultPropsWithSpecifiedGeneric extends ReactComponent {
+}
+JustDefaultPropsWithSpecifiedGeneric.defaultProps = {
+ foo: "no",
+};
const x = ;
const y = ; // error, no prop named bar
const z = ; // error, wrong type
diff --git a/tests/baselines/reference/typeOfPrototype.js b/tests/baselines/reference/typeOfPrototype.js
index 5b847afda5d57..4cebe75ddb7e2 100644
--- a/tests/baselines/reference/typeOfPrototype.js
+++ b/tests/baselines/reference/typeOfPrototype.js
@@ -9,13 +9,10 @@ Foo.prototype.bar = undefined; // Should be OK
//// [typeOfPrototype.js]
-let Foo = (() => {
- class Foo {
- constructor() {
- this.bar = 3;
- }
+class Foo {
+ constructor() {
+ this.bar = 3;
}
- Foo.bar = '';
- return Foo;
-})();
+}
+Foo.bar = '';
Foo.prototype.bar = undefined; // Should be OK
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
index b5970b962ecff..8e98aa178b8f1 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
@@ -57,65 +57,52 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-let C = (() => {
- let C = class C {
- };
- C.a = 1;
- C.b = (void 0).a + 1;
- C = __decorate([
- foo
- ], C);
- return C;
-})();
-let D = (() => {
- let D = class D extends C {
- static foo() {
- return this.c + 1;
- }
- static get fa() {
- return this.c + 1;
- }
- static set fa(v) {
- this.c = v + 1;
- }
- };
- D.c = 2;
- D.d = (void 0).c + 1;
- D.e = super.a + (void 0).c + 1;
- D.f = () => (void 0).c + 1;
- D.ff = function () { this.c + 1; };
- D = __decorate([
- foo
- ], D);
- return D;
-})();
-let CC = (() => {
- var _a;
- class CC {
+var _a, _b;
+let C = class C {
+};
+C.a = 1;
+C.b = (void 0).a + 1;
+C = __decorate([
+ foo
+], C);
+let D = class D extends C {
+ static foo() {
+ return this.c + 1;
+ }
+ static get fa() {
+ return this.c + 1;
+ }
+ static set fa(v) {
+ this.c = v + 1;
+ }
+};
+D.c = 2;
+D.d = (void 0).c + 1;
+D.e = super.a + (void 0).c + 1;
+D.f = () => (void 0).c + 1;
+D.ff = function () { this.c + 1; };
+D = __decorate([
+ foo
+], D);
+class CC {
+}
+_a = CC;
+CC.a = 1;
+CC.b = _a.a + 1;
+class DD extends CC {
+ static foo() {
+ return this.c + 1;
+ }
+ static get fa() {
+ return this.c + 1;
}
- _a = CC;
- CC.a = 1;
- CC.b = _a.a + 1;
- return CC;
-})();
-let DD = (() => {
- var _a;
- class DD extends CC {
- static foo() {
- return this.c + 1;
- }
- static get fa() {
- return this.c + 1;
- }
- static set fa(v) {
- this.c = v + 1;
- }
+ static set fa(v) {
+ this.c = v + 1;
}
- _a = DD;
- DD.c = 2;
- DD.d = _a.c + 1;
- DD.e = super.a + _a.c + 1;
- DD.f = () => _a.c + 1;
- DD.ff = function () { this.c + 1; };
- return DD;
-})();
+}
+_b = DD;
+DD.c = 2;
+DD.d = _b.c + 1;
+DD.e = super.a + _b.c + 1;
+DD.f = () => _b.c + 1;
+DD.ff = function () { this.c + 1; };
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
index 5aefa8d07f1fb..3f5a443903f74 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
@@ -57,135 +57,122 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-let C = (() => {
- let C = class C {
- };
- Object.defineProperty(C, "a", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 1
- });
- Object.defineProperty(C, "b", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: (void 0).a + 1
- });
- C = __decorate([
- foo
- ], C);
- return C;
-})();
-let D = (() => {
- let D = class D extends C {
- static foo() {
- return this.c + 1;
- }
- static get fa() {
- return this.c + 1;
- }
- static set fa(v) {
- this.c = v + 1;
- }
- };
- Object.defineProperty(D, "c", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 2
- });
- Object.defineProperty(D, "d", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: (void 0).c + 1
- });
- Object.defineProperty(D, "e", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super.a + (void 0).c + 1
- });
- Object.defineProperty(D, "f", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: () => (void 0).c + 1
- });
- Object.defineProperty(D, "ff", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: function () { this.c + 1; }
- });
- D = __decorate([
- foo
- ], D);
- return D;
-})();
-let CC = (() => {
- var _a;
- class CC {
+var _a, _b;
+let C = class C {
+};
+Object.defineProperty(C, "a", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 1
+});
+Object.defineProperty(C, "b", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: (void 0).a + 1
+});
+C = __decorate([
+ foo
+], C);
+let D = class D extends C {
+ static foo() {
+ return this.c + 1;
+ }
+ static get fa() {
+ return this.c + 1;
+ }
+ static set fa(v) {
+ this.c = v + 1;
+ }
+};
+Object.defineProperty(D, "c", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 2
+});
+Object.defineProperty(D, "d", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: (void 0).c + 1
+});
+Object.defineProperty(D, "e", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super.a + (void 0).c + 1
+});
+Object.defineProperty(D, "f", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: () => (void 0).c + 1
+});
+Object.defineProperty(D, "ff", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: function () { this.c + 1; }
+});
+D = __decorate([
+ foo
+], D);
+class CC {
+}
+_a = CC;
+Object.defineProperty(CC, "a", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 1
+});
+Object.defineProperty(CC, "b", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a.a + 1
+});
+class DD extends CC {
+ static foo() {
+ return this.c + 1;
+ }
+ static get fa() {
+ return this.c + 1;
}
- _a = CC;
- Object.defineProperty(CC, "a", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 1
- });
- Object.defineProperty(CC, "b", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.a + 1
- });
- return CC;
-})();
-let DD = (() => {
- var _a;
- class DD extends CC {
- static foo() {
- return this.c + 1;
- }
- static get fa() {
- return this.c + 1;
- }
- static set fa(v) {
- this.c = v + 1;
- }
+ static set fa(v) {
+ this.c = v + 1;
}
- _a = DD;
- Object.defineProperty(DD, "c", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 2
- });
- Object.defineProperty(DD, "d", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.c + 1
- });
- Object.defineProperty(DD, "e", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super.a + _a.c + 1
- });
- Object.defineProperty(DD, "f", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: () => _a.c + 1
- });
- Object.defineProperty(DD, "ff", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: function () { this.c + 1; }
- });
- return DD;
-})();
+}
+_b = DD;
+Object.defineProperty(DD, "c", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 2
+});
+Object.defineProperty(DD, "d", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _b.c + 1
+});
+Object.defineProperty(DD, "e", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super.a + _b.c + 1
+});
+Object.defineProperty(DD, "f", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: () => _b.c + 1
+});
+Object.defineProperty(DD, "ff", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: function () { this.c + 1; }
+});
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers12(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers12(target=es5).js
index 6ffdd94e5dd1d..02c82dab3fc05 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers12(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers12(target=es5).js
@@ -11,20 +11,17 @@ class C {
//// [typeOfThisInStaticMembers12.js]
-let C = (() => {
- var _a, _b, _c, _d;
- class C {
- }
- _a = C;
- C.c = "foo";
- C.bar = (_b = class Inner {
- constructor() {
- this[_d] = 123;
- }
- },
- _c = _a.c,
- _d = _a.c,
- _b[_c] = 123,
- _b);
- return C;
-})();
+var _a, _b, _c, _d;
+class C {
+}
+_a = C;
+C.c = "foo";
+C.bar = (_b = class Inner {
+ constructor() {
+ this[_d] = 123;
+ }
+ },
+ _c = _a.c,
+ _d = _a.c,
+ _b[_c] = 123,
+ _b);
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers13(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers13(target=es5).js
index 0b4a69e4377b9..63d7396a82cab 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers13(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers13(target=es5).js
@@ -11,40 +11,37 @@ class C {
//// [typeOfThisInStaticMembers13.js]
-let C = (() => {
- var _a, _b, _c, _d;
- class C {
- }
- _a = C;
- Object.defineProperty(C, "c", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: "foo"
- });
- Object.defineProperty(C, "bar", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: (_b = class Inner {
- constructor() {
- Object.defineProperty(this, _d, {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 123
- });
- }
- },
- _c = _a.c,
- _d = _a.c,
- Object.defineProperty(_b, _c, {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 123
- }),
- _b)
- });
- return C;
-})();
+var _a, _b, _c, _d;
+class C {
+}
+_a = C;
+Object.defineProperty(C, "c", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: "foo"
+});
+Object.defineProperty(C, "bar", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: (_b = class Inner {
+ constructor() {
+ Object.defineProperty(this, _d, {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 123
+ });
+ }
+ },
+ _c = _a.c,
+ _d = _a.c,
+ Object.defineProperty(_b, _c, {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 123
+ }),
+ _b)
+});
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers2.js b/tests/baselines/reference/typeOfThisInStaticMembers2.js
index 0482356e3ea62..653c352ad5742 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers2.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers2.js
@@ -10,19 +10,12 @@ class C2 {
}
//// [typeOfThisInStaticMembers2.js]
-let C = (() => {
- var _a;
- class C {
- }
- _a = C;
- C.foo = _a; // ok
- return C;
-})();
-let C2 = (() => {
- var _a;
- class C2 {
- }
- _a = C2;
- C2.foo = _a; // ok
- return C2;
-})();
+var _a, _b;
+class C {
+}
+_a = C;
+C.foo = _a; // ok
+class C2 {
+}
+_b = C2;
+C2.foo = _b; // ok
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
index dda826637d5ba..ec89abc11bb40 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
@@ -14,22 +14,15 @@ class D extends C {
//// [typeOfThisInStaticMembers3.js]
-let C = (() => {
- var _a;
- class C {
- }
- _a = C;
- C.a = 1;
- C.b = _a.a + 1;
- return C;
-})();
-let D = (() => {
- var _a;
- class D extends C {
- }
- _a = D;
- D.c = 2;
- D.d = _a.c + 1;
- D.e = super.a + _a.c + 1;
- return D;
-})();
+var _a, _b;
+class C {
+}
+_a = C;
+C.a = 1;
+C.b = _a.a + 1;
+class D extends C {
+}
+_b = D;
+D.c = 2;
+D.d = _b.c + 1;
+D.e = super.a + _b.c + 1;
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
index c84dc012e89e9..4a97cbb6c1da2 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
@@ -14,47 +14,40 @@ class D extends C {
//// [typeOfThisInStaticMembers4.js]
-let C = (() => {
- var _a;
- class C {
- }
- _a = C;
- Object.defineProperty(C, "a", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 1
- });
- Object.defineProperty(C, "b", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.a + 1
- });
- return C;
-})();
-let D = (() => {
- var _a;
- class D extends C {
- }
- _a = D;
- Object.defineProperty(D, "c", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: 2
- });
- Object.defineProperty(D, "d", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: _a.c + 1
- });
- Object.defineProperty(D, "e", {
- enumerable: true,
- configurable: true,
- writable: true,
- value: super.a + _a.c + 1
- });
- return D;
-})();
+var _a, _b;
+class C {
+}
+_a = C;
+Object.defineProperty(C, "a", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 1
+});
+Object.defineProperty(C, "b", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _a.a + 1
+});
+class D extends C {
+}
+_b = D;
+Object.defineProperty(D, "c", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: 2
+});
+Object.defineProperty(D, "d", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: _b.c + 1
+});
+Object.defineProperty(D, "e", {
+ enumerable: true,
+ configurable: true,
+ writable: true,
+ value: super.a + _b.c + 1
+});
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).js
index 94d190d5cecc0..8cd77a8ef2b56 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers5(target=es5).js
@@ -11,14 +11,11 @@ class C {
//// [typeOfThisInStaticMembers5.js]
-let C = (() => {
- var _a;
- class C {
- constructor(foo) {
- this.foo = foo;
- }
+var _a;
+class C {
+ constructor(foo) {
+ this.foo = foo;
}
- _a = C;
- C.create = () => new _a("yep");
- return C;
-})();
+}
+_a = C;
+C.create = () => new _a("yep");
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers6.js b/tests/baselines/reference/typeOfThisInStaticMembers6.js
index c95671a697ab0..bdd4293bcf60a 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers6.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers6.js
@@ -11,15 +11,9 @@ class D extends C {
//// [typeOfThisInStaticMembers6.js]
-let C = (() => {
- class C {
- }
- C.f = 1;
- return C;
-})();
-let D = (() => {
- class D extends C {
- }
- D.c = super();
- return D;
-})();
+class C {
+}
+C.f = 1;
+class D extends C {
+}
+D.c = super();
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
index 55d96e550a509..e55d2443df425 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
@@ -14,22 +14,15 @@ class D extends C {
//// [typeOfThisInStaticMembers7.js]
-let C = (() => {
- var _a;
- class C {
- }
- _a = C;
- C.a = 1;
- C.b = _a.a + 1;
- return C;
-})();
-let D = (() => {
- var _a;
- class D extends C {
- }
- _a = D;
- D.c = 2;
- D.d = _a.c + 1;
- D.e = 1 + (super.a) + (_a.c + 1) + 1;
- return D;
-})();
+var _a, _b;
+class C {
+}
+_a = C;
+C.a = 1;
+C.b = _a.a + 1;
+class D extends C {
+}
+_b = D;
+D.c = 2;
+D.d = _b.c + 1;
+D.e = 1 + (super.a) + (_b.c + 1) + 1;
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers8(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers8(target=es5).js
index 909b378d68b76..65f2861ad7a91 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers8(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers8(target=es5).js
@@ -21,31 +21,28 @@ class C {
//// [typeOfThisInStaticMembers8.js]
-let C = (() => {
- var _a;
- class C {
+var _a;
+class C {
+}
+_a = C;
+C.f = 1;
+C.arrowFunctionBoundary = () => _a.f + 1;
+C.functionExprBoundary = function () { return this.f + 2; };
+C.classExprBoundary = class {
+ constructor() {
+ this.a = this.f + 3;
}
- _a = C;
- C.f = 1;
- C.arrowFunctionBoundary = () => _a.f + 1;
- C.functionExprBoundary = function () { return this.f + 2; };
- C.classExprBoundary = class {
+};
+C.functionAndClassDeclBoundary = (() => {
+ function foo() {
+ return this.f + 4;
+ }
+ class CC {
constructor() {
- this.a = this.f + 3;
- }
- };
- C.functionAndClassDeclBoundary = (() => {
- function foo() {
- return this.f + 4;
+ this.a = this.f + 5;
}
- class CC {
- constructor() {
- this.a = this.f + 5;
- }
- method() {
- return this.f + 6;
- }
+ method() {
+ return this.f + 6;
}
- })();
- return C;
+ }
})();
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
index 5467f8291d840..6b170c4fcdb07 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
@@ -24,34 +24,28 @@ class D extends C {
//// [typeOfThisInStaticMembers9.js]
-let C = (() => {
- class C {
+class C {
+}
+C.f = 1;
+class D extends C {
+}
+D.arrowFunctionBoundary = () => super.f + 1;
+D.functionExprBoundary = function () { return super.f + 2; };
+D.classExprBoundary = class {
+ constructor() {
+ this.a = super.f + 3;
}
- C.f = 1;
- return C;
-})();
-let D = (() => {
- class D extends C {
+};
+D.functionAndClassDeclBoundary = (() => {
+ function foo() {
+ return super.f + 4;
}
- D.arrowFunctionBoundary = () => super.f + 1;
- D.functionExprBoundary = function () { return super.f + 2; };
- D.classExprBoundary = class {
+ class C {
constructor() {
- this.a = super.f + 3;
+ this.a = super.f + 5;
}
- };
- D.functionAndClassDeclBoundary = (() => {
- function foo() {
- return super.f + 4;
+ method() {
+ return super.f + 6;
}
- class C {
- constructor() {
- this.a = super.f + 5;
- }
- method() {
- return super.f + 6;
- }
- }
- })();
- return D;
+ }
})();
diff --git a/tests/baselines/reference/typeQueryOnClass.js b/tests/baselines/reference/typeQueryOnClass.js
index ed291e4b836e3..e75bfa1c7babe 100644
--- a/tests/baselines/reference/typeQueryOnClass.js
+++ b/tests/baselines/reference/typeQueryOnClass.js
@@ -59,37 +59,34 @@ var r3: typeof D;
var r4: typeof d;
//// [typeQueryOnClass.js]
-let C = (() => {
- class C {
- constructor(x) {
- this.x = x;
- this.ia = 1;
- this.ib = () => this.ia;
- }
- static foo(x) { }
- static bar(x) { }
- static get sc() {
- return 1;
- }
- static set sc(x) {
- }
- static get sd() {
- return 1;
- }
- baz(x) { return ''; }
- get ic() {
- return 1;
- }
- set ic(x) {
- }
- get id() {
- return 1;
- }
+class C {
+ constructor(x) {
+ this.x = x;
+ this.ia = 1;
+ this.ib = () => this.ia;
}
- C.sa = 1;
- C.sb = () => 1;
- return C;
-})();
+ static foo(x) { }
+ static bar(x) { }
+ static get sc() {
+ return 1;
+ }
+ static set sc(x) {
+ }
+ static get sd() {
+ return 1;
+ }
+ baz(x) { return ''; }
+ get ic() {
+ return 1;
+ }
+ set ic(x) {
+ }
+ get id() {
+ return 1;
+ }
+}
+C.sa = 1;
+C.sb = () => 1;
var c;
// BUG 820454
var r1;
diff --git a/tests/baselines/reference/typeofUsedBeforeBlockScoped.js b/tests/baselines/reference/typeofUsedBeforeBlockScoped.js
index 32d249927e890..588d6d4e6ce62 100644
--- a/tests/baselines/reference/typeofUsedBeforeBlockScoped.js
+++ b/tests/baselines/reference/typeofUsedBeforeBlockScoped.js
@@ -11,11 +11,8 @@ let o = { n: 12 };
//// [typeofUsedBeforeBlockScoped.js]
-let C = (() => {
- class C {
- }
- C.s = 2;
- return C;
-})();
+class C {
+}
+C.s = 2;
let o2;
let o = { n: 12 };
diff --git a/tests/baselines/reference/unqualifiedCallToClassStatic1.js b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
index 2e45a9122d494..3d279a6b63965 100644
--- a/tests/baselines/reference/unqualifiedCallToClassStatic1.js
+++ b/tests/baselines/reference/unqualifiedCallToClassStatic1.js
@@ -9,12 +9,9 @@ class Vector {
}
//// [unqualifiedCallToClassStatic1.js]
-let Vector = (() => {
- class Vector {
- }
- Vector.foo = () => {
- // 'foo' cannot be called in an unqualified manner.
- foo();
- };
- return Vector;
-})();
+class Vector {
+}
+Vector.foo = () => {
+ // 'foo' cannot be called in an unqualified manner.
+ foo();
+};
diff --git a/tests/baselines/reference/unreachableDeclarations(preserveconstenums=false).js b/tests/baselines/reference/unreachableDeclarations(preserveconstenums=false).js
index 7d7535e7fe920..ca6ecc4098735 100644
--- a/tests/baselines/reference/unreachableDeclarations(preserveconstenums=false).js
+++ b/tests/baselines/reference/unreachableDeclarations(preserveconstenums=false).js
@@ -131,12 +131,9 @@ function func4() {
function aFunc() {
console.log(ClassA.Value);
}
- let ClassA = (() => {
- class ClassA {
- }
- ClassA.Value = 1234;
- return ClassA;
- })();
+ class ClassA {
+ }
+ ClassA.Value = 1234;
}
function func5() {
aFunc();
diff --git a/tests/baselines/reference/unreachableDeclarations(preserveconstenums=true).js b/tests/baselines/reference/unreachableDeclarations(preserveconstenums=true).js
index 9cb6d80f7d541..9dabf708babff 100644
--- a/tests/baselines/reference/unreachableDeclarations(preserveconstenums=true).js
+++ b/tests/baselines/reference/unreachableDeclarations(preserveconstenums=true).js
@@ -139,12 +139,9 @@ function func4() {
function aFunc() {
console.log(ClassA.Value);
}
- let ClassA = (() => {
- class ClassA {
- }
- ClassA.Value = 1234;
- return ClassA;
- })();
+ class ClassA {
+ }
+ ClassA.Value = 1234;
}
function func5() {
aFunc();
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=commonjs,target=es5).js
index 4d88814c4b095..8233547808f31 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=commonjs,target=es5).js
@@ -20,24 +20,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=esnext,target=es5).js
index 90151cbef82bf..881a701416fa0 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=esnext,target=es5).js
@@ -18,24 +18,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).js
index 499159bbaa9b7..6a9a0c1eca320 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.1(module=system,target=es5).js
@@ -24,24 +24,21 @@ System.register([], function (exports_1, context_1) {
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=commonjs,target=es5).js
index fc7aca0193df6..1ee50e7153fd1 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=commonjs,target=es5).js
@@ -15,27 +15,23 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.10.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-let default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+exports.default = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
+ return default_1 = _classThis;
})();
-exports.default = default_1;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=esnext,target=es5).js
index ee52a9b3b377a..aa18a0db5741b 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=esnext,target=es5).js
@@ -13,27 +13,23 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.10.js]
-let default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+export default (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
+ return default_1 = _classThis;
})();
-export default default_1;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).js
index a43aaccb92609..71d284edc86c0 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.10(module=system,target=es5).js
@@ -15,32 +15,28 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.10.js]
System.register([], function (exports_1, context_1) {
"use strict";
- var default_1, after, env_1;
+ var after, env_1;
var __moduleName = context_1 && context_1.id;
return {
setters: [],
execute: function () {
- default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+ exports_1("default", (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
- })();
- exports_1("default", default_1);
+ return default_1 = _classThis;
+ })());
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=commonjs,target=es5).js
index 9cc06b0b6f4ad..e0b3e593d8aa7 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=commonjs,target=es5).js
@@ -19,24 +19,21 @@ using after = null;
Object.defineProperty(exports, "__esModule", { value: true });
exports.C = void 0;
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports.C = C;
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=esnext,target=es5).js
index 8d27db7f1aeb2..659f358797559 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=esnext,target=es5).js
@@ -16,24 +16,21 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.11.js]
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
export { C };
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).js
index 07d4e4737ee8a..a4b253535fc68 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.11(module=system,target=es5).js
@@ -23,24 +23,21 @@ System.register([], function (exports_1, context_1) {
setters: [],
execute: function () {
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports_1("C", C);
env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=commonjs,target=es5).js
index f0ed4423dfd08..849eb86c6dec6 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=commonjs,target=es5).js
@@ -19,24 +19,21 @@ using after = null;
Object.defineProperty(exports, "__esModule", { value: true });
exports.D = void 0;
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports.D = C;
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=esnext,target=es5).js
index d122fc7664426..9b8c44a683de4 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=esnext,target=es5).js
@@ -16,24 +16,21 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.12.js]
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
export { C as D };
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).js
index d47302c67d310..793d539f10288 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.12(module=system,target=es5).js
@@ -23,24 +23,21 @@ System.register([], function (exports_1, context_1) {
setters: [],
execute: function () {
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports_1("D", C);
env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=commonjs,target=es5).js
index 79e78f449809c..40c21674578e6 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=commonjs,target=es5).js
@@ -21,24 +21,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
exports.C = C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=esnext,target=es5).js
index 52f98cfef6ea8..d2f48cd452b6b 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=esnext,target=es5).js
@@ -19,24 +19,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).js
index d0bc25122f274..93147b23960c5 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.2(module=system,target=es5).js
@@ -24,24 +24,21 @@ System.register([], function (exports_1, context_1) {
try {
before = __addDisposableResource(env_1, null, false);
exports_1("C", C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})());
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=commonjs,target=es5).js
index ad3f076a141ac..3ee664c17c865 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=commonjs,target=es5).js
@@ -21,27 +21,23 @@ var before, C, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ exports.default = _default = C = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
- exports.default = _default = C;
void C;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=esnext,target=es5).js
index 4d3bd2677c183..9b215b2165ccd 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=esnext,target=es5).js
@@ -19,27 +19,23 @@ var before, C, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ _default = C = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
- _default = C;
void C;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).js
index 1d3a35f0fd7e5..7e1509a47ca07 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.3(module=system,target=es5).js
@@ -24,27 +24,23 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ exports_1("default", _default = C = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
- })();
- exports_1("default", _default = C);
+ return C = _classThis;
+ })());
void C;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=commonjs,target=es5).js
index ae562be681d14..5899f1e0e749f 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=commonjs,target=es5).js
@@ -16,31 +16,27 @@ export default class {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.default = void 0;
-var before, default_1, _default;
+var before, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+ exports.default = _default = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
+ return default_1 = _classThis;
})();
- exports.default = _default = default_1;
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=esnext,target=es5).js
index 27f560aa4b891..9e6dbbc765942 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=esnext,target=es5).js
@@ -14,31 +14,27 @@ export default class {
//// [usingDeclarationsWithESClassDecorators.4.js]
export { _default as default };
-var before, default_1, _default;
+var before, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+ _default = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
+ return default_1 = _classThis;
})();
- _default = default_1;
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).js
index fa2212110c910..fa1e2e819bbba 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.4(module=system,target=es5).js
@@ -15,7 +15,7 @@ export default class {
//// [usingDeclarationsWithESClassDecorators.4.js]
System.register([], function (exports_1, context_1) {
"use strict";
- var before, default_1, _default, env_1;
+ var before, _default, env_1;
var __moduleName = context_1 && context_1.id;
return {
setters: [],
@@ -23,27 +23,23 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var default_1 = _classThis = class {
- };
- __setFunctionName(_classThis, "default");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- default_1 = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return default_1 = _classThis;
+ exports_1("default", _default = (() => {
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var default_1 = _classThis = class {
+ };
+ __setFunctionName(_classThis, "default");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ default_1 = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return default_1;
- })();
- exports_1("default", _default = default_1);
+ return default_1 = _classThis;
+ })());
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=commonjs,target=es5).js
index ed55a951ce17e..19de7edc90d47 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=commonjs,target=es5).js
@@ -22,24 +22,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
exports.C = C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=esnext,target=es5).js
index 9436220a111b6..4179081e7f4e5 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=esnext,target=es5).js
@@ -20,24 +20,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).js
index ce84920a6a174..d9c54c762d45f 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.5(module=system,target=es5).js
@@ -25,24 +25,21 @@ System.register([], function (exports_1, context_1) {
try {
before = __addDisposableResource(env_1, null, false);
exports_1("C", C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})());
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=commonjs,target=es5).js
index 8397deb11138e..8a70ad08b5a5f 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=commonjs,target=es5).js
@@ -22,24 +22,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
exports.D = C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=esnext,target=es5).js
index 2d0aa6707666f..6ad0b8001504d 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=esnext,target=es5).js
@@ -20,24 +20,21 @@ const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).js
index 9bd87039cdf34..d3b4ca2386822 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.6(module=system,target=es5).js
@@ -25,24 +25,21 @@ System.register([], function (exports_1, context_1) {
try {
before = __addDisposableResource(env_1, null, false);
exports_1("D", C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})());
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=commonjs,target=es5).js
index f28e9fa86b092..2cdc9b7775365 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=commonjs,target=es5).js
@@ -17,24 +17,21 @@ using after = null;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=esnext,target=es5).js
index 313d8ebfcc12c..5d9a204a8a8d6 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=esnext,target=es5).js
@@ -15,24 +15,21 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.7.js]
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).js
index 793dd2c1b0716..8f49b34dbb515 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.7(module=system,target=es5).js
@@ -22,24 +22,21 @@ System.register([], function (exports_1, context_1) {
setters: [],
execute: function () {
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=commonjs,target=es5).js
index 8b9b38a8905f8..ae07806fa0be2 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=commonjs,target=es5).js
@@ -17,24 +17,21 @@ using after = null;
Object.defineProperty(exports, "__esModule", { value: true });
exports.C = void 0;
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports.C = C;
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=esnext,target=es5).js
index b7814aa602897..abd697b380533 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=esnext,target=es5).js
@@ -14,24 +14,21 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.8.js]
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
export { C };
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).js
index 1b6e8e852b6fc..b3c14f4536eb5 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.8(module=system,target=es5).js
@@ -21,24 +21,21 @@ System.register([], function (exports_1, context_1) {
setters: [],
execute: function () {
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports_1("C", C);
env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=commonjs,target=es5).js
index 0757663395c33..1d639b4a4a773 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=commonjs,target=es5).js
@@ -19,24 +19,21 @@ using after = null;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports.default = C;
void C;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=esnext,target=es5).js
index 2187affab15c3..ce2aab2ded16e 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=esnext,target=es5).js
@@ -17,24 +17,21 @@ using after = null;
//// [usingDeclarationsWithESClassDecorators.9.js]
let C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
export default C;
void C;
diff --git a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).js
index 0b3c4e863f3d9..1268ad3d00142 100644
--- a/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithESClassDecorators.9(module=system,target=es5).js
@@ -24,24 +24,21 @@ System.register([], function (exports_1, context_1) {
setters: [],
execute: function () {
C = (() => {
- let C = (() => {
- let _classDecorators = [dec];
- let _classDescriptor;
- let _classExtraInitializers = [];
- let _classThis;
- var C = _classThis = class {
- };
- __setFunctionName(_classThis, "C");
- (() => {
- const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
- __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
- C = _classThis = _classDescriptor.value;
- if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
- __runInitializers(_classThis, _classExtraInitializers);
- })();
- return C = _classThis;
+ let _classDecorators = [dec];
+ let _classDescriptor;
+ let _classExtraInitializers = [];
+ let _classThis;
+ var C = _classThis = class {
+ };
+ __setFunctionName(_classThis, "C");
+ (() => {
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+ __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+ C = _classThis = _classDescriptor.value;
+ if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+ __runInitializers(_classThis, _classExtraInitializers);
})();
- return C;
+ return C = _classThis;
})();
exports_1("default", C);
void C;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).js
index 0d2db1cb43077..b7056ebea45f6 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=commonjs,target=es5).js
@@ -19,14 +19,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=esnext,target=es5).js
index be88e9a3f92bf..b0cfcf2065e10 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=esnext,target=es5).js
@@ -17,14 +17,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).js
index b5f81e4b22ad1..e38f4368dd2b1 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.1(module=system,target=es5).js
@@ -23,14 +23,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).js
index f1757aa26f4f4..7d88c087818b4 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=commonjs,target=es5).js
@@ -15,14 +15,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.10.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-let default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
-})();
+let default_1 = class {
+};
+default_1 = __decorate([
+ dec
+], default_1);
exports.default = default_1;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=esnext,target=es5).js
index 0a19a414e2cee..0d6a670510e88 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=esnext,target=es5).js
@@ -13,14 +13,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.10.js]
-let default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
-})();
+let default_1 = class {
+};
+default_1 = __decorate([
+ dec
+], default_1);
export default default_1;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).js
index e5bf3353ebfea..f42cafc020f48 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.10(module=system,target=es5).js
@@ -20,14 +20,11 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
- })();
+ default_1 = class {
+ };
+ default_1 = __decorate([
+ dec
+ ], default_1);
exports_1("default", default_1);
env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
index 3a79c749f10bb..c8bba52f21d1d 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
@@ -18,15 +18,12 @@ using after = null;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.C = void 0;
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
exports.C = C;
+C = __decorate([
+ dec
+], C);
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=esnext,target=es5).js
index b3ff50d9a9dc8..9093751af8570 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=esnext,target=es5).js
@@ -15,14 +15,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.11.js]
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
export { C };
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
index 631b3ee0a2b3b..dc2c658a9102e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
@@ -22,15 +22,12 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
exports_1("C", C);
+ C = __decorate([
+ dec
+ ], C);
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
index 96d18bea0b0e3..311da78397ff9 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
@@ -18,15 +18,12 @@ using after = null;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.D = void 0;
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
exports.D = C;
+C = __decorate([
+ dec
+], C);
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=esnext,target=es5).js
index 026c9261c93c4..6a0dc99507452 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=esnext,target=es5).js
@@ -15,14 +15,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.12.js]
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
export { C as D };
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
index 1669ca166e664..eefdf3801c646 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
@@ -22,15 +22,12 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
exports_1("D", C);
+ C = __decorate([
+ dec
+ ], C);
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
index a4e14d47fabc0..e6b4a69a3397f 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
@@ -20,14 +20,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports.C = C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ exports.C = C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=esnext,target=es5).js
index 4349f4c845cff..8643cb7216193 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=esnext,target=es5).js
@@ -18,14 +18,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
index 50be39b30f0f0..2e1e558e1594a 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
@@ -23,14 +23,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports_1("C", C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })());
+ exports_1("C", C = class C {
+ });
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).js
index 383525d2bca2e..24b99f7ec2921 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=commonjs,target=es5).js
@@ -20,14 +20,11 @@ var before, C, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
exports.default = _default = C;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=esnext,target=es5).js
index 2e585cc4ab265..dc4b8a751a1db 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=esnext,target=es5).js
@@ -18,14 +18,11 @@ var before, C, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
_default = C;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).js
index 447fa894b4c74..7dc57efd1ae8a 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.3(module=system,target=es5).js
@@ -23,14 +23,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
exports_1("default", _default = C);
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).js
index 54cdaca49c74d..f5304502626a8 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=commonjs,target=es5).js
@@ -20,14 +20,11 @@ var before, default_1, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
- })();
+ default_1 = class {
+ };
+ default_1 = __decorate([
+ dec
+ ], default_1);
exports.default = _default = default_1;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=esnext,target=es5).js
index 310c248865715..78d86eeb20599 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=esnext,target=es5).js
@@ -18,14 +18,11 @@ var before, default_1, _default;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
- })();
+ default_1 = class {
+ };
+ default_1 = __decorate([
+ dec
+ ], default_1);
_default = default_1;
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).js
index 4df57d3fb1d0c..44c3493d3312e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.4(module=system,target=es5).js
@@ -23,14 +23,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- default_1 = (() => {
- let default_1 = class {
- };
- default_1 = __decorate([
- dec
- ], default_1);
- return default_1;
- })();
+ default_1 = class {
+ };
+ default_1 = __decorate([
+ dec
+ ], default_1);
exports_1("default", _default = default_1);
}
catch (e_1) {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
index d44f7e9c386a8..e332826c78a4f 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
@@ -21,14 +21,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports.C = C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ exports.C = C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=esnext,target=es5).js
index 70f241565b410..0d0242609312c 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=esnext,target=es5).js
@@ -19,14 +19,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
index c049792bfaa35..652bab2f0984e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
@@ -24,14 +24,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports_1("C", C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })());
+ exports_1("C", C = class C {
+ });
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
index 459c53406d152..9a90f1941fd5c 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
@@ -21,14 +21,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports.D = C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ exports.D = C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=esnext,target=es5).js
index 4b2c6fc873abb..f3762ca32533e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=esnext,target=es5).js
@@ -19,14 +19,11 @@ var before, C;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
index 3ed2d2db35419..0e927eee69e0f 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
@@ -24,14 +24,11 @@ System.register([], function (exports_1, context_1) {
env_1 = { stack: [], error: void 0, hasError: false };
try {
before = __addDisposableResource(env_1, null, false);
- exports_1("D", C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })());
+ exports_1("D", C = class C {
+ });
+ C = __decorate([
+ dec
+ ], C);
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).js
index ebd3fd480b1c0..c2103047fb56e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=commonjs,target=es5).js
@@ -15,14 +15,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.7.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=esnext,target=es5).js
index eb2abb2bdc237..9b8ec66516f8e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=esnext,target=es5).js
@@ -13,14 +13,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.7.js]
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).js
index 8c4da36233d15..7e32ca24eb2d9 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.7(module=system,target=es5).js
@@ -20,14 +20,11 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
index 7515f54868b85..ab2a975d5794d 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
@@ -16,15 +16,12 @@ using after = null;
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.C = void 0;
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
exports.C = C;
+C = __decorate([
+ dec
+], C);
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=esnext,target=es5).js
index 7fb5fec88e706..b87aac7bf4f42 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=esnext,target=es5).js
@@ -13,14 +13,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.8.js]
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
export { C };
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
index 05827e436662a..fdef92d90fc9d 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
@@ -20,15 +20,12 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
exports_1("C", C);
+ C = __decorate([
+ dec
+ ], C);
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).js
index cfeb9a6bed382..80064a1921b7b 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=commonjs,target=es5).js
@@ -15,14 +15,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.9.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
exports.default = C;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=esnext,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=esnext,target=es5).js
index 9238df55c2636..aa0f6687345e9 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=esnext,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=esnext,target=es5).js
@@ -13,14 +13,11 @@ using after = null;
//// [usingDeclarationsWithLegacyClassDecorators.9.js]
-let C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
-})();
+let C = class C {
+};
+C = __decorate([
+ dec
+], C);
export default C;
var after;
const env_1 = { stack: [], error: void 0, hasError: false };
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).js
index 5358f60c7e0bd..bcac7ec03c1d1 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.9(module=system,target=es5).js
@@ -20,14 +20,11 @@ System.register([], function (exports_1, context_1) {
return {
setters: [],
execute: function () {
- C = (() => {
- let C = class C {
- };
- C = __decorate([
- dec
- ], C);
- return C;
- })();
+ C = class C {
+ };
+ C = __decorate([
+ dec
+ ], C);
exports_1("default", C);
env_1 = { stack: [], error: void 0, hasError: false };
try {
diff --git a/tests/baselines/reference/variance.js b/tests/baselines/reference/variance.js
index 282224ab0f946..b92795896d7a7 100644
--- a/tests/baselines/reference/variance.js
+++ b/tests/baselines/reference/variance.js
@@ -36,13 +36,10 @@ const x = foo;
const y = foo;
const z = x;
// Repro from #30118
-let Bar = (() => {
- class Bar {
- cast(_name) { }
- pushThis() {
- Bar.instance.push(this);
- }
+class Bar {
+ cast(_name) { }
+ pushThis() {
+ Bar.instance.push(this);
}
- Bar.instance = [];
- return Bar;
-})();
+}
+Bar.instance = [];
diff --git a/tests/baselines/reference/witness.js b/tests/baselines/reference/witness.js
index 12150b3814692..43eb54d20be5f 100644
--- a/tests/baselines/reference/witness.js
+++ b/tests/baselines/reference/witness.js
@@ -251,12 +251,9 @@ class C2 {
var c2inst = new C2().n;
var c2inst;
// Constructor function property access
-let C3 = (() => {
- class C3 {
- }
- C3.q = C3.q;
- return C3;
-})();
+class C3 {
+}
+C3.q = C3.q;
var qq = C3.q;
var qq;
// Parentheses - tested a bunch above
From 19612b5307a2b0c20af65657865dc3b15b77dc4a Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 22:51:43 -0700
Subject: [PATCH 05/18] legacyDecorators.ts
---
src/compiler/transformers/legacyDecorators.ts | 12 ++----------
...decoratorMetadataRestParameterWithImportedType.js | 2 +-
...atorMetadataWithImportDeclarationNameCollision.js | 2 +-
...torMetadataWithImportDeclarationNameCollision2.js | 2 +-
...torMetadataWithImportDeclarationNameCollision3.js | 2 +-
...torMetadataWithImportDeclarationNameCollision4.js | 2 +-
...torMetadataWithImportDeclarationNameCollision5.js | 2 +-
...torMetadataWithImportDeclarationNameCollision6.js | 2 +-
...torMetadataWithImportDeclarationNameCollision7.js | 2 +-
...torMetadataWithImportDeclarationNameCollision8.js | 2 +-
tests/baselines/reference/decoratorOnClass2.js | 2 +-
tests/baselines/reference/decoratorOnClass3.js | 2 +-
.../reference/decoratorOnClassConstructor2.js | 2 +-
.../reference/decoratorOnClassConstructor3.js | 2 +-
.../amd/main.js | 2 +-
.../node/main.js | 2 +-
.../amd/main.js | 2 +-
.../node/main.js | 2 +-
.../emitDecoratorMetadataSystemJS/amd/main.js | 2 +-
.../emitDecoratorMetadataSystemJS/node/main.js | 2 +-
.../amd/main.js | 2 +-
.../node/main.js | 2 +-
.../amd/main.js | 2 +-
.../node/main.js | 2 +-
... and emit metadata (verbatimModuleSyntax=true).js | 2 +-
...adata (verbatimModuleSyntax=true).oldTranspile.js | 2 +-
...anspile with emit decorators and emit metadata.js | 2 +-
...emit decorators and emit metadata.oldTranspile.js | 2 +-
...ClassDecorators.11(module=commonjs,target=es5).js | 2 +-
...cyClassDecorators.11(module=system,target=es5).js | 4 ++--
...ClassDecorators.12(module=commonjs,target=es5).js | 2 +-
...cyClassDecorators.12(module=system,target=es5).js | 4 ++--
...yClassDecorators.2(module=commonjs,target=es5).js | 2 +-
...acyClassDecorators.2(module=system,target=es5).js | 4 ++--
...yClassDecorators.5(module=commonjs,target=es5).js | 2 +-
...acyClassDecorators.5(module=system,target=es5).js | 4 ++--
...yClassDecorators.6(module=commonjs,target=es5).js | 2 +-
...acyClassDecorators.6(module=system,target=es5).js | 4 ++--
...yClassDecorators.8(module=commonjs,target=es5).js | 2 +-
...acyClassDecorators.8(module=system,target=es5).js | 4 ++--
40 files changed, 47 insertions(+), 55 deletions(-)
diff --git a/src/compiler/transformers/legacyDecorators.ts b/src/compiler/transformers/legacyDecorators.ts
index 8edba2affaab3..366913e768421 100644
--- a/src/compiler/transformers/legacyDecorators.ts
+++ b/src/compiler/transformers/legacyDecorators.ts
@@ -327,11 +327,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S
const location = moveRangePastModifiers(node);
const classAlias = getClassAliasIfNeeded(node);
- // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
- // without any block-scoped variable collision handling
- const declName = languageVersion < ScriptTarget.ES2015 ?
- factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
- factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+ const declName = factory.getLocalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
// ... = class ${name} ${heritageClauses} {
// ${members}
@@ -687,11 +683,7 @@ export function transformLegacyDecorators(context: TransformationContext): (x: S
const classAlias = classAliases && classAliases[getOriginalNodeId(node)];
- // When we transform to ES5/3 this will be moved inside an IIFE and should reference the name
- // without any block-scoped variable collision handling
- const localName = languageVersion < ScriptTarget.ES2015 ?
- factory.getInternalName(node, /*allowComments*/ false, /*allowSourceMaps*/ true) :
- factory.getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
+ const localName = factory.getDeclarationName(node, /*allowComments*/ false, /*allowSourceMaps*/ true);
const decorate = emitHelpers().createDecorateHelper(decoratorExpressions, localName);
const expression = factory.createAssignment(localName, classAlias ? factory.createAssignment(classAlias, decorate) : decorate);
setEmitFlags(expression, EmitFlags.NoComments);
diff --git a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
index 2e1b3227ce714..87de928d6a703 100644
--- a/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
+++ b/tests/baselines/reference/decoratorMetadataRestParameterWithImportedType.js
@@ -95,7 +95,7 @@ __decorate([
__metadata("design:paramtypes", [aux1_1.SomeClass1]),
__metadata("design:returntype", void 0)
], ClassA.prototype, "foo", null);
-ClassA = __decorate([
+exports.ClassA = ClassA = __decorate([
annotation(),
__metadata("design:paramtypes", [aux_1.SomeClass])
], ClassA);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
index 489fc8b301883..55563b87fabfb 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision.js
@@ -47,7 +47,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [db_1.db])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
index f87c392506fda..ac4ba3b37b7a3 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision2.js
@@ -47,7 +47,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [db_1.db])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
index a2bc2fa78871b..fc23e4c6603de 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision3.js
@@ -47,7 +47,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [db.db])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
index 4adefa185ecad..c54e3fc2d0e1f 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision4.js
@@ -48,7 +48,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.default !== "undefined" && db_1.default.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
index 258752c3d24e8..f1f8861b1fe89 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision5.js
@@ -46,7 +46,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [db_1.default])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
index 6f069868b3b6e..b84f59d2321ce 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision6.js
@@ -46,7 +46,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [db_1.default])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
index 559bb8f55ae8c..b31903d4e2f74 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision7.js
@@ -47,7 +47,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.default !== "undefined" && db_1.default.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
index 9276409d1e8bf..773cec62a78ac 100644
--- a/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
+++ b/tests/baselines/reference/decoratorMetadataWithImportDeclarationNameCollision8.js
@@ -47,7 +47,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [database.db])
], MyClass);
diff --git a/tests/baselines/reference/decoratorOnClass2.js b/tests/baselines/reference/decoratorOnClass2.js
index 6ffb222821035..172324643a4bf 100644
--- a/tests/baselines/reference/decoratorOnClass2.js
+++ b/tests/baselines/reference/decoratorOnClass2.js
@@ -20,6 +20,6 @@ exports.C = void 0;
let C = class C {
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
dec
], C);
diff --git a/tests/baselines/reference/decoratorOnClass3.js b/tests/baselines/reference/decoratorOnClass3.js
index 25818eb3554be..2d9eaa878354a 100644
--- a/tests/baselines/reference/decoratorOnClass3.js
+++ b/tests/baselines/reference/decoratorOnClass3.js
@@ -21,6 +21,6 @@ exports.C = void 0;
let C = class C {
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
dec
], C);
diff --git a/tests/baselines/reference/decoratorOnClassConstructor2.js b/tests/baselines/reference/decoratorOnClassConstructor2.js
index 47446ce56291d..e147604ad77a7 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor2.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor2.js
@@ -43,6 +43,6 @@ let C = class C extends _0_ts_1.base {
}
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
__param(0, _0_ts_2.foo)
], C);
diff --git a/tests/baselines/reference/decoratorOnClassConstructor3.js b/tests/baselines/reference/decoratorOnClassConstructor3.js
index 99c74e4e33043..4007ee3f9ba7b 100644
--- a/tests/baselines/reference/decoratorOnClassConstructor3.js
+++ b/tests/baselines/reference/decoratorOnClassConstructor3.js
@@ -46,6 +46,6 @@ let C = class C extends _0_1.base {
}
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
__param(0, _0_2.foo)
], C);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
index dd654f608f921..a3a95a3d1607e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/amd/main.js
@@ -52,7 +52,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
}
};
exports.MyClass1 = MyClass1;
- MyClass1 = __decorate([
+ exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
index e6106eb40bb11..1abfa5ab8099c 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModules/node/main.js
@@ -51,7 +51,7 @@ let MyClass1 = class MyClass1 {
}
};
exports.MyClass1 = MyClass1;
-MyClass1 = __decorate([
+exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
index dd654f608f921..a3a95a3d1607e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/amd/main.js
@@ -52,7 +52,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
}
};
exports.MyClass1 = MyClass1;
- MyClass1 = __decorate([
+ exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
index e6106eb40bb11..1abfa5ab8099c 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataCommonJSISolatedModulesNoResolve/node/main.js
@@ -51,7 +51,7 @@ let MyClass1 = class MyClass1 {
}
};
exports.MyClass1 = MyClass1;
-MyClass1 = __decorate([
+exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
index dd654f608f921..a3a95a3d1607e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/amd/main.js
@@ -52,7 +52,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
}
};
exports.MyClass1 = MyClass1;
- MyClass1 = __decorate([
+ exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
index e6106eb40bb11..1abfa5ab8099c 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJS/node/main.js
@@ -51,7 +51,7 @@ let MyClass1 = class MyClass1 {
}
};
exports.MyClass1 = MyClass1;
-MyClass1 = __decorate([
+exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
index dd654f608f921..a3a95a3d1607e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/amd/main.js
@@ -52,7 +52,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
}
};
exports.MyClass1 = MyClass1;
- MyClass1 = __decorate([
+ exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
index e6106eb40bb11..1abfa5ab8099c 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModules/node/main.js
@@ -51,7 +51,7 @@ let MyClass1 = class MyClass1 {
}
};
exports.MyClass1 = MyClass1;
-MyClass1 = __decorate([
+exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
index dd654f608f921..a3a95a3d1607e 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/amd/main.js
@@ -52,7 +52,7 @@ define(["require", "exports", "angular2/core"], function (require, exports, ng)
}
};
exports.MyClass1 = MyClass1;
- MyClass1 = __decorate([
+ exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
index e6106eb40bb11..1abfa5ab8099c 100644
--- a/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
+++ b/tests/baselines/reference/project/emitDecoratorMetadataSystemJSISolatedModulesNoResolve/node/main.js
@@ -51,7 +51,7 @@ let MyClass1 = class MyClass1 {
}
};
exports.MyClass1 = MyClass1;
-MyClass1 = __decorate([
+exports.MyClass1 = MyClass1 = __decorate([
foo,
__metadata("design:paramtypes", [typeof (_a = typeof ng !== "undefined" && ng.ElementRef) === "function" ? _a : Object])
], MyClass1);
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
index b17219c66b8a1..a4e3499eab1dd 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).js
@@ -13,7 +13,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
index b17219c66b8a1..a4e3499eab1dd 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata (verbatimModuleSyntax=true).oldTranspile.js
@@ -13,7 +13,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
index b17219c66b8a1..a4e3499eab1dd 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.js
@@ -13,7 +13,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
index b17219c66b8a1..a4e3499eab1dd 100644
--- a/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
+++ b/tests/baselines/reference/transpile/Transpile with emit decorators and emit metadata.oldTranspile.js
@@ -13,7 +13,7 @@ let MyClass = class MyClass {
}
};
exports.MyClass = MyClass;
-MyClass = __decorate([
+exports.MyClass = MyClass = __decorate([
someDecorator,
__metadata("design:paramtypes", [typeof (_a = typeof db_1.db !== "undefined" && db_1.db) === "function" ? _a : Object])
], MyClass);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
index c8bba52f21d1d..f8dd7ad608931 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=commonjs,target=es5).js
@@ -21,7 +21,7 @@ exports.C = void 0;
let C = class C {
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
dec
], C);
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
index dc2c658a9102e..d43c78d6fd206 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.11(module=system,target=es5).js
@@ -25,9 +25,9 @@ System.register([], function (exports_1, context_1) {
C = class C {
};
exports_1("C", C);
- C = __decorate([
+ exports_1("C", C = __decorate([
dec
- ], C);
+ ], C));
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
index 311da78397ff9..ab54db5b65d06 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=commonjs,target=es5).js
@@ -21,7 +21,7 @@ exports.D = void 0;
let C = class C {
};
exports.D = C;
-C = __decorate([
+exports.D = C = __decorate([
dec
], C);
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
index eefdf3801c646..ef4e15941152e 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.12(module=system,target=es5).js
@@ -25,9 +25,9 @@ System.register([], function (exports_1, context_1) {
C = class C {
};
exports_1("D", C);
- C = __decorate([
+ exports_1("D", C = __decorate([
dec
- ], C);
+ ], C));
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
index e6b4a69a3397f..110e2d0686a68 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=commonjs,target=es5).js
@@ -22,7 +22,7 @@ try {
before = __addDisposableResource(env_1, null, false);
exports.C = C = class C {
};
- C = __decorate([
+ exports.C = C = __decorate([
dec
], C);
}
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
index 2e1e558e1594a..e32aea12a16c7 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.2(module=system,target=es5).js
@@ -25,9 +25,9 @@ System.register([], function (exports_1, context_1) {
before = __addDisposableResource(env_1, null, false);
exports_1("C", C = class C {
});
- C = __decorate([
+ exports_1("C", C = __decorate([
dec
- ], C);
+ ], C));
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
index e332826c78a4f..c5eaee6126599 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=commonjs,target=es5).js
@@ -23,7 +23,7 @@ try {
before = __addDisposableResource(env_1, null, false);
exports.C = C = class C {
};
- C = __decorate([
+ exports.C = C = __decorate([
dec
], C);
}
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
index 652bab2f0984e..6b859f60e6a3d 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.5(module=system,target=es5).js
@@ -26,9 +26,9 @@ System.register([], function (exports_1, context_1) {
before = __addDisposableResource(env_1, null, false);
exports_1("C", C = class C {
});
- C = __decorate([
+ exports_1("C", C = __decorate([
dec
- ], C);
+ ], C));
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
index 9a90f1941fd5c..e6d605175bedc 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=commonjs,target=es5).js
@@ -23,7 +23,7 @@ try {
before = __addDisposableResource(env_1, null, false);
exports.D = C = class C {
};
- C = __decorate([
+ exports.D = C = __decorate([
dec
], C);
}
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
index 0e927eee69e0f..c49f186a62b8a 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.6(module=system,target=es5).js
@@ -26,9 +26,9 @@ System.register([], function (exports_1, context_1) {
before = __addDisposableResource(env_1, null, false);
exports_1("D", C = class C {
});
- C = __decorate([
+ exports_1("D", C = __decorate([
dec
- ], C);
+ ], C));
}
catch (e_1) {
env_1.error = e_1;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
index ab2a975d5794d..d3f6f053686b2 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=commonjs,target=es5).js
@@ -19,7 +19,7 @@ exports.C = void 0;
let C = class C {
};
exports.C = C;
-C = __decorate([
+exports.C = C = __decorate([
dec
], C);
var after;
diff --git a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
index fdef92d90fc9d..aa595d326bc71 100644
--- a/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
+++ b/tests/baselines/reference/usingDeclarationsWithLegacyClassDecorators.8(module=system,target=es5).js
@@ -23,9 +23,9 @@ System.register([], function (exports_1, context_1) {
C = class C {
};
exports_1("C", C);
- C = __decorate([
+ exports_1("C", C = __decorate([
dec
- ], C);
+ ], C));
env_1 = { stack: [], error: void 0, hasError: false };
try {
after = __addDisposableResource(env_1, null, false);
From 656ecb4c0aae2cacba1a4f7eb2fceaf6340c2541 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 22:57:56 -0700
Subject: [PATCH 06/18] es2018.ts
---
src/compiler/transformers/es2018.ts | 5 +----
.../reference/emitter.asyncGenerators.classMethods.es5.js | 5 ++++-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/compiler/transformers/es2018.ts b/src/compiler/transformers/es2018.ts
index c8894d336af1c..0156ce7020637 100644
--- a/src/compiler/transformers/es2018.ts
+++ b/src/compiler/transformers/es2018.ts
@@ -41,7 +41,6 @@ import {
FunctionLikeDeclaration,
GeneratedIdentifierFlags,
GetAccessorDeclaration,
- getEmitScriptTarget,
getFunctionFlags,
getNodeId,
hasSyntacticModifier,
@@ -82,7 +81,6 @@ import {
processTaggedTemplateExpression,
PropertyAccessExpression,
ReturnStatement,
- ScriptTarget,
SetAccessorDeclaration,
setEmitFlags,
setOriginalNode,
@@ -162,7 +160,6 @@ export function transformES2018(context: TransformationContext): (x: SourceFile
const resolver = context.getEmitResolver();
const compilerOptions = context.getCompilerOptions();
- const languageVersion = getEmitScriptTarget(compilerOptions);
const previousOnEmitNode = context.onEmitNode;
context.onEmitNode = onEmitNode;
@@ -1191,7 +1188,7 @@ export function transformES2018(context: TransformationContext): (x: SourceFile
// Minor optimization, emit `_super` helper to capture `super` access in an arrow.
// This step isn't needed if we eventually transform this to ES5.
- const emitSuperHelpers = languageVersion >= ScriptTarget.ES2015 && (resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync));
+ const emitSuperHelpers = resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync);
if (emitSuperHelpers) {
enableSubstitutionForAsyncMethodsWithSuper();
const variableStatement = createSuperAccessVariableStatement(factory, resolver, node, capturedSuperProperties);
diff --git a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
index 274ad803464fa..1f3c979593917 100644
--- a/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
+++ b/tests/baselines/reference/emitter.asyncGenerators.classMethods.es5.js
@@ -272,8 +272,11 @@ class B9 {
}
class C9 extends B9 {
f() {
+ const _super = Object.create(null, {
+ g: { get: () => super.g }
+ });
return __asyncGenerator(this, arguments, function* f_1() {
- super.g();
+ _super.g.call(this);
});
}
}
From a8189b3ca8a14e7bd71ce84817b9aca66f8fe900 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:03:13 -0700
Subject: [PATCH 07/18] es2017.ts
---
src/compiler/transformers/es2017.ts | 35 ++---------------
.../asyncAwaitIsolatedModules_es5.js | 14 +++----
tests/baselines/reference/asyncAwait_es5.js | 14 +++----
.../asyncFunctionDeclaration15_es5.js | 2 +-
.../reference/asyncImportedPromise_es5.js | 2 +-
.../reference/asyncMethodWithSuper_es5.js | 38 ++++++++++++-------
.../reference/asyncQualifiedReturnType_es5.js | 2 +-
7 files changed, 46 insertions(+), 61 deletions(-)
diff --git a/src/compiler/transformers/es2017.ts b/src/compiler/transformers/es2017.ts
index 3a80a84334eef..23a1b46f14314 100644
--- a/src/compiler/transformers/es2017.ts
+++ b/src/compiler/transformers/es2017.ts
@@ -35,8 +35,6 @@ import {
FunctionLikeDeclaration,
GeneratedIdentifierFlags,
GetAccessorDeclaration,
- getEmitScriptTarget,
- getEntityNameFromTypeNode,
getFunctionFlags,
getInitializedVariables,
getNodeId,
@@ -47,10 +45,8 @@ import {
isBlock,
isConciseBody,
isEffectiveStrictModeSourceFile,
- isEntityName,
isExpression,
isForInitializer,
- isFunctionLike,
isFunctionLikeDeclaration,
isIdentifier,
isModifier,
@@ -73,7 +69,6 @@ import {
ParameterDeclaration,
PropertyAccessExpression,
PropertyAssignment,
- ScriptTarget,
SetAccessorDeclaration,
setEmitFlags,
setOriginalNode,
@@ -86,8 +81,6 @@ import {
TextRange,
TransformationContext,
TransformFlags,
- TypeNode,
- TypeReferenceSerializationKind,
unescapeLeadingUnderscores,
VariableDeclaration,
VariableDeclarationList,
@@ -127,7 +120,6 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
const resolver = context.getEmitResolver();
const compilerOptions = context.getCompilerOptions();
- const languageVersion = getEmitScriptTarget(compilerOptions);
/**
* Keeps track of whether expression substitution has been enabled for specific edge cases.
@@ -659,8 +651,7 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
// Minor optimization, emit `_super` helper to capture `super` access in an arrow.
// This step isn't needed if we eventually transform this to ES5.
const originalMethod = getOriginalNode(node, isFunctionLikeDeclaration);
- const emitSuperHelpers = languageVersion >= ScriptTarget.ES2015 &&
- (resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync)) &&
+ const emitSuperHelpers = (resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync)) &&
(getFunctionFlags(originalMethod) & FunctionFlags.AsyncGenerator) !== FunctionFlags.AsyncGenerator;
if (emitSuperHelpers) {
@@ -739,9 +730,6 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
const innerParameters = !isSimpleParameterList(node.parameters) ? visitParameterList(node.parameters, visitor, context) : undefined;
resumeLexicalEnvironment();
- const original = getOriginalNode(node, isFunctionLike);
- const nodeType = original.type;
- const promiseConstructor = languageVersion < ScriptTarget.ES2015 ? getPromiseConstructor(nodeType) : undefined;
const isArrowFunction = node.kind === SyntaxKind.ArrowFunction;
const savedLexicalArgumentsBinding = lexicalArgumentsBinding;
const hasLexicalArguments = resolver.hasNodeCheckFlag(node, NodeCheckFlags.CaptureArguments);
@@ -808,7 +796,7 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
emitHelpers().createAwaiterHelper(
hasLexicalThis,
argumentsExpression,
- promiseConstructor,
+ /*promiseConstructor*/ undefined,
innerParameters,
asyncBody,
),
@@ -817,7 +805,7 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
// Minor optimization, emit `_super` helper to capture `super` access in an arrow.
// This step isn't needed if we eventually transform this to ES5.
- const emitSuperHelpers = languageVersion >= ScriptTarget.ES2015 && (resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync));
+ const emitSuperHelpers = resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAssignmentInAsync) || resolver.hasNodeCheckFlag(node, NodeCheckFlags.MethodWithSuperPropertyAccessInAsync);
if (emitSuperHelpers) {
enableSubstitutionForAsyncMethodsWithSuper();
@@ -851,7 +839,7 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
result = emitHelpers().createAwaiterHelper(
hasLexicalThis,
argumentsExpression,
- promiseConstructor,
+ /*promiseConstructor*/ undefined,
innerParameters,
asyncBody,
);
@@ -880,21 +868,6 @@ export function transformES2017(context: TransformationContext): (x: SourceFile
}
}
- function getPromiseConstructor(type: TypeNode | undefined) {
- const typeName = type && getEntityNameFromTypeNode(type);
- if (typeName && isEntityName(typeName)) {
- const serializationKind = resolver.getTypeReferenceSerializationKind(typeName);
- if (
- serializationKind === TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue
- || serializationKind === TypeReferenceSerializationKind.Unknown
- ) {
- return typeName;
- }
- }
-
- return undefined;
- }
-
function enableSubstitutionForAsyncMethodsWithSuper() {
if ((enabledSubstitutions & ES2017SubstitutionFlags.AsyncMethodsWithSuper) === 0) {
enabledSubstitutions |= ES2017SubstitutionFlags.AsyncMethodsWithSuper;
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index fce34fb096989..9be0eec2d917d 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -61,7 +61,7 @@ function f1() {
return __awaiter(this, void 0, void 0, function* () { });
}
function f3() {
- return __awaiter(this, void 0, missing_1.MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
let f4 = function () {
return __awaiter(this, void 0, void 0, function* () { });
@@ -70,15 +70,15 @@ let f5 = function () {
return __awaiter(this, void 0, void 0, function* () { });
};
let f6 = function () {
- return __awaiter(this, void 0, missing_1.MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
};
let f7 = () => __awaiter(void 0, void 0, void 0, function* () { });
let f8 = () => __awaiter(void 0, void 0, void 0, function* () { });
-let f9 = () => __awaiter(void 0, void 0, missing_1.MyPromise, function* () { });
+let f9 = () => __awaiter(void 0, void 0, void 0, function* () { });
let f10 = () => __awaiter(void 0, void 0, void 0, function* () { return p; });
let f11 = () => __awaiter(void 0, void 0, void 0, function* () { return mp; });
let f12 = () => __awaiter(void 0, void 0, void 0, function* () { return mp; });
-let f13 = () => __awaiter(void 0, void 0, missing_1.MyPromise, function* () { return p; });
+let f13 = () => __awaiter(void 0, void 0, void 0, function* () { return p; });
let o = {
m1() {
return __awaiter(this, void 0, void 0, function* () { });
@@ -87,7 +87,7 @@ let o = {
return __awaiter(this, void 0, void 0, function* () { });
},
m3() {
- return __awaiter(this, void 0, missing_1.MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
};
class C {
@@ -98,7 +98,7 @@ class C {
return __awaiter(this, void 0, void 0, function* () { });
}
m3() {
- return __awaiter(this, void 0, missing_1.MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
static m4() {
return __awaiter(this, void 0, void 0, function* () { });
@@ -107,7 +107,7 @@ class C {
return __awaiter(this, void 0, void 0, function* () { });
}
static m6() {
- return __awaiter(this, void 0, missing_1.MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
}
var M;
diff --git a/tests/baselines/reference/asyncAwait_es5.js b/tests/baselines/reference/asyncAwait_es5.js
index 2249e7bb31522..0ba7f4f57ec01 100644
--- a/tests/baselines/reference/asyncAwait_es5.js
+++ b/tests/baselines/reference/asyncAwait_es5.js
@@ -65,7 +65,7 @@ function f1() {
return __awaiter(this, void 0, void 0, function* () { });
}
function f3() {
- return __awaiter(this, void 0, MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
let f4 = function () {
return __awaiter(this, void 0, void 0, function* () { });
@@ -74,15 +74,15 @@ let f5 = function () {
return __awaiter(this, void 0, void 0, function* () { });
};
let f6 = function () {
- return __awaiter(this, void 0, MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
};
let f7 = () => __awaiter(this, void 0, void 0, function* () { });
let f8 = () => __awaiter(this, void 0, void 0, function* () { });
-let f9 = () => __awaiter(this, void 0, MyPromise, function* () { });
+let f9 = () => __awaiter(this, void 0, void 0, function* () { });
let f10 = () => __awaiter(this, void 0, void 0, function* () { return p; });
let f11 = () => __awaiter(this, void 0, void 0, function* () { return mp; });
let f12 = () => __awaiter(this, void 0, void 0, function* () { return mp; });
-let f13 = () => __awaiter(this, void 0, MyPromise, function* () { return p; });
+let f13 = () => __awaiter(this, void 0, void 0, function* () { return p; });
let o = {
m1() {
return __awaiter(this, void 0, void 0, function* () { });
@@ -91,7 +91,7 @@ let o = {
return __awaiter(this, void 0, void 0, function* () { });
},
m3() {
- return __awaiter(this, void 0, MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
};
class C {
@@ -102,7 +102,7 @@ class C {
return __awaiter(this, void 0, void 0, function* () { });
}
m3() {
- return __awaiter(this, void 0, MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
static m4() {
return __awaiter(this, void 0, void 0, function* () { });
@@ -111,7 +111,7 @@ class C {
return __awaiter(this, void 0, void 0, function* () { });
}
static m6() {
- return __awaiter(this, void 0, MyPromise, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
}
}
var M;
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es5.js b/tests/baselines/reference/asyncFunctionDeclaration15_es5.js
index 189aa917dd19d..9a5737d1524b0 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration15_es5.js
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es5.js
@@ -43,7 +43,7 @@ function fn5() {
return __awaiter(this, void 0, void 0, function* () { });
} // error
function fn6() {
- return __awaiter(this, void 0, Thenable, function* () { });
+ return __awaiter(this, void 0, void 0, function* () { });
} // error
function fn7() {
return __awaiter(this, void 0, void 0, function* () { return; });
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 91b131a9b32c3..5014f85267bf5 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -31,6 +31,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
const task_1 = require("./task");
class Test {
example() {
- return __awaiter(this, void 0, task_1.Task, function* () { return; });
+ return __awaiter(this, void 0, void 0, function* () { return; });
}
}
diff --git a/tests/baselines/reference/asyncMethodWithSuper_es5.js b/tests/baselines/reference/asyncMethodWithSuper_es5.js
index 7cf48bea1e72b..973a66e85459e 100644
--- a/tests/baselines/reference/asyncMethodWithSuper_es5.js
+++ b/tests/baselines/reference/asyncMethodWithSuper_es5.js
@@ -67,39 +67,51 @@ class A {
class B extends A {
// async method with only call/get on 'super' does not require a binding
simple() {
+ const _superIndex = name => super[name];
+ const _super = Object.create(null, {
+ x: { get: () => super.x },
+ y: { get: () => super.y }
+ });
return __awaiter(this, void 0, void 0, function* () {
// call with property access
- super.x();
+ _super.x.call(this);
// call additional property.
- super.y();
+ _super.y.call(this);
// call with element access
- super["x"]();
+ _superIndex("x").call(this);
// property access (read)
- const a = super.x;
+ const a = _super.x;
// element access (read)
- const b = super["x"];
+ const b = _superIndex("x");
});
}
// async method with assignment/destructuring on 'super' requires a binding
advanced() {
+ const _superIndex = (function (geti, seti) {
+ const cache = Object.create(null);
+ return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
+ })(name => super[name], (name, value) => super[name] = value);
+ const _super = Object.create(null, {
+ x: { get: () => super.x, set: v => super.x = v }
+ });
return __awaiter(this, void 0, void 0, function* () {
const f = () => { };
// call with property access
- super.x();
+ _super.x.call(this);
// call with element access
- super["x"]();
+ _superIndex("x").value.call(this);
// property access (read)
- const a = super.x;
+ const a = _super.x;
// element access (read)
- const b = super["x"];
+ const b = _superIndex("x").value;
// property access (assign)
- super.x = f;
+ _super.x = f;
// element access (assign)
- super["x"] = f;
+ _superIndex("x").value = f;
// destructuring assign with property access
- ({ f: super.x } = { f });
+ ({ f: _super.x } = { f });
// destructuring assign with element access
- ({ f: super["x"] } = { f });
+ ({ f: _superIndex("x").value } = { f });
});
}
}
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.js b/tests/baselines/reference/asyncQualifiedReturnType_es5.js
index 04f84300a2085..381b121316173 100644
--- a/tests/baselines/reference/asyncQualifiedReturnType_es5.js
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.js
@@ -17,6 +17,6 @@ var X;
X.MyPromise = MyPromise;
})(X || (X = {}));
function f() {
- return __awaiter(this, void 0, X.MyPromise, function* () {
+ return __awaiter(this, void 0, void 0, function* () {
});
}
From 6da599f853c7841aefd1aedbf1925837f5e47b18 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:08:43 -0700
Subject: [PATCH 08/18] classFields.ts
---
src/compiler/transformers/classFields.ts | 2 +-
.../classStaticBlock5(target=es5).js | 10 +-
.../baselines/reference/classStaticBlock6.js | 15 +-
tests/baselines/reference/errorSuperCalls.js | 2 +
.../javascriptThisAssignmentInStaticBlock.js | 6 +-
tests/baselines/reference/superAccess2.js | 7 +-
.../superInStaticMembers1(target=es5).js | 324 +++++++++---------
.../reference/thisAndSuperInStaticMembers3.js | 8 +-
.../reference/thisAndSuperInStaticMembers4.js | 8 +-
...typeOfThisInStaticMembers10(target=es5).js | 8 +-
...typeOfThisInStaticMembers11(target=es5).js | 8 +-
.../typeOfThisInStaticMembers3(target=es5).js | 6 +-
.../typeOfThisInStaticMembers4(target=es5).js | 6 +-
.../reference/typeOfThisInStaticMembers6.js | 4 +-
.../typeOfThisInStaticMembers7(target=es5).js | 6 +-
.../typeOfThisInStaticMembers9(target=es5).js | 6 +-
16 files changed, 218 insertions(+), 208 deletions(-)
diff --git a/src/compiler/transformers/classFields.ts b/src/compiler/transformers/classFields.ts
index 91b033e16acee..ec0850234941e 100644
--- a/src/compiler/transformers/classFields.ts
+++ b/src/compiler/transformers/classFields.ts
@@ -389,7 +389,7 @@ export function transformClassFields(context: TransformationContext): (x: Source
// We don't need to transform `super` property access when target <= ES5 because
// the es2015 transformation handles those.
- const shouldTransformSuperInStaticInitializers = shouldTransformThisInStaticInitializers && languageVersion >= ScriptTarget.ES2015;
+ const shouldTransformSuperInStaticInitializers = shouldTransformThisInStaticInitializers;
const shouldTransformAnything = shouldTransformInitializers ||
shouldTransformPrivateElementsOrClassStaticBlocks ||
diff --git a/tests/baselines/reference/classStaticBlock5(target=es5).js b/tests/baselines/reference/classStaticBlock5(target=es5).js
index 5fddbbff69b17..404ca2101ee19 100644
--- a/tests/baselines/reference/classStaticBlock5(target=es5).js
+++ b/tests/baselines/reference/classStaticBlock5(target=es5).js
@@ -19,18 +19,18 @@ class C extends B {
//// [classStaticBlock5.js]
-var _a;
+var _a, _b;
class B {
}
B.a = 1;
B.b = 2;
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
C.b = 3;
-C.c = super.a;
+C.c = Reflect.get(_b, "a", _a);
(() => {
_a.b;
- super.b;
- super.a;
+ Reflect.get(_b, "b", _a);
+ Reflect.get(_b, "a", _a);
})();
diff --git a/tests/baselines/reference/classStaticBlock6.js b/tests/baselines/reference/classStaticBlock6.js
index a4d5d60d8de19..2761dccac7a7e 100644
--- a/tests/baselines/reference/classStaticBlock6.js
+++ b/tests/baselines/reference/classStaticBlock6.js
@@ -86,12 +86,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
-var _a;
+var _a, _b, _c;
class B {
}
B.a = 1;
-class C extends B {
+class C extends (_b = B) {
}
+_a = C;
(() => {
let await = 1;
let arguments = 1;
@@ -107,8 +108,10 @@ class C extends B {
})();
class CC {
constructor() {
- class C extends B {
+ var _d, _e;
+ class C extends (_e = B) {
}
+ _d = C;
(() => {
class CC extends B {
constructor() {
@@ -148,12 +151,12 @@ function foo1() {
}
class foo2 {
}
-_a = foo2;
+_c = foo2;
(() => {
- _a.b; // should error
+ _c.b; // should error
let b; // ok
if (1) {
- _a.b; // should error
+ _c.b; // should error
}
})();
foo2.b = 1;
diff --git a/tests/baselines/reference/errorSuperCalls.js b/tests/baselines/reference/errorSuperCalls.js
index a3f996216160e..deb072983227c 100644
--- a/tests/baselines/reference/errorSuperCalls.js
+++ b/tests/baselines/reference/errorSuperCalls.js
@@ -77,6 +77,7 @@ class OtherDerived extends OtherBase {
//// [errorSuperCalls.js]
+var _a;
//super call in class constructor with no base type
class NoBase {
constructor() {
@@ -109,6 +110,7 @@ class NoBase {
super();
}
}
+_a = NoBase;
//super call in static class member initializer with no base type
NoBase.k = super();
class Base {
diff --git a/tests/baselines/reference/javascriptThisAssignmentInStaticBlock.js b/tests/baselines/reference/javascriptThisAssignmentInStaticBlock.js
index 076a555f3ccc2..f5385e55bf96d 100644
--- a/tests/baselines/reference/javascriptThisAssignmentInStaticBlock.js
+++ b/tests/baselines/reference/javascriptThisAssignmentInStaticBlock.js
@@ -21,7 +21,7 @@ class ElementsArray extends Array {
ElementsArray.isArray(new ElementsArray());
//// [a.js]
-var _a, _b;
+var _a, _b, _c;
class Thing {
}
_a = Thing;
@@ -30,11 +30,11 @@ _a = Thing;
})();
Thing.doSomething();
// GH#46468
-class ElementsArray extends Array {
+class ElementsArray extends (_c = Array) {
}
_b = ElementsArray;
(() => {
- const superisArray = super.isArray;
+ const superisArray = Reflect.get(_c, "isArray", _b);
const customIsArray = (arg) => superisArray(arg);
_b.isArray = customIsArray;
})();
diff --git a/tests/baselines/reference/superAccess2.js b/tests/baselines/reference/superAccess2.js
index 0c3109a23c5c2..2b2afa3993c66 100644
--- a/tests/baselines/reference/superAccess2.js
+++ b/tests/baselines/reference/superAccess2.js
@@ -27,11 +27,12 @@ class Q extends P {
}
//// [superAccess2.js]
+var _a, _b;
class P {
x() { }
static y() { }
}
-class Q extends P {
+class Q extends (_b = P) {
// Super is not allowed in constructor args
constructor(z = super., zz = super., zzz = () => super.) {
super();
@@ -47,5 +48,5 @@ class Q extends P {
super.y();
}
}
-Q.yy = super. // error for static initializer accessing super
-; // error for static initializer accessing super
+_a = Q;
+Q.yy = Reflect.get(_b, "", _a); // error for static initializer accessing super
diff --git a/tests/baselines/reference/superInStaticMembers1(target=es5).js b/tests/baselines/reference/superInStaticMembers1(target=es5).js
index ac79d84cc1479..a030079b5d66c 100644
--- a/tests/baselines/reference/superInStaticMembers1(target=es5).js
+++ b/tests/baselines/reference/superInStaticMembers1(target=es5).js
@@ -504,489 +504,489 @@ exports.default = default_1;
;
//// [locals.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
C._ = [
(() => {
var Reflect; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
var [Reflect] = [null]; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
class Reflect {
} // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
function Reflect() { } // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
let Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
; // no collision
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
(class Reflect {
}); // no collision
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
(() => {
(function Reflect() { }); // no collision
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})(),
];
(() => {
var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
var [Reflect] = [null]; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
var Reflect; // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
class Reflect {
} // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
function Reflect() { } // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
let Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
(class Reflect {
}); // no collision
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
(() => {
(function Reflect() { }); // no collision
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [varInContainingScopeStaticField1.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect = null; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [varInContainingScopeStaticField2.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [varInContainingScopeStaticField3.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var [Reflect] = [null]; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [varInContainingScopeStaticBlock1.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect = null; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [varInContainingScopeStaticBlock2.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [varInContainingScopeStaticBlock3.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var [Reflect] = [null]; // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [classDeclInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
class Reflect {
} // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [classDeclInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
class Reflect {
} // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [funcDeclInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
function Reflect() { } // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [funcDeclInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
function Reflect() { } // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [valueNamespaceInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [valueNamespaceInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [enumInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [enumInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
var Reflect;
(function (Reflect) {
})(Reflect || (Reflect = {})); // collision (es2015-es2021 only)
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [constEnumInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [constEnumInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [namespaceImportInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [namespaceImportInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [namedImportInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [namedImportInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [namedImportOfInterfaceInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [namedImportOfInterfaceInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [namedImportOfUninstantiatedNamespaceInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [namedImportOfUninstantiatedNamespaceInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [namedImportOfConstEnumInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [namedImportOfConstEnumInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [typeOnlyNamedImportInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [typeOnlyNamedImportInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [defaultImportInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [defaultImportInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [typeOnlyDefaultImportInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [typeOnlyDefaultImportInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [typeInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [typeInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [interfaceInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [interfaceInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [uninstantiatedNamespaceInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [uninstantiatedNamespaceInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
; // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [classExprInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
(class Reflect {
}); // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [classExprInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
(class Reflect {
}); // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [inContainingClassExprStaticField.js]
"use strict";
@@ -995,11 +995,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
(_a = class Reflect {
},
(() => {
- var _b;
- class C extends B {
+ var _b, _c;
+ class C extends (_c = B) {
}
_b = C;
- C._ = super.w();
+ C._ = Reflect.get(_c, "w", _b).call(_b);
})(),
_a);
//// [inContainingClassExprStaticBlock.js]
@@ -1009,54 +1009,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
(_a = class Reflect {
},
(() => {
- var _b;
- class C extends B {
+ var _b, _c;
+ class C extends (_c = B) {
}
_b = C;
(() => {
- super.w();
+ Reflect.get(_c, "w", _b).call(_b);
})();
})(),
_a);
//// [funcExprInContainingScopeStaticField.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() { }); // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
-C._ = super.w();
+C._ = Reflect.get(_b, "w", _a).call(_a);
//// [funcExprInContainingScopeStaticBlock.js]
"use strict";
-var _a;
+var _a, _b;
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() { }); // no collision
-class C extends B {
+class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
//// [inContainingFuncExprStaticField.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() {
- var _a;
- class C extends B {
+ var _a, _b;
+ class C extends (_b = B) {
}
_a = C;
- C._ = super.w();
+ C._ = Reflect.get(_b, "w", _a).call(_a);
});
//// [inContainingFuncExprStaticBlock.js]
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
(function Reflect() {
- var _a;
- class C extends B {
+ var _a, _b;
+ class C extends (_b = B) {
}
_a = C;
(() => {
- super.w();
+ Reflect.get(_b, "w", _a).call(_a);
})();
});
diff --git a/tests/baselines/reference/thisAndSuperInStaticMembers3.js b/tests/baselines/reference/thisAndSuperInStaticMembers3.js
index cdfd202fe5182..8ab6b91d5525c 100644
--- a/tests/baselines/reference/thisAndSuperInStaticMembers3.js
+++ b/tests/baselines/reference/thisAndSuperInStaticMembers3.js
@@ -25,8 +25,8 @@ class C extends B {
}
//// [thisAndSuperInStaticMembers3.js]
-var _a;
-class C extends B {
+var _a, _b;
+class C extends (_b = B) {
constructor() {
super(...arguments);
// these should be unaffected
@@ -91,11 +91,11 @@ Object.defineProperty(C, "z3", {
enumerable: true,
configurable: true,
writable: true,
- value: super.f()
+ value: Reflect.get(_b, "f", _a).call(_a)
});
Object.defineProperty(C, "z4", {
enumerable: true,
configurable: true,
writable: true,
- value: super["f"]()
+ value: Reflect.get(_b, "f", _a).call(_a)
});
diff --git a/tests/baselines/reference/thisAndSuperInStaticMembers4.js b/tests/baselines/reference/thisAndSuperInStaticMembers4.js
index f7abc92fb2a64..dcb95691f8b90 100644
--- a/tests/baselines/reference/thisAndSuperInStaticMembers4.js
+++ b/tests/baselines/reference/thisAndSuperInStaticMembers4.js
@@ -25,8 +25,8 @@ class C extends B {
}
//// [thisAndSuperInStaticMembers4.js]
-var _a;
-class C extends B {
+var _a, _b;
+class C extends (_b = B) {
constructor() {
super(...arguments);
// these should be unaffected
@@ -42,5 +42,5 @@ C.y2 = _a.x();
C.y3 = _a === null || _a === void 0 ? void 0 : _a.x();
C.y4 = _a[("x")]();
C.y5 = _a === null || _a === void 0 ? void 0 : _a[("x")]();
-C.z3 = super.f();
-C.z4 = super["f"]();
+C.z3 = Reflect.get(_b, "f", _a).call(_a);
+C.z4 = Reflect.get(_b, "f", _a).call(_a);
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
index 8e98aa178b8f1..478fdaddfec29 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers10(target=es5).js
@@ -57,7 +57,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-var _a, _b;
+var _a, _b, _c;
let C = class C {
};
C.a = 1;
@@ -78,7 +78,7 @@ let D = class D extends C {
};
D.c = 2;
D.d = (void 0).c + 1;
-D.e = super.a + (void 0).c + 1;
+D.e = (void 0).a + (void 0).c + 1;
D.f = () => (void 0).c + 1;
D.ff = function () { this.c + 1; };
D = __decorate([
@@ -89,7 +89,7 @@ class CC {
_a = CC;
CC.a = 1;
CC.b = _a.a + 1;
-class DD extends CC {
+class DD extends (_c = CC) {
static foo() {
return this.c + 1;
}
@@ -103,6 +103,6 @@ class DD extends CC {
_b = DD;
DD.c = 2;
DD.d = _b.c + 1;
-DD.e = super.a + _b.c + 1;
+DD.e = Reflect.get(_c, "a", _b) + _b.c + 1;
DD.f = () => _b.c + 1;
DD.ff = function () { this.c + 1; };
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
index 3f5a443903f74..e0b75ad9b1fb0 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers11(target=es5).js
@@ -57,7 +57,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
return c > 3 && r && Object.defineProperty(target, key, r), r;
};
-var _a, _b;
+var _a, _b, _c;
let C = class C {
};
Object.defineProperty(C, "a", {
@@ -102,7 +102,7 @@ Object.defineProperty(D, "e", {
enumerable: true,
configurable: true,
writable: true,
- value: super.a + (void 0).c + 1
+ value: (void 0).a + (void 0).c + 1
});
Object.defineProperty(D, "f", {
enumerable: true,
@@ -134,7 +134,7 @@ Object.defineProperty(CC, "b", {
writable: true,
value: _a.a + 1
});
-class DD extends CC {
+class DD extends (_c = CC) {
static foo() {
return this.c + 1;
}
@@ -162,7 +162,7 @@ Object.defineProperty(DD, "e", {
enumerable: true,
configurable: true,
writable: true,
- value: super.a + _b.c + 1
+ value: Reflect.get(_c, "a", _b) + _b.c + 1
});
Object.defineProperty(DD, "f", {
enumerable: true,
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
index ec89abc11bb40..be15f470ca94a 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).js
@@ -14,15 +14,15 @@ class D extends C {
//// [typeOfThisInStaticMembers3.js]
-var _a, _b;
+var _a, _b, _c;
class C {
}
_a = C;
C.a = 1;
C.b = _a.a + 1;
-class D extends C {
+class D extends (_c = C) {
}
_b = D;
D.c = 2;
D.d = _b.c + 1;
-D.e = super.a + _b.c + 1;
+D.e = Reflect.get(_c, "a", _b) + _b.c + 1;
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
index 4a97cbb6c1da2..3d98ea273333a 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).js
@@ -14,7 +14,7 @@ class D extends C {
//// [typeOfThisInStaticMembers4.js]
-var _a, _b;
+var _a, _b, _c;
class C {
}
_a = C;
@@ -30,7 +30,7 @@ Object.defineProperty(C, "b", {
writable: true,
value: _a.a + 1
});
-class D extends C {
+class D extends (_c = C) {
}
_b = D;
Object.defineProperty(D, "c", {
@@ -49,5 +49,5 @@ Object.defineProperty(D, "e", {
enumerable: true,
configurable: true,
writable: true,
- value: super.a + _b.c + 1
+ value: Reflect.get(_c, "a", _b) + _b.c + 1
});
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers6.js b/tests/baselines/reference/typeOfThisInStaticMembers6.js
index bdd4293bcf60a..7fd5a7d530f72 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers6.js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers6.js
@@ -11,9 +11,11 @@ class D extends C {
//// [typeOfThisInStaticMembers6.js]
+var _a, _b;
class C {
}
C.f = 1;
-class D extends C {
+class D extends (_b = C) {
}
+_a = D;
D.c = super();
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
index e55d2443df425..4a3e24c874aeb 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).js
@@ -14,15 +14,15 @@ class D extends C {
//// [typeOfThisInStaticMembers7.js]
-var _a, _b;
+var _a, _b, _c;
class C {
}
_a = C;
C.a = 1;
C.b = _a.a + 1;
-class D extends C {
+class D extends (_c = C) {
}
_b = D;
D.c = 2;
D.d = _b.c + 1;
-D.e = 1 + (super.a) + (_b.c + 1) + 1;
+D.e = 1 + (Reflect.get(_c, "a", _b)) + (_b.c + 1) + 1;
diff --git a/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js b/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
index 6b170c4fcdb07..f435f053ff5c9 100644
--- a/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
+++ b/tests/baselines/reference/typeOfThisInStaticMembers9(target=es5).js
@@ -24,12 +24,14 @@ class D extends C {
//// [typeOfThisInStaticMembers9.js]
+var _a, _b;
class C {
}
C.f = 1;
-class D extends C {
+class D extends (_b = C) {
}
-D.arrowFunctionBoundary = () => super.f + 1;
+_a = D;
+D.arrowFunctionBoundary = () => Reflect.get(_b, "f", _a) + 1;
D.functionExprBoundary = function () { return super.f + 2; };
D.classExprBoundary = class {
constructor() {
From a0f670be5a5c3585a2bbf31b553e2cd9635ba8e4 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:12:23 -0700
Subject: [PATCH 09/18] nodeFactory.ts
---
src/compiler/factory/nodeFactory.ts | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/compiler/factory/nodeFactory.ts b/src/compiler/factory/nodeFactory.ts
index c7286dc33c677..45cd664ccd06b 100644
--- a/src/compiler/factory/nodeFactory.ts
+++ b/src/compiler/factory/nodeFactory.ts
@@ -6665,9 +6665,7 @@ export function createNodeFactory(flags: NodeFactoryFlags, baseFactory: BaseNode
}
else if (isSuperKeyword(callee)) {
thisArg = createThis();
- target = languageVersion !== undefined && languageVersion < ScriptTarget.ES2015
- ? setTextRange(createIdentifier("_super"), callee)
- : callee as PrimaryExpression;
+ target = callee as PrimaryExpression;
}
else if (getEmitFlags(callee) & EmitFlags.HelperName) {
thisArg = createVoidZero();
From 43eb9da1a903687129513dab62583578d2a8d898 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:16:01 -0700
Subject: [PATCH 10/18] emitHelpers.ts
---
src/compiler/factory/emitHelpers.ts | 31 +-----
.../anyAndUnknownHaveFalsyComponents.js | 15 +--
.../contextualTypeObjectSpreadExpression.js | 13 +--
...declarationEmitReadonlyComputedProperty.js | 13 +--
.../declarationEmitSpreadStringlyKeyedEnum.js | 13 +--
...ationEmitStringEnumUsedInNonlocalSpread.js | 13 +--
...iveInternalTypesProduceUniqueTypeParams.js | 13 +--
.../reference/destructuringFromUnionSpread.js | 13 +--
...ingInitializerContextualTypeFromContext.js | 13 +--
.../reference/destructuringSpread.js | 19 +---
.../excessPropertyCheckWithSpread.js | 15 +--
.../excessPropertyCheckWithUnions.js | 13 +--
...xplicitAnyAfterSpreadNoImplicitAnyError.js | 13 +--
.../reference/genericIsNeverEmptyObject.js | 13 +--
.../baselines/reference/importHelpersInTsx.js | 16 +--
.../reference/importHelpersNoHelpers.js | 2 +-
.../reference/intersectionPropertyCheck.js | 13 +--
.../reference/intraExpressionInferences.js | 13 +--
...sxComplexSignatureHasApplicabilityError.js | 13 +--
.../jsxExcessPropsAndAssignability.js | 15 +--
...xJsxsCjsTransformKeyProp(jsx=react-jsx).js | 15 +--
...xsCjsTransformKeyProp(jsx=react-jsxdev).js | 15 +--
...sformKeyPropCustomImport(jsx=react-jsx).js | 15 +--
...rmKeyPropCustomImport(jsx=react-jsxdev).js | 15 +--
...eyPropCustomImportPragma(jsx=react-jsx).js | 30 +----
...ropCustomImportPragma(jsx=react-jsxdev).js | 30 +----
.../jsxNamespacePrefixInNameReact.js | 15 +--
.../reference/jsxSpreadFirstUnionNoErrors.js | 13 +--
.../reference/literalTypeWidening.js | 13 +--
.../objectInstantiationFromUnionSpread.js | 15 +--
.../objectLiteralFreshnessWithSpread.js | 13 +--
.../reference/objectLiteralNormalization.js | 15 +--
tests/baselines/reference/objectSpread.js | 105 ++++++++----------
.../reference/objectSpreadComputedProperty.js | 17 +--
.../reference/objectSpreadIndexSignature.js | 19 +---
.../reference/objectSpreadNegative.js | 51 ++++-----
.../reference/objectSpreadNegativeParse.js | 19 +---
.../objectSpreadRepeatedComplexity.js | 13 +--
.../objectSpreadRepeatedNullCheckPerf.js | 13 +--
.../reference/objectSpreadStrictNull.js | 31 ++----
...preadWithinMethodWithinObjectWithSpread.js | 15 +--
...kIntersectionCheckCorrectlyCachesErrors.js | 13 +--
.../reference/reactHOCSpreadprops.js | 13 +--
.../reference/reactNamespaceJSXEmit.js | 17 +--
.../reactReadonlyHOCAssignabilityReal.js | 13 +--
.../reactTagNameComponentWithPropsNoOOM.js | 13 +--
.../reactTagNameComponentWithPropsNoOOM2.js | 13 +--
...reverseMappedTypeIntersectionConstraint.js | 13 +--
.../spreadContextualTypedBindingPattern.js | 13 +--
tests/baselines/reference/spreadDuplicate.js | 27 ++---
.../reference/spreadDuplicateExact.js | 27 ++---
.../reference/spreadExcessProperty.js | 13 +--
.../spreadExpressionContextualType.js | 15 +--
...adExpressionContextualTypeWithNamespace.js | 13 +--
.../reference/spreadIdenticalTypesRemoved.js | 15 +--
.../baselines/reference/spreadIntersection.js | 15 +--
.../reference/spreadIntersectionJsx.js | 13 +--
.../reference/spreadInvalidArgumentType.js | 49 ++++----
.../baselines/reference/spreadNonPrimitive.js | 13 +--
.../reference/spreadObjectOrFalsy.js | 25 ++---
...tions(exactoptionalpropertytypes=false).js | 41 +++----
...ations(exactoptionalpropertytypes=true).js | 41 +++----
...ithIndexDoesNotAddUndefinedToLocalIndex.js | 13 +--
...ObjectLiteralAssignableToIndexSignature.js | 23 +---
.../reference/spreadOverwritesProperty.js | 21 +---
.../spreadOverwritesPropertyStrict.js | 37 +++---
.../reference/spreadTypeRemovesReadonly.js | 13 +--
.../baselines/reference/spreadTypeVariable.js | 23 +---
tests/baselines/reference/spreadUnion.js | 17 +--
tests/baselines/reference/spreadUnion2.js | 23 +---
tests/baselines/reference/spreadUnion3.js | 19 +---
tests/baselines/reference/spreadUnion4.js | 13 +--
.../reference/strictOptionalProperties1.js | 15 +--
...aggedTemplateStringsWithCurriedFunction.js | 21 +---
...rivialSubtypeReductionNoStructuralCheck.js | 13 +--
...ivialSubtypeReductionNoStructuralCheck2.js | 13 +--
...lpers-backing-types-removed-incremental.js | 3 +-
...portHelpers-backing-types-removed-watch.js | 3 +-
.../reference/tsxExternalModuleEmit2.js | 13 +--
.../reference/tsxNotUsingApparentTypeOfSFC.js | 15 +--
tests/baselines/reference/tsxReactEmit2.js | 21 +---
tests/baselines/reference/tsxReactEmit4.js | 13 +--
tests/baselines/reference/tsxReactEmit5.js | 13 +--
tests/baselines/reference/tsxReactEmit6.js | 13 +--
...ctPropsInferenceSucceedsOnIntersections.js | 13 +--
...ildrenInvalidType(jsx=react,target=es5).js | 13 +--
...enInvalidType(jsx=react-jsx,target=es5).js | 13 +--
.../tsxSpreadDoesNotReportExcessProps.js | 13 +--
.../unionExcessPropsWithPartialMember.js | 13 +--
tests/baselines/reference/unknownType1.js | 19 +---
90 files changed, 313 insertions(+), 1313 deletions(-)
diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts
index 255518a2842cf..d54a8fee68b25 100644
--- a/src/compiler/factory/emitHelpers.ts
+++ b/src/compiler/factory/emitHelpers.ts
@@ -16,7 +16,6 @@ import {
FunctionExpression,
GeneratedIdentifierFlags,
getEmitFlags,
- getEmitScriptTarget,
getPropertyNameOfBindingOrAssignmentElement,
Identifier,
InternalEmitFlags,
@@ -28,7 +27,6 @@ import {
ObjectLiteralElementLike,
ParameterDeclaration,
PrivateIdentifier,
- ScriptTarget,
setEmitFlags,
setInternalEmitFlags,
setTextRange,
@@ -400,15 +398,7 @@ export function createEmitHelperFactory(context: TransformationContext): EmitHel
// ES2018 Helpers
function createAssignHelper(attributesSegments: Expression[]) {
- if (getEmitScriptTarget(context.getCompilerOptions()) >= ScriptTarget.ES2015) {
- return factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "assign"), /*typeArguments*/ undefined, attributesSegments);
- }
- context.requestEmitHelper(assignHelper);
- return factory.createCallExpression(
- getUnscopedHelperName("__assign"),
- /*typeArguments*/ undefined,
- attributesSegments,
- );
+ return factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier("Object"), "assign"), /*typeArguments*/ undefined, attributesSegments);
}
function createAwaitHelper(expression: Expression) {
@@ -816,25 +806,6 @@ const runInitializersHelper: UnscopedEmitHelper = {
// ES2018 Helpers
-const assignHelper: UnscopedEmitHelper = {
- name: "typescript:assign",
- importName: "__assign",
- scoped: false,
- priority: 1,
- text: `
- var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
- };`,
-};
-
const awaitHelper: UnscopedEmitHelper = {
name: "typescript:await",
importName: "__await",
diff --git a/tests/baselines/reference/anyAndUnknownHaveFalsyComponents.js b/tests/baselines/reference/anyAndUnknownHaveFalsyComponents.js
index e793b344ad0bc..57b210842881a 100644
--- a/tests/baselines/reference/anyAndUnknownHaveFalsyComponents.js
+++ b/tests/baselines/reference/anyAndUnknownHaveFalsyComponents.js
@@ -31,26 +31,15 @@ function foo2() {
//// [anyAndUnknownHaveFalsyComponents.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const y1 = x1 && 3;
function foo1() {
- return __assign({ display: "block" }, (isTreeHeader1 && {
+ return Object.assign({ display: "block" }, (isTreeHeader1 && {
display: "flex",
}));
}
const y2 = x2 && 3;
function foo2() {
- return __assign({ display: "block" }, (isTreeHeader1 && {
+ return Object.assign({ display: "block" }, (isTreeHeader1 && {
display: "flex",
}));
}
diff --git a/tests/baselines/reference/contextualTypeObjectSpreadExpression.js b/tests/baselines/reference/contextualTypeObjectSpreadExpression.js
index 032928668ed5c..dc90049321175 100644
--- a/tests/baselines/reference/contextualTypeObjectSpreadExpression.js
+++ b/tests/baselines/reference/contextualTypeObjectSpreadExpression.js
@@ -9,16 +9,5 @@ i = { ...{ a: "a" } };
//// [contextualTypeObjectSpreadExpression.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let i;
-i = __assign({ a: "a" });
+i = Object.assign({ a: "a" });
diff --git a/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js b/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js
index 670c91f5aba38..5bbd2be5deab6 100644
--- a/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js
+++ b/tests/baselines/reference/declarationEmitReadonlyComputedProperty.js
@@ -33,21 +33,10 @@ function createInstance() {
}
//// [index.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.spread = void 0;
const bug_1 = require("./bug");
-exports.spread = __assign({}, (0, bug_1.createInstance)());
+exports.spread = Object.assign({}, (0, bug_1.createInstance)());
//// [bug.d.ts]
diff --git a/tests/baselines/reference/declarationEmitSpreadStringlyKeyedEnum.js b/tests/baselines/reference/declarationEmitSpreadStringlyKeyedEnum.js
index ed33b7fe09199..1aaa6b30c4875 100644
--- a/tests/baselines/reference/declarationEmitSpreadStringlyKeyedEnum.js
+++ b/tests/baselines/reference/declarationEmitSpreadStringlyKeyedEnum.js
@@ -6,17 +6,6 @@ export const SpotifyAgeGroupEnum = { ...AgeGroups };
//// [declarationEmitSpreadStringlyKeyedEnum.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.SpotifyAgeGroupEnum = void 0;
var AgeGroups;
@@ -29,7 +18,7 @@ var AgeGroups;
AgeGroups[AgeGroups["45-59"] = 5] = "45-59";
AgeGroups[AgeGroups["60-150"] = 6] = "60-150";
})(AgeGroups || (AgeGroups = {}));
-exports.SpotifyAgeGroupEnum = __assign({}, AgeGroups);
+exports.SpotifyAgeGroupEnum = Object.assign({}, AgeGroups);
//// [declarationEmitSpreadStringlyKeyedEnum.d.ts]
diff --git a/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.js b/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.js
index b9e1f3e3e9d4b..2b76c687bbf6c 100644
--- a/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.js
+++ b/tests/baselines/reference/declarationEmitStringEnumUsedInNonlocalSpread.js
@@ -46,23 +46,12 @@ class A {
exports.A = A;
//// [index.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.B = void 0;
const class_1 = require("./class");
class B extends class_1.A {
getA() {
- return __assign(__assign({}, super.getA()), { a: '123' });
+ return Object.assign(Object.assign({}, super.getA()), { a: '123' });
}
}
exports.B = B;
diff --git a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
index 618990a5f976c..eefbdc979e969 100644
--- a/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
+++ b/tests/baselines/reference/declarationsWithRecursiveInternalTypesProduceUniqueTypeParams.js
@@ -46,17 +46,6 @@ void p3.result.three;
"use strict";
// Note that both of the following have an `any` in their return type from where we bottom out the type printout
// for having too many instances of the same symbol nesting.
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.testRecFun = exports.updateIfChanged = void 0;
const updateIfChanged = (t) => {
@@ -73,7 +62,7 @@ exports.updateIfChanged = updateIfChanged;
const testRecFun = (parent) => {
return {
result: parent,
- deeper: (child) => (0, exports.testRecFun)(__assign(__assign({}, parent), child))
+ deeper: (child) => (0, exports.testRecFun)(Object.assign(Object.assign({}, parent), child))
};
};
exports.testRecFun = testRecFun;
diff --git a/tests/baselines/reference/destructuringFromUnionSpread.js b/tests/baselines/reference/destructuringFromUnionSpread.js
index 420a13ded7a84..0adf7740fbe66 100644
--- a/tests/baselines/reference/destructuringFromUnionSpread.js
+++ b/tests/baselines/reference/destructuringFromUnionSpread.js
@@ -9,15 +9,4 @@ const { a } = { ...x } // error
//// [destructuringFromUnionSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const { a } = __assign({}, x); // error
+const { a } = Object.assign({}, x); // error
diff --git a/tests/baselines/reference/destructuringInitializerContextualTypeFromContext.js b/tests/baselines/reference/destructuringInitializerContextualTypeFromContext.js
index dab669996f53a..66feadde79dc3 100644
--- a/tests/baselines/reference/destructuringInitializerContextualTypeFromContext.js
+++ b/tests/baselines/reference/destructuringInitializerContextualTypeFromContext.js
@@ -29,17 +29,6 @@ f(([_1, _2 = undefined]) => undefined)
//// [destructuringInitializerContextualTypeFromContext.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __rest = (this && this.__rest) || function (s, e) {
var t = {};
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -53,7 +42,7 @@ var __rest = (this && this.__rest) || function (s, e) {
};
const Parent = (_a) => {
var { children, name = "Artemis" } = _a, props = __rest(_a, ["children", "name"]);
- return Child(__assign({ name }, props));
+ return Child(Object.assign({ name }, props));
};
const Child = (_a) => {
var { children, name = "Artemis" } = _a, props = __rest(_a, ["children", "name"]);
diff --git a/tests/baselines/reference/destructuringSpread.js b/tests/baselines/reference/destructuringSpread.js
index c27b19a2440a1..709cc971e5837 100644
--- a/tests/baselines/reference/destructuringSpread.js
+++ b/tests/baselines/reference/destructuringSpread.js
@@ -31,20 +31,9 @@ const { c, d, e, f, g } = {
//// [destructuringSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const { x } = __assign({}, { x: 0 });
-const { y } = __assign({ y: 0 }, {});
-const { z, a, b } = __assign({ z: 0 }, { a: 0, b: 0 });
-const { c, d, e, f, g } = __assign(__assign({}, __assign(__assign({}, __assign({
+const { x } = Object.assign({}, { x: 0 });
+const { y } = Object.assign({ y: 0 }, {});
+const { z, a, b } = Object.assign({ z: 0 }, { a: 0, b: 0 });
+const { c, d, e, f, g } = Object.assign(Object.assign({}, Object.assign(Object.assign({}, Object.assign({
c: 0,
}, { d: 0 })), { e: 0 })), { f: 0 });
diff --git a/tests/baselines/reference/excessPropertyCheckWithSpread.js b/tests/baselines/reference/excessPropertyCheckWithSpread.js
index a05d342391902..a5de2298a1bea 100644
--- a/tests/baselines/reference/excessPropertyCheckWithSpread.js
+++ b/tests/baselines/reference/excessPropertyCheckWithSpread.js
@@ -20,16 +20,5 @@ f({ a: 1, ...l, ...r });
//// [excessPropertyCheckWithSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-f(__assign({ a: 1 }, i));
-f(__assign(__assign({ a: 1 }, l), r));
+f(Object.assign({ a: 1 }, i));
+f(Object.assign(Object.assign({ a: 1 }, l), r));
diff --git a/tests/baselines/reference/excessPropertyCheckWithUnions.js b/tests/baselines/reference/excessPropertyCheckWithUnions.js
index 4e0fffbbaafc5..599c84f4b840f 100644
--- a/tests/baselines/reference/excessPropertyCheckWithUnions.js
+++ b/tests/baselines/reference/excessPropertyCheckWithUnions.js
@@ -156,17 +156,6 @@ F2({
//// [excessPropertyCheckWithUnions.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let wrong = { tag: "T", a1: "extra" };
wrong = { tag: "A", d20: 12 };
wrong = { tag: "D" };
@@ -185,7 +174,7 @@ let over;
// these two are still errors despite their doubled up discriminants
over = { a: 1, b: 1, first: "ok", second: "error" };
over = { a: 1, b: 1, first: "ok", third: "error" };
-let t2 = __assign({}, t1);
+let t2 = Object.assign({}, t1);
t0 = t2;
const abab = {
kind: "A",
diff --git a/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
index 5cd098b2d15fa..23bc21278ca4c 100644
--- a/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
+++ b/tests/baselines/reference/explicitAnyAfterSpreadNoImplicitAnyError.js
@@ -6,16 +6,5 @@ let x: any;
//// [explicitAnyAfterSpreadNoImplicitAnyError.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-(__assign({ a: [] }, null));
+(Object.assign({ a: [] }, null));
let x;
diff --git a/tests/baselines/reference/genericIsNeverEmptyObject.js b/tests/baselines/reference/genericIsNeverEmptyObject.js
index 169258469c870..4f6c2901ae3c7 100644
--- a/tests/baselines/reference/genericIsNeverEmptyObject.js
+++ b/tests/baselines/reference/genericIsNeverEmptyObject.js
@@ -15,17 +15,6 @@ let o2: { b: string, x: number } = test(o1);
//// [genericIsNeverEmptyObject.js]
"use strict";
// Repro from #29067
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __rest = (this && this.__rest) || function (s, e) {
var t = {};
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -39,7 +28,7 @@ var __rest = (this && this.__rest) || function (s, e) {
};
function test(obj) {
let { a } = obj, rest = __rest(obj, ["a"]);
- return __assign(__assign({}, rest), { b: a });
+ return Object.assign(Object.assign({}, rest), { b: a });
}
let o1 = { a: 'hello', x: 42 };
let o2 = test(o1);
diff --git a/tests/baselines/reference/importHelpersInTsx.js b/tests/baselines/reference/importHelpersInTsx.js
index 55414485945aa..054c0daeeaf4f 100644
--- a/tests/baselines/reference/importHelpersInTsx.js
+++ b/tests/baselines/reference/importHelpersInTsx.js
@@ -23,18 +23,6 @@ export declare function __awaiter(thisArg: any, _arguments: any, P: Function, ge
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.x = void 0;
-const tslib_1 = require("tslib");
-exports.x = React.createElement("span", tslib_1.__assign({}, o));
+exports.x = React.createElement("span", Object.assign({}, o));
//// [script.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const x = React.createElement("span", __assign({}, o));
+const x = React.createElement("span", Object.assign({}, o));
diff --git a/tests/baselines/reference/importHelpersNoHelpers.js b/tests/baselines/reference/importHelpersNoHelpers.js
index 3fe6366166b93..46e475aaecd0d 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.js
+++ b/tests/baselines/reference/importHelpersNoHelpers.js
@@ -67,7 +67,7 @@ C = tslib_1.__decorate([
dec
], C);
const o = { a: 1 };
-const y = tslib_1.__assign({}, o);
+const y = Object.assign({}, o);
const x = tslib_1.__rest(y, []);
//// [script.js]
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
diff --git a/tests/baselines/reference/intersectionPropertyCheck.js b/tests/baselines/reference/intersectionPropertyCheck.js
index 6c1ad3bd0cf28..02a834fc56ef2 100644
--- a/tests/baselines/reference/intersectionPropertyCheck.js
+++ b/tests/baselines/reference/intersectionPropertyCheck.js
@@ -23,22 +23,11 @@ function test(value: T): Test {
//// [intersectionPropertyCheck.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let obj = { a: { x: 'hello', y: 2 }, c: 5 }; // Nested excess property
let weak = wrong; // Nested weak object type
function foo(x, y) {
x = y; // Mismatched property in source intersection
}
function test(value) {
- return __assign(__assign({}, value), { hi: true });
+ return Object.assign(Object.assign({}, value), { hi: true });
}
diff --git a/tests/baselines/reference/intraExpressionInferences.js b/tests/baselines/reference/intraExpressionInferences.js
index d8a38d1b8d60d..65c41dc3c8cce 100644
--- a/tests/baselines/reference/intraExpressionInferences.js
+++ b/tests/baselines/reference/intraExpressionInferences.js
@@ -336,17 +336,6 @@ const distantRes = distant({
//// [intraExpressionInferences.js]
"use strict";
// Repros from #47599
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
callIt({
produce: () => 0,
consume: n => n.toFixed()
@@ -458,7 +447,7 @@ branch({
let test1 = u;
}
});
-Foo(__assign({
+Foo(Object.assign({
a: (x) => 10,
b: (arg) => {
arg.toString();
diff --git a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
index f45854f7fc980..5881830d2ce3d 100644
--- a/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
+++ b/tests/baselines/reference/jsxComplexSignatureHasApplicabilityError.js
@@ -613,17 +613,6 @@ export interface ReactSelectProps extends React.Props
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -662,7 +651,7 @@ exports.createReactSingleSelect = createReactSingleSelect;
const React = __importStar(require("react"));
function createReactSingleSelect(WrappedComponent) {
return (props) => {
- return (React.createElement(ReactSelectClass, __assign({}, props, { multi: false, autosize: false, value: props.value, onChange: (value) => {
+ return (React.createElement(ReactSelectClass, Object.assign({}, props, { multi: false, autosize: false, value: props.value, onChange: (value) => {
if (props.onChange) {
props.onChange(value === null ? undefined : value);
}
diff --git a/tests/baselines/reference/jsxExcessPropsAndAssignability.js b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
index 57e4ea348dae0..c64a015bd64b0 100644
--- a/tests/baselines/reference/jsxExcessPropsAndAssignability.js
+++ b/tests/baselines/reference/jsxExcessPropsAndAssignability.js
@@ -21,17 +21,6 @@ const myHoc = (
//// [jsxExcessPropsAndAssignability.js]
"use strict";
///
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -70,6 +59,6 @@ const React = __importStar(require("react"));
const myHoc = (ComposedComponent) => {
const WrapperComponent = null;
const props = null;
- React.createElement(WrapperComponent, __assign({}, props, { myProp: '1000000' }));
- React.createElement(WrapperComponent, __assign({}, props, { myProp: 1000000 }));
+ React.createElement(WrapperComponent, Object.assign({}, props, { myProp: '1000000' }));
+ React.createElement(WrapperComponent, Object.assign({}, props, { myProp: 1000000 }));
};
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
index e0f87f52ecd16..7f06e65190fe3 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsx).js
@@ -11,21 +11,10 @@ export {};
//// [jsxJsxsCjsTransformKeyProp.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = require("react");
const jsx_runtime_1 = require("react/jsx-runtime");
///
const props = { answer: 42 };
-const a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
-const b = (0, react_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_runtime_1.jsx)("div", Object.assign({}, props, { children: "text" }), "foo");
+const b = (0, react_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
index 672a1d6ece9ec..00e943c57ed20 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyProp(jsx=react-jsxdev).js
@@ -11,22 +11,11 @@ export {};
//// [jsxJsxsCjsTransformKeyProp.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = require("react");
const jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
const _jsxFileName = "jsxJsxsCjsTransformKeyProp.tsx";
///
const props = { answer: 42 };
-const a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
-const b = (0, react_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_dev_runtime_1.jsxDEV)("div", Object.assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
+const b = (0, react_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
index 7750cb072735b..84562093ac9fb 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsx).js
@@ -11,21 +11,10 @@ export {};
//// [jsxJsxsCjsTransformKeyPropCustomImport.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const preact_1 = require("preact");
const jsx_runtime_1 = require("preact/jsx-runtime");
///
const props = { answer: 42 };
-const a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
-const b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_runtime_1.jsx)("div", Object.assign({}, props, { children: "text" }), "foo");
+const b = (0, preact_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
index e265dc0fe5683..99d8c49c94636 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImport(jsx=react-jsxdev).js
@@ -11,22 +11,11 @@ export {};
//// [jsxJsxsCjsTransformKeyPropCustomImport.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const preact_1 = require("preact");
const jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
const _jsxFileName = "jsxJsxsCjsTransformKeyPropCustomImport.tsx";
///
const props = { answer: 42 };
-const a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
-const b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_dev_runtime_1.jsxDEV)("div", Object.assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 3, columnNumber: 10 }, this);
+const b = (0, preact_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
index bffb9b02d9fd1..4062f5654a428 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsx).js
@@ -22,38 +22,16 @@ export {};
//// [preact.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const preact_1 = require("preact");
const jsx_runtime_1 = require("preact/jsx-runtime");
///
/* @jsxImportSource preact */
const props = { answer: 42 };
-const a = (0, jsx_runtime_1.jsx)("div", __assign({}, props, { children: "text" }), "foo");
-const b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_runtime_1.jsx)("div", Object.assign({}, props, { children: "text" }), "foo");
+const b = (0, preact_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
//// [react.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = require("react");
const jsx_runtime_1 = require("react/jsx-runtime");
@@ -61,5 +39,5 @@ const jsx_runtime_1 = require("react/jsx-runtime");
/* @jsxImportSource react */
require("./preact");
const props2 = { answer: 42 };
-const a2 = (0, jsx_runtime_1.jsx)("div", __assign({}, props2, { children: "text" }), "foo");
-const b2 = (0, react_1.createElement)("div", __assign({}, props2, { key: "bar" }), "text");
+const a2 = (0, jsx_runtime_1.jsx)("div", Object.assign({}, props2, { children: "text" }), "foo");
+const b2 = (0, react_1.createElement)("div", Object.assign({}, props2, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
index 4f6f7a85707cd..06a12373973a3 100644
--- a/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
+++ b/tests/baselines/reference/jsxJsxsCjsTransformKeyPropCustomImportPragma(jsx=react-jsxdev).js
@@ -22,17 +22,6 @@ export {};
//// [preact.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const preact_1 = require("preact");
const jsx_dev_runtime_1 = require("preact/jsx-dev-runtime");
@@ -40,21 +29,10 @@ const _jsxFileName = "preact.tsx";
///
/* @jsxImportSource preact */
const props = { answer: 42 };
-const a = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
-const b = (0, preact_1.createElement)("div", __assign({}, props, { key: "bar" }), "text");
+const a = (0, jsx_dev_runtime_1.jsxDEV)("div", Object.assign({}, props, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 4, columnNumber: 10 }, this);
+const b = (0, preact_1.createElement)("div", Object.assign({}, props, { key: "bar" }), "text");
//// [react.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = require("react");
const jsx_dev_runtime_1 = require("react/jsx-dev-runtime");
@@ -63,5 +41,5 @@ const _jsxFileName = "react.tsx";
/* @jsxImportSource react */
require("./preact");
const props2 = { answer: 42 };
-const a2 = (0, jsx_dev_runtime_1.jsxDEV)("div", __assign({}, props2, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 11 }, this);
-const b2 = (0, react_1.createElement)("div", __assign({}, props2, { key: "bar" }), "text");
+const a2 = (0, jsx_dev_runtime_1.jsxDEV)("div", Object.assign({}, props2, { children: "text" }), "foo", false, { fileName: _jsxFileName, lineNumber: 5, columnNumber: 11 }, this);
+const b2 = (0, react_1.createElement)("div", Object.assign({}, props2, { key: "bar" }), "text");
diff --git a/tests/baselines/reference/jsxNamespacePrefixInNameReact.js b/tests/baselines/reference/jsxNamespacePrefixInNameReact.js
index 71d7334c9ab91..ddf6313cffe91 100644
--- a/tests/baselines/reference/jsxNamespacePrefixInNameReact.js
+++ b/tests/baselines/reference/jsxNamespacePrefixInNameReact.js
@@ -34,17 +34,6 @@ var upcaseComponent2 = ; // Parsed as instrinsic
//// [jsxNamespacePrefixInNameReact.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var justElement1 = React.createElement("a:element", null);
var justElement2 = React.createElement("a:element", null);
var justElement3 = React.createElement("a:element", { attr: "value" });
@@ -65,9 +54,9 @@ var justAttribute3 = React.createElement("element", { "a:attr": "value" }, "text
var both1 = React.createElement("a:element", { "a:attr": "value" });
var both2 = React.createElement("a:element", { "k:attr": "value" });
var both3 = React.createElement("a:element", { "a:attr": "value" }, "text");
-var endOfIdent1 = React.createElement("a:attr", __assign({}, "value"));
+var endOfIdent1 = React.createElement("a:attr", Object.assign({}, "value"));
var endOfIdent2 = React.createElement("a", { "attr:": "value" });
var beginOfIdent1 = < , a, attr = { "value": } / > ;
-var beginOfIdent2 = React.createElement("a:attr", __assign({}, "value"));
+var beginOfIdent2 = React.createElement("a:attr", Object.assign({}, "value"));
var upcaseComponent1 = React.createElement("ns:Upcase", null); // Parsed as intrinsic
var upcaseComponent2 = React.createElement("Upcase:element", null); // Parsed as instrinsic
diff --git a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
index 50a01c92a4e1b..2693ba19b27b4 100644
--- a/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
+++ b/tests/baselines/reference/jsxSpreadFirstUnionNoErrors.js
@@ -20,17 +20,6 @@ const c = ;
//// [jsxSpreadFirstUnionNoErrors.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
@@ -41,4 +30,4 @@ const Info = (props) => props.status === "hidden"
: react_1.default.createElement("div", null, props.content);
const a = react_1.default.createElement(Info, { status: "hidden" });
const b = react_1.default.createElement(Info, { status: "visible", content: "hello world" });
-const c = react_1.default.createElement(Info, __assign({}, infoProps));
+const c = react_1.default.createElement(Info, Object.assign({}, infoProps));
diff --git a/tests/baselines/reference/literalTypeWidening.js b/tests/baselines/reference/literalTypeWidening.js
index 461b4b0efe4da..cf0648a45eac0 100644
--- a/tests/baselines/reference/literalTypeWidening.js
+++ b/tests/baselines/reference/literalTypeWidening.js
@@ -149,17 +149,6 @@ const b: E.A = a;
//// [literalTypeWidening.js]
"use strict";
// Widening vs. non-widening literal types
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __rest = (this && this.__rest) || function (s, e) {
var t = {};
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -271,7 +260,7 @@ const arr = exports.langCodes.map(code => ({ code }));
// Repro from #29081
function test(obj) {
let { a } = obj, rest = __rest(obj, ["a"]);
- return __assign({ a: 'hello' }, rest);
+ return Object.assign({ a: 'hello' }, rest);
}
var E;
(function (E) {
diff --git a/tests/baselines/reference/objectInstantiationFromUnionSpread.js b/tests/baselines/reference/objectInstantiationFromUnionSpread.js
index 6f130b2f073bd..0d5e7bc871868 100644
--- a/tests/baselines/reference/objectInstantiationFromUnionSpread.js
+++ b/tests/baselines/reference/objectInstantiationFromUnionSpread.js
@@ -24,20 +24,9 @@ function f2(a: Item[]) {
//// [objectInstantiationFromUnionSpread.js]
// #40995
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f1(a) {
- a.map(item => (__assign({}, item))).filter(value => { });
+ a.map(item => (Object.assign({}, item))).filter(value => { });
}
function f2(a) {
- a.map(item => (__assign({}, item))).filter(value => { });
+ a.map(item => (Object.assign({}, item))).filter(value => { });
}
diff --git a/tests/baselines/reference/objectLiteralFreshnessWithSpread.js b/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
index 777f82a56d063..61d8aa65fbdc9 100644
--- a/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
+++ b/tests/baselines/reference/objectLiteralFreshnessWithSpread.js
@@ -6,16 +6,5 @@ let xx: { a, b } = { a: 1, ...x, z: 3 } // error for 'z', no error for 'extra'
//// [objectLiteralFreshnessWithSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let x = { b: 1, extra: 2 };
-let xx = __assign(__assign({ a: 1 }, x), { z: 3 }); // error for 'z', no error for 'extra'
+let xx = Object.assign(Object.assign({ a: 1 }, x), { z: 3 }); // error for 'z', no error for 'extra'
diff --git a/tests/baselines/reference/objectLiteralNormalization.js b/tests/baselines/reference/objectLiteralNormalization.js
index 33829cc1f3695..b2572f2a31a64 100644
--- a/tests/baselines/reference/objectLiteralNormalization.js
+++ b/tests/baselines/reference/objectLiteralNormalization.js
@@ -54,17 +54,6 @@ let e4 = f({ a: 2 }, data);
//// [objectLiteralNormalization.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
// Object literals in unions are normalized upon widening
let a1 = [{ a: 0 }, { a: 1, b: "x" }, { a: 2, b: "y", c: true }][0];
a1.a; // number
@@ -82,8 +71,8 @@ a2 = { a: "def" };
a2 = {};
a2 = { a: "def", b: 20 }; // Error
a2 = { a: 1 }; // Error
-let b2 = __assign(__assign({}, b1), { z: 55 });
-let b3 = __assign({}, b2);
+let b2 = Object.assign(Object.assign({}, b1), { z: 55 });
+let b3 = Object.assign({}, b2);
let c1 = !true ? {} : opts;
let c2 = !true ? opts : {};
let c3 = !true ? { a: 0, b: 0 } : {};
diff --git a/tests/baselines/reference/objectSpread.js b/tests/baselines/reference/objectSpread.js
index 8f2652b2f4635..61742822759b5 100644
--- a/tests/baselines/reference/objectSpread.js
+++ b/tests/baselines/reference/objectSpread.js
@@ -146,60 +146,49 @@ function genericSpread(t: T, u: U, v: T | U, w: T | { s: string }, obj: {
//// [objectSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let o = { a: 1, b: 'no' };
let o2 = { b: 'yes', c: true };
let swap = { a: 'yes', b: -1 };
-let addAfter = __assign(__assign({}, o), { c: false });
-let addBefore = __assign({ c: false }, o);
-let override = __assign(__assign({}, o), { b: 'override' });
-let nested = __assign(__assign({}, __assign({ a: 3 }, { b: false, c: 'overriden' })), { c: 'whatever' });
-let combined = __assign(__assign({}, o), o2);
-let combinedAfter = __assign(__assign(__assign({}, o), o2), { b: 'ok' });
-let combinedNestedChangeType = __assign(__assign({}, __assign({ a: 1 }, { b: false, c: 'overriden' })), { c: -1 });
-let propertyNested = { a: __assign({}, o) };
+let addAfter = Object.assign(Object.assign({}, o), { c: false });
+let addBefore = Object.assign({ c: false }, o);
+let override = Object.assign(Object.assign({}, o), { b: 'override' });
+let nested = Object.assign(Object.assign({}, Object.assign({ a: 3 }, { b: false, c: 'overriden' })), { c: 'whatever' });
+let combined = Object.assign(Object.assign({}, o), o2);
+let combinedAfter = Object.assign(Object.assign(Object.assign({}, o), o2), { b: 'ok' });
+let combinedNestedChangeType = Object.assign(Object.assign({}, Object.assign({ a: 1 }, { b: false, c: 'overriden' })), { c: -1 });
+let propertyNested = { a: Object.assign({}, o) };
// accessors don't copy the descriptor
// (which means that readonly getters become read/write properties)
let op = { get a() { return 6; } };
-let getter = __assign(__assign({}, op), { c: 7 });
+let getter = Object.assign(Object.assign({}, op), { c: 7 });
getter.a = 12;
// functions result in { }
-let spreadFunc = __assign({}, (function () { }));
+let spreadFunc = Object.assign({}, (function () { }));
function from16326(header, authToken) {
- return __assign(__assign(__assign({}, this.header), header), authToken && { authToken });
+ return Object.assign(Object.assign(Object.assign({}, this.header), header), authToken && { authToken });
}
// boolean && T results in Partial
function conditionalSpreadBoolean(b) {
let o = { x: 12, y: 13 };
- o = __assign(__assign({}, o), b && { x: 14 });
- let o2 = __assign({}, b && { x: 21 });
+ o = Object.assign(Object.assign({}, o), b && { x: 14 });
+ let o2 = Object.assign({}, b && { x: 21 });
return o;
}
function conditionalSpreadNumber(nt) {
let o = { x: 15, y: 16 };
- o = __assign(__assign({}, o), nt && { x: nt });
- let o2 = __assign({}, nt && { x: nt });
+ o = Object.assign(Object.assign({}, o), nt && { x: nt });
+ let o2 = Object.assign({}, nt && { x: nt });
return o;
}
function conditionalSpreadString(st) {
let o = { x: 'hi', y: 17 };
- o = __assign(__assign({}, o), st && { x: st });
- let o2 = __assign({}, st && { x: st });
+ o = Object.assign(Object.assign({}, o), st && { x: st });
+ let o2 = Object.assign({}, st && { x: st });
return o;
}
// any results in any
let anything;
-let spreadAny = __assign({}, anything);
+let spreadAny = Object.assign({}, anything);
// methods are not enumerable
class C {
constructor() {
@@ -208,51 +197,51 @@ class C {
m() { }
}
let c = new C();
-let spreadC = __assign({}, c);
+let spreadC = Object.assign({}, c);
// own methods are enumerable
-let cplus = __assign(__assign({}, c), { plus() { return this.p + 1; } });
+let cplus = Object.assign(Object.assign({}, c), { plus() { return this.p + 1; } });
cplus.plus();
// new field's type conflicting with existing field is OK
-let changeTypeAfter = __assign(__assign({}, o), { a: 'wrong type?' });
-let changeTypeBoth = __assign(__assign({}, o), swap);
+let changeTypeAfter = Object.assign(Object.assign({}, o), { a: 'wrong type?' });
+let changeTypeBoth = Object.assign(Object.assign({}, o), swap);
// optional
function container(definiteBoolean, definiteString, optionalString, optionalNumber) {
- let optionalUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), optionalNumber);
- let optionalUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
- let allOptional = __assign(__assign({}, optionalString), optionalNumber);
+ let optionalUnionStops = Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), optionalNumber);
+ let optionalUnionDuplicates = Object.assign(Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
+ let allOptional = Object.assign(Object.assign({}, optionalString), optionalNumber);
// computed property
- let computedFirst = __assign(__assign({ ['before everything']: 12 }, o), { b: 'yes' });
- let computedAfter = __assign(__assign({}, o), { b: 'yeah', ['at the end']: 14 });
+ let computedFirst = Object.assign(Object.assign({ ['before everything']: 12 }, o), { b: 'yes' });
+ let computedAfter = Object.assign(Object.assign({}, o), { b: 'yeah', ['at the end']: 14 });
}
// shortcut syntax
let a = 12;
-let shortCutted = __assign(__assign({}, o), { a });
+let shortCutted = Object.assign(Object.assign({}, o), { a });
// non primitive
-let spreadNonPrimitive = __assign({}, {});
+let spreadNonPrimitive = Object.assign({}, {});
// generic spreads
function f(t, u) {
- return __assign(__assign(__assign({}, t), u), { id: 'id' });
+ return Object.assign(Object.assign(Object.assign({}, t), u), { id: 'id' });
}
let exclusive = f({ a: 1, b: 'yes' }, { c: 'no', d: false });
let overlap = f({ a: 1 }, { a: 2, b: 'extra' });
let overlapConflict = f({ a: 1 }, { a: 'mismatch' });
let overwriteId = f({ a: 1, id: true }, { c: 1, d: 'no' });
function genericSpread(t, u, v, w, obj) {
- let x01 = __assign({}, t);
- let x02 = __assign(__assign({}, t), t);
- let x03 = __assign(__assign({}, t), u);
- let x04 = __assign(__assign({}, u), t);
- let x05 = __assign({ a: 5, b: 'hi' }, t);
- let x06 = __assign(__assign({}, t), { a: 5, b: 'hi' });
- let x07 = __assign(__assign(__assign({ a: 5, b: 'hi' }, t), { c: true }), obj);
- let x09 = __assign(__assign(__assign({ a: 5 }, t), { b: 'hi', c: true }), obj);
- let x10 = __assign(__assign(__assign(__assign({ a: 5 }, t), { b: 'hi' }), u), obj);
- let x11 = __assign({}, v);
- let x12 = __assign(__assign({}, v), obj);
- let x13 = __assign({}, w);
- let x14 = __assign(__assign({}, w), obj);
- let x15 = __assign(__assign({}, t), v);
- let x16 = __assign(__assign({}, t), w);
- let x17 = __assign(__assign(__assign({}, t), w), obj);
- let x18 = __assign(__assign(__assign({}, t), v), w);
+ let x01 = Object.assign({}, t);
+ let x02 = Object.assign(Object.assign({}, t), t);
+ let x03 = Object.assign(Object.assign({}, t), u);
+ let x04 = Object.assign(Object.assign({}, u), t);
+ let x05 = Object.assign({ a: 5, b: 'hi' }, t);
+ let x06 = Object.assign(Object.assign({}, t), { a: 5, b: 'hi' });
+ let x07 = Object.assign(Object.assign(Object.assign({ a: 5, b: 'hi' }, t), { c: true }), obj);
+ let x09 = Object.assign(Object.assign(Object.assign({ a: 5 }, t), { b: 'hi', c: true }), obj);
+ let x10 = Object.assign(Object.assign(Object.assign(Object.assign({ a: 5 }, t), { b: 'hi' }), u), obj);
+ let x11 = Object.assign({}, v);
+ let x12 = Object.assign(Object.assign({}, v), obj);
+ let x13 = Object.assign({}, w);
+ let x14 = Object.assign(Object.assign({}, w), obj);
+ let x15 = Object.assign(Object.assign({}, t), v);
+ let x16 = Object.assign(Object.assign({}, t), w);
+ let x17 = Object.assign(Object.assign(Object.assign({}, t), w), obj);
+ let x18 = Object.assign(Object.assign(Object.assign({}, t), v), w);
}
diff --git a/tests/baselines/reference/objectSpreadComputedProperty.js b/tests/baselines/reference/objectSpreadComputedProperty.js
index 07cbee3e76e24..a4daa96af8388 100644
--- a/tests/baselines/reference/objectSpreadComputedProperty.js
+++ b/tests/baselines/reference/objectSpreadComputedProperty.js
@@ -13,23 +13,12 @@ function f() {
//// [objectSpreadComputedProperty.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
// fixes #12200
function f() {
let n = 12;
let m = 13;
let a = null;
- const o1 = __assign({}, { [n]: n });
- const o2 = __assign({}, { [a]: n });
- const o3 = __assign(__assign(__assign(__assign({ [a]: n }, {}), { [n]: n }), {}), { [m]: m });
+ const o1 = Object.assign({}, { [n]: n });
+ const o2 = Object.assign({}, { [a]: n });
+ const o3 = Object.assign(Object.assign(Object.assign(Object.assign({ [a]: n }, {}), { [n]: n }), {}), { [m]: m });
}
diff --git a/tests/baselines/reference/objectSpreadIndexSignature.js b/tests/baselines/reference/objectSpreadIndexSignature.js
index 54eae2b42f396..a9d297e60aa16 100644
--- a/tests/baselines/reference/objectSpreadIndexSignature.js
+++ b/tests/baselines/reference/objectSpreadIndexSignature.js
@@ -21,23 +21,12 @@ writable.a = 0; // should be ok.
//// [objectSpreadIndexSignature.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-let i = __assign(__assign({}, indexed1), { b: 11 });
+let i = Object.assign(Object.assign({}, indexed1), { b: 11 });
// only indexed has indexer, so i[101]: any
i[101];
-let ii = __assign(__assign({}, indexed1), indexed2);
+let ii = Object.assign(Object.assign({}, indexed1), indexed2);
// both have indexer, so i[1001]: number | boolean
ii[1001];
-indexed3 = __assign({}, b ? indexed3 : undefined);
-var writable = __assign({}, roindex);
+indexed3 = Object.assign({}, b ? indexed3 : undefined);
+var writable = Object.assign({}, roindex);
writable.a = 0; // should be ok.
diff --git a/tests/baselines/reference/objectSpreadNegative.js b/tests/baselines/reference/objectSpreadNegative.js
index 5049fce1dfa81..5ef5a972df110 100644
--- a/tests/baselines/reference/objectSpreadNegative.js
+++ b/tests/baselines/reference/objectSpreadNegative.js
@@ -78,59 +78,48 @@ spreadObj.a; // error 'a' is not in {}
//// [objectSpreadNegative.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
let o = { a: 1, b: 'no' };
/// private propagates
class PrivateOptionalX {
}
class PublicX {
}
-let o2 = __assign(__assign({}, publicX), privateOptionalX);
+let o2 = Object.assign(Object.assign({}, publicX), privateOptionalX);
let sn = o2.x; // error, x is private
-let allOptional = __assign(__assign({}, optionalString), optionalNumber);
+let allOptional = Object.assign(Object.assign({}, optionalString), optionalNumber);
;
;
-let spread = __assign({ b: true }, { s: "foo" });
+let spread = Object.assign({ b: true }, { s: "foo" });
spread = { s: "foo" }; // error, missing 'b'
let b = { b: false };
spread = b; // error, missing 's'
// literal repeats are not allowed, but spread repeats are fine
-let duplicated = __assign(__assign(__assign(__assign({ b: 'bad' }, o), { b: 'bad' }), o2), { b: 'bad' });
-let duplicatedSpread = __assign(__assign({}, o), o);
+let duplicated = Object.assign(Object.assign(Object.assign(Object.assign({ b: 'bad' }, o), { b: 'bad' }), o2), { b: 'bad' });
+let duplicatedSpread = Object.assign(Object.assign({}, o), o);
// Note: ignore changes the order that properties are printed
-let ignore = __assign({ b: 'ignored' }, o);
+let ignore = Object.assign({ b: 'ignored' }, o);
let o3 = { a: 1, b: 'no' };
let o4 = { b: 'yes', c: true };
-let combinedBefore = __assign(__assign({ b: 'ok' }, o3), o4);
-let combinedMid = __assign(__assign(__assign({}, o3), { b: 'ok' }), o4);
-let combinedNested = __assign(__assign(__assign({}, __assign({ a: 4 }, { b: false, c: 'overriden' })), { d: 'actually new' }), { a: 5, d: 'maybe new' });
-let changeTypeBefore = __assign({ a: 'wrong type?' }, o3);
-let computedMiddle = __assign(__assign(__assign({}, o3), { ['in the middle']: 13, b: 'maybe?' }), o4);
+let combinedBefore = Object.assign(Object.assign({ b: 'ok' }, o3), o4);
+let combinedMid = Object.assign(Object.assign(Object.assign({}, o3), { b: 'ok' }), o4);
+let combinedNested = Object.assign(Object.assign(Object.assign({}, Object.assign({ a: 4 }, { b: false, c: 'overriden' })), { d: 'actually new' }), { a: 5, d: 'maybe new' });
+let changeTypeBefore = Object.assign({ a: 'wrong type?' }, o3);
+let computedMiddle = Object.assign(Object.assign(Object.assign({}, o3), { ['in the middle']: 13, b: 'maybe?' }), o4);
// primitives are not allowed, except for falsy ones
-let spreadNum = __assign({}, 12);
-let spreadSum = __assign({}, 1 + 1);
-let spreadZero = __assign({}, 0);
+let spreadNum = Object.assign({}, 12);
+let spreadSum = Object.assign({}, 1 + 1);
+let spreadZero = Object.assign({}, 0);
spreadZero.toFixed(); // error, no methods even from a falsy number
-let spreadBool = __assign({}, true);
+let spreadBool = Object.assign({}, true);
spreadBool.valueOf();
-let spreadStr = __assign({}, 'foo');
+let spreadStr = Object.assign({}, 'foo');
spreadStr.length; // error, no 'length'
spreadStr.charAt(1); // error, no methods either
// functions are skipped
-let spreadFunc = __assign({}, function () { });
+let spreadFunc = Object.assign({}, function () { });
spreadFunc(); // error, no call signature
// write-only properties get skipped
-let setterOnly = __assign({ set b(bad) { } });
+let setterOnly = Object.assign({ set b(bad) { } });
setterOnly.b = 12; // error, 'b' does not exist
// methods are skipped because they aren't enumerable
class C {
@@ -140,9 +129,9 @@ class C {
m() { }
}
let c = new C();
-let spreadC = __assign({}, c);
+let spreadC = Object.assign({}, c);
spreadC.m(); // error 'm' is not in '{ ... c }'
// non primitive
let obj = { a: 123 };
-let spreadObj = __assign({}, obj);
+let spreadObj = Object.assign({}, obj);
spreadObj.a; // error 'a' is not in {}
diff --git a/tests/baselines/reference/objectSpreadNegativeParse.js b/tests/baselines/reference/objectSpreadNegativeParse.js
index f714a7a92a9e2..6e26f458fcfea 100644
--- a/tests/baselines/reference/objectSpreadNegativeParse.js
+++ b/tests/baselines/reference/objectSpreadNegativeParse.js
@@ -8,19 +8,8 @@ let o10 = { ...get x() { return 12; }};
//// [objectSpreadNegativeParse.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-let o7 = __assign({}, o ? : );
-let o8 = __assign({}, * o);
-let o9 = __assign({}, matchMedia()), {};
+let o7 = Object.assign({}, o ? : );
+let o8 = Object.assign({}, * o);
+let o9 = Object.assign({}, matchMedia()), {};
;
-let o10 = __assign(__assign({}, get), { x() { return 12; } });
+let o10 = Object.assign(Object.assign({}, get), { x() { return 12; } });
diff --git a/tests/baselines/reference/objectSpreadRepeatedComplexity.js b/tests/baselines/reference/objectSpreadRepeatedComplexity.js
index cf0c6638c0941..c24e89a53a5a4 100644
--- a/tests/baselines/reference/objectSpreadRepeatedComplexity.js
+++ b/tests/baselines/reference/objectSpreadRepeatedComplexity.js
@@ -88,20 +88,9 @@ function f(cnd: Record){
//// [objectSpreadRepeatedComplexity.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f(cnd) {
// Type is a union of 2^(n-1) members, where n is the number of spread objects
- return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, (cnd[1] &&
+ return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (cnd[1] &&
cnd[2] && {
prop0: 0,
})), (cnd[3] && {
diff --git a/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.js b/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.js
index c5f5e70a65635..4cf4463608ef0 100644
--- a/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.js
+++ b/tests/baselines/reference/objectSpreadRepeatedNullCheckPerf.js
@@ -65,18 +65,7 @@ parseWithSpread({ a: 1, b: 2, z: 26 })
//// [objectSpreadRepeatedNullCheckPerf.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function parseWithSpread(config) {
- return __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, config.a !== undefined && { a: config.a.toString() }), config.b !== undefined && { b: config.b.toString() }), config.c !== undefined && { c: config.c.toString() }), config.d !== undefined && { d: config.d.toString() }), config.e !== undefined && { e: config.e.toString() }), config.f !== undefined && { f: config.f.toString() }), config.g !== undefined && { g: config.g.toString() }), config.h !== undefined && { h: config.h.toString() }), config.i !== undefined && { i: config.i.toString() }), config.j !== undefined && { j: config.j.toString() }), config.k !== undefined && { k: config.k.toString() }), config.l !== undefined && { l: config.l.toString() }), config.m !== undefined && { m: config.m.toString() }), config.n !== undefined && { n: config.n.toString() }), config.o !== undefined && { o: config.o.toString() }), config.p !== undefined && { p: config.p.toString() }), config.q !== undefined && { q: config.q.toString() }), config.r !== undefined && { r: config.r.toString() }), config.s !== undefined && { s: config.s.toString() }), config.t !== undefined && { t: config.t.toString() }), config.u !== undefined && { u: config.u.toString() }), config.v !== undefined && { v: config.v.toString() }), config.w !== undefined && { w: config.w.toString() }), config.x !== undefined && { x: config.x.toString() }), config.y !== undefined && { y: config.y.toString() }), config.z !== undefined && { z: config.z.toString() });
+ return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, config.a !== undefined && { a: config.a.toString() }), config.b !== undefined && { b: config.b.toString() }), config.c !== undefined && { c: config.c.toString() }), config.d !== undefined && { d: config.d.toString() }), config.e !== undefined && { e: config.e.toString() }), config.f !== undefined && { f: config.f.toString() }), config.g !== undefined && { g: config.g.toString() }), config.h !== undefined && { h: config.h.toString() }), config.i !== undefined && { i: config.i.toString() }), config.j !== undefined && { j: config.j.toString() }), config.k !== undefined && { k: config.k.toString() }), config.l !== undefined && { l: config.l.toString() }), config.m !== undefined && { m: config.m.toString() }), config.n !== undefined && { n: config.n.toString() }), config.o !== undefined && { o: config.o.toString() }), config.p !== undefined && { p: config.p.toString() }), config.q !== undefined && { q: config.q.toString() }), config.r !== undefined && { r: config.r.toString() }), config.s !== undefined && { s: config.s.toString() }), config.t !== undefined && { t: config.t.toString() }), config.u !== undefined && { u: config.u.toString() }), config.v !== undefined && { v: config.v.toString() }), config.w !== undefined && { w: config.w.toString() }), config.x !== undefined && { x: config.x.toString() }), config.y !== undefined && { y: config.y.toString() }), config.z !== undefined && { z: config.z.toString() });
}
parseWithSpread({ a: 1, b: 2, z: 26 });
diff --git a/tests/baselines/reference/objectSpreadStrictNull.js b/tests/baselines/reference/objectSpreadStrictNull.js
index 4264a5a5dac93..b4783576d4598 100644
--- a/tests/baselines/reference/objectSpreadStrictNull.js
+++ b/tests/baselines/reference/objectSpreadStrictNull.js
@@ -47,34 +47,23 @@ function g(fields: Fields, partialFields: Partial, nearlyPartialFields:
//// [objectSpreadStrictNull.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f(definiteBoolean, definiteString, optionalString, optionalNumber, undefinedString, undefinedNumber) {
// optional
- let optionalUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), optionalNumber);
- let optionalUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
- let allOptional = __assign(__assign({}, optionalString), optionalNumber);
+ let optionalUnionStops = Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), optionalNumber);
+ let optionalUnionDuplicates = Object.assign(Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), optionalString), optionalNumber);
+ let allOptional = Object.assign(Object.assign({}, optionalString), optionalNumber);
// undefined
- let undefinedUnionStops = __assign(__assign(__assign({}, definiteBoolean), definiteString), undefinedNumber);
- let undefinedUnionDuplicates = __assign(__assign(__assign(__assign({}, definiteBoolean), definiteString), undefinedString), undefinedNumber);
- let allUndefined = __assign(__assign({}, undefinedString), undefinedNumber);
- let undefinedWithOptionalContinues = __assign(__assign(__assign({}, definiteBoolean), undefinedString), optionalNumber);
+ let undefinedUnionStops = Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), undefinedNumber);
+ let undefinedUnionDuplicates = Object.assign(Object.assign(Object.assign(Object.assign({}, definiteBoolean), definiteString), undefinedString), undefinedNumber);
+ let allUndefined = Object.assign(Object.assign({}, undefinedString), undefinedNumber);
+ let undefinedWithOptionalContinues = Object.assign(Object.assign(Object.assign({}, definiteBoolean), undefinedString), optionalNumber);
}
const m = { title: "The Matrix", yearReleased: 1999 };
// should error here because title: undefined is not assignable to string
-const x = __assign(__assign({}, m), { title: undefined });
+const x = Object.assign(Object.assign({}, m), { title: undefined });
function g(fields, partialFields, nearlyPartialFields) {
// ok, undefined is stripped from optional properties when spread
- fields = __assign(__assign({}, fields), partialFields);
+ fields = Object.assign(Object.assign({}, fields), partialFields);
// error: not optional, undefined remains
- fields = __assign(__assign({}, fields), nearlyPartialFields);
+ fields = Object.assign(Object.assign({}, fields), nearlyPartialFields);
}
diff --git a/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js b/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
index b83cb77c4307e..0c4297a4c92cf 100644
--- a/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
+++ b/tests/baselines/reference/objectSpreadWithinMethodWithinObjectWithSpread.js
@@ -14,18 +14,7 @@ const a = {
//// [objectSpreadWithinMethodWithinObjectWithSpread.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const obj = {};
-const a = __assign(__assign({}, obj), { prop() {
- return __assign(__assign({}, obj), { metadata: 213 });
+const a = Object.assign(Object.assign({}, obj), { prop() {
+ return Object.assign(Object.assign({}, obj), { metadata: 213 });
} });
diff --git a/tests/baselines/reference/quickIntersectionCheckCorrectlyCachesErrors.js b/tests/baselines/reference/quickIntersectionCheckCorrectlyCachesErrors.js
index bf9f9d3a3f246..97135a1347408 100644
--- a/tests/baselines/reference/quickIntersectionCheckCorrectlyCachesErrors.js
+++ b/tests/baselines/reference/quickIntersectionCheckCorrectlyCachesErrors.js
@@ -18,24 +18,13 @@ export function wu(CC: F) {
//// [quickIntersectionCheckCorrectlyCachesErrors.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.wu = wu;
function wu(CC) {
class WU {
m() {
g(CC);
- return React.createElement(CC, __assign({}, null));
+ return React.createElement(CC, Object.assign({}, null));
}
}
}
diff --git a/tests/baselines/reference/reactHOCSpreadprops.js b/tests/baselines/reference/reactHOCSpreadprops.js
index b9117b47169ac..e8624e042573e 100644
--- a/tests/baselines/reference/reactHOCSpreadprops.js
+++ b/tests/baselines/reference/reactHOCSpreadprops.js
@@ -14,24 +14,13 @@ function f
(App: React.ComponentClass
| React.StatelessComponent
): void
//// [reactHOCSpreadprops.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
///
const React = require("react");
function f(App) {
class C extends React.Component {
render() {
- return React.createElement(App, __assign({}, this.props));
+ return React.createElement(App, Object.assign({}, this.props));
}
}
}
diff --git a/tests/baselines/reference/reactNamespaceJSXEmit.js b/tests/baselines/reference/reactNamespaceJSXEmit.js
index bbacb89338612..ea4baf619b9ce 100644
--- a/tests/baselines/reference/reactNamespaceJSXEmit.js
+++ b/tests/baselines/reference/reactNamespaceJSXEmit.js
@@ -16,20 +16,9 @@ declare var x: any;
//// [reactNamespaceJSXEmit.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
myReactLib.createElement("foo", { data: true });
myReactLib.createElement(Bar, { x: x });
myReactLib.createElement("x-component", null);
-myReactLib.createElement(Bar, __assign({}, x));
-myReactLib.createElement(Bar, __assign({}, x, { y: 2 }));
-myReactLib.createElement(_Bar, __assign({}, x));
+myReactLib.createElement(Bar, Object.assign({}, x));
+myReactLib.createElement(Bar, Object.assign({}, x, { y: 2 }));
+myReactLib.createElement(_Bar, Object.assign({}, x));
diff --git a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
index 8c22bda6f09e9..62553f32b8ad6 100644
--- a/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
+++ b/tests/baselines/reference/reactReadonlyHOCAssignabilityReal.js
@@ -14,17 +14,6 @@ function myHigherOrderComponent
(Inner: React.ComponentClass
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -65,4 +54,4 @@ const React = __importStar(require("react"));
const classes = "";
const rest = {};
const children = [];
-React.createElement(Tag, __assign({ className: classes }, rest), children);
+React.createElement(Tag, Object.assign({ className: classes }, rest), children);
diff --git a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
index cf42e0f0f0c93..dfb6d47c03f4b 100644
--- a/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
+++ b/tests/baselines/reference/reactTagNameComponentWithPropsNoOOM2.js
@@ -16,17 +16,6 @@ const children: any[] = [];
//// [reactTagNameComponentWithPropsNoOOM2.js]
"use strict";
///
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -65,4 +54,4 @@ const React = __importStar(require("react"));
const classes = "";
const rest = {};
const children = [];
-React.createElement(Tag, __assign({ className: classes }, rest), children);
+React.createElement(Tag, Object.assign({ className: classes }, rest), children);
diff --git a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js
index 2a19678e5f583..e2749d9ea4c5b 100644
--- a/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js
+++ b/tests/baselines/reference/reverseMappedTypeIntersectionConstraint.js
@@ -177,17 +177,6 @@ const config2 = createXMachine({
//// [reverseMappedTypeIntersectionConstraint.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const inferredParams1 = createMachine({
entry: "foo",
states: {
@@ -238,7 +227,7 @@ function bar(props) {
return foo(props); // no error because lack of excess property check by design
}
foo({ x: 1, y: 'foo' });
-foo(__assign({ x: 1, y: 'foo' })); // no error because lack of excess property check by design
+foo(Object.assign({ x: 1, y: 'foo' })); // no error because lack of excess property check by design
baz({ x: 1 });
baz({ x: 1, z: 123 });
baz({ x: 1, y: 'foo' });
diff --git a/tests/baselines/reference/spreadContextualTypedBindingPattern.js b/tests/baselines/reference/spreadContextualTypedBindingPattern.js
index fa896d287757a..8a4153b22f603 100644
--- a/tests/baselines/reference/spreadContextualTypedBindingPattern.js
+++ b/tests/baselines/reference/spreadContextualTypedBindingPattern.js
@@ -15,16 +15,5 @@ const { naam, age } = {...bob, ...alice}
//// [spreadContextualTypedBindingPattern.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
// [ts] Initializer provides no value for this binding element and the binding element has no default value.
-const { naam, age } = __assign(__assign({}, bob), alice);
+const { naam, age } = Object.assign(Object.assign({}, bob), alice);
diff --git a/tests/baselines/reference/spreadDuplicate.js b/tests/baselines/reference/spreadDuplicate.js
index 124cc13306ffe..76a4788551e16 100644
--- a/tests/baselines/reference/spreadDuplicate.js
+++ b/tests/baselines/reference/spreadDuplicate.js
@@ -24,25 +24,14 @@ let d2 = { a: 123, ...(t ? d : {}) }; // string | number
//// [spreadDuplicate.js]
"use strict";
// Repro from #44438
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-let a1 = __assign({ a: 123 }, a); // string (Error)
-let b1 = __assign({ a: 123 }, b); // string | number
-let c1 = __assign({ a: 123 }, c); // string | undefined (Error)
-let d1 = __assign({ a: 123 }, d); // string | number
-let a2 = __assign({ a: 123 }, (t ? a : {})); // string | number
-let b2 = __assign({ a: 123 }, (t ? b : {})); // string | number
-let c2 = __assign({ a: 123 }, (t ? c : {})); // string | number
-let d2 = __assign({ a: 123 }, (t ? d : {})); // string | number
+let a1 = Object.assign({ a: 123 }, a); // string (Error)
+let b1 = Object.assign({ a: 123 }, b); // string | number
+let c1 = Object.assign({ a: 123 }, c); // string | undefined (Error)
+let d1 = Object.assign({ a: 123 }, d); // string | number
+let a2 = Object.assign({ a: 123 }, (t ? a : {})); // string | number
+let b2 = Object.assign({ a: 123 }, (t ? b : {})); // string | number
+let c2 = Object.assign({ a: 123 }, (t ? c : {})); // string | number
+let d2 = Object.assign({ a: 123 }, (t ? d : {})); // string | number
//// [spreadDuplicate.d.ts]
diff --git a/tests/baselines/reference/spreadDuplicateExact.js b/tests/baselines/reference/spreadDuplicateExact.js
index 6d5fa4d671de6..4792617b846c8 100644
--- a/tests/baselines/reference/spreadDuplicateExact.js
+++ b/tests/baselines/reference/spreadDuplicateExact.js
@@ -24,25 +24,14 @@ let d2 = { a: 123, ...(t ? d : {}) }; // string | number | undefined
//// [spreadDuplicateExact.js]
"use strict";
// Repro from #44438
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-let a1 = __assign({ a: 123 }, a); // string (Error)
-let b1 = __assign({ a: 123 }, b); // string | number
-let c1 = __assign({ a: 123 }, c); // string | undefined (Error)
-let d1 = __assign({ a: 123 }, d); // string | number | undefined
-let a2 = __assign({ a: 123 }, (t ? a : {})); // string | number
-let b2 = __assign({ a: 123 }, (t ? b : {})); // string | number
-let c2 = __assign({ a: 123 }, (t ? c : {})); // string | number | undefined
-let d2 = __assign({ a: 123 }, (t ? d : {})); // string | number | undefined
+let a1 = Object.assign({ a: 123 }, a); // string (Error)
+let b1 = Object.assign({ a: 123 }, b); // string | number
+let c1 = Object.assign({ a: 123 }, c); // string | undefined (Error)
+let d1 = Object.assign({ a: 123 }, d); // string | number | undefined
+let a2 = Object.assign({ a: 123 }, (t ? a : {})); // string | number
+let b2 = Object.assign({ a: 123 }, (t ? b : {})); // string | number
+let c2 = Object.assign({ a: 123 }, (t ? c : {})); // string | number | undefined
+let d2 = Object.assign({ a: 123 }, (t ? d : {})); // string | number | undefined
//// [spreadDuplicateExact.d.ts]
diff --git a/tests/baselines/reference/spreadExcessProperty.js b/tests/baselines/reference/spreadExcessProperty.js
index 19898b769ee2b..5c7a3f0b3c027 100644
--- a/tests/baselines/reference/spreadExcessProperty.js
+++ b/tests/baselines/reference/spreadExcessProperty.js
@@ -7,16 +7,5 @@ const a1: A = { ...extra1 }; // spread should not give excess property errors
//// [spreadExcessProperty.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const extra1 = { a: "a", b: "b", extra: "extra" };
-const a1 = __assign({}, extra1); // spread should not give excess property errors
+const a1 = Object.assign({}, extra1); // spread should not give excess property errors
diff --git a/tests/baselines/reference/spreadExpressionContextualType.js b/tests/baselines/reference/spreadExpressionContextualType.js
index 13cb97cba4e33..e14361fa01f60 100644
--- a/tests/baselines/reference/spreadExpressionContextualType.js
+++ b/tests/baselines/reference/spreadExpressionContextualType.js
@@ -24,22 +24,11 @@ function test2(item: T): T {
//// [spreadExpressionContextualType.js]
"use strict";
// Repro from #43966
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function test(item) {
- return __assign({}, item);
+ return Object.assign({}, item);
}
function test2(item) {
- const x = __assign({}, item);
+ const x = Object.assign({}, item);
return x;
}
diff --git a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
index b3975a1093bd4..7248c1d4a3f42 100644
--- a/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
+++ b/tests/baselines/reference/spreadExpressionContextualTypeWithNamespace.js
@@ -50,17 +50,6 @@ exports.obj = obj;
function exportedDirectly() { }
//// [spreadExpressionContextualTypeWithNamespace_1.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
@@ -101,7 +90,7 @@ stuff.klass;
stuff.obj;
stuff.exportedDirectly;
function getStuff() {
- const thing = __assign({}, stuff);
+ const thing = Object.assign({}, stuff);
thing.func;
thing.klass;
thing.obj;
diff --git a/tests/baselines/reference/spreadIdenticalTypesRemoved.js b/tests/baselines/reference/spreadIdenticalTypesRemoved.js
index 7efa77f1afbd9..d366ff7c55829 100644
--- a/tests/baselines/reference/spreadIdenticalTypesRemoved.js
+++ b/tests/baselines/reference/spreadIdenticalTypesRemoved.js
@@ -31,20 +31,9 @@ function billOwner(pet: Animal2) {
//// [spreadIdenticalTypesRemoved.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function clonePet(pet, fullCopy) {
- return __assign({ name: pet.name, kind: pet.kind }, (fullCopy && pet));
+ return Object.assign({ name: pet.name, kind: pet.kind }, (fullCopy && pet));
}
function billOwner(pet) {
- return __assign(__assign({}, (pet.owner && pet)), { paid: false });
+ return Object.assign(Object.assign({}, (pet.owner && pet)), { paid: false });
}
diff --git a/tests/baselines/reference/spreadIntersection.js b/tests/baselines/reference/spreadIntersection.js
index fe2bcebcefd18..202b97d9dbf0e 100644
--- a/tests/baselines/reference/spreadIntersection.js
+++ b/tests/baselines/reference/spreadIntersection.js
@@ -10,19 +10,8 @@ var o2: { a: number, b: string, c: boolean };
var o2 = { ...intersection, c: false };
//// [spreadIntersection.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var intersection;
var o1;
-var o1 = __assign({}, intersection);
+var o1 = Object.assign({}, intersection);
var o2;
-var o2 = __assign(__assign({}, intersection), { c: false });
+var o2 = Object.assign(Object.assign({}, intersection), { c: false });
diff --git a/tests/baselines/reference/spreadIntersectionJsx.js b/tests/baselines/reference/spreadIntersectionJsx.js
index eb034023a29d7..68d5c2662c448 100644
--- a/tests/baselines/reference/spreadIntersectionJsx.js
+++ b/tests/baselines/reference/spreadIntersectionJsx.js
@@ -9,21 +9,10 @@ let element = ;
//// [spreadIntersectionJsx.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const React = null;
class A {
}
class C {
}
let intersected;
-let element = React.createElement("div", __assign({}, intersected));
+let element = React.createElement("div", Object.assign({}, intersected));
diff --git a/tests/baselines/reference/spreadInvalidArgumentType.js b/tests/baselines/reference/spreadInvalidArgumentType.js
index 9bb5ccfb9545b..f2250b6d0c197 100644
--- a/tests/baselines/reference/spreadInvalidArgumentType.js
+++ b/tests/baselines/reference/spreadInvalidArgumentType.js
@@ -60,17 +60,6 @@ function f(p1: T, p2: T[]) {
//// [spreadInvalidArgumentType.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var E;
(function (E) {
E[E["v1"] = 0] = "v1";
@@ -95,23 +84,23 @@ function f(p1, p2) {
var n;
var a;
var e;
- var o1 = __assign({}, p1); // OK, generic type paramterre
- var o2 = __assign({}, p2); // OK
- var o3 = __assign({}, t); // OK, generic type paramter
- var o4 = __assign({}, i); // Error, index access
- var o5 = __assign({}, k); // Error, index
- var o6 = __assign({}, mapped_generic); // OK, generic mapped object type
- var o7 = __assign({}, mapped); // OK, non-generic mapped type
- var o8 = __assign({}, union_generic); // OK, union with generic type parameter
- var o9 = __assign({}, union_primitive); // Error, union with generic type parameter
- var o10 = __assign({}, intersection_generic); // OK, intersection with generic type parameter
- var o11 = __assign({}, intersection_primitive); // Error, intersection with generic type parameter
- var o12 = __assign({}, num); // Error
- var o13 = __assign({}, str); // Error
- var o14 = __assign({}, u); // error, undefined-only not allowed
- var o15 = __assign({}, n); // error, null-only not allowed
- var o16 = __assign({}, a); // OK
- var o17 = __assign({}, literal_string); // Error
- var o18 = __assign({}, literal_number); // Error
- var o19 = __assign({}, e); // Error, enum
+ var o1 = Object.assign({}, p1); // OK, generic type paramterre
+ var o2 = Object.assign({}, p2); // OK
+ var o3 = Object.assign({}, t); // OK, generic type paramter
+ var o4 = Object.assign({}, i); // Error, index access
+ var o5 = Object.assign({}, k); // Error, index
+ var o6 = Object.assign({}, mapped_generic); // OK, generic mapped object type
+ var o7 = Object.assign({}, mapped); // OK, non-generic mapped type
+ var o8 = Object.assign({}, union_generic); // OK, union with generic type parameter
+ var o9 = Object.assign({}, union_primitive); // Error, union with generic type parameter
+ var o10 = Object.assign({}, intersection_generic); // OK, intersection with generic type parameter
+ var o11 = Object.assign({}, intersection_primitive); // Error, intersection with generic type parameter
+ var o12 = Object.assign({}, num); // Error
+ var o13 = Object.assign({}, str); // Error
+ var o14 = Object.assign({}, u); // error, undefined-only not allowed
+ var o15 = Object.assign({}, n); // error, null-only not allowed
+ var o16 = Object.assign({}, a); // OK
+ var o17 = Object.assign({}, literal_string); // Error
+ var o18 = Object.assign({}, literal_number); // Error
+ var o19 = Object.assign({}, e); // Error, enum
}
diff --git a/tests/baselines/reference/spreadNonPrimitive.js b/tests/baselines/reference/spreadNonPrimitive.js
index 8c89051ad7778..e361a4634815f 100644
--- a/tests/baselines/reference/spreadNonPrimitive.js
+++ b/tests/baselines/reference/spreadNonPrimitive.js
@@ -6,15 +6,4 @@ const x: { a: number, b: number } = { a: 1, ...o, b: 2 };
//// [spreadNonPrimitive.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const x = __assign(__assign({ a: 1 }, o), { b: 2 });
+const x = Object.assign(Object.assign({ a: 1 }, o), { b: 2 });
diff --git a/tests/baselines/reference/spreadObjectOrFalsy.js b/tests/baselines/reference/spreadObjectOrFalsy.js
index 74c76a287e745..fee6a12506307 100644
--- a/tests/baselines/reference/spreadObjectOrFalsy.js
+++ b/tests/baselines/reference/spreadObjectOrFalsy.js
@@ -55,39 +55,28 @@ class Foo {
//// [spreadObjectOrFalsy.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f1(a) {
- return __assign({}, a); // Error
+ return Object.assign({}, a); // Error
}
function f2(a) {
- return __assign({}, a);
+ return Object.assign({}, a);
}
function f3(a) {
- return __assign({}, a); // Error
+ return Object.assign({}, a); // Error
}
function f4(a) {
- return __assign({}, a);
+ return Object.assign({}, a);
}
function f5(a) {
- return __assign({}, a);
+ return Object.assign({}, a);
}
function f6(a) {
- return __assign({}, a);
+ return Object.assign({}, a);
}
// Repro from #46976
function g1(a) {
const { z } = a;
- return __assign({}, z);
+ return Object.assign({}, z);
}
class Foo {
bar() {
diff --git a/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=false).js b/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=false).js
index 81b077c7adff0..4f2e773772fca 100644
--- a/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=false).js
+++ b/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=false).js
@@ -24,29 +24,18 @@ const v_cba = { ...c, ...b, ...a };
//// [spreadObjectPermutations.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const v_a = __assign({}, a);
-const v_b = __assign({}, b);
-const v_c = __assign({}, c);
-const v_ab = __assign(__assign({}, a), b);
-const v_ac = __assign(__assign({}, a), c);
-const v_ba = __assign(__assign({}, b), a);
-const v_bc = __assign(__assign({}, b), c);
-const v_ca = __assign(__assign({}, c), a);
-const v_cb = __assign(__assign({}, c), b);
-const v_abc = __assign(__assign(__assign({}, a), b), c);
-const v_acb = __assign(__assign(__assign({}, a), c), b);
-const v_bac = __assign(__assign(__assign({}, b), a), c);
-const v_bca = __assign(__assign(__assign({}, b), c), a);
-const v_cab = __assign(__assign(__assign({}, c), a), b);
-const v_cba = __assign(__assign(__assign({}, c), b), a);
+const v_a = Object.assign({}, a);
+const v_b = Object.assign({}, b);
+const v_c = Object.assign({}, c);
+const v_ab = Object.assign(Object.assign({}, a), b);
+const v_ac = Object.assign(Object.assign({}, a), c);
+const v_ba = Object.assign(Object.assign({}, b), a);
+const v_bc = Object.assign(Object.assign({}, b), c);
+const v_ca = Object.assign(Object.assign({}, c), a);
+const v_cb = Object.assign(Object.assign({}, c), b);
+const v_abc = Object.assign(Object.assign(Object.assign({}, a), b), c);
+const v_acb = Object.assign(Object.assign(Object.assign({}, a), c), b);
+const v_bac = Object.assign(Object.assign(Object.assign({}, b), a), c);
+const v_bca = Object.assign(Object.assign(Object.assign({}, b), c), a);
+const v_cab = Object.assign(Object.assign(Object.assign({}, c), a), b);
+const v_cba = Object.assign(Object.assign(Object.assign({}, c), b), a);
diff --git a/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=true).js b/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=true).js
index 81b077c7adff0..4f2e773772fca 100644
--- a/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=true).js
+++ b/tests/baselines/reference/spreadObjectPermutations(exactoptionalpropertytypes=true).js
@@ -24,29 +24,18 @@ const v_cba = { ...c, ...b, ...a };
//// [spreadObjectPermutations.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const v_a = __assign({}, a);
-const v_b = __assign({}, b);
-const v_c = __assign({}, c);
-const v_ab = __assign(__assign({}, a), b);
-const v_ac = __assign(__assign({}, a), c);
-const v_ba = __assign(__assign({}, b), a);
-const v_bc = __assign(__assign({}, b), c);
-const v_ca = __assign(__assign({}, c), a);
-const v_cb = __assign(__assign({}, c), b);
-const v_abc = __assign(__assign(__assign({}, a), b), c);
-const v_acb = __assign(__assign(__assign({}, a), c), b);
-const v_bac = __assign(__assign(__assign({}, b), a), c);
-const v_bca = __assign(__assign(__assign({}, b), c), a);
-const v_cab = __assign(__assign(__assign({}, c), a), b);
-const v_cba = __assign(__assign(__assign({}, c), b), a);
+const v_a = Object.assign({}, a);
+const v_b = Object.assign({}, b);
+const v_c = Object.assign({}, c);
+const v_ab = Object.assign(Object.assign({}, a), b);
+const v_ac = Object.assign(Object.assign({}, a), c);
+const v_ba = Object.assign(Object.assign({}, b), a);
+const v_bc = Object.assign(Object.assign({}, b), c);
+const v_ca = Object.assign(Object.assign({}, c), a);
+const v_cb = Object.assign(Object.assign({}, c), b);
+const v_abc = Object.assign(Object.assign(Object.assign({}, a), b), c);
+const v_acb = Object.assign(Object.assign(Object.assign({}, a), c), b);
+const v_bac = Object.assign(Object.assign(Object.assign({}, b), a), c);
+const v_bca = Object.assign(Object.assign(Object.assign({}, b), c), a);
+const v_cab = Object.assign(Object.assign(Object.assign({}, c), a), b);
+const v_cba = Object.assign(Object.assign(Object.assign({}, c), b), a);
diff --git a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js
index 18990a04bba7a..9aba8b291a367 100644
--- a/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js
+++ b/tests/baselines/reference/spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js
@@ -6,15 +6,4 @@ const x: { [k: string]: string } = { ...m, ["a" + "b"]: "" };
//// [spreadObjectWithIndexDoesNotAddUndefinedToLocalIndex.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const x = __assign(__assign({}, m), { ["a" + "b"]: "" });
+const x = Object.assign(Object.assign({}, m), { ["a" + "b"]: "" });
diff --git a/tests/baselines/reference/spreadOfObjectLiteralAssignableToIndexSignature.js b/tests/baselines/reference/spreadOfObjectLiteralAssignableToIndexSignature.js
index 41e18b5b65171..fd22ce6ddc0c5 100644
--- a/tests/baselines/reference/spreadOfObjectLiteralAssignableToIndexSignature.js
+++ b/tests/baselines/reference/spreadOfObjectLiteralAssignableToIndexSignature.js
@@ -17,23 +17,12 @@ recordsOfRecordsOrEmpty.propC = {...(foo !== undefined && {foo})} // OK
//// [spreadOfObjectLiteralAssignableToIndexSignature.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const foo = {}; // OK
const recordOfRecords = {};
-recordOfRecords.propA = __assign({}, (foo !== undefined ? { foo } : {})); // OK
-recordOfRecords.propB = __assign({}, (foo && { foo })); // OK
-recordOfRecords.propC = __assign({}, (foo !== undefined && { foo })); // error'd in 3.7 beta, should be OK
+recordOfRecords.propA = Object.assign({}, (foo !== undefined ? { foo } : {})); // OK
+recordOfRecords.propB = Object.assign({}, (foo && { foo })); // OK
+recordOfRecords.propC = Object.assign({}, (foo !== undefined && { foo })); // error'd in 3.7 beta, should be OK
const recordsOfRecordsOrEmpty = {};
-recordsOfRecordsOrEmpty.propA = __assign({}, (foo !== undefined ? { foo } : {})); // OK
-recordsOfRecordsOrEmpty.propB = __assign({}, (foo && { foo })); // OK
-recordsOfRecordsOrEmpty.propC = __assign({}, (foo !== undefined && { foo })); // OK
+recordsOfRecordsOrEmpty.propA = Object.assign({}, (foo !== undefined ? { foo } : {})); // OK
+recordsOfRecordsOrEmpty.propB = Object.assign({}, (foo && { foo })); // OK
+recordsOfRecordsOrEmpty.propC = Object.assign({}, (foo !== undefined && { foo })); // OK
diff --git a/tests/baselines/reference/spreadOverwritesProperty.js b/tests/baselines/reference/spreadOverwritesProperty.js
index 8a0545073adb4..33dfec4535dee 100644
--- a/tests/baselines/reference/spreadOverwritesProperty.js
+++ b/tests/baselines/reference/spreadOverwritesProperty.js
@@ -17,23 +17,12 @@ function h(obj: { x: number }) {
//// [spreadOverwritesProperty.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-var unused1 = __assign({ b: 1 }, ab);
-var unused2 = __assign(__assign({}, ab), ab);
-var unused3 = __assign({ b: 1 }, abq);
+var unused1 = Object.assign({ b: 1 }, ab);
+var unused2 = Object.assign(Object.assign({}, ab), ab);
+var unused3 = Object.assign({ b: 1 }, abq);
function g(obj) {
- return __assign({ x: 1 }, obj);
+ return Object.assign({ x: 1 }, obj);
}
function h(obj) {
- return __assign({ x: 1 }, obj);
+ return Object.assign({ x: 1 }, obj);
}
diff --git a/tests/baselines/reference/spreadOverwritesPropertyStrict.js b/tests/baselines/reference/spreadOverwritesPropertyStrict.js
index a19550b90b248..8a61a76dc2b21 100644
--- a/tests/baselines/reference/spreadOverwritesPropertyStrict.js
+++ b/tests/baselines/reference/spreadOverwritesPropertyStrict.js
@@ -38,43 +38,32 @@ function m(anyoptional: { a?: any }) {
//// [spreadOverwritesPropertyStrict.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-var unused1 = __assign({ b: 1 }, ab); // error
-var unused2 = __assign(__assign({}, ab), ab); // ok, overwritten error doesn't apply to spreads
-var unused3 = __assign({ b: 1 }, abq); // ok, abq might have b: undefined
-var unused4 = __assign(__assign({}, ab), { b: 1 }); // ok, we don't care that b in ab is overwritten
-var unused5 = __assign(__assign({}, abq), { b: 1 }); // ok
+var unused1 = Object.assign({ b: 1 }, ab); // error
+var unused2 = Object.assign(Object.assign({}, ab), ab); // ok, overwritten error doesn't apply to spreads
+var unused3 = Object.assign({ b: 1 }, abq); // ok, abq might have b: undefined
+var unused4 = Object.assign(Object.assign({}, ab), { b: 1 }); // ok, we don't care that b in ab is overwritten
+var unused5 = Object.assign(Object.assign({}, abq), { b: 1 }); // ok
function g(obj) {
- return __assign({ x: 1 }, obj); // ok, obj might have x: undefined
+ return Object.assign({ x: 1 }, obj); // ok, obj might have x: undefined
}
function f(obj) {
- return __assign({ x: 1 }, obj); // ok, obj might be undefined
+ return Object.assign({ x: 1 }, obj); // ok, obj might be undefined
}
function h(obj) {
- return __assign({ x: 1 }, obj); // error
+ return Object.assign({ x: 1 }, obj); // error
}
function i(b, t) {
- return __assign({ command: "hi" }, (b ? t : {})); // ok
+ return Object.assign({ command: "hi" }, (b ? t : {})); // ok
}
function j() {
- return __assign({ command: "hi" }, { command: "bye" }); // ok
+ return Object.assign({ command: "hi" }, { command: "bye" }); // ok
}
function k(t) {
- return __assign(__assign(__assign({ command: "hi" }, { spoiler: true }), { spoiler2: true }), t); // error
+ return Object.assign(Object.assign(Object.assign({ command: "hi" }, { spoiler: true }), { spoiler2: true }), t); // error
}
function l(anyrequired) {
- return __assign({ a: 'zzz' }, anyrequired); // error
+ return Object.assign({ a: 'zzz' }, anyrequired); // error
}
function m(anyoptional) {
- return __assign({ a: 'zzz' }, anyoptional); // ok
+ return Object.assign({ a: 'zzz' }, anyoptional); // ok
}
diff --git a/tests/baselines/reference/spreadTypeRemovesReadonly.js b/tests/baselines/reference/spreadTypeRemovesReadonly.js
index 5a78509f61472..913b1c6ec3173 100644
--- a/tests/baselines/reference/spreadTypeRemovesReadonly.js
+++ b/tests/baselines/reference/spreadTypeRemovesReadonly.js
@@ -11,17 +11,6 @@ clone.value = 'bar';
//// [spreadTypeRemovesReadonly.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const data = { value: 'foo' };
-const clone = __assign({}, data);
+const clone = Object.assign({}, data);
clone.value = 'bar';
diff --git a/tests/baselines/reference/spreadTypeVariable.js b/tests/baselines/reference/spreadTypeVariable.js
index d3049f6497ada..278ea3bccb496 100644
--- a/tests/baselines/reference/spreadTypeVariable.js
+++ b/tests/baselines/reference/spreadTypeVariable.js
@@ -28,32 +28,21 @@ function f6(arg: T) {
//// [spreadTypeVariable.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f1(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
function f2(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
function f3(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
function f4(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
function f5(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
function f6(arg) {
- return __assign({}, arg);
+ return Object.assign({}, arg);
}
diff --git a/tests/baselines/reference/spreadUnion.js b/tests/baselines/reference/spreadUnion.js
index 6d65812e8779d..60593b340c430 100644
--- a/tests/baselines/reference/spreadUnion.js
+++ b/tests/baselines/reference/spreadUnion.js
@@ -13,21 +13,10 @@ var o5: { a: number } | { b: string } | { a: number, b: string };
var o5 = { ...union, ...union };
//// [spreadUnion.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var union;
var o3;
-var o3 = __assign({}, union);
+var o3 = Object.assign({}, union);
var o4;
-var o4 = __assign(__assign({}, union), { a: false });
+var o4 = Object.assign(Object.assign({}, union), { a: false });
var o5;
-var o5 = __assign(__assign({}, union), union);
+var o5 = Object.assign(Object.assign({}, union), union);
diff --git a/tests/baselines/reference/spreadUnion2.js b/tests/baselines/reference/spreadUnion2.js
index 627f615c633c4..b6d9cce5a0737 100644
--- a/tests/baselines/reference/spreadUnion2.js
+++ b/tests/baselines/reference/spreadUnion2.js
@@ -23,25 +23,14 @@ var o5 = { ...nullUnion, ...nullUnion };
//// [spreadUnion2.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var o1;
-var o1 = __assign({}, undefinedUnion);
+var o1 = Object.assign({}, undefinedUnion);
var o2;
-var o2 = __assign({}, nullUnion);
+var o2 = Object.assign({}, nullUnion);
var o3;
-var o3 = __assign(__assign({}, undefinedUnion), nullUnion);
-var o3 = __assign(__assign({}, nullUnion), undefinedUnion);
+var o3 = Object.assign(Object.assign({}, undefinedUnion), nullUnion);
+var o3 = Object.assign(Object.assign({}, nullUnion), undefinedUnion);
var o4;
-var o4 = __assign(__assign({}, undefinedUnion), undefinedUnion);
+var o4 = Object.assign(Object.assign({}, undefinedUnion), undefinedUnion);
var o5;
-var o5 = __assign(__assign({}, nullUnion), nullUnion);
+var o5 = Object.assign(Object.assign({}, nullUnion), nullUnion);
diff --git a/tests/baselines/reference/spreadUnion3.js b/tests/baselines/reference/spreadUnion3.js
index b1938ba964856..f3b8af7db8691 100644
--- a/tests/baselines/reference/spreadUnion3.js
+++ b/tests/baselines/reference/spreadUnion3.js
@@ -22,27 +22,16 @@ var y = { ...nullAndUndefinedUnion };
//// [spreadUnion3.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f(x) {
- return __assign({ y: 123 }, x); // y: string | number
+ return Object.assign({ y: 123 }, x); // y: string | number
}
f(undefined);
function g(t) {
- let b = __assign({}, t);
+ let b = Object.assign({}, t);
let c = b.a; // might not have 'a'
}
g();
g(undefined);
g(null);
-var x = __assign(__assign({}, nullAndUndefinedUnion), nullAndUndefinedUnion);
-var y = __assign({}, nullAndUndefinedUnion);
+var x = Object.assign(Object.assign({}, nullAndUndefinedUnion), nullAndUndefinedUnion);
+var y = Object.assign({}, nullAndUndefinedUnion);
diff --git a/tests/baselines/reference/spreadUnion4.js b/tests/baselines/reference/spreadUnion4.js
index 8315f9908e969..469430b66fb4a 100644
--- a/tests/baselines/reference/spreadUnion4.js
+++ b/tests/baselines/reference/spreadUnion4.js
@@ -8,15 +8,4 @@ const c = { ...a, ...b };
//// [spreadUnion4.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-const c = __assign(__assign({}, a), b);
+const c = Object.assign(Object.assign({}, a), b);
diff --git a/tests/baselines/reference/strictOptionalProperties1.js b/tests/baselines/reference/strictOptionalProperties1.js
index 2b4c2c80d898c..c88544a128ced 100644
--- a/tests/baselines/reference/strictOptionalProperties1.js
+++ b/tests/baselines/reference/strictOptionalProperties1.js
@@ -239,17 +239,6 @@ type UC = UA & UB; // undefined
//// [strictOptionalProperties1.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function f1(obj) {
let a = obj.a; // string | undefined
let b = obj.b; // string | undefined
@@ -330,7 +319,7 @@ function f6() {
}
const defaultProps = { foo: 'foo' };
const inputProps = { foo: undefined, bar: 'bar' };
-const completeProps = __assign(__assign({}, defaultProps), inputProps);
+const completeProps = Object.assign(Object.assign({}, defaultProps), inputProps);
// Example from #13195
const t1 = [1];
const t2 = [1, undefined];
@@ -338,7 +327,7 @@ const t3 = [1, "string", undefined];
const t4 = [1, undefined, undefined];
// Example from #13195
const x = { foo: undefined };
-const y = __assign({ foo: 123 }, x);
+const y = Object.assign({ foo: 123 }, x);
f11(ox1); // string
f11(ox2); // string | undefined
f11(ox3); // string
diff --git a/tests/baselines/reference/taggedTemplateStringsWithCurriedFunction.js b/tests/baselines/reference/taggedTemplateStringsWithCurriedFunction.js
index bd943b8645ebc..28216ca976a1c 100644
--- a/tests/baselines/reference/taggedTemplateStringsWithCurriedFunction.js
+++ b/tests/baselines/reference/taggedTemplateStringsWithCurriedFunction.js
@@ -14,20 +14,9 @@ f({ x: (() => 1)(), ...{ y: 1 } })``;
//// [taggedTemplateStringsWithCurriedFunction.js]
// Originated from #38558
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
const f = _ => (..._) => "";
-f(__assign({ x: 0 })) ``;
-f(__assign({ x: 0 })) `x`;
-f(__assign({ x: 0 })) `x${f}x`;
-f(__assign({ x: 0 }, { y: (() => 1)() })) ``;
-f(__assign({ x: (() => 1)() }, { y: 1 })) ``;
+f(Object.assign({ x: 0 })) ``;
+f(Object.assign({ x: 0 })) `x`;
+f(Object.assign({ x: 0 })) `x${f}x`;
+f(Object.assign({ x: 0 }, { y: (() => 1)() })) ``;
+f(Object.assign({ x: (() => 1)() }, { y: 1 })) ``;
diff --git a/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck.js b/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck.js
index 457cca76ea921..d7c8361a423ed 100644
--- a/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck.js
+++ b/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck.js
@@ -17,22 +17,11 @@ export interface WizardStepProps {
//// [trivialSubtypeReductionNoStructuralCheck.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.Wizard = void 0;
class Wizard {
get steps() {
- return __assign({ wizard: this }, props);
+ return Object.assign({ wizard: this }, props);
}
}
exports.Wizard = Wizard;
diff --git a/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck2.js b/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck2.js
index 39a5951efbc66..5faef299d2638 100644
--- a/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck2.js
+++ b/tests/baselines/reference/trivialSubtypeReductionNoStructuralCheck2.js
@@ -17,22 +17,11 @@ export interface WizardStepProps {
//// [trivialSubtypeReductionNoStructuralCheck2.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
exports.Wizard = void 0;
class Wizard {
get steps() {
- return __assign({ wizard: this }, props);
+ return Object.assign({ wizard: this }, props);
}
}
exports.Wizard = Wizard;
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
index af005fcdd2b58..e10870067d53b 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
@@ -43,8 +43,7 @@ Output::
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.x = void 0;
-const tslib_1 = require("tslib");
-exports.x = tslib_1.__assign({});
+exports.x = Object.assign({});
//// [/users/username/projects/project/tsconfig.tsbuildinfo]
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
index 21a3cc85c61e4..fb40e39a10c9d 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
@@ -48,8 +48,7 @@ Output::
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
exports.x = void 0;
-const tslib_1 = require("tslib");
-exports.x = tslib_1.__assign({});
+exports.x = Object.assign({});
diff --git a/tests/baselines/reference/tsxExternalModuleEmit2.js b/tests/baselines/reference/tsxExternalModuleEmit2.js
index bf90371a668d8..a0fb02899300c 100644
--- a/tests/baselines/reference/tsxExternalModuleEmit2.js
+++ b/tests/baselines/reference/tsxExternalModuleEmit2.js
@@ -18,17 +18,6 @@ declare var Foo, React;
//// [app.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
@@ -37,4 +26,4 @@ const mod_1 = __importDefault(require("mod"));
// Should see mod_1['default'] in emit here
React.createElement(Foo, { handler: mod_1.default });
// Should see mod_1['default'] in emit here
-React.createElement(Foo, __assign({}, mod_1.default));
+React.createElement(Foo, Object.assign({}, mod_1.default));
diff --git a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
index 86f61ddfe3c98..3c95421f45216 100644
--- a/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
+++ b/tests/baselines/reference/tsxNotUsingApparentTypeOfSFC.js
@@ -24,17 +24,6 @@ function test
(wrappedProps: P) {
//// [tsxNotUsingApparentTypeOfSFC.js]
"use strict";
///
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
@@ -51,6 +40,6 @@ function test(wrappedProps) {
}
let x = react_1.default.createElement(MySFC, null); // should error
let y = react_1.default.createElement(MyComponent, null); // should error
- let z = react_1.default.createElement(MySFC, __assign({}, wrappedProps)); // should work
- let q = react_1.default.createElement(MyComponent, __assign({}, wrappedProps)); // should work
+ let z = react_1.default.createElement(MySFC, Object.assign({}, wrappedProps)); // should work
+ let q = react_1.default.createElement(MyComponent, Object.assign({}, wrappedProps)); // should work
}
diff --git a/tests/baselines/reference/tsxReactEmit2.js b/tests/baselines/reference/tsxReactEmit2.js
index 0c4b927ae7351..ce700596a18b9 100644
--- a/tests/baselines/reference/tsxReactEmit2.js
+++ b/tests/baselines/reference/tsxReactEmit2.js
@@ -18,20 +18,9 @@ var spreads5 =
var spread1 = ;
//// [file.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var p;
var openClosed1 = React.createElement("div", null, blah);
// Should emit React.__spread({}, p, {x: 0})
-var spread1 = React.createElement("div", __assign({}, p, { x: 0 }));
+var spread1 = React.createElement("div", Object.assign({}, p, { x: 0 }));
diff --git a/tests/baselines/reference/tsxReactEmit5.js b/tests/baselines/reference/tsxReactEmit5.js
index 056c46302b23d..aa852e7fcd1ac 100644
--- a/tests/baselines/reference/tsxReactEmit5.js
+++ b/tests/baselines/reference/tsxReactEmit5.js
@@ -22,20 +22,9 @@ var spread1 = ;
//// [file.js]
//// [react-consumer.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const test_1 = require("./test");
// Should emit test_1.React.createElement
// and React.__spread
var foo;
-var spread1 = test_1.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
+var spread1 = test_1.React.createElement("div", Object.assign({ x: '' }, foo, { y: '' }));
diff --git a/tests/baselines/reference/tsxReactEmit6.js b/tests/baselines/reference/tsxReactEmit6.js
index 0f0b9a8793da4..d3f0647f2bd81 100644
--- a/tests/baselines/reference/tsxReactEmit6.js
+++ b/tests/baselines/reference/tsxReactEmit6.js
@@ -27,17 +27,6 @@ namespace M {
//// [file.js]
//// [react-consumer.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var M;
(function (M) {
})(M || (M = {}));
@@ -45,7 +34,7 @@ var M;
// Should emit M.React.createElement
// and M.React.__spread
var foo;
- var spread1 = M.React.createElement("div", __assign({ x: '' }, foo, { y: '' }));
+ var spread1 = M.React.createElement("div", Object.assign({ x: '' }, foo, { y: '' }));
// Quotes
var x = M.React.createElement("div", null, "This \"quote\" thing");
})(M || (M = {}));
diff --git a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
index 238668914a4da..e075d2dce2f9b 100644
--- a/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
+++ b/tests/baselines/reference/tsxReactPropsInferenceSucceedsOnIntersections.js
@@ -21,20 +21,9 @@ const CustomButton: React.SFC = props =>
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = __importDefault(require("react"));
-const CustomButton = props => react_1.default.createElement(Button, __assign({}, props));
+const CustomButton = props => react_1.default.createElement(Button, Object.assign({}, props));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
index 35dcc70c454ed..7d3f3aad7ab39 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react,target=es5).js
@@ -35,17 +35,6 @@ let x: TodoListProps;
//// [tsxSpreadChildrenInvalidType.js]
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
function Todo(prop) {
return React.createElement("div", null, prop.key.toString() + prop.todo);
}
@@ -57,4 +46,4 @@ function TodoListNoError({ todos }) {
return React.createElement("div", null, ...React.createElement(Todo, { key: todos[0].id, todo: todos[0].todo }));
}
let x;
-React.createElement(TodoList, __assign({}, x));
+React.createElement(TodoList, Object.assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
index 0922ab7c9eafc..8e43213934052 100644
--- a/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
+++ b/tests/baselines/reference/tsxSpreadChildrenInvalidType(jsx=react-jsx,target=es5).js
@@ -36,17 +36,6 @@ let x: TodoListProps;
//// [tsxSpreadChildrenInvalidType.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
Object.defineProperty(exports, "__esModule", { value: true });
const jsx_runtime_1 = require("react/jsx-runtime");
function Todo(prop) {
@@ -60,4 +49,4 @@ function TodoListNoError({ todos }) {
return (0, jsx_runtime_1.jsxs)("div", { children: [...(0, jsx_runtime_1.jsx)(Todo, { todo: todos[0].todo }, todos[0].id)] });
}
let x;
-(0, jsx_runtime_1.jsx)(TodoList, __assign({}, x));
+(0, jsx_runtime_1.jsx)(TodoList, Object.assign({}, x));
diff --git a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
index 7f7e219d8c25c..c6fa46feb88d7 100644
--- a/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
+++ b/tests/baselines/reference/tsxSpreadDoesNotReportExcessProps.js
@@ -15,17 +15,6 @@ class MyComponent extends React.Component<{dataSource: number[], onClick?: any},
//// [tsxSpreadDoesNotReportExcessProps.js]
"use strict";
///
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
@@ -33,6 +22,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
const react_1 = __importDefault(require("react"));
class MyComponent extends react_1.default.Component {
render() {
- return (react_1.default.createElement("div", __assign({}, this.props, { className: "ok" })));
+ return (react_1.default.createElement("div", Object.assign({}, this.props, { className: "ok" })));
}
}
diff --git a/tests/baselines/reference/unionExcessPropsWithPartialMember.js b/tests/baselines/reference/unionExcessPropsWithPartialMember.js
index 703a6a1822f11..311193211c8ac 100644
--- a/tests/baselines/reference/unionExcessPropsWithPartialMember.js
+++ b/tests/baselines/reference/unionExcessPropsWithPartialMember.js
@@ -19,15 +19,4 @@ ab = {...a, y: (null as any as string | undefined)}; // Should be allowed, since
//// [unionExcessPropsWithPartialMember.js]
"use strict";
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
-ab = __assign(__assign({}, a), { y: null }); // Should be allowed, since `y` is missing on `A`
+ab = Object.assign(Object.assign({}, a), { y: null }); // Should be allowed, since `y` is missing on `A`
diff --git a/tests/baselines/reference/unknownType1.js b/tests/baselines/reference/unknownType1.js
index 0302bfc22eb72..a5f13713b0d3e 100644
--- a/tests/baselines/reference/unknownType1.js
+++ b/tests/baselines/reference/unknownType1.js
@@ -188,17 +188,6 @@ function oops(arg: T): {} {
//// [unknownType1.js]
"use strict";
// In an intersection everything absorbs unknown
-var __assign = (this && this.__assign) || function () {
- __assign = Object.assign || function(t) {
- for (var s, i = 1, n = arguments.length; i < n; i++) {
- s = arguments[i];
- for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
- t[p] = s[p];
- }
- return t;
- };
- return __assign.apply(this, arguments);
-};
var __rest = (this && this.__rest) || function (s, e) {
var t = {};
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -281,10 +270,10 @@ function f25() {
}
// Spread of unknown causes result to be unknown
function f26(x, y, z) {
- let o1 = __assign({ a: 42 }, x); // { a: number }
- let o2 = __assign(__assign({ a: 42 }, x), y); // unknown
- let o3 = __assign(__assign(__assign({ a: 42 }, x), y), z); // any
- let o4 = __assign({ a: 42 }, z); // any
+ let o1 = Object.assign({ a: 42 }, x); // { a: number }
+ let o2 = Object.assign(Object.assign({ a: 42 }, x), y); // unknown
+ let o3 = Object.assign(Object.assign(Object.assign({ a: 42 }, x), y), z); // any
+ let o4 = Object.assign({ a: 42 }, z); // any
}
// Functions with unknown return type don't need return expressions
function f27() {
From 998879eef70e9aa4eb7dae04408933fca3cbaf53 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:20:01 -0700
Subject: [PATCH 11/18] visitorPublic.ts
---
src/compiler/visitorPublic.ts | 7 +---
.../capturedParametersInInitializers2.js | 37 +++++++++++--------
...ldInParameterBindingPattern(target=es5).js | 6 +--
...FieldInParameterInitializer(target=es5).js | 4 +-
...orInParameterBindingPattern(target=es5).js | 2 +-
...ratorInParameterInitializer(target=es5).js | 2 +-
...ngInParameterBindingPattern(target=es5).js | 2 +-
...iningInParameterInitializer(target=es5).js | 2 +-
.../staticFieldWithInterfaceContext.js | 4 +-
9 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/src/compiler/visitorPublic.ts b/src/compiler/visitorPublic.ts
index d1aee94bc6e1b..53f5075037f77 100644
--- a/src/compiler/visitorPublic.ts
+++ b/src/compiler/visitorPublic.ts
@@ -6,7 +6,6 @@ import {
factory,
FunctionBody,
getEmitFlags,
- getEmitScriptTarget,
HasChildren,
Identifier,
isArray,
@@ -93,7 +92,6 @@ import {
NodeVisitor,
nullTransformationContext,
ParameterDeclaration,
- ScriptTarget,
setEmitFlags,
setTextRange,
setTextRangePosEnd,
@@ -405,10 +403,7 @@ export function visitParameterList(nodes: NodeArray | unde
// exists in a different lexical scope. To address this, we move any binding patterns and initializers
// in a parameter list to the body if we detect a variable being hoisted while visiting a parameter list
// when the emit target is greater than ES2015.
- if (
- context.getLexicalEnvironmentFlags() & LexicalEnvironmentFlags.VariablesHoistedInParameters &&
- getEmitScriptTarget(context.getCompilerOptions()) >= ScriptTarget.ES2015
- ) {
+ if (context.getLexicalEnvironmentFlags() & LexicalEnvironmentFlags.VariablesHoistedInParameters) {
updated = addDefaultValueAssignmentsIfNeeded(updated, context);
}
context.setLexicalEnvironmentFlags(LexicalEnvironmentFlags.InParameters, false);
diff --git a/tests/baselines/reference/capturedParametersInInitializers2.js b/tests/baselines/reference/capturedParametersInInitializers2.js
index 4bb279ae1ea33..ae2a81645d949 100644
--- a/tests/baselines/reference/capturedParametersInInitializers2.js
+++ b/tests/baselines/reference/capturedParametersInInitializers2.js
@@ -21,23 +21,28 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
};
-function foo(y = (_a = class {
- get [x]() { return x; }
- constructor() { x; }
- [z]() { return z; }
- },
- __setFunctionName(_a, "y"),
- _a.c = x,
- _a), x = 1, z = 2) {
+function foo(y, x, z) {
var _a;
+ if (y === void 0) { y = (_a = class {
+ get [x]() { return x; }
+ constructor() { x; }
+ [z]() { return z; }
+ },
+ __setFunctionName(_a, "y"),
+ _a.c = x,
+ _a); }
+ if (x === void 0) { x = 1; }
+ if (z === void 0) { z = 2; }
y.c;
}
-function foo2(y = (_a = class {
- constructor() {
- this[_b] = x;
- }
- },
- _b = x,
- _a), x = 1) {
- var _b, _a;
+function foo2(y, x) {
+ var _a, _b;
+ if (y === void 0) { y = (_b = class {
+ constructor() {
+ this[_a] = x;
+ }
+ },
+ _a = x,
+ _b); }
+ if (x === void 0) { x = 1; }
}
diff --git a/tests/baselines/reference/classWithStaticFieldInParameterBindingPattern(target=es5).js b/tests/baselines/reference/classWithStaticFieldInParameterBindingPattern(target=es5).js
index 302b79d1f7632..1f5494e202bc2 100644
--- a/tests/baselines/reference/classWithStaticFieldInParameterBindingPattern(target=es5).js
+++ b/tests/baselines/reference/classWithStaticFieldInParameterBindingPattern(target=es5).js
@@ -6,7 +6,7 @@
//// [classWithStaticFieldInParameterBindingPattern.js]
// https://github.com/microsoft/TypeScript/issues/36295
-(({ [(_a = class {
+((_a) => { var _b; var { [(_b = class {
},
- _a.x = 1,
- _a).x]: b = "" }) => { var _a; })();
+ _b.x = 1,
+ _b).x]: b = "" } = _a; })();
diff --git a/tests/baselines/reference/classWithStaticFieldInParameterInitializer(target=es5).js b/tests/baselines/reference/classWithStaticFieldInParameterInitializer(target=es5).js
index 752eafc9f578c..e3adc92a100e4 100644
--- a/tests/baselines/reference/classWithStaticFieldInParameterInitializer(target=es5).js
+++ b/tests/baselines/reference/classWithStaticFieldInParameterInitializer(target=es5).js
@@ -10,8 +10,8 @@ var __setFunctionName = (this && this.__setFunctionName) || function (f, name, p
return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
};
// https://github.com/microsoft/TypeScript/issues/36295
-((b = (_a = class {
+((b) => { var _a; if (b === void 0) { b = (_a = class {
},
__setFunctionName(_a, "b"),
_a.x = 1,
- _a)) => { var _a; })();
+ _a); } })();
diff --git a/tests/baselines/reference/nullishCoalescingOperatorInParameterBindingPattern(target=es5).js b/tests/baselines/reference/nullishCoalescingOperatorInParameterBindingPattern(target=es5).js
index 924e1ebd4f04c..0b889037b0d8d 100644
--- a/tests/baselines/reference/nullishCoalescingOperatorInParameterBindingPattern(target=es5).js
+++ b/tests/baselines/reference/nullishCoalescingOperatorInParameterBindingPattern(target=es5).js
@@ -8,4 +8,4 @@ const a = (): string | undefined => undefined;
//// [nullishCoalescingOperatorInParameterBindingPattern.js]
// https://github.com/microsoft/TypeScript/issues/36295
const a = () => undefined;
-(({ [(_a = a()) !== null && _a !== void 0 ? _a : "d"]: c = "" }) => { var _a; })();
+((_a) => { var _b; var { [(_b = a()) !== null && _b !== void 0 ? _b : "d"]: c = "" } = _a; })();
diff --git a/tests/baselines/reference/nullishCoalescingOperatorInParameterInitializer(target=es5).js b/tests/baselines/reference/nullishCoalescingOperatorInParameterInitializer(target=es5).js
index 722c661959752..793f507743131 100644
--- a/tests/baselines/reference/nullishCoalescingOperatorInParameterInitializer(target=es5).js
+++ b/tests/baselines/reference/nullishCoalescingOperatorInParameterInitializer(target=es5).js
@@ -8,4 +8,4 @@ const a = (): string | undefined => undefined;
//// [nullishCoalescingOperatorInParameterInitializer.js]
// https://github.com/microsoft/TypeScript/issues/36295
const a = () => undefined;
-((b = (_a = a()) !== null && _a !== void 0 ? _a : "d") => { var _a; })();
+((b) => { var _a; if (b === void 0) { b = (_a = a()) !== null && _a !== void 0 ? _a : "d"; } })();
diff --git a/tests/baselines/reference/optionalChainingInParameterBindingPattern(target=es5).js b/tests/baselines/reference/optionalChainingInParameterBindingPattern(target=es5).js
index d3d2d4c6cac0c..4deb650441990 100644
--- a/tests/baselines/reference/optionalChainingInParameterBindingPattern(target=es5).js
+++ b/tests/baselines/reference/optionalChainingInParameterBindingPattern(target=es5).js
@@ -8,4 +8,4 @@ const a = (): { d: string } | undefined => undefined;
//// [optionalChainingInParameterBindingPattern.js]
// https://github.com/microsoft/TypeScript/issues/36295
const a = () => undefined;
-(({ [(_a = a()) === null || _a === void 0 ? void 0 : _a.d]: c = "" }) => { var _a; })();
+((_a) => { var _b; var { [(_b = a()) === null || _b === void 0 ? void 0 : _b.d]: c = "" } = _a; })();
diff --git a/tests/baselines/reference/optionalChainingInParameterInitializer(target=es5).js b/tests/baselines/reference/optionalChainingInParameterInitializer(target=es5).js
index 36493cf27f7ab..65f2d01613102 100644
--- a/tests/baselines/reference/optionalChainingInParameterInitializer(target=es5).js
+++ b/tests/baselines/reference/optionalChainingInParameterInitializer(target=es5).js
@@ -8,4 +8,4 @@ const a = (): { d: string } | undefined => undefined;
//// [optionalChainingInParameterInitializer.js]
// https://github.com/microsoft/TypeScript/issues/36295
const a = () => undefined;
-((b = (_a = a()) === null || _a === void 0 ? void 0 : _a.d) => { var _a; })();
+((b) => { var _a; if (b === void 0) { b = (_a = a()) === null || _a === void 0 ? void 0 : _a.d; } })();
diff --git a/tests/baselines/reference/staticFieldWithInterfaceContext.js b/tests/baselines/reference/staticFieldWithInterfaceContext.js
index ede8d8cbd5c17..52e3e9f07bef2 100644
--- a/tests/baselines/reference/staticFieldWithInterfaceContext.js
+++ b/tests/baselines/reference/staticFieldWithInterfaceContext.js
@@ -49,11 +49,11 @@ let c2 = (_b = class {
_b[_c] = { a: "a" },
_b);
c[ex] = { a: "a" };
-function f(c = (_r = class {
+function f(c) { var _r; if (c === void 0) { c = (_r = class {
},
__setFunctionName(_r, "c"),
_r.x = { a: "a" },
- _r)) { var _r; }
+ _r); } }
let { c: c3 } = { c: (_d = class {
},
__setFunctionName(_d, "c"),
From a387c605dfa23ff0c9056b38102edfee201c9046 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:27:22 -0700
Subject: [PATCH 12/18] utilities.ts
---
src/compiler/utilities.ts | 20 ++-----
...rowFunctionWhenUsingArguments01.errors.txt | 8 +--
...tArrowFunctionWhenUsingArguments01.symbols | 2 -
...mitArrowFunctionWhenUsingArguments01.types | 8 +--
...rowFunctionWhenUsingArguments02.errors.txt | 4 +-
...tArrowFunctionWhenUsingArguments02.symbols | 1 -
...mitArrowFunctionWhenUsingArguments02.types | 12 ++--
...rowFunctionWhenUsingArguments03.errors.txt | 8 ---
...tArrowFunctionWhenUsingArguments03.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments03.types | 12 ++--
...rowFunctionWhenUsingArguments04.errors.txt | 10 ----
...tArrowFunctionWhenUsingArguments04.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments04.types | 12 ++--
...rowFunctionWhenUsingArguments05.errors.txt | 9 ---
...tArrowFunctionWhenUsingArguments05.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments05.types | 12 ++--
...rowFunctionWhenUsingArguments06.errors.txt | 9 ---
...tArrowFunctionWhenUsingArguments06.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments06.types | 16 +++--
...rowFunctionWhenUsingArguments07.errors.txt | 9 ---
...tArrowFunctionWhenUsingArguments07.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments07.types | 17 +++---
...rowFunctionWhenUsingArguments11.errors.txt | 10 ----
...tArrowFunctionWhenUsingArguments11.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments11.types | 16 +++--
...rowFunctionWhenUsingArguments12.errors.txt | 5 +-
...tArrowFunctionWhenUsingArguments12.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments12.types | 12 ++--
...rowFunctionWhenUsingArguments14.errors.txt | 12 ----
...tArrowFunctionWhenUsingArguments14.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments14.types | 12 ++--
...rowFunctionWhenUsingArguments15.errors.txt | 13 ----
...tArrowFunctionWhenUsingArguments15.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments15.types | 12 ++--
...rowFunctionWhenUsingArguments16.errors.txt | 13 ----
...tArrowFunctionWhenUsingArguments16.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments16.types | 16 ++---
...rowFunctionWhenUsingArguments17.errors.txt | 13 ----
...tArrowFunctionWhenUsingArguments17.symbols | 2 +-
...mitArrowFunctionWhenUsingArguments17.types | 16 ++---
.../functionImplementationErrors.errors.txt | 5 +-
.../functionImplementationErrors.symbols | 2 +-
.../functionImplementationErrors.types | 12 ++--
...ctionLikeInParameterInitializer.errors.txt | 34 +++++++++++
...functionLikeInParameterInitializer.symbols | 4 --
.../functionLikeInParameterInitializer.types | 60 +++++++++----------
...nalParamReferencingOtherParams2.errors.txt | 4 +-
...tionalParamReferencingOtherParams2.symbols | 1 -
...optionalParamReferencingOtherParams2.types | 16 ++---
...rInitializersForwardReferencing.errors.txt | 13 ++--
...eterInitializersForwardReferencing.symbols | 4 +-
...InitializersForwardReferencing1.errors.txt | 13 +---
...terInitializersForwardReferencing1.symbols | 6 +-
...meterInitializersForwardReferencing1.types | 26 ++++----
54 files changed, 211 insertions(+), 330 deletions(-)
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
create mode 100644 tests/baselines/reference/functionLikeInParameterInitializer.errors.txt
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
index 95ae7ec9cc9db..e0cb3fa1758d3 100644
--- a/src/compiler/utilities.ts
+++ b/src/compiler/utilities.ts
@@ -8979,6 +8979,7 @@ const _computedOptions = createComputedCompilerOptions({
computeValue: (compilerOptions): ModuleKind => {
return typeof compilerOptions.module === "number" ?
compilerOptions.module :
+ // TODO: remove ScriptTarget.ES2015
_computedOptions.target.computeValue(compilerOptions) >= ScriptTarget.ES2015 ? ModuleKind.ES2015 : ModuleKind.CommonJS;
},
},
@@ -11641,13 +11642,6 @@ export function createNameResolver({
}
}
break;
- case SyntaxKind.ArrowFunction:
- // when targeting ES6 or higher there is no 'arguments' in an arrow function
- // for lower compile targets the resolved symbol is used to emit an error
- if (getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES2015) {
- break;
- }
- // falls through
case SyntaxKind.MethodDeclaration:
case SyntaxKind.Constructor:
case SyntaxKind.GetAccessor:
@@ -11821,14 +11815,12 @@ export function createNameResolver({
// - optional chaining pre-es2020
// - nullish coalesce pre-es2020
// - spread assignment in binding pattern pre-es2017
- if (target >= ScriptTarget.ES2015) {
- let declarationRequiresScopeChange = getRequiresScopeChangeCache(functionLocation);
- if (declarationRequiresScopeChange === undefined) {
- declarationRequiresScopeChange = forEach(functionLocation.parameters, requiresScopeChange) || false;
- setRequiresScopeChangeCache(functionLocation, declarationRequiresScopeChange);
- }
- return !declarationRequiresScopeChange;
+ let declarationRequiresScopeChange = getRequiresScopeChangeCache(functionLocation);
+ if (declarationRequiresScopeChange === undefined) {
+ declarationRequiresScopeChange = forEach(functionLocation.parameters, requiresScopeChange) || false;
+ setRequiresScopeChangeCache(functionLocation, declarationRequiresScopeChange);
}
+ return !declarationRequiresScopeChange;
}
return false;
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
index 4f3fd70472338..edf9a3c0844da 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
@@ -1,14 +1,14 @@
-emitArrowFunctionWhenUsingArguments01.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
+emitArrowFunctionWhenUsingArguments01.ts(2,15): error TS2304: Cannot find name 'arguments'.
emitArrowFunctionWhenUsingArguments01.ts(7,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
emitArrowFunctionWhenUsingArguments01.ts(13,13): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
+emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2304: Cannot find name 'arguments'.
==== emitArrowFunctionWhenUsingArguments01.ts (4 errors) ====
var a = () => {
var arg = arguments[0]; // error
~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
+!!! error TS2304: Cannot find name 'arguments'.
}
var b = function () {
@@ -31,7 +31,7 @@ emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2496: The 'arguments' o
foo(() => {
var arg = arguments[0]; // error
~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
+!!! error TS2304: Cannot find name 'arguments'.
});
function bar() {
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.symbols
index 56b61fc422ad6..57738e423082b 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.symbols
@@ -6,7 +6,6 @@ var a = () => {
var arg = arguments[0]; // error
>arg : Symbol(arg, Decl(emitArrowFunctionWhenUsingArguments01.ts, 1, 7))
->arguments : Symbol(arguments)
}
var b = function () {
@@ -40,7 +39,6 @@ foo(() => {
var arg = arguments[0]; // error
>arg : Symbol(arg, Decl(emitArrowFunctionWhenUsingArguments01.ts, 18, 7))
->arguments : Symbol(arguments)
});
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.types
index cc598bbd22017..6c3d1858f02ec 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.types
@@ -12,8 +12,8 @@ var a = () => {
> : ^^^
>arguments[0] : any
> : ^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>arguments : any
+> : ^^^
>0 : 0
> : ^
}
@@ -81,8 +81,8 @@ foo(() => {
> : ^^^
>arguments[0] : any
> : ^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>arguments : any
+> : ^^^
>0 : 0
> : ^
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
index dd2a76eaddb4d..cf09790eb8c97 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.errors.txt
@@ -1,7 +1,7 @@
-emitArrowFunctionWhenUsingArguments02.ts(1,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
+emitArrowFunctionWhenUsingArguments02.ts(1,15): error TS2304: Cannot find name 'arguments'.
==== emitArrowFunctionWhenUsingArguments02.ts (1 errors) ====
var a = () => arguments;
~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
\ No newline at end of file
+!!! error TS2304: Cannot find name 'arguments'.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.symbols
index bc6ada7030f58..525d7f19a9a66 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.symbols
@@ -3,5 +3,4 @@
=== emitArrowFunctionWhenUsingArguments02.ts ===
var a = () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments02.ts, 0, 3))
->arguments : Symbol(arguments)
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.types
index d944707ad3978..50c575b6e4896 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments02.types
@@ -2,10 +2,10 @@
=== emitArrowFunctionWhenUsingArguments02.ts ===
var a = () => arguments;
->a : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => any
+> : ^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
+> : ^^^
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
deleted file mode 100644
index c9f5526b14ebe..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-emitArrowFunctionWhenUsingArguments03.ts(2,15): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments03.ts (1 errors) ====
- var arguments;
- var a = () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.symbols
index 330ee3789816c..e54b9ef5bd414 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.symbols
@@ -6,5 +6,5 @@ var arguments;
var a = () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments03.ts, 1, 3))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments03.ts, 0, 3))
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.types
index 756142e72f371..bbce51d986fa7 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments03.types
@@ -3,13 +3,11 @@
=== emitArrowFunctionWhenUsingArguments03.ts ===
var arguments;
>arguments : any
-> : ^^^
var a = () => arguments;
->a : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => any
+> : ^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
deleted file mode 100644
index b962c5453e1bf..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-emitArrowFunctionWhenUsingArguments04.ts(3,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments04.ts (1 errors) ====
- function f() {
- var arguments;
- var a = () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.symbols
index ed04a6c54cd57..1b2fc7cf3feba 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.symbols
@@ -9,5 +9,5 @@ function f() {
var a = () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments04.ts, 2, 7))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments04.ts, 1, 7))
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.types
index 74e000ce61f6a..f19ab5dbcf9fd 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments04.types
@@ -7,13 +7,11 @@ function f() {
var arguments;
>arguments : any
-> : ^^^
var a = () => arguments;
->a : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => any
+> : ^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
deleted file mode 100644
index 802e88b146761..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-emitArrowFunctionWhenUsingArguments05.ts(2,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments05.ts (1 errors) ====
- function f(arguments) {
- var a = () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.symbols
index 1bb2d9b8d32b3..254d7203b21f2 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.symbols
@@ -7,5 +7,5 @@ function f(arguments) {
var a = () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments05.ts, 1, 7))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments05.ts, 0, 11))
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.types
index 69a46a305c427..6cd5c153831b4 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments05.types
@@ -5,13 +5,11 @@ function f(arguments) {
>f : (arguments: any) => void
> : ^ ^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
var a = () => arguments;
->a : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => any
+> : ^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
deleted file mode 100644
index 1d17c2669a321..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-emitArrowFunctionWhenUsingArguments06.ts(2,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments06.ts (1 errors) ====
- function f(arguments) {
- var a = () => () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.symbols
index 9b8370f3f0e49..b9bf50b481ae3 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.symbols
@@ -7,5 +7,5 @@ function f(arguments) {
var a = () => () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments06.ts, 1, 7))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments06.ts, 0, 11))
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.types
index ee4e78ccfd433..6fbcc94be2cdc 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments06.types
@@ -5,15 +5,13 @@ function f(arguments) {
>f : (arguments: any) => void
> : ^ ^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
var a = () => () => arguments;
->a : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
->() => () => arguments : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => () => any
+> : ^^^^^^^^^^^^^^^
+>() => () => arguments : () => () => any
+> : ^^^^^^^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
deleted file mode 100644
index c3037a6e2b559..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-emitArrowFunctionWhenUsingArguments07.ts(2,34): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments07.ts (1 errors) ====
- function f(arguments) {
- var a = (arguments) => () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.symbols
index 4bccf38d83dab..bbfaf7221f80b 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.symbols
@@ -8,5 +8,5 @@ function f(arguments) {
var a = (arguments) => () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments07.ts, 1, 7))
>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments07.ts, 1, 13))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments07.ts, 1, 13))
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.types
index 36785c96f6a32..3b67ce8002417 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments07.types
@@ -5,17 +5,14 @@ function f(arguments) {
>f : (arguments: any) => void
> : ^ ^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
var a = (arguments) => () => arguments;
->a : (arguments: any) => () => IArguments
-> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
->(arguments) => () => arguments : (arguments: any) => () => IArguments
-> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^
+>a : (arguments: any) => () => any
+> : ^ ^^^^^^^^^^^^^^^^^^^
+>(arguments) => () => arguments : (arguments: any) => () => any
+> : ^ ^^^^^^^^^^^^^^^^^^^
+>arguments : any
+>() => arguments : () => any
+> : ^^^^^^^^^
>arguments : any
-> : ^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
deleted file mode 100644
index dcce324a922d3..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-emitArrowFunctionWhenUsingArguments11.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments11.ts (1 errors) ====
- function f(arguments) {
- var _arguments = 10;
- var a = () => () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.symbols
index c554e449a98f7..96debf73c8304 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.symbols
@@ -10,5 +10,5 @@ function f(arguments) {
var a = () => () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments11.ts, 2, 7))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments11.ts, 0, 11))
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.types
index 94009bca9e4ad..e273761aeea90 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments11.types
@@ -5,7 +5,6 @@ function f(arguments) {
>f : (arguments: any) => void
> : ^ ^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
var _arguments = 10;
>_arguments : number
@@ -14,12 +13,11 @@ function f(arguments) {
> : ^^
var a = () => () => arguments;
->a : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
->() => () => arguments : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => () => any
+> : ^^^^^^^^^^^^^^^
+>() => () => arguments : () => () => any
+> : ^^^^^^^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
index 6d2385b2cb7f7..ac04a75538d93 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.errors.txt
@@ -1,14 +1,11 @@
emitArrowFunctionWhenUsingArguments12.ts(2,7): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-emitArrowFunctionWhenUsingArguments12.ts(3,23): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-==== emitArrowFunctionWhenUsingArguments12.ts (2 errors) ====
+==== emitArrowFunctionWhenUsingArguments12.ts (1 errors) ====
class C {
f(arguments) {
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var a = () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.symbols
index f033123856568..69807522f1799 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.symbols
@@ -10,6 +10,6 @@ class C {
var a = () => arguments;
>a : Symbol(a, Decl(emitArrowFunctionWhenUsingArguments12.ts, 2, 11))
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments12.ts, 1, 6))
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.types
index 4839104b6841b..40ce11eb65f02 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments12.types
@@ -12,11 +12,11 @@ class C {
> : ^^^
var a = () => arguments;
->a : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>a : () => any
+> : ^^^^^^^^^
+>() => arguments : () => any
+> : ^^^^^^^^^
+>arguments : any
+> : ^^^
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
deleted file mode 100644
index 38491ae7195a5..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-emitArrowFunctionWhenUsingArguments14.ts(4,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments14.ts (1 errors) ====
- function f() {
- if (Math.random()) {
- const arguments = 100;
- return () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.symbols
index b3044325ad7f1..21a8b2004e86d 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.symbols
@@ -13,6 +13,6 @@ function f() {
>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments14.ts, 2, 13))
return () => arguments;
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments14.ts, 2, 13))
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.types
index 4f265d5bc112b..63f66daca2a4b 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments14.types
@@ -2,8 +2,8 @@
=== emitArrowFunctionWhenUsingArguments14.ts ===
function f() {
->f : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
+>f : () => () => number
+> : ^^^^^^^^^^^^^^^^^^
if (Math.random()) {
>Math.random() : number
@@ -22,9 +22,9 @@ function f() {
> : ^^^
return () => arguments;
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>() => arguments : () => number
+> : ^^^^^^^^^^^^
+>arguments : 100
+> : ^^^
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
deleted file mode 100644
index 08a608ae1216d..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-emitArrowFunctionWhenUsingArguments15.ts(5,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments15.ts (1 errors) ====
- function f() {
- var arguments = "hello";
- if (Math.random()) {
- const arguments = 100;
- return () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.symbols
index 11847717e6abc..8b33e698c4647 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.symbols
@@ -16,6 +16,6 @@ function f() {
>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments15.ts, 3, 13))
return () => arguments;
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments15.ts, 3, 13))
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.types
index f8f496216b06a..c83d8ca35e8b5 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments15.types
@@ -2,8 +2,8 @@
=== emitArrowFunctionWhenUsingArguments15.ts ===
function f() {
->f : () => () => IArguments
-> : ^^^^^^^^^^^^^^^^^^^^^^
+>f : () => () => number
+> : ^^^^^^^^^^^^^^^^^^
var arguments = "hello";
>arguments : string
@@ -28,9 +28,9 @@ function f() {
> : ^^^
return () => arguments;
->() => arguments : () => IArguments
-> : ^^^^^^^^^^^^^^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>() => arguments : () => number
+> : ^^^^^^^^^^^^
+>arguments : 100
+> : ^^^
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
deleted file mode 100644
index f3becb13393c7..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-emitArrowFunctionWhenUsingArguments16.ts(4,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments16.ts (1 errors) ====
- function f() {
- var arguments = "hello";
- if (Math.random()) {
- return () => arguments[0];
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- var arguments = "world";
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.symbols
index bcca348e03c6c..539ed97dca80d 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.symbols
@@ -13,7 +13,7 @@ function f() {
>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
return () => arguments[0];
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments16.ts, 1, 7), Decl(emitArrowFunctionWhenUsingArguments16.ts, 5, 7))
}
var arguments = "world";
>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments16.ts, 1, 7), Decl(emitArrowFunctionWhenUsingArguments16.ts, 5, 7))
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.types
index e5ffd84d04bc3..780601d9fc530 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments16.types
@@ -2,8 +2,8 @@
=== emitArrowFunctionWhenUsingArguments16.ts ===
function f() {
->f : () => () => any
-> : ^^^^^^^^^^^^^^^
+>f : () => () => string
+> : ^^^^^^^^^^^^^^^^^^
var arguments = "hello";
>arguments : string
@@ -22,12 +22,12 @@ function f() {
> : ^^^^^^
return () => arguments[0];
->() => arguments[0] : () => any
-> : ^^^^^^^^^
->arguments[0] : any
-> : ^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>() => arguments[0] : () => string
+> : ^^^^^^^^^^^^
+>arguments[0] : string
+> : ^^^^^^
+>arguments : string
+> : ^^^^^^
>0 : 0
> : ^
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
deleted file mode 100644
index 47a1971378097..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-emitArrowFunctionWhenUsingArguments17.ts(4,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments17.ts (1 errors) ====
- function f() {
- var { arguments } = { arguments: "hello" };
- if (Math.random()) {
- return () => arguments[0];
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- var arguments = "world";
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.symbols b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.symbols
index 83602fe1451b8..5764303b4f951 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.symbols
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.symbols
@@ -14,7 +14,7 @@ function f() {
>random : Symbol(Math.random, Decl(lib.es5.d.ts, --, --))
return () => arguments[0];
->arguments : Symbol(arguments)
+>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments17.ts, 1, 9), Decl(emitArrowFunctionWhenUsingArguments17.ts, 5, 7))
}
var arguments = "world";
>arguments : Symbol(arguments, Decl(emitArrowFunctionWhenUsingArguments17.ts, 1, 9), Decl(emitArrowFunctionWhenUsingArguments17.ts, 5, 7))
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.types
index d9d6a3594c278..08520075773a1 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments17.types
@@ -2,8 +2,8 @@
=== emitArrowFunctionWhenUsingArguments17.ts ===
function f() {
->f : () => () => any
-> : ^^^^^^^^^^^^^^^
+>f : () => () => string
+> : ^^^^^^^^^^^^^^^^^^
var { arguments } = { arguments: "hello" };
>arguments : string
@@ -26,12 +26,12 @@ function f() {
> : ^^^^^^
return () => arguments[0];
->() => arguments[0] : () => any
-> : ^^^^^^^^^
->arguments[0] : any
-> : ^^^
->arguments : IArguments
-> : ^^^^^^^^^^
+>() => arguments[0] : () => string
+> : ^^^^^^^^^^^^
+>arguments[0] : string
+> : ^^^^^^
+>arguments : string
+> : ^^^^^^
>0 : 0
> : ^
}
diff --git a/tests/baselines/reference/functionImplementationErrors.errors.txt b/tests/baselines/reference/functionImplementationErrors.errors.txt
index 09a5987d82ae2..4f29d69b857c3 100644
--- a/tests/baselines/reference/functionImplementationErrors.errors.txt
+++ b/tests/baselines/reference/functionImplementationErrors.errors.txt
@@ -1,10 +1,9 @@
functionImplementationErrors.ts(25,16): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-functionImplementationErrors.ts(30,17): error TS2373: Parameter 'n' cannot reference identifier 'm' declared after it.
functionImplementationErrors.ts(35,17): error TS2373: Parameter 'n' cannot reference identifier 'm' declared after it.
functionImplementationErrors.ts(40,1): error TS2839: This condition will always return 'false' since JavaScript compares objects by reference, not value.
-==== functionImplementationErrors.ts (4 errors) ====
+==== functionImplementationErrors.ts (3 errors) ====
// FunctionExpression with no return type annotation with multiple return statements with unrelated types
var f1 = function () {
return '';
@@ -37,8 +36,6 @@ functionImplementationErrors.ts(40,1): error TS2839: This condition will always
var m;
// Function signature with parameter initializer referencing in scope local variable
function f6(n = m) {
- ~
-!!! error TS2373: Parameter 'n' cannot reference identifier 'm' declared after it.
var m = 4;
}
diff --git a/tests/baselines/reference/functionImplementationErrors.symbols b/tests/baselines/reference/functionImplementationErrors.symbols
index 3c207c5a95d2d..37c19b405c027 100644
--- a/tests/baselines/reference/functionImplementationErrors.symbols
+++ b/tests/baselines/reference/functionImplementationErrors.symbols
@@ -45,7 +45,7 @@ var m;
function f6(n = m) {
>f6 : Symbol(f6, Decl(functionImplementationErrors.ts, 27, 6))
>n : Symbol(n, Decl(functionImplementationErrors.ts, 29, 12))
->m : Symbol(m, Decl(functionImplementationErrors.ts, 30, 7))
+>m : Symbol(m, Decl(functionImplementationErrors.ts, 27, 3))
var m = 4;
>m : Symbol(m, Decl(functionImplementationErrors.ts, 30, 7))
diff --git a/tests/baselines/reference/functionImplementationErrors.types b/tests/baselines/reference/functionImplementationErrors.types
index acf714f4f113f..2e5d4d2aa750e 100644
--- a/tests/baselines/reference/functionImplementationErrors.types
+++ b/tests/baselines/reference/functionImplementationErrors.types
@@ -88,12 +88,12 @@ var m;
// Function signature with parameter initializer referencing in scope local variable
function f6(n = m) {
->f6 : (n?: number) => void
-> : ^ ^^^^^^^^^^^^^^^^^^
->n : number
-> : ^^^^^^
->m : number
-> : ^^^^^^
+>f6 : (n?: any) => void
+> : ^ ^^^^^^^^^^^^^^^
+>n : any
+> : ^^^
+>m : any
+> : ^^^
var m = 4;
>m : number
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.errors.txt b/tests/baselines/reference/functionLikeInParameterInitializer.errors.txt
new file mode 100644
index 0000000000000..a51f29297d7f3
--- /dev/null
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.errors.txt
@@ -0,0 +1,34 @@
+functionLikeInParameterInitializer.ts(2,34): error TS2304: Cannot find name 'foo'.
+functionLikeInParameterInitializer.ts(6,44): error TS2304: Cannot find name 'foo'.
+functionLikeInParameterInitializer.ts(11,50): error TS2304: Cannot find name 'foo'.
+functionLikeInParameterInitializer.ts(16,41): error TS2304: Cannot find name 'foo'.
+
+
+==== functionLikeInParameterInitializer.ts (4 errors) ====
+ // error
+ export function bar(func = () => foo) {
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ let foo = "in";
+ }
+ // error
+ export function baz1(func = { f() { return foo } }) {
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ let foo = "in";
+ }
+
+ // error
+ export function baz2(func = function () { return foo }) {
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ let foo = "in";
+ }
+
+ // error
+ export function baz3(func = class { x = foo }) {
+ ~~~
+!!! error TS2304: Cannot find name 'foo'.
+ let foo = "in";
+ }
+
\ No newline at end of file
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.symbols b/tests/baselines/reference/functionLikeInParameterInitializer.symbols
index c2ccb255456ae..c67e44f4e6909 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.symbols
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.symbols
@@ -5,7 +5,6 @@
export function bar(func = () => foo) {
>bar : Symbol(bar, Decl(functionLikeInParameterInitializer.ts, 0, 0))
>func : Symbol(func, Decl(functionLikeInParameterInitializer.ts, 1, 20))
->foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 2, 7))
let foo = "in";
>foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 2, 7))
@@ -15,7 +14,6 @@ export function baz1(func = { f() { return foo } }) {
>baz1 : Symbol(baz1, Decl(functionLikeInParameterInitializer.ts, 3, 1))
>func : Symbol(func, Decl(functionLikeInParameterInitializer.ts, 5, 21))
>f : Symbol(f, Decl(functionLikeInParameterInitializer.ts, 5, 29))
->foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 6, 7))
let foo = "in";
>foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 6, 7))
@@ -25,7 +23,6 @@ export function baz1(func = { f() { return foo } }) {
export function baz2(func = function () { return foo }) {
>baz2 : Symbol(baz2, Decl(functionLikeInParameterInitializer.ts, 7, 1))
>func : Symbol(func, Decl(functionLikeInParameterInitializer.ts, 10, 21))
->foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 11, 7))
let foo = "in";
>foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 11, 7))
@@ -36,7 +33,6 @@ export function baz3(func = class { x = foo }) {
>baz3 : Symbol(baz3, Decl(functionLikeInParameterInitializer.ts, 12, 1))
>func : Symbol(func, Decl(functionLikeInParameterInitializer.ts, 15, 21))
>x : Symbol((Anonymous class).x, Decl(functionLikeInParameterInitializer.ts, 15, 35))
->foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 16, 7))
let foo = "in";
>foo : Symbol(foo, Decl(functionLikeInParameterInitializer.ts, 16, 7))
diff --git a/tests/baselines/reference/functionLikeInParameterInitializer.types b/tests/baselines/reference/functionLikeInParameterInitializer.types
index 582877c8fb871..a0393006dfd56 100644
--- a/tests/baselines/reference/functionLikeInParameterInitializer.types
+++ b/tests/baselines/reference/functionLikeInParameterInitializer.types
@@ -3,14 +3,14 @@
=== functionLikeInParameterInitializer.ts ===
// error
export function bar(func = () => foo) {
->bar : (func?: () => string) => void
-> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^
->func : () => string
-> : ^^^^^^^^^^^^
->() => foo : () => string
-> : ^^^^^^^^^^^^
->foo : string
-> : ^^^^^^
+>bar : (func?: () => any) => void
+> : ^ ^^^^^^^^^^^^^^^^^^^^^
+>func : () => any
+> : ^^^^^^^^^
+>() => foo : () => any
+> : ^^^^^^^^^
+>foo : any
+> : ^^^
let foo = "in";
>foo : string
@@ -20,16 +20,16 @@ export function bar(func = () => foo) {
}
// error
export function baz1(func = { f() { return foo } }) {
->baz1 : (func?: { f(): string; }) => void
-> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->func : { f(): string; }
-> : ^^^^^^^^^^^^^^^^
->{ f() { return foo } } : { f(): string; }
-> : ^^^^^^^^^^^^^^^^
->f : () => string
-> : ^^^^^^^^^^^^
->foo : string
-> : ^^^^^^
+>baz1 : (func?: { f(): any; }) => void
+> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^^
+>func : { f(): any; }
+> : ^^^^^^^^^^^^^
+>{ f() { return foo } } : { f(): any; }
+> : ^^^^^^^^^^^^^
+>f : () => any
+> : ^^^^^^^^^
+>foo : any
+> : ^^^
let foo = "in";
>foo : string
@@ -40,14 +40,14 @@ export function baz1(func = { f() { return foo } }) {
// error
export function baz2(func = function () { return foo }) {
->baz2 : (func?: () => string) => void
-> : ^ ^^^^^^^^^^^^^^^^^^^^^^^^
->func : () => string
-> : ^^^^^^^^^^^^
->function () { return foo } : () => string
-> : ^^^^^^^^^^^^
->foo : string
-> : ^^^^^^
+>baz2 : (func?: () => any) => void
+> : ^ ^^^^^^^^^^^^^^^^^^^^^
+>func : () => any
+> : ^^^^^^^^^
+>function () { return foo } : () => any
+> : ^^^^^^^^^
+>foo : any
+> : ^^^
let foo = "in";
>foo : string
@@ -64,10 +64,10 @@ export function baz3(func = class { x = foo }) {
> : ^^^^^^^^^^^^^^^^^^^^^^^^
>class { x = foo } : typeof (Anonymous class)
> : ^^^^^^^^^^^^^^^^^^^^^^^^
->x : string
-> : ^^^^^^
->foo : string
-> : ^^^^^^
+>x : any
+> : ^^^
+>foo : any
+> : ^^^
let foo = "in";
>foo : string
diff --git a/tests/baselines/reference/optionalParamReferencingOtherParams2.errors.txt b/tests/baselines/reference/optionalParamReferencingOtherParams2.errors.txt
index 9061b457b9667..4e6f2c1e6c023 100644
--- a/tests/baselines/reference/optionalParamReferencingOtherParams2.errors.txt
+++ b/tests/baselines/reference/optionalParamReferencingOtherParams2.errors.txt
@@ -1,11 +1,11 @@
-optionalParamReferencingOtherParams2.ts(2,29): error TS2373: Parameter 'y' cannot reference identifier 'b' declared after it.
+optionalParamReferencingOtherParams2.ts(2,29): error TS2304: Cannot find name 'b'.
==== optionalParamReferencingOtherParams2.ts (1 errors) ====
var a = 1;
function strange(x = a, y = b) {
~
-!!! error TS2373: Parameter 'y' cannot reference identifier 'b' declared after it.
+!!! error TS2304: Cannot find name 'b'.
var b = "";
return y;
}
\ No newline at end of file
diff --git a/tests/baselines/reference/optionalParamReferencingOtherParams2.symbols b/tests/baselines/reference/optionalParamReferencingOtherParams2.symbols
index 6e15771255701..09cbc15ae2481 100644
--- a/tests/baselines/reference/optionalParamReferencingOtherParams2.symbols
+++ b/tests/baselines/reference/optionalParamReferencingOtherParams2.symbols
@@ -9,7 +9,6 @@ function strange(x = a, y = b) {
>x : Symbol(x, Decl(optionalParamReferencingOtherParams2.ts, 1, 17))
>a : Symbol(a, Decl(optionalParamReferencingOtherParams2.ts, 0, 3))
>y : Symbol(y, Decl(optionalParamReferencingOtherParams2.ts, 1, 23))
->b : Symbol(b, Decl(optionalParamReferencingOtherParams2.ts, 2, 7))
var b = "";
>b : Symbol(b, Decl(optionalParamReferencingOtherParams2.ts, 2, 7))
diff --git a/tests/baselines/reference/optionalParamReferencingOtherParams2.types b/tests/baselines/reference/optionalParamReferencingOtherParams2.types
index 4c4d1d9aebfb0..f69088f4739ed 100644
--- a/tests/baselines/reference/optionalParamReferencingOtherParams2.types
+++ b/tests/baselines/reference/optionalParamReferencingOtherParams2.types
@@ -8,16 +8,16 @@ var a = 1;
> : ^
function strange(x = a, y = b) {
->strange : (x?: number, y?: string) => string
-> : ^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^
+>strange : (x?: number, y?: any) => any
+> : ^ ^^^^^^^^^^^ ^^^^^^^^^^^^^^
>x : number
> : ^^^^^^
>a : number
> : ^^^^^^
->y : string
-> : ^^^^^^
->b : string
-> : ^^^^^^
+>y : any
+> : ^^^
+>b : any
+> : ^^^
var b = "";
>b : string
@@ -26,6 +26,6 @@ function strange(x = a, y = b) {
> : ^^
return y;
->y : string
-> : ^^^^^^
+>y : any
+> : ^^^
}
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing.errors.txt b/tests/baselines/reference/parameterInitializersForwardReferencing.errors.txt
index e9738950e841b..cbad689b1270c 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing.errors.txt
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing.errors.txt
@@ -1,16 +1,15 @@
parameterInitializersForwardReferencing.ts(6,20): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
parameterInitializersForwardReferencing.ts(11,21): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
parameterInitializersForwardReferencing.ts(11,28): error TS2373: Parameter 'b' cannot reference identifier 'c' declared after it.
-parameterInitializersForwardReferencing.ts(17,21): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
-parameterInitializersForwardReferencing.ts(23,25): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
+parameterInitializersForwardReferencing.ts(17,21): error TS2304: Cannot find name 'b'.
parameterInitializersForwardReferencing.ts(32,21): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
parameterInitializersForwardReferencing.ts(33,16): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
parameterInitializersForwardReferencing.ts(37,14): error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
parameterInitializersForwardReferencing.ts(37,21): error TS2373: Parameter 'b' cannot reference identifier 'c' declared after it.
-parameterInitializersForwardReferencing.ts(37,28): error TS2373: Parameter 'c' cannot reference identifier 'd' declared after it.
+parameterInitializersForwardReferencing.ts(37,28): error TS2304: Cannot find name 'd'.
-==== parameterInitializersForwardReferencing.ts (10 errors) ====
+==== parameterInitializersForwardReferencing.ts (9 errors) ====
function left(a, b = a, c = b) {
a;
b;
@@ -35,15 +34,13 @@ parameterInitializersForwardReferencing.ts(37,28): error TS2373: Parameter 'c' c
function inside(a = b) {
~
-!!! error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
+!!! error TS2304: Cannot find name 'b'.
var b;
}
function outside() {
var b;
function inside(a = b) { // Still an error because b is declared inside the function
- ~
-!!! error TS2373: Parameter 'a' cannot reference identifier 'b' declared after it.
var b;
}
}
@@ -67,7 +64,7 @@ parameterInitializersForwardReferencing.ts(37,28): error TS2373: Parameter 'c' c
~
!!! error TS2373: Parameter 'b' cannot reference identifier 'c' declared after it.
~
-!!! error TS2373: Parameter 'c' cannot reference identifier 'd' declared after it.
+!!! error TS2304: Cannot find name 'd'.
// Should not produce errors - can reference later parameters if they occur within a function expression initializer.
function f(a, b = function () { return c; }, c = b()) {
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing.symbols b/tests/baselines/reference/parameterInitializersForwardReferencing.symbols
index cdcb05dc6ba42..8c95d44549552 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing.symbols
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing.symbols
@@ -52,7 +52,6 @@ function right2(a = b, b = c, c = a) {
function inside(a = b) {
>inside : Symbol(inside, Decl(parameterInitializersForwardReferencing.ts, 14, 1))
>a : Symbol(a, Decl(parameterInitializersForwardReferencing.ts, 16, 16))
->b : Symbol(b, Decl(parameterInitializersForwardReferencing.ts, 17, 7))
var b;
>b : Symbol(b, Decl(parameterInitializersForwardReferencing.ts, 17, 7))
@@ -67,7 +66,7 @@ function outside() {
function inside(a = b) { // Still an error because b is declared inside the function
>inside : Symbol(inside, Decl(parameterInitializersForwardReferencing.ts, 21, 10))
>a : Symbol(a, Decl(parameterInitializersForwardReferencing.ts, 22, 20))
->b : Symbol(b, Decl(parameterInitializersForwardReferencing.ts, 23, 11))
+>b : Symbol(b, Decl(parameterInitializersForwardReferencing.ts, 21, 7))
var b;
>b : Symbol(b, Decl(parameterInitializersForwardReferencing.ts, 23, 11))
@@ -110,7 +109,6 @@ var x = (a = b, b = c, c = d) => { var d; };
>c : Symbol(c, Decl(parameterInitializersForwardReferencing.ts, 36, 22))
>c : Symbol(c, Decl(parameterInitializersForwardReferencing.ts, 36, 22))
>d : Symbol(d, Decl(parameterInitializersForwardReferencing.ts, 36, 38))
->d : Symbol(d, Decl(parameterInitializersForwardReferencing.ts, 36, 38))
// Should not produce errors - can reference later parameters if they occur within a function expression initializer.
function f(a, b = function () { return c; }, c = b()) {
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing1.errors.txt b/tests/baselines/reference/parameterInitializersForwardReferencing1.errors.txt
index e8b2b856f29d0..9f393f33488be 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing1.errors.txt
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing1.errors.txt
@@ -1,17 +1,13 @@
-parameterInitializersForwardReferencing1.ts(3,20): error TS2373: Parameter 'bar' cannot reference identifier 'foo' declared after it.
parameterInitializersForwardReferencing1.ts(13,20): error TS2373: Parameter 'bar' cannot reference identifier 'foo' declared after it.
parameterInitializersForwardReferencing1.ts(21,18): error TS2372: Parameter 'a' cannot reference itself.
parameterInitializersForwardReferencing1.ts(25,22): error TS2372: Parameter 'async' cannot reference itself.
-parameterInitializersForwardReferencing1.ts(29,15): error TS2373: Parameter '{[foo]: bar}' cannot reference identifier 'foo' declared after it.
-parameterInitializersForwardReferencing1.ts(29,15): error TS2448: Block-scoped variable 'foo' used before its declaration.
+parameterInitializersForwardReferencing1.ts(29,15): error TS2537: Type 'any[]' has no matching index signature for type 'string'.
-==== parameterInitializersForwardReferencing1.ts (6 errors) ====
+==== parameterInitializersForwardReferencing1.ts (4 errors) ====
let foo: string = "";
function f1 (bar = foo) { // unexpected compiler error; works at runtime
- ~~~
-!!! error TS2373: Parameter 'bar' cannot reference identifier 'foo' declared after it.
var foo: number = 2;
return bar; // returns 1
}
@@ -45,10 +41,7 @@ parameterInitializersForwardReferencing1.ts(29,15): error TS2448: Block-scoped v
function f7({[foo]: bar}: any[]) {
~~~
-!!! error TS2373: Parameter '{[foo]: bar}' cannot reference identifier 'foo' declared after it.
- ~~~
-!!! error TS2448: Block-scoped variable 'foo' used before its declaration.
-!!! related TS2728 parameterInitializersForwardReferencing1.ts:30:9: 'foo' is declared here.
+!!! error TS2537: Type 'any[]' has no matching index signature for type 'string'.
let foo: number = 2;
}
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing1.symbols b/tests/baselines/reference/parameterInitializersForwardReferencing1.symbols
index efadc19e5d0c8..76ef0ee99bc82 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing1.symbols
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing1.symbols
@@ -7,7 +7,7 @@ let foo: string = "";
function f1 (bar = foo) { // unexpected compiler error; works at runtime
>f1 : Symbol(f1, Decl(parameterInitializersForwardReferencing1.ts, 0, 21))
>bar : Symbol(bar, Decl(parameterInitializersForwardReferencing1.ts, 2, 13))
->foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 3, 7))
+>foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 0, 3))
var foo: number = 2;
>foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 3, 7))
@@ -20,7 +20,7 @@ function f2 (bar = (baz = foo) => baz) { // unexpected compiler error; works at
>f2 : Symbol(f2, Decl(parameterInitializersForwardReferencing1.ts, 5, 1))
>bar : Symbol(bar, Decl(parameterInitializersForwardReferencing1.ts, 7, 13))
>baz : Symbol(baz, Decl(parameterInitializersForwardReferencing1.ts, 7, 20))
->foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 8, 7))
+>foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 0, 3))
>baz : Symbol(baz, Decl(parameterInitializersForwardReferencing1.ts, 7, 20))
var foo: number = 2;
@@ -70,7 +70,7 @@ function f6 (async = async) {
function f7({[foo]: bar}: any[]) {
>f7 : Symbol(f7, Decl(parameterInitializersForwardReferencing1.ts, 26, 1))
->foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 29, 7))
+>foo : Symbol(foo, Decl(parameterInitializersForwardReferencing1.ts, 0, 3))
>bar : Symbol(bar, Decl(parameterInitializersForwardReferencing1.ts, 28, 13))
let foo: number = 2;
diff --git a/tests/baselines/reference/parameterInitializersForwardReferencing1.types b/tests/baselines/reference/parameterInitializersForwardReferencing1.types
index f18d9ae0f4903..07780a722b1a9 100644
--- a/tests/baselines/reference/parameterInitializersForwardReferencing1.types
+++ b/tests/baselines/reference/parameterInitializersForwardReferencing1.types
@@ -8,11 +8,11 @@ let foo: string = "";
> : ^^
function f1 (bar = foo) { // unexpected compiler error; works at runtime
->f1 : (bar?: number) => number
+>f1 : (bar?: string) => string
> : ^ ^^^^^^^^^^^^^^^^^^^^
->bar : number
+>bar : string
> : ^^^^^^
->foo : number
+>foo : string
> : ^^^^^^
var foo: number = 2;
@@ -22,22 +22,22 @@ function f1 (bar = foo) { // unexpected compiler error; works at runtime
> : ^
return bar; // returns 1
->bar : number
+>bar : string
> : ^^^^^^
}
function f2 (bar = (baz = foo) => baz) { // unexpected compiler error; works at runtime
->f2 : (bar?: (baz?: number) => number) => number
+>f2 : (bar?: (baz?: string) => string) => string
> : ^ ^^^^ ^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->bar : (baz?: number) => number
+>bar : (baz?: string) => string
> : ^ ^^^^^^^^^^^^^^^^^^^^
->(baz = foo) => baz : (baz?: number) => number
+>(baz = foo) => baz : (baz?: string) => string
> : ^ ^^^^^^^^^^^^^^^^^^^^
->baz : number
+>baz : string
> : ^^^^^^
->foo : number
+>foo : string
> : ^^^^^^
->baz : number
+>baz : string
> : ^^^^^^
var foo: number = 2;
@@ -47,9 +47,9 @@ function f2 (bar = (baz = foo) => baz) { // unexpected compiler error; works at
> : ^
return bar(); // returns 1
->bar() : number
+>bar() : string
> : ^^^^^^
->bar : (baz?: number) => number
+>bar : (baz?: string) => string
> : ^ ^^^^^^^^^^^^^^^^^^^^
}
@@ -114,7 +114,7 @@ function f6 (async = async) {
function f7({[foo]: bar}: any[]) {
>f7 : ({ [foo]: bar }: any[]) => void
> : ^ ^^ ^^^^^^^^^
->foo : number
+>foo : string
> : ^^^^^^
>bar : any
> : ^^^
From eebf69b9e92ba8f262f184ad2dbddfb0c5e4665b Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:34:34 -0700
Subject: [PATCH 13/18] types.ts
---
src/compiler/checker.ts | 38 -------------------
src/compiler/scanner.ts | 2 -
src/compiler/types.ts | 29 --------------
.../arraySpreadImportHelpers.errors.txt | 16 --------
.../importHelpersNoHelpers.errors.txt | 8 +---
...persNoHelpersForAsyncGenerators.errors.txt | 5 +--
.../importHelpersNoModule.errors.txt | 6 +--
...nBracketInCharClass(target=es5).errors.txt | 5 +--
...rExpressionScanning(target=es5).errors.txt | 23 +----------
...pertyValueExpressionSuggestions.errors.txt | 5 +--
...edTemplateWithoutDeclaredHelper.errors.txt | 15 --------
...lpers-backing-types-removed-incremental.js | 28 ++------------
...portHelpers-backing-types-removed-watch.js | 7 +---
...egularExpressions01(target=es5).errors.txt | 8 ----
...egularExpressions02(target=es5).errors.txt | 8 ----
...egularExpressions03(target=es5).errors.txt | 8 ----
...egularExpressions04(target=es5).errors.txt | 8 ----
...egularExpressions05(target=es5).errors.txt | 8 ----
...egularExpressions06(target=es5).errors.txt | 10 -----
...egularExpressions07(target=es5).errors.txt | 5 +--
...egularExpressions08(target=es5).errors.txt | 11 ------
...egularExpressions09(target=es5).errors.txt | 11 ------
...egularExpressions10(target=es5).errors.txt | 12 ------
...egularExpressions11(target=es5).errors.txt | 12 ------
...egularExpressions12(target=es5).errors.txt | 5 +--
...egularExpressions13(target=es5).errors.txt | 8 ----
...egularExpressions14(target=es5).errors.txt | 5 +--
...egularExpressions15(target=es5).errors.txt | 8 ----
...egularExpressions16(target=es5).errors.txt | 8 ----
...egularExpressions17(target=es5).errors.txt | 5 +--
...egularExpressions18(target=es5).errors.txt | 8 ----
...egularExpressions19(target=es5).errors.txt | 5 +--
32 files changed, 17 insertions(+), 323 deletions(-)
delete mode 100644 tests/baselines/reference/arraySpreadImportHelpers.errors.txt
delete mode 100644 tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18(target=es5).errors.txt
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index f659c1aacdf4f..beaf864b7f16b 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -33197,10 +33197,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
function checkSpreadExpression(node: SpreadElement, checkMode?: CheckMode): Type {
- if (languageVersion < LanguageFeatureMinimumTarget.SpreadElements) {
- checkExternalEmitHelpers(node, compilerOptions.downlevelIteration ? ExternalEmitHelpers.SpreadIncludes : ExternalEmitHelpers.SpreadArray);
- }
-
const arrayOrIterableType = checkExpression(node.expression, checkMode);
return checkIteratedTypeOrElementType(IterationUse.Spread, arrayOrIterableType, undefinedType, node.expression);
}
@@ -33236,9 +33232,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
for (let i = 0; i < elementCount; i++) {
const e = elements[i];
if (e.kind === SyntaxKind.SpreadElement) {
- if (languageVersion < LanguageFeatureMinimumTarget.SpreadElements) {
- checkExternalEmitHelpers(e, compilerOptions.downlevelIteration ? ExternalEmitHelpers.SpreadIncludes : ExternalEmitHelpers.SpreadArray);
- }
const spreadType = checkExpression((e as SpreadElement).expression, checkMode, forceTuple);
if (isArrayLikeType(spreadType)) {
elementTypes.push(spreadType);
@@ -33527,9 +33520,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
else if (memberDecl.kind === SyntaxKind.SpreadAssignment) {
- if (languageVersion < LanguageFeatureMinimumTarget.ObjectAssign) {
- checkExternalEmitHelpers(memberDecl, ExternalEmitHelpers.Assign);
- }
if (propertiesArray.length > 0) {
spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, objectFlags, inConstContext);
propertiesArray = [];
@@ -37957,9 +37947,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function checkTaggedTemplateExpression(node: TaggedTemplateExpression): Type {
if (!checkGrammarTaggedTemplateChain(node)) checkGrammarTypeArguments(node, node.typeArguments);
- if (languageVersion < LanguageFeatureMinimumTarget.TaggedTemplates) {
- checkExternalEmitHelpers(node, ExternalEmitHelpers.MakeTemplateObject);
- }
const signature = getResolvedSignature(node);
checkDeprecatedSignature(signature, node);
return getReturnTypeOfSignature(signature);
@@ -40183,9 +40170,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function checkArrayLiteralAssignment(node: ArrayLiteralExpression, sourceType: Type, checkMode?: CheckMode): Type {
const elements = node.elements;
- if (languageVersion < LanguageFeatureMinimumTarget.DestructuringAssignment && compilerOptions.downlevelIteration) {
- checkExternalEmitHelpers(node, ExternalEmitHelpers.Read);
- }
// This elementType will be used if the specific property corresponding to this index is not
// present (aka the tuple element property). This call also checks that the parentType is in
// fact an iterable or array (depending on target language).
@@ -41126,11 +41110,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (isAsync && languageVersion < LanguageFeatureMinimumTarget.AsyncGenerators) {
checkExternalEmitHelpers(node, ExternalEmitHelpers.AsyncDelegatorIncludes);
}
-
- // Generator functions prior to ES2015 require the __values helper
- if (!isAsync && languageVersion < LanguageFeatureMinimumTarget.Generators && compilerOptions.downlevelIteration) {
- checkExternalEmitHelpers(node, ExternalEmitHelpers.Values);
- }
}
// There is no point in doing an assignability check if the function
@@ -42068,12 +42047,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if ((functionFlags & FunctionFlags.AsyncGenerator) === FunctionFlags.Async && languageVersion < LanguageFeatureMinimumTarget.AsyncFunctions) {
checkExternalEmitHelpers(node, ExternalEmitHelpers.Awaiter);
}
-
- // Generator functions, Async functions, and Async Generator functions prior to
- // ES2015 require the __generator helper
- if ((functionFlags & FunctionFlags.AsyncGenerator) !== FunctionFlags.Normal && languageVersion < LanguageFeatureMinimumTarget.Generators) {
- checkExternalEmitHelpers(node, ExternalEmitHelpers.Generator);
- }
}
checkTypeParameters(getEffectiveTypeParameterDeclarations(node));
@@ -44946,10 +44919,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// For a binding pattern, check contained binding elements
if (isBindingPattern(node.name)) {
- if (node.name.kind === SyntaxKind.ArrayBindingPattern && languageVersion < LanguageFeatureMinimumTarget.BindingPatterns && compilerOptions.downlevelIteration) {
- checkExternalEmitHelpers(node, ExternalEmitHelpers.Read);
- }
-
forEach(node.name.elements, checkSourceElement);
}
// For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
@@ -45399,10 +45368,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
}
- else if (compilerOptions.downlevelIteration && languageVersion < LanguageFeatureMinimumTarget.ForOf) {
- // for..of prior to ES2015 requires the __values helper when downlevelIteration is enabled
- checkExternalEmitHelpers(node, ExternalEmitHelpers.ForOfIncludes);
- }
// Check the LHS and RHS
// If the LHS is a declaration, just check it as a variable declaration, which will in turn check the RHS
@@ -46954,9 +46919,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const baseTypeNode = getEffectiveBaseTypeNode(node);
if (baseTypeNode) {
forEach(baseTypeNode.typeArguments, checkSourceElement);
- if (languageVersion < LanguageFeatureMinimumTarget.Classes) {
- checkExternalEmitHelpers(baseTypeNode.parent, ExternalEmitHelpers.Extends);
- }
// check both @extends and extends if both are specified.
const extendsNode = getClassExtendsHeritageElement(node);
if (extendsNode && extendsNode !== baseTypeNode) {
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
index 46ec3630455f7..fc618adbc1dfd 100644
--- a/src/compiler/scanner.ts
+++ b/src/compiler/scanner.ts
@@ -300,9 +300,7 @@ const charCodeToRegExpFlag = new Map([
const regExpFlagToFirstAvailableLanguageVersion = new Map([
[RegularExpressionFlags.HasIndices, LanguageFeatureMinimumTarget.RegularExpressionFlagsHasIndices],
[RegularExpressionFlags.DotAll, LanguageFeatureMinimumTarget.RegularExpressionFlagsDotAll],
- [RegularExpressionFlags.Unicode, LanguageFeatureMinimumTarget.RegularExpressionFlagsUnicode],
[RegularExpressionFlags.UnicodeSets, LanguageFeatureMinimumTarget.RegularExpressionFlagsUnicodeSets],
- [RegularExpressionFlags.Sticky, LanguageFeatureMinimumTarget.RegularExpressionFlagsSticky],
]);
/**
diff --git a/src/compiler/types.ts b/src/compiler/types.ts
index 21c50bd9a4536..08cf2a4a27e86 100644
--- a/src/compiler/types.ts
+++ b/src/compiler/types.ts
@@ -8429,21 +8429,6 @@ export type EmitHelperUniqueNameCallback = (name: string) => string;
/** @internal */
export type LanugageFeatures =
- // ES2015 Features
- | "Classes"
- | "ForOf"
- | "Generators"
- | "Iteration"
- | "SpreadElements"
- | "RestElements"
- | "TaggedTemplates"
- | "DestructuringAssignment"
- | "BindingPatterns"
- | "ArrowFunctions"
- | "BlockScopedVariables"
- | "ObjectAssign"
- | "RegularExpressionFlagsUnicode"
- | "RegularExpressionFlagsSticky"
// ES2016 Features
| "Exponentiation" // `x ** y`
// ES2017 Features
@@ -8486,20 +8471,6 @@ export type LanugageFeatures =
* @internal
*/
export const LanguageFeatureMinimumTarget: Record = {
- Classes: ScriptTarget.ES2015,
- ForOf: ScriptTarget.ES2015,
- Generators: ScriptTarget.ES2015,
- Iteration: ScriptTarget.ES2015,
- SpreadElements: ScriptTarget.ES2015,
- RestElements: ScriptTarget.ES2015,
- TaggedTemplates: ScriptTarget.ES2015,
- DestructuringAssignment: ScriptTarget.ES2015,
- BindingPatterns: ScriptTarget.ES2015,
- ArrowFunctions: ScriptTarget.ES2015,
- BlockScopedVariables: ScriptTarget.ES2015,
- ObjectAssign: ScriptTarget.ES2015,
- RegularExpressionFlagsUnicode: ScriptTarget.ES2015,
- RegularExpressionFlagsSticky: ScriptTarget.ES2015,
Exponentiation: ScriptTarget.ES2016,
AsyncFunctions: ScriptTarget.ES2017,
ForAwaitOf: ScriptTarget.ES2018,
diff --git a/tests/baselines/reference/arraySpreadImportHelpers.errors.txt b/tests/baselines/reference/arraySpreadImportHelpers.errors.txt
deleted file mode 100644
index 98b0b1cae757f..0000000000000
--- a/tests/baselines/reference/arraySpreadImportHelpers.errors.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-main.ts(3,15): error TS2807: This syntax requires an imported helper named '__spreadArray' with 3 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'.
-
-
-==== main.ts (1 errors) ====
- export {};
- const k = [1, , 2];
- const o = [3, ...k, 4];
- ~~~~
-!!! error TS2807: This syntax requires an imported helper named '__spreadArray' with 3 parameters, which is not compatible with the one in 'tslib'. Consider upgrading your version of 'tslib'.
-
-==== tslib.d.ts (0 errors) ====
- // this is a pre-TS4.4 versions of emit helper, which always forced array packing
- declare module "tslib" {
- function __spreadArray(to: any[], from: any[]): any[];
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/importHelpersNoHelpers.errors.txt b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
index 4c58dcf6c2063..4a71aa578b992 100644
--- a/tests/baselines/reference/importHelpersNoHelpers.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpers.errors.txt
@@ -1,22 +1,18 @@
error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
external.ts(1,1): error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
-external.ts(3,16): error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
external.ts(7,1): error TS2343: This syntax requires an imported helper named '__decorate' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
external.ts(7,1): error TS2343: This syntax requires an imported helper named '__metadata' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
external.ts(9,12): error TS2343: This syntax requires an imported helper named '__param' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
-external.ts(14,13): error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
external.ts(15,12): error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== external.ts (7 errors) ====
+==== external.ts (5 errors) ====
export * from "./other";
~~~~~~~~~~~~~~~~~~~~~~~~
!!! error TS2343: This syntax requires an imported helper named '__exportStar' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
export class A { }
export class B extends A { }
- ~~~~~~~~~
-!!! error TS2343: This syntax requires an imported helper named '__extends' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
declare var dec: any;
@@ -34,8 +30,6 @@ external.ts(15,12): error TS2343: This syntax requires an imported helper named
const o = { a: 1 };
const y = { ...o };
- ~~~~
-!!! error TS2343: This syntax requires an imported helper named '__assign' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
const { ...x } = y;
~
!!! error TS2343: This syntax requires an imported helper named '__rest' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
diff --git a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
index 652f4ef43c909..7cda5ffbb2296 100644
--- a/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
+++ b/tests/baselines/reference/importHelpersNoHelpersForAsyncGenerators.errors.txt
@@ -1,20 +1,17 @@
error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
main.ts(1,25): error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
main.ts(1,25): error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
-main.ts(1,25): error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncDelegator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
main.ts(4,5): error TS2343: This syntax requires an imported helper named '__asyncValues' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== main.ts (5 errors) ====
+==== main.ts (4 errors) ====
export async function * f() {
~
!!! error TS2343: This syntax requires an imported helper named '__asyncGenerator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
~
!!! error TS2343: This syntax requires an imported helper named '__await' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
- ~
-!!! error TS2343: This syntax requires an imported helper named '__generator' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
await 1;
yield 2;
yield* [3];
diff --git a/tests/baselines/reference/importHelpersNoModule.errors.txt b/tests/baselines/reference/importHelpersNoModule.errors.txt
index ed5940d20f2e7..3c128bf5226f8 100644
--- a/tests/baselines/reference/importHelpersNoModule.errors.txt
+++ b/tests/baselines/reference/importHelpersNoModule.errors.txt
@@ -1,17 +1,17 @@
error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-external.ts(2,16): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
+external.ts(6,1): error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
!!! error TS5107: Option 'moduleResolution=classic' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
==== external.ts (1 errors) ====
export class A { }
export class B extends A { }
- ~~~~~~~~~
-!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
declare var dec: any;
@dec
+ ~~~~
+!!! error TS2354: This syntax requires an imported helper but module 'tslib' cannot be found.
class C {
method(@dec x: number) {
}
diff --git a/tests/baselines/reference/regExpWithOpenBracketInCharClass(target=es5).errors.txt b/tests/baselines/reference/regExpWithOpenBracketInCharClass(target=es5).errors.txt
index b73fabe019701..86e97bc3edce0 100644
--- a/tests/baselines/reference/regExpWithOpenBracketInCharClass(target=es5).errors.txt
+++ b/tests/baselines/reference/regExpWithOpenBracketInCharClass(target=es5).errors.txt
@@ -1,14 +1,11 @@
-regExpWithOpenBracketInCharClass.ts(3,8): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regExpWithOpenBracketInCharClass.ts(4,7): error TS1005: ']' expected.
regExpWithOpenBracketInCharClass.ts(4,8): error TS1501: This regular expression flag is only available when targeting 'es2024' or later.
-==== regExpWithOpenBracketInCharClass.ts (3 errors) ====
+==== regExpWithOpenBracketInCharClass.ts (2 errors) ====
const regexes: RegExp[] = [
/[[]/, // Valid
/[[]/u, // Valid
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/[[]/v, // Well-terminated regex with an incomplete character class
!!! error TS1005: ']' expected.
diff --git a/tests/baselines/reference/regularExpressionScanning(target=es5).errors.txt b/tests/baselines/reference/regularExpressionScanning(target=es5).errors.txt
index bb82df70855d7..a32fb1567c578 100644
--- a/tests/baselines/reference/regularExpressionScanning(target=es5).errors.txt
+++ b/tests/baselines/reference/regularExpressionScanning(target=es5).errors.txt
@@ -41,7 +41,6 @@ regularExpressionScanning.ts(13,47): error TS1533: This backreference refers to
regularExpressionScanning.ts(13,48): error TS1487: Octal escape sequences are not allowed. Use the syntax '\x05'.
regularExpressionScanning.ts(13,53): error TS1533: This backreference refers to a group that does not exist. There are only 4 capturing groups in this regular expression.
regularExpressionScanning.ts(13,54): error TS1487: Octal escape sequences are not allowed. Use the syntax '\x00'.
-regularExpressionScanning.ts(13,59): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(14,5): error TS1503: Named capturing groups are only available when targeting 'ES2018' or later.
regularExpressionScanning.ts(14,14): error TS1503: Named capturing groups are only available when targeting 'ES2018' or later.
regularExpressionScanning.ts(14,29): error TS1503: Named capturing groups are only available when targeting 'ES2018' or later.
@@ -71,7 +70,6 @@ regularExpressionScanning.ts(20,59): error TS1530: Unicode property value expres
regularExpressionScanning.ts(20,62): error TS1529: Unknown Unicode property name or value.
regularExpressionScanning.ts(21,28): error TS1529: Unknown Unicode property name or value.
regularExpressionScanning.ts(21,62): error TS1529: Unknown Unicode property name or value.
-regularExpressionScanning.ts(21,72): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(22,28): error TS1529: Unknown Unicode property name or value.
regularExpressionScanning.ts(22,62): error TS1529: Unknown Unicode property name or value.
regularExpressionScanning.ts(22,72): error TS1501: This regular expression flag is only available when targeting 'es2024' or later.
@@ -100,7 +98,6 @@ regularExpressionScanning.ts(24,53): error TS1531: '\p' must be followed by a Un
regularExpressionScanning.ts(24,57): error TS1531: '\P' must be followed by a Unicode property value expression enclosed in braces.
regularExpressionScanning.ts(24,62): error TS1527: Expected a Unicode property name or value.
regularExpressionScanning.ts(24,66): error TS1527: Expected a Unicode property name or value.
-regularExpressionScanning.ts(24,67): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(25,6): error TS1524: Unknown Unicode property name.
regularExpressionScanning.ts(25,31): error TS1523: Expected a Unicode property name.
regularExpressionScanning.ts(25,32): error TS1525: Expected a Unicode property value.
@@ -124,7 +121,6 @@ regularExpressionScanning.ts(27,6): error TS1528: Any Unicode property that woul
regularExpressionScanning.ts(27,19): error TS1528: Any Unicode property that would possibly match more than a single character is only available when the Unicode Sets (v) flag is set.
regularExpressionScanning.ts(27,34): error TS1528: Any Unicode property that would possibly match more than a single character is only available when the Unicode Sets (v) flag is set.
regularExpressionScanning.ts(27,47): error TS1528: Any Unicode property that would possibly match more than a single character is only available when the Unicode Sets (v) flag is set.
-regularExpressionScanning.ts(27,59): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(28,19): error TS1518: Anything that would possibly match more than a single character is invalid inside a negated character class.
regularExpressionScanning.ts(28,31): error TS1518: Anything that would possibly match more than a single character is invalid inside a negated character class.
regularExpressionScanning.ts(28,47): error TS1518: Anything that would possibly match more than a single character is invalid inside a negated character class.
@@ -135,7 +131,6 @@ regularExpressionScanning.ts(31,15): error TS1512: '\c' must be followed by an A
regularExpressionScanning.ts(31,17): error TS1535: This character cannot be escaped in a regular expression.
regularExpressionScanning.ts(31,20): error TS1512: '\c' must be followed by an ASCII letter.
regularExpressionScanning.ts(31,23): error TS1535: This character cannot be escaped in a regular expression.
-regularExpressionScanning.ts(31,26): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(33,3): error TS1535: This character cannot be escaped in a regular expression.
regularExpressionScanning.ts(33,7): error TS1535: This character cannot be escaped in a regular expression.
regularExpressionScanning.ts(33,10): error TS1535: This character cannot be escaped in a regular expression.
@@ -148,7 +143,6 @@ regularExpressionScanning.ts(33,41): error TS1508: Unexpected '{'. Did you mean
regularExpressionScanning.ts(33,42): error TS1508: Unexpected ']'. Did you mean to escape it with backslash?
regularExpressionScanning.ts(33,43): error TS1535: This character cannot be escaped in a regular expression.
regularExpressionScanning.ts(33,45): error TS1508: Unexpected '{'. Did you mean to escape it with backslash?
-regularExpressionScanning.ts(33,47): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(34,3): error TS1511: '\q' is only available inside character class.
regularExpressionScanning.ts(34,7): error TS1535: This character cannot be escaped in a regular expression.
regularExpressionScanning.ts(34,10): error TS1521: '\q' must be followed by string alternatives enclosed in braces.
@@ -178,7 +172,6 @@ regularExpressionScanning.ts(37,57): error TS1508: Unexpected '{'. Did you mean
regularExpressionScanning.ts(37,61): error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
regularExpressionScanning.ts(37,63): error TS1517: Range out of order in character class.
regularExpressionScanning.ts(37,76): error TS1535: This character cannot be escaped in a regular expression.
-regularExpressionScanning.ts(37,87): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
regularExpressionScanning.ts(38,8): error TS1005: '--' expected.
regularExpressionScanning.ts(38,9): error TS1520: Expected a class set operand.
regularExpressionScanning.ts(38,11): error TS1520: Expected a class set operand.
@@ -226,7 +219,7 @@ regularExpressionScanning.ts(47,89): error TS1518: Anything that would possibly
regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag is only available when targeting 'es2024' or later.
-==== regularExpressionScanning.ts (226 errors) ====
+==== regularExpressionScanning.ts (219 errors) ====
const regexes: RegExp[] = [
// Flags
/foo/visualstudiocode,
@@ -326,8 +319,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1533: This backreference refers to a group that does not exist. There are only 4 capturing groups in this regular expression.
~~~
!!! error TS1487: Octal escape sequences are not allowed. Use the syntax '\x00'.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/(?)((?bar)bar)(?baz)|(foo(?foo))(?)/,
~~~~~
!!! error TS1503: Named capturing groups are only available when targeting 'ES2018' or later.
@@ -394,8 +385,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1529: Unknown Unicode property name or value.
~~~~~~~
!!! error TS1529: Unknown Unicode property name or value.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/\p{L}\p{gc=L}\p{ASCII}\p{Invalid}[\p{L}\p{gc=L}\P{ASCII}\p{Invalid}]/v,
~~~~~~~
!!! error TS1529: Unknown Unicode property name or value.
@@ -455,8 +444,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1527: Expected a Unicode property name or value.
!!! error TS1527: Expected a Unicode property name or value.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/\p{InvalidProperty=Value}\p{=}\p{sc=}\P{=foo}[\p{}\p\\\P\P{]\p{/v,
~~~~~~~~~~~~~~~
!!! error TS1524: Unknown Unicode property name.
@@ -506,8 +493,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1528: Any Unicode property that would possibly match more than a single character is only available when the Unicode Sets (v) flag is set.
~~~~~~~~~
!!! error TS1528: Any Unicode property that would possibly match more than a single character is only available when the Unicode Sets (v) flag is set.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/\p{RGI_Emoji}\P{RGI_Emoji}[^\p{RGI_Emoji}\P{RGI_Emoji}]/v,
~~~~~~~~~
!!! error TS1518: Anything that would possibly match more than a single character is invalid inside a negated character class.
@@ -532,8 +517,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1512: '\c' must be followed by an ASCII letter.
~~
!!! error TS1535: This character cannot be escaped in a regular expression.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/\q\\\`[\q\\\`[\Q\\\Q{\q{foo|bar|baz]\q{]\q{/,
/\q\\\`[\q\\\`[\Q\\\Q{\q{foo|bar|baz]\q{]\q{/u,
~~
@@ -560,8 +543,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1535: This character cannot be escaped in a regular expression.
~
!!! error TS1508: Unexpected '{'. Did you mean to escape it with backslash?
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/\q\\\`[\q\\\`[\Q\\\Q{\q{foo|bar|baz]\q{]\q{/v,
~~
!!! error TS1511: '\q' is only available inside character class.
@@ -624,8 +605,6 @@ regularExpressionScanning.ts(47,101): error TS1501: This regular expression flag
!!! error TS1517: Range out of order in character class.
~~
!!! error TS1535: This character cannot be escaped in a regular expression.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
/[a--b[--][\d++[]]&&[[&0-9--]&&[\p{L}]--\P{L}-_-]]&&&\q{foo}[0---9][&&q&&&\q{bar}&&]/v,
!!! error TS1005: '--' expected.
diff --git a/tests/baselines/reference/regularExpressionUnicodePropertyValueExpressionSuggestions.errors.txt b/tests/baselines/reference/regularExpressionUnicodePropertyValueExpressionSuggestions.errors.txt
index 3d5e1e9c02a44..cf811c2d94ebb 100644
--- a/tests/baselines/reference/regularExpressionUnicodePropertyValueExpressionSuggestions.errors.txt
+++ b/tests/baselines/reference/regularExpressionUnicodePropertyValueExpressionSuggestions.errors.txt
@@ -3,10 +3,9 @@ regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,28): error TS152
regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,45): error TS1526: Unknown Unicode property value.
regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,57): error TS1524: Unknown Unicode property name.
regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,93): error TS1526: Unknown Unicode property value.
-regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,102): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== regularExpressionUnicodePropertyValueExpressionSuggestions.ts (6 errors) ====
+==== regularExpressionUnicodePropertyValueExpressionSuggestions.ts (5 errors) ====
const regex = /\p{ascii}\p{Sc=Unknown}\p{sc=unknownX}\p{Script_Declensions=Inherited}\p{scx=inherit}/u;
~~~~~
!!! error TS1529: Unknown Unicode property name or value.
@@ -23,6 +22,4 @@ regularExpressionUnicodePropertyValueExpressionSuggestions.ts(1,102): error TS15
~~~~~~~
!!! error TS1526: Unknown Unicode property value.
!!! related TS1369: Did you mean 'Inherited'?
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
diff --git a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt b/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt
deleted file mode 100644
index eb23a5d19b2aa..0000000000000
--- a/tests/baselines/reference/taggedTemplateWithoutDeclaredHelper.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-foo.ts(5,23): error TS2343: This syntax requires an imported helper named '__makeTemplateObject' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
-
-
-==== foo.ts (1 errors) ====
- function id(x: T) {
- return x;
- }
-
- export const result = id `hello world`;
- ~~~~~~~~~~~~~~~~
-!!! error TS2343: This syntax requires an imported helper named '__makeTemplateObject' which does not exist in 'tslib'. Consider upgrading your version of 'tslib'.
-
-==== ./node_modules/tslib/index.d.ts (0 errors) ====
- export { };
-
\ No newline at end of file
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
index e10870067d53b..22b265ea77e53 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-incremental.js
@@ -137,19 +137,11 @@ Input::
//// [/users/username/projects/project/node_modules/tslib/package.json] deleted
Output::
-[96mindex.tsx[0m:[93m1[0m:[93m19[0m - [91merror[0m[90m TS2354: [0mThis syntax requires an imported helper but module 'tslib' cannot be found.
-
-[7m1[0m export const x = {...{}};
-[7m [0m [91m ~~~~~[0m
-
-
-Found 1 error in index.tsx[90m:1[0m
-
//// [/users/username/projects/project/index.js] file written with same contents
//// [/users/username/projects/project/tsconfig.tsbuildinfo]
-{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.tsx"],"fileInfos":[{"version":"3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14168389096-export const x = {...{}};","signature":"-6508651827-export declare const x: {};\n"}],"root":[2],"options":{"importHelpers":true},"semanticDiagnosticsPerFile":[[2,[{"start":18,"length":5,"messageText":"This syntax requires an imported helper but module 'tslib' cannot be found.","category":1,"code":2354}]]],"version":"FakeTSVersion"}
+{"fileNames":["../../../../home/src/tslibs/ts/lib/lib.d.ts","./index.tsx"],"fileInfos":[{"version":"3858781397-/// \ninterface Boolean {}\ninterface Function {}\ninterface CallableFunction {}\ninterface NewableFunction {}\ninterface IArguments {}\ninterface Number { toExponential: any; }\ninterface Object {}\ninterface RegExp {}\ninterface String { charAt: any; }\ninterface Array { length: number; [n: number]: T; }\ninterface ReadonlyArray {}\ndeclare const console: { log(msg: any): void; };","affectsGlobalScope":true},{"version":"-14168389096-export const x = {...{}};","signature":"-6508651827-export declare const x: {};\n"}],"root":[2],"options":{"importHelpers":true},"version":"FakeTSVersion"}
//// [/users/username/projects/project/tsconfig.tsbuildinfo.readable.baseline.txt]
{
@@ -185,22 +177,8 @@ Found 1 error in index.tsx[90m:1[0m
"options": {
"importHelpers": true
},
- "semanticDiagnosticsPerFile": [
- [
- "./index.tsx",
- [
- {
- "start": 18,
- "length": 5,
- "messageText": "This syntax requires an imported helper but module 'tslib' cannot be found.",
- "category": 1,
- "code": 2354
- }
- ]
- ]
- ],
"version": "FakeTSVersion",
- "size": 925
+ "size": 747
}
@@ -223,4 +201,4 @@ Semantic diagnostics in builder refreshed for::
Shape signatures in builder refreshed for::
/users/username/projects/project/index.tsx (computed .d.ts)
-exitCode:: ExitStatus.DiagnosticsPresent_OutputsGenerated
+exitCode:: ExitStatus.Success
diff --git a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
index fb40e39a10c9d..fc1828d685dd1 100644
--- a/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
+++ b/tests/baselines/reference/tscWatch/incremental/importHelpers-backing-types-removed-watch.js
@@ -144,12 +144,7 @@ Output::
>> Screen clear
[[90mHH:MM:SS AM[0m] Starting compilation in watch mode...
-[96mindex.tsx[0m:[93m1[0m:[93m19[0m - [91merror[0m[90m TS2354: [0mThis syntax requires an imported helper but module 'tslib' cannot be found.
-
-[7m1[0m export const x = {...{}};
-[7m [0m [91m ~~~~~[0m
-
-[[90mHH:MM:SS AM[0m] Found 1 error. Watching for file changes.
+[[90mHH:MM:SS AM[0m] Found 0 errors. Watching for file changes.
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01(target=es5).errors.txt
deleted file mode 100644
index ab854267f49de..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions01(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions01.ts(1,17): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions01.ts (1 errors) ====
- var x = /\u{0}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02(target=es5).errors.txt
deleted file mode 100644
index 7c8275c32bc78..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions02(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions02.ts(1,18): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions02.ts (1 errors) ====
- var x = /\u{00}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03(target=es5).errors.txt
deleted file mode 100644
index 21b3b2e4daea7..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions03(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions03.ts(1,20): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions03.ts (1 errors) ====
- var x = /\u{0000}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04(target=es5).errors.txt
deleted file mode 100644
index 9282d070a9742..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions04(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions04.ts(1,24): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions04.ts (1 errors) ====
- var x = /\u{00000000}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05(target=es5).errors.txt
deleted file mode 100644
index 42b296e64af31..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions05(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions05.ts(1,78): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions05.ts (1 errors) ====
- var x = /\u{48}\u{65}\u{6c}\u{6c}\u{6f}\u{20}\u{77}\u{6f}\u{72}\u{6c}\u{64}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06(target=es5).errors.txt
deleted file mode 100644
index 1c254e3b6b053..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions06(target=es5).errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions06.ts(3,22): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions06.ts (1 errors) ====
- // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
- // 1. Assert: 0 ≤ cp ≤ 0x10FFFF.
- var x = /\u{10FFFF}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07(target=es5).errors.txt
index 1234f30a12e2c..51228e4c8752a 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions07(target=es5).errors.txt
@@ -1,13 +1,10 @@
unicodeExtendedEscapesInRegularExpressions07.ts(3,13): error TS1198: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
-unicodeExtendedEscapesInRegularExpressions07.ts(3,22): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== unicodeExtendedEscapesInRegularExpressions07.ts (2 errors) ====
+==== unicodeExtendedEscapesInRegularExpressions07.ts (1 errors) ====
// ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
// 1. Assert: 0 ≤ cp ≤ 0x10FFFF.
var x = /\u{110000}/gu;
~~~~~~
!!! error TS1198: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08(target=es5).errors.txt
deleted file mode 100644
index a3b5b30aac479..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions08(target=es5).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions08.ts(4,20): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions08.ts (1 errors) ====
- // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
- // 2. If cp ≤ 65535, return cp.
- // (FFFF == 65535)
- var x = /\u{FFFF}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09(target=es5).errors.txt
deleted file mode 100644
index 95d5dd12e3b24..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions09(target=es5).errors.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions09.ts(4,21): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions09.ts (1 errors) ====
- // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
- // 2. If cp ≤ 65535, return cp.
- // (10000 == 65536)
- var x = /\u{10000}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10(target=es5).errors.txt
deleted file mode 100644
index a3e4686d217e2..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions10(target=es5).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions10.ts(5,20): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions10.ts (1 errors) ====
- // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
- // 2. Let cu1 be floor((cp – 65536) / 1024) + 0xD800.
- // Although we should just get back a single code point value of 0xD800,
- // this is a useful edge-case test.
- var x = /\u{D800}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11(target=es5).errors.txt
deleted file mode 100644
index 4f04207f550cc..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions11(target=es5).errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions11.ts(5,20): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions11.ts (1 errors) ====
- // ES6 Spec - 10.1.1 Static Semantics: UTF16Encoding (cp)
- // 2. Let cu2 be ((cp – 65536) modulo 1024) + 0xDC00.
- // Although we should just get back a single code point value of 0xDC00,
- // this is a useful edge-case test.
- var x = /\u{DC00}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12(target=es5).errors.txt
index 01a2ed15ccb52..71bc964c77774 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions12(target=es5).errors.txt
@@ -1,11 +1,8 @@
unicodeExtendedEscapesInRegularExpressions12.ts(1,13): error TS1198: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
-unicodeExtendedEscapesInRegularExpressions12.ts(1,24): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== unicodeExtendedEscapesInRegularExpressions12.ts (2 errors) ====
+==== unicodeExtendedEscapesInRegularExpressions12.ts (1 errors) ====
var x = /\u{FFFFFFFF}/gu;
~~~~~~~~
!!! error TS1198: An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13(target=es5).errors.txt
deleted file mode 100644
index f307764d37902..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions13(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions13.ts(1,21): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions13.ts (1 errors) ====
- var x = /\u{DDDDD}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14(target=es5).errors.txt
index 9a108e96403cb..2f7010fdb3da9 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions14(target=es5).errors.txt
@@ -1,15 +1,12 @@
unicodeExtendedEscapesInRegularExpressions14.ts(2,13): error TS1125: Hexadecimal digit expected.
unicodeExtendedEscapesInRegularExpressions14.ts(2,18): error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
-unicodeExtendedEscapesInRegularExpressions14.ts(2,21): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== unicodeExtendedEscapesInRegularExpressions14.ts (3 errors) ====
+==== unicodeExtendedEscapesInRegularExpressions14.ts (2 errors) ====
// Shouldn't work, negatives are not allowed.
var x = /\u{-DDDD}/gu;
!!! error TS1125: Hexadecimal digit expected.
~
!!! error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15(target=es5).errors.txt
deleted file mode 100644
index 10f023bfa0f5e..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions15(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions15.ts(1,44): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions15.ts (1 errors) ====
- var x = /\u{abcd}\u{ef12}\u{3456}\u{7890}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16(target=es5).errors.txt
deleted file mode 100644
index 736b8082149e6..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions16(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions16.ts(1,44): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions16.ts (1 errors) ====
- var x = /\u{ABCD}\u{EF12}\u{3456}\u{7890}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17(target=es5).errors.txt
index d2eca7a5a4ace..25e6af149872d 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions17(target=es5).errors.txt
@@ -4,10 +4,9 @@ unicodeExtendedEscapesInRegularExpressions17.ts(1,18): error TS1125: Hexadecimal
unicodeExtendedEscapesInRegularExpressions17.ts(1,19): error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
unicodeExtendedEscapesInRegularExpressions17.ts(1,23): error TS1125: Hexadecimal digit expected.
unicodeExtendedEscapesInRegularExpressions17.ts(1,24): error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
-unicodeExtendedEscapesInRegularExpressions17.ts(1,27): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== unicodeExtendedEscapesInRegularExpressions17.ts (7 errors) ====
+==== unicodeExtendedEscapesInRegularExpressions17.ts (6 errors) ====
var x = /\u{r}\u{n}\u{t}/gu;
!!! error TS1125: Hexadecimal digit expected.
@@ -21,6 +20,4 @@ unicodeExtendedEscapesInRegularExpressions17.ts(1,27): error TS1501: This regula
!!! error TS1125: Hexadecimal digit expected.
~
!!! error TS1508: Unexpected '}'. Did you mean to escape it with backslash?
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18(target=es5).errors.txt
deleted file mode 100644
index d3c12b909f223..0000000000000
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions18(target=es5).errors.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-unicodeExtendedEscapesInRegularExpressions18.ts(1,24): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
-
-==== unicodeExtendedEscapesInRegularExpressions18.ts (1 errors) ====
- var x = /\u{65}\u{65}/gu;
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-
\ No newline at end of file
diff --git a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19(target=es5).errors.txt b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19(target=es5).errors.txt
index d1507998bd49f..dadcab40d9862 100644
--- a/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19(target=es5).errors.txt
+++ b/tests/baselines/reference/unicodeExtendedEscapesInRegularExpressions19(target=es5).errors.txt
@@ -1,11 +1,8 @@
unicodeExtendedEscapesInRegularExpressions19.ts(1,13): error TS1125: Hexadecimal digit expected.
-unicodeExtendedEscapesInRegularExpressions19.ts(1,16): error TS1501: This regular expression flag is only available when targeting 'es6' or later.
-==== unicodeExtendedEscapesInRegularExpressions19.ts (2 errors) ====
+==== unicodeExtendedEscapesInRegularExpressions19.ts (1 errors) ====
var x = /\u{}/gu;
!!! error TS1125: Hexadecimal digit expected.
- ~
-!!! error TS1501: This regular expression flag is only available when targeting 'es6' or later.
\ No newline at end of file
From c94b54a69d8d957d26233b4f382e2adb3cf4ac27 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:37:54 -0700
Subject: [PATCH 14/18] program.ts
---
src/compiler/program.ts | 9 ---------
tests/baselines/reference/moduleNoneErrors.errors.txt | 5 +----
...ExportModuleAugmentationInDeclarationFile2.errors.txt | 5 +----
...ExportModuleAugmentationInDeclarationFile3.errors.txt | 5 +----
.../requireOfJsonFileWithModuleEmitNone.errors.txt | 5 +----
...OfJsonFileWithModuleNodeResolutionEmitNone.errors.txt | 5 +----
tests/cases/fourslash/autoImportModuleNone1.ts | 6 +-----
7 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
index c78ce26ab32da..cc39c233147f6 100644
--- a/src/compiler/program.ts
+++ b/src/compiler/program.ts
@@ -4240,19 +4240,10 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
const firstNonAmbientExternalModuleSourceFile = find(files, f => isExternalModule(f) && !f.isDeclarationFile);
if (options.isolatedModules || options.verbatimModuleSyntax) {
- if (options.module === ModuleKind.None && languageVersion < ScriptTarget.ES2015 && options.isolatedModules) {
- createDiagnosticForOptionName(Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher, "isolatedModules", "target");
- }
-
if (options.preserveConstEnums === false) {
createDiagnosticForOptionName(Diagnostics.Option_preserveConstEnums_cannot_be_disabled_when_0_is_enabled, options.verbatimModuleSyntax ? "verbatimModuleSyntax" : "isolatedModules", "preserveConstEnums");
}
}
- else if (firstNonAmbientExternalModuleSourceFile && languageVersion < ScriptTarget.ES2015 && options.module === ModuleKind.None) {
- // We cannot use createDiagnosticFromNode because nodes do not have parents yet
- const span = getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, typeof firstNonAmbientExternalModuleSourceFile.externalModuleIndicator === "boolean" ? firstNonAmbientExternalModuleSourceFile : firstNonAmbientExternalModuleSourceFile.externalModuleIndicator!);
- programDiagnostics.addConfigDiagnostic(createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
- }
// Cannot specify module gen that isn't amd or system with --out
if (outputFile && !options.emitDeclarationOnly) {
diff --git a/tests/baselines/reference/moduleNoneErrors.errors.txt b/tests/baselines/reference/moduleNoneErrors.errors.txt
index 7ff5b8706838c..2036555b0ff7c 100644
--- a/tests/baselines/reference/moduleNoneErrors.errors.txt
+++ b/tests/baselines/reference/moduleNoneErrors.errors.txt
@@ -1,12 +1,9 @@
error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-a.ts(1,14): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== a.ts (1 errors) ====
+==== a.ts (0 errors) ====
export class Foo {
- ~~~
-!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
foo: string;
}
\ No newline at end of file
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
index 7ad4ea8858b04..a07843788c7ca 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile2.errors.txt
@@ -1,12 +1,9 @@
error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== 1.ts (1 errors) ====
+==== 1.ts (0 errors) ====
export var j = "hello"; // error
- ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
==== 0.d.ts (0 errors) ====
export = a;
diff --git a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
index ba676c872cc92..87bdfd92fdd90 100644
--- a/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
+++ b/tests/baselines/reference/noErrorUsingImportExportModuleAugmentationInDeclarationFile3.errors.txt
@@ -1,5 +1,4 @@
error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
@@ -7,8 +6,6 @@ error TS5107: Option 'module=None' is deprecated and will stop functioning in Ty
export = a;
declare var a: number;
-==== 1.ts (1 errors) ====
+==== 1.ts (0 errors) ====
export var j = "hello"; // error
- ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
\ No newline at end of file
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
index 44d3758ebc6b6..e8208cda2393e 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleEmitNone.errors.txt
@@ -1,14 +1,11 @@
error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
!!! error TS5070: Option '--resolveJsonModule' cannot be specified when 'moduleResolution' is set to 'classic'.
!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (1 errors) ====
+==== file1.ts (0 errors) ====
import * as b from './b.json';
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
==== b.json (0 errors) ====
{
diff --git a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
index 1f804dd8bace3..48f6eb0159815 100644
--- a/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
+++ b/tests/baselines/reference/requireOfJsonFileWithModuleNodeResolutionEmitNone.errors.txt
@@ -1,16 +1,13 @@
error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-file1.ts(1,1): error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
!!! error TS5071: Option '--resolveJsonModule' cannot be specified when 'module' is set to 'none', 'system', or 'umd'.
!!! error TS5095: Option 'bundler' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.
!!! error TS5107: Option 'module=None' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== file1.ts (1 errors) ====
+==== file1.ts (0 errors) ====
import * as b from './b.json';
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS1148: Cannot use imports, exports, or module augmentations when '--module' is 'none'.
==== b.json (0 errors) ====
{
diff --git a/tests/cases/fourslash/autoImportModuleNone1.ts b/tests/cases/fourslash/autoImportModuleNone1.ts
index 50f3bbcc64ef3..ee8c3f0fb5af9 100644
--- a/tests/cases/fourslash/autoImportModuleNone1.ts
+++ b/tests/cases/fourslash/autoImportModuleNone1.ts
@@ -19,8 +19,4 @@ verify.completions({
});
edit.replaceLine(0, "import { x } from 'dep'; x;");
-verify.getSemanticDiagnostics([{
- range: { fileName: "/index.ts", pos: 0, end: "import { x } from 'dep';".length },
- code: ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none.code,
- message: ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none.message
-}]);
+verify.getSemanticDiagnostics([]);
From fbf0da6c7de84ebdfa082be9eb4e85bf225806a6 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:45:38 -0700
Subject: [PATCH 15/18] emitter.ts
---
src/compiler/emitter.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compiler/emitter.ts b/src/compiler/emitter.ts
index c60fd92787275..4cc000f6e7dda 100644
--- a/src/compiler/emitter.ts
+++ b/src/compiler/emitter.ts
@@ -2608,7 +2608,7 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
}
const preferNewLine = node.multiLine ? ListFormat.PreferNewLine : ListFormat.None;
- const allowTrailingComma = currentSourceFile && currentSourceFile.languageVersion >= ScriptTarget.ES5 && !isJsonSourceFile(currentSourceFile) ? ListFormat.AllowTrailingComma : ListFormat.None;
+ const allowTrailingComma = currentSourceFile && !isJsonSourceFile(currentSourceFile) ? ListFormat.AllowTrailingComma : ListFormat.None;
emitList(node, node.properties, ListFormat.ObjectLiteralExpressionProperties | allowTrailingComma | preferNewLine);
if (indentedFlag) {
From 60cd67e3d90e6ad8722bda234534e73a469e5819 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:50:03 -0700
Subject: [PATCH 16/18] binder.ts
---
src/compiler/binder.ts | 38 +-----------------
...unctionDeclarationInStrictClass.errors.txt | 5 +--
...pedFunctionDeclarationStrictES5.errors.txt | 5 +--
...ameFunctionDeclarationStrictES5.errors.txt | 8 +---
.../reference/downlevelLetConst18.errors.txt | 39 -------------------
.../reference/downlevelLetConst18.types | 15 -------
.../reference/downlevelLetConst19.errors.txt | 25 ------------
.../reference/downlevelLetConst19.types | 14 -------
...ntDeclarationListInLoopNoCrash1.errors.txt | 5 ++-
...ntDeclarationListInLoopNoCrash2.errors.txt | 12 ++++++
...ntDeclarationListInLoopNoCrash3.errors.txt | 5 ++-
...ntDeclarationListInLoopNoCrash4.errors.txt | 5 ++-
...rationNoCrash1(module=commonjs).errors.txt | 5 ++-
...larationNoCrash1(module=esnext).errors.txt | 5 ++-
...larationNoCrash1(module=system).errors.txt | 5 ++-
15 files changed, 40 insertions(+), 151 deletions(-)
delete mode 100644 tests/baselines/reference/downlevelLetConst18.errors.txt
delete mode 100644 tests/baselines/reference/downlevelLetConst19.errors.txt
create mode 100644 tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash2.errors.txt
diff --git a/src/compiler/binder.ts b/src/compiler/binder.ts
index 27ec079f614ab..711e7568277c1 100644
--- a/src/compiler/binder.ts
+++ b/src/compiler/binder.ts
@@ -91,7 +91,6 @@ import {
getContainingClass,
getEffectiveContainerForJSDocTemplateTag,
getElementOrPropertyAccessName,
- getEmitScriptTarget,
getEnclosingBlockScopeContainer,
getEnclosingContainer,
getErrorSpanForNode,
@@ -280,7 +279,6 @@ import {
QualifiedName,
removeFileExtension,
ReturnStatement,
- ScriptTarget,
SetAccessorDeclaration,
setParent,
setParentRecursive,
@@ -523,7 +521,6 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
/* eslint-disable no-var */
var file: SourceFile;
var options: CompilerOptions;
- var languageVersion: ScriptTarget;
var parent: Node;
var container: IsContainer | EntityNameExpression;
var thisParentContainer: IsContainer | EntityNameExpression; // Container one level up
@@ -583,7 +580,6 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
function bindSourceFile(f: SourceFile, opts: CompilerOptions) {
file = f;
options = opts;
- languageVersion = getEmitScriptTarget(options);
inStrictMode = bindInStrictMode(file, opts);
classifiableNames = new Set();
symbolCount = 0;
@@ -606,7 +602,6 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
file = undefined!;
options = undefined!;
- languageVersion = undefined!;
parent = undefined!;
container = undefined!;
thisParentContainer = undefined!;
@@ -2673,36 +2668,6 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
}
}
- function getStrictModeBlockScopeFunctionDeclarationMessage(node: Node) {
- // Provide specialized messages to help the user understand why we think they're in
- // strict mode.
- if (getContainingClass(node)) {
- return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES5_Class_definitions_are_automatically_in_strict_mode;
- }
-
- if (file.externalModuleIndicator) {
- return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES5_Modules_are_automatically_in_strict_mode;
- }
-
- return Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES5;
- }
-
- function checkStrictModeFunctionDeclaration(node: FunctionDeclaration) {
- if (languageVersion < ScriptTarget.ES2015) {
- // Report error if function is not top level function declaration
- if (
- blockScopeContainer.kind !== SyntaxKind.SourceFile &&
- blockScopeContainer.kind !== SyntaxKind.ModuleDeclaration &&
- !isFunctionLikeOrClassStaticBlockDeclaration(blockScopeContainer)
- ) {
- // We check first if the name is inside class declaration or class expression; if so give explicit message
- // otherwise report generic error message.
- const errorSpan = getErrorSpanForNode(file, node);
- file.bindDiagnostics.push(createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
- }
- }
- }
-
function checkStrictModePostfixUnaryExpression(node: PostfixUnaryExpression) {
// Grammar checking
// The identifier eval or arguments may not appear as the LeftHandSideExpression of an
@@ -2731,7 +2696,7 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
function checkStrictModeLabeledStatement(node: LabeledStatement) {
// Grammar checking for labeledStatement
- if (inStrictMode && getEmitScriptTarget(options) >= ScriptTarget.ES2015) {
+ if (inStrictMode) {
if (isDeclarationStatement(node.statement) || isVariableStatement(node.statement)) {
errorOnFirstToken(node.label, Diagnostics.A_label_is_not_allowed_here);
}
@@ -3725,7 +3690,6 @@ function createBinder(): (file: SourceFile, options: CompilerOptions) => void {
checkStrictModeFunctionName(node);
if (inStrictMode) {
- checkStrictModeFunctionDeclaration(node);
bindBlockScopedDeclaration(node, SymbolFlags.Function, SymbolFlags.FunctionExcludes);
}
else {
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt
index f0e4c2cc061c6..0fcc185589055 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationInStrictClass.errors.txt
@@ -1,14 +1,11 @@
-blockScopedFunctionDeclarationInStrictClass.ts(4,22): error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'. Class definitions are automatically in strict mode.
blockScopedFunctionDeclarationInStrictClass.ts(7,9): error TS2304: Cannot find name 'foo'.
-==== blockScopedFunctionDeclarationInStrictClass.ts (2 errors) ====
+==== blockScopedFunctionDeclarationInStrictClass.ts (1 errors) ====
class c {
method() {
if (true) {
function foo() { }
- ~~~
-!!! error TS1251: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'. Class definitions are automatically in strict mode.
foo(); // ok
}
foo(); // not ok
diff --git a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt
index 857941c464872..120e1f45d585f 100644
--- a/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt
+++ b/tests/baselines/reference/blockScopedFunctionDeclarationStrictES5.errors.txt
@@ -1,13 +1,10 @@
-blockScopedFunctionDeclarationStrictES5.ts(3,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
blockScopedFunctionDeclarationStrictES5.ts(6,1): error TS2304: Cannot find name 'foo'.
-==== blockScopedFunctionDeclarationStrictES5.ts (2 errors) ====
+==== blockScopedFunctionDeclarationStrictES5.ts (1 errors) ====
"use strict";
if (true) {
function foo() { } // Error to declare function in block scope
- ~~~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
foo(); // This call should be ok
}
foo(); // Error to find name foo
diff --git a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
index 2a0872026df8e..2d70db4f6cf15 100644
--- a/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
+++ b/tests/baselines/reference/blockScopedSameNameFunctionDeclarationStrictES5.errors.txt
@@ -1,18 +1,14 @@
-blockScopedSameNameFunctionDeclarationStrictES5.ts(4,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
blockScopedSameNameFunctionDeclarationStrictES5.ts(6,13): error TS2554: Expected 0 arguments, but got 1.
-blockScopedSameNameFunctionDeclarationStrictES5.ts(9,18): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
blockScopedSameNameFunctionDeclarationStrictES5.ts(11,13): error TS2554: Expected 0 arguments, but got 1.
blockScopedSameNameFunctionDeclarationStrictES5.ts(14,5): error TS2554: Expected 1 arguments, but got 0.
blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2554: Expected 1 arguments, but got 0.
-==== blockScopedSameNameFunctionDeclarationStrictES5.ts (6 errors) ====
+==== blockScopedSameNameFunctionDeclarationStrictES5.ts (4 errors) ====
"use strict";
function foo(a: number) {
if (a === 1) {
function foo() { } // Error to declare function in block scope
- ~~~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
foo();
foo(10); // not ok
~~
@@ -20,8 +16,6 @@ blockScopedSameNameFunctionDeclarationStrictES5.ts(17,1): error TS2554: Expected
}
else {
function foo() { } // Error to declare function in block scope
- ~~~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
foo();
foo(10); // not ok
~~
diff --git a/tests/baselines/reference/downlevelLetConst18.errors.txt b/tests/baselines/reference/downlevelLetConst18.errors.txt
deleted file mode 100644
index 1b818a010bcc4..0000000000000
--- a/tests/baselines/reference/downlevelLetConst18.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-downlevelLetConst18.ts(4,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
-downlevelLetConst18.ts(8,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
-
-
-==== downlevelLetConst18.ts (2 errors) ====
- 'use strict'
-
- for (let x; ;) {
- function foo() { x };
- ~~~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
- }
-
- for (let x; ;) {
- function foo1() { x };
- ~~~~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
- }
-
- for (let x; ;) {
- (() => { x })();
- }
-
- for (const x = 1; ;) {
- (() => { x })();
- }
-
- for (let x; ;) {
- ({ foo() { x }})
- }
-
- for (let x; ;) {
- ({ get foo() { return x } })
- }
-
- for (let x; ;) {
- ({ set foo(v) { x } })
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst18.types b/tests/baselines/reference/downlevelLetConst18.types
index 1e4aefd90ffdb..0794966a9d03a 100644
--- a/tests/baselines/reference/downlevelLetConst18.types
+++ b/tests/baselines/reference/downlevelLetConst18.types
@@ -7,29 +7,24 @@
for (let x; ;) {
>x : any
-> : ^^^
function foo() { x };
>foo : () => void
> : ^^^^^^^^^^
>x : any
-> : ^^^
}
for (let x; ;) {
>x : any
-> : ^^^
function foo1() { x };
>foo1 : () => void
> : ^^^^^^^^^^
>x : any
-> : ^^^
}
for (let x; ;) {
>x : any
-> : ^^^
(() => { x })();
>(() => { x })() : never
@@ -39,7 +34,6 @@ for (let x; ;) {
>() => { x } : () => never
> : ^^^^^^^^^^^
>x : any
-> : ^^^
}
for (const x = 1; ;) {
@@ -61,7 +55,6 @@ for (const x = 1; ;) {
for (let x; ;) {
>x : any
-> : ^^^
({ foo() { x }})
>({ foo() { x }}) : { foo(): void; }
@@ -71,12 +64,10 @@ for (let x; ;) {
>foo : () => void
> : ^^^^^^^^^^
>x : any
-> : ^^^
}
for (let x; ;) {
>x : any
-> : ^^^
({ get foo() { return x } })
>({ get foo() { return x } }) : { readonly foo: any; }
@@ -84,14 +75,11 @@ for (let x; ;) {
>{ get foo() { return x } } : { readonly foo: any; }
> : ^^^^^^^^^^^^^^^^^^^^^^
>foo : any
-> : ^^^
>x : any
-> : ^^^
}
for (let x; ;) {
>x : any
-> : ^^^
({ set foo(v) { x } })
>({ set foo(v) { x } }) : { foo: any; }
@@ -99,10 +87,7 @@ for (let x; ;) {
>{ set foo(v) { x } } : { foo: any; }
> : ^^^^^^^^^^^^^
>foo : any
-> : ^^^
>v : any
-> : ^^^
>x : any
-> : ^^^
}
diff --git a/tests/baselines/reference/downlevelLetConst19.errors.txt b/tests/baselines/reference/downlevelLetConst19.errors.txt
deleted file mode 100644
index 216ba2d6de48c..0000000000000
--- a/tests/baselines/reference/downlevelLetConst19.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-downlevelLetConst19.ts(9,14): error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
-
-
-==== downlevelLetConst19.ts (1 errors) ====
- 'use strict'
- declare function use(a: any);
- var x;
- function a() {
- {
- let x;
- use(x);
-
- function b() {
- ~
-!!! error TS1250: Function declarations are not allowed inside blocks in strict mode when targeting 'ES5'.
- {
- let x;
- use(x);
- }
- use(x);
- }
- }
- use(x)
- }
- use(x)
\ No newline at end of file
diff --git a/tests/baselines/reference/downlevelLetConst19.types b/tests/baselines/reference/downlevelLetConst19.types
index 3daed202f29cd..b0237887dd4e3 100644
--- a/tests/baselines/reference/downlevelLetConst19.types
+++ b/tests/baselines/reference/downlevelLetConst19.types
@@ -9,11 +9,9 @@ declare function use(a: any);
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>a : any
-> : ^^^
var x;
>x : any
-> : ^^^
function a() {
>a : () => void
@@ -21,15 +19,12 @@ function a() {
{
let x;
>x : any
-> : ^^^
use(x);
>use(x) : any
-> : ^^^
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>x : any
-> : ^^^
function b() {
>b : () => void
@@ -37,38 +32,29 @@ function a() {
{
let x;
>x : any
-> : ^^^
use(x);
>use(x) : any
-> : ^^^
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>x : any
-> : ^^^
}
use(x);
>use(x) : any
-> : ^^^
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>x : any
-> : ^^^
}
}
use(x)
>use(x) : any
-> : ^^^
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>x : any
-> : ^^^
}
use(x)
>use(x) : any
-> : ^^^
>use : (a: any) => any
> : ^ ^^ ^^^^^^^^
>x : any
-> : ^^^
diff --git a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash1.errors.txt b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash1.errors.txt
index 35cdc3ccea052..7ea8c06f82b50 100644
--- a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash1.errors.txt
+++ b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash1.errors.txt
@@ -1,10 +1,13 @@
+labeledStatementDeclarationListInLoopNoCrash1.ts(3,3): error TS1344: 'A label is not allowed here.
labeledStatementDeclarationListInLoopNoCrash1.ts(3,11): error TS1123: Variable declaration list cannot be empty.
-==== labeledStatementDeclarationListInLoopNoCrash1.ts (1 errors) ====
+==== labeledStatementDeclarationListInLoopNoCrash1.ts (2 errors) ====
for (let x of []) {
var v0 = x;
foo: var;
+ ~~~
+!!! error TS1344: 'A label is not allowed here.
!!! error TS1123: Variable declaration list cannot be empty.
(function() { return x + v0});
diff --git a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash2.errors.txt b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash2.errors.txt
new file mode 100644
index 0000000000000..cccda1a9a35dc
--- /dev/null
+++ b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash2.errors.txt
@@ -0,0 +1,12 @@
+labeledStatementDeclarationListInLoopNoCrash2.ts(3,3): error TS1344: 'A label is not allowed here.
+
+
+==== labeledStatementDeclarationListInLoopNoCrash2.ts (1 errors) ====
+ for (let x of []) {
+ var v0 = x;
+ foo: var y;
+ ~~~
+!!! error TS1344: 'A label is not allowed here.
+ (function() { return x + v0});
+ }
+
\ No newline at end of file
diff --git a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash3.errors.txt b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash3.errors.txt
index 075f135a3b8fa..7580e978e97e5 100644
--- a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash3.errors.txt
+++ b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash3.errors.txt
@@ -9,6 +9,7 @@ labeledStatementDeclarationListInLoopNoCrash3.ts(15,42): error TS1005: ')' expec
labeledStatementDeclarationListInLoopNoCrash3.ts(15,53): error TS2304: Cannot find name 'fontSize'.
labeledStatementDeclarationListInLoopNoCrash3.ts(15,61): error TS1005: ';' expected.
labeledStatementDeclarationListInLoopNoCrash3.ts(16,12): error TS1005: ';' expected.
+labeledStatementDeclarationListInLoopNoCrash3.ts(16,12): error TS1344: 'A label is not allowed here.
labeledStatementDeclarationListInLoopNoCrash3.ts(16,23): error TS1134: Variable declaration expected.
labeledStatementDeclarationListInLoopNoCrash3.ts(16,38): error TS2581: Cannot find name '$'. Do you need to install type definitions for jQuery? Try `npm i --save-dev @types/jquery`.
labeledStatementDeclarationListInLoopNoCrash3.ts(16,39): error TS1005: ')' expected.
@@ -17,7 +18,7 @@ labeledStatementDeclarationListInLoopNoCrash3.ts(16,56): error TS1005: ';' expec
labeledStatementDeclarationListInLoopNoCrash3.ts(22,1): error TS1160: Unterminated template literal.
-==== labeledStatementDeclarationListInLoopNoCrash3.ts (17 errors) ====
+==== labeledStatementDeclarationListInLoopNoCrash3.ts (18 errors) ====
// https://github.com/microsoft/TypeScript/issues/59345
export class ParseThemeData {
@@ -56,6 +57,8 @@ labeledStatementDeclarationListInLoopNoCrash3.ts(22,1): error TS1160: Unterminat
`height: var(--button-size-${fontType}-height)`,
~~~~~~
!!! error TS1005: ';' expected.
+ ~~~~~~
+!!! error TS1344: 'A label is not allowed here.
~
!!! error TS1134: Variable declaration expected.
~
diff --git a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash4.errors.txt b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash4.errors.txt
index 8d20a6b2ac1f5..4b7f3b90aa3db 100644
--- a/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash4.errors.txt
+++ b/tests/baselines/reference/labeledStatementDeclarationListInLoopNoCrash4.errors.txt
@@ -9,12 +9,13 @@ labeledStatementDeclarationListInLoopNoCrash4.ts(13,42): error TS1005: ')' expec
labeledStatementDeclarationListInLoopNoCrash4.ts(13,53): error TS2304: Cannot find name 'fontSize'.
labeledStatementDeclarationListInLoopNoCrash4.ts(13,61): error TS1005: ';' expected.
labeledStatementDeclarationListInLoopNoCrash4.ts(14,12): error TS1005: ';' expected.
+labeledStatementDeclarationListInLoopNoCrash4.ts(14,12): error TS1344: 'A label is not allowed here.
labeledStatementDeclarationListInLoopNoCrash4.ts(14,27): error TS1005: ',' expected.
labeledStatementDeclarationListInLoopNoCrash4.ts(20,1): error TS1005: '}' expected.
labeledStatementDeclarationListInLoopNoCrash4.ts(20,1): error TS1160: Unterminated template literal.
-==== labeledStatementDeclarationListInLoopNoCrash4.ts (14 errors) ====
+==== labeledStatementDeclarationListInLoopNoCrash4.ts (15 errors) ====
export class ParseThemeData {
parseButton(button: any) {
const {type, size} = button;
@@ -51,6 +52,8 @@ labeledStatementDeclarationListInLoopNoCrash4.ts(20,1): error TS1160: Unterminat
`height: var foo`,
~~~~~~
!!! error TS1005: ';' expected.
+ ~~~~~~
+!!! error TS1344: 'A label is not allowed here.
~~
].join(';')
~~~~~~~~~~~~~~~~~~~
diff --git a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=commonjs).errors.txt b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=commonjs).errors.txt
index c82821c21e508..89400ea7ad53d 100644
--- a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=commonjs).errors.txt
+++ b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=commonjs).errors.txt
@@ -1,15 +1,18 @@
labeledStatementExportDeclarationNoCrash1.ts(3,14): error TS1155: 'const' declarations must be initialized.
+labeledStatementExportDeclarationNoCrash1.ts(4,1): error TS1344: 'A label is not allowed here.
labeledStatementExportDeclarationNoCrash1.ts(5,1): error TS1184: Modifiers cannot appear here.
labeledStatementExportDeclarationNoCrash1.ts(5,14): error TS1155: 'const' declarations must be initialized.
-==== labeledStatementExportDeclarationNoCrash1.ts (3 errors) ====
+==== labeledStatementExportDeclarationNoCrash1.ts (4 errors) ====
// https://github.com/microsoft/TypeScript/issues/59372
export const box: string
~~~
!!! error TS1155: 'const' declarations must be initialized.
subTitle:
+ ~~~~~~~~
+!!! error TS1344: 'A label is not allowed here.
export const title: string
~~~~~~
!!! error TS1184: Modifiers cannot appear here.
diff --git a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=esnext).errors.txt b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=esnext).errors.txt
index c82821c21e508..89400ea7ad53d 100644
--- a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=esnext).errors.txt
+++ b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=esnext).errors.txt
@@ -1,15 +1,18 @@
labeledStatementExportDeclarationNoCrash1.ts(3,14): error TS1155: 'const' declarations must be initialized.
+labeledStatementExportDeclarationNoCrash1.ts(4,1): error TS1344: 'A label is not allowed here.
labeledStatementExportDeclarationNoCrash1.ts(5,1): error TS1184: Modifiers cannot appear here.
labeledStatementExportDeclarationNoCrash1.ts(5,14): error TS1155: 'const' declarations must be initialized.
-==== labeledStatementExportDeclarationNoCrash1.ts (3 errors) ====
+==== labeledStatementExportDeclarationNoCrash1.ts (4 errors) ====
// https://github.com/microsoft/TypeScript/issues/59372
export const box: string
~~~
!!! error TS1155: 'const' declarations must be initialized.
subTitle:
+ ~~~~~~~~
+!!! error TS1344: 'A label is not allowed here.
export const title: string
~~~~~~
!!! error TS1184: Modifiers cannot appear here.
diff --git a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
index 3f04b2a944f07..4837a8b7703c3 100644
--- a/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
+++ b/tests/baselines/reference/labeledStatementExportDeclarationNoCrash1(module=system).errors.txt
@@ -1,17 +1,20 @@
error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
labeledStatementExportDeclarationNoCrash1.ts(3,14): error TS1155: 'const' declarations must be initialized.
+labeledStatementExportDeclarationNoCrash1.ts(4,1): error TS1344: 'A label is not allowed here.
labeledStatementExportDeclarationNoCrash1.ts(5,1): error TS1184: Modifiers cannot appear here.
labeledStatementExportDeclarationNoCrash1.ts(5,14): error TS1155: 'const' declarations must be initialized.
!!! error TS5107: Option 'module=System' is deprecated and will stop functioning in TypeScript 7.0. Specify compilerOption '"ignoreDeprecations": "6.0"' to silence this error.
-==== labeledStatementExportDeclarationNoCrash1.ts (3 errors) ====
+==== labeledStatementExportDeclarationNoCrash1.ts (4 errors) ====
// https://github.com/microsoft/TypeScript/issues/59372
export const box: string
~~~
!!! error TS1155: 'const' declarations must be initialized.
subTitle:
+ ~~~~~~~~
+!!! error TS1344: 'A label is not allowed here.
export const title: string
~~~~~~
!!! error TS1184: Modifiers cannot appear here.
From 3145f19a6996fc4d563ada1d3c664ad903a4edb1 Mon Sep 17 00:00:00 2001
From: Jake Bailey <5341706+jakebailey@users.noreply.github.com>
Date: Sat, 25 Oct 2025 00:16:11 -0700
Subject: [PATCH 17/18] checker.ts
---
src/compiler/checker.ts | 276 +-------
.../accessorInAmbientContextES5.errors.txt | 32 -
.../accessorInAmbientContextES5.types | 1 -
.../asyncAliasReturnType_es5.errors.txt | 10 -
...owFunctionCapturesArguments_es5.errors.txt | 13 -
...ncArrowFunctionCapturesArguments_es5.types | 2 -
.../asyncAwaitIsolatedModules_es5.js | 1 -
.../asyncFunctionDeclaration15_es5.errors.txt | 26 +-
.../asyncFunctionDeclaration16_es5.errors.txt | 15 +-
...eclarationCapturesArguments_es5.errors.txt | 15 -
...tionDeclarationCapturesArguments_es5.types | 3 -
...ctionReturnExpressionErrorSpans.errors.txt | 5 +-
.../asyncImportedPromise_es5.errors.txt | 13 +
.../reference/asyncImportedPromise_es5.js | 1 -
.../asyncQualifiedReturnType_es5.errors.txt | 13 +
.../autoAccessor1(target=es5).errors.txt | 22 -
.../reference/autoAccessor1(target=es5).js | 3 -
.../reference/autoAccessor1(target=es5).types | 2 -
.../autoAccessor3(target=es5).errors.txt | 22 -
.../reference/autoAccessor3(target=es5).js | 3 -
.../reference/autoAccessor3(target=es5).types | 2 -
.../autoAccessor4(target=es5).errors.txt | 22 -
.../reference/autoAccessor4(target=es5).js | 3 -
.../reference/autoAccessor4(target=es5).types | 2 -
.../autoAccessor5(target=es5).errors.txt | 14 +-
.../classExpressionWithStaticProperties3.js | 2 +-
.../classStaticBlock5(target=es5).errors.txt | 28 -
.../reference/classStaticBlock6.errors.txt | 5 +-
...ollisionArgumentsArrowFunctions.errors.txt | 25 -
...lisionArgumentsClassConstructor.errors.txt | 17 +-
.../collisionArgumentsClassMethod.errors.txt | 14 +-
.../collisionArgumentsFunction.errors.txt | 59 --
.../collisionArgumentsFunction.types | 5 -
...ionArgumentsFunctionExpressions.errors.txt | 49 --
...ollisionArgumentsFunctionExpressions.types | 5 -
...rowFunctionWhenUsingArguments01.errors.txt | 8 +-
...rowFunctionWhenUsingArguments09.errors.txt | 9 -
...mitArrowFunctionWhenUsingArguments09.types | 1 -
...rowFunctionWhenUsingArguments10.errors.txt | 10 -
...rowFunctionWhenUsingArguments18.errors.txt | 12 -
...rowFunctionWhenUsingArguments19.errors.txt | 19 -
...mitArrowFunctionWhenUsingArguments19.types | 1 -
.../errorOnFunctionReturnType.errors.txt | 7 +-
.../errorSuperPropertyAccess.errors.txt | 55 +-
.../reference/parserAstSpans1.errors.txt | 8 +-
...teFieldAssignabilityFromUnknown.errors.txt | 5 +-
...vateInstanceMemberAccessibility.errors.txt | 8 +-
.../privateNameBadDeclaration.errors.txt | 8 +-
.../reference/privateNameES5Ban.errors.txt | 40 --
.../privateNameInObjectLiteral-3.errors.txt | 5 +-
.../privateNameJsBadDeclaration.errors.txt | 8 +-
...opertyAccessibleWithinSubclass3.errors.txt | 4 +-
...ctedInstanceMemberAccessibility.errors.txt | 4 +-
...opertyAccessibleWithinSubclass2.errors.txt | 30 -
.../reference/superAccess.errors.txt | 8 +-
.../reference/superInLambdas.errors.txt | 8 +-
.../superInObjectLiterals_ES5.errors.txt | 20 +-
...perInStaticMembers1(target=es5).errors.txt | 630 ++++++++++++++++++
.../reference/superPropertyAccess.errors.txt | 20 +-
.../reference/superPropertyAccess1.errors.txt | 39 --
.../reference/superPropertyAccess2.errors.txt | 5 +-
.../superPropertyAccess_ES5.errors.txt | 37 -
...ect-literal-getters-and-setters.errors.txt | 11 +-
...ransformNestedGeneratorsWithTry.errors.txt | 35 -
.../transformNestedGeneratorsWithTry.types | 2 -
.../noEmit/multiFile/changes-composite.js | 233 +------
.../changes-incremental-declaration.js | 233 +------
.../noEmit/multiFile/changes-incremental.js | 233 +------
.../changes-with-initial-noEmit-composite.js | 126 +---
...-initial-noEmit-incremental-declaration.js | 126 +---
...changes-with-initial-noEmit-incremental.js | 126 +---
.../tsc/noEmit/multiFile/changes-composite.js | 194 +-----
.../changes-incremental-declaration.js | 194 +-----
.../noEmit/multiFile/changes-incremental.js | 194 +-----
.../changes-with-initial-noEmit-composite.js | 121 +---
...-initial-noEmit-incremental-declaration.js | 121 +---
...changes-with-initial-noEmit-incremental.js | 121 +---
...isInStaticMembers10(target=es5).errors.txt | 8 +-
...isInStaticMembers11(target=es5).errors.txt | 8 +-
...hisInStaticMembers3(target=es5).errors.txt | 17 -
...hisInStaticMembers4(target=es5).errors.txt | 17 -
...hisInStaticMembers7(target=es5).errors.txt | 17 -
...hisInStaticMembers9(target=es5).errors.txt | 5 +-
...odeEscapesInNames01(target=es5).errors.txt | 134 ----
.../completionListStaticProtectedMembers2.ts | 7 +
85 files changed, 1012 insertions(+), 3010 deletions(-)
delete mode 100644 tests/baselines/reference/accessorInAmbientContextES5.errors.txt
delete mode 100644 tests/baselines/reference/asyncAliasReturnType_es5.errors.txt
delete mode 100644 tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt
delete mode 100644 tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt
create mode 100644 tests/baselines/reference/asyncImportedPromise_es5.errors.txt
create mode 100644 tests/baselines/reference/asyncQualifiedReturnType_es5.errors.txt
delete mode 100644 tests/baselines/reference/autoAccessor1(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/autoAccessor3(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/autoAccessor4(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/classStaticBlock5(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/collisionArgumentsArrowFunctions.errors.txt
delete mode 100644 tests/baselines/reference/collisionArgumentsFunction.errors.txt
delete mode 100644 tests/baselines/reference/collisionArgumentsFunctionExpressions.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
delete mode 100644 tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
delete mode 100644 tests/baselines/reference/privateNameES5Ban.errors.txt
delete mode 100644 tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.errors.txt
create mode 100644 tests/baselines/reference/superInStaticMembers1(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/superPropertyAccess1.errors.txt
delete mode 100644 tests/baselines/reference/superPropertyAccess_ES5.errors.txt
delete mode 100644 tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
delete mode 100644 tests/baselines/reference/typeOfThisInStaticMembers3(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/typeOfThisInStaticMembers4(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/typeOfThisInStaticMembers7(target=es5).errors.txt
delete mode 100644 tests/baselines/reference/unicodeEscapesInNames01(target=es5).errors.txt
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
index beaf864b7f16b..5be72511868db 100644
--- a/src/compiler/checker.ts
+++ b/src/compiler/checker.ts
@@ -295,7 +295,6 @@ import {
getEmitStandardClassFields,
getEnclosingBlockScopeContainer,
getEnclosingContainer,
- getEntityNameFromTypeNode,
getErrorSpanForNode,
getEscapedTextOfIdentifierOrLiteral,
getEscapedTextOfJsxAttributeName,
@@ -566,7 +565,6 @@ import {
isForInOrOfStatement,
isForInStatement,
isForOfStatement,
- isForStatement,
isFunctionDeclaration,
isFunctionExpression,
isFunctionExpressionOrArrowFunction,
@@ -2271,7 +2269,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
var deferredGlobalPromiseType: GenericType | undefined;
var deferredGlobalPromiseLikeType: GenericType | undefined;
var deferredGlobalPromiseConstructorSymbol: Symbol | undefined;
- var deferredGlobalPromiseConstructorLikeType: ObjectType | undefined;
var deferredGlobalIterableType: GenericType | undefined;
var deferredGlobalIteratorType: GenericType | undefined;
var deferredGlobalIterableIteratorType: GenericType | undefined;
@@ -12349,6 +12346,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const lastElement = lastOrUndefined(elements);
const restElement = lastElement && lastElement.kind === SyntaxKind.BindingElement && lastElement.dotDotDotToken ? lastElement : undefined;
if (elements.length === 0 || elements.length === 1 && restElement) {
+ // TODO: remove ScriptTarget.ES2015
return languageVersion >= ScriptTarget.ES2015 ? createIterableType(anyType) : anyArrayType;
}
const elementTypes = map(elements, e => isOmittedExpression(e) ? anyType : getTypeFromBindingElement(e, includePatternInType, reportErrors));
@@ -17493,10 +17491,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return deferredGlobalPromiseConstructorSymbol ||= getGlobalValueSymbol("Promise" as __String, reportErrors);
}
- function getGlobalPromiseConstructorLikeType(reportErrors: boolean) {
- return (deferredGlobalPromiseConstructorLikeType ||= getGlobalType("PromiseConstructorLike" as __String, /*arity*/ 0, reportErrors)) || emptyObjectType;
- }
-
function getGlobalAsyncIterableType(reportErrors: boolean) {
return (deferredGlobalAsyncIterableType ||= getGlobalType("AsyncIterable" as __String, /*arity*/ 3, reportErrors)) || emptyGenericType;
}
@@ -30451,7 +30445,8 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
case ReferenceHint.Jsx:
return markJsxAliasReferenced(location as JsxOpeningLikeElement | JsxOpeningFragment);
case ReferenceHint.AsyncFunction:
- return markAsyncFunctionAliasReferenced(location as FunctionLikeDeclaration | MethodSignature);
+ // TODO: remove case
+ return;
case ReferenceHint.ExportImportEquals:
return markImportEqualsAliasReferenced(location as ImportEqualsDeclaration);
case ReferenceHint.ExportSpecifier:
@@ -30493,10 +30488,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (isExportSpecifier(location)) {
return markExportSpecifierAliasReferenced(location);
}
- if (isFunctionLikeDeclaration(location) || isMethodSignature(location)) {
- markAsyncFunctionAliasReferenced(location);
- // Might be decorated, fall through to decorator final case
- }
if (!compilerOptions.emitDecoratorMetadata) {
return;
}
@@ -30624,15 +30615,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return;
}
- function markAsyncFunctionAliasReferenced(location: FunctionLikeDeclaration | MethodSignature) {
- if (languageVersion < ScriptTarget.ES2015) {
- if (getFunctionFlags(location) & FunctionFlags.Async) {
- const returnTypeNode = getEffectiveReturnTypeNode(location);
- markTypeNodeAsReferenced(returnTypeNode);
- }
- }
- }
-
function markImportEqualsAliasReferenced(location: ImportEqualsDeclaration) {
if (hasSyntacticModifier(location, ModifierFlags.Export)) {
markExportAsReferenced(location);
@@ -30798,14 +30780,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
- /**
- * If a TypeNode can be resolved to a value symbol imported from an external module, it is
- * marked as referenced to prevent import elision.
- */
- function markTypeNodeAsReferenced(node: TypeNode | undefined) {
- markEntityNameOrEntityExpressionAsReference(node && getEntityNameFromTypeNode(node), /*forDecoratorMetadata*/ false);
- }
-
/**
* This function marks the type used for metadata decorator as referenced if it is import
* from external module.
@@ -30930,15 +30904,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
let container = getContainingFunction(node);
if (container) {
- if (languageVersion < ScriptTarget.ES2015) {
- if (container.kind === SyntaxKind.ArrowFunction) {
- error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES5_Consider_using_a_standard_function_expression);
- }
- else if (hasSyntacticModifier(container, ModifierFlags.Async)) {
- error(node, Diagnostics.The_arguments_object_cannot_be_referenced_in_an_async_function_or_method_in_ES5_Consider_using_a_standard_function_or_method);
- }
- }
-
getNodeLinks(container).flags |= NodeCheckFlags.CaptureArguments;
while (container && isArrowFunction(container)) {
container = getContainingFunction(container);
@@ -30974,8 +30939,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
}
-
- checkNestedBlockScopedBinding(node, symbol);
}
function checkIdentifier(node: Identifier, checkMode: CheckMode | undefined): Type {
@@ -31153,116 +31116,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return true;
}
- function isInsideFunctionOrInstancePropertyInitializer(node: Node, threshold: Node): boolean {
- return !!findAncestor(node, n =>
- n === threshold ? "quit" : isFunctionLike(n) || (
- n.parent && isPropertyDeclaration(n.parent) && !hasStaticModifier(n.parent) && n.parent.initializer === n
- ));
- }
-
- function getPartOfForStatementContainingNode(node: Node, container: ForStatement) {
- return findAncestor(node, n => n === container ? "quit" : n === container.initializer || n === container.condition || n === container.incrementor || n === container.statement);
- }
-
function getEnclosingIterationStatement(node: Node): Node | undefined {
return findAncestor(node, n => (!n || nodeStartsNewLexicalEnvironment(n)) ? "quit" : isIterationStatement(n, /*lookInLabeledStatements*/ false));
}
- function checkNestedBlockScopedBinding(node: Identifier, symbol: Symbol): void {
- if (
- languageVersion >= ScriptTarget.ES2015 ||
- (symbol.flags & (SymbolFlags.BlockScopedVariable | SymbolFlags.Class)) === 0 ||
- !symbol.valueDeclaration ||
- isSourceFile(symbol.valueDeclaration) ||
- symbol.valueDeclaration.parent.kind === SyntaxKind.CatchClause
- ) {
- return;
- }
-
- // 1. walk from the use site up to the declaration and check
- // if there is anything function like between declaration and use-site (is binding/class is captured in function).
- // 2. walk from the declaration up to the boundary of lexical environment and check
- // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
-
- const container = getEnclosingBlockScopeContainer(symbol.valueDeclaration);
- const isCaptured = isInsideFunctionOrInstancePropertyInitializer(node, container);
-
- const enclosingIterationStatement = getEnclosingIterationStatement(container);
- if (enclosingIterationStatement) {
- if (isCaptured) {
- // mark iteration statement as containing block-scoped binding captured in some function
- let capturesBlockScopeBindingInLoopBody = true;
- if (isForStatement(container)) {
- const varDeclList = getAncestor(symbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
- if (varDeclList && varDeclList.parent === container) {
- const part = getPartOfForStatementContainingNode(node.parent, container);
- if (part) {
- const links = getNodeLinks(part);
- links.flags |= NodeCheckFlags.ContainsCapturedBlockScopeBinding;
-
- const capturedBindings = links.capturedBlockScopeBindings || (links.capturedBlockScopeBindings = []);
- pushIfUnique(capturedBindings, symbol);
-
- if (part === container.initializer) {
- capturesBlockScopeBindingInLoopBody = false; // Initializer is outside of loop body
- }
- }
- }
- }
- if (capturesBlockScopeBindingInLoopBody) {
- getNodeLinks(enclosingIterationStatement).flags |= NodeCheckFlags.LoopWithCapturedBlockScopedBinding;
- }
- }
-
- // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
- // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
- if (isForStatement(container)) {
- const varDeclList = getAncestor(symbol.valueDeclaration, SyntaxKind.VariableDeclarationList);
- if (varDeclList && varDeclList.parent === container && isAssignedInBodyOfForStatement(node, container)) {
- getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.NeedsLoopOutParameter;
- }
- }
-
- // set 'declared inside loop' bit on the block-scoped binding
- getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.BlockScopedBindingInLoop;
- }
-
- if (isCaptured) {
- getNodeLinks(symbol.valueDeclaration).flags |= NodeCheckFlags.CapturedBlockScopedBinding;
- }
- }
-
function isBindingCapturedByNode(node: Node, decl: VariableDeclaration | BindingElement) {
const links = getNodeLinks(node);
return !!links && contains(links.capturedBlockScopeBindings, getSymbolOfDeclaration(decl));
}
- function isAssignedInBodyOfForStatement(node: Identifier, container: ForStatement): boolean {
- // skip parenthesized nodes
- let current: Node = node;
- while (current.parent.kind === SyntaxKind.ParenthesizedExpression) {
- current = current.parent;
- }
-
- // check if node is used as LHS in some assignment expression
- let isAssigned = false;
- if (isAssignmentTarget(current)) {
- isAssigned = true;
- }
- else if ((current.parent.kind === SyntaxKind.PrefixUnaryExpression || current.parent.kind === SyntaxKind.PostfixUnaryExpression)) {
- const expr = current.parent as PrefixUnaryExpression | PostfixUnaryExpression;
- isAssigned = expr.operator === SyntaxKind.PlusPlusToken || expr.operator === SyntaxKind.MinusMinusToken;
- }
-
- if (!isAssigned) {
- return false;
- }
-
- // at this point we know that node is the target of assignment
- // now check that modification happens inside the statement part of the ForStatement
- return !!findAncestor(current, n => n === container ? "quit" : n === container.statement);
- }
-
function captureLexicalThis(node: Node, container: Node): void {
getNodeLinks(node).flags |= NodeCheckFlags.LexicalThis;
if (container.kind === SyntaxKind.PropertyDeclaration || container.kind === SyntaxKind.Constructor) {
@@ -31316,7 +31178,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
function checkThisExpression(node: Node): Type {
- const isNodeInTypeQuery = isInTypeQuery(node);
// Stop at the first arrow function so that we can
// tell whether 'this' needs to be captured.
let container = getThisContainer(node, /*includeArrowFunctions*/ true, /*includeClassComputedPropertyName*/ true);
@@ -31360,11 +31221,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
- // When targeting es6, mark that we'll need to capture `this` in its lexically bound scope.
- if (!isNodeInTypeQuery && capturedByArrowFunction && languageVersion < ScriptTarget.ES2015) {
- captureLexicalThis(node, container);
- }
-
const type = tryGetThisTypeAt(node, /*includeGlobalThis*/ true, container);
if (noImplicitThis) {
const globalThisType = getTypeOfSymbol(globalThisSymbol);
@@ -31532,7 +31388,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
const immediateContainer = getSuperContainer(node, /*stopOnFunctions*/ true);
let container = immediateContainer;
- let needToCaptureLexicalThis = false;
let inAsyncFunction = false;
// adjust the container reference in case if super is used inside arrow functions with arbitrarily deep nesting
@@ -31540,7 +31395,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
while (container && container.kind === SyntaxKind.ArrowFunction) {
if (hasSyntacticModifier(container, ModifierFlags.Async)) inAsyncFunction = true;
container = getSuperContainer(container, /*stopOnFunctions*/ true);
- needToCaptureLexicalThis = languageVersion < ScriptTarget.ES2015;
}
if (container && hasSyntacticModifier(container, ModifierFlags.Async)) inAsyncFunction = true;
}
@@ -31577,7 +31431,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
nodeCheckFlag = NodeCheckFlags.SuperStatic;
if (
!isCallExpression &&
- languageVersion >= ScriptTarget.ES2015 && languageVersion <= ScriptTarget.ES2021 &&
+ languageVersion <= ScriptTarget.ES2021 &&
(isPropertyDeclaration(container) || isClassStaticBlockDeclaration(container))
) {
// for `super.x` or `super[x]` in a static initializer, mark all enclosing
@@ -31664,22 +31518,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
- if (needToCaptureLexicalThis) {
- // call expressions are allowed only in constructors so they should always capture correct 'this'
- // super property access expressions can also appear in arrow functions -
- // in this case they should also use correct lexical this
- captureLexicalThis(node.parent, container);
- }
-
if (container.parent.kind === SyntaxKind.ObjectLiteralExpression) {
- if (languageVersion < ScriptTarget.ES2015) {
- error(node, Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
- return errorType;
- }
- else {
- // for object literal assume that type of 'super' is 'any'
- return anyType;
- }
+ // for object literal assume that type of 'super' is 'any'
+ return anyType;
}
// at this point the only legal case for parent is ClassLikeDeclaration
@@ -34384,14 +34225,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// - In a static member function or static member accessor
// where this references the constructor function object of a derived class,
// a super property access is permitted and must specify a public static member function of the base class.
- if (languageVersion < ScriptTarget.ES2015) {
- if (symbolHasNonMethodDeclaration(prop)) {
- if (errorNode) {
- error(errorNode, Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
- }
- return false;
- }
- }
if (flags & ModifierFlags.Abstract) {
// A method cannot be accessed in a super property access if the method is abstract.
// This error could mask a private property access error. But, a member
@@ -42062,8 +41895,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
addLazyDiagnostic(checkSignatureDeclarationDiagnostics);
function checkSignatureDeclarationDiagnostics() {
- checkCollisionWithArgumentsInGeneratedCode(node);
-
let returnTypeNode = getEffectiveReturnTypeNode(node);
let returnTypeErrorLocation = returnTypeNode;
@@ -43661,64 +43492,15 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
// }
//
const returnType = getTypeFromTypeNode(returnTypeNode);
- if (languageVersion >= ScriptTarget.ES2015) {
- if (isErrorType(returnType)) {
- return;
- }
- const globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
- if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) {
- // The promise type was not a valid type reference to the global promise type, so we
- // report an error and return the unknown type.
- reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
- return;
- }
+ if (isErrorType(returnType)) {
+ return;
}
- else {
- // Always mark the type node as referenced if it points to a value
- markLinkedReferences(node, ReferenceHint.AsyncFunction);
- if (isErrorType(returnType)) {
- return;
- }
-
- const promiseConstructorName = getEntityNameFromTypeNode(returnTypeNode);
- if (promiseConstructorName === undefined) {
- reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, typeToString(returnType));
- return;
- }
-
- const promiseConstructorSymbol = resolveEntityName(promiseConstructorName, SymbolFlags.Value, /*ignoreErrors*/ true);
- const promiseConstructorType = promiseConstructorSymbol ? getTypeOfSymbol(promiseConstructorSymbol) : errorType;
- if (isErrorType(promiseConstructorType)) {
- if (promiseConstructorName.kind === SyntaxKind.Identifier && promiseConstructorName.escapedText === "Promise" && getTargetType(returnType) === getGlobalPromiseType(/*reportErrors*/ false)) {
- error(returnTypeErrorLocation, Diagnostics.An_async_function_or_method_in_ES5_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option);
- }
- else {
- reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
- }
- return;
- }
-
- const globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType(/*reportErrors*/ true);
- if (globalPromiseConstructorLikeType === emptyObjectType) {
- // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
- // compatibility with __awaiter.
- reportErrorForInvalidReturnType(Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_because_it_does_not_refer_to_a_Promise_compatible_constructor_value, returnTypeNode, returnTypeErrorLocation, entityNameToString(promiseConstructorName));
- return;
- }
-
- const headMessage = Diagnostics.Type_0_is_not_a_valid_async_function_return_type_in_ES5_because_it_does_not_refer_to_a_Promise_compatible_constructor_value;
- const errorInfo = () => returnTypeNode === returnTypeErrorLocation ? undefined : chainDiagnosticMessages(/*details*/ undefined, Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
- if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, returnTypeErrorLocation, headMessage, errorInfo)) {
- return;
- }
-
- // Verify there is no local declaration that could collide with the promise constructor.
- const rootName = promiseConstructorName && getFirstIdentifier(promiseConstructorName);
- const collidingSymbol = getSymbol(node.locals!, rootName.escapedText, SymbolFlags.Value);
- if (collidingSymbol) {
- error(collidingSymbol.valueDeclaration, Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, idText(rootName), entityNameToString(promiseConstructorName));
- return;
- }
+ const globalPromiseType = getGlobalPromiseType(/*reportErrors*/ true);
+ if (globalPromiseType !== emptyGenericType && !isReferenceToType(returnType, globalPromiseType)) {
+ // The promise type was not a valid type reference to the global promise type, so we
+ // report an error and return the unknown type.
+ reportErrorForInvalidReturnType(Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_Did_you_mean_to_write_Promise_0, returnTypeNode, returnTypeErrorLocation, typeToString(getAwaitedTypeNoAlias(returnType) || voidType));
+ return;
}
checkAwaitedType(returnType, /*withAlias*/ false, node, Diagnostics.The_return_type_of_an_async_function_must_either_be_a_valid_promise_or_must_not_contain_a_callable_then_member);
@@ -44578,19 +44360,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
}
- function checkCollisionWithArgumentsInGeneratedCode(node: SignatureDeclaration) {
- // no rest parameters \ declaration context \ overload - no codegen impact
- if (languageVersion >= ScriptTarget.ES2015 || !hasRestParameter(node) || node.flags & NodeFlags.Ambient || nodeIsMissing((node as FunctionLikeDeclaration).body)) {
- return;
- }
-
- forEach(node.parameters, p => {
- if (p.name && !isBindingPattern(p.name) && p.name.escapedText === argumentsSymbol.escapedName) {
- errorSkippedOn("noEmit", p, Diagnostics.Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters);
- }
- });
- }
-
/**
* Checks whether an {@link Identifier}, in the context of another {@link Node}, would collide with a runtime value
* of {@link name} in an outer scope. This is used to check for collisions for downlevel transformations that
@@ -44728,7 +44497,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function recordPotentialCollisionWithReflectInGeneratedCode(node: Node, name: Identifier | undefined): void {
if (
- name && languageVersion >= ScriptTarget.ES2015 && languageVersion <= ScriptTarget.ES2021
+ name && languageVersion <= ScriptTarget.ES2021
&& needCollisionCheckForIdentifier(node, name, "Reflect")
) {
potentialReflectCollisions.push(node);
@@ -45490,6 +45259,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
return undefined;
}
+ // TODO: remove ScriptTarget.ES2015
const uplevelIteration = languageVersion >= ScriptTarget.ES2015;
const downlevelIteration = !uplevelIteration && compilerOptions.downlevelIteration;
const possibleOutOfBounds = compilerOptions.noUncheckedIndexedAccess && !!(use & IterationUse.PossiblyOutOfBounds);
@@ -46645,7 +46415,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
*/
function checkClassNameCollisionWithObject(name: Identifier): void {
if (
- languageVersion >= ScriptTarget.ES5 && name.escapedText === "Object"
+ name.escapedText === "Object"
&& host.getEmitModuleFormatOfFile(getSourceFileOfNode(name)) < ModuleKind.ES2015
) {
error(name, Diagnostics.Class_name_cannot_be_Object_when_targeting_ES5_and_above_with_module_0, ModuleKind[moduleKind]); // https://github.com/Microsoft/TypeScript/issues/17494
@@ -52565,9 +52335,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
function checkGrammarAccessor(accessor: AccessorDeclaration): boolean {
if (!(accessor.flags & NodeFlags.Ambient) && (accessor.parent.kind !== SyntaxKind.TypeLiteral) && (accessor.parent.kind !== SyntaxKind.InterfaceDeclaration)) {
- if (languageVersion < ScriptTarget.ES2015 && isPrivateIdentifier(accessor.name)) {
- return grammarErrorOnNode(accessor.name, Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
- }
if (accessor.body === undefined && !hasSyntacticModifier(accessor, ModifierFlags.Abstract)) {
return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, Diagnostics._0_expected, "{");
}
@@ -52709,9 +52476,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
}
if (isClassLike(node.parent)) {
- if (languageVersion < ScriptTarget.ES2015 && isPrivateIdentifier(node.name)) {
- return grammarErrorOnNode(node.name, Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
- }
// Technically, computed properties in ambient contexts is disallowed
// for property declarations and accessors too, not just methods.
// However, property declarations disallow computed names in general,
@@ -53102,12 +52866,6 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
if (checkGrammarForInvalidDynamicName(node.name, Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_have_a_simple_literal_type_or_a_unique_symbol_type)) {
return true;
}
- if (languageVersion < ScriptTarget.ES2015 && isPrivateIdentifier(node.name)) {
- return grammarErrorOnNode(node.name, Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
- }
- if (languageVersion < ScriptTarget.ES2015 && isAutoAccessorPropertyDeclaration(node) && !(node.flags & NodeFlags.Ambient)) {
- return grammarErrorOnNode(node.name, Diagnostics.Properties_with_the_accessor_modifier_are_only_available_when_targeting_ECMAScript_2015_and_higher);
- }
if (isAutoAccessorPropertyDeclaration(node) && checkGrammarForInvalidQuestionMark(node.questionToken, Diagnostics.An_accessor_property_cannot_be_declared_optional)) {
return true;
}
diff --git a/tests/baselines/reference/accessorInAmbientContextES5.errors.txt b/tests/baselines/reference/accessorInAmbientContextES5.errors.txt
deleted file mode 100644
index c9351f69f7213..0000000000000
--- a/tests/baselines/reference/accessorInAmbientContextES5.errors.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-accessorInAmbientContextES5.ts(25,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-
-
-==== accessorInAmbientContextES5.ts (1 errors) ====
- // Should allow accessor in ambient contexts even when targeting ES5
-
- declare class AmbientClass {
- accessor prop1: string;
- static accessor prop2: number;
- private accessor prop3: boolean;
- private static accessor prop4: symbol;
- }
-
- declare namespace AmbientNamespace {
- class C {
- accessor prop: string;
- }
- }
-
- // Should also work in .d.ts files (simulated with declare)
- declare module "some-module" {
- export class ExportedClass {
- accessor value: any;
- }
- }
-
- // Regular class should still error when targeting ES5
- class RegularClass {
- accessor shouldError: string; // Should still error
- ~~~~~~~~~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/accessorInAmbientContextES5.types b/tests/baselines/reference/accessorInAmbientContextES5.types
index eefedf0cf1306..a1519de527550 100644
--- a/tests/baselines/reference/accessorInAmbientContextES5.types
+++ b/tests/baselines/reference/accessorInAmbientContextES5.types
@@ -49,7 +49,6 @@ declare module "some-module" {
accessor value: any;
>value : any
-> : ^^^
}
}
diff --git a/tests/baselines/reference/asyncAliasReturnType_es5.errors.txt b/tests/baselines/reference/asyncAliasReturnType_es5.errors.txt
deleted file mode 100644
index b0ad4b8920dbc..0000000000000
--- a/tests/baselines/reference/asyncAliasReturnType_es5.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-asyncAliasReturnType_es5.ts(3,21): error TS1055: Type 'PromiseAlias' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-
-
-==== asyncAliasReturnType_es5.ts (1 errors) ====
- type PromiseAlias = Promise;
-
- async function f(): PromiseAlias {
- ~~~~~~~~~~~~~~~~~~
-!!! error TS1055: Type 'PromiseAlias' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt
deleted file mode 100644
index db54dddc46804..0000000000000
--- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.errors.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-asyncArrowFunctionCapturesArguments_es5.ts(4,52): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== asyncArrowFunctionCapturesArguments_es5.ts (1 errors) ====
- class C {
- method() {
- function other() {}
- var fn = async () => await other.apply(this, arguments);
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.types b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.types
index be3cc5d3315cb..28155cec6f6c8 100644
--- a/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.types
+++ b/tests/baselines/reference/asyncArrowFunctionCapturesArguments_es5.types
@@ -19,9 +19,7 @@ class C {
>async () => await other.apply(this, arguments) : () => Promise
> : ^^^^^^^^^^^^^^^^^^
>await other.apply(this, arguments) : any
-> : ^^^
>other.apply(this, arguments) : any
-> : ^^^
>other.apply : (this: Function, thisArg: any, argArray?: any) => any
> : ^ ^^ ^^ ^^ ^^ ^^^ ^^^^^
>other : () => void
diff --git a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
index 9be0eec2d917d..6b76980684a60 100644
--- a/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
+++ b/tests/baselines/reference/asyncAwaitIsolatedModules_es5.js
@@ -53,7 +53,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
});
};
Object.defineProperty(exports, "__esModule", { value: true });
-const missing_1 = require("missing");
function f0() {
return __awaiter(this, void 0, void 0, function* () { });
}
diff --git a/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt
index fb4cdc909c6bc..f8f2d10feec68 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt
+++ b/tests/baselines/reference/asyncFunctionDeclaration15_es5.errors.txt
@@ -1,13 +1,10 @@
-asyncFunctionDeclaration15_es5.ts(6,23): error TS1055: Type '{}' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+asyncFunctionDeclaration15_es5.ts(6,23): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise<{}>'?
asyncFunctionDeclaration15_es5.ts(6,23): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-asyncFunctionDeclaration15_es5.ts(7,23): error TS1055: Type 'any' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-asyncFunctionDeclaration15_es5.ts(8,23): error TS1055: Type 'number' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+asyncFunctionDeclaration15_es5.ts(7,23): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+asyncFunctionDeclaration15_es5.ts(8,23): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
asyncFunctionDeclaration15_es5.ts(8,23): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-asyncFunctionDeclaration15_es5.ts(9,23): error TS1055: Type 'PromiseLike' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-asyncFunctionDeclaration15_es5.ts(10,23): error TS1055: Type 'typeof Thenable' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
- Construct signature return types 'Thenable' and 'PromiseLike' are incompatible.
- The types returned by 'then(...)' are incompatible between these types.
- Type 'void' is not assignable to type 'PromiseLike'.
+asyncFunctionDeclaration15_es5.ts(9,23): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+asyncFunctionDeclaration15_es5.ts(10,23): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
asyncFunctionDeclaration15_es5.ts(17,16): error TS1058: The return type of an async function must either be a valid promise or must not contain a callable 'then' member.
asyncFunctionDeclaration15_es5.ts(23,25): error TS1320: Type of 'await' operand must either be a valid promise or must not contain a callable 'then' member.
@@ -20,26 +17,23 @@ asyncFunctionDeclaration15_es5.ts(23,25): error TS1320: Type of 'await' operand
async function fn1() { } // valid: Promise
async function fn2(): { } { } // error
~~~
-!!! error TS1055: Type '{}' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise<{}>'?
~~~
!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
async function fn3(): any { } // error
~~~
-!!! error TS1055: Type 'any' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
async function fn4(): number { } // error
~~~~~~
-!!! error TS1055: Type 'number' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
~~~~~~
!!! error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
async function fn5(): PromiseLike { } // error
~~~~~~~~~~~~~~~~~
-!!! error TS1055: Type 'PromiseLike' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
async function fn6(): Thenable { } // error
~~~~~~~~
-!!! error TS1055: Type 'typeof Thenable' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-!!! error TS1055: Construct signature return types 'Thenable' and 'PromiseLike' are incompatible.
-!!! error TS1055: The types returned by 'then(...)' are incompatible between these types.
-!!! error TS1055: Type 'void' is not assignable to type 'PromiseLike'.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
async function fn7() { return; } // valid: Promise
async function fn8() { return 1; } // valid: Promise
async function fn9() { return null; } // valid: Promise
diff --git a/tests/baselines/reference/asyncFunctionDeclaration16_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclaration16_es5.errors.txt
index f6f88f047eb49..1ab6e50c0837c 100644
--- a/tests/baselines/reference/asyncFunctionDeclaration16_es5.errors.txt
+++ b/tests/baselines/reference/asyncFunctionDeclaration16_es5.errors.txt
@@ -1,10 +1,6 @@
-/a.js(21,14): error TS1055: Type 'string' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+/a.js(21,14): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
/a.js(27,12): error TS1065: The return type of an async function or method must be the global Promise type.
/a.js(45,12): error TS1065: The return type of an async function or method must be the global Promise type.
- Type 'typeof Thenable' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
- Construct signature return types 'Thenable' and 'PromiseLike' are incompatible.
- The types returned by 'then(...)' are incompatible between these types.
- Type 'void' is not assignable to type 'PromiseLike'.
==== /types.d.ts (0 errors) ====
@@ -33,7 +29,7 @@
* @param {string} str
* @returns {string}
~~~~~~
-!!! error TS1055: Type 'string' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
*/
const f1 = async str => {
return str;
@@ -42,7 +38,7 @@
/** @type {T1} */
~~
!!! error TS1065: The return type of an async function or method must be the global Promise type.
-!!! related TS1055 /a.js:4:14: Type 'string' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! related TS1064 /a.js:4:14: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
const f2 = async str => {
return str;
}
@@ -63,10 +59,7 @@
/** @type {T3} */
~~
!!! error TS1065: The return type of an async function or method must be the global Promise type.
-!!! error TS1065: Type 'typeof Thenable' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
-!!! error TS1065: Construct signature return types 'Thenable' and 'PromiseLike' are incompatible.
-!!! error TS1065: The types returned by 'then(...)' are incompatible between these types.
-!!! error TS1065: Type 'void' is not assignable to type 'PromiseLike'.
+!!! related TS1064 /a.js:16:14: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
const f5 = async str => {
return str;
}
diff --git a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt
deleted file mode 100644
index e6c805127cbcd..0000000000000
--- a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.errors.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-asyncFunctionDeclarationCapturesArguments_es5.ts(5,36): error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES5. Consider using a standard function or method.
-
-
-==== asyncFunctionDeclarationCapturesArguments_es5.ts (1 errors) ====
- class C {
- method() {
- function other() {}
- async function fn () {
- await other.apply(this, arguments);
- ~~~~~~~~~
-!!! error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES5. Consider using a standard function or method.
- }
- }
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.types b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.types
index 5f5a1a148d35f..c6269bd45edd9 100644
--- a/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.types
+++ b/tests/baselines/reference/asyncFunctionDeclarationCapturesArguments_es5.types
@@ -19,9 +19,7 @@ class C {
await other.apply(this, arguments);
>await other.apply(this, arguments) : any
-> : ^^^
>other.apply(this, arguments) : any
-> : ^^^
>other.apply : (this: Function, thisArg: any, argArray?: any) => any
> : ^ ^^ ^^ ^^ ^^ ^^^ ^^^^^
>other : () => void
@@ -29,7 +27,6 @@ class C {
>apply : (this: Function, thisArg: any, argArray?: any) => any
> : ^ ^^ ^^ ^^ ^^ ^^^ ^^^^^
>this : any
-> : ^^^
>arguments : IArguments
> : ^^^^^^^^^^
}
diff --git a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.errors.txt b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.errors.txt
index 22f1cb846f308..b7b73ce546c57 100644
--- a/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.errors.txt
+++ b/tests/baselines/reference/asyncFunctionReturnExpressionErrorSpans.errors.txt
@@ -1,8 +1,7 @@
-asyncFunctionReturnExpressionErrorSpans.ts(11,28): error TS2705: An async function or method in ES5 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
asyncFunctionReturnExpressionErrorSpans.ts(16,21): error TS2322: Type 'number' is not assignable to type 'string'.
-==== asyncFunctionReturnExpressionErrorSpans.ts (2 errors) ====
+==== asyncFunctionReturnExpressionErrorSpans.ts (1 errors) ====
interface Foo {
bar: {
baz: {
@@ -14,8 +13,6 @@ asyncFunctionReturnExpressionErrorSpans.ts(16,21): error TS2322: Type 'number' i
}
async function asyncFoo(): Promise {
- ~~~~~~~~~~~~
-!!! error TS2705: An async function or method in ES5 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
return {
bar: {
baz: {
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.errors.txt b/tests/baselines/reference/asyncImportedPromise_es5.errors.txt
new file mode 100644
index 0000000000000..e26e60423e201
--- /dev/null
+++ b/tests/baselines/reference/asyncImportedPromise_es5.errors.txt
@@ -0,0 +1,13 @@
+test.ts(3,25): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+
+
+==== task.ts (0 errors) ====
+ export class Task extends Promise { }
+
+==== test.ts (1 errors) ====
+ import { Task } from "./task";
+ class Test {
+ async example(): Task { return; }
+ ~~~~~~~
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+ }
\ No newline at end of file
diff --git a/tests/baselines/reference/asyncImportedPromise_es5.js b/tests/baselines/reference/asyncImportedPromise_es5.js
index 5014f85267bf5..d452e0e36761e 100644
--- a/tests/baselines/reference/asyncImportedPromise_es5.js
+++ b/tests/baselines/reference/asyncImportedPromise_es5.js
@@ -28,7 +28,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
});
};
Object.defineProperty(exports, "__esModule", { value: true });
-const task_1 = require("./task");
class Test {
example() {
return __awaiter(this, void 0, void 0, function* () { return; });
diff --git a/tests/baselines/reference/asyncQualifiedReturnType_es5.errors.txt b/tests/baselines/reference/asyncQualifiedReturnType_es5.errors.txt
new file mode 100644
index 0000000000000..5e2ce01846052
--- /dev/null
+++ b/tests/baselines/reference/asyncQualifiedReturnType_es5.errors.txt
@@ -0,0 +1,13 @@
+asyncQualifiedReturnType_es5.ts(6,21): error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+
+
+==== asyncQualifiedReturnType_es5.ts (1 errors) ====
+ namespace X {
+ export class MyPromise extends Promise {
+ }
+ }
+
+ async function f(): X.MyPromise {
+ ~~~~~~~~~~~~~~~~~
+!!! error TS1064: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
+ }
\ No newline at end of file
diff --git a/tests/baselines/reference/autoAccessor1(target=es5).errors.txt b/tests/baselines/reference/autoAccessor1(target=es5).errors.txt
deleted file mode 100644
index d20d2bfecf11e..0000000000000
--- a/tests/baselines/reference/autoAccessor1(target=es5).errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-autoAccessor1.ts(2,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor1.ts(3,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor1.ts(4,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor1.ts(5,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-
-
-==== autoAccessor1.ts (4 errors) ====
- class C1 {
- accessor a: any;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- accessor b = 1;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor c: any;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor d = 2;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/autoAccessor1(target=es5).js b/tests/baselines/reference/autoAccessor1(target=es5).js
index de1cfac78f382..e05e19fa51df5 100644
--- a/tests/baselines/reference/autoAccessor1(target=es5).js
+++ b/tests/baselines/reference/autoAccessor1(target=es5).js
@@ -9,9 +9,6 @@ class C1 {
}
-
-
-!!!! File autoAccessor1.js missing from original emit, but present in noCheck emit
//// [autoAccessor1.js]
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
diff --git a/tests/baselines/reference/autoAccessor1(target=es5).types b/tests/baselines/reference/autoAccessor1(target=es5).types
index ae3c602c2598f..9477dd86be887 100644
--- a/tests/baselines/reference/autoAccessor1(target=es5).types
+++ b/tests/baselines/reference/autoAccessor1(target=es5).types
@@ -7,7 +7,6 @@ class C1 {
accessor a: any;
>a : any
-> : ^^^
accessor b = 1;
>b : number
@@ -17,7 +16,6 @@ class C1 {
static accessor c: any;
>c : any
-> : ^^^
static accessor d = 2;
>d : number
diff --git a/tests/baselines/reference/autoAccessor3(target=es5).errors.txt b/tests/baselines/reference/autoAccessor3(target=es5).errors.txt
deleted file mode 100644
index 0637053416bfe..0000000000000
--- a/tests/baselines/reference/autoAccessor3(target=es5).errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-autoAccessor3.ts(2,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor3.ts(3,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor3.ts(4,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor3.ts(5,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-
-
-==== autoAccessor3.ts (4 errors) ====
- class C1 {
- accessor "w": any;
- ~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- accessor "x" = 1;
- ~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor "y": any;
- ~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor "z" = 2;
- ~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/autoAccessor3(target=es5).js b/tests/baselines/reference/autoAccessor3(target=es5).js
index 744e9e9d351bb..4e664b01eff63 100644
--- a/tests/baselines/reference/autoAccessor3(target=es5).js
+++ b/tests/baselines/reference/autoAccessor3(target=es5).js
@@ -9,9 +9,6 @@ class C1 {
}
-
-
-!!!! File autoAccessor3.js missing from original emit, but present in noCheck emit
//// [autoAccessor3.js]
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
diff --git a/tests/baselines/reference/autoAccessor3(target=es5).types b/tests/baselines/reference/autoAccessor3(target=es5).types
index e8072a0fce844..112e04e2fb86d 100644
--- a/tests/baselines/reference/autoAccessor3(target=es5).types
+++ b/tests/baselines/reference/autoAccessor3(target=es5).types
@@ -7,7 +7,6 @@ class C1 {
accessor "w": any;
>"w" : any
-> : ^^^
accessor "x" = 1;
>"x" : number
@@ -17,7 +16,6 @@ class C1 {
static accessor "y": any;
>"y" : any
-> : ^^^
static accessor "z" = 2;
>"z" : number
diff --git a/tests/baselines/reference/autoAccessor4(target=es5).errors.txt b/tests/baselines/reference/autoAccessor4(target=es5).errors.txt
deleted file mode 100644
index 5c481a6438a95..0000000000000
--- a/tests/baselines/reference/autoAccessor4(target=es5).errors.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-autoAccessor4.ts(2,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor4.ts(3,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor4.ts(4,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor4.ts(5,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-
-
-==== autoAccessor4.ts (4 errors) ====
- class C1 {
- accessor 0: any;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- accessor 1 = 1;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor 2: any;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- static accessor 3 = 2;
- ~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/autoAccessor4(target=es5).js b/tests/baselines/reference/autoAccessor4(target=es5).js
index f7b2a4210fa69..3c774d990f336 100644
--- a/tests/baselines/reference/autoAccessor4(target=es5).js
+++ b/tests/baselines/reference/autoAccessor4(target=es5).js
@@ -9,9 +9,6 @@ class C1 {
}
-
-
-!!!! File autoAccessor4.js missing from original emit, but present in noCheck emit
//// [autoAccessor4.js]
var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
diff --git a/tests/baselines/reference/autoAccessor4(target=es5).types b/tests/baselines/reference/autoAccessor4(target=es5).types
index 04c4c440b0c05..b51f3ff55fa08 100644
--- a/tests/baselines/reference/autoAccessor4(target=es5).types
+++ b/tests/baselines/reference/autoAccessor4(target=es5).types
@@ -7,7 +7,6 @@ class C1 {
accessor 0: any;
>0 : any
-> : ^^^
accessor 1 = 1;
>1 : number
@@ -17,7 +16,6 @@ class C1 {
static accessor 2: any;
>2 : any
-> : ^^^
static accessor 3 = 2;
>3 : number
diff --git a/tests/baselines/reference/autoAccessor5(target=es5).errors.txt b/tests/baselines/reference/autoAccessor5(target=es5).errors.txt
index 5800cd441ff26..2ce40eaac06d3 100644
--- a/tests/baselines/reference/autoAccessor5(target=es5).errors.txt
+++ b/tests/baselines/reference/autoAccessor5(target=es5).errors.txt
@@ -1,24 +1,12 @@
-autoAccessor5.ts(2,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor5.ts(3,14): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor5.ts(4,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
-autoAccessor5.ts(5,21): error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
autoAccessor5.ts(10,14): error TS1166: A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type.
-==== autoAccessor5.ts (5 errors) ====
+==== autoAccessor5.ts (1 errors) ====
class C1 {
accessor ["w"]: any;
- ~~~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
accessor ["x"] = 1;
- ~~~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
static accessor ["y"]: any;
- ~~~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
static accessor ["z"] = 2;
- ~~~~~
-!!! error TS18045: Properties with the 'accessor' modifier are only available when targeting ECMAScript 2015 and higher.
}
declare var f: any;
diff --git a/tests/baselines/reference/classExpressionWithStaticProperties3.js b/tests/baselines/reference/classExpressionWithStaticProperties3.js
index 305520e576936..b2a29fb88857f 100644
--- a/tests/baselines/reference/classExpressionWithStaticProperties3.js
+++ b/tests/baselines/reference/classExpressionWithStaticProperties3.js
@@ -12,9 +12,9 @@ for (let i = 0; i < 3; i++) {
arr.forEach(C => console.log(C.y()));
//// [classExpressionWithStaticProperties3.js]
+var _a;
const arr = [];
for (let i = 0; i < 3; i++) {
- let _a;
arr.push((_a = class C {
},
_a.x = i,
diff --git a/tests/baselines/reference/classStaticBlock5(target=es5).errors.txt b/tests/baselines/reference/classStaticBlock5(target=es5).errors.txt
deleted file mode 100644
index e08815d9d420b..0000000000000
--- a/tests/baselines/reference/classStaticBlock5(target=es5).errors.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-classStaticBlock5.ts(8,22): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-classStaticBlock5.ts(12,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-classStaticBlock5.ts(13,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-
-
-==== classStaticBlock5.ts (3 errors) ====
- class B {
- static a = 1;
- static b = 2;
- }
-
- class C extends B {
- static b = 3;
- static c = super.a
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-
- static {
- this.b;
- super.b;
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- super.a;
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
- }
-
\ No newline at end of file
diff --git a/tests/baselines/reference/classStaticBlock6.errors.txt b/tests/baselines/reference/classStaticBlock6.errors.txt
index 321325c296527..7e8a0fa61359c 100644
--- a/tests/baselines/reference/classStaticBlock6.errors.txt
+++ b/tests/baselines/reference/classStaticBlock6.errors.txt
@@ -10,14 +10,13 @@ classStaticBlock6.ts(32,17): error TS2337: Super calls are not permitted outside
classStaticBlock6.ts(41,13): error TS2815: 'arguments' cannot be referenced in property initializers or class static initialization blocks.
classStaticBlock6.ts(42,13): error TS18037: 'await' expression cannot be used inside a class static block.
classStaticBlock6.ts(42,18): error TS1109: Expression expected.
-classStaticBlock6.ts(45,17): error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES5. Consider using a standard function or method.
classStaticBlock6.ts(46,22): error TS1109: Expression expected.
classStaticBlock6.ts(55,13): error TS2815: 'arguments' cannot be referenced in property initializers or class static initialization blocks.
classStaticBlock6.ts(66,14): error TS2729: Property 'b' is used before its initialization.
classStaticBlock6.ts(69,18): error TS2729: Property 'b' is used before its initialization.
-==== classStaticBlock6.ts (17 errors) ====
+==== classStaticBlock6.ts (16 errors) ====
class B {
static a = 1;
}
@@ -87,8 +86,6 @@ classStaticBlock6.ts(69,18): error TS2729: Property 'b' is used before its initi
async function ff () {
arguments;
- ~~~~~~~~~
-!!! error TS2522: The 'arguments' object cannot be referenced in an async function or method in ES5. Consider using a standard function or method.
await;
~
!!! error TS1109: Expression expected.
diff --git a/tests/baselines/reference/collisionArgumentsArrowFunctions.errors.txt b/tests/baselines/reference/collisionArgumentsArrowFunctions.errors.txt
deleted file mode 100644
index c3ed9abd5f8b7..0000000000000
--- a/tests/baselines/reference/collisionArgumentsArrowFunctions.errors.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-collisionArgumentsArrowFunctions.ts(1,22): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsArrowFunctions.ts(4,12): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-
-
-==== collisionArgumentsArrowFunctions.ts (2 errors) ====
- var f1 = (i: number, ...arguments) => { //arguments is error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any[]; // no error
- }
- var f12 = (arguments: number, ...rest) => { //arguments is error
- ~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments = 10; // no error
- }
- var f1NoError = (arguments: number) => { // no error
- var arguments = 10; // no error
- }
-
- var f2 = (...restParameters) => {
- var arguments = 10; // No Error
- }
- var f2NoError = () => {
- var arguments = 10; // no error
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionArgumentsClassConstructor.errors.txt b/tests/baselines/reference/collisionArgumentsClassConstructor.errors.txt
index 96f8c1fd3ae2d..e906397447a71 100644
--- a/tests/baselines/reference/collisionArgumentsClassConstructor.errors.txt
+++ b/tests/baselines/reference/collisionArgumentsClassConstructor.errors.txt
@@ -1,27 +1,22 @@
-collisionArgumentsClassConstructor.ts(3,28): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassConstructor.ts(3,31): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(4,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(8,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassConstructor.ts(8,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassConstructor.ts(9,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(13,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(14,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(20,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(25,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassConstructor.ts(30,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassConstructor.ts(30,24): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(31,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(35,24): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(36,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(51,31): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(52,31): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassConstructor.ts(53,25): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassConstructor.ts(53,28): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(54,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(59,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(60,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(61,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassConstructor.ts(61,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassConstructor.ts(62,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(67,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassConstructor.ts(68,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
@@ -29,12 +24,10 @@ collisionArgumentsClassConstructor.ts(69,17): error TS1210: Code contained in a
collisionArgumentsClassConstructor.ts(70,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-==== collisionArgumentsClassConstructor.ts (29 errors) ====
+==== collisionArgumentsClassConstructor.ts (24 errors) ====
// Constructors
class c1 {
constructor(i: number, ...arguments) { // error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var arguments: any[]; // no error
@@ -46,8 +39,6 @@ collisionArgumentsClassConstructor.ts(70,13): error TS1210: Code contained in a
constructor(arguments: number, ...rest) { // error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
- ~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
var arguments = 10; // no error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
@@ -80,8 +71,6 @@ collisionArgumentsClassConstructor.ts(70,13): error TS1210: Code contained in a
class c3 {
constructor(public arguments: number, ...restParameters) { //arguments is error
- ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var arguments = 10; // no error
@@ -117,8 +106,6 @@ collisionArgumentsClassConstructor.ts(70,13): error TS1210: Code contained in a
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
constructor(i: any, ...arguments) { // error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var arguments: any[]; // no error
@@ -137,8 +124,6 @@ collisionArgumentsClassConstructor.ts(70,13): error TS1210: Code contained in a
constructor(arguments: any, ...rest) { // error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
- ~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
var arguments: any; // no error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
diff --git a/tests/baselines/reference/collisionArgumentsClassMethod.errors.txt b/tests/baselines/reference/collisionArgumentsClassMethod.errors.txt
index e242b2421ae00..8dbe2d91bfc31 100644
--- a/tests/baselines/reference/collisionArgumentsClassMethod.errors.txt
+++ b/tests/baselines/reference/collisionArgumentsClassMethod.errors.txt
@@ -1,20 +1,16 @@
-collisionArgumentsClassMethod.ts(2,27): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassMethod.ts(2,30): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(3,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(5,17): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassMethod.ts(5,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassMethod.ts(6,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(8,23): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(9,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(11,29): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(12,29): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassMethod.ts(13,23): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassMethod.ts(13,26): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(14,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(16,16): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(17,16): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(18,16): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-collisionArgumentsClassMethod.ts(18,16): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
collisionArgumentsClassMethod.ts(19,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(21,22): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
collisionArgumentsClassMethod.ts(22,22): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
@@ -24,11 +20,9 @@ collisionArgumentsClassMethod.ts(43,13): error TS1210: Code contained in a class
collisionArgumentsClassMethod.ts(46,13): error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
-==== collisionArgumentsClassMethod.ts (24 errors) ====
+==== collisionArgumentsClassMethod.ts (20 errors) ====
class c1 {
public foo(i: number, ...arguments) { //arguments is error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var arguments: any[]; // no error
@@ -38,8 +32,6 @@ collisionArgumentsClassMethod.ts(46,13): error TS1210: Code contained in a class
public foo1(arguments: number, ...rest) { //arguments is error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
- ~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
var arguments = 10; // no error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
@@ -58,8 +50,6 @@ collisionArgumentsClassMethod.ts(46,13): error TS1210: Code contained in a class
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
public f4(i: any, ...arguments) { // error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
var arguments: any[]; // no error
@@ -75,8 +65,6 @@ collisionArgumentsClassMethod.ts(46,13): error TS1210: Code contained in a class
public f41(arguments: any, ...rest) { // error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
- ~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
var arguments: any; // no error
~~~~~~~~~
!!! error TS1210: Code contained in a class is evaluated in JavaScript's strict mode which does not allow this use of 'arguments'. For more information, see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode.
diff --git a/tests/baselines/reference/collisionArgumentsFunction.errors.txt b/tests/baselines/reference/collisionArgumentsFunction.errors.txt
deleted file mode 100644
index 1d7d2b3c99b7f..0000000000000
--- a/tests/baselines/reference/collisionArgumentsFunction.errors.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-collisionArgumentsFunction.ts(2,13): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunction.ts(5,25): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunction.ts(25,13): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunction.ts(30,22): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-
-
-==== collisionArgumentsFunction.ts (4 errors) ====
- // Functions
- function f1(arguments: number, ...restParameters) { //arguments is error
- ~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments = 10; // no error
- }
- function f12(i: number, ...arguments) { //arguments is error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any[]; // no error
- }
- function f1NoError(arguments: number) { // no error
- var arguments = 10; // no error
- }
-
- declare function f2(i: number, ...arguments); // no error - no code gen
- declare function f21(arguments: number, ...rest); // no error - no code gen
- declare function f2NoError(arguments: number); // no error
-
- function f3(...restParameters) {
- var arguments = 10; // no error
- }
- function f3NoError() {
- var arguments = 10; // no error
- }
-
- function f4(arguments: number, ...rest); // no codegen no error
- function f4(arguments: string, ...rest); // no codegen no error
- function f4(arguments: any, ...rest) { // error
- ~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any; // No error
- }
- function f42(i: number, ...arguments); // no codegen no error
- function f42(i: string, ...arguments); // no codegen no error
- function f42(i: any, ...arguments) { // error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any[]; // No error
- }
- function f4NoError(arguments: number); // no error
- function f4NoError(arguments: string); // no error
- function f4NoError(arguments: any) { // no error
- var arguments: any; // No error
- }
-
- declare function f5(arguments: number, ...rest); // no codegen no error
- declare function f5(arguments: string, ...rest); // no codegen no error
- declare function f52(i: number, ...arguments); // no codegen no error
- declare function f52(i: string, ...arguments); // no codegen no error
- declare function f6(arguments: number); // no codegen no error
- declare function f6(arguments: string); // no codegen no error
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionArgumentsFunction.types b/tests/baselines/reference/collisionArgumentsFunction.types
index 88c4107b45ae9..00149caf4329c 100644
--- a/tests/baselines/reference/collisionArgumentsFunction.types
+++ b/tests/baselines/reference/collisionArgumentsFunction.types
@@ -106,13 +106,11 @@ function f4(arguments: any, ...rest) { // error
>f4 : { (arguments: number, ...rest: any[]): any; (arguments: string, ...rest: any[]): any; }
> : ^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
>rest : any[]
> : ^^^^^
var arguments: any; // No error
>arguments : any
-> : ^^^
}
function f42(i: number, ...arguments); // no codegen no error
>f42 : { (i: number, ...arguments: any[]): any; (i: string, ...arguments: any[]): any; }
@@ -134,7 +132,6 @@ function f42(i: any, ...arguments) { // error
>f42 : { (i: number, ...arguments: any[]): any; (i: string, ...arguments: any[]): any; }
> : ^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^
>i : any
-> : ^^^
>arguments : any[]
> : ^^^^^
@@ -158,11 +155,9 @@ function f4NoError(arguments: any) { // no error
>f4NoError : { (arguments: number): any; (arguments: string): any; }
> : ^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^^^^
>arguments : any
-> : ^^^
var arguments: any; // No error
>arguments : any
-> : ^^^
}
declare function f5(arguments: number, ...rest); // no codegen no error
diff --git a/tests/baselines/reference/collisionArgumentsFunctionExpressions.errors.txt b/tests/baselines/reference/collisionArgumentsFunctionExpressions.errors.txt
deleted file mode 100644
index f85bd42c754d8..0000000000000
--- a/tests/baselines/reference/collisionArgumentsFunctionExpressions.errors.txt
+++ /dev/null
@@ -1,49 +0,0 @@
-collisionArgumentsFunctionExpressions.ts(2,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunctionExpressions.ts(5,29): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunctionExpressions.ts(21,17): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-collisionArgumentsFunctionExpressions.ts(26,26): error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
-
-
-==== collisionArgumentsFunctionExpressions.ts (4 errors) ====
- function foo() {
- function f1(arguments: number, ...restParameters) { //arguments is error
- ~~~~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments = 10; // no error
- }
- function f12(i: number, ...arguments) { //arguments is error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any[]; // no error
- }
- function f1NoError(arguments: number) { // no error
- var arguments = 10; // no error
- }
-
- function f3(...restParameters) {
- var arguments = 10; // no error
- }
- function f3NoError() {
- var arguments = 10; // no error
- }
-
- function f4(arguments: number, ...rest); // no codegen no error
- function f4(arguments: string, ...rest); // no codegen no error
- function f4(arguments: any, ...rest) { // error
- ~~~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any; // No error
- }
- function f42(i: number, ...arguments); // no codegen no error
- function f42(i: string, ...arguments); // no codegen no error
- function f42(i: any, ...arguments) { // error
- ~~~~~~~~~~~~
-!!! error TS2396: Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters.
- var arguments: any[]; // No error
- }
- function f4NoError(arguments: number); // no error
- function f4NoError(arguments: string); // no error
- function f4NoError(arguments: any) { // no error
- var arguments: any; // No error
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/collisionArgumentsFunctionExpressions.types b/tests/baselines/reference/collisionArgumentsFunctionExpressions.types
index 6ede79355c201..7cc3327ed029b 100644
--- a/tests/baselines/reference/collisionArgumentsFunctionExpressions.types
+++ b/tests/baselines/reference/collisionArgumentsFunctionExpressions.types
@@ -87,13 +87,11 @@ function foo() {
>f4 : { (arguments: number, ...rest: any[]): any; (arguments: string, ...rest: any[]): any; }
> : ^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^
>arguments : any
-> : ^^^
>rest : any[]
> : ^^^^^
var arguments: any; // No error
>arguments : any
-> : ^^^
}
function f42(i: number, ...arguments); // no codegen no error
>f42 : { (i: number, ...arguments: any[]): any; (i: string, ...arguments: any[]): any; }
@@ -115,7 +113,6 @@ function foo() {
>f42 : { (i: number, ...arguments: any[]): any; (i: string, ...arguments: any[]): any; }
> : ^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^ ^^ ^^^^^ ^^^^^^^^^^^^^^^^
>i : any
-> : ^^^
>arguments : any[]
> : ^^^^^
@@ -139,10 +136,8 @@ function foo() {
>f4NoError : { (arguments: number): any; (arguments: string): any; }
> : ^^^ ^^ ^^^^^^^^^ ^^ ^^^^^^^^^
>arguments : any
-> : ^^^
var arguments: any; // No error
>arguments : any
-> : ^^^
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
index edf9a3c0844da..94d9dbd86bea7 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments01.errors.txt
@@ -1,10 +1,8 @@
emitArrowFunctionWhenUsingArguments01.ts(2,15): error TS2304: Cannot find name 'arguments'.
-emitArrowFunctionWhenUsingArguments01.ts(7,19): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-emitArrowFunctionWhenUsingArguments01.ts(13,13): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2304: Cannot find name 'arguments'.
-==== emitArrowFunctionWhenUsingArguments01.ts (4 errors) ====
+==== emitArrowFunctionWhenUsingArguments01.ts (2 errors) ====
var a = () => {
var arg = arguments[0]; // error
~~~~~~~~~
@@ -14,16 +12,12 @@ emitArrowFunctionWhenUsingArguments01.ts(19,15): error TS2304: Cannot find name
var b = function () {
var a = () => {
var arg = arguments[0]; // error
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
}
}
function baz() {
() => {
var arg = arguments[0];
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
}
}
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
deleted file mode 100644
index 3cc070dda0a6c..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.errors.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-emitArrowFunctionWhenUsingArguments09.ts(2,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments09.ts (1 errors) ====
- function f(_arguments) {
- var a = () => () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.types
index 2da20754aaa10..7dda31a5e9555 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments09.types
@@ -5,7 +5,6 @@ function f(_arguments) {
>f : (_arguments: any) => void
> : ^ ^^^^^^^^^^^^^^
>_arguments : any
-> : ^^^
var a = () => () => arguments;
>a : () => () => IArguments
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
deleted file mode 100644
index 2117758380281..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments10.errors.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-emitArrowFunctionWhenUsingArguments10.ts(3,25): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments10.ts (1 errors) ====
- function f() {
- var _arguments = 10;
- var a = () => () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
deleted file mode 100644
index 69afb2040f137..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments18.errors.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-emitArrowFunctionWhenUsingArguments18.ts(4,22): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments18.ts (1 errors) ====
- function f() {
- var { arguments: args } = { arguments };
- if (Math.random()) {
- return () => arguments;
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
deleted file mode 100644
index 3095afb9eda95..0000000000000
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.errors.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-emitArrowFunctionWhenUsingArguments19.ts(5,33): error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
-
-
-==== emitArrowFunctionWhenUsingArguments19.ts (1 errors) ====
- function f() {
- function g() {
- var _arguments = 10; // No capture in 'g', so no conflict.
- function h() {
- var capture = () => arguments; // Should trigger an '_arguments' capture into function 'h'
- ~~~~~~~~~
-!!! error TS2496: The 'arguments' object cannot be referenced in an arrow function in ES5. Consider using a standard function expression.
- foo(_arguments); // Error as this does not resolve to the user defined '_arguments'
- }
- }
-
- function foo(x: any) {
- return 100;
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.types b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.types
index 4b92126a9a256..1f273f66ff688 100644
--- a/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.types
+++ b/tests/baselines/reference/emitArrowFunctionWhenUsingArguments19.types
@@ -41,7 +41,6 @@ function f() {
>foo : (x: any) => number
> : ^ ^^ ^^^^^^^^^^^
>x : any
-> : ^^^
return 100;
>100 : 100
diff --git a/tests/baselines/reference/errorOnFunctionReturnType.errors.txt b/tests/baselines/reference/errorOnFunctionReturnType.errors.txt
index ae6e21f882d78..7fc273e59c4c5 100644
--- a/tests/baselines/reference/errorOnFunctionReturnType.errors.txt
+++ b/tests/baselines/reference/errorOnFunctionReturnType.errors.txt
@@ -1,5 +1,4 @@
foo.js(7,10): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
-foo.js(11,12): error TS2705: An async function or method in ES5 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
foo.js(13,5): error TS2322: Type 'string' is not assignable to type 'number'.
foo.js(16,60): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
foo.js(21,20): error TS2355: A function whose declared type is neither 'undefined', 'void', nor 'any' must return a value.
@@ -10,7 +9,7 @@ foo.js(40,56): error TS2534: A function returning 'never' cannot have a reachabl
foo.js(45,18): error TS2534: A function returning 'never' cannot have a reachable end point.
-==== foo.js (10 errors) ====
+==== foo.js (9 errors) ====
/**
* @callback FunctionReturningPromise
* @returns {Promise}
@@ -24,8 +23,6 @@ foo.js(45,18): error TS2534: A function returning 'never' cannot have a reachabl
}
/** @type {FunctionReturningPromise} */
- ~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2705: An async function or method in ES5 requires the 'Promise' constructor. Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option.
async function testPromise2() {
return "asd";
~~~~~~
@@ -60,7 +57,7 @@ foo.js(45,18): error TS2534: A function returning 'never' cannot have a reachabl
/** @type {FunctionReturningNever} */
~~~~~~~~~~~~~~~~~~~~~~
!!! error TS1065: The return type of an async function or method must be the global Promise type.
-!!! related TS1055 foo.js:27:14: Type 'never' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
+!!! related TS1064 foo.js:27:14: The return type of an async function or method must be the global Promise type. Did you mean to write 'Promise'?
async function testNever2() {
return "asd";
~~~~~~
diff --git a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
index 4f9de10df31b5..f0a5fe433238e 100644
--- a/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
+++ b/tests/baselines/reference/errorSuperPropertyAccess.errors.txt
@@ -7,30 +7,27 @@ errorSuperPropertyAccess.ts(16,9): error TS2335: 'super' can only be referenced
errorSuperPropertyAccess.ts(21,9): error TS2335: 'super' can only be referenced in a derived class.
errorSuperPropertyAccess.ts(25,9): error TS2335: 'super' can only be referenced in a derived class.
errorSuperPropertyAccess.ts(30,9): error TS2335: 'super' can only be referenced in a derived class.
-errorSuperPropertyAccess.ts(57,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(61,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(65,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(69,19): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+errorSuperPropertyAccess.ts(57,15): error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(61,23): error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(65,23): error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(69,19): error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
errorSuperPropertyAccess.ts(73,13): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
errorSuperPropertyAccess.ts(76,40): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
-errorSuperPropertyAccess.ts(87,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(91,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(95,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(99,19): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(109,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(110,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+errorSuperPropertyAccess.ts(87,15): error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(91,23): error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(95,23): error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(99,19): error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
+errorSuperPropertyAccess.ts(110,15): error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
errorSuperPropertyAccess.ts(111,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
-errorSuperPropertyAccess.ts(114,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(115,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+errorSuperPropertyAccess.ts(115,15): error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
errorSuperPropertyAccess.ts(116,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
-errorSuperPropertyAccess.ts(120,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-errorSuperPropertyAccess.ts(121,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+errorSuperPropertyAccess.ts(121,15): error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
errorSuperPropertyAccess.ts(122,15): error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
errorSuperPropertyAccess.ts(127,16): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
-==== errorSuperPropertyAccess.ts (30 errors) ====
+==== errorSuperPropertyAccess.ts (27 errors) ====
//super property access in constructor of class with no base type
//super property access in instance member function of class with no base type
//super property access in instance member accessor(get and set) of class with no base type
@@ -107,25 +104,25 @@ errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be reference
super();
super.publicMember = 1;
~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
}
fn() {
var x = super.publicMember;
~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
}
get a() {
var x = super.publicMember;
~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
return undefined;
}
set a(n) {
n = super.publicMember;
~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'publicMember' defined by the parent class is not accessible in the child class via super.
}
fn2() {
function inner() {
@@ -149,25 +146,25 @@ errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be reference
super();
super.privateMember = 1;
~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
}
fn() {
var x = super.privateMember;
~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
}
get a() {
var x = super.privateMember;
~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
return undefined;
}
set a(n) {
n = super.privateMember;
~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'privateMember' defined by the parent class is not accessible in the child class via super.
}
}
@@ -178,22 +175,18 @@ errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be reference
class SomeDerived3 extends SomeBase {
static fn() {
super.publicStaticMember = 3;
- ~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
super.privateStaticMember = 3;
~~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
super.privateStaticFunc();
~~~~~~~~~~~~~~~~~
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
}
static get a() {
super.publicStaticMember = 3;
- ~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
super.privateStaticMember = 3;
~~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
super.privateStaticFunc();
~~~~~~~~~~~~~~~~~
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
@@ -201,11 +194,9 @@ errorSuperPropertyAccess.ts(127,30): error TS2660: 'super' can only be reference
}
static set a(n) {
super.publicStaticMember = 3;
- ~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
super.privateStaticMember = 3;
~~~~~~~~~~~~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2341: Property 'privateStaticMember' is private and only accessible within class 'SomeBase'.
super.privateStaticFunc();
~~~~~~~~~~~~~~~~~
!!! error TS2341: Property 'privateStaticFunc' is private and only accessible within class 'SomeBase'.
diff --git a/tests/baselines/reference/parserAstSpans1.errors.txt b/tests/baselines/reference/parserAstSpans1.errors.txt
index 657aaca97162b..f95e4f8af8de4 100644
--- a/tests/baselines/reference/parserAstSpans1.errors.txt
+++ b/tests/baselines/reference/parserAstSpans1.errors.txt
@@ -1,5 +1,5 @@
-parserAstSpans1.ts(111,25): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+parserAstSpans1.ts(111,25): error TS2855: Class field 'c2_p1' defined by the parent class is not accessible in the child class via super.
+parserAstSpans1.ts(217,24): error TS2855: Class field 'b' defined by the parent class is not accessible in the child class via super.
==== parserAstSpans1.ts (2 errors) ====
@@ -115,7 +115,7 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
super(10);
this.p1 = super.c2_p1;
~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'c2_p1' defined by the parent class is not accessible in the child class via super.
}
/** c3 p1*/
public p1: number;
@@ -223,6 +223,6 @@ parserAstSpans1.ts(217,24): error TS2340: Only public and protected methods of t
super();
this.d = super.b;
~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'b' defined by the parent class is not accessible in the child class via super.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/privateFieldAssignabilityFromUnknown.errors.txt b/tests/baselines/reference/privateFieldAssignabilityFromUnknown.errors.txt
index eae2c7066dff4..eecc2af6e2880 100644
--- a/tests/baselines/reference/privateFieldAssignabilityFromUnknown.errors.txt
+++ b/tests/baselines/reference/privateFieldAssignabilityFromUnknown.errors.txt
@@ -1,12 +1,9 @@
-privateFieldAssignabilityFromUnknown.ts(2,3): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
privateFieldAssignabilityFromUnknown.ts(5,7): error TS2741: Property '#field' is missing in type '{}' but required in type 'Class'.
-==== privateFieldAssignabilityFromUnknown.ts (2 errors) ====
+==== privateFieldAssignabilityFromUnknown.ts (1 errors) ====
export class Class {
#field: any
- ~~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
}
const task: Class = {} as unknown;
diff --git a/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt b/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt
index f9abb4ef34a61..ef5eaed6c511d 100644
--- a/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt
+++ b/tests/baselines/reference/privateInstanceMemberAccessibility.errors.txt
@@ -1,7 +1,7 @@
privateInstanceMemberAccessibility.ts(5,7): error TS2415: Class 'Derived' incorrectly extends base class 'Base'.
Property 'foo' is private in type 'Base' but not in type 'Derived'.
-privateInstanceMemberAccessibility.ts(6,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-privateInstanceMemberAccessibility.ts(8,22): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+privateInstanceMemberAccessibility.ts(6,15): error TS2855: Class field 'foo' defined by the parent class is not accessible in the child class via super.
+privateInstanceMemberAccessibility.ts(8,22): error TS2855: Class field 'foo' defined by the parent class is not accessible in the child class via super.
privateInstanceMemberAccessibility.ts(10,15): error TS2304: Cannot find name 'super'.
privateInstanceMemberAccessibility.ts(12,12): error TS1442: Expected '=' for property initializer.
@@ -17,11 +17,11 @@ privateInstanceMemberAccessibility.ts(12,12): error TS1442: Expected '=' for pro
!!! error TS2415: Property 'foo' is private in type 'Base' but not in type 'Derived'.
x = super.foo; // error
~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'foo' defined by the parent class is not accessible in the child class via super.
y() {
return super.foo; // error
~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'foo' defined by the parent class is not accessible in the child class via super.
}
z: typeof super.foo; // error
~~~~~
diff --git a/tests/baselines/reference/privateNameBadDeclaration.errors.txt b/tests/baselines/reference/privateNameBadDeclaration.errors.txt
index 8078eb3b63ea9..d5403ee25f8d0 100644
--- a/tests/baselines/reference/privateNameBadDeclaration.errors.txt
+++ b/tests/baselines/reference/privateNameBadDeclaration.errors.txt
@@ -1,15 +1,13 @@
privateNameBadDeclaration.ts(3,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameBadDeclaration.ts(4,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameBadDeclaration.ts(5,7): error TS18016: Private identifiers are not allowed outside class bodies.
-privateNameBadDeclaration.ts(5,7): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
privateNameBadDeclaration.ts(9,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameBadDeclaration.ts(10,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameBadDeclaration.ts(11,7): error TS18016: Private identifiers are not allowed outside class bodies.
-privateNameBadDeclaration.ts(11,7): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
privateNameBadDeclaration.ts(15,10): error TS2339: Property '#z' does not exist on type 'C'.
-==== privateNameBadDeclaration.ts (9 errors) ====
+==== privateNameBadDeclaration.ts (7 errors) ====
function A() { }
A.prototype = {
#x: 1, // Error
@@ -21,8 +19,6 @@ privateNameBadDeclaration.ts(15,10): error TS2339: Property '#z' does not exist
get #p() { return "" } // Error
~~
!!! error TS18016: Private identifiers are not allowed outside class bodies.
- ~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
}
class B { }
B.prototype = {
@@ -35,8 +31,6 @@ privateNameBadDeclaration.ts(15,10): error TS2339: Property '#z' does not exist
get #p() { return "" } // Error
~~
!!! error TS18016: Private identifiers are not allowed outside class bodies.
- ~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
}
class C {
constructor() {
diff --git a/tests/baselines/reference/privateNameES5Ban.errors.txt b/tests/baselines/reference/privateNameES5Ban.errors.txt
deleted file mode 100644
index ad9351e971157..0000000000000
--- a/tests/baselines/reference/privateNameES5Ban.errors.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-privateNameES5Ban.ts(3,5): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(4,5): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(5,12): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(6,12): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(7,9): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(8,9): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(9,16): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-privateNameES5Ban.ts(10,16): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-
-
-==== privateNameES5Ban.ts (8 errors) ====
- class A {
- constructor() {}
- #field = 123;
- ~~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- #method() {}
- ~~~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- static #sField = "hello world";
- ~~~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- static #sMethod() {}
- ~~~~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- get #acc() { return ""; }
- ~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- set #acc(x: string) {}
- ~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- static get #sAcc() { return 0; }
- ~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- static set #sAcc(x: number) {}
- ~~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
- }
-
-
\ No newline at end of file
diff --git a/tests/baselines/reference/privateNameInObjectLiteral-3.errors.txt b/tests/baselines/reference/privateNameInObjectLiteral-3.errors.txt
index 59fc51734f525..315c29e419ace 100644
--- a/tests/baselines/reference/privateNameInObjectLiteral-3.errors.txt
+++ b/tests/baselines/reference/privateNameInObjectLiteral-3.errors.txt
@@ -1,14 +1,11 @@
privateNameInObjectLiteral-3.ts(2,9): error TS18016: Private identifiers are not allowed outside class bodies.
-privateNameInObjectLiteral-3.ts(2,9): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
-==== privateNameInObjectLiteral-3.ts (2 errors) ====
+==== privateNameInObjectLiteral-3.ts (1 errors) ====
const obj = {
get #foo() {
~~~~
!!! error TS18016: Private identifiers are not allowed outside class bodies.
- ~~~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
return ""
}
};
diff --git a/tests/baselines/reference/privateNameJsBadDeclaration.errors.txt b/tests/baselines/reference/privateNameJsBadDeclaration.errors.txt
index 7711e8aa8da4e..44c244734441d 100644
--- a/tests/baselines/reference/privateNameJsBadDeclaration.errors.txt
+++ b/tests/baselines/reference/privateNameJsBadDeclaration.errors.txt
@@ -1,15 +1,13 @@
privateNameJsPrototype.js(3,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameJsPrototype.js(4,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameJsPrototype.js(5,7): error TS18016: Private identifiers are not allowed outside class bodies.
-privateNameJsPrototype.js(5,7): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
privateNameJsPrototype.js(9,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameJsPrototype.js(10,3): error TS18016: Private identifiers are not allowed outside class bodies.
privateNameJsPrototype.js(11,7): error TS18016: Private identifiers are not allowed outside class bodies.
-privateNameJsPrototype.js(11,7): error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
privateNameJsPrototype.js(15,10): error TS2339: Property '#z' does not exist on type 'C'.
-==== privateNameJsPrototype.js (9 errors) ====
+==== privateNameJsPrototype.js (7 errors) ====
function A() { }
A.prototype = {
#x: 1, // Error
@@ -21,8 +19,6 @@ privateNameJsPrototype.js(15,10): error TS2339: Property '#z' does not exist on
get #p() { return "" } // Error
~~
!!! error TS18016: Private identifiers are not allowed outside class bodies.
- ~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
}
class B { }
B.prototype = {
@@ -35,8 +31,6 @@ privateNameJsPrototype.js(15,10): error TS2339: Property '#z' does not exist on
get #p() { return "" } // Error
~~
!!! error TS18016: Private identifiers are not allowed outside class bodies.
- ~~
-!!! error TS18028: Private identifiers are only available when targeting ECMAScript 2015 and higher.
}
class C {
constructor() {
diff --git a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.errors.txt b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.errors.txt
index af6e691bb4f94..cdca62567babe 100644
--- a/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.errors.txt
+++ b/tests/baselines/reference/protectedClassPropertyAccessibleWithinSubclass3.errors.txt
@@ -1,4 +1,4 @@
-protectedClassPropertyAccessibleWithinSubclass3.ts(11,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+protectedClassPropertyAccessibleWithinSubclass3.ts(11,15): error TS2855: Class field 'x' defined by the parent class is not accessible in the child class via super.
==== protectedClassPropertyAccessibleWithinSubclass3.ts (1 errors) ====
@@ -14,6 +14,6 @@ protectedClassPropertyAccessibleWithinSubclass3.ts(11,15): error TS2340: Only pu
this.x; // OK, accessed within a subclass of the declaring class
super.x; // Error, x is not public
~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'x' defined by the parent class is not accessible in the child class via super.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
index 4afd3abfa9b07..48474a76cf870 100644
--- a/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
+++ b/tests/baselines/reference/protectedInstanceMemberAccessibility.errors.txt
@@ -1,5 +1,5 @@
protectedInstanceMemberAccessibility.ts(14,23): error TS2339: Property 'z' does not exist on type 'B'.
-protectedInstanceMemberAccessibility.ts(16,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+protectedInstanceMemberAccessibility.ts(16,24): error TS2855: Class field 'x' defined by the parent class is not accessible in the child class via super.
protectedInstanceMemberAccessibility.ts(18,24): error TS2339: Property 'y' does not exist on type 'A'.
protectedInstanceMemberAccessibility.ts(19,24): error TS2339: Property 'z' does not exist on type 'A'.
protectedInstanceMemberAccessibility.ts(22,20): error TS2446: Property 'x' is protected and only accessible through an instance of class 'B'. This is an instance of class 'A'.
@@ -33,7 +33,7 @@ protectedInstanceMemberAccessibility.ts(37,20): error TS2445: Property 'z' is pr
var s1 = super.x; // error
~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'x' defined by the parent class is not accessible in the child class via super.
var s2 = super.f();
var s3 = super.y; // error
~
diff --git a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.errors.txt b/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.errors.txt
deleted file mode 100644
index 05c4395a4b603..0000000000000
--- a/tests/baselines/reference/protectedStaticClassPropertyAccessibleWithinSubclass2.errors.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-protectedStaticClassPropertyAccessibleWithinSubclass2.ts(11,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-protectedStaticClassPropertyAccessibleWithinSubclass2.ts(19,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-
-
-==== protectedStaticClassPropertyAccessibleWithinSubclass2.ts (2 errors) ====
- class Base {
- protected static x: string;
- static staticMethod() {
- this.x; // OK, accessed within their declaring class
- }
- }
-
- class Derived1 extends Base {
- static staticMethod1() {
- this.x; // OK, accessed within a class derived from their declaring class
- super.x; // Error, x is not public
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
- }
-
- class Derived2 extends Derived1 {
- protected static x: string;
- static staticMethod3() {
- this.x; // OK, accessed within a class derived from their declaring class
- super.x; // Error, x is not public
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/superAccess.errors.txt b/tests/baselines/reference/superAccess.errors.txt
index bf40e1363c6ce..f8fb17f9ee148 100644
--- a/tests/baselines/reference/superAccess.errors.txt
+++ b/tests/baselines/reference/superAccess.errors.txt
@@ -1,6 +1,6 @@
superAccess.ts(9,24): error TS2576: Property 'S1' does not exist on type 'MyBase'. Did you mean to access the static member 'MyBase.S1' instead?
-superAccess.ts(10,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superAccess.ts(11,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+superAccess.ts(10,24): error TS2855: Class field 'S2' defined by the parent class is not accessible in the child class via super.
+superAccess.ts(11,24): error TS2855: Class field 'f' defined by the parent class is not accessible in the child class via super.
==== superAccess.ts (3 errors) ====
@@ -17,9 +17,9 @@ superAccess.ts(11,24): error TS2340: Only public and protected methods of the ba
!!! error TS2576: Property 'S1' does not exist on type 'MyBase'. Did you mean to access the static member 'MyBase.S1' instead?
var l4 = super.S2; // Expected => Error: Only public instance methods of the base class are accessible via the 'super' keyword
~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'S2' defined by the parent class is not accessible in the child class via super.
var l5 = super.f(); // Expected => Error: Only public instance methods of the base class are accessible via the 'super' keyword
~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'f' defined by the parent class is not accessible in the child class via super.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/superInLambdas.errors.txt b/tests/baselines/reference/superInLambdas.errors.txt
index 9ed4f8a94b0b3..4d46f490044e5 100644
--- a/tests/baselines/reference/superInLambdas.errors.txt
+++ b/tests/baselines/reference/superInLambdas.errors.txt
@@ -1,5 +1,5 @@
-superInLambdas.ts(47,49): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superInLambdas.ts(51,49): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+superInLambdas.ts(47,49): error TS2855: Class field 'name' defined by the parent class is not accessible in the child class via super.
+superInLambdas.ts(51,49): error TS2855: Class field 'name' defined by the parent class is not accessible in the child class via super.
superInLambdas.ts(61,34): error TS1034: 'super' must be followed by an argument list or member access.
superInLambdas.ts(65,34): error TS1034: 'super' must be followed by an argument list or member access.
@@ -53,13 +53,13 @@ superInLambdas.ts(65,34): error TS1034: 'super' must be followed by an argument
// super property in a nested lambda in a constructor
var superName = () => () => () => super.name;
~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'name' defined by the parent class is not accessible in the child class via super.
}
sayHello(): void {
// super property in a nested lambda in a method
var superName = () => () => () => super.name;
~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'name' defined by the parent class is not accessible in the child class via super.
}
}
diff --git a/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt
index c06e5f2d47495..bd90e5e1b7d38 100644
--- a/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt
+++ b/tests/baselines/reference/superInObjectLiterals_ES5.errors.txt
@@ -1,17 +1,11 @@
-superInObjectLiterals_ES5.ts(7,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-superInObjectLiterals_ES5.ts(10,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-superInObjectLiterals_ES5.ts(14,9): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
superInObjectLiterals_ES5.ts(17,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
superInObjectLiterals_ES5.ts(20,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
superInObjectLiterals_ES5.ts(23,9): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
-superInObjectLiterals_ES5.ts(39,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-superInObjectLiterals_ES5.ts(42,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-superInObjectLiterals_ES5.ts(46,17): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
superInObjectLiterals_ES5.ts(49,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
-==== superInObjectLiterals_ES5.ts (11 errors) ====
+==== superInObjectLiterals_ES5.ts (5 errors) ====
var obj = {
__proto__: {
method() {
@@ -19,19 +13,13 @@ superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' can only be reference
},
method() {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
get prop() {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
return 10;
},
set prop(value) {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
p1: function () {
super.method();
@@ -63,19 +51,13 @@ superInObjectLiterals_ES5.ts(52,17): error TS2660: 'super' can only be reference
},
method() {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
get prop() {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
return 10;
},
set prop(value) {
super.method();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
p1: function () {
super.method();
diff --git a/tests/baselines/reference/superInStaticMembers1(target=es5).errors.txt b/tests/baselines/reference/superInStaticMembers1(target=es5).errors.txt
new file mode 100644
index 0000000000000..5522f4ff9f7c8
--- /dev/null
+++ b/tests/baselines/reference/superInStaticMembers1(target=es5).errors.txt
@@ -0,0 +1,630 @@
+classDeclInContainingScopeStaticBlock.ts(3,7): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+classDeclInContainingScopeStaticField.ts(3,7): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+constEnumInContainingScopeStaticBlock.ts(3,12): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+constEnumInContainingScopeStaticField.ts(3,12): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+defaultImportInContainingScopeStaticBlock.ts(3,8): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+defaultImportInContainingScopeStaticField.ts(3,8): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+enumInContainingScopeStaticBlock.ts(3,6): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+enumInContainingScopeStaticField.ts(3,6): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+funcDeclInContainingScopeStaticBlock.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+funcDeclInContainingScopeStaticField.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+inContainingClassExprStaticBlock.ts(3,8): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+inContainingClassExprStaticField.ts(3,8): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+inContainingFuncExprStaticBlock.ts(3,11): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+inContainingFuncExprStaticField.ts(3,11): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(6,17): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(10,19): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(14,18): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(18,19): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(22,22): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(26,18): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(30,24): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(52,15): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(57,14): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(62,13): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(67,15): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(72,18): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(77,14): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+locals.ts(82,20): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportInContainingScopeStaticBlock.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportInContainingScopeStaticField.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfConstEnumInContainingScopeStaticBlock.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfConstEnumInContainingScopeStaticField.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfInterfaceInContainingScopeStaticBlock.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfInterfaceInContainingScopeStaticField.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfUninstantiatedNamespaceInContainingScopeStaticBlock.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namedImportOfUninstantiatedNamespaceInContainingScopeStaticField.ts(3,10): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namespaceImportInContainingScopeStaticBlock.ts(3,13): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+namespaceImportInContainingScopeStaticField.ts(3,13): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+valueNamespaceInContainingScopeStaticBlock.ts(3,11): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+valueNamespaceInContainingScopeStaticField.ts(3,11): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticBlock1.ts(3,5): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticBlock2.ts(3,7): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticBlock3.ts(3,6): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticField1.ts(3,5): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticField2.ts(3,7): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+varInContainingScopeStaticField3.ts(3,6): error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+
+
+==== external.ts (0 errors) ====
+ export class Reflect {}
+ export interface Foo {}
+ export declare namespace Bar { type _ = unknown; }
+ export const enum Baz {}
+ export default class {};
+
+==== locals.ts (14 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ class C extends B {
+ static _ = [
+ (() => {
+ var Reflect; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ class Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ function Reflect() {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ const enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ })(),
+ (() => {
+ type Reflect = unknown; // no collision
+ super.w();
+ })(),
+ (() => {
+ interface Reflect {}; // no collision
+ super.w();
+ })(),
+ (() => {
+ (class Reflect {}); // no collision
+ super.w();
+ })(),
+ (() => {
+ (function Reflect() {}); // no collision
+ super.w();
+ })(),
+ ];
+
+ static {
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ var Reflect; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ class Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ function Reflect() {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ const enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ super.w();
+ }
+
+ static {
+ type Reflect = unknown; // no collision
+ super.w();
+ }
+
+ static {
+ interface Reflect {} // no collision
+ super.w();
+ }
+
+ static {
+ (class Reflect {}) // no collision
+ super.w();
+ }
+
+ static {
+ (function Reflect() {}) // no collision
+ super.w();
+ }
+ }
+
+==== varInContainingScopeStaticField1.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var Reflect = null; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== varInContainingScopeStaticField2.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== varInContainingScopeStaticField3.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== varInContainingScopeStaticBlock1.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var Reflect = null; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== varInContainingScopeStaticBlock2.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var { Reflect } = { Reflect: null }; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== varInContainingScopeStaticBlock3.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ var [Reflect] = [null]; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== classDeclInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ class Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== classDeclInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ class Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== funcDeclInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ function Reflect() {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== funcDeclInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ function Reflect() {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== valueNamespaceInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ namespace Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== valueNamespaceInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ namespace Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== enumInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== enumInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== constEnumInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ const enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== constEnumInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ const enum Reflect {} // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== namespaceImportInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import * as Reflect from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== namespaceImportInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import * as Reflect from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== namedImportInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Reflect } from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== namedImportInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Reflect } from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== namedImportOfInterfaceInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Foo as Reflect } from "./external"; // collision (es2015-es2021 only, not a type-only import)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== namedImportOfInterfaceInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Foo as Reflect } from "./external"; // collision (es2015-es2021 only, not a type-only import)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== namedImportOfUninstantiatedNamespaceInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Bar as Reflect } from "./external"; // collision (es2015-es2021 only, not a type-only import)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== namedImportOfUninstantiatedNamespaceInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Bar as Reflect } from "./external"; // collision (es2015-es2021 only, not a type-only import)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== namedImportOfConstEnumInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Baz as Reflect } from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== namedImportOfConstEnumInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import { Baz as Reflect } from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== typeOnlyNamedImportInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import type { Reflect } from "./external"; // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== typeOnlyNamedImportInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import type { Reflect } from "./external"; // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== defaultImportInContainingScopeStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import Reflect from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== defaultImportInContainingScopeStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import Reflect from "./external"; // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== typeOnlyDefaultImportInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import type Reflect from "./external"; // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== typeOnlyDefaultImportInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ import type Reflect from "./external"; // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== typeInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ type Reflect = unknown; // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== typeInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ type Reflect = unknown; // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== interfaceInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ interface Reflect {}; // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== interfaceInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ interface Reflect {}; // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== uninstantiatedNamespaceInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ declare namespace Reflect { type _ = unknown; }; // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== uninstantiatedNamespaceInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ declare namespace Reflect { type _ = unknown; }; // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== classExprInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (class Reflect {}); // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== classExprInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (class Reflect {}); // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== inContainingClassExprStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (class Reflect { // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ static {
+ class C extends B {
+ static _ = super.w();
+ }
+ }
+ });
+
+==== inContainingClassExprStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (class Reflect { // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ static {
+ class C extends B {
+ static { super.w(); }
+ }
+ }
+ });
+
+==== funcExprInContainingScopeStaticField.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (function Reflect() {}); // no collision
+ class C extends B {
+ static _ = super.w();
+ }
+
+==== funcExprInContainingScopeStaticBlock.ts (0 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (function Reflect() {}); // no collision
+ class C extends B {
+ static { super.w(); }
+ }
+
+==== inContainingFuncExprStaticField.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (function Reflect() { // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static _ = super.w();
+ }
+ });
+
+==== inContainingFuncExprStaticBlock.ts (1 errors) ====
+ export {};
+ declare class B { static w(): number; }
+ (function Reflect() { // collision (es2015-es2021 only)
+ ~~~~~~~
+!!! error TS2818: Duplicate identifier 'Reflect'. Compiler reserves name 'Reflect' when emitting 'super' references in static initializers.
+ class C extends B {
+ static { super.w(); }
+ }
+ });
+
\ No newline at end of file
diff --git a/tests/baselines/reference/superPropertyAccess.errors.txt b/tests/baselines/reference/superPropertyAccess.errors.txt
index b53a4f5a3268f..108616c2ac4c5 100644
--- a/tests/baselines/reference/superPropertyAccess.errors.txt
+++ b/tests/baselines/reference/superPropertyAccess.errors.txt
@@ -1,12 +1,10 @@
-superPropertyAccess.ts(21,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+superPropertyAccess.ts(21,15): error TS2855: Class field 'm2' defined by the parent class is not accessible in the child class via super.
superPropertyAccess.ts(23,15): error TS2341: Property 'p1' is private and only accessible within class 'MyBase'.
-superPropertyAccess.ts(25,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess.ts(27,24): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess.ts(31,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess.ts(33,23): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+superPropertyAccess.ts(25,24): error TS2855: Class field 'd1' defined by the parent class is not accessible in the child class via super.
+superPropertyAccess.ts(27,24): error TS2855: Class field 'd2' defined by the parent class is not accessible in the child class via super.
-==== superPropertyAccess.ts (6 errors) ====
+==== superPropertyAccess.ts (4 errors) ====
class MyBase {
m1(a: string) { return a; }
private p1() { }
@@ -29,7 +27,7 @@ superPropertyAccess.ts(33,23): error TS2340: Only public and protected methods o
super.m2.bind(this); // Should error, instance property, not a public instance member function
~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'm2' defined by the parent class is not accessible in the child class via super.
super.p1(); // Should error, private not public instance member function
~~
@@ -37,20 +35,16 @@ superPropertyAccess.ts(33,23): error TS2340: Only public and protected methods o
var l1 = super.d1; // Should error, instance data property not a public instance member function
~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'd1' defined by the parent class is not accessible in the child class via super.
var l1 = super.d2; // Should error, instance data property not a public instance member function
~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
+!!! error TS2855: Class field 'd2' defined by the parent class is not accessible in the child class via super.
super.m1 = function (a: string) { return ""; }; // Should be allowed, we will not restrict assignment
super.value = 0; // Should error, instance data property not a public instance member function
- ~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
var z = super.value; // Should error, instance data property not a public instance member function
- ~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
}
}
\ No newline at end of file
diff --git a/tests/baselines/reference/superPropertyAccess1.errors.txt b/tests/baselines/reference/superPropertyAccess1.errors.txt
deleted file mode 100644
index 7b141f0e74825..0000000000000
--- a/tests/baselines/reference/superPropertyAccess1.errors.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-superPropertyAccess1.ts(13,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess1.ts(19,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess1.ts(24,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-
-
-==== superPropertyAccess1.ts (3 errors) ====
- class C {
- public foo() { }
- public get x() {
- return 1;
- }
-
- public bar() { }
- }
-
- class D extends C {
- public foo() {
- super.bar();
- super.x; // error
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
-
- constructor() {
- super();
- super.bar();
- super.x; // error
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
-
- public get y() {
- super.bar();
- super.x; // error
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- return 1;
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/superPropertyAccess2.errors.txt b/tests/baselines/reference/superPropertyAccess2.errors.txt
index a42c6e5a4a53f..b0437ec80ec3e 100644
--- a/tests/baselines/reference/superPropertyAccess2.errors.txt
+++ b/tests/baselines/reference/superPropertyAccess2.errors.txt
@@ -1,10 +1,9 @@
superPropertyAccess2.ts(13,15): error TS2339: Property 'x' does not exist on type 'typeof C'.
superPropertyAccess2.ts(18,15): error TS2576: Property 'bar' does not exist on type 'C'. Did you mean to access the static member 'C.bar' instead?
-superPropertyAccess2.ts(19,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
superPropertyAccess2.ts(24,15): error TS2339: Property 'x' does not exist on type 'typeof C'.
-==== superPropertyAccess2.ts (4 errors) ====
+==== superPropertyAccess2.ts (3 errors) ====
class C {
public static foo() { }
public get x() {
@@ -28,8 +27,6 @@ superPropertyAccess2.ts(24,15): error TS2339: Property 'x' does not exist on typ
~~~
!!! error TS2576: Property 'bar' does not exist on type 'C'. Did you mean to access the static member 'C.bar' instead?
super.x; // error
- ~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
}
public static get y() {
diff --git a/tests/baselines/reference/superPropertyAccess_ES5.errors.txt b/tests/baselines/reference/superPropertyAccess_ES5.errors.txt
deleted file mode 100644
index 9f4e7b5658e01..0000000000000
--- a/tests/baselines/reference/superPropertyAccess_ES5.errors.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-superPropertyAccess_ES5.ts(11,22): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-superPropertyAccess_ES5.ts(26,15): error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
-
-
-==== superPropertyAccess_ES5.ts (2 errors) ====
- class MyBase {
- getValue(): number { return 1; }
- get value(): number { return 1; }
- }
-
- class MyDerived extends MyBase {
- constructor() {
- super();
-
- const f1 = super.getValue();
- const f2 = super.value;
- ~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
- }
-
- var d = new MyDerived();
- var f3 = d.value;
-
- class A {
- private _property: string;
- get property() { return this._property; }
- set property(value: string) { this._property = value }
- }
-
- class B extends A {
- set property(value: string) {
- super.property = value + " addition";
- ~~~~~~~~
-!!! error TS2340: Only public and protected methods of the base class are accessible via the 'super' keyword.
- }
- }
\ No newline at end of file
diff --git a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt
index d6c019a7ee097..755ef581212fe 100644
--- a/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt
+++ b/tests/baselines/reference/super_inside-object-literal-getters-and-setters.errors.txt
@@ -1,22 +1,15 @@
-super_inside-object-literal-getters-and-setters.ts(5,20): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-super_inside-object-literal-getters-and-setters.ts(8,13): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
super_inside-object-literal-getters-and-setters.ts(11,20): error TS2660: 'super' can only be referenced in members of derived classes or object literal expressions.
-super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
-==== super_inside-object-literal-getters-and-setters.ts (4 errors) ====
+==== super_inside-object-literal-getters-and-setters.ts (1 errors) ====
module ObjectLiteral {
var ThisInObjectLiteral = {
_foo: '1',
get foo(): string {
return super._foo;
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
set foo(value: string) {
super._foo = value;
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
},
test: function () {
return super._foo;
@@ -32,8 +25,6 @@ super_inside-object-literal-getters-and-setters.ts(21,24): error TS2659: 'super'
var test = {
get F() {
return super.test();
- ~~~~~
-!!! error TS2659: 'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher.
}
};
}
diff --git a/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt b/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
deleted file mode 100644
index 53d0c0e56f0ec..0000000000000
--- a/tests/baselines/reference/transformNestedGeneratorsWithTry.errors.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-main.ts(3,21): error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
- Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'.
-main.ts(5,35): error TS1055: Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' is not a valid async function return type in ES5 because it does not refer to a Promise-compatible constructor value.
- Type '{ all(values: Iterable>): Promise[]>; all(values: T): Promise<{ -readonly [P in keyof T]: Awaited; }>; race(values: Iterable>): Promise>; race(values: T): Promise>; prototype: Promise; reject(reason?: any): Promise; resolve(): Promise; resolve(value: T): Promise>; resolve(value: T | PromiseLike): Promise>; [Symbol.species]: PromiseConstructor; default: PromiseConstructor; }' provides no match for the signature 'new (executor: (resolve: (value: T | PromiseLike) => void, reject: (reason?: any) => void) => void): PromiseLike'.
-
-
-==== main.ts (2 errors) ====
- // https://github.com/Microsoft/TypeScript/issues/11177
- import * as Bluebird from 'bluebird';
- async function a(): Bluebird {
- ~~~~~~~~~~~~~~
-!!! error TS1055: Type '{ all(values: Iterable