Properly resolve specifiers in import.defer(...)

Author: nicolo-ribaudo

src/compiler/utilities.ts

@@ -12074,7 +12074,7 @@ export function forEachDynamicImportOrRequireCall<IncludeTypeSpaceImports extend
     cb: (node: CallExpression | (IncludeTypeSpaceImports extends false ? never : JSDocImportTag | ImportTypeNode), argument: RequireStringLiteralLikeArgument extends true ? StringLiteralLike : Expression) => void,
 ): void {
     const isJavaScriptFile = isInJSFile(file);
-    const r = /import|require/g;
+    const r = /import|defer|require/g;
     while (r.exec(file.text) !== null) { // eslint-disable-line no-restricted-syntax
         const node = getNodeAtPosition(file, r.lastIndex, /*includeJSDoc*/ includeTypeSpaceImports);
         if (isJavaScriptFile && isRequireCall(node, requireStringLiteralLikeArgument)) {

tests/baselines/reference/dynamicImportDefer(module=commonjs).errors.txt

@@ -12,6 +12,4 @@ b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module
 !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
       ns.foo();
     });
-    
-    import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 

tests/baselines/reference/dynamicImportDefer(module=commonjs).js

@@ -9,8 +9,6 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 
 
 //// [a.js]
@@ -24,4 +22,3 @@ function foo() {
 import.defer("./a.js").then(ns => {
     ns.foo();
 });
-Promise.resolve().then(() => require("./a.js")); // TODO: Without this the import.defer cannot resolve ./a

tests/baselines/reference/dynamicImportDefer(module=commonjs).symbols

@@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->"./a.js" : Symbol("a", Decl(a.ts, 0, 0))
-

tests/baselines/reference/dynamicImportDefer(module=commonjs).types

@@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->import("./a.js") : Promise<typeof import("a")>
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.js" : "./a.js"
->         : ^^^^^^^^
-

tests/baselines/reference/dynamicImportDefer(module=es2015).errors.txt

@@ -1,20 +1,15 @@
 b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
-b.ts(5,1): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', or 'nodenext'.
 
 
 ==== a.ts (0 errors) ====
     export function foo() {
       console.log("foo from a");
     }
 
-==== b.ts (2 errors) ====
+==== b.ts (1 errors) ====
     import.defer("./a.js").then(ns => {
     ~~~~~~~~~~~~~~~~~~~~~~
 !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
       ns.foo();
     });
-    
-    import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
-    ~~~~~~~~~~~~~~~~
-!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', or 'nodenext'.
 

tests/baselines/reference/dynamicImportDefer(module=es2015).js

@@ -9,8 +9,6 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 
 
 //// [a.js]
@@ -21,4 +19,3 @@ export function foo() {
 import.defer("./a.js").then(ns => {
     ns.foo();
 });
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

tests/baselines/reference/dynamicImportDefer(module=es2015).symbols

@@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->"./a.js" : Symbol("a", Decl(a.ts, 0, 0))
-

tests/baselines/reference/dynamicImportDefer(module=es2015).types

@@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->import("./a.js") : Promise<typeof import("a")>
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.js" : "./a.js"
->         : ^^^^^^^^
-

tests/baselines/reference/dynamicImportDefer(module=es2020).errors.txt

@@ -12,6 +12,4 @@ b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module
 !!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
       ns.foo();
     });
-    
-    import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 

tests/baselines/reference/dynamicImportDefer(module=es2020).js

@@ -9,8 +9,6 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 
 
 //// [a.js]
@@ -21,4 +19,3 @@ export function foo() {
 import.defer("./a.js").then(ns => {
     ns.foo();
 });
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

tests/baselines/reference/dynamicImportDefer(module=es2020).symbols

@@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->"./a.js" : Symbol("a", Decl(a.ts, 0, 0))
-

tests/baselines/reference/dynamicImportDefer(module=es2020).types

@@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->import("./a.js") : Promise<typeof import("a")>
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.js" : "./a.js"
->         : ^^^^^^^^
-

tests/baselines/reference/dynamicImportDefer(module=esnext).js

@@ -9,8 +9,6 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 
 
 //// [a.js]
@@ -21,4 +19,3 @@ export function foo() {
 import.defer("./a.js").then(ns => {
     ns.foo();
 });
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

tests/baselines/reference/dynamicImportDefer(module=esnext).symbols

@@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->"./a.js" : Symbol("a", Decl(a.ts, 0, 0))
-

tests/baselines/reference/dynamicImportDefer(module=esnext).types

@@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->import("./a.js") : Promise<typeof import("a")>
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.js" : "./a.js"
->         : ^^^^^^^^
-

tests/baselines/reference/dynamicImportDefer(module=nodenext).js

@@ -9,8 +9,6 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
 
 
 //// [a.js]
@@ -26,4 +24,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 import.defer("./a.js").then(ns => {
     ns.foo();
 });
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

tests/baselines/reference/dynamicImportDefer(module=nodenext).symbols

@@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->"./a.js" : Symbol("a", Decl(a.ts, 0, 0))
-

tests/baselines/reference/dynamicImportDefer(module=nodenext).types

@@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {
 
 });
 
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
->import("./a.js") : Promise<{ default: typeof import("a"); foo(): void; }>
->                 : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
->"./a.js" : "./a.js"
->         : ^^^^^^^^
-

tests/cases/conformance/importDefer/dynamicImportDefer.ts

@@ -10,5 +10,3 @@ export function foo() {
 import.defer("./a.js").then(ns => {
   ns.foo();
 });
-
-import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a