pruny 1.23.0 → 1.24.0

package/dist/index.js

@@ -7631,7 +7631,7 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/index.ts
-import { rmSync, existsSync as existsSync7 } from "node:fs";
+import { rmSync, existsSync as existsSync7, readdirSync, lstatSync } from "node:fs";
 import { dirname as dirname4, join as join8 } from "node:path";
 
 // src/scanner.ts
@@ -9193,12 +9193,16 @@ var import_fast_glob2 = __toESM(require_out4(), 1);
 import { readFileSync as readFileSync2, statSync, existsSync as existsSync2 } from "node:fs";
 import { join as join2, dirname, resolve, relative, sep as sep2 } from "node:path";
 async function scanUnusedFiles(config) {
-  const cwd = config.dir;
+  const rootDir = config.appSpecificScan ? config.appSpecificScan.rootDir : config.dir;
+  const searchDir = config.appSpecificScan ? config.appSpecificScan.appDir : config.dir;
   const extensions = config.extensions;
   const extGlob = `**/*{${extensions.join(",")}}`;
+  console.log(`
+   \uD83D\uDD0D Finding source files in: ${searchDir}`);
   const allFiles = await import_fast_glob2.default(extGlob, {
-    cwd,
-    ignore: [...config.ignore.folders, ...config.ignore.files]
+    cwd: searchDir,
+    ignore: [...config.ignore.folders, ...config.ignore.files],
+    absolute: true
   });
   if (allFiles.length === 0) {
     return { total: 0, used: 0, unused: 0, files: [] };
@@ -9245,8 +9249,9 @@ async function scanUnusedFiles(config) {
     "**/api/index.ts"
   ];
   for (const file of allFiles) {
+    const relPath = relative(searchDir, file);
     const isEntry = entryPatterns.some((pattern) => {
-      return minimatch(file, pattern, { dot: true });
+      return minimatch(relPath, pattern, { dot: true });
     });
     if (isEntry)
       entryFiles.add(file);
@@ -9257,9 +9262,9 @@ async function scanUnusedFiles(config) {
   const importRegex = /from\s+['"]([^'"]+)['"]|import\(['"]([^'"]+)['"]\)|require\(['"]([^'"]+)['"]\)/g;
   while (queue.length > 0) {
     const currentFile = queue.shift();
-    const currentDir = dirname(join2(cwd, currentFile));
+    const currentDir = dirname(currentFile);
     try {
-      const content = readFileSync2(join2(cwd, currentFile), "utf-8");
+      const content = readFileSync2(currentFile, "utf-8");
       let match2;
       importRegex.lastIndex = 0;
       while ((match2 = importRegex.exec(content)) !== null) {
@@ -9268,23 +9273,30 @@ async function scanUnusedFiles(config) {
           continue;
         let resolvedFile = null;
         if (imp.startsWith(".")) {
-          resolvedFile = resolveImport(currentDir, imp, extensions, cwd);
+          resolvedFile = resolveImport(currentDir, imp, extensions, rootDir);
         } else if (imp.startsWith("@/") || imp.startsWith("~/")) {
           const aliasPath = imp.substring(2);
-          resolvedFile = resolveImport(cwd, aliasPath, extensions, cwd) || resolveImport(join2(cwd, "src"), aliasPath, extensions, cwd) || resolveImport(join2(cwd, "app"), aliasPath, extensions, cwd);
+          resolvedFile = resolveImport(rootDir, aliasPath, extensions, rootDir) || resolveImport(join2(rootDir, "src"), aliasPath, extensions, rootDir) || resolveImport(join2(rootDir, "app"), aliasPath, extensions, rootDir);
           if (!resolvedFile) {
-            const pathParts = currentFile.split(/[/\\]/);
-            if (pathParts.length >= 2 && (pathParts[0] === "apps" || pathParts[0] === "packages")) {
-              const projectRoot = join2(cwd, pathParts[0], pathParts[1]);
-              resolvedFile = resolveImport(projectRoot, aliasPath, extensions, cwd) || resolveImport(join2(projectRoot, "src"), aliasPath, extensions, cwd) || resolveImport(join2(projectRoot, "app"), aliasPath, extensions, cwd);
+            const pathParts = currentFile.split(sep2);
+            const appsIndex = pathParts.lastIndexOf("apps");
+            const packagesIndex = pathParts.lastIndexOf("packages");
+            const index = Math.max(appsIndex, packagesIndex);
+            if (index !== -1 && index + 1 < pathParts.length) {
+              const projectRoot = pathParts.slice(0, index + 2).join(sep2);
+              resolvedFile = resolveImport(projectRoot, aliasPath, extensions, rootDir) || resolveImport(join2(projectRoot, "src"), aliasPath, extensions, rootDir) || resolveImport(join2(projectRoot, "app"), aliasPath, extensions, rootDir);
             }
           }
         }
-        if (resolvedFile && allFilesSet.has(resolvedFile)) {
-          usedFiles.add(resolvedFile);
-          if (!visited.has(resolvedFile)) {
-            visited.add(resolvedFile);
-            queue.push(resolvedFile);
+        if (resolvedFile) {
+          const absoluteResolved = join2(rootDir, resolvedFile);
+          const absoluteTarget = resolve(rootDir, resolvedFile);
+          if (!visited.has(absoluteTarget) && existsSync2(absoluteTarget) && statSync(absoluteTarget).isFile()) {
+            visited.add(absoluteTarget);
+            usedFiles.add(absoluteTarget);
+            queue.push(absoluteTarget);
+          } else {
+            usedFiles.add(absoluteTarget);
           }
         }
       }
@@ -9293,15 +9305,15 @@ async function scanUnusedFiles(config) {
   const unusedResults = [];
   for (const file of allFiles) {
     if (!usedFiles.has(file)) {
-      const fullPath = join2(cwd, file);
+      const displayPath = relative(rootDir, file);
       try {
-        const stats = statSync(fullPath);
+        const stats = statSync(file);
         unusedResults.push({
-          path: file,
+          path: displayPath,
           size: stats.size
         });
       } catch {
-        unusedResults.push({ path: file, size: 0 });
+        unusedResults.push({ path: displayPath, size: 0 });
       }
     }
   }
@@ -9337,7 +9349,7 @@ function resolveImport(baseDir, impPath, extensions, rootDir) {
 // src/scanners/unused-exports.ts
 var import_fast_glob3 = __toESM(require_out4(), 1);
 import { readFileSync as readFileSync3 } from "node:fs";
-import { join as join3 } from "node:path";
+import { join as join3, relative as relative2 } from "node:path";
 import { Worker } from "node:worker_threads";
 import { fileURLToPath } from "node:url";
 import { dirname as dirname2 } from "node:path";
@@ -9440,42 +9452,66 @@ async function scanUnusedExports(config) {
   const cwd = config.dir;
   const extensions = config.extensions;
   const extGlob = `**/*{${extensions.join(",")}}`;
-  const allFiles = await import_fast_glob3.default(extGlob, {
-    cwd,
-    ignore: [...config.ignore.folders, ...config.ignore.files]
+  const candidateCwd = config.appSpecificScan ? config.appSpecificScan.appDir : cwd;
+  const referenceCwd = config.appSpecificScan ? config.appSpecificScan.rootDir : cwd;
+  console.log(`
+   \uD83D\uDD0D Finding export candidates in: ${candidateCwd}`);
+  console.log(`   \uD83C\uDF0D Checking usage in global scope: ${referenceCwd}
+`);
+  const candidateFiles = await import_fast_glob3.default(extGlob, {
+    cwd: candidateCwd,
+    ignore: [...config.ignore.folders, ...config.ignore.files],
+    absolute: true
   });
-  if (allFiles.length === 0) {
+  if (candidateFiles.length === 0) {
     return { total: 0, used: 0, unused: 0, exports: [] };
   }
+  const referenceFiles = await import_fast_glob3.default(extGlob, {
+    cwd: referenceCwd,
+    ignore: [...config.ignore.folders, ...config.ignore.files],
+    absolute: true
+  });
   const exportMap = new Map;
   const totalContents = new Map;
   let allExportsCount = 0;
   const inlineExportRegex = /^export\s+(?:async\s+)?(?:const|let|var|function|type|interface|enum|class)\s+([a-zA-Z0-9_$]+)/gm;
   const blockExportRegex = /^export\s*\{([^}]+)\}/gm;
-  const USE_WORKERS = allFiles.length >= 500;
+  const USE_WORKERS = referenceFiles.length >= 500;
   const WORKER_COUNT = 2;
   if (USE_WORKERS) {
-    console.log(`\uD83D\uDCDD Scanning ${allFiles.length} files for exports (using ${WORKER_COUNT} workers)...`);
-    const result = await processFilesInParallel(allFiles, cwd, WORKER_COUNT);
-    for (const [file, exports] of result.exportMap.entries()) {
-      exportMap.set(file, exports);
-      allExportsCount += exports.length;
-    }
+    console.log(`\uD83D\uDCDD Scanning ${candidateFiles.length} candidate files for exports & ${referenceFiles.length} files for usage...`);
+    const result = await processFilesInParallel(referenceFiles, referenceCwd, WORKER_COUNT);
     for (const [file, content] of result.contents.entries()) {
       totalContents.set(file, content);
     }
+    const candidateSet = new Set(candidateFiles);
+    for (const [file, exports] of result.exportMap.entries()) {
+      const absoluteFile = file.startsWith("/") ? file : join3(referenceCwd, file);
+      if (candidateSet.has(absoluteFile)) {
+        const displayPath = relative2(config.dir, absoluteFile);
+        const mappedExports = exports.map((e) => ({ ...e, file: displayPath }));
+        exportMap.set(displayPath, mappedExports);
+        allExportsCount += mappedExports.length;
+      }
+    }
   } else {
-    console.log(`\uD83D\uDCDD Scanning ${allFiles.length} files for exports...`);
+    console.log(`\uD83D\uDCDD Scanning ${candidateFiles.length} files for exports...`);
+    for (const file of referenceFiles) {
+      try {
+        const content = readFileSync3(file, "utf-8");
+        totalContents.set(file, content);
+      } catch {}
+    }
     let processedFiles = 0;
-    for (const file of allFiles) {
+    for (const file of candidateFiles) {
       try {
         processedFiles++;
-        if (processedFiles % 10 === 0 || processedFiles === allFiles.length) {
-          const percent = Math.round(processedFiles / allFiles.length * 100);
-          const shortFile = file.length > 50 ? "..." + file.slice(-47) : file;
-          process.stdout.write(`\r   Progress: ${processedFiles}/${allFiles.length} (${percent}%) - ${shortFile}${" ".repeat(10)}`);
+        const displayPath = relative2(config.dir, file);
+        if (processedFiles % 10 === 0 || processedFiles === candidateFiles.length) {
+          const percent = Math.round(processedFiles / candidateFiles.length * 100);
+          process.stdout.write(`\r   Progress: ${processedFiles}/${candidateFiles.length} (${percent}%)`);
         }
-        const content = readFileSync3(join3(cwd, file), "utf-8");
+        const content = totalContents.get(file) || readFileSync3(file, "utf-8");
         totalContents.set(file, content);
         const isService = file.endsWith(".service.ts") || file.endsWith(".service.tsx");
         const lines = content.split(`
@@ -9485,7 +9521,7 @@ async function scanUnusedExports(config) {
           inlineExportRegex.lastIndex = 0;
           let match2;
           while ((match2 = inlineExportRegex.exec(line)) !== null) {
-            if (addExport(file, match2[1], i + 1)) {
+            if (addExport(displayPath, match2[1], i + 1)) {
               allExportsCount++;
             }
           }
@@ -9496,7 +9532,7 @@ async function scanUnusedExports(config) {
               return parts[parts.length - 1];
             });
             for (const name of names) {
-              if (addExport(file, name, i + 1)) {
+              if (addExport(displayPath, name, i + 1)) {
                 allExportsCount++;
               }
             }
@@ -9506,9 +9542,9 @@ async function scanUnusedExports(config) {
             while ((match2 = classMethodRegex.exec(line)) !== null) {
               const name = match2[1];
               if (name && !NEST_LIFECYCLE_METHODS.has(name) && !IGNORED_EXPORT_NAMES.has(name)) {
-                const existing = exportMap.get(file)?.find((e) => e.name === name);
+                const existing = exportMap.get(displayPath)?.find((e) => e.name === name);
                 if (!existing) {
-                  if (addExport(file, name, i + 1)) {
+                  if (addExport(displayPath, name, i + 1)) {
                     allExportsCount++;
                   }
                 }
@@ -9903,7 +9939,7 @@ async function scan(config) {
 // src/config.ts
 var import_fast_glob5 = __toESM(require_out4(), 1);
 import { existsSync as existsSync4, readFileSync as readFileSync5 } from "node:fs";
-import { join as join5, resolve as resolve2, relative as relative2, dirname as dirname3 } from "node:path";
+import { join as join5, resolve as resolve2, relative as relative3, dirname as dirname3 } from "node:path";
 var DEFAULT_CONFIG = {
   dir: "./",
   ignore: {
@@ -9977,7 +10013,7 @@ function loadConfig(options) {
       const content = readFileSync5(configPath, "utf-8");
       const config = JSON.parse(content);
       const configDir = dirname3(configPath);
-      const relDir = relative2(cwd, configDir);
+      const relDir = relative3(cwd, configDir);
       const prefixPattern = (p) => {
         if (p.startsWith("**/") || p.startsWith("/") || !relDir)
           return p;
@@ -10262,34 +10298,66 @@ program2.command("init").description("Create a default pruny.config.json file").
 program2.action(async (options) => {
   const startTime = Date.now();
   try {
-    const config = loadConfig({
+    const baseConfig = loadConfig({
       dir: options.dir,
       config: options.config,
       excludePublic: !options.public
     });
-    const absoluteDir = config.dir.startsWith("/") ? config.dir : join8(process.cwd(), config.dir);
-    config.dir = absoluteDir;
+    const absoluteDir = baseConfig.dir.startsWith("/") ? baseConfig.dir : join8(process.cwd(), baseConfig.dir);
+    baseConfig.dir = absoluteDir;
     if (options.verbose)
       console.log("");
     console.log(source_default.bold(`
 \uD83D\uDD0D Scanning for unused API routes...
 `));
-    let result = await scan(config);
-    logScanStats(result);
-    if (options.filter) {
-      filterResults(result, options.filter);
-    }
-    if (options.json) {
-      console.log(JSON.stringify(result, null, 2));
-      return;
-    }
-    if (options.fix) {
-      await handleFixes(result, config, options);
-    } else if (hasUnusedItems(result)) {
-      console.log(source_default.dim(`\uD83D\uDCA1 Run with --fix to automatically clean up unused routes, files, and exports.
+    const appsDir = join8(absoluteDir, "apps");
+    const isMonorepo = existsSync7(appsDir) && lstatSync(appsDir).isDirectory();
+    const appsToScan = [];
+    if (isMonorepo) {
+      const apps = readdirSync(appsDir);
+      for (const app of apps) {
+        const appPath = join8(appsDir, app);
+        if (lstatSync(appPath).isDirectory()) {
+          appsToScan.push(app);
+        }
+      }
+      console.log(source_default.bold(`
+\uD83C\uDFE2 Monorepo Detected. Found ${appsToScan.length} apps: ${appsToScan.join(", ")}
 `));
+    } else {
+      appsToScan.push("root");
+    }
+    for (const appName of appsToScan) {
+      const currentConfig = { ...baseConfig };
+      let appLabel = "Root App";
+      let appDir = absoluteDir;
+      if (isMonorepo) {
+        appLabel = `App: ${appName}`;
+        appDir = join8(absoluteDir, "apps", appName);
+        currentConfig.appSpecificScan = {
+          appDir,
+          rootDir: absoluteDir
+        };
+      }
+      console.log(source_default.bold.magenta(`
+\uD83D\uDC49 Scanning ${appLabel}...`));
+      let result = await scan(currentConfig);
+      logScanStats(result, appLabel);
+      if (options.filter) {
+        filterResults(result, options.filter);
+      }
+      if (options.json) {
+        console.log(JSON.stringify(result, null, 2));
+      } else {
+        if (options.fix) {
+          await handleFixes(result, currentConfig, options);
+        } else if (hasUnusedItems(result)) {
+          console.log(source_default.dim(`\uD83D\uDCA1 Run with --fix to clean up.
+`));
+        }
+        printSummaryTable(result, appLabel);
+      }
     }
-    printSummaryTable(result);
   } catch (err) {
     console.error(source_default.red("Error scanning:"), err);
     process.exit(1);
@@ -10299,8 +10367,8 @@ program2.action(async (options) => {
 ⏱️  Completed in ${elapsed}s`));
 });
 program2.parse();
-function logScanStats(result) {
-  console.log(source_default.blue.bold("\uD83D\uDCCA Scan Statistics:"));
+function logScanStats(result, context) {
+  console.log(source_default.blue.bold(`\uD83D\uDCCA stats for ${context}:`));
   console.log(source_default.blue(`   • API Routes:    ${result.total}`));
   if (result.publicAssets) {
     console.log(source_default.blue(`   • Public Assets: ${result.publicAssets.total}`));
@@ -10557,8 +10625,8 @@ async function fixUnusedExports(result, config) {
 `));
   return fixedSomething;
 }
-function printSummaryTable(result) {
-  console.log(source_default.bold(`\uD83D\uDCCA Summary Report
+function printSummaryTable(result, context) {
+  console.log(source_default.bold(`\uD83D\uDCCA Summary Report for ${context}
 `));
   const summary = [];
   const groupedRoutes = new Map;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pruny",
-  "version": "1.23.0",
+  "version": "1.24.0",
   "description": "Find and remove unused Next.js API routes & Nest.js Controllers",
   "type": "module",
   "files": [