Do more with a regex

andrewbranch · andrewbranch · commit a55e9f7a805d · 2024-09-24T13:57:49.000-07:00
diff --git a/tslib.es6.js b/tslib.es6.js
@@ -353,14 +353,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
         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.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
+            return d && (ext && !cm || !ext) ? m : ("." + (cm || "").toLowerCase() + "js");
+        });
     }
     return path;
 }
diff --git a/tslib.es6.mjs b/tslib.es6.mjs
@@ -352,14 +352,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
       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.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
+          return d && (ext && !cm || !ext) ? m : ("." + (cm || "").toLowerCase() + "js");
+      });
   }
   return path;
 }
diff --git a/tslib.js b/tslib.js
@@ -401,14 +401,9 @@ var __rewriteRelativeImportExtension;
             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.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {
+                return d && (ext && !cm || !ext) ? m : ("." + (cm || "").toLowerCase() + "js");
+            });
         }
         return path;
     };

Original file line number	Diff line number	Diff line change
`@@ -353,14 +353,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {`
`353`	`353`	`if (path.substring(path.length - 4).toLowerCase() === ".tsx") {`
`354`	`354`	`return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");`
`355`	`355`	`}`
`356`		`- var extMatch = path.match(/\.[cm]?ts$/i);`
`357`		`- if (extMatch) {`
`358`		`- var ext = extMatch[0].toLowerCase();`
`359`		`- var dot = path.lastIndexOf(".", path.length - (ext.length + 1));`
`360`		`- if (dot < 0 \|\| !(path.substring(dot - 2, dot).toLowerCase() === ".d" \|\| path.substring(dot, dot + 2).toLowerCase() === ".d")) {`
`361`		`- return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`362`		`- }`
`363`		`- }`
	`356`	`+ return path.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {`
	`357`	`+ return d && (ext && !cm \|\| !ext) ? m : ("." + (cm \|\| "").toLowerCase() + "js");`
	`358`	`+ });`
`364`	`359`	`}`
`365`	`360`	`return path;`
`366`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -352,14 +352,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {`
`352`	`352`	`if (path.substring(path.length - 4).toLowerCase() === ".tsx") {`
`353`	`353`	`return path.substring(0, path.length - 4) + (preserveJsx ? ".jsx" : ".js");`
`354`	`354`	`}`
`355`		`- var extMatch = path.match(/\.[cm]?ts$/i);`
`356`		`- if (extMatch) {`
`357`		`- var ext = extMatch[0].toLowerCase();`
`358`		`- var dot = path.lastIndexOf(".", path.length - (ext.length + 1));`
`359`		`- if (dot < 0 \|\| !(path.substring(dot - 2, dot).toLowerCase() === ".d" \|\| path.substring(dot, dot + 2).toLowerCase() === ".d")) {`
`360`		`- return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`361`		`- }`
`362`		`- }`
	`355`	`+ return path.replace(/(\.d)?(\.[^./]+?)?\.([cm])?ts$/i, function (m, d, ext, cm) {`
	`356`	`+ return d && (ext && !cm \|\| !ext) ? m : ("." + (cm \|\| "").toLowerCase() + "js");`
	`357`	`+ });`
`363`	`358`	`}`
`364`	`359`	`return path;`
`365`	`360`	`}`