pruny 1.18.0 → 1.20.0

package/dist/index.js

@@ -7649,13 +7649,20 @@ var API_METHOD_PATTERNS = [
   { regex: /axios\.put\s*\(\s*['"`](\/[^'"`\s)]+)['"`]/g, method: "PUT" },
   { regex: /axios\.delete\s*\(\s*['"`](\/[^'"`\s)]+)['"`]/g, method: "DELETE" },
   { regex: /axios\.patch\s*\(\s*['"`](\/[^'"`\s)]+)['"`]/g, method: "PATCH" },
+  { regex: /axios\.get\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "GET" },
+  { regex: /axios\.post\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "POST" },
+  { regex: /axios\.put\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "PUT" },
+  { regex: /axios\.delete\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "DELETE" },
+  { regex: /axios\.patch\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "PATCH" },
   { regex: /useSWR\s*\(\s*['"`](\/[^'"`\s)]+)['"`]/g, method: "GET" },
+  { regex: /useSWR\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: "GET" },
   { regex: /fetch\s*\(\s*['"`](\/[^'"`\s)]+)['"`]/g, method: undefined },
-  { regex: /fetch\s*\(\s*`[^`]*(\/[^`\s)]+)`/g, method: undefined },
+  { regex: /fetch\s*\(\s*`[^`]*?(\/[^`\s)]+)`/g, method: undefined },
   { regex: /['"`](\/api\/[^'"`\s]+)['"`]/g, method: undefined },
-  { regex: /['"`](?:https?:\/\/[^/]+)?(\/api\/[^'"`\s]+)['"`]/g, method: undefined },
-  { regex: /`[^`]*(\/[\w-]+\/[^`\s]+)`/g, method: undefined },
-  { regex: /['"`](\/[\w-]{2,}\/[\w-./]+)['"`]/g, method: undefined }
+  { regex: /`[^`]*?(\/api\/[^`\s]+)`/g, method: undefined },
+  { regex: /`[^`]*?(\/[\w-]{2,}\/[^`\s]*)`/g, method: undefined },
+  { regex: /['"`](\/[\w-]{2,}\/[^'"`\s]*)['"`]/g, method: undefined },
+  { regex: /['"`](\/api\/[^'"`\s]*)['"`]/g, method: undefined }
 ];
 function extractApiReferences(content) {
   const matches = [];
@@ -9362,6 +9369,8 @@ var IGNORED_EXPORT_NAMES = new Set([
   "OPTIONS",
   "default"
 ]);
+var NEST_LIFECYCLE_METHODS = new Set(["constructor", "onModuleInit", "onApplicationBootstrap", "onModuleDestroy", "beforeApplicationShutdown", "onApplicationShutdown"]);
+var classMethodRegex = /^\s*(?:async\s+)?([a-zA-Z0-9_$]+)\s*\([^)]*\)\s*(?::\s*[^\{]*)?\{/gm;
 async function processFilesInParallel(files, cwd, workerCount) {
   const __filename2 = fileURLToPath(import.meta.url);
   const __dirname2 = dirname2(__filename2);
@@ -9468,6 +9477,7 @@ async function scanUnusedExports(config) {
         }
         const content = readFileSync3(join3(cwd, file), "utf-8");
         totalContents.set(file, content);
+        const isService = file.endsWith(".service.ts") || file.endsWith(".service.tsx");
         const lines = content.split(`
 `);
         for (let i = 0;i < lines.length; i++) {
@@ -9491,6 +9501,20 @@ async function scanUnusedExports(config) {
               }
             }
           }
+          if (isService) {
+            classMethodRegex.lastIndex = 0;
+            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);
+                if (!existing) {
+                  if (addExport(file, name, i + 1)) {
+                    allExportsCount++;
+                  }
+                }
+              }
+            }
+          }
         }
       } catch {}
     }
@@ -9704,21 +9728,32 @@ function normalizeNextPath(path2) {
 function normalizeNestPath(path2) {
   return path2.replace(/\/$/, "").replace(/\?.*$/, "").replace(/:[^/]+/g, "*").toLowerCase();
 }
-function checkRouteUsage(route, references, nestGlobalPrefix = "api") {
+function checkRouteUsage(route, references, nestGlobalPrefix = "") {
   const normalize = route.type === "nextjs" ? normalizeNextPath : normalizeNestPath;
   const normalizedRoute = normalize(route.path);
-  const prefixToRemove = `/${nestGlobalPrefix}`;
-  const normalizedRouteNoPrefix = route.type === "nestjs" && route.path.startsWith(prefixToRemove) ? normalize(route.path.substring(prefixToRemove.length)) : null;
+  const variations = new Set([normalizedRoute]);
+  if (route.type === "nestjs") {
+    if (nestGlobalPrefix) {
+      const prefixToRemove = `/${nestGlobalPrefix}`.replace(/\/+/g, "/");
+      if (route.path.startsWith(prefixToRemove)) {
+        variations.add(normalize(route.path.substring(prefixToRemove.length)));
+      }
+    }
+    if (route.path.startsWith("/api/")) {
+      variations.add(normalize(route.path.substring(4)));
+    } else {
+      variations.add(normalize("/api" + route.path));
+    }
+  }
   const usedMethods = new Set;
   let used = false;
   for (const ref of references) {
     const normalizedFound = ref.path.replace(/\/$/, "").replace(/\?.*$/, "").replace(/\$\{[^}]+\}/g, "*").toLowerCase();
     let match2 = false;
-    if (normalizedRoute === normalizedFound || normalizedFound.startsWith(normalizedRoute + "/") || minimatch(normalizedFound, normalizedRoute)) {
-      match2 = true;
-    } else if (normalizedRouteNoPrefix) {
-      if (normalizedRouteNoPrefix === normalizedFound || normalizedFound.startsWith(normalizedRouteNoPrefix + "/") || minimatch(normalizedFound, normalizedRouteNoPrefix)) {
+    for (const v of variations) {
+      if (v === normalizedFound || normalizedFound.startsWith(v + "/") || minimatch(normalizedFound, v)) {
         match2 = true;
+        break;
       }
     }
     if (match2) {
@@ -9895,7 +9930,7 @@ var DEFAULT_CONFIG = {
     ]
   },
   extensions: [".ts", ".tsx", ".js", ".jsx"],
-  nestGlobalPrefix: "api",
+  nestGlobalPrefix: "",
   extraRoutePatterns: []
 };
 function loadConfig(options) {
@@ -10185,13 +10220,11 @@ program2.action(async (options) => {
       if (result.unusedFiles) {
         result.unusedFiles.files = result.unusedFiles.files.filter((f) => matchesFilter(f.path));
         result.unusedFiles.total = result.unusedFiles.files.length;
-        result.unusedFiles.used = 0;
         result.unusedFiles.unused = result.unusedFiles.files.length;
       }
       if (result.unusedExports) {
         result.unusedExports.exports = result.unusedExports.exports.filter((e) => matchesFilter(e.file));
         result.unusedExports.total = result.unusedExports.exports.length;
-        result.unusedExports.used = 0;
         result.unusedExports.unused = result.unusedExports.exports.length;
       }
     }
@@ -10243,7 +10276,7 @@ program2.action(async (options) => {
       console.log("");
     }
     if (result.unusedExports && result.unusedExports.exports.length > 0) {
-      console.log(source_default.red.bold(`\uD83D\uDD17 Unused Named Exports:
+      console.log(source_default.red.bold(`\uD83D\uDD17 Unused Named Exports/Methods:
 `));
       for (const exp of result.unusedExports.exports) {
         console.log(source_default.red(`   ${exp.name}`));
@@ -10290,7 +10323,6 @@ program2.action(async (options) => {
                 fixedSomething = true;
               } else {
                 console.log(source_default.yellow(`   Skipped File Deletion (internally used): ${filePath}`));
-                console.log(source_default.dim(`      → This controller is imported in another file (e.g. app.module.ts).`));
                 const allMethodsToPrune = [];
                 for (const r of fileRoutes) {
                   for (const m of r.unusedMethods) {
@@ -10368,38 +10400,17 @@ program2.action(async (options) => {
         console.log("");
       }
       if (result.unusedExports && result.unusedExports.exports.length > 0) {
-        console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing unused exports (removing "export" keyword)...
-`));
-        const exportsByFile = new Map;
-        for (const exp of result.unusedExports.exports) {
-          if (!exportsByFile.has(exp.file)) {
-            exportsByFile.set(exp.file, []);
-          }
-          exportsByFile.get(exp.file).push(exp);
-        }
-        let fixedCount = 0;
-        for (const [file, exports] of exportsByFile.entries()) {
-          const sortedExports = exports.sort((a, b) => b.line - a.line);
-          for (const exp of sortedExports) {
-            const fullPath = join8(config.dir, exp.file);
-            if (!existsSync7(fullPath))
-              continue;
-            if (removeExportFromLine(config.dir, exp)) {
-              console.log(source_default.green(`   Fixed: ${exp.name} in ${exp.file}`));
-              fixedCount++;
-              fixedSomething = true;
-              const expIdx = result.unusedExports.exports.indexOf(exp);
-              if (expIdx !== -1) {
-                result.unusedExports.exports.splice(expIdx, 1);
-                result.unusedExports.unused--;
-              }
-            }
-          }
-        }
-        if (fixedCount > 0) {
-          console.log(source_default.green(`
-✅ Removed "export" from ${fixedCount} item(s).
+        fixedSomething = await fixUnusedExports(result, config) || fixedSomething;
+      }
+      if (fixedSomething) {
+        console.log(source_default.cyan.bold(`
+\uD83D\uDD04 Checking for cascading dead code (newly unused implementation)...`));
+        const secondPass = await scanUnusedExports(config);
+        if (secondPass.unused > 0) {
+          console.log(source_default.yellow(`   Found ${secondPass.unused} newly unused items/methods after pruning.
 `));
+          result.unusedExports = secondPass;
+          await fixUnusedExports(result, config);
         }
       }
       if (fixedSomething) {
@@ -10433,41 +10444,21 @@ program2.action(async (options) => {
     for (const key of sortedKeys) {
       const group = groupedRoutes.get(key);
       const typeLabel = group.type === "nextjs" ? "Next.js" : "NestJS";
-      const label = `${typeLabel} (${group.app})`;
       summary.push({
-        Category: label,
+        Category: `${typeLabel} (${group.app})`,
         Total: group.routes.length,
         Used: group.routes.filter((r) => r.used).length,
         Unused: group.routes.filter((r) => !r.used).length
       });
     }
-    if (summary.length === 0) {
+    if (summary.length === 0)
       summary.push({ Category: "API Routes", Total: result.total, Used: result.used, Unused: result.unused });
-    }
-    if (result.publicAssets) {
-      summary.push({
-        Category: "Public Assets",
-        Total: result.publicAssets.total,
-        Used: result.publicAssets.used,
-        Unused: result.publicAssets.unused
-      });
-    }
-    if (result.unusedFiles) {
-      summary.push({
-        Category: "Source Files",
-        Total: result.unusedFiles.total,
-        Used: result.unusedFiles.used,
-        Unused: result.unusedFiles.unused
-      });
-    }
-    if (result.unusedExports) {
-      summary.push({
-        Category: "Exported Items",
-        Total: result.unusedExports.total,
-        Used: result.unusedExports.used,
-        Unused: result.unusedExports.unused
-      });
-    }
+    if (result.publicAssets)
+      summary.push({ Category: "Public Assets", Total: result.publicAssets.total, Used: result.publicAssets.used, Unused: result.publicAssets.unused });
+    if (result.unusedFiles)
+      summary.push({ Category: "Source Files", Total: result.unusedFiles.total, Used: result.unusedFiles.used, Unused: result.unusedFiles.unused });
+    if (result.unusedExports)
+      summary.push({ Category: "Exported Items", Total: result.unusedExports.total, Used: result.unusedExports.used, Unused: result.unusedExports.unused });
     console.table(summary);
   } catch (_err) {
     console.error(source_default.red("Error scanning:"), _err);
@@ -10477,4 +10468,41 @@ program2.action(async (options) => {
   console.log(source_default.dim(`
 ⏱️  Completed in ${elapsed}s`));
 });
+async function fixUnusedExports(result, config) {
+  if (!result.unusedExports || result.unusedExports.exports.length === 0)
+    return false;
+  console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing unused exports/methods...
+`));
+  const exportsByFile = new Map;
+  for (const exp of result.unusedExports.exports) {
+    if (!exportsByFile.has(exp.file))
+      exportsByFile.set(exp.file, []);
+    exportsByFile.get(exp.file).push(exp);
+  }
+  let fixedCount = 0;
+  let fixedSomething = false;
+  for (const [file, exports] of exportsByFile.entries()) {
+    const sortedExports = exports.sort((a, b) => b.line - a.line);
+    for (const exp of sortedExports) {
+      const fullPath = join8(config.dir, exp.file);
+      if (!existsSync7(fullPath))
+        continue;
+      if (removeExportFromLine(config.dir, exp)) {
+        console.log(source_default.green(`   Fixed: ${exp.name} in ${exp.file}`));
+        fixedCount++;
+        fixedSomething = true;
+        const expIdx = result.unusedExports.exports.indexOf(exp);
+        if (expIdx !== -1) {
+          result.unusedExports.exports.splice(expIdx, 1);
+          result.unusedExports.unused--;
+        }
+      }
+    }
+  }
+  if (fixedCount > 0)
+    console.log(source_default.green(`
+✅ Cleaned up ${fixedCount} unused item(s).
+`));
+  return fixedSomething;
+}
 program2.parse();

package/dist/workers/file-processor.js

@@ -22,11 +22,11 @@ var IGNORED_EXPORT_NAMES = new Set([
   "POST",
   "PUT",
   "PATCH",
-  "DELETE",
-  "HEAD",
   "OPTIONS",
   "default"
 ]);
+var NEST_LIFECYCLE_METHODS = new Set(["constructor", "onModuleInit", "onApplicationBootstrap", "onModuleDestroy", "beforeApplicationShutdown", "onApplicationShutdown"]);
+var classMethodRegex = /^\s*(?:async\s+)?([a-zA-Z0-9_$]+)\s*\([^)]*\)\s*(?::\s*[^\{]*)?\{/gm;
 var inlineExportRegex = /^export\s+(?:async\s+)?(?:const|let|var|function|type|interface|enum|class)\s+([a-zA-Z0-9_$]+)/gm;
 var blockExportRegex = /^export\s*\{([^}]+)\}/gm;
 if (parentPort && workerData) {
@@ -40,6 +40,7 @@ if (parentPort && workerData) {
       contents.set(file, content);
       const lines = content.split(`
 `);
+      const isService = file.endsWith(".service.ts") || file.endsWith(".service.tsx");
       for (let i = 0;i < lines.length; i++) {
         const line = lines[i];
         inlineExportRegex.lastIndex = 0;
@@ -66,6 +67,20 @@ if (parentPort && workerData) {
             }
           }
         }
+        if (isService) {
+          classMethodRegex.lastIndex = 0;
+          while ((match = classMethodRegex.exec(line)) !== null) {
+            const name = match[1];
+            if (name && !NEST_LIFECYCLE_METHODS.has(name) && !IGNORED_EXPORT_NAMES.has(name)) {
+              const existing = exportMap.get(file)?.find((e) => e.name === name);
+              if (!existing) {
+                if (!exportMap.has(file))
+                  exportMap.set(file, []);
+                exportMap.get(file).push({ name, line: i + 1, file });
+              }
+            }
+          }
+        }
       }
       processedCount++;
       if (processedCount % 10 === 0) {

package/package.json

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