Combine tsx case into regex

microsoft · Sep 24, 2024 · 9c731e9 · 9c731e9
1 parent 1c03288
commit 9c731e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 18 deletions.
diff --git a/tslib.es6.js b/tslib.es6.js
@@ -349,12 +349,9 @@ export function __disposeResources(env) {
 }
 
 export function __rewriteRelativeImportExtension(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");
-        }
-        return path.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
-            return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
+    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 || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
         });
     }
     return path;

diff --git a/tslib.es6.mjs b/tslib.es6.mjs
@@ -348,12 +348,9 @@ export function __disposeResources(env) {
 }
 
 export function __rewriteRelativeImportExtension(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");
-      }
-      return path.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
-          return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
+  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 || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
       });
   }
   return path;

diff --git a/tslib.js b/tslib.js
@@ -397,12 +397,9 @@ var __rewriteRelativeImportExtension;
     };
 
     __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");
-            }
-            return path.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
-                return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
+        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 || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
             });
         }
         return path;