Skip to content

Commit aa26a59

Browse files
authored
Merge pull request #24244 from Andarist/redefining-helpers
Use redefining helper pattern for better tree-shakeability
2 parents 3846e7b + 3af425b commit aa26a59

File tree

808 files changed

+5662
-3213
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

808 files changed

+5662
-3213
lines changed

src/compiler/transformers/es2015.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4067,9 +4067,13 @@ namespace ts {
40674067
priority: 0,
40684068
text: `
40694069
var __extends = (this && this.__extends) || (function () {
4070-
var extendStatics = Object.setPrototypeOf ||
4071-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
4072-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
4070+
var extendStatics = function (d, b) {
4071+
extendStatics = Object.setPrototypeOf ||
4072+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
4073+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
4074+
return extendStatics(d, b);
4075+
}
4076+
40734077
return function (d, b) {
40744078
extendStatics(d, b);
40754079
function __() { this.constructor = d; }

src/compiler/transformers/esnext.ts

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -890,13 +890,16 @@ namespace ts {
890890
scoped: false,
891891
priority: 1,
892892
text: `
893-
var __assign = (this && this.__assign) || Object.assign || function(t) {
894-
for (var s, i = 1, n = arguments.length; i < n; i++) {
895-
s = arguments[i];
896-
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
897-
t[p] = s[p];
898-
}
899-
return t;
893+
var __assign = (this && this.__assign) || function () {
894+
__assign = Object.assign || function(t) {
895+
for (var s, i = 1, n = arguments.length; i < n; i++) {
896+
s = arguments[i];
897+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
898+
t[p] = s[p];
899+
}
900+
return t;
901+
};
902+
return __assign.apply(this, arguments);
900903
};`
901904
};
902905

tests/baselines/reference/ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ module A {
2222

2323
//// [ExportClassWithAccessibleTypesInTypeParameterConstraintsClassHeritageListMemberTypeAnnotations.js]
2424
var __extends = (this && this.__extends) || (function () {
25-
var extendStatics = Object.setPrototypeOf ||
26-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
27-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
25+
var extendStatics = function (d, b) {
26+
extendStatics = Object.setPrototypeOf ||
27+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
28+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
29+
return extendStatics(d, b);
30+
}
2831
return function (d, b) {
2932
extendStatics(d, b);
3033
function __() { this.constructor = d; }

tests/baselines/reference/ExportClassWithInaccessibleTypeInTypeParameterConstraint.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ module A {
2626

2727
//// [ExportClassWithInaccessibleTypeInTypeParameterConstraint.js]
2828
var __extends = (this && this.__extends) || (function () {
29-
var extendStatics = Object.setPrototypeOf ||
30-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
31-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
29+
var extendStatics = function (d, b) {
30+
extendStatics = Object.setPrototypeOf ||
31+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
32+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
33+
return extendStatics(d, b);
34+
}
3235
return function (d, b) {
3336
extendStatics(d, b);
3437
function __() { this.constructor = d; }

tests/baselines/reference/abstractClassInLocalScope.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99

1010
//// [abstractClassInLocalScope.js]
1111
var __extends = (this && this.__extends) || (function () {
12-
var extendStatics = Object.setPrototypeOf ||
13-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
14-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
12+
var extendStatics = function (d, b) {
13+
extendStatics = Object.setPrototypeOf ||
14+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
15+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
16+
return extendStatics(d, b);
17+
}
1518
return function (d, b) {
1619
extendStatics(d, b);
1720
function __() { this.constructor = d; }

tests/baselines/reference/abstractClassInLocalScopeIsAbstract.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,12 @@
99

1010
//// [abstractClassInLocalScopeIsAbstract.js]
1111
var __extends = (this && this.__extends) || (function () {
12-
var extendStatics = Object.setPrototypeOf ||
13-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
14-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
12+
var extendStatics = function (d, b) {
13+
extendStatics = Object.setPrototypeOf ||
14+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
15+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
16+
return extendStatics(d, b);
17+
}
1518
return function (d, b) {
1619
extendStatics(d, b);
1720
function __() { this.constructor = d; }

tests/baselines/reference/abstractProperty.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,12 @@ class C extends B {
2323

2424
//// [abstractProperty.js]
2525
var __extends = (this && this.__extends) || (function () {
26-
var extendStatics = Object.setPrototypeOf ||
27-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
28-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
26+
var extendStatics = function (d, b) {
27+
extendStatics = Object.setPrototypeOf ||
28+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
29+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
30+
return extendStatics(d, b);
31+
}
2932
return function (d, b) {
3033
extendStatics(d, b);
3134
function __() { this.constructor = d; }

tests/baselines/reference/abstractPropertyNegative.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,12 @@ abstract class AbstractAccessorMismatch {
4545

4646
//// [abstractPropertyNegative.js]
4747
var __extends = (this && this.__extends) || (function () {
48-
var extendStatics = Object.setPrototypeOf ||
49-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
50-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
48+
var extendStatics = function (d, b) {
49+
extendStatics = Object.setPrototypeOf ||
50+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
51+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
52+
return extendStatics(d, b);
53+
}
5154
return function (d, b) {
5255
extendStatics(d, b);
5356
function __() { this.constructor = d; }

tests/baselines/reference/accessOverriddenBaseClassMember1.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ class ColoredPoint extends Point {
1717

1818
//// [accessOverriddenBaseClassMember1.js]
1919
var __extends = (this && this.__extends) || (function () {
20-
var extendStatics = Object.setPrototypeOf ||
21-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
22-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
20+
var extendStatics = function (d, b) {
21+
extendStatics = Object.setPrototypeOf ||
22+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
23+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
24+
return extendStatics(d, b);
25+
}
2326
return function (d, b) {
2427
extendStatics(d, b);
2528
function __() { this.constructor = d; }

tests/baselines/reference/accessors_spec_section-4.5_inference.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,12 @@ class LanguageSpec_section_4_5_inference {
2626

2727
//// [accessors_spec_section-4.5_inference.js]
2828
var __extends = (this && this.__extends) || (function () {
29-
var extendStatics = Object.setPrototypeOf ||
30-
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
31-
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
29+
var extendStatics = function (d, b) {
30+
extendStatics = Object.setPrototypeOf ||
31+
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
32+
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
33+
return extendStatics(d, b);
34+
}
3235
return function (d, b) {
3336
extendStatics(d, b);
3437
function __() { this.constructor = d; }

0 commit comments

Comments
 (0)