@reliverse/pathkit 1.2.7 → 1.2.9

package/bin/mod.d.ts

@@ -1,6 +1,7 @@
 import type { PlatformPath } from "node:path";
 import { getFileImportsExports, type ImportExportInfo, type ImportExportSpecifier, type GetFileImportsExportsOptions } from "./impl/getFileImportsExports.js";
 declare const normalizedAliasSymbol: unique symbol;
+export declare const IMPORT_EXPORT_REGEX: RegExp;
 interface NormalizedRecord extends Record<string, string> {
     [normalizedAliasSymbol]?: true;
 }
@@ -95,13 +96,14 @@ declare function convertStringAliasRelative({ importPath, importerFile, pathPatt
     targetDir: string;
 }): Promise<string>;
 /**
- * main function to convert import paths from aliases to relative paths
+ * main function to convert import/export paths from aliases to relative paths
  */
-declare function convertImportsAliasToRelative({ targetDir, aliasToReplace, pathExtFilter, displayLogsOnlyFor, }: {
+declare function convertImportsAliasToRelative({ targetDir, aliasToReplace, pathExtFilter, displayLogsOnlyFor, displayLogs, }: {
     targetDir: string;
     aliasToReplace: string;
     pathExtFilter: PathExtFilter;
     displayLogsOnlyFor?: string[];
+    displayLogs?: boolean;
 }): Promise<{
     file: string;
     changes: {
@@ -110,13 +112,14 @@ declare function convertImportsAliasToRelative({ targetDir, aliasToReplace, path
     }[];
 }[]>;
 /**
- * converts extensions in import paths from one format to another
+ * converts extensions in import/export paths from one format to another
  */
-declare function convertImportsExt({ targetDir, extFrom, extTo, alias, }: {
+declare function convertImportsExt({ targetDir, extFrom, extTo, alias, displayLogs, }: {
     targetDir: string;
     extFrom: ImportExtType;
     extTo: ImportExtType;
     alias?: string;
+    displayLogs?: boolean;
 }): Promise<{
     file: string;
     changes: {
@@ -140,11 +143,12 @@ declare function stripPathSegments(path: string, count?: number, alias?: string)
  * @param extensionsToProcess - Array of file extensions to process (default: EXTENSIONS)
  * @returns Array of processed files and their changes
  */
-declare function stripPathSegmentsInDirectory({ targetDir, segmentsToStrip, alias, extensionsToProcess, }: {
+declare function stripPathSegmentsInDirectory({ targetDir, segmentsToStrip, alias, extensionsToProcess, displayLogs, }: {
     targetDir: string;
     segmentsToStrip: number;
     alias?: string;
     extensionsToProcess?: string[];
+    displayLogs?: boolean;
 }): Promise<{
     file: string;
     changes: {
@@ -167,18 +171,19 @@ declare function attachPathSegments(path: string, segments: string | string[], o
     preserveAlias?: string;
 }): string;
 /**
- * recursively processes files in a directory to attach path segments to import statements
+ * recursively processes files in a directory to attach path segments to import/export statements
  * @param targetDir - The directory to process
  * @param segments - The segments to attach
  * @param options - Configuration options for path segment attachment
  * @param extensionsToProcess - Array of file extensions to process (default: EXTENSIONS)
  * @returns Array of processed files and their changes
  */
-declare function attachPathSegmentsInDirectory({ targetDir, segments, options, extensionsToProcess, }: {
+declare function attachPathSegmentsInDirectory({ targetDir, segments, options, extensionsToProcess, displayLogs, }: {
     targetDir: string;
     segments: string | string[];
     options?: Parameters<typeof attachPathSegments>[2];
     extensionsToProcess?: string[];
+    displayLogs?: boolean;
 }): Promise<{
     file: string;
     changes: {
@@ -201,26 +206,12 @@ declare const _pathBase: {
     relative: (from: string, to: string) => string;
     filename: typeof filename;
 };
-declare const path: PlatformPath & {
-    sep: string;
-    normalize: (path: string) => string;
-    join: (...segments: string[]) => string;
-    resolve: (...args: string[]) => string;
-    isAbsolute: (p: string) => boolean;
-    dirname: (p: string) => string;
-    basename: (p: string, ext?: string) => string;
-    extname: (p: string) => string;
-    format: (p: FormatInputPathObject) => string;
-    parse: (p: string) => ParsedPath;
-    toNamespacedPath: (p: string) => string;
-    relative: (from: string, to: string) => string;
-    filename: typeof filename;
-} & {
+declare const path: PlatformPath & typeof _pathBase & {
     posix: PlatformPath;
     win32: PlatformPath;
 };
 declare const win32: PlatformPath;
-declare const delimiter: string;
+declare const delimiter: ";" | ":";
 export type { PlatformPath, PathExtFilter, ImportExtType, ImportExportInfo, ImportExportSpecifier, GetFileImportsExportsOptions, };
 export { _pathBase as posix, win32, basename, delimiter, dirname, extname, filename, format, isAbsolute, join, normalize, parse, relative, resolve, sep, toNamespacedPath, normalizeAliases, resolveAlias, reverseResolveAlias, normalizeWindowsPath, convertStringAliasRelative, convertImportsAliasToRelative, convertImportsExt, stripPathSegments, stripPathSegmentsInDirectory, attachPathSegments, attachPathSegmentsInDirectory, getFileImportsExports, };
 export default path;

package/bin/mod.js

@@ -10,8 +10,8 @@ const filteredLogger = (msg) => {
   const message = typeof msg === "function" ? msg() : msg;
   console.log(`\x1B[36;2m${message}\x1B[0m`);
 };
+const DEBUG_MODE = false;
 const logInternal = (msg) => {
-  const DEBUG_MODE = true;
   if (DEBUG_MODE) {
     const message = typeof msg === "function" ? msg() : msg;
     console.log(`\x1B[36;2m${message}\x1B[0m`);
@@ -30,7 +30,7 @@ const UNC_REGEX = /^[/\\]{2}/;
 const IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
 const ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;
 const PATH_ROOT_RE = /^[/\\]|^[a-zA-Z]:[/\\]/;
-const IMPORT_REGEX = /(?:import\s+(?:[\s\S]*?)\s+from\s+|import\s*\(\s*)\s*(['"])([^'"]+)\1/g;
+export const IMPORT_EXPORT_REGEX = /(?:import\s+(?:type\s+)?[\s\S]*?\s+from\s+|import\s*\(\s*|export\s+(?:type\s+)?(?:\*\s+from\s+|(?:\w+(?:\s*,\s*|\s+))?\{[\s\S]*?\}(?:\s*,\s*\w+)?\s+from\s+|\w+\s+from\s+))\s*(['"])([^'"]+)\1/g;
 function normalizeWindowsPath(input = "") {
   if (!input) return input;
   return input.replace(/\\/g, SLASH).replace(DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
@@ -464,26 +464,28 @@ function replaceAllInString(original, searchValue, replaceValue) {
   }
   return result;
 }
-async function processFile(filePath, aliasToReplace, targetDir, pathExtFilter, displayLogsOnlyFor) {
-  const shouldLog = !displayLogsOnlyFor || displayLogsOnlyFor.includes(filePath);
+async function processFile(filePath, aliasToReplace, targetDir, pathExtFilter, displayLogsOnlyFor, displayLogs = false) {
+  const shouldLog = displayLogs && (!displayLogsOnlyFor || displayLogsOnlyFor.includes(filePath));
   const log = (msg) => shouldLog && filteredLogger(msg);
   const content = await fs.readFile(filePath, "utf-8");
   let updated = content;
   const changes = [];
-  const matches = Array.from(content.matchAll(IMPORT_REGEX));
+  const matches = Array.from(content.matchAll(IMPORT_EXPORT_REGEX));
   const normalizedAlias = aliasToReplace.endsWith("/*") ? aliasToReplace : `${aliasToReplace}/*`;
   const baseAlias = aliasToReplace.replace("/*", "");
   log(`[processFile] Processing file: ${filePath}`);
   log(`  - normalizedAlias: ${normalizedAlias}`);
   log(`  - baseAlias: ${baseAlias}`);
-  log(`  - found ${matches.length} import statements`);
+  log(`  - found ${matches.length} import/export statements`);
   for (const match of matches) {
     const originalQuote = match[1];
     const importPath = match[2];
     if (!importPath) continue;
     log(`  Processing import: ${importPath}`);
     if (!importPath.startsWith(baseAlias)) {
-      log(`  - skipping: import doesn't start with ${baseAlias}`);
+      if (DEBUG_MODE) {
+        log(`  - skipping: import/export doesn't start with ${baseAlias}`);
+      }
       continue;
     }
     const importExt = extname(importPath);
@@ -519,7 +521,9 @@ async function processFile(filePath, aliasToReplace, targetDir, pathExtFilter, d
     await fs.writeFile(filePath, updated);
     log(`\u2713 processed: ${filePath}`);
   } else {
-    log(`  - no changes made to file`);
+    if (DEBUG_MODE) {
+      log(`  - no changes made to file: ${filePath}`);
+    }
   }
   return changes;
 }
@@ -575,7 +579,8 @@ async function convertImportsAliasToRelative({
   targetDir,
   aliasToReplace,
   pathExtFilter,
-  displayLogsOnlyFor
+  displayLogsOnlyFor,
+  displayLogs = false
 }) {
   const normalizedAlias = aliasToReplace.endsWith("/*") ? aliasToReplace : `${aliasToReplace}/*`;
   regularLogger(
@@ -592,7 +597,7 @@ async function convertImportsAliasToRelative({
     pathExtFilter,
     displayLogsOnlyFor
   });
-  if (results.length > 0) {
+  if (results.length > 0 && displayLogs) {
     regularLogger("\n[convertImportsAliasToRelative] Summary of changes:");
     for (const { file, changes } of results) {
       const displayPath = relative(targetDir, file) || basename(file);
@@ -602,14 +607,15 @@ async function convertImportsAliasToRelative({
       }
     }
   }
-  regularLogger("Import path conversion process complete.");
+  regularLogger("Import/export path conversion process complete.");
   return results;
 }
 async function convertImportsExt({
   targetDir,
   extFrom,
   extTo,
-  alias
+  alias,
+  displayLogs = false
 }) {
   const fromExtStr = extFrom === "none" ? "" : `.${extFrom}`;
   const toExtStr = extTo === "none" ? "" : `.${extTo}`;
@@ -691,7 +697,7 @@ async function convertImportsExt({
         }
       })
     );
-    if (results.length > 0) {
+    if (results.length > 0 && displayLogs) {
       regularLogger("\n[convertImportsExt] Summary of changes:");
       for (const { file, changes } of results) {
         const displayPath = relative(targetDir, file) || basename(file);
@@ -760,7 +766,8 @@ async function stripPathSegmentsInDirectory({
   targetDir,
   segmentsToStrip,
   alias = "",
-  extensionsToProcess = EXTENSIONS
+  extensionsToProcess = EXTENSIONS,
+  displayLogs = false
 }) {
   regularLogger(
     () => `[stripPathSegmentsInDirectory] Processing directory: ${targetDir}`
@@ -787,7 +794,7 @@ async function stripPathSegmentsInDirectory({
           const content = await fs.readFile(fullPath, "utf-8");
           let updated = content;
           const changes = [];
-          const matches = Array.from(content.matchAll(IMPORT_REGEX));
+          const matches = Array.from(content.matchAll(IMPORT_EXPORT_REGEX));
           for (const match of matches) {
             const originalQuote = match[1];
             const importPath = match[2];
@@ -822,7 +829,7 @@ async function stripPathSegmentsInDirectory({
         }
       })
     );
-    if (results.length > 0) {
+    if (results.length > 0 && displayLogs) {
       regularLogger(() => "[stripPathSegmentsInDirectory] Summary of changes:");
       for (const { file, changes } of results) {
         const displayPath = relative(targetDir, file) || basename(file);
@@ -881,7 +888,8 @@ async function attachPathSegmentsInDirectory({
   targetDir,
   segments,
   options = {},
-  extensionsToProcess = EXTENSIONS
+  extensionsToProcess = EXTENSIONS,
+  displayLogs = false
 }) {
   try {
     const entries = await fs.readdir(targetDir, { withFileTypes: true });
@@ -902,7 +910,7 @@ async function attachPathSegmentsInDirectory({
           const content = await fs.readFile(fullPath, "utf-8");
           let updated = content;
           const changes = [];
-          const matches = Array.from(content.matchAll(IMPORT_REGEX));
+          const matches = Array.from(content.matchAll(IMPORT_EXPORT_REGEX));
           for (const match of matches) {
             const originalQuote = match[1];
             const importPath = match[2];
@@ -929,7 +937,7 @@ async function attachPathSegmentsInDirectory({
         }
       })
     );
-    if (results.length > 0) {
+    if (results.length > 0 && displayLogs) {
       regularLogger(
         () => "\n[attachPathSegmentsInDirectory] Summary of changes:"
       );

package/package.json

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