Test and fix invalid declaration-looking extensions

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

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/test/node/rewriteRelativeImportExtension.test.js b/test/node/rewriteRelativeImportExtension.test.js
@@ -9,6 +9,7 @@ testHelper("__rewriteRelativeImportExtension", __rewriteRelativeImportExtension
     assert.equal(__rewriteRelativeImportExtension("../../foo.ts"), "../../foo.js");
     assert.equal(__rewriteRelativeImportExtension("./foo.TS"), "./foo.js");
     assert.equal(__rewriteRelativeImportExtension("./foo.Ts"), "./foo.js");
+    assert.equal(__rewriteRelativeImportExtension("./foo/.hidden/foo.ts"), "./foo/.hidden/foo.js");
   });
 
   test("rewrites other TypeScript extensions", () => {
@@ -17,6 +18,8 @@ testHelper("__rewriteRelativeImportExtension", __rewriteRelativeImportExtension
     assert.equal(__rewriteRelativeImportExtension("./foo.tsx"), "./foo.js");
     assert.equal(__rewriteRelativeImportExtension("./foo.tsx", true), "./foo.jsx");
     assert.equal(__rewriteRelativeImportExtension("./foo.Tsx", true), "./foo.jsx");
+    assert.equal(__rewriteRelativeImportExtension("./foo.d.css.mts"), "./foo.d.css.mjs");
+    assert.equal(__rewriteRelativeImportExtension("./foo.d.tsx"), "./foo.d.js");
   });
 
   test("does not rewrite other extensions", () => {

diff --git a/tslib.es6.js b/tslib.es6.js
@@ -354,7 +354,7 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
             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 : ("." + (cm || "").toLowerCase() + "js");
+            return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
         });
     }
     return path;

diff --git a/tslib.es6.mjs b/tslib.es6.mjs
@@ -353,7 +353,7 @@ export function __rewriteRelativeImportExtension(path, preserveJsx) {
           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 : ("." + (cm || "").toLowerCase() + "js");
+          return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
       });
   }
   return path;

diff --git a/tslib.js b/tslib.js
@@ -402,7 +402,7 @@ var __rewriteRelativeImportExtension;
                 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 : ("." + (cm || "").toLowerCase() + "js");
+                return d && (ext && !cm || !ext) ? m : ((d || "") + (ext || "") + "." + (cm || "").toLowerCase() + "js");
             });
         }
         return path;