diff --git a/internal/core/compileroptions.go b/internal/core/compileroptions.go index 1771cac83b..35e0600f57 100644 --- a/internal/core/compileroptions.go +++ b/internal/core/compileroptions.go @@ -254,7 +254,7 @@ func (options *CompilerOptions) GetESModuleInterop() bool { return options.ESModuleInterop == TSTrue } switch options.GetEmitModuleKind() { - case ModuleKindNode16, ModuleKindNodeNext, ModuleKindPreserve: + case ModuleKindNode16, ModuleKindNode18, ModuleKindNodeNext, ModuleKindPreserve: return true } return false diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js index 92b7e88696..2d0c7b4607 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js @@ -14,6 +14,39 @@ p.thing(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const p = require("pkg"); +const p = __importStar(require("pkg")); p.thing(); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js.diff deleted file mode 100644 index ea0dd073c6..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=node16).js.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- old.moduleResolutionWithModule(module=node18,moduleresolution=node16).js -+++ new.moduleResolutionWithModule(module=node18,moduleresolution=node16).js -@@= skipped -13, +13 lines =@@ - - //// [index.js] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); --const p = __importStar(require("pkg")); -+const p = require("pkg"); - p.thing(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js index 92b7e88696..2d0c7b4607 100644 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js +++ b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js @@ -14,6 +14,39 @@ p.thing(); //// [index.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); -const p = require("pkg"); +const p = __importStar(require("pkg")); p.thing(); diff --git a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js.diff b/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js.diff deleted file mode 100644 index 2665e6647c..0000000000 --- a/testdata/baselines/reference/submodule/compiler/moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js.diff +++ /dev/null @@ -1,43 +0,0 @@ ---- old.moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js -+++ new.moduleResolutionWithModule(module=node18,moduleresolution=nodenext).js -@@= skipped -13, +13 lines =@@ - - //// [index.js] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); --const p = __importStar(require("pkg")); -+const p = require("pkg"); - p.thing(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js index d01954f66b..3c4b1a08c3 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js @@ -34,6 +34,39 @@ const importStarTestA: typeC.otherType = "expect error about otherType"; //// [arbitraryModuleNamespaceIdentifiers_module.js] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports[""] = exports[""] = exports[""] = void 0; const someValue = "someValue"; @@ -46,7 +79,7 @@ Object.defineProperty(exports, "", { enumerable: true, get: function () { ret const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_3[""] !== "someValue") throw "should be someValue"; -exports[""] = require("./arbitraryModuleNamespaceIdentifiers_module"); +exports[""] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module")); const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_4[""][""] !== "someValue") throw "should be someValue"; diff --git a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js.diff index e7b1cb55e9..1abf5f9675 100644 --- a/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/arbitraryModuleNamespaceIdentifiers_module(module=node18).js.diff @@ -1,46 +1,6 @@ --- old.arbitraryModuleNamespaceIdentifiers_module(module=node18).js +++ new.arbitraryModuleNamespaceIdentifiers_module(module=node18).js -@@= skipped -33, +33 lines =@@ - - //// [arbitraryModuleNamespaceIdentifiers_module.js] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - exports[""] = exports[""] = exports[""] = void 0; - const someValue = "someValue"; -@@= skipped -40, +7 lines =@@ +@@= skipped -73, +73 lines =@@ const arbitraryModuleNamespaceIdentifiers_module_1 = require("./arbitraryModuleNamespaceIdentifiers_module"); if (arbitraryModuleNamespaceIdentifiers_module_1[""] !== "someValue") throw "should be someValue"; @@ -48,10 +8,4 @@ +const arbitraryModuleNamespaceIdentifiers_module_2 = require("./arbitraryModuleNamespaceIdentifiers_module"); Object.defineProperty(exports, "", { enumerable: true, get: function () { return arbitraryModuleNamespaceIdentifiers_module_2[""]; } }); const arbitraryModuleNamespaceIdentifiers_module_3 = require("./arbitraryModuleNamespaceIdentifiers_module"); - if (arbitraryModuleNamespaceIdentifiers_module_3[""] !== "someValue") - throw "should be someValue"; --exports[""] = __importStar(require("./arbitraryModuleNamespaceIdentifiers_module")); -+exports[""] = require("./arbitraryModuleNamespaceIdentifiers_module"); - const arbitraryModuleNamespaceIdentifiers_module_4 = require("./arbitraryModuleNamespaceIdentifiers_module"); - if (arbitraryModuleNamespaceIdentifiers_module_4[""][""] !== "someValue") - throw "should be someValue"; \ No newline at end of file + if (arbitraryModuleNamespaceIdentifiers_module_3[""] !== "someValue") \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js index dec5d49ea5..1498e98d79 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js @@ -30,9 +30,42 @@ import * as self from "package"; self; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const self = require("package"); +const self = __importStar(require("package")); self; diff --git a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js.diff deleted file mode 100644 index a617204d98..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeAllowJsPackageSelfName(module=node18).js.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- old.nodeAllowJsPackageSelfName(module=node18).js -+++ new.nodeAllowJsPackageSelfName(module=node18).js -@@= skipped -29, +29 lines =@@ - self; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const self = __importStar(require("package")); -+const self = require("package"); - self; - diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js index 53ef354c42..4806948856 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js @@ -373,33 +373,66 @@ const x = 1; exports.x = x; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; // ESM-format imports below should issue errors -const m1 = require("./index.js"); -const m2 = require("./index.mjs"); -const m3 = require("./index.cjs"); -const m4 = require("./subfolder/index.js"); -const m5 = require("./subfolder/index.mjs"); -const m6 = require("./subfolder/index.cjs"); -const m7 = require("./subfolder2/index.js"); -const m8 = require("./subfolder2/index.mjs"); -const m9 = require("./subfolder2/index.cjs"); -const m10 = require("./subfolder2/another/index.js"); -const m11 = require("./subfolder2/another/index.mjs"); -const m12 = require("./subfolder2/another/index.cjs"); +const m1 = __importStar(require("./index.js")); +const m2 = __importStar(require("./index.mjs")); +const m3 = __importStar(require("./index.cjs")); +const m4 = __importStar(require("./subfolder/index.js")); +const m5 = __importStar(require("./subfolder/index.mjs")); +const m6 = __importStar(require("./subfolder/index.cjs")); +const m7 = __importStar(require("./subfolder2/index.js")); +const m8 = __importStar(require("./subfolder2/index.mjs")); +const m9 = __importStar(require("./subfolder2/index.cjs")); +const m10 = __importStar(require("./subfolder2/another/index.js")); +const m11 = __importStar(require("./subfolder2/another/index.mjs")); +const m12 = __importStar(require("./subfolder2/another/index.cjs")); // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file) -const m13 = require("./"); -const m14 = require("./index"); -const m15 = require("./subfolder"); -const m16 = require("./subfolder/"); -const m17 = require("./subfolder/index"); -const m18 = require("./subfolder2"); -const m19 = require("./subfolder2/"); -const m20 = require("./subfolder2/index"); -const m21 = require("./subfolder2/another"); -const m22 = require("./subfolder2/another/"); -const m23 = require("./subfolder2/another/index"); +const m13 = __importStar(require("./")); +const m14 = __importStar(require("./index")); +const m15 = __importStar(require("./subfolder")); +const m16 = __importStar(require("./subfolder/")); +const m17 = __importStar(require("./subfolder/index")); +const m18 = __importStar(require("./subfolder2")); +const m19 = __importStar(require("./subfolder2/")); +const m20 = __importStar(require("./subfolder2/index")); +const m21 = __importStar(require("./subfolder2/another")); +const m22 = __importStar(require("./subfolder2/another/")); +const m23 = __importStar(require("./subfolder2/another/index")); void m1; void m2; void m3; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js.diff index 4bad96ec43..b24928753d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModules1(module=node18).js.diff @@ -1,96 +1,6 @@ --- old.nodeModules1(module=node18).js +++ new.nodeModules1(module=node18).js -@@= skipped -372, +372 lines =@@ - exports.x = x; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - exports.x = void 0; - // ESM-format imports below should issue errors --const m1 = __importStar(require("./index.js")); --const m2 = __importStar(require("./index.mjs")); --const m3 = __importStar(require("./index.cjs")); --const m4 = __importStar(require("./subfolder/index.js")); --const m5 = __importStar(require("./subfolder/index.mjs")); --const m6 = __importStar(require("./subfolder/index.cjs")); --const m7 = __importStar(require("./subfolder2/index.js")); --const m8 = __importStar(require("./subfolder2/index.mjs")); --const m9 = __importStar(require("./subfolder2/index.cjs")); --const m10 = __importStar(require("./subfolder2/another/index.js")); --const m11 = __importStar(require("./subfolder2/another/index.mjs")); --const m12 = __importStar(require("./subfolder2/another/index.cjs")); -+const m1 = require("./index.js"); -+const m2 = require("./index.mjs"); -+const m3 = require("./index.cjs"); -+const m4 = require("./subfolder/index.js"); -+const m5 = require("./subfolder/index.mjs"); -+const m6 = require("./subfolder/index.cjs"); -+const m7 = require("./subfolder2/index.js"); -+const m8 = require("./subfolder2/index.mjs"); -+const m9 = require("./subfolder2/index.cjs"); -+const m10 = require("./subfolder2/another/index.js"); -+const m11 = require("./subfolder2/another/index.mjs"); -+const m12 = require("./subfolder2/another/index.cjs"); - // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file) --const m13 = __importStar(require("./")); --const m14 = __importStar(require("./index")); --const m15 = __importStar(require("./subfolder")); --const m16 = __importStar(require("./subfolder/")); --const m17 = __importStar(require("./subfolder/index")); --const m18 = __importStar(require("./subfolder2")); --const m19 = __importStar(require("./subfolder2/")); --const m20 = __importStar(require("./subfolder2/index")); --const m21 = __importStar(require("./subfolder2/another")); --const m22 = __importStar(require("./subfolder2/another/")); --const m23 = __importStar(require("./subfolder2/another/index")); -+const m13 = require("./"); -+const m14 = require("./index"); -+const m15 = require("./subfolder"); -+const m16 = require("./subfolder/"); -+const m17 = require("./subfolder/index"); -+const m18 = require("./subfolder2"); -+const m19 = require("./subfolder2/"); -+const m20 = require("./subfolder2/index"); -+const m21 = require("./subfolder2/another"); -+const m22 = require("./subfolder2/another/"); -+const m23 = require("./subfolder2/another/index"); - void m1; - void m2; - void m3; -@@= skipped -300, +267 lines =@@ +@@= skipped -672, +672 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js index fb40dfae97..3ce5147557 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js @@ -373,33 +373,66 @@ const x = 1; export { x }; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.x = void 0; // ESM-format imports below should issue errors -const m1 = require("./index.js"); -const m2 = require("./index.mjs"); -const m3 = require("./index.cjs"); -const m4 = require("./subfolder/index.js"); -const m5 = require("./subfolder/index.mjs"); -const m6 = require("./subfolder/index.cjs"); -const m7 = require("./subfolder2/index.js"); -const m8 = require("./subfolder2/index.mjs"); -const m9 = require("./subfolder2/index.cjs"); -const m10 = require("./subfolder2/another/index.js"); -const m11 = require("./subfolder2/another/index.mjs"); -const m12 = require("./subfolder2/another/index.cjs"); +const m1 = __importStar(require("./index.js")); +const m2 = __importStar(require("./index.mjs")); +const m3 = __importStar(require("./index.cjs")); +const m4 = __importStar(require("./subfolder/index.js")); +const m5 = __importStar(require("./subfolder/index.mjs")); +const m6 = __importStar(require("./subfolder/index.cjs")); +const m7 = __importStar(require("./subfolder2/index.js")); +const m8 = __importStar(require("./subfolder2/index.mjs")); +const m9 = __importStar(require("./subfolder2/index.cjs")); +const m10 = __importStar(require("./subfolder2/another/index.js")); +const m11 = __importStar(require("./subfolder2/another/index.mjs")); +const m12 = __importStar(require("./subfolder2/another/index.cjs")); // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file) -const m13 = require("./"); -const m14 = require("./index"); -const m15 = require("./subfolder"); -const m16 = require("./subfolder/"); -const m17 = require("./subfolder/index"); -const m18 = require("./subfolder2"); -const m19 = require("./subfolder2/"); -const m20 = require("./subfolder2/index"); -const m21 = require("./subfolder2/another"); -const m22 = require("./subfolder2/another/"); -const m23 = require("./subfolder2/another/index"); +const m13 = __importStar(require("./")); +const m14 = __importStar(require("./index")); +const m15 = __importStar(require("./subfolder")); +const m16 = __importStar(require("./subfolder/")); +const m17 = __importStar(require("./subfolder/index")); +const m18 = __importStar(require("./subfolder2")); +const m19 = __importStar(require("./subfolder2/")); +const m20 = __importStar(require("./subfolder2/index")); +const m21 = __importStar(require("./subfolder2/another")); +const m22 = __importStar(require("./subfolder2/another/")); +const m23 = __importStar(require("./subfolder2/another/index")); void m1; void m2; void m3; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js.diff index 546ae3167c..9c35f7212d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJs1(module=node18).js.diff @@ -1,96 +1,6 @@ --- old.nodeModulesAllowJs1(module=node18).js +++ new.nodeModulesAllowJs1(module=node18).js -@@= skipped -372, +372 lines =@@ - export { x }; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - exports.x = void 0; - // ESM-format imports below should issue errors --const m1 = __importStar(require("./index.js")); --const m2 = __importStar(require("./index.mjs")); --const m3 = __importStar(require("./index.cjs")); --const m4 = __importStar(require("./subfolder/index.js")); --const m5 = __importStar(require("./subfolder/index.mjs")); --const m6 = __importStar(require("./subfolder/index.cjs")); --const m7 = __importStar(require("./subfolder2/index.js")); --const m8 = __importStar(require("./subfolder2/index.mjs")); --const m9 = __importStar(require("./subfolder2/index.cjs")); --const m10 = __importStar(require("./subfolder2/another/index.js")); --const m11 = __importStar(require("./subfolder2/another/index.mjs")); --const m12 = __importStar(require("./subfolder2/another/index.cjs")); -+const m1 = require("./index.js"); -+const m2 = require("./index.mjs"); -+const m3 = require("./index.cjs"); -+const m4 = require("./subfolder/index.js"); -+const m5 = require("./subfolder/index.mjs"); -+const m6 = require("./subfolder/index.cjs"); -+const m7 = require("./subfolder2/index.js"); -+const m8 = require("./subfolder2/index.mjs"); -+const m9 = require("./subfolder2/index.cjs"); -+const m10 = require("./subfolder2/another/index.js"); -+const m11 = require("./subfolder2/another/index.mjs"); -+const m12 = require("./subfolder2/another/index.cjs"); - // The next ones should _mostly_ work - cjs format files have index resolution and extension resolution (except for those which resolve to an esm format file) --const m13 = __importStar(require("./")); --const m14 = __importStar(require("./index")); --const m15 = __importStar(require("./subfolder")); --const m16 = __importStar(require("./subfolder/")); --const m17 = __importStar(require("./subfolder/index")); --const m18 = __importStar(require("./subfolder2")); --const m19 = __importStar(require("./subfolder2/")); --const m20 = __importStar(require("./subfolder2/index")); --const m21 = __importStar(require("./subfolder2/another")); --const m22 = __importStar(require("./subfolder2/another/")); --const m23 = __importStar(require("./subfolder2/another/index")); -+const m13 = require("./"); -+const m14 = require("./index"); -+const m15 = require("./subfolder"); -+const m16 = require("./subfolder/"); -+const m17 = require("./subfolder/index"); -+const m18 = require("./subfolder2"); -+const m19 = require("./subfolder2/"); -+const m20 = require("./subfolder2/index"); -+const m21 = require("./subfolder2/another"); -+const m22 = require("./subfolder2/another/"); -+const m23 = require("./subfolder2/another/index"); - void m1; - void m2; - void m3; -@@= skipped -300, +267 lines =@@ +@@= skipped -672, +672 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js index 63608c6079..2f99e51c4c 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js @@ -157,18 +157,51 @@ typei.mjsSource; ts.mjsSource; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjs = require("package/cjs"); -const mjs = require("package/mjs"); -const type = require("package"); +const cjs = __importStar(require("package/cjs")); +const mjs = __importStar(require("package/mjs")); +const type = __importStar(require("package")); cjs; mjs; type; -const cjsi = require("inner/a"); -const mjsi = require("inner/b"); -const typei = require("inner"); -const ts = require("inner/types"); +const cjsi = __importStar(require("inner/a")); +const mjsi = __importStar(require("inner/b")); +const typei = __importStar(require("inner")); +const ts = __importStar(require("inner/types")); cjsi.cjsSource; mjsi.cjsSource; typei.implicitCjsSource; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js.diff index 9d4af863a7..67f41a0a18 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsConditionalPackageExports(module=node18).js.diff @@ -23,63 +23,7 @@ //// [index.mjs] // esm format file import * as cjs from "package/cjs"; -@@= skipped -18, +34 lines =@@ - ts.mjsSource; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjs = __importStar(require("package/cjs")); --const mjs = __importStar(require("package/mjs")); --const type = __importStar(require("package")); -+const cjs = require("package/cjs"); -+const mjs = require("package/mjs"); -+const type = require("package"); - cjs; - mjs; - type; --const cjsi = __importStar(require("inner/a")); --const mjsi = __importStar(require("inner/b")); --const typei = __importStar(require("inner")); --const ts = __importStar(require("inner/types")); -+const cjsi = require("inner/a"); -+const mjsi = require("inner/b"); -+const typei = require("inner"); -+const ts = require("inner/types"); - cjsi.cjsSource; +@@= skipped -67, +83 lines =@@ mjsi.cjsSource; typei.implicitCjsSource; ts.cjsSource; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js index a2dd953a21..a30d220227 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js @@ -32,10 +32,11 @@ declare module "tslib" { //// [index.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = require("tslib"); // cjs format file -const fs_1 = require("fs"); +const fs_1 = tslib_1.__importDefault(require("fs")); fs_1.default.readFile; -const fs = require("fs"); +const fs = tslib_1.__importStar(require("fs")); fs.readFile; //// [index.js] // esm format file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js.diff deleted file mode 100644 index fa913e9ede..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions1(module=node18).js.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.nodeModulesAllowJsImportHelpersCollisions1(module=node18).js -+++ new.nodeModulesAllowJsImportHelpersCollisions1(module=node18).js -@@= skipped -31, +31 lines =@@ - //// [index.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // cjs format file --const fs_1 = tslib_1.__importDefault(require("fs")); -+const fs_1 = require("fs"); - fs_1.default.readFile; --const fs = tslib_1.__importStar(require("fs")); -+const fs = require("fs"); - fs.readFile; - //// [index.js] - // esm format file \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js index 64405d2cb8..2cfc0e98c6 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js @@ -32,7 +32,7 @@ exports.fs = void 0; const tslib_1 = require("tslib"); // cjs format file tslib_1.__exportStar(require("fs"), exports); -exports.fs = require("fs"); +exports.fs = tslib_1.__importStar(require("fs")); //// [index.js] // esm format file export * from "fs"; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js.diff index 2e51e5d0c7..5bb394090c 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions2(module=node18).js.diff @@ -1,15 +1,6 @@ --- old.nodeModulesAllowJsImportHelpersCollisions2(module=node18).js +++ new.nodeModulesAllowJsImportHelpersCollisions2(module=node18).js -@@= skipped -31, +31 lines =@@ - const tslib_1 = require("tslib"); - // cjs format file - tslib_1.__exportStar(require("fs"), exports); --exports.fs = tslib_1.__importStar(require("fs")); -+exports.fs = require("fs"); - //// [index.js] - // esm format file - export * from "fs"; -@@= skipped -8, +8 lines =@@ +@@= skipped -39, +39 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js index 878a995831..d6f712d5f9 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js @@ -31,11 +31,12 @@ declare module "tslib" { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.baz = exports.foo = exports.default = void 0; +const tslib_1 = require("tslib"); // cjs format file const fs_1 = require("fs"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return fs_1.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); const fs_2 = require("fs"); -Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return fs_2.default; } }); +Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_2).default; } }); const fs_3 = require("fs"); Object.defineProperty(exports, "baz", { enumerable: true, get: function () { return fs_3.bar; } }); //// [index.js] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js.diff index 4aace85945..97d2c6cc29 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsImportHelpersCollisions3(module=node18).js.diff @@ -5,21 +5,20 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.baz = exports.foo = exports.default = void 0; -var tslib_1 = require("tslib"); ++const tslib_1 = require("tslib"); // cjs format file -var fs_1 = require("fs"); --Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); --var fs_2 = require("fs"); --Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_2).default; } }); --var fs_3 = require("fs"); +const fs_1 = require("fs"); -+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return fs_1.default; } }); + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); +-var fs_2 = require("fs"); +const fs_2 = require("fs"); -+Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return fs_2.default; } }); + Object.defineProperty(exports, "foo", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_2).default; } }); +-var fs_3 = require("fs"); +const fs_3 = require("fs"); Object.defineProperty(exports, "baz", { enumerable: true, get: function () { return fs_3.bar; } }); //// [index.js] // esm format file -@@= skipped -16, +15 lines =@@ +@@= skipped -16, +16 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js index 71df78c720..817ed97973 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js @@ -118,17 +118,50 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjs = require("package/cjs"); -const mjs = require("package/mjs"); -const type = require("package"); +const cjs = __importStar(require("package/cjs")); +const mjs = __importStar(require("package/mjs")); +const type = __importStar(require("package")); cjs; mjs; type; -const cjsi = require("inner/cjs"); -const mjsi = require("inner/mjs"); -const typei = require("inner"); +const cjsi = __importStar(require("inner/cjs")); +const mjsi = __importStar(require("inner/mjs")); +const typei = __importStar(require("inner")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js.diff index 26dc4e113f..8db327a4a4 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageExports(module=node18).js.diff @@ -21,57 +21,10 @@ //// [index.mjs] // esm format file import * as cjs from "package/cjs"; -@@= skipped -16, +30 lines =@@ +@@= skipped -63, +77 lines =@@ + cjsi; + mjsi; typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjs = __importStar(require("package/cjs")); --const mjs = __importStar(require("package/mjs")); --const type = __importStar(require("package")); --cjs; --mjs; --type; --const cjsi = __importStar(require("inner/cjs")); --const mjsi = __importStar(require("inner/mjs")); --const typei = __importStar(require("inner")); --cjsi; --mjsi; --typei; -//// [index.js] -// esm format file -import * as cjs from "package/cjs"; @@ -88,18 +41,6 @@ -typei; - - -+const cjs = require("package/cjs"); -+const mjs = require("package/mjs"); -+const type = require("package"); -+cjs; -+mjs; -+type; -+const cjsi = require("inner/cjs"); -+const mjsi = require("inner/mjs"); -+const typei = require("inner"); -+cjsi; -+mjsi; -+typei; + + +//// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js index f6dffbaa4d..ca3aa0ac43 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js @@ -55,11 +55,44 @@ mjs; type; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const cjs = require("#cjs"); -const mjs = require("#mjs"); -const type = require("#type"); +const cjs = __importStar(require("#cjs")); +const mjs = __importStar(require("#mjs")); +const type = __importStar(require("#type")); cjs; mjs; type; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js.diff index 2b0d5022be..0043c07f94 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackageImports(module=node18).js.diff @@ -15,51 +15,10 @@ //// [index.mjs] // esm format file import * as cjs from "#cjs"; -@@= skipped -10, +18 lines =@@ +@@= skipped -51, +59 lines =@@ + cjs; + mjs; type; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const cjs = __importStar(require("#cjs")); --const mjs = __importStar(require("#mjs")); --const type = __importStar(require("#type")); --cjs; --mjs; --type; -//// [index.js] -// esm format file -import * as cjs from "#cjs"; @@ -70,12 +29,6 @@ -type; - - -+const cjs = require("#cjs"); -+const mjs = require("#mjs"); -+const type = require("#type"); -+cjs; -+mjs; -+type; + + +//// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js index 2730cdb510..0c82c6e77b 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js @@ -84,11 +84,44 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/index"); -const mjsi = require("inner/mjs/index"); -const typei = require("inner/js/index"); +const cjsi = __importStar(require("inner/cjs/index")); +const mjsi = __importStar(require("inner/mjs/index")); +const typei = __importStar(require("inner/js/index")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js.diff deleted file mode 100644 index 78d77332f5..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExports(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesAllowJsPackagePatternExports(module=node18).js -+++ new.nodeModulesAllowJsPackagePatternExports(module=node18).js -@@= skipped -83, +83 lines =@@ - typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/index")); --const mjsi = __importStar(require("inner/mjs/index")); --const typei = __importStar(require("inner/js/index")); -+const cjsi = require("inner/cjs/index"); -+const mjsi = require("inner/mjs/index"); -+const typei = require("inner/js/index"); - cjsi; - mjsi; - typei; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js index 38ad4085f6..3ba5fbbce0 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js @@ -86,11 +86,44 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/exclude/index"); -const mjsi = require("inner/mjs/exclude/index"); -const typei = require("inner/js/exclude/index"); +const cjsi = __importStar(require("inner/cjs/exclude/index")); +const mjsi = __importStar(require("inner/mjs/exclude/index")); +const typei = __importStar(require("inner/js/exclude/index")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js.diff deleted file mode 100644 index 3dfc3da1cd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js -+++ new.nodeModulesAllowJsPackagePatternExportsExclude(module=node18).js -@@= skipped -85, +85 lines =@@ - typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/exclude/index")); --const mjsi = __importStar(require("inner/mjs/exclude/index")); --const typei = __importStar(require("inner/js/exclude/index")); -+const cjsi = require("inner/cjs/exclude/index"); -+const mjsi = require("inner/mjs/exclude/index"); -+const typei = require("inner/js/exclude/index"); - cjsi; - mjsi; - typei; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js index d36f73a186..5c434e9847 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js @@ -84,11 +84,44 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/index.cjs"); -const mjsi = require("inner/mjs/index.mjs"); -const typei = require("inner/js/index.js"); +const cjsi = __importStar(require("inner/cjs/index.cjs")); +const mjsi = __importStar(require("inner/mjs/index.mjs")); +const typei = __importStar(require("inner/js/index.js")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js.diff deleted file mode 100644 index 06c5f624a3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js -+++ new.nodeModulesAllowJsPackagePatternExportsTrailers(module=node18).js -@@= skipped -83, +83 lines =@@ - typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/index.cjs")); --const mjsi = __importStar(require("inner/mjs/index.mjs")); --const typei = __importStar(require("inner/js/index.js")); -+const cjsi = require("inner/cjs/index.cjs"); -+const mjsi = require("inner/mjs/index.mjs"); -+const typei = require("inner/js/index.js"); - cjsi; - mjsi; - typei; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types index 9ef6ca5e5d..a28566d8d4 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types @@ -25,9 +25,9 @@ export async function f() { >"../index.js" : "../index.js" const mod4 = await import ("./index.js"); ->mod4 : typeof mod2 ->await import ("./index.js") : typeof mod2 ->import ("./index.js") : Promise +>mod4 : { f(): Promise; default: typeof mod2; } +>await import ("./index.js") : { f(): Promise; default: typeof mod2; } +>import ("./index.js") : Promise<{ f(): Promise; default: typeof mod2; }> >"./index.js" : "./index.js" h(); @@ -59,9 +59,9 @@ export async function h() { >"./index.js" : "./index.js" const mod4 = await import ("./subfolder/index.js"); ->mod4 : typeof mod2 ->await import ("./subfolder/index.js") : typeof mod2 ->import ("./subfolder/index.js") : Promise +>mod4 : { f(): Promise; default: typeof mod2; } +>await import ("./subfolder/index.js") : { f(): Promise; default: typeof mod2; } +>import ("./subfolder/index.js") : Promise<{ f(): Promise; default: typeof mod2; }> >"./subfolder/index.js" : "./subfolder/index.js" f(); diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js index 0432572e6c..41870a452e 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js @@ -42,8 +42,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); ; //// [5.cjs] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const _2_cjs_1 = require("./2.cjs"); // ok -const _3_cjs_1 = require("./3.cjs"); // error +const _2_cjs_1 = __importDefault(require("./2.cjs")); // ok +const _3_cjs_1 = __importDefault(require("./3.cjs")); // error _2_cjs_1.default.foo; _3_cjs_1.default.foo; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff index 9c47d84aa9..16a4552b04 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesCJSEmit1(module=node18).js.diff @@ -19,18 +19,4 @@ +export var foo = {}; exports.foo = {}; //// [4.cjs] - "use strict"; -@@= skipped -15, +20 lines =@@ - ; - //// [5.cjs] - "use strict"; --var __importDefault = (this && this.__importDefault) || function (mod) { -- return (mod && mod.__esModule) ? mod : { "default": mod }; --}; - Object.defineProperty(exports, "__esModule", { value: true }); --const _2_cjs_1 = __importDefault(require("./2.cjs")); // ok --const _3_cjs_1 = __importDefault(require("./3.cjs")); // error -+const _2_cjs_1 = require("./2.cjs"); // ok -+const _3_cjs_1 = require("./3.cjs"); // error - _2_cjs_1.default.foo; - _3_cjs_1.default.foo; \ No newline at end of file + "use strict"; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js index f9843b3e1b..87d5cda21c 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js @@ -157,18 +157,51 @@ typei.mjsSource; ts.mjsSource; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjs = require("package/cjs"); -const mjs = require("package/mjs"); -const type = require("package"); +const cjs = __importStar(require("package/cjs")); +const mjs = __importStar(require("package/mjs")); +const type = __importStar(require("package")); cjs; mjs; type; -const cjsi = require("inner/a"); -const mjsi = require("inner/b"); -const typei = require("inner"); -const ts = require("inner/types"); +const cjsi = __importStar(require("inner/a")); +const mjsi = __importStar(require("inner/b")); +const typei = __importStar(require("inner")); +const ts = __importStar(require("inner/types")); cjsi.cjsSource; mjsi.cjsSource; typei.implicitCjsSource; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js.diff index fbf3a6575b..88c09cb208 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesConditionalPackageExports(module=node18).js.diff @@ -23,63 +23,7 @@ //// [index.mjs] // esm format file import * as cjs from "package/cjs"; -@@= skipped -18, +34 lines =@@ - ts.mjsSource; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjs = __importStar(require("package/cjs")); --const mjs = __importStar(require("package/mjs")); --const type = __importStar(require("package")); -+const cjs = require("package/cjs"); -+const mjs = require("package/mjs"); -+const type = require("package"); - cjs; - mjs; - type; --const cjsi = __importStar(require("inner/a")); --const mjsi = __importStar(require("inner/b")); --const typei = __importStar(require("inner")); --const ts = __importStar(require("inner/types")); -+const cjsi = require("inner/a"); -+const mjsi = require("inner/b"); -+const typei = require("inner"); -+const ts = require("inner/types"); - cjsi.cjsSource; +@@= skipped -67, +83 lines =@@ mjsi.cjsSource; typei.implicitCjsSource; ts.cjsSource; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js index 9cf59460af..bd8213279f 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js @@ -126,31 +126,55 @@ export {}; export {}; //// [other.d.ts] // esm format file -export declare const a: typeof import("package/cjs"); +export declare const a: { + default: typeof import("package/cjs"); +}; export declare const b: typeof import("package/mjs"); export declare const c: typeof import("package"); -export declare const f: typeof import("inner"); +export declare const f: { + cjsMain: true; + default: typeof import("inner"); +}; //// [other2.d.ts] // esm format file -export declare const d: typeof import("inner/cjs"); +export declare const d: { + cjsNonmain: true; + default: typeof import("inner/cjs"); +}; export declare const e: typeof import("inner/mjs"); //// [other.d.mts] // esm format file -export declare const a: typeof import("package/cjs"); +export declare const a: { + default: typeof import("package/cjs"); +}; export declare const b: typeof import("package/mjs"); export declare const c: typeof import("package"); -export declare const f: typeof import("inner"); +export declare const f: { + cjsMain: true; + default: typeof import("inner"); +}; //// [other2.d.mts] // esm format file -export declare const d: typeof import("inner/cjs"); +export declare const d: { + cjsNonmain: true; + default: typeof import("inner/cjs"); +}; export declare const e: typeof import("inner/mjs"); //// [other.d.cts] // cjs format file, no TLA -export declare const a: Promise; +export declare const a: Promise<{ + default: typeof import("./index.cts"); +}>; export declare const b: Promise; export declare const c: Promise; -export declare const f: Promise; +export declare const f: Promise<{ + cjsMain: true; + default: typeof import("inner"); +}>; //// [other2.d.cts] // cjs format file, no TLA -export declare const d: Promise; +export declare const d: Promise<{ + cjsNonmain: true; + default: typeof import("inner/cjs"); +}>; export declare const e: Promise; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js.diff index 62041dcb9f..3985ca9bf4 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).js.diff @@ -13,65 +13,48 @@ +// cjs format file export {}; //// [other.d.ts] --export declare const a: { -- default: typeof import("package/cjs"); --}; +// esm format file -+export declare const a: typeof import("package/cjs"); - export declare const b: typeof import("package/mjs"); - export declare const c: typeof import("package"); --export declare const f: { -- cjsMain: true; -- default: typeof import("inner"); --}; -+export declare const f: typeof import("inner"); + export declare const a: { + default: typeof import("package/cjs"); + }; +@@= skipped -16, +20 lines =@@ + default: typeof import("inner"); + }; //// [other2.d.ts] --export declare const d: { -- cjsNonmain: true; -- default: typeof import("inner/cjs"); --}; +// esm format file -+export declare const d: typeof import("inner/cjs"); + export declare const d: { + cjsNonmain: true; + default: typeof import("inner/cjs"); + }; export declare const e: typeof import("inner/mjs"); //// [other.d.mts] --export declare const a: { -- default: typeof import("package/cjs"); --}; +// esm format file -+export declare const a: typeof import("package/cjs"); - export declare const b: typeof import("package/mjs"); - export declare const c: typeof import("package"); --export declare const f: { -- cjsMain: true; -- default: typeof import("inner"); --}; -+export declare const f: typeof import("inner"); + export declare const a: { + default: typeof import("package/cjs"); + }; +@@= skipped -16, +18 lines =@@ + default: typeof import("inner"); + }; //// [other2.d.mts] --export declare const d: { -- cjsNonmain: true; -- default: typeof import("inner/cjs"); --}; +// esm format file -+export declare const d: typeof import("inner/cjs"); + export declare const d: { + cjsNonmain: true; + default: typeof import("inner/cjs"); + }; export declare const e: typeof import("inner/mjs"); //// [other.d.cts] --export declare const a: Promise<{ -- default: typeof import("./index.cjs"); --}>; +// cjs format file, no TLA -+export declare const a: Promise; + export declare const a: Promise<{ +- default: typeof import("./index.cjs"); ++ default: typeof import("./index.cts"); + }>; export declare const b: Promise; export declare const c: Promise; --export declare const f: Promise<{ -- cjsMain: true; -- default: typeof import("inner"); --}>; -+export declare const f: Promise; +@@= skipped -16, +18 lines =@@ + default: typeof import("inner"); + }>; //// [other2.d.cts] --export declare const d: Promise<{ -- cjsNonmain: true; -- default: typeof import("inner/cjs"); --}>; +// cjs format file, no TLA -+export declare const d: Promise; - export declare const e: Promise; \ No newline at end of file + export declare const d: Promise<{ + cjsNonmain: true; + default: typeof import("inner/cjs"); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types index 23cab9aabd..9f4bf477f6 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types @@ -15,9 +15,9 @@ export {}; === other.ts === // esm format file export const a = await import("package/cjs"); ->a : typeof import("index") ->await import("package/cjs") : typeof import("index") ->import("package/cjs") : Promise +>a : { default: typeof import("index"); } +>await import("package/cjs") : { default: typeof import("index"); } +>import("package/cjs") : Promise<{ default: typeof import("index"); }> >"package/cjs" : "package/cjs" export const b = await import("package/mjs"); @@ -33,17 +33,17 @@ export const c = await import("package"); >"package" : "package" export const f = await import("inner"); ->f : typeof import("node_modules/inner/index") ->await import("inner") : typeof import("node_modules/inner/index") ->import("inner") : Promise +>f : { cjsMain: true; default: typeof import("node_modules/inner/index"); } +>await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); } +>import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> >"inner" : "inner" === other2.ts === // esm format file export const d = await import("inner/cjs"); ->d : typeof import("node_modules/inner/index") ->await import("inner/cjs") : typeof import("node_modules/inner/index") ->import("inner/cjs") : Promise +>d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } +>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } +>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> >"inner/cjs" : "inner/cjs" export const e = await import("inner/mjs"); @@ -55,9 +55,9 @@ export const e = await import("inner/mjs"); === other.mts === // esm format file export const a = await import("package/cjs"); ->a : typeof import("index") ->await import("package/cjs") : typeof import("index") ->import("package/cjs") : Promise +>a : { default: typeof import("index"); } +>await import("package/cjs") : { default: typeof import("index"); } +>import("package/cjs") : Promise<{ default: typeof import("index"); }> >"package/cjs" : "package/cjs" export const b = await import("package/mjs"); @@ -73,17 +73,17 @@ export const c = await import("package"); >"package" : "package" export const f = await import("inner"); ->f : typeof import("node_modules/inner/index") ->await import("inner") : typeof import("node_modules/inner/index") ->import("inner") : Promise +>f : { cjsMain: true; default: typeof import("node_modules/inner/index"); } +>await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); } +>import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> >"inner" : "inner" === other2.mts === // esm format file export const d = await import("inner/cjs"); ->d : typeof import("node_modules/inner/index") ->await import("inner/cjs") : typeof import("node_modules/inner/index") ->import("inner/cjs") : Promise +>d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } +>await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } +>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> >"inner/cjs" : "inner/cjs" export const e = await import("inner/mjs"); @@ -95,8 +95,8 @@ export const e = await import("inner/mjs"); === other.cts === // cjs format file, no TLA export const a = import("package/cjs"); ->a : Promise ->import("package/cjs") : Promise +>a : Promise<{ default: typeof import("index"); }> +>import("package/cjs") : Promise<{ default: typeof import("index"); }> >"package/cjs" : "package/cjs" export const b = import("package/mjs"); @@ -110,15 +110,15 @@ export const c = import("package"); >"package" : "package" export const f = import("inner"); ->f : Promise ->import("inner") : Promise +>f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> +>import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> >"inner" : "inner" === other2.cts === // cjs format file, no TLA export const d = import("inner/cjs"); ->d : Promise ->import("inner/cjs") : Promise +>d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> +>import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> >"inner/cjs" : "inner/cjs" export const e = import("inner/mjs"); diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff deleted file mode 100644 index 51ba5468e9..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types.diff +++ /dev/null @@ -1,107 +0,0 @@ ---- old.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types -+++ new.nodeModulesDeclarationEmitDynamicImportWithPackageExports(module=node18).types -@@= skipped -14, +14 lines =@@ - === other.ts === - // esm format file - export const a = await import("package/cjs"); -->a : { default: typeof import("index"); } -->await import("package/cjs") : { default: typeof import("index"); } -->import("package/cjs") : Promise<{ default: typeof import("index"); }> -+>a : typeof import("index") -+>await import("package/cjs") : typeof import("index") -+>import("package/cjs") : Promise - >"package/cjs" : "package/cjs" - - export const b = await import("package/mjs"); -@@= skipped -18, +18 lines =@@ - >"package" : "package" - - export const f = await import("inner"); -->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); } -->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); } -->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> -+>f : typeof import("node_modules/inner/index") -+>await import("inner") : typeof import("node_modules/inner/index") -+>import("inner") : Promise - >"inner" : "inner" - - === other2.ts === - // esm format file - export const d = await import("inner/cjs"); -->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } -->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } -->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> -+>d : typeof import("node_modules/inner/index") -+>await import("inner/cjs") : typeof import("node_modules/inner/index") -+>import("inner/cjs") : Promise - >"inner/cjs" : "inner/cjs" - - export const e = await import("inner/mjs"); -@@= skipped -22, +22 lines =@@ - === other.mts === - // esm format file - export const a = await import("package/cjs"); -->a : { default: typeof import("index"); } -->await import("package/cjs") : { default: typeof import("index"); } -->import("package/cjs") : Promise<{ default: typeof import("index"); }> -+>a : typeof import("index") -+>await import("package/cjs") : typeof import("index") -+>import("package/cjs") : Promise - >"package/cjs" : "package/cjs" - - export const b = await import("package/mjs"); -@@= skipped -18, +18 lines =@@ - >"package" : "package" - - export const f = await import("inner"); -->f : { cjsMain: true; default: typeof import("node_modules/inner/index"); } -->await import("inner") : { cjsMain: true; default: typeof import("node_modules/inner/index"); } -->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> -+>f : typeof import("node_modules/inner/index") -+>await import("inner") : typeof import("node_modules/inner/index") -+>import("inner") : Promise - >"inner" : "inner" - - === other2.mts === - // esm format file - export const d = await import("inner/cjs"); -->d : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } -->await import("inner/cjs") : { cjsNonmain: true; default: typeof import("node_modules/inner/index"); } -->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> -+>d : typeof import("node_modules/inner/index") -+>await import("inner/cjs") : typeof import("node_modules/inner/index") -+>import("inner/cjs") : Promise - >"inner/cjs" : "inner/cjs" - - export const e = await import("inner/mjs"); -@@= skipped -22, +22 lines =@@ - === other.cts === - // cjs format file, no TLA - export const a = import("package/cjs"); -->a : Promise<{ default: typeof import("index"); }> -->import("package/cjs") : Promise<{ default: typeof import("index"); }> -+>a : Promise -+>import("package/cjs") : Promise - >"package/cjs" : "package/cjs" - - export const b = import("package/mjs"); -@@= skipped -15, +15 lines =@@ - >"package" : "package" - - export const f = import("inner"); -->f : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> -->import("inner") : Promise<{ cjsMain: true; default: typeof import("node_modules/inner/index"); }> -+>f : Promise -+>import("inner") : Promise - >"inner" : "inner" - - === other2.cts === - // cjs format file, no TLA - export const d = import("inner/cjs"); -->d : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> -->import("inner/cjs") : Promise<{ cjsNonmain: true; default: typeof import("node_modules/inner/index"); }> -+>d : Promise -+>import("inner/cjs") : Promise - >"inner/cjs" : "inner/cjs" - - export const e = import("inner/mjs"); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js index e5c52ba9ab..cec3b8c991 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js @@ -121,18 +121,51 @@ export const e = mjsi; export const f = typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); exports.f = exports.e = exports.d = exports.c = exports.b = exports.a = void 0; // cjs format file -const cjs = require("package/cjs"); -const mjs = require("package/mjs"); -const type = require("package"); +const cjs = __importStar(require("package/cjs")); +const mjs = __importStar(require("package/mjs")); +const type = __importStar(require("package")); exports.a = cjs; exports.b = mjs; exports.c = type; -const cjsi = require("inner/cjs"); -const mjsi = require("inner/mjs"); -const typei = require("inner"); +const cjsi = __importStar(require("inner/cjs")); +const mjsi = __importStar(require("inner/mjs")); +const typei = __importStar(require("inner")); exports.d = cjsi; exports.e = mjsi; exports.f = typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js.diff index 1e02f710e6..12552fd6ec 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesDeclarationEmitWithPackageExports(module=node18).js.diff @@ -21,61 +21,7 @@ //// [index.mjs] // esm format file import * as cjs from "package/cjs"; -@@= skipped -16, +30 lines =@@ - export const f = typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - exports.f = exports.e = exports.d = exports.c = exports.b = exports.a = void 0; - // cjs format file --const cjs = __importStar(require("package/cjs")); --const mjs = __importStar(require("package/mjs")); --const type = __importStar(require("package")); -+const cjs = require("package/cjs"); -+const mjs = require("package/mjs"); -+const type = require("package"); - exports.a = cjs; - exports.b = mjs; - exports.c = type; --const cjsi = __importStar(require("inner/cjs")); --const mjsi = __importStar(require("inner/mjs")); --const typei = __importStar(require("inner")); -+const cjsi = require("inner/cjs"); -+const mjsi = require("inner/mjs"); -+const typei = require("inner"); +@@= skipped -64, +78 lines =@@ exports.d = cjsi; exports.e = mjsi; exports.f = typei; @@ -117,7 +63,7 @@ import * as cjsi from "inner/cjs"; import * as mjsi from "inner/mjs"; import * as typei from "inner"; -@@= skipped -78, +38 lines =@@ +@@= skipped -30, +23 lines =@@ export declare const e: typeof mjsi; export declare const f: typeof typei; //// [index.d.cts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt index dc5617cd1a..1f49a7dc62 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt @@ -1,15 +1,11 @@ -otherc.cts(1,8): error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag otherc.cts(1,35): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls. otherc.cts(2,40): error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'nodenext', or 'preserve'. ==== index.ts (0 errors) ==== import json from "./package.json" assert { type: "json" }; -==== otherc.cts (3 errors) ==== +==== otherc.cts (2 errors) ==== import json from "./package.json" assert { type: "json" }; // should error, cjs mode imports don't support assertions - ~~~~ -!!! error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -!!! related TS2594 package.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls. const json2 = import("./package.json", { assert: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt.diff index b79ffe993b..aabc0b0def 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).errors.txt.diff @@ -1,7 +1,6 @@ --- old.nodeModulesImportAssertions(module=node18).errors.txt +++ new.nodeModulesImportAssertions(module=node18).errors.txt @@= skipped -0, +0 lines =@@ -+otherc.cts(1,8): error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag otherc.cts(1,35): error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls. +otherc.cts(2,40): error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'nodenext', or 'preserve'. @@ -9,11 +8,8 @@ ==== index.ts (0 errors) ==== import json from "./package.json" assert { type: "json" }; -==== otherc.cts (1 errors) ==== -+==== otherc.cts (3 errors) ==== ++==== otherc.cts (2 errors) ==== import json from "./package.json" assert { type: "json" }; // should error, cjs mode imports don't support assertions -+ ~~~~ -+!!! error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -+!!! related TS2594 package.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2836: Import assertions are not allowed on statements that compile to CommonJS 'require' calls. const json2 = import("./package.json", { assert: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types index 3572106eba..0d5c792171 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types @@ -7,7 +7,7 @@ import json from "./package.json" assert { type: "json" }; === otherc.cts === import json from "./package.json" assert { type: "json" }; // should error, cjs mode imports don't support assertions ->json : any +>json : { name: string; private: boolean; type: string; } >type : any const json2 = import("./package.json", { assert: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types.diff deleted file mode 100644 index 987f81c363..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAssertions(module=node18).types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.nodeModulesImportAssertions(module=node18).types -+++ new.nodeModulesImportAssertions(module=node18).types -@@= skipped -6, +6 lines =@@ - - === otherc.cts === - import json from "./package.json" assert { type: "json" }; // should error, cjs mode imports don't support assertions -->json : { name: string; private: boolean; type: string; } -+>json : any - >type : any - - const json2 = import("./package.json", { assert: { type: "json" } }); // should be fine \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt index 8d62b711ab..a9c692a338 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt @@ -1,15 +1,11 @@ -otherc.cts(1,8): error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag otherc.cts(1,35): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. otherc.cts(2,40): error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'nodenext', or 'preserve'. ==== index.ts (0 errors) ==== import json from "./package.json" with { type: "json" }; -==== otherc.cts (3 errors) ==== +==== otherc.cts (2 errors) ==== import json from "./package.json" with { type: "json" }; // should error, cjs mode imports don't support attributes - ~~~~ -!!! error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -!!! related TS2594 package.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ~~~~~~~~~~~~~~~~~~~~~ !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. const json2 = import("./package.json", { with: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt.diff index b84ac1b6a1..83be471510 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).errors.txt.diff @@ -1,7 +1,6 @@ --- old.nodeModulesImportAttributes(module=node18).errors.txt +++ new.nodeModulesImportAttributes(module=node18).errors.txt @@= skipped -0, +0 lines =@@ -+otherc.cts(1,8): error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag otherc.cts(1,35): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. +otherc.cts(2,40): error TS1324: Dynamic imports only support a second argument when the '--module' option is set to 'esnext', 'node16', 'node18', 'nodenext', or 'preserve'. @@ -9,11 +8,8 @@ ==== index.ts (0 errors) ==== import json from "./package.json" with { type: "json" }; -==== otherc.cts (1 errors) ==== -+==== otherc.cts (3 errors) ==== ++==== otherc.cts (2 errors) ==== import json from "./package.json" with { type: "json" }; // should error, cjs mode imports don't support attributes -+ ~~~~ -+!!! error TS1259: Module '"package"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -+!!! related TS2594 package.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ~~~~~~~~~~~~~~~~~~~~~ !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. const json2 = import("./package.json", { with: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types index 73b67e357e..a6b4943e6d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types @@ -7,7 +7,7 @@ import json from "./package.json" with { type: "json" }; === otherc.cts === import json from "./package.json" with { type: "json" }; // should error, cjs mode imports don't support attributes ->json : any +>json : { name: string; private: boolean; type: string; } >type : any const json2 = import("./package.json", { with: { type: "json" } }); // should be fine diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types.diff deleted file mode 100644 index acf54dc1f2..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributes(module=node18).types.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- old.nodeModulesImportAttributes(module=node18).types -+++ new.nodeModulesImportAttributes(module=node18).types -@@= skipped -6, +6 lines =@@ - - === otherc.cts === - import json from "./package.json" with { type: "json" }; // should error, cjs mode imports don't support attributes -->json : { name: string; private: boolean; type: string; } -+>json : any - >type : any - - const json2 = import("./package.json", { with: { type: "json" } }); // should be fine \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt index f5aea7c4ad..2d2f2c5b8f 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt @@ -8,7 +8,7 @@ /other.ts(3,52): error TS1128: Declaration or statement expected. /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'. /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. -/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other.ts(6,49): error TS1005: 'with' expected. /other.ts(6,66): error TS1005: ';' expected. @@ -40,7 +40,7 @@ /other3.ts(3,56): error TS1128: Declaration or statement expected. /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'. /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. -/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other3.ts(6,48): error TS1005: '{' expected. /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type. @@ -56,7 +56,7 @@ /other4.ts(6,32): error TS1128: Declaration or statement expected. /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration. /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration. -/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other4.ts(9,48): error TS1005: '{' expected. /other4.ts(9,58): error TS1005: ',' expected. @@ -125,7 +125,7 @@ ~~~~~~~~~~~~~~~~~ !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface); ~~~~~~~~~~~~~~~ @@ -210,7 +210,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface); ~~~~~~~~~~~~~ @@ -260,7 +260,7 @@ !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration. !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", Attribute1).RequireInterface); ~~~~~~~~~~~~~ diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt.diff deleted file mode 100644 index e770892216..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt.diff +++ /dev/null @@ -1,56 +0,0 @@ ---- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt -+++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).errors.txt -@@= skipped -7, +7 lines =@@ - /other.ts(3,52): error TS1128: Declaration or statement expected. - /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'. - /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. --/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other.ts(6,49): error TS1005: 'with' expected. - /other.ts(6,66): error TS1005: ';' expected. -@@= skipped -32, +32 lines =@@ - /other3.ts(3,56): error TS1128: Declaration or statement expected. - /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'. - /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. --/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other3.ts(6,48): error TS1005: '{' expected. - /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type. -@@= skipped -16, +16 lines =@@ - /other4.ts(6,32): error TS1128: Declaration or statement expected. - /other4.ts(6,33): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration. - /other4.ts(7,21): error TS2448: Block-scoped variable 'Attribute2' used before its declaration. --/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other4.ts(7,33): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other4.ts(9,48): error TS1005: '{' expected. - /other4.ts(9,58): error TS1005: ',' expected. -@@= skipped -69, +69 lines =@@ - ~~~~~~~~~~~~~~~~~ - !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface); - ~~~~~~~~~~~~~~~ -@@= skipped -85, +85 lines =@@ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface); - ~~~~~~~~~~~~~ -@@= skipped -50, +50 lines =@@ - !!! error TS2448: Block-scoped variable 'Attribute2' used before its declaration. - !!! related TS2728 /other4.ts:10:48: 'Attribute2' is declared here. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", Attribute1).RequireInterface); - ~~~~~~~~~~~~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types index beeadd97ad..22b588a9b5 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types @@ -40,7 +40,7 @@ export type LocalInterface = & import("pkg", {"resolution-mode": "import"}).ImportInterface; >import("pkg", {"resolution-mode": "import"}).ImportInterface : any ->import("pkg", {"resolution-mode": "import"}) : Promise +>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >{"resolution-mode": "import"} : { "resolution-mode": string; } >"resolution-mode" : string @@ -97,7 +97,7 @@ export type LocalInterface = & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface; >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise +>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[] >{"resolution-mode": "import"} : { "resolution-mode": string; } @@ -145,7 +145,7 @@ export type LocalInterface = & import("pkg", Attribute2).ImportInterface; >import("pkg", Attribute2).ImportInterface : any ->import("pkg", Attribute2) : Promise +>import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >Attribute2 : any >ImportInterface : any diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff deleted file mode 100644 index 52dd07ebc3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types -+++ new.nodeModulesImportAttributesTypeModeDeclarationEmitErrors(module=node18).types -@@= skipped -39, +39 lines =@@ - - & import("pkg", {"resolution-mode": "import"}).ImportInterface; - >import("pkg", {"resolution-mode": "import"}).ImportInterface : any -->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", {"resolution-mode": "import"}) : Promise - >"pkg" : "pkg" - >{"resolution-mode": "import"} : { "resolution-mode": string; } - >"resolution-mode" : string -@@= skipped -57, +57 lines =@@ - - & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface; - >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any -->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise - >"pkg" : "pkg" - >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[] - >{"resolution-mode": "import"} : { "resolution-mode": string; } -@@= skipped -48, +48 lines =@@ - - & import("pkg", Attribute2).ImportInterface; - >import("pkg", Attribute2).ImportInterface : any -->import("pkg", Attribute2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", Attribute2) : Promise - >"pkg" : "pkg" - >Attribute2 : any - >ImportInterface : any \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js index 3d9892e080..4712d65a09 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js @@ -32,10 +32,11 @@ declare module "tslib" { //// [index.js] "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +const tslib_1 = require("tslib"); // cjs format file -const fs_1 = require("fs"); +const fs_1 = tslib_1.__importDefault(require("fs")); fs_1.default.readFile; -const fs = require("fs"); +const fs = tslib_1.__importStar(require("fs")); fs.readFile; //// [index.js] // esm format file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js.diff deleted file mode 100644 index 09914a654b..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions(module=node18).js.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.nodeModulesImportHelpersCollisions(module=node18).js -+++ new.nodeModulesImportHelpersCollisions(module=node18).js -@@= skipped -31, +31 lines =@@ - //// [index.js] - "use strict"; - Object.defineProperty(exports, "__esModule", { value: true }); --const tslib_1 = require("tslib"); - // cjs format file --const fs_1 = tslib_1.__importDefault(require("fs")); -+const fs_1 = require("fs"); - fs_1.default.readFile; --const fs = tslib_1.__importStar(require("fs")); -+const fs = require("fs"); - fs.readFile; - //// [index.js] - // esm format file \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js index 898916a8c8..11894ac648 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js @@ -32,7 +32,7 @@ exports.fs = void 0; const tslib_1 = require("tslib"); // cjs format file tslib_1.__exportStar(require("fs"), exports); -exports.fs = require("fs"); +exports.fs = tslib_1.__importStar(require("fs")); //// [index.js] // esm format file export * from "fs"; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js.diff index 93658bb97c..dcb9d3892e 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions2(module=node18).js.diff @@ -1,15 +1,6 @@ --- old.nodeModulesImportHelpersCollisions2(module=node18).js +++ new.nodeModulesImportHelpersCollisions2(module=node18).js -@@= skipped -31, +31 lines =@@ - const tslib_1 = require("tslib"); - // cjs format file - tslib_1.__exportStar(require("fs"), exports); --exports.fs = tslib_1.__importStar(require("fs")); -+exports.fs = require("fs"); - //// [index.js] - // esm format file - export * from "fs"; -@@= skipped -8, +8 lines =@@ +@@= skipped -39, +39 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js index ea40ccdcd2..8a5f661da0 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js @@ -27,9 +27,10 @@ declare module "tslib" { "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; +const tslib_1 = require("tslib"); // cjs format file const fs_1 = require("fs"); -Object.defineProperty(exports, "default", { enumerable: true, get: function () { return fs_1.default; } }); +Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); //// [index.js] // esm format file export { default } from "fs"; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js.diff index 025ed636d5..8da158eeac 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportHelpersCollisions3(module=node18).js.diff @@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = void 0; -var tslib_1 = require("tslib"); ++const tslib_1 = require("tslib"); // cjs format file -var fs_1 = require("fs"); --Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); +const fs_1 = require("fs"); -+Object.defineProperty(exports, "default", { enumerable: true, get: function () { return fs_1.default; } }); + Object.defineProperty(exports, "default", { enumerable: true, get: function () { return tslib_1.__importDefault(fs_1).default; } }); //// [index.js] // esm format file - export { default } from "fs"; +@@= skipped -10, +10 lines =@@ //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js index 5fa5db8901..a60b20a63d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js @@ -25,9 +25,42 @@ type; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const type = require("#type"); +const type = __importStar(require("#type")); type; //// [index.js] // esm format file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js.diff deleted file mode 100644 index 7681881ed7..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionIntoExport(module=node18).js.diff +++ /dev/null @@ -1,46 +0,0 @@ ---- old.nodeModulesImportResolutionIntoExport(module=node18).js -+++ new.nodeModulesImportResolutionIntoExport(module=node18).js -@@= skipped -24, +24 lines =@@ - - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const type = __importStar(require("#type")); -+const type = require("#type"); - type; - //// [index.js] - // esm format file \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js index 66855a1118..fa6401e1a4 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js @@ -33,9 +33,42 @@ import * as type from "#type"; type; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const type = require("#type"); +const type = __importStar(require("#type")); type; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js.diff deleted file mode 100644 index 8dd53dfcc3..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportResolutionNoCycle(module=node18).js.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- old.nodeModulesImportResolutionNoCycle(module=node18).js -+++ new.nodeModulesImportResolutionNoCycle(module=node18).js -@@= skipped -32, +32 lines =@@ - type; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const type = __importStar(require("#type")); -+const type = require("#type"); - type; - diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt index 9322401b8e..5172f49a5c 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt @@ -8,7 +8,7 @@ /other.ts(3,52): error TS1128: Declaration or statement expected. /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'. /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. -/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other.ts(6,49): error TS1005: 'with' expected. /other.ts(6,66): error TS1005: ';' expected. @@ -40,7 +40,7 @@ /other3.ts(3,56): error TS1128: Declaration or statement expected. /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'. /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. -/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other3.ts(6,48): error TS1005: '{' expected. /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type. @@ -56,7 +56,7 @@ /other4.ts(6,30): error TS1128: Declaration or statement expected. /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration. /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration. -/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? /other4.ts(9,48): error TS1005: '{' expected. /other4.ts(9,56): error TS1005: ',' expected. @@ -122,7 +122,7 @@ ~~~~~~~~~~~~~~~~~ !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface); ~~~~~~~~~~~~~~~ @@ -205,7 +205,7 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface); ~~~~~~~~~~~~~ @@ -254,7 +254,7 @@ !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration. !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here. ~~~~~~~~~~~~~~~ -!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. +!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. export const a = (null as any as import("pkg", Asserts1).RequireInterface); ~~~~~~~~~~~~~ diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt.diff deleted file mode 100644 index 007a5c5ad8..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt.diff +++ /dev/null @@ -1,56 +0,0 @@ ---- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt -+++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).errors.txt -@@= skipped -7, +7 lines =@@ - /other.ts(3,52): error TS1128: Declaration or statement expected. - /other.ts(3,53): error TS2304: Cannot find name 'RequireInterface'. - /other.ts(4,22): error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. --/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other.ts(4,52): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other.ts(6,49): error TS1005: 'with' expected. - /other.ts(6,66): error TS1005: ';' expected. -@@= skipped -32, +32 lines =@@ - /other3.ts(3,56): error TS1128: Declaration or statement expected. - /other3.ts(3,57): error TS2304: Cannot find name 'RequireInterface'. - /other3.ts(4,21): error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. --/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other3.ts(4,56): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other3.ts(6,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other3.ts(6,48): error TS1005: '{' expected. - /other3.ts(6,50): error TS2538: Type '{ "resolution-mode": "require"; }' cannot be used as an index type. -@@= skipped -16, +16 lines =@@ - /other4.ts(6,30): error TS1128: Declaration or statement expected. - /other4.ts(6,31): error TS2448: Block-scoped variable 'RequireInterface' used before its declaration. - /other4.ts(7,21): error TS2448: Block-scoped variable 'Asserts2' used before its declaration. --/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+/other4.ts(7,31): error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - /other4.ts(9,34): error TS1340: Module 'pkg' does not refer to a type, but is used as a type here. Did you mean 'typeof import('pkg')'? - /other4.ts(9,48): error TS1005: '{' expected. - /other4.ts(9,56): error TS1005: ',' expected. -@@= skipped -66, +66 lines =@@ - ~~~~~~~~~~~~~~~~~ - !!! error TS2353: Object literal may only specify known properties, and '"resolution-mode"' does not exist in type 'ImportCallOptions'. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", {"resolution-mode": "require"}).RequireInterface); - ~~~~~~~~~~~~~~~ -@@= skipped -83, +83 lines =@@ - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - !!! error TS2559: Type '{ "resolution-mode": string; }[]' has no properties in common with type 'ImportCallOptions'. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", [ {"resolution-mode": "require"} ]).RequireInterface); - ~~~~~~~~~~~~~ -@@= skipped -49, +49 lines =@@ - !!! error TS2448: Block-scoped variable 'Asserts2' used before its declaration. - !!! related TS2728 /other4.ts:10:48: 'Asserts2' is declared here. - ~~~~~~~~~~~~~~~ --!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise<{ default: typeof import("/node_modules/pkg/import"); }>'. -+!!! error TS2339: Property 'ImportInterface' does not exist on type 'Promise'. - - export const a = (null as any as import("pkg", Asserts1).RequireInterface); - ~~~~~~~~~~~~~ \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types index db278cec15..c366fd27fc 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types @@ -38,7 +38,7 @@ export type LocalInterface = & import("pkg", {"resolution-mode": "import"}).ImportInterface; >import("pkg", {"resolution-mode": "import"}).ImportInterface : any ->import("pkg", {"resolution-mode": "import"}) : Promise +>import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >{"resolution-mode": "import"} : { "resolution-mode": string; } >"resolution-mode" : string @@ -95,7 +95,7 @@ export type LocalInterface = & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface; >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any ->import("pkg", [ {"resolution-mode": "import"} ]) : Promise +>import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[] >{"resolution-mode": "import"} : { "resolution-mode": string; } @@ -143,7 +143,7 @@ export type LocalInterface = & import("pkg", Asserts2).ImportInterface; >import("pkg", Asserts2).ImportInterface : any ->import("pkg", Asserts2) : Promise +>import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> >"pkg" : "pkg" >Asserts2 : any >ImportInterface : any diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff deleted file mode 100644 index 9f28443bfd..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- old.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types -+++ new.nodeModulesImportTypeModeDeclarationEmitErrors1(module=node18).types -@@= skipped -37, +37 lines =@@ - - & import("pkg", {"resolution-mode": "import"}).ImportInterface; - >import("pkg", {"resolution-mode": "import"}).ImportInterface : any -->import("pkg", {"resolution-mode": "import"}) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", {"resolution-mode": "import"}) : Promise - >"pkg" : "pkg" - >{"resolution-mode": "import"} : { "resolution-mode": string; } - >"resolution-mode" : string -@@= skipped -57, +57 lines =@@ - - & import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface; - >import("pkg", [ {"resolution-mode": "import"} ]).ImportInterface : any -->import("pkg", [ {"resolution-mode": "import"} ]) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", [ {"resolution-mode": "import"} ]) : Promise - >"pkg" : "pkg" - >[ {"resolution-mode": "import"} ] : { "resolution-mode": string; }[] - >{"resolution-mode": "import"} : { "resolution-mode": string; } -@@= skipped -48, +48 lines =@@ - - & import("pkg", Asserts2).ImportInterface; - >import("pkg", Asserts2).ImportInterface : any -->import("pkg", Asserts2) : Promise<{ default: typeof import("/node_modules/pkg/import"); }> -+>import("pkg", Asserts2) : Promise - >"pkg" : "pkg" - >Asserts2 : any - >ImportInterface : any \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt index 856fcee888..4ba7849c2d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt @@ -1,6 +1,4 @@ -/loosey.cts(1,8): error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag /loosey.cts(1,36): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. -/loosey.cts(2,8): error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag /loosey.cts(6,9): error TS2339: Property 'default' does not exist on type '{ version: number; }'. /main.mts(2,22): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'Node18'. /main.mts(3,19): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'Node18'. @@ -71,17 +69,11 @@ !!! error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. config3.default; // Ok -==== /loosey.cts (4 errors) ==== +==== /loosey.cts (2 errors) ==== import config from "./config.json" with { type: "json" }; // Error - ~~~~~~ -!!! error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -!!! related TS2594 /config.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. ~~~~~~~~~~~~~~~~~~~~~ !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. import config2 from "./config.json"; // Ok - ~~~~~~~ -!!! error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -!!! related TS2594 /config.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. import { version } from "./config.json"; // Ok import * as config3 from "./config.json"; config3.version; // Ok diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt.diff deleted file mode 100644 index 48e0c69f86..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).errors.txt.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.nodeModulesJson(module=node18).errors.txt -+++ new.nodeModulesJson(module=node18).errors.txt -@@= skipped -0, +0 lines =@@ -+/loosey.cts(1,8): error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag - /loosey.cts(1,36): error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. -+/loosey.cts(2,8): error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag - /loosey.cts(6,9): error TS2339: Property 'default' does not exist on type '{ version: number; }'. - /main.mts(2,22): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'Node18'. - /main.mts(3,19): error TS1543: Importing a JSON file into an ECMAScript module requires a 'type: "json"' import attribute when 'module' is set to 'Node18'. -@@= skipped -68, +70 lines =@@ - !!! error TS2339: Property 'version' does not exist on type '{ default: { version: number; }; }'. - config3.default; // Ok - --==== /loosey.cts (2 errors) ==== -+==== /loosey.cts (4 errors) ==== - import config from "./config.json" with { type: "json" }; // Error -+ ~~~~~~ -+!!! error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -+!!! related TS2594 /config.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. - ~~~~~~~~~~~~~~~~~~~~~ - !!! error TS2856: Import attributes are not allowed on statements that compile to CommonJS 'require' calls. - import config2 from "./config.json"; // Ok -+ ~~~~~~~ -+!!! error TS1259: Module '"/config"' can only be default-imported using the 'allowSyntheticDefaultImports' flag -+!!! related TS2594 /config.json:1:1: This module is declared with 'export =', and can only be used with a default import when using the 'allowSyntheticDefaultImports' flag. - import { version } from "./config.json"; // Ok - import * as config3 from "./config.json"; - config3.version; // Ok \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types index 36337d45da..845f651a55 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types @@ -74,11 +74,11 @@ config3.default; // Ok === /loosey.cts === import config from "./config.json" with { type: "json" }; // Error ->config : any +>config : { version: number; } >type : any import config2 from "./config.json"; // Ok ->config2 : any +>config2 : { version: number; } import { version } from "./config.json"; // Ok >version : number diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types.diff deleted file mode 100644 index 39640eed66..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesJson(module=node18).types.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- old.nodeModulesJson(module=node18).types -+++ new.nodeModulesJson(module=node18).types -@@= skipped -73, +73 lines =@@ - - === /loosey.cts === - import config from "./config.json" with { type: "json" }; // Error -->config : { version: number; } -+>config : any - >type : any - - import config2 from "./config.json"; // Ok -->config2 : { version: number; } -+>config2 : any - - import { version } from "./config.json"; // Ok - >version : number \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js index 495945686c..53f53dc3c1 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js @@ -118,17 +118,50 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjs = require("package/cjs"); -const mjs = require("package/mjs"); -const type = require("package"); +const cjs = __importStar(require("package/cjs")); +const mjs = __importStar(require("package/mjs")); +const type = __importStar(require("package")); cjs; mjs; type; -const cjsi = require("inner/cjs"); -const mjsi = require("inner/mjs"); -const typei = require("inner"); +const cjsi = __importStar(require("inner/cjs")); +const mjsi = __importStar(require("inner/mjs")); +const typei = __importStar(require("inner")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js.diff index 646830d128..20989c5ae2 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageExports(module=node18).js.diff @@ -21,57 +21,10 @@ //// [index.mjs] // esm format file import * as cjs from "package/cjs"; -@@= skipped -16, +30 lines =@@ +@@= skipped -63, +77 lines =@@ + cjsi; + mjsi; typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjs = __importStar(require("package/cjs")); --const mjs = __importStar(require("package/mjs")); --const type = __importStar(require("package")); --cjs; --mjs; --type; --const cjsi = __importStar(require("inner/cjs")); --const mjsi = __importStar(require("inner/mjs")); --const typei = __importStar(require("inner")); --cjsi; --mjsi; --typei; -//// [index.js] -// esm format file -import * as cjs from "package/cjs"; @@ -88,18 +41,6 @@ -typei; - - -+const cjs = require("package/cjs"); -+const mjs = require("package/mjs"); -+const type = require("package"); -+cjs; -+mjs; -+type; -+const cjsi = require("inner/cjs"); -+const mjsi = require("inner/mjs"); -+const typei = require("inner"); -+cjsi; -+mjsi; -+typei; + + +//// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js index c51cf9fc0d..c25d1005e9 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js @@ -47,11 +47,44 @@ mjs; type; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const cjs = require("#cjs"); -const mjs = require("#mjs"); -const type = require("#type"); +const cjs = __importStar(require("#cjs")); +const mjs = __importStar(require("#mjs")); +const type = __importStar(require("#type")); cjs; mjs; type; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js.diff deleted file mode 100644 index 0483f1b912..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackageImports(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesPackageImports(module=node18).js -+++ new.nodeModulesPackageImports(module=node18).js -@@= skipped -46, +46 lines =@@ - type; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const cjs = __importStar(require("#cjs")); --const mjs = __importStar(require("#mjs")); --const type = __importStar(require("#type")); -+const cjs = require("#cjs"); -+const mjs = require("#mjs"); -+const type = require("#type"); - cjs; - mjs; - type; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js index ef720b5b0f..16d7442eb7 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js @@ -84,11 +84,44 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/index"); -const mjsi = require("inner/mjs/index"); -const typei = require("inner/js/index"); +const cjsi = __importStar(require("inner/cjs/index")); +const mjsi = __importStar(require("inner/mjs/index")); +const typei = __importStar(require("inner/js/index")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js.diff deleted file mode 100644 index f5d77592fa..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExports(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesPackagePatternExports(module=node18).js -+++ new.nodeModulesPackagePatternExports(module=node18).js -@@= skipped -83, +83 lines =@@ - typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/index")); --const mjsi = __importStar(require("inner/mjs/index")); --const typei = __importStar(require("inner/js/index")); -+const cjsi = require("inner/cjs/index"); -+const mjsi = require("inner/mjs/index"); -+const typei = require("inner/js/index"); - cjsi; - mjsi; - typei; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js index cea2e74915..5fe735dbc3 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js @@ -140,17 +140,50 @@ mjsi2; typei2; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/exclude/index"); -const mjsi = require("inner/mjs/exclude/index"); -const typei = require("inner/js/exclude/index"); +const cjsi = __importStar(require("inner/cjs/exclude/index")); +const mjsi = __importStar(require("inner/mjs/exclude/index")); +const typei = __importStar(require("inner/js/exclude/index")); cjsi; mjsi; typei; -const cjsi2 = require("inner/cjs/index"); -const mjsi2 = require("inner/mjs/index"); -const typei2 = require("inner/js/index"); +const cjsi2 = __importStar(require("inner/cjs/index")); +const mjsi2 = __importStar(require("inner/mjs/index")); +const typei2 = __importStar(require("inner/js/index")); cjsi2; mjsi2; typei2; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js.diff deleted file mode 100644 index 069f8f4eed..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsExclude(module=node18).js.diff +++ /dev/null @@ -1,59 +0,0 @@ ---- old.nodeModulesPackagePatternExportsExclude(module=node18).js -+++ new.nodeModulesPackagePatternExportsExclude(module=node18).js -@@= skipped -139, +139 lines =@@ - typei2; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/exclude/index")); --const mjsi = __importStar(require("inner/mjs/exclude/index")); --const typei = __importStar(require("inner/js/exclude/index")); -+const cjsi = require("inner/cjs/exclude/index"); -+const mjsi = require("inner/mjs/exclude/index"); -+const typei = require("inner/js/exclude/index"); - cjsi; - mjsi; - typei; --const cjsi2 = __importStar(require("inner/cjs/index")); --const mjsi2 = __importStar(require("inner/mjs/index")); --const typei2 = __importStar(require("inner/js/index")); -+const cjsi2 = require("inner/cjs/index"); -+const mjsi2 = require("inner/mjs/index"); -+const typei2 = require("inner/js/index"); - cjsi2; - mjsi2; - typei2; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js index 237a74e6ec..7e40184e6a 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js @@ -84,11 +84,44 @@ mjsi; typei; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const cjsi = require("inner/cjs/index.cjs"); -const mjsi = require("inner/mjs/index.mjs"); -const typei = require("inner/js/index.js"); +const cjsi = __importStar(require("inner/cjs/index.cjs")); +const mjsi = __importStar(require("inner/mjs/index.mjs")); +const typei = __importStar(require("inner/js/index.js")); cjsi; mjsi; typei; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js.diff deleted file mode 100644 index 71abc78e49..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesPackagePatternExportsTrailers(module=node18).js.diff +++ /dev/null @@ -1,50 +0,0 @@ ---- old.nodeModulesPackagePatternExportsTrailers(module=node18).js -+++ new.nodeModulesPackagePatternExportsTrailers(module=node18).js -@@= skipped -83, +83 lines =@@ - typei; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const cjsi = __importStar(require("inner/cjs/index.cjs")); --const mjsi = __importStar(require("inner/mjs/index.mjs")); --const typei = __importStar(require("inner/js/index.js")); -+const cjsi = require("inner/cjs/index.cjs"); -+const mjsi = require("inner/mjs/index.mjs"); -+const typei = require("inner/js/index.js"); - cjsi; - mjsi; - typei; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt index 25c8da6d8e..10ebcd6562 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt @@ -1,4 +1,3 @@ -index.cts(2,25): error TS2339: Property 'name' does not exist on type 'string'. index.cts(5,33): error TS2339: Property 'name' does not exist on type 'string'. @@ -8,11 +7,9 @@ index.cts(5,33): error TS2339: Property 'name' does not exist on type 'string'. import * as ns from "./package.json" with { type: "json" }; export const thing = ns; export const name2 = ns.default.name; -==== index.cts (2 errors) ==== +==== index.cts (1 errors) ==== import pkg from "./package.json"; export const name = pkg.name; - ~~~~ -!!! error TS2339: Property 'name' does not exist on type 'string'. import * as ns from "./package.json"; export const thing = ns; export const name2 = ns.default.name; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt.diff index a992636f5a..0363f40d0f 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).errors.txt.diff @@ -2,7 +2,6 @@ +++ new.nodeModulesResolveJsonModule(module=node18).errors.txt @@= skipped -0, +0 lines =@@ - -+index.cts(2,25): error TS2339: Property 'name' does not exist on type 'string'. +index.cts(5,33): error TS2339: Property 'name' does not exist on type 'string'. + + @@ -12,11 +11,9 @@ + import * as ns from "./package.json" with { type: "json" }; + export const thing = ns; + export const name2 = ns.default.name; -+==== index.cts (2 errors) ==== ++==== index.cts (1 errors) ==== + import pkg from "./package.json"; + export const name = pkg.name; -+ ~~~~ -+!!! error TS2339: Property 'name' does not exist on type 'string'. + import * as ns from "./package.json"; + export const thing = ns; + export const name2 = ns.default.name; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js index 7b856c56e4..f310acacc7 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js @@ -41,11 +41,47 @@ export const thing = ns; export const name2 = ns.default.name; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); exports.name2 = exports.thing = exports.name = void 0; -const package_json_1 = require("./package.json"); +const package_json_1 = __importDefault(require("./package.json")); exports.name = package_json_1.default.name; -const ns = require("./package.json"); +const ns = __importStar(require("./package.json")); exports.thing = ns; exports.name2 = ns.default.name; //// [index.mjs] @@ -68,7 +104,7 @@ export declare const thing: { }; export declare const name2: string; //// [index.d.cts] -export declare const name: any; +export declare const name: string; export declare const thing: { name: string; version: string; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js.diff index d4bae8dd80..dd5c415c8e 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).js.diff @@ -1,62 +1,6 @@ --- old.nodeModulesResolveJsonModule(module=node18).js +++ new.nodeModulesResolveJsonModule(module=node18).js -@@= skipped -40, +40 lines =@@ - export const name2 = ns.default.name; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); --var __importDefault = (this && this.__importDefault) || function (mod) { -- return (mod && mod.__esModule) ? mod : { "default": mod }; --}; - Object.defineProperty(exports, "__esModule", { value: true }); - exports.name2 = exports.thing = exports.name = void 0; --const package_json_1 = __importDefault(require("./package.json")); -+const package_json_1 = require("./package.json"); - exports.name = package_json_1.default.name; --const ns = __importStar(require("./package.json")); -+const ns = require("./package.json"); - exports.thing = ns; - exports.name2 = ns.default.name; - //// [index.mjs] -@@= skipped -63, +27 lines =@@ - }; - export declare const name2: string; - //// [index.d.cts] --export declare const name: string; -+export declare const name: any; - export declare const thing: { +@@= skipped -108, +108 lines =@@ name: string; version: string; type: string; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols index 077c42efc1..569f4b48c0 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols @@ -31,7 +31,9 @@ import pkg from "./package.json"; export const name = pkg.name; >name : Symbol(name, Decl(index.cts, 1, 12)) +>pkg.name : Symbol("name", Decl(package.json, 0, 1)) >pkg : Symbol(pkg, Decl(index.cts, 0, 6)) +>name : Symbol("name", Decl(package.json, 0, 1)) import * as ns from "./package.json"; >ns : Symbol(ns, Decl(index.cts, 2, 6)) @@ -42,9 +44,9 @@ export const thing = ns; export const name2 = ns.default.name; >name2 : Symbol(name2, Decl(index.cts, 4, 12)) ->ns.default : Symbol(pkg, Decl(package.json, 3, 21)) +>ns.default : Symbol(default, Decl(package.json, 3, 21)) >ns : Symbol(ns, Decl(index.cts, 2, 6)) ->default : Symbol(pkg, Decl(package.json, 3, 21)) +>default : Symbol(default, Decl(package.json, 3, 21)) === index.mts === import pkg from "./package.json" with { type: "json" }; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols.diff index ce50a4c883..9001e12b6d 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).symbols.diff @@ -1,26 +1,16 @@ --- old.nodeModulesResolveJsonModule(module=node18).symbols +++ new.nodeModulesResolveJsonModule(module=node18).symbols -@@= skipped -30, +30 lines =@@ - - export const name = pkg.name; - >name : Symbol(name, Decl(index.cts, 1, 12)) -->pkg.name : Symbol("name", Decl(package.json, 0, 1)) - >pkg : Symbol(pkg, Decl(index.cts, 0, 6)) -->name : Symbol("name", Decl(package.json, 0, 1)) - - import * as ns from "./package.json"; - >ns : Symbol(ns, Decl(index.cts, 2, 6)) -@@= skipped -13, +11 lines =@@ +@@= skipped -43, +43 lines =@@ export const name2 = ns.default.name; >name2 : Symbol(name2, Decl(index.cts, 4, 12)) ->ns.default.name : Symbol("name", Decl(package.json, 0, 1)) ->ns.default : Symbol("package") -+>ns.default : Symbol(pkg, Decl(package.json, 3, 21)) ++>ns.default : Symbol(default, Decl(package.json, 3, 21)) >ns : Symbol(ns, Decl(index.cts, 2, 6)) ->default : Symbol("package") ->name : Symbol("name", Decl(package.json, 0, 1)) -+>default : Symbol(pkg, Decl(package.json, 3, 21)) ++>default : Symbol(default, Decl(package.json, 3, 21)) === index.mts === import pkg from "./package.json" with { type: "json" }; \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types index 915882d58a..8fd2b5dc73 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types @@ -29,13 +29,13 @@ export const name2 = ns.default.name; === index.cts === import pkg from "./package.json"; ->pkg : string +>pkg : { name: string; version: string; type: string; default: string; } export const name = pkg.name; ->name : any ->pkg.name : any ->pkg : string ->name : any +>name : string +>pkg.name : string +>pkg : { name: string; version: string; type: string; default: string; } +>name : string import * as ns from "./package.json"; >ns : { name: string; version: string; type: string; default: string; } diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types.diff index 55b9ba98d8..9c95540b00 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesResolveJsonModule(module=node18).types.diff @@ -18,22 +18,8 @@ export const thing = ns; >thing : { default: { name: string; version: string; type: string; default: string; }; } -@@= skipped -16, +16 lines =@@ - - === index.cts === - import pkg from "./package.json"; -->pkg : { name: string; version: string; type: string; default: string; } -+>pkg : string - - export const name = pkg.name; -->name : string -->pkg.name : string -->pkg : { name: string; version: string; type: string; default: string; } -->name : string -+>name : any -+>pkg.name : any -+>pkg : string -+>name : any +@@= skipped -25, +25 lines =@@ + >name : string import * as ns from "./package.json"; ->ns : { name: string; version: string; type: string; default: { name: string; version: string; type: string; default: string; }; } @@ -67,7 +53,7 @@ export const name = pkg.name; >name : string -@@= skipped -36, +36 lines =@@ +@@= skipped -27, +27 lines =@@ import * as ns from "./package.json" with { type: "json" }; >ns : { default: { name: string; version: string; type: string; default: string; }; } diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types index 9e80a34c40..f4631698cc 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types @@ -25,9 +25,9 @@ export async function f() { >"../index.js" : "../index.js" const mod4 = await import ("./index.js"); ->mod4 : typeof mod2 ->await import ("./index.js") : typeof mod2 ->import ("./index.js") : Promise +>mod4 : { f(): Promise; default: typeof mod2; } +>await import ("./index.js") : { f(): Promise; default: typeof mod2; } +>import ("./index.js") : Promise<{ f(): Promise; default: typeof mod2; }> >"./index.js" : "./index.js" h(); @@ -59,9 +59,9 @@ export async function h() { >"./index.js" : "./index.js" const mod4 = await import ("./subfolder/index.js"); ->mod4 : typeof mod2 ->await import ("./subfolder/index.js") : typeof mod2 ->import ("./subfolder/index.js") : Promise +>mod4 : { f(): Promise; default: typeof mod2; } +>await import ("./subfolder/index.js") : { f(): Promise; default: typeof mod2; } +>import ("./subfolder/index.js") : Promise<{ f(): Promise; default: typeof mod2; }> >"./subfolder/index.js" : "./subfolder/index.js" f(); diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types.diff deleted file mode 100644 index 9107b20b33..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesSynchronousCallErrors(module=node18).types.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.nodeModulesSynchronousCallErrors(module=node18).types -+++ new.nodeModulesSynchronousCallErrors(module=node18).types -@@= skipped -24, +24 lines =@@ - >"../index.js" : "../index.js" - - const mod4 = await import ("./index.js"); -->mod4 : { f(): Promise; default: typeof mod2; } -->await import ("./index.js") : { f(): Promise; default: typeof mod2; } -->import ("./index.js") : Promise<{ f(): Promise; default: typeof mod2; }> -+>mod4 : typeof mod2 -+>await import ("./index.js") : typeof mod2 -+>import ("./index.js") : Promise - >"./index.js" : "./index.js" - - h(); -@@= skipped -34, +34 lines =@@ - >"./index.js" : "./index.js" - - const mod4 = await import ("./subfolder/index.js"); -->mod4 : { f(): Promise; default: typeof mod2; } -->await import ("./subfolder/index.js") : { f(): Promise; default: typeof mod2; } -->import ("./subfolder/index.js") : Promise<{ f(): Promise; default: typeof mod2; }> -+>mod4 : typeof mod2 -+>await import ("./subfolder/index.js") : typeof mod2 -+>import ("./subfolder/index.js") : Promise - >"./subfolder/index.js" : "./subfolder/index.js" - - f(); \ No newline at end of file diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js index 5d04cf2e87..b91a324b32 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js @@ -35,8 +35,11 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.default = getInterR(); //// [index.js] "use strict"; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; Object.defineProperty(exports, "__esModule", { value: true }); -const uses_js_1 = require("./uses.js"); +const uses_js_1 = __importDefault(require("./uses.js")); exports.default = uses_js_1.default; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js.diff index d790a874de..d2d7bc4ed9 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js.diff +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js.diff @@ -1,19 +1,6 @@ --- old.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js +++ new.nodeModulesTripleSlashReferenceModeDeclarationEmit6(module=node18).js -@@= skipped -34, +34 lines =@@ - exports.default = getInterR(); - //// [index.js] - "use strict"; --var __importDefault = (this && this.__importDefault) || function (mod) { -- return (mod && mod.__esModule) ? mod : { "default": mod }; --}; - Object.defineProperty(exports, "__esModule", { value: true }); --const uses_js_1 = __importDefault(require("./uses.js")); -+const uses_js_1 = require("./uses.js"); - exports.default = uses_js_1.default; - - -@@= skipped -13, +10 lines =@@ +@@= skipped -47, +47 lines =@@ declare const _default: RequireInterface; export default _default; //// [index.d.ts] diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js index 783825d4ba..0a09964a04 100644 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js @@ -62,9 +62,42 @@ import * as mod from "inner"; mod.correctVersionApplied; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const mod = require("inner"); +const mod = __importStar(require("inner")); mod.correctVersionApplied; diff --git a/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js.diff deleted file mode 100644 index 8c6758c2f8..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodeModulesTypesVersionPackageExports(module=node18).js.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- old.nodeModulesTypesVersionPackageExports(module=node18).js -+++ new.nodeModulesTypesVersionPackageExports(module=node18).js -@@= skipped -61, +61 lines =@@ - mod.correctVersionApplied; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const mod = __importStar(require("inner")); -+const mod = require("inner"); - mod.correctVersionApplied; - diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js index e1a383e4d9..dc65d690cf 100644 --- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js @@ -30,9 +30,42 @@ import * as self from "package"; self; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // esm format file -const self = require("package"); +const self = __importStar(require("package")); self; diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js.diff deleted file mode 100644 index 6f36f54177..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfName(module=node18).js.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- old.nodePackageSelfName(module=node18).js -+++ new.nodePackageSelfName(module=node18).js -@@= skipped -29, +29 lines =@@ - self; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // esm format file --const self = __importStar(require("package")); -+const self = require("package"); - self; - diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js index d8b9f2d540..f9d633df6f 100644 --- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js +++ b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js @@ -30,9 +30,42 @@ import * as self from "@scope/package"; self; //// [index.cjs] "use strict"; +var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + var desc = Object.getOwnPropertyDescriptor(m, k); + if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { + desc = { enumerable: true, get: function() { return m[k]; } }; + } + Object.defineProperty(o, k2, desc); +}) : (function(o, m, k, k2) { + if (k2 === undefined) k2 = k; + o[k2] = m[k]; +})); +var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { + Object.defineProperty(o, "default", { enumerable: true, value: v }); +}) : function(o, v) { + o["default"] = v; +}); +var __importStar = (this && this.__importStar) || (function () { + var ownKeys = function(o) { + ownKeys = Object.getOwnPropertyNames || function (o) { + var ar = []; + for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; + return ar; + }; + return ownKeys(o); + }; + return function (mod) { + if (mod && mod.__esModule) return mod; + var result = {}; + if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); + __setModuleDefault(result, mod); + return result; + }; +})(); Object.defineProperty(exports, "__esModule", { value: true }); // cjs format file -const self = require("@scope/package"); +const self = __importStar(require("@scope/package")); self; diff --git a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js.diff b/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js.diff deleted file mode 100644 index fae08d9236..0000000000 --- a/testdata/baselines/reference/submodule/conformance/nodePackageSelfNameScoped(module=node18).js.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- old.nodePackageSelfNameScoped(module=node18).js -+++ new.nodePackageSelfNameScoped(module=node18).js -@@= skipped -29, +29 lines =@@ - self; - //// [index.cjs] - "use strict"; --var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- var desc = Object.getOwnPropertyDescriptor(m, k); -- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { -- desc = { enumerable: true, get: function() { return m[k]; } }; -- } -- Object.defineProperty(o, k2, desc); --}) : (function(o, m, k, k2) { -- if (k2 === undefined) k2 = k; -- o[k2] = m[k]; --})); --var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { -- Object.defineProperty(o, "default", { enumerable: true, value: v }); --}) : function(o, v) { -- o["default"] = v; --}); --var __importStar = (this && this.__importStar) || (function () { -- var ownKeys = function(o) { -- ownKeys = Object.getOwnPropertyNames || function (o) { -- var ar = []; -- for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k; -- return ar; -- }; -- return ownKeys(o); -- }; -- return function (mod) { -- if (mod && mod.__esModule) return mod; -- var result = {}; -- if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]); -- __setModuleDefault(result, mod); -- return result; -- }; --})(); - Object.defineProperty(exports, "__esModule", { value: true }); - // cjs format file --const self = __importStar(require("@scope/package")); -+const self = require("@scope/package"); - self; - diff --git a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types.diff b/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types.diff deleted file mode 100644 index e4ba694c72..0000000000 --- a/testdata/baselines/reference/submoduleAccepted/conformance/nodeModulesAllowJsSynchronousCallErrors(module=node18).types.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- old.nodeModulesAllowJsSynchronousCallErrors(module=node18).types -+++ new.nodeModulesAllowJsSynchronousCallErrors(module=node18).types -@@= skipped -24, +24 lines =@@ - >"../index.js" : "../index.js" - - const mod4 = await import ("./index.js"); -->mod4 : { f(): Promise; default: typeof mod2; } -->await import ("./index.js") : { f(): Promise; default: typeof mod2; } -->import ("./index.js") : Promise<{ f(): Promise; default: typeof mod2; }> -+>mod4 : typeof mod2 -+>await import ("./index.js") : typeof mod2 -+>import ("./index.js") : Promise - >"./index.js" : "./index.js" - - h(); -@@= skipped -34, +34 lines =@@ - >"./index.js" : "./index.js" - - const mod4 = await import ("./subfolder/index.js"); -->mod4 : { f(): Promise; default: typeof mod2; } -->await import ("./subfolder/index.js") : { f(): Promise; default: typeof mod2; } -->import ("./subfolder/index.js") : Promise<{ f(): Promise; default: typeof mod2; }> -+>mod4 : typeof mod2 -+>await import ("./subfolder/index.js") : typeof mod2 -+>import ("./subfolder/index.js") : Promise - >"./subfolder/index.js" : "./subfolder/index.js" - - f(); \ No newline at end of file