Rewrite rather than shim literal-argument require/import calls

microsoft · Sep 24, 2024 · 4c9557c · 4c9557c
1 parent 35c6438
commit 4c9557c
Show file tree

Hide file tree

Showing 9 changed files with 105 additions and 31 deletions.
diff --git a/src/compiler/transformers/module/esnextAnd2015.ts b/src/compiler/transformers/module/esnextAnd2015.ts
@@ -81,7 +81,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
     context.enableSubstitution(SyntaxKind.Identifier);
 
     const noSubstitution = new Set<NodeId>();
-    let importsAndRequiresToShim: CallExpression[] | undefined;
+    let importsAndRequiresToRewriteOrShim: CallExpression[] | undefined;
     let helperNameSubstitutions: Map<string, Identifier> | undefined;
     let currentSourceFile: SourceFile | undefined;
     let importRequireStatements: [ImportDeclaration, VariableStatement] | undefined;
@@ -98,7 +98,7 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
             if (compilerOptions.rewriteRelativeImportExtensions && (currentSourceFile.flags & NodeFlags.PossiblyContainsDynamicImport || isInJSFile(node))) {
                 forEachDynamicImportOrRequireCall(node, /*includeTypeSpaceImports*/ false, /*requireStringLiteralLikeArgument*/ false, node => {
                     if (!isStringLiteralLike(node.arguments[0]) || shouldRewriteModuleSpecifier(node.arguments[0].text, compilerOptions)) {
-                        importsAndRequiresToShim = append(importsAndRequiresToShim, node);
+                        importsAndRequiresToRewriteOrShim = append(importsAndRequiresToRewriteOrShim, node);
                     }
                 });
             }
@@ -155,12 +155,12 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
             case SyntaxKind.ImportDeclaration:
                 return visitImportDeclaration(node as ImportDeclaration);
             case SyntaxKind.CallExpression:
-                if (node === importsAndRequiresToShim?.[0]) {
-                    return visitImportOrRequireCall(importsAndRequiresToShim.shift()!);
+                if (node === importsAndRequiresToRewriteOrShim?.[0]) {
+                    return visitImportOrRequireCall(importsAndRequiresToRewriteOrShim.shift()!);
                 }
                 break;
             default:
-                if (importsAndRequiresToShim?.length && rangeContainsRange(node, importsAndRequiresToShim[0])) {
+                if (importsAndRequiresToRewriteOrShim?.length && rangeContainsRange(node, importsAndRequiresToRewriteOrShim[0])) {
                     return visitEachChild(node, visitor, context);
                 }
         }
@@ -190,7 +190,12 @@ export function transformECMAScriptModule(context: TransformationContext): (x: S
             node,
             node.expression,
             node.typeArguments,
-            [emitHelpers().createRewriteRelativeImportExtensionsHelper(node.arguments[0]), ...node.arguments.slice(1)],
+            [
+                isStringLiteralLike(node.arguments[0])
+                    ? rewriteModuleSpecifier(node.arguments[0], compilerOptions)
+                    : emitHelpers().createRewriteRelativeImportExtensionsHelper(node.arguments[0]),
+                ...node.arguments.slice(1),
+            ],
         );
     }
 

diff --git a/src/compiler/transformers/module/module.ts b/src/compiler/transformers/module/module.ts
@@ -217,7 +217,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
 
     let currentSourceFile: SourceFile; // The current file.
     let currentModuleInfo: ExternalModuleInfo; // The ExternalModuleInfo for the current file.
-    let importsAndRequiresToShim: CallExpression[] | undefined;
+    let importsAndRequiresToRewriteOrShim: CallExpression[] | undefined;
     const noSubstitution: boolean[] = []; // Set of nodes for which substitution rules should be ignored.
     let needUMDDynamicImportHelper: boolean;
 
@@ -244,7 +244,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         if (compilerOptions.rewriteRelativeImportExtensions) {
             forEachDynamicImportOrRequireCall(node, /*includeTypeSpaceImports*/ false, /*requireStringLiteralLikeArgument*/ false, node => {
                 if (!isStringLiteralLike(node.arguments[0]) || shouldRewriteModuleSpecifier(node.arguments[0].text, compilerOptions)) {
-                    importsAndRequiresToShim = append(importsAndRequiresToShim, node);
+                    importsAndRequiresToRewriteOrShim = append(importsAndRequiresToRewriteOrShim, node);
                 }
             });
         }
@@ -795,7 +795,7 @@ export function transformModule(context: TransformationContext): (x: SourceFile
     function visitorWorker(node: Node, valueIsDiscarded: boolean): VisitResult<Node> {
         // This visitor does not need to descend into the tree if there is no dynamic import, destructuring assignment, or update expression
         // as export/import statements are only transformed at the top level of a file.
-        if (!(node.transformFlags & (TransformFlags.ContainsDynamicImport | TransformFlags.ContainsDestructuringAssignment | TransformFlags.ContainsUpdateExpressionForIdentifier)) && !importsAndRequiresToShim?.length) {
+        if (!(node.transformFlags & (TransformFlags.ContainsDynamicImport | TransformFlags.ContainsDestructuringAssignment | TransformFlags.ContainsUpdateExpressionForIdentifier)) && !importsAndRequiresToRewriteOrShim?.length) {
             return node;
         }
 
@@ -809,15 +809,15 @@ export function transformModule(context: TransformationContext): (x: SourceFile
             case SyntaxKind.PartiallyEmittedExpression:
                 return visitPartiallyEmittedExpression(node as PartiallyEmittedExpression, valueIsDiscarded);
             case SyntaxKind.CallExpression:
-                const needsShim = node === firstOrUndefined(importsAndRequiresToShim);
-                if (needsShim) {
-                    importsAndRequiresToShim!.shift();
+                const needsRewrite = node === firstOrUndefined(importsAndRequiresToRewriteOrShim);
+                if (needsRewrite) {
+                    importsAndRequiresToRewriteOrShim!.shift();
                 }
                 if (isImportCall(node) && host.shouldTransformImportCall(currentSourceFile)) {
-                    return visitImportCallExpression(node, needsShim);
+                    return visitImportCallExpression(node, needsRewrite);
                 }
-                else if (needsShim) {
-                    return shimImportOrRequireCall(node as CallExpression);
+                else if (needsRewrite) {
+                    return shimOrRewriteImportOrRequireCall(node as CallExpression);
                 }
                 break;
             case SyntaxKind.BinaryExpression:
@@ -1189,21 +1189,23 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         return visitEachChild(node, visitor, context);
     }
 
-    function shimImportOrRequireCall(node: CallExpression): CallExpression {
+    function shimOrRewriteImportOrRequireCall(node: CallExpression): CallExpression {
         return factory.updateCallExpression(
             node,
             node.expression,
             /*typeArguments*/ undefined,
             visitNodes(node.arguments, (arg: Expression) => {
                 if (arg === node.arguments[0]) {
-                    return emitHelpers().createRewriteRelativeImportExtensionsHelper(arg);
+                    return isStringLiteralLike(arg)
+                        ? rewriteModuleSpecifier(arg, compilerOptions)
+                        : emitHelpers().createRewriteRelativeImportExtensionsHelper(arg);
                 }
                 return visitor(arg);
             }, isExpression),
         );
     }
 
-    function visitImportCallExpression(node: ImportCall, shim: boolean): Expression {
+    function visitImportCallExpression(node: ImportCall, rewriteOrShim: boolean): Expression {
         if (moduleKind === ModuleKind.None && languageVersion >= ScriptTarget.ES2020) {
             return visitEachChild(node, visitor, context);
         }
@@ -1212,7 +1214,9 @@ export function transformModule(context: TransformationContext): (x: SourceFile
         // Only use the external module name if it differs from the first argument. This allows us to preserve the quote style of the argument on output.
         const argument = externalModuleName && (!firstArgument || !isStringLiteral(firstArgument) || firstArgument.text !== externalModuleName.text)
             ? externalModuleName
-            : firstArgument && shim ? emitHelpers().createRewriteRelativeImportExtensionsHelper(firstArgument) : firstArgument;
+            : firstArgument && rewriteOrShim
+            ? isStringLiteral(firstArgument) ? rewriteModuleSpecifier(firstArgument, compilerOptions) : emitHelpers().createRewriteRelativeImportExtensionsHelper(firstArgument)
+            : firstArgument;
         const containsLexicalThis = !!(node.transformFlags & TransformFlags.ContainsLexicalThis);
         switch (compilerOptions.module) {
             case ModuleKind.AMD:

diff --git a/tests/baselines/reference/emit(jsx=preserve).js b/tests/baselines/reference/emit(jsx=preserve).js
@@ -78,8 +78,8 @@ const foo = require("./foo.js");
 import "./foo.js";
 export * from "./foo.js";
 //Shim
-import(__rewriteRelativeImportExtension("./foo.ts", true));
-import(__rewriteRelativeImportExtension("./foo.ts", true), { with: { attr: "value" } });
+import("./foo.js");
+import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts", true));
 //// [js.js]
 var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
@@ -106,11 +106,11 @@ import {} from "./foo.jsx";
 import "./foo.js";
 export * from "./foo.js";
 // Shim
-import(__rewriteRelativeImportExtension("./foo.ts", true));
-import(__rewriteRelativeImportExtension("./foo.ts", true), { with: { attr: "value" } });
-require(__rewriteRelativeImportExtension("./foo.ts", true));
+import("./foo.js");
+import("./foo.js", { with: { attr: "value" } });
+require("./foo.js");
 {
-    require(__rewriteRelativeImportExtension("./foo.ts", true));
+    require("./foo.js");
     require(__rewriteRelativeImportExtension(getPath(), true));
 }
 // No rewrite or shim

diff --git a/tests/baselines/reference/emit(jsx=react).js b/tests/baselines/reference/emit(jsx=react).js
@@ -78,8 +78,8 @@ const foo = require("./foo.js");
 import "./foo.js";
 export * from "./foo.js";
 //Shim
-import(__rewriteRelativeImportExtension("./foo.ts"));
-import(__rewriteRelativeImportExtension("./foo.ts"), { with: { attr: "value" } });
+import("./foo.js");
+import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts"));
 //// [js.js]
 var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
@@ -106,11 +106,11 @@ import {} from "./foo.js";
 import "./foo.js";
 export * from "./foo.js";
 // Shim
-import(__rewriteRelativeImportExtension("./foo.ts"));
-import(__rewriteRelativeImportExtension("./foo.ts"), { with: { attr: "value" } });
-require(__rewriteRelativeImportExtension("./foo.ts"));
+import("./foo.js");
+import("./foo.js", { with: { attr: "value" } });
+require("./foo.js");
 {
-    require(__rewriteRelativeImportExtension("./foo.ts"));
+    require("./foo.js");
     require(__rewriteRelativeImportExtension(getPath()));
 }
 // No rewrite or shim

diff --git a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).errors.txt b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).errors.txt
@@ -0,0 +1,25 @@
+a.js(4,11): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+a.js(5,10): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+b.ts(3,10): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+
+
+==== a.js (2 errors) ====
+    {
+      require("" + "./foo.ts");
+      import("" + "./foo.ts");
+      require("./foo.ts");
+              ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+      import("./foo.ts");
+             ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    }
+
+==== b.ts (1 errors) ====
+    {
+      import("" + "./foo.ts");
+      import("./foo.ts");
+             ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    }
+
diff --git a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
@@ -4,11 +4,14 @@
 {
   require("" + "./foo.ts");
   import("" + "./foo.ts");
+  require("./foo.ts");
+  import("./foo.ts");
 }
 
 //// [b.ts]
 {
   import("" + "./foo.ts");
+  import("./foo.ts");
 }
 
 
@@ -32,6 +35,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 {
     require(__rewriteRelativeImportExtension("" + "./foo.ts"));
     Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
+    require("./foo.js");
+    Promise.resolve().then(() => require("./foo.js"));
 }
 //// [b.js]
 var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
@@ -52,4 +57,5 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 };
 {
     Promise.resolve(`${__rewriteRelativeImportExtension("" + "./foo.ts")}`).then(s => require(s));
+    Promise.resolve().then(() => require("./foo.js"));
 }
diff --git a/tests/baselines/reference/emitModuleCommonJS(module=nodenext).errors.txt b/tests/baselines/reference/emitModuleCommonJS(module=nodenext).errors.txt
@@ -0,0 +1,25 @@
+a.js(4,11): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+a.js(5,10): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+b.ts(3,10): error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+
+
+==== a.js (2 errors) ====
+    {
+      require("" + "./foo.ts");
+      import("" + "./foo.ts");
+      require("./foo.ts");
+              ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+      import("./foo.ts");
+             ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    }
+
+==== b.ts (1 errors) ====
+    {
+      import("" + "./foo.ts");
+      import("./foo.ts");
+             ~~~~~~~~~~
+!!! error TS2307: Cannot find module './foo.ts' or its corresponding type declarations.
+    }
+
diff --git a/tests/baselines/reference/emitModuleCommonJS(module=nodenext).js b/tests/baselines/reference/emitModuleCommonJS(module=nodenext).js
@@ -4,11 +4,14 @@
 {
   require("" + "./foo.ts");
   import("" + "./foo.ts");
+  require("./foo.ts");
+  import("./foo.ts");
 }
 
 //// [b.ts]
 {
   import("" + "./foo.ts");
+  import("./foo.ts");
 }
 
 
@@ -33,6 +36,8 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 {
     require(__rewriteRelativeImportExtension("" + "./foo.ts"));
     import(__rewriteRelativeImportExtension("" + "./foo.ts"));
+    require("./foo.js");
+    import("./foo.js");
 }
 //// [b.js]
 "use strict";
@@ -55,4 +60,5 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 Object.defineProperty(exports, "__esModule", { value: true });
 {
     import(__rewriteRelativeImportExtension("" + "./foo.ts"));
+    import("./foo.js");
 }
diff --git a/...s/cases/conformance/externalModules/rewriteRelativeImportExtensions/emitModuleCommonJS.ts b/...s/cases/conformance/externalModules/rewriteRelativeImportExtensions/emitModuleCommonJS.ts
@@ -9,9 +9,12 @@
 {
   require("" + "./foo.ts");
   import("" + "./foo.ts");
+  require("./foo.ts");
+  import("./foo.ts");
 }
 
 // @Filename: b.ts
 {
   import("" + "./foo.ts");
+  import("./foo.ts");
 }