@reliverse/pathkit 1.1.7 → 1.1.9

package/bin/mod.d.ts

@@ -19,7 +19,7 @@ export interface FormatInputPathObject {
     name?: string;
 }
 type PathExtFilter = "js" | "ts" | "none" | "js-ts-none";
-type ImportExtType = "js" | "ts" | "none" | "none-and-js";
+type ImportExtType = "js" | "ts" | "none";
 /**
  * normalizes windows paths to use forward slashes
  */

package/bin/mod.js

@@ -576,12 +576,20 @@ async function convertImportsExt({
   extFrom,
   extTo
 }) {
-  const fromExtStr = extFrom === "none" ? "" : extFrom === "none-and-js" ? "(?:\\.js)?" : `.${extFrom}`;
+  const fromExtStr = extFrom === "none" ? "" : `.${extFrom}`;
   const toExtStr = extTo === "none" ? "" : `.${extTo}`;
   const importRegex = new RegExp(
     `(?:import\\s+(?:[\\s\\S]*?)\\s+from\\s+|import\\s*\\(\\s*)\\s*(['"])([^'"]+${fromExtStr.replace(".", "\\.")})(\\1)`,
     "g"
   );
+  function shouldSkipPath(path2) {
+    if (path2.startsWith("node:") || path2.startsWith("bun:") || path2.startsWith("npm:") || path2.startsWith("jsr:") || path2.startsWith("node_modules"))
+      return true;
+    if (path2.startsWith("@") || !path2.includes("/")) return true;
+    if (path2.startsWith("http://") || path2.startsWith("https://")) return true;
+    if (extTo !== "none" && path2.endsWith(`.${extTo}`)) return true;
+    return false;
+  }
   try {
     const entries = await fs.readdir(targetDir, { withFileTypes: true });
     const results = [];
@@ -606,15 +614,13 @@ async function convertImportsExt({
             const quote = match[1];
             const importPath = match[2];
             if (!importPath) continue;
+            if (shouldSkipPath(importPath)) {
+              match = importRegex.exec(updated);
+              continue;
+            }
             let replacementPath;
             if (extFrom === "none") {
               replacementPath = importPath + toExtStr;
-            } else if (extFrom === "none-and-js") {
-              if (importPath.endsWith(".js")) {
-                replacementPath = importPath.slice(0, -3) + toExtStr;
-              } else {
-                replacementPath = importPath + toExtStr;
-              }
             } else if (extTo === "none") {
               replacementPath = importPath.slice(0, -fromExtStr.length);
             } else {

package/package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "name": "@reliverse/pathkit",
   "type": "module",
-  "version": "1.1.7",
+  "version": "1.1.9",
   "devDependencies": {},
   "exports": {
     ".": "./bin/mod.js"