Skip to content

Commit c0ef09c

Browse files
andrewbranchandrewbranch
authored
Fix esModuleInterop default in --module node18 (#1748)
1 parent 914791e commit c0ef09c

File tree

101 files changed

+1142
-2155
lines changed

Some content is hidden

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

101 files changed

+1142
-2155
lines changed

‎internal/core/compileroptions.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func (options *CompilerOptions) GetESModuleInterop() bool {
254254
return options.ESModuleInterop == TSTrue
255255
}
256256
switch options.GetEmitModuleKind() {
257-
case ModuleKindNode16, ModuleKindNodeNext, ModuleKindPreserve:
257+
case ModuleKindNode16, ModuleKindNode18, ModuleKindNodeNext, ModuleKindPreserve:
258258
return true
259259
}
260260
return false

‎testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,39 @@ p.thing();
1414

1515
//// [index.js]
1616
"use strict";
17+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18+
if (k2 === undefined) k2 = k;
19+
var desc = Object.getOwnPropertyDescriptor(m, k);
20+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
21+
desc = { enumerable: true, get: function() { return m[k]; } };
22+
}
23+
Object.defineProperty(o, k2, desc);
24+
}) : (function(o, m, k, k2) {
25+
if (k2 === undefined) k2 = k;
26+
o[k2] = m[k];
27+
}));
28+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
29+
Object.defineProperty(o, "default", { enumerable: true, value: v });
30+
}) : function(o, v) {
31+
o["default"] = v;
32+
});
33+
var __importStar = (this && this.__importStar) || (function () {
34+
var ownKeys = function(o) {
35+
ownKeys = Object.getOwnPropertyNames || function (o) {
36+
var ar = [];
37+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
38+
return ar;
39+
};
40+
return ownKeys(o);
41+
};
42+
return function (mod) {
43+
if (mod && mod.__esModule) return mod;
44+
var result = {};
45+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
46+
__setModuleDefault(result, mod);
47+
return result;
48+
};
49+
})();
1750
Object.defineProperty(exports, "__esModule", { value: true });
18-
const p = require("pkg");
51+
const p = __importStar(require("pkg"));
1952
p.thing();

‎testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js.diff‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,39 @@ p.thing();
1414

1515
//// [index.js]
1616
"use strict";
17+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18+
if (k2 === undefined) k2 = k;
19+
var desc = Object.getOwnPropertyDescriptor(m, k);
20+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
21+
desc = { enumerable: true, get: function() { return m[k]; } };
22+
}
23+
Object.defineProperty(o, k2, desc);
24+
}) : (function(o, m, k, k2) {
25+
if (k2 === undefined) k2 = k;
26+
o[k2] = m[k];
27+
}));
28+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
29+
Object.defineProperty(o, "default", { enumerable: true, value: v });
30+
}) : function(o, v) {
31+
o["default"] = v;
32+
});
33+
var __importStar = (this && this.__importStar) || (function () {
34+
var ownKeys = function(o) {
35+
ownKeys = Object.getOwnPropertyNames || function (o) {
36+
var ar = [];
37+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
38+
return ar;
39+
};
40+
return ownKeys(o);
41+
};
42+
return function (mod) {
43+
if (mod && mod.__esModule) return mod;
44+
var result = {};
45+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
46+
__setModuleDefault(result, mod);
47+
return result;
48+
};
49+
})();
1750
Object.defineProperty(exports, "__esModule", { value: true });
18-
const p = require("pkg");
51+
const p = __importStar(require("pkg"));
1952
p.thing();

‎testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js.diff‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,39 @@ const importStarTestA: typeC.otherType = "expect error about otherType";
3434

3535
//// [arbitraryModuleNamespaceIdentifiers_module.js]
3636
"use strict";
37+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
38+
if (k2 === undefined) k2 = k;
39+
var desc = Object.getOwnPropertyDescriptor(m, k);
40+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
41+
desc = { enumerable: true, get: function() { return m[k]; } };
42+
}
43+
Object.defineProperty(o, k2, desc);
44+
}) : (function(o, m, k, k2) {
45+
if (k2 === undefined) k2 = k;
46+
o[k2] = m[k];
47+
}));
48+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
49+
Object.defineProperty(o, "default", { enumerable: true, value: v });
50+
}) : function(o, v) {
51+
o["default"] = v;
52+
});
53+
var __importStar = (this && this.__importStar) || (function () {
54+
var ownKeys = function(o) {
55+
ownKeys = Object.getOwnPropertyNames || function (o) {
56+
var ar = [];
57+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
58+
return ar;
59+
};
60+
return ownKeys(o);
61+
};
62+
return function (mod) {
63+
if (mod && mod.__esModule) return mod;
64+
var result = {};
65+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
66+
__setModuleDefault(result, mod);
67+
return result;
68+
};
69+
})();
3770
Object.defineProperty(exports, "__esModule", { value: true });
3871
exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
3972
const someValue = "someValue";
@@ -46,7 +79,7 @@ Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { ret
4679
const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
4780
if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
4881
throw "should be someValue";
49-
exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
82+
exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
5083
const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
5184
if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
5285
throw "should be someValue";

‎testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js.diff‎

Lines changed: 2 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,11 @@
11
--- old.arbitraryModuleNamespaceIdentifiers_module(module=node18).js
22
+++ new.arbitraryModuleNamespaceIdentifiers_module(module=node18).js
3-
@@= skipped -33, +33 lines =@@
4-
5-
//// [arbitraryModuleNamespaceIdentifiers_module.js]
6-
"use strict";
7-
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
8-
- if (k2 === undefined) k2 = k;
9-
- var desc = Object.getOwnPropertyDescriptor(m, k);
10-
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
11-
- desc = { enumerable: true, get: function() { return m[k]; } };
12-
- }
13-
- Object.defineProperty(o, k2, desc);
14-
-}) : (function(o, m, k, k2) {
15-
- if (k2 === undefined) k2 = k;
16-
- o[k2] = m[k];
17-
-}));
18-
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
19-
- Object.defineProperty(o, "default", { enumerable: true, value: v });
20-
-}) : function(o, v) {
21-
- o["default"] = v;
22-
-});
23-
-var __importStar = (this && this.__importStar) || (function () {
24-
- var ownKeys = function(o) {
25-
- ownKeys = Object.getOwnPropertyNames || function (o) {
26-
- var ar = [];
27-
- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
28-
- return ar;
29-
- };
30-
- return ownKeys(o);
31-
- };
32-
- return function (mod) {
33-
- if (mod && mod.__esModule) return mod;
34-
- var result = {};
35-
- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
36-
- __setModuleDefault(result, mod);
37-
- return result;
38-
- };
39-
-})();
40-
Object.defineProperty(exports, "__esModule", { value: true });
41-
exports["<Z>"] = exports["<Y>"] = exports["<X>"] = void 0;
42-
const someValue = "someValue";
43-
@@= skipped -40, +7 lines =@@
3+
@@= skipped -73, +73 lines =@@
444
const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module");
455
if (arbitraryModuleNamespaceIdentifiers_module_1["<X>"] !== "someValue")
466
throw "should be someValue";
477
-var arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
488
+const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module");
499
Object.defineProperty(exports, "<Y>", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2["<X>"]; } });
5010
const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module");
51-
if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")
52-
throw "should be someValue";
53-
-exports["<Z>"] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module"));
54-
+exports["<Z>"] = require("./arbitraryModuleNamespaceIdentifiers_module");
55-
const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module");
56-
if (arbitraryModuleNamespaceIdentifiers_module_4["<Z>"]["<X>"] !== "someValue")
57-
throw "should be someValue";
11+
if (arbitraryModuleNamespaceIdentifiers_module_3["<Y>"] !== "someValue")

‎testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,42 @@ import * as self from "package";
3030
self;
3131
//// [index.cjs]
3232
"use strict";
33+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
34+
if (k2 === undefined) k2 = k;
35+
var desc = Object.getOwnPropertyDescriptor(m, k);
36+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
37+
desc = { enumerable: true, get: function() { return m[k]; } };
38+
}
39+
Object.defineProperty(o, k2, desc);
40+
}) : (function(o, m, k, k2) {
41+
if (k2 === undefined) k2 = k;
42+
o[k2] = m[k];
43+
}));
44+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
45+
Object.defineProperty(o, "default", { enumerable: true, value: v });
46+
}) : function(o, v) {
47+
o["default"] = v;
48+
});
49+
var __importStar = (this && this.__importStar) || (function () {
50+
var ownKeys = function(o) {
51+
ownKeys = Object.getOwnPropertyNames || function (o) {
52+
var ar = [];
53+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
54+
return ar;
55+
};
56+
return ownKeys(o);
57+
};
58+
return function (mod) {
59+
if (mod && mod.__esModule) return mod;
60+
var result = {};
61+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
62+
__setModuleDefault(result, mod);
63+
return result;
64+
};
65+
})();
3366
Object.defineProperty(exports, "__esModule", { value: true });
3467
// esm format file
35-
const self = require("package");
68+
const self = __importStar(require("package"));
3669
self;
3770

3871

‎testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js.diff‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

0 commit comments

Comments
 (0)