@reliverse/pathkit 1.1.6 → 1.1.7

package/bin/impl/getFileImportsExports.js

@@ -29,7 +29,7 @@ export function getFileImportsExports(content, options = {}) {
     const specifiers = [];
     const isTypeOnly = statement.includes("import type") || statement.includes("export type");
     const namespaceMatch = /(?:import|export)\s+(?:type\s+)?\*\s+as\s+(\w+)/.exec(statement);
-    if (namespaceMatch) {
+    if (namespaceMatch?.[1]) {
       specifiers.push({
         type: "namespace",
         name: namespaceMatch[1],
@@ -40,7 +40,7 @@ export function getFileImportsExports(content, options = {}) {
     const defaultMatch = /import\s+(?:type\s+)?(\w+)(?:\s*,|\s+from)/.exec(
       statement
     );
-    if (defaultMatch && !statement.includes("{")) {
+    if (defaultMatch?.[1] && !statement.includes("{")) {
       specifiers.push({
         type: "default",
         name: defaultMatch[1],
@@ -48,14 +48,16 @@ export function getFileImportsExports(content, options = {}) {
       });
     }
     const namedMatch = /{([^}]*)}/.exec(statement);
-    if (namedMatch) {
+    if (namedMatch?.[1]) {
       const items = namedMatch[1].split(",").map((item) => item.trim()).filter((item) => item.length > 0);
       for (const item of items) {
         const typeMatch = /^type\s+(.+)/.exec(item);
         const actualItem = typeMatch ? typeMatch[1] : item;
+        if (!actualItem) continue;
         const isItemType = !!typeMatch || isTypeOnly;
         if (actualItem.includes(" as ")) {
           const [name, alias] = actualItem.split(" as ").map((p) => p.trim());
+          if (!name) continue;
           specifiers.push({
             type: "named",
             name,
@@ -79,7 +81,7 @@ export function getFileImportsExports(content, options = {}) {
       const source = match[1] || match[3];
       if (!source) continue;
       const pathType = getPathType(source);
-      if (!pathTypes.includes(pathType)) continue;
+      if (!pathType || !pathTypes.includes(pathType)) continue;
       const info = {
         statement: match[0],
         type: "static",
@@ -89,8 +91,8 @@ export function getFileImportsExports(content, options = {}) {
         pathTypeSymbol: pathType === "alias" ? /^[@~]/.exec(source)?.[0] : void 0,
         isTypeOnly: match[0].includes("import type"),
         specifiers: extractSpecifiers(match[0]),
-        start: match.index,
-        end: match.index + match[0].length
+        start: match.index ?? 0,
+        end: (match.index ?? 0) + match[0].length
       };
       results.push(info);
     }
@@ -99,7 +101,7 @@ export function getFileImportsExports(content, options = {}) {
       const source = match[1];
       if (!source) continue;
       const pathType = getPathType(source);
-      if (!pathTypes.includes(pathType)) continue;
+      if (!pathType || !pathTypes.includes(pathType)) continue;
       const info = {
         statement: match[0],
         type: "dynamic",
@@ -109,8 +111,8 @@ export function getFileImportsExports(content, options = {}) {
         pathTypeSymbol: pathType === "alias" ? /^[@~]/.exec(source)?.[0] : void 0,
         isTypeOnly: false,
         specifiers: [],
-        start: match.index,
-        end: match.index + match[0].length
+        start: match.index ?? 0,
+        end: (match.index ?? 0) + match[0].length
       };
       results.push(info);
     }
@@ -121,7 +123,7 @@ export function getFileImportsExports(content, options = {}) {
       const source = match[1];
       if (!source) continue;
       const pathType = getPathType(source);
-      if (!pathTypes.includes(pathType)) continue;
+      if (!pathType || !pathTypes.includes(pathType)) continue;
       const info = {
         statement: match[0],
         type: "static",
@@ -131,8 +133,8 @@ export function getFileImportsExports(content, options = {}) {
         pathTypeSymbol: pathType === "alias" ? /^[@~]/.exec(source)?.[0] : void 0,
         isTypeOnly: match[0].includes("export type"),
         specifiers: extractSpecifiers(match[0]),
-        start: match.index,
-        end: match.index + match[0].length
+        start: match.index ?? 0,
+        end: (match.index ?? 0) + match[0].length
       };
       results.push(info);
     }

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";
+type ImportExtType = "js" | "ts" | "none" | "none-and-js";
 /**
  * normalizes windows paths to use forward slashes
  */
@@ -97,8 +97,7 @@ declare function convertStringAliasRelative({ importPath, importerFile, pathPatt
 /**
  * main function to convert import paths from aliases to relative paths
  */
-declare function convertImportsAliasToRelative({ targetDir, aliasToReplace, // e.g. @, ~, @/*, ~/*
-pathExtFilter, }: {
+declare function convertImportsAliasToRelative({ targetDir, aliasToReplace, pathExtFilter, }: {
     targetDir: string;
     aliasToReplace: string;
     pathExtFilter: PathExtFilter;

package/bin/mod.js

@@ -2,8 +2,19 @@ import fs from "node:fs/promises";
 import {
   getFileImportsExports
 } from "./impl/getFileImportsExports.js";
-const log = (msg) => console.log(`\x1B[2m${msg}\x1B[0m`);
-const logInternal = (msg) => console.log(`\x1B[36;2m${msg}\x1B[0m`);
+const logger = (msg, debugOnly = false) => {
+  if (!debugOnly || DEBUG_MODE) {
+    const message = typeof msg === "function" ? msg() : msg;
+    console.log(`\x1B[2m${message}\x1B[0m`);
+  }
+};
+const logInternal = (msg) => {
+  if (DEBUG_MODE) {
+    const message = typeof msg === "function" ? msg() : msg;
+    console.log(`\x1B[36;2m${message}\x1B[0m`);
+  }
+};
+const DEBUG_MODE = false;
 const EXTENSIONS = [".ts", ".tsx", ".js", ".jsx", ".mjs", ".cjs"];
 const SLASH = "/";
 const BACK_SLASH = "\\";
@@ -39,7 +50,7 @@ function normalizeString(path2, allowAboveRoot) {
   let char = null;
   for (let index = 0; index <= path2.length; ++index) {
     if (index < path2.length) {
-      char = path2[index];
+      char = path2[index] ?? null;
     } else if (char === SLASH) {
       break;
     } else {
@@ -190,7 +201,7 @@ const relative = (from, to) => {
   if (resolvedFrom === resolvedTo) return EMPTY;
   const fromSegments = resolvedFrom.replace(ROOT_FOLDER_RE, "$1").split(SLASH).filter(Boolean);
   const toSegments = resolvedTo.replace(ROOT_FOLDER_RE, "$1").split(SLASH).filter(Boolean);
-  if (fromSegments.length > 0 && toSegments.length > 0 && DRIVE_LETTER_RE.test(fromSegments[0]) && DRIVE_LETTER_RE.test(toSegments[0]) && fromSegments[0].toUpperCase() !== toSegments[0].toUpperCase()) {
+  if (fromSegments.length > 0 && toSegments.length > 0 && fromSegments[0] && toSegments[0] && DRIVE_LETTER_RE.test(fromSegments[0]) && DRIVE_LETTER_RE.test(toSegments[0]) && fromSegments[0].toUpperCase() !== toSegments[0].toUpperCase()) {
     return resolvedTo;
   }
   let commonSegments = 0;
@@ -345,6 +356,7 @@ function reverseResolveAlias(path2, aliases) {
 }
 const findAliasMatch = (importPath, paths) => {
   const firstPathKey = Object.keys(paths)[0];
+  if (!firstPathKey) return null;
   const baseAlias = firstPathKey.replace("/*", "");
   if (importPath.startsWith("@") && !importPath.startsWith(baseAlias)) {
     return null;
@@ -455,6 +467,7 @@ async function processFile(filePath, aliasToReplace, targetDir, pathExtFilter) {
   for (const match of matches) {
     const originalQuote = match[1];
     const importPath = match[2];
+    if (!importPath) continue;
     if (!importPath.startsWith(baseAlias)) {
       continue;
     }
@@ -519,7 +532,7 @@ async function processAllFiles({
     );
     return results;
   } catch (error) {
-    log(
+    logger(
       `error processing directory ${srcDir}: ${error instanceof Error ? error.message : String(error)}`
     );
     return [];
@@ -528,14 +541,15 @@ async function processAllFiles({
 async function convertImportsAliasToRelative({
   targetDir,
   aliasToReplace,
-  // e.g. @, ~, @/*, ~/*
   pathExtFilter
 }) {
   const normalizedAlias = aliasToReplace.endsWith("/*") ? aliasToReplace : `${aliasToReplace}/*`;
-  log(
+  logger(
     `Converting aliased imports starting with '${aliasToReplace}' to relative paths in "${targetDir}"...`
   );
-  log(`   (Assuming "${normalizedAlias}" resolves relative to "${targetDir}")`);
+  logger(
+    `   (Assuming "${normalizedAlias}" resolves relative to "${targetDir}")`
+  );
   const results = await processAllFiles({
     srcDir: targetDir,
     aliasToReplace: normalizedAlias,
@@ -544,17 +558,17 @@ async function convertImportsAliasToRelative({
     pathExtFilter
   });
   if (results.length > 0) {
-    log("\n[convertImportsAliasToRelative] Summary of changes:");
+    logger("\n[convertImportsAliasToRelative] Summary of changes:", true);
     for (const { file, changes } of results) {
       const displayPath = relative(targetDir, file) || basename(file);
-      log(`  in ${displayPath}:`);
+      logger(() => `  in ${displayPath}:`, true);
       for (const { from, to } of changes) {
-        log(`    - ${from} \u2192 ${to}`);
+        logger(() => `    - ${from} \u2192 ${to}`, true);
       }
     }
   } else {
   }
-  log("Import path conversion process complete.");
+  logger("Import path conversion process complete.");
   return results;
 }
 async function convertImportsExt({
@@ -562,7 +576,7 @@ async function convertImportsExt({
   extFrom,
   extTo
 }) {
-  const fromExtStr = extFrom === "none" ? "" : `.${extFrom}`;
+  const fromExtStr = extFrom === "none" ? "" : extFrom === "none-and-js" ? "(?:\\.js)?" : `.${extFrom}`;
   const toExtStr = extTo === "none" ? "" : `.${extTo}`;
   const importRegex = new RegExp(
     `(?:import\\s+(?:[\\s\\S]*?)\\s+from\\s+|import\\s*\\(\\s*)\\s*(['"])([^'"]+${fromExtStr.replace(".", "\\.")})(\\1)`,
@@ -591,9 +605,16 @@ async function convertImportsExt({
           while (match !== null) {
             const quote = match[1];
             const importPath = match[2];
+            if (!importPath) 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 {
@@ -617,19 +638,18 @@ async function convertImportsExt({
       })
     );
     if (results.length > 0) {
-      log("\n[convertImportsExt] Summary of changes:");
+      logger("\n[convertImportsExt] Summary of changes:", true);
       for (const { file, changes } of results) {
         const displayPath = relative(targetDir, file) || basename(file);
-        log(`  in ${displayPath}:`);
+        logger(() => `  in ${displayPath}:`, true);
         for (const { from, to } of changes) {
-          log(`    - ${from} \u2192 ${to}`);
+          logger(() => `    - ${from} \u2192 ${to}`, true);
         }
       }
-    } else {
     }
     return results;
   } catch (error) {
-    log(
+    logger(
       `error processing directory ${targetDir}: ${error instanceof Error ? error.message : String(error)}`
     );
     return [];
@@ -653,13 +673,17 @@ function stripPathSegments(path2, count = 1, alias = "") {
   }
   pathSegments = pathSegments.filter(Boolean);
   const leadingPreservedSegments = [];
-  if (alias && pathSegments.length > 0 && pathSegments[0].startsWith(alias)) {
+  if (alias && pathSegments.length > 0 && pathSegments[0]?.startsWith(alias)) {
     const preserved = pathSegments.shift();
-    leadingPreservedSegments.push(preserved);
+    if (preserved) {
+      leadingPreservedSegments.push(preserved);
+    }
   }
   while (pathSegments.length > 0 && (pathSegments[0] === DOT || pathSegments[0] === DOUBLE_DOT)) {
     const preserved = pathSegments.shift();
-    leadingPreservedSegments.push(preserved);
+    if (preserved) {
+      leadingPreservedSegments.push(preserved);
+    }
   }
   const numToStrip = Math.min(count, pathSegments.length);
   const remainingBodySegments = pathSegments.slice(numToStrip);
@@ -684,8 +708,14 @@ async function stripPathSegmentsInDirectory({
   alias = "",
   extensionsToProcess = EXTENSIONS
 }) {
-  log(`[stripPathSegmentsInDirectory] Processing directory: ${targetDir}`);
-  log(`  - segmentsToStrip: ${segmentsToStrip}, alias: ${alias}`);
+  logger(
+    () => `[stripPathSegmentsInDirectory] Processing directory: ${targetDir}`,
+    true
+  );
+  logger(
+    () => `  - segmentsToStrip: ${segmentsToStrip}, alias: ${alias}`,
+    true
+  );
   try {
     const entries = await fs.readdir(targetDir, { withFileTypes: true });
     const results = [];
@@ -709,6 +739,7 @@ async function stripPathSegmentsInDirectory({
           for (const match of matches) {
             const originalQuote = match[1];
             const importPath = match[2];
+            if (!importPath) continue;
             if (!importPath.includes(SLASH)) {
               continue;
             }
@@ -740,19 +771,19 @@ async function stripPathSegmentsInDirectory({
       })
     );
     if (results.length > 0) {
-      log("[stripPathSegmentsInDirectory] Summary of changes:");
+      logger(() => "[stripPathSegmentsInDirectory] Summary of changes:", true);
       for (const { file, changes } of results) {
         const displayPath = relative(targetDir, file) || basename(file);
-        log(`  in ${displayPath}:`);
+        logger(() => `  in ${displayPath}:`, true);
         for (const { from, to } of changes) {
-          log(`    - ${from} \u2192 ${to}`);
+          logger(() => `    - ${from} \u2192 ${to}`, true);
         }
       }
     } else {
     }
     return results;
   } catch (error) {
-    log(
+    logger(
       `error processing directory ${targetDir}: ${error instanceof Error ? error.message : String(error)}`
     );
     return [];
@@ -823,6 +854,7 @@ async function attachPathSegmentsInDirectory({
           for (const match of matches) {
             const originalQuote = match[1];
             const importPath = match[2];
+            if (!importPath) continue;
             if (!importPath.includes(SLASH)) continue;
             const modifiedPath = attachPathSegments(
               importPath,
@@ -846,18 +878,21 @@ async function attachPathSegmentsInDirectory({
       })
     );
     if (results.length > 0) {
-      log("\n[attachPathSegmentsInDirectory] Summary of changes:");
+      logger(
+        () => "\n[attachPathSegmentsInDirectory] Summary of changes:",
+        true
+      );
       for (const { file, changes } of results) {
         const displayPath = relative(targetDir, file) || basename(file);
-        log(`  in ${displayPath}:`);
+        logger(() => `  in ${displayPath}:`, true);
         for (const { from, to } of changes) {
-          log(`    - ${from} \u2192 ${to}`);
+          logger(() => `    - ${from} \u2192 ${to}`, true);
         }
       }
     }
     return results;
   } catch (error) {
-    log(
+    logger(
       `error processing directory ${targetDir}: ${error instanceof Error ? error.message : String(error)}`
     );
     return [];

package/package.json

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