Skip to content

Commit b36b803

Browse files
weswighamweswigham
authored
Skip default when initially iterating exports in __importStar, same as __exportStar (#38808)
* Skip default when iterating exports in __importStar, same as __exportStar * Accept baselines
1 parent 8e290e5 commit b36b803

21 files changed

+26
-26
lines changed

‎src/compiler/transformers/module/module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1914,7 +1914,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
19141914
var __importStar = (this && this.__importStar) || function (mod) {
19151915
if (mod && mod.__esModule) return mod;
19161916
var result = {};
1917-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
1917+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
19181918
__setModuleDefault(result, mod);
19191919
return result;
19201920
};`

‎tests/baselines/reference/esModuleInterop.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
3535
var __importStar = (this && this.__importStar) || function (mod) {
3636
if (mod && mod.__esModule) return mod;
3737
var result = {};
38-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
38+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3939
__setModuleDefault(result, mod);
4040
return result;
4141
};

‎tests/baselines/reference/esModuleInteropImportCall.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2626
var __importStar = (this && this.__importStar) || function (mod) {
2727
if (mod && mod.__esModule) return mod;
2828
var result = {};
29-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
29+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3030
__setModuleDefault(result, mod);
3131
return result;
3232
};

‎tests/baselines/reference/esModuleInteropImportNamespace.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2727
var __importStar = (this && this.__importStar) || function (mod) {
2828
if (mod && mod.__esModule) return mod;
2929
var result = {};
30-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3131
__setModuleDefault(result, mod);
3232
return result;
3333
};

‎tests/baselines/reference/esModuleInteropNamedDefaultImports.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
4545
var __importStar = (this && this.__importStar) || function (mod) {
4646
if (mod && mod.__esModule) return mod;
4747
var result = {};
48-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
48+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
4949
__setModuleDefault(result, mod);
5050
return result;
5151
};

‎tests/baselines/reference/esModuleInteropPrettyErrorRelatedInformation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2727
var __importStar = (this && this.__importStar) || function (mod) {
2828
if (mod && mod.__esModule) return mod;
2929
var result = {};
30-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3131
__setModuleDefault(result, mod);
3232
return result;
3333
};

‎tests/baselines/reference/esModuleInteropUsesExportStarWhenDefaultPlusNames.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2020
var __importStar = (this && this.__importStar) || function (mod) {
2121
if (mod && mod.__esModule) return mod;
2222
var result = {};
23-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
23+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
2424
__setModuleDefault(result, mod);
2525
return result;
2626
};

‎tests/baselines/reference/esModuleInteropWithExportStar(target=es3).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

‎tests/baselines/reference/esModuleInteropWithExportStar(target=es5).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

‎tests/baselines/reference/esModuleIntersectionCrash.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2929
var __importStar = (this && this.__importStar) || function (mod) {
3030
if (mod && mod.__esModule) return mod;
3131
var result = {};
32-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
32+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3333
__setModuleDefault(result, mod);
3434
return result;
3535
};

‎tests/baselines/reference/exportAsNamespace2(module=amd).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
4747
var __importStar = (this && this.__importStar) || function (mod) {
4848
if (mod && mod.__esModule) return mod;
4949
var result = {};
50-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
50+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
5151
__setModuleDefault(result, mod);
5252
return result;
5353
};

‎tests/baselines/reference/exportAsNamespace2(module=commonjs).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
3838
var __importStar = (this && this.__importStar) || function (mod) {
3939
if (mod && mod.__esModule) return mod;
4040
var result = {};
41-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
41+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
4242
__setModuleDefault(result, mod);
4343
return result;
4444
};
@@ -63,7 +63,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
6363
var __importStar = (this && this.__importStar) || function (mod) {
6464
if (mod && mod.__esModule) return mod;
6565
var result = {};
66-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
66+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
6767
__setModuleDefault(result, mod);
6868
return result;
6969
};

‎tests/baselines/reference/exportAsNamespace2(module=umd).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
4747
var __importStar = (this && this.__importStar) || function (mod) {
4848
if (mod && mod.__esModule) return mod;
4949
var result = {};
50-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
50+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
5151
__setModuleDefault(result, mod);
5252
return result;
5353
};
@@ -82,7 +82,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
8282
var __importStar = (this && this.__importStar) || function (mod) {
8383
if (mod && mod.__esModule) return mod;
8484
var result = {};
85-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
85+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
8686
__setModuleDefault(result, mod);
8787
return result;
8888
};

‎tests/baselines/reference/exportAsNamespace3(module=amd).js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
5353
var __importStar = (this && this.__importStar) || function (mod) {
5454
if (mod && mod.__esModule) return mod;
5555
var result = {};
56-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
56+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
5757
__setModuleDefault(result, mod);
5858
return result;
5959
};

‎tests/baselines/reference/exportAsNamespace3(module=commonjs).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
4141
var __importStar = (this && this.__importStar) || function (mod) {
4242
if (mod && mod.__esModule) return mod;
4343
var result = {};
44-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
44+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
4545
__setModuleDefault(result, mod);
4646
return result;
4747
};
@@ -69,7 +69,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
6969
var __importStar = (this && this.__importStar) || function (mod) {
7070
if (mod && mod.__esModule) return mod;
7171
var result = {};
72-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
72+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
7373
__setModuleDefault(result, mod);
7474
return result;
7575
};

‎tests/baselines/reference/exportAsNamespace3(module=umd).js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
5050
var __importStar = (this && this.__importStar) || function (mod) {
5151
if (mod && mod.__esModule) return mod;
5252
var result = {};
53-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
53+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
5454
__setModuleDefault(result, mod);
5555
return result;
5656
};
@@ -88,7 +88,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
8888
var __importStar = (this && this.__importStar) || function (mod) {
8989
if (mod && mod.__esModule) return mod;
9090
var result = {};
91-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
91+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
9292
__setModuleDefault(result, mod);
9393
return result;
9494
};

‎tests/baselines/reference/exportAsNamespace_exportAssignment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
2727
var __importStar = (this && this.__importStar) || function (mod) {
2828
if (mod && mod.__esModule) return mod;
2929
var result = {};
30-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
30+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3131
__setModuleDefault(result, mod);
3232
return result;
3333
};

‎tests/baselines/reference/exportDefault.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
5959
var __importStar = (this && this.__importStar) || function (mod) {
6060
if (mod && mod.__esModule) return mod;
6161
var result = {};
62-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
62+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
6363
__setModuleDefault(result, mod);
6464
return result;
6565
};
@@ -92,7 +92,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
9292
var __importStar = (this && this.__importStar) || function (mod) {
9393
if (mod && mod.__esModule) return mod;
9494
var result = {};
95-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
95+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
9696
__setModuleDefault(result, mod);
9797
return result;
9898
};

‎tests/baselines/reference/importEquals1.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
5858
var __importStar = (this && this.__importStar) || function (mod) {
5959
if (mod && mod.__esModule) return mod;
6060
var result = {};
61-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
61+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
6262
__setModuleDefault(result, mod);
6363
return result;
6464
};

‎tests/baselines/reference/importEquals2.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
3838
var __importStar = (this && this.__importStar) || function (mod) {
3939
if (mod && mod.__esModule) return mod;
4040
var result = {};
41-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
41+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
4242
__setModuleDefault(result, mod);
4343
return result;
4444
};

‎tests/baselines/reference/tsbuild/sample1/incremental-declaration-changes/when-esModuleInterop-option-changes.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
3434
var __importStar = (this && this.__importStar) || function (mod) {
3535
if (mod && mod.__esModule) return mod;
3636
var result = {};
37-
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
37+
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
3838
__setModuleDefault(result, mod);
3939
return result;
4040
};

0 commit comments

Comments
 (0)