Skip to content

Commit b40b542

Browse files
rbucktonrbuckton
authored
Merge pull request #29676 from NicholasLYang/fixObjectRestEnumeration
Fix object rest enumeration
2 parents 8c07b40 + 61e1009 commit b40b542

File tree

47 files changed

+4034
-3798
lines changed

Some content is hidden

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

47 files changed

+4034
-3798
lines changed

‎src/compiler/transformers/destructuring.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,8 +521,10 @@ namespace ts {
521521
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
522522
t[p] = s[p];
523523
if (s != null && typeof Object.getOwnPropertySymbols === "function")
524-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
525-
t[p[i]] = s[p[i]];
524+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
525+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
526+
t[p[i]] = s[p[i]];
527+
}
526528
return t;
527529
};`
528530
};

‎tests/baselines/reference/asyncFunctionTempVariableScoping.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ var __rest = (this && this.__rest) || function (s, e) {
4545
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
4646
t[p] = s[p];
4747
if (s != null && typeof Object.getOwnPropertySymbols === "function")
48-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
49-
t[p[i]] = s[p[i]];
48+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
49+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
50+
t[p[i]] = s[p[i]];
51+
}
5052
return t;
5153
};
5254
var _this = this;

‎tests/baselines/reference/destructuringAssignmentWithStrictNullChecks.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ var __rest = (this && this.__rest) || function (s, e) {
99
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
1010
t[p] = s[p];
1111
if (s != null && typeof Object.getOwnPropertySymbols === "function")
12-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
13-
t[p[i]] = s[p[i]];
12+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
13+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
14+
t[p[i]] = s[p[i]];
15+
}
1416
return t;
1517
};
1618
var bar;

‎tests/baselines/reference/destructuringInitializerContextualTypeFromContext.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,10 @@ var __rest = (this && this.__rest) || function (s, e) {
4343
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
4444
t[p] = s[p];
4545
if (s != null && typeof Object.getOwnPropertySymbols === "function")
46-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
47-
t[p[i]] = s[p[i]];
46+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
47+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
48+
t[p[i]] = s[p[i]];
49+
}
4850
return t;
4951
};
5052
var Parent = function (_a) {

‎tests/baselines/reference/destructuringObjectBindingPatternAndAssignment5.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ var __rest = (this && this.__rest) || function (s, e) {
1212
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
1313
t[p] = s[p];
1414
if (s != null && typeof Object.getOwnPropertySymbols === "function")
15-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
16-
t[p[i]] = s[p[i]];
15+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
16+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
17+
t[p[i]] = s[p[i]];
18+
}
1719
return t;
1820
};
1921
function a() {

‎tests/baselines/reference/forLoopWithDestructuringDoesNotElideFollowingStatement.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ var __rest = (this && this.__rest) || function (s, e) {
99
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
1010
t[p] = s[p];
1111
if (s != null && typeof Object.getOwnPropertySymbols === "function")
12-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
13-
t[p[i]] = s[p[i]];
12+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
13+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
14+
t[p[i]] = s[p[i]];
15+
}
1416
return t;
1517
};
1618
var array = [{ a: 0, b: 1 }];

‎tests/baselines/reference/genericIsNeverEmptyObject.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ var __rest = (this && this.__rest) || function (s, e) {
2929
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
3030
t[p] = s[p];
3131
if (s != null && typeof Object.getOwnPropertySymbols === "function")
32-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
33-
t[p[i]] = s[p[i]];
32+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
33+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
34+
t[p[i]] = s[p[i]];
35+
}
3436
return t;
3537
};
3638
function test(obj) {

‎tests/baselines/reference/genericObjectRest.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ var __rest = (this && this.__rest) || function (s, e) {
3535
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
3636
t[p] = s[p];
3737
if (s != null && typeof Object.getOwnPropertySymbols === "function")
38-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
39-
t[p[i]] = s[p[i]];
38+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
39+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
40+
t[p[i]] = s[p[i]];
41+
}
4042
return t;
4143
};
4244
const a = 'a';

‎tests/baselines/reference/literalTypeWidening.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,10 @@ var __rest = (this && this.__rest) || function (s, e) {
156156
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
157157
t[p] = s[p];
158158
if (s != null && typeof Object.getOwnPropertySymbols === "function")
159-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
160-
t[p[i]] = s[p[i]];
159+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
160+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
161+
t[p[i]] = s[p[i]];
162+
}
161163
return t;
162164
};
163165
exports.__esModule = true;

‎tests/baselines/reference/mappedTypeConstraints.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ var __rest = (this && this.__rest) || function (s, e) {
4242
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
4343
t[p] = s[p];
4444
if (s != null && typeof Object.getOwnPropertySymbols === "function")
45-
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) if (e.indexOf(p[i]) < 0)
46-
t[p[i]] = s[p[i]];
45+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
46+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
47+
t[p[i]] = s[p[i]];
48+
}
4749
return t;
4850
};
4951
function f0(obj) {

0 commit comments

Comments
 (0)