Sync helper content

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

Hide file tree

Showing 5 changed files with 47 additions and 119 deletions.
diff --git a/src/compiler/factory/emitHelpers.ts b/src/compiler/factory/emitHelpers.ts
@@ -1444,21 +1444,13 @@ const rewriteRelativeImportExtensionsHelper: UnscopedEmitHelper = {
     scoped: false,
     text: `
         var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-            if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-                if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-                    return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-                }
-                var extMatch = path.match(/\\.[cm]?ts$/i);
-                if (extMatch) {
-                    var ext = extMatch[0].toLowerCase();
-                    var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-                    if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                        return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-                    }
-                }
-            }
-            return path;
-        };`,
+        if (typeof path === "string" && /^\\.\\.?\\//.test(path)) {
+            return path.replace(/\\.(tsx)$|((?:\\.d)?)((?:\\.[^./]+?)?)\\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+                return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+            });
+        }
+        return path;
+    };`,
 };
 
 /** @internal */

diff --git a/tests/baselines/reference/emit(jsx=preserve).js b/tests/baselines/reference/emit(jsx=preserve).js
@@ -53,19 +53,11 @@ require("node:path");
 
 
 //// [main.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };
@@ -82,19 +74,11 @@ import("./foo.js");
 import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts", true));
 //// [js.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };

diff --git a/tests/baselines/reference/emit(jsx=react).js b/tests/baselines/reference/emit(jsx=react).js
@@ -53,19 +53,11 @@ require("node:path");
 
 
 //// [main.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };
@@ -82,19 +74,11 @@ import("./foo.js");
 import("./foo.js", { with: { attr: "value" } });
 import(__rewriteRelativeImportExtension("" + "./foo.ts"));
 //// [js.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };

diff --git a/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js b/tests/baselines/reference/emitModuleCommonJS(module=commonjs).js
@@ -16,19 +16,11 @@
 
 
 //// [a.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };
@@ -39,19 +31,11 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
     Promise.resolve().then(() => require("./foo.js"));
 }
 //// [b.js]
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };

diff --git a/tests/baselines/reference/emitModuleCommonJS(module=nodenext).js b/tests/baselines/reference/emitModuleCommonJS(module=nodenext).js
@@ -17,19 +17,11 @@
 
 //// [a.js]
 "use strict";
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };
@@ -41,19 +33,11 @@ var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExte
 }
 //// [b.js]
 "use strict";
-var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
-    if (typeof path === "string" && path[0] === "." && (path[1] === "/" || path[1] === "." && path[2] === "/")) {
-        if (path.substring(path.length - 4).toLowerCase() === ".tsx") {
-            return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");
-        }
-        var extMatch = path.match(/\.[cm]?ts$/i);
-        if (extMatch) {
-            var ext = extMatch[0].toLowerCase();
-            var dot = path.lastIndexOf(".", path.length - (ext.length + 1));
-            if (dot < 0 || !(path.substring(dot - 2, dot).toLowerCase() === ".d" || path.substring(dot, dot + 2).toLowerCase() === ".d")) {
-                return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
-            }
-        }
+    var __rewriteRelativeImportExtension = (this && this.__rewriteRelativeImportExtension) || function (path, preserveJsx) {
+    if (typeof path === "string" && /^\.\.?\//.test(path)) {
+        return path.replace(/\.(tsx)$|((?:\.d)?)((?:\.[^./]+?)?)\.([cm]?)ts$/i, function (m, tsx, d, ext, cm) {
+            return tsx ? preserveJsx ? ".jsx" : ".js" : d && (!ext || !cm) ? m : (d + ext + "." + cm.toLowerCase() + "js");
+        });
     }
     return path;
 };