Shorten by one line

andrewbranch · andrewbranch · commit e828dac33c77 · 2024-09-24T09:38:27.000-07:00
diff --git a/tslib.es6.js b/tslib.es6.js
@@ -357,10 +357,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
         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;
+            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.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
         }
     }
     return path;
diff --git a/tslib.es6.mjs b/tslib.es6.mjs
@@ -356,10 +356,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
       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;
+          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.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
       }
   }
   return path;
diff --git a/tslib.js b/tslib.js
@@ -405,10 +405,9 @@ var __rewriteRelativeImportExtension;
             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;
+                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.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");
             }
         }
         return path;

Original file line number	Diff line number	Diff line change
`@@ -357,10 +357,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {`
`357`	`357`	`if (extMatch) {`
`358`	`358`	`var ext = extMatch[0].toLowerCase();`
`359`	`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;`
	`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`	`362`	`}`
`363`		`- return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`364`	`363`	`}`
`365`	`364`	`}`
`366`	`365`	`return path;`
Original file line number	Diff line number	Diff line change
`@@ -356,10 +356,9 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {`
`356`	`356`	`if (extMatch) {`
`357`	`357`	`var ext = extMatch[0].toLowerCase();`
`358`	`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;`
	`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`	`361`	`}`
`362`		`- return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`363`	`362`	`}`
`364`	`363`	`}`
`365`	`364`	`return path;`
Original file line number	Diff line number	Diff line change
`@@ -405,10 +405,9 @@ var __rewriteRelativeImportExtension;`
`405`	`405`	`if (extMatch) {`
`406`	`406`	`var ext = extMatch[0].toLowerCase();`
`407`	`407`	`var dot = path.lastIndexOf(".", path.length - (ext.length + 1));`
`408`		`- if (dot >= 0 && (path.substring(dot - 2, dot).toLowerCase() === ".d" \|\| path.substring(dot, dot + 2).toLowerCase() === ".d")) {`
`409`		`- return path;`
	`408`	`+ if (dot < 0 \|\| !(path.substring(dot - 2, dot).toLowerCase() === ".d" \|\| path.substring(dot, dot + 2).toLowerCase() === ".d")) {`
	`409`	`+ return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`410`	`410`	`}`
`411`		`- return path.substring(0, path.length - ext.length) + (ext === ".mts" ? ".mjs" : ext === ".cts" ? ".cjs" : ".js");`
`412`	`411`	`}`
`413`	`412`	`}`
`414`	`413`	`return path;`