pruny 1.15.0 → 1.16.0

package/dist/index.js

@@ -7631,8 +7631,8 @@ var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
 // src/index.ts
-import { rmSync } from "node:fs";
-import { dirname as dirname3, join as join8 } from "node:path";
+import { rmSync, existsSync as existsSync7 } from "node:fs";
+import { dirname as dirname4, join as join8 } from "node:path";
 
 // src/scanner.ts
 var import_fast_glob4 = __toESM(require_out4(), 1);
@@ -9231,7 +9231,11 @@ async function scanUnusedFiles(config) {
     "scripts/**/*.{ts,js}",
     "cypress/**/*.{ts,js,tsx}",
     "**/public/sw.js",
-    "**/sw.{js,ts}"
+    "**/sw.{js,ts}",
+    "**/main.{ts,js}",
+    "api/index.ts",
+    "**/app.module.ts",
+    "**/api/index.ts"
   ];
   for (const file of allFiles) {
     const isEntry = entryPatterns.some((pattern) => {
@@ -9687,22 +9691,29 @@ function shouldIgnore(path2, ignorePatterns) {
     return false;
   });
 }
-function normalizeApiPath(path2) {
+function normalizeNextPath(path2) {
   return path2.replace(/\/$/, "").replace(/\?.*$/, "").replace(/\$\{[^}]+\}/g, "*").replace(/\[[^\]]+\]/g, "*").toLowerCase();
 }
-function checkRouteUsage(routePath, references) {
-  const normalizedRoute = normalizeApiPath(routePath);
+function normalizeNestPath(path2) {
+  return path2.replace(/\/$/, "").replace(/\?.*$/, "").replace(/:[^/]+/g, "*").toLowerCase();
+}
+function checkRouteUsage(route, references, nestGlobalPrefix = "api") {
+  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 usedMethods = new Set;
   let used = false;
   for (const ref of references) {
-    const normalizedFound = normalizeApiPath(ref.path);
+    const normalizedFound = ref.path.replace(/\/$/, "").replace(/\?.*$/, "").replace(/\$\{[^}]+\}/g, "*").toLowerCase();
     let match2 = false;
-    if (normalizedRoute === normalizedFound)
-      match2 = true;
-    else if (normalizedFound.startsWith(normalizedRoute))
-      match2 = true;
-    else if (minimatch(normalizedFound, normalizedRoute))
+    if (normalizedRoute === normalizedFound || normalizedFound.startsWith(normalizedRoute + "/") || minimatch(normalizedFound, normalizedRoute)) {
       match2 = true;
+    } else if (normalizedRouteNoPrefix) {
+      if (normalizedRouteNoPrefix === normalizedFound || normalizedFound.startsWith(normalizedRouteNoPrefix + "/") || minimatch(normalizedFound, normalizedRouteNoPrefix)) {
+        match2 = true;
+      }
+    }
     if (match2) {
       used = true;
       if (ref.method) {
@@ -9803,7 +9814,7 @@ async function scan(config) {
       route.unusedMethods = [];
       continue;
     }
-    const { used, usedMethods } = checkRouteUsage(route.path, allReferences);
+    const { used, usedMethods } = checkRouteUsage(route, allReferences, config.nestGlobalPrefix);
     if (used) {
       route.used = true;
       if (usedMethods.has("ALL")) {
@@ -9812,7 +9823,7 @@ async function scan(config) {
         route.unusedMethods = route.methods.filter((m) => !usedMethods.has(m));
       }
       for (const [file, refs] of fileReferences) {
-        if (checkRouteUsage(route.path, refs).used) {
+        if (checkRouteUsage(route, refs, config.nestGlobalPrefix).used) {
           route.references.push(file);
         }
       }
@@ -9837,7 +9848,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 } from "node:path";
+import { join as join5, resolve as resolve2, relative as relative2, dirname as dirname3 } from "node:path";
 var DEFAULT_CONFIG = {
   dir: "./",
   ignore: {
@@ -9859,19 +9870,19 @@ var DEFAULT_CONFIG = {
       "**/vendor/**"
     ],
     files: [
-      "*.test.ts",
-      "*.spec.ts",
-      "*.test.tsx",
-      "*.spec.tsx",
-      "public/robots.txt",
-      "public/sitemap*.xml",
-      "public/favicon.ico",
-      "public/sw.js",
-      "public/manifest.json",
-      "public/twitter-image.*",
-      "public/opengraph-image.*",
-      "public/apple-icon.*",
-      "public/icon.*",
+      "**/*.test.ts",
+      "**/*.spec.ts",
+      "**/*.test.tsx",
+      "**/*.spec.tsx",
+      "**/public/robots.txt",
+      "**/public/sitemap*.xml",
+      "**/public/favicon.ico",
+      "**/public/sw.js",
+      "**/public/manifest.json",
+      "**/public/twitter-image.*",
+      "**/public/opengraph-image.*",
+      "**/public/apple-icon.*",
+      "**/public/icon.*",
       "**/proxy.*",
       "**/middleware.*"
     ]
@@ -9910,12 +9921,19 @@ function loadConfig(options) {
     try {
       const content = readFileSync5(configPath, "utf-8");
       const config = JSON.parse(content);
+      const configDir = dirname3(configPath);
+      const relDir = relative2(cwd, configDir);
+      const prefixPattern = (p) => {
+        if (p.startsWith("**/") || p.startsWith("/") || !relDir)
+          return p;
+        return join5(relDir, p).replace(/\\/g, "/");
+      };
       if (config.ignore?.routes)
-        mergedIgnore.routes.push(...config.ignore.routes);
+        mergedIgnore.routes.push(...config.ignore.routes.map(prefixPattern));
       if (config.ignore?.folders)
-        mergedIgnore.folders.push(...config.ignore.folders);
+        mergedIgnore.folders.push(...config.ignore.folders.map(prefixPattern));
       if (config.ignore?.files)
-        mergedIgnore.files.push(...config.ignore.files);
+        mergedIgnore.files.push(...config.ignore.files.map(prefixPattern));
       if (config.extensions)
         mergedExtensions = [...new Set([...mergedExtensions, ...config.extensions])];
       if (config.nestGlobalPrefix)
@@ -9924,8 +9942,6 @@ function loadConfig(options) {
         extraRoutePatterns.push(...config.extraRoutePatterns);
       if (config.excludePublic !== undefined)
         excludePublic = config.excludePublic;
-      if (config.excludePublic !== undefined)
-        excludePublic = config.excludePublic;
     } catch {}
   }
   const gitIgnorePatterns = parseGitIgnore(cwd);
@@ -9972,6 +9988,8 @@ import { readFileSync as readFileSync6, writeFileSync, unlinkSync, existsSync as
 import { join as join6 } from "node:path";
 function removeExportFromLine(rootDir, exp) {
   const fullPath = join6(rootDir, exp.file);
+  if (!existsSync5(fullPath))
+    return false;
   try {
     const content = readFileSync6(fullPath, "utf-8");
     const lines = content.split(`
@@ -10230,18 +10248,40 @@ program2.action(async (options) => {
 `));
     }
     if (options.fix) {
+      let fixedSomething = false;
       if (unusedRoutes.length > 0) {
         console.log(source_default.yellow.bold(`\uD83D\uDDD1️  Deleting unused routes...
 `));
         for (const route of unusedRoutes) {
-          const routeDir = dirname3(join8(config.dir, route.filePath));
+          const fullPath = join8(config.dir, route.filePath);
+          const routeDir = dirname4(fullPath);
           try {
-            rmSync(routeDir, { recursive: true, force: true });
-            console.log(source_default.red(`   Deleted: ${route.filePath}`));
+            if (!existsSync7(fullPath))
+              continue;
+            if (route.type === "nextjs") {
+              if (route.filePath.includes("app/api") || route.filePath.includes("pages/api")) {
+                rmSync(routeDir, { recursive: true, force: true });
+                console.log(source_default.red(`   Deleted Folder: ${routeDir}`));
+              } else {
+                rmSync(fullPath, { force: true });
+                console.log(source_default.red(`   Deleted File: ${route.filePath}`));
+              }
+            } else if (route.type === "nestjs") {
+              rmSync(fullPath, { force: true });
+              console.log(source_default.red(`   Deleted File: ${route.filePath}`));
+            } else {
+              rmSync(fullPath, { force: true });
+              console.log(source_default.red(`   Deleted File: ${route.filePath}`));
+            }
+            fixedSomething = true;
+            const idx = result.routes.indexOf(route);
+            if (idx !== -1)
+              result.routes.splice(idx, 1);
           } catch (_err) {
             console.log(source_default.yellow(`   Failed to delete: ${route.filePath}`));
           }
         }
+        console.log("");
       }
       const partiallyRoutes = result.routes.filter((r) => r.used && r.unusedMethods.length > 0);
       if (partiallyRoutes.length > 0) {
@@ -10249,15 +10289,44 @@ program2.action(async (options) => {
 `));
         for (const route of partiallyRoutes) {
           const sortedMethods = [...route.unusedMethods].filter((m) => route.methodLines[m] !== undefined).sort((a, b) => route.methodLines[b] - route.methodLines[a]);
+          let fixedCount = 0;
           for (const method of sortedMethods) {
             const lineNum = route.methodLines[method];
             if (removeMethodFromRoute(config.dir, route.filePath, method, lineNum)) {
               console.log(source_default.green(`   Fixed: Removed ${method} from ${route.path}`));
+              fixedCount++;
+              fixedSomething = true;
             }
           }
+          if (fixedCount === route.methods.length) {
+            const idx = result.routes.indexOf(route);
+            if (idx !== -1)
+              result.routes.splice(idx, 1);
+          } else {
+            route.unusedMethods = route.unusedMethods.filter((m) => !sortedMethods.includes(m));
+          }
         }
         console.log("");
       }
+      if (result.unusedFiles && result.unusedFiles.files.length > 0) {
+        console.log(source_default.yellow.bold(`\uD83D\uDDD1️  Deleting unused source files...
+`));
+        for (const file of result.unusedFiles.files) {
+          try {
+            const fullPath = join8(config.dir, file.path);
+            if (!existsSync7(fullPath))
+              continue;
+            rmSync(fullPath, { force: true });
+            console.log(source_default.red(`   Deleted: ${file.path}`));
+            fixedSomething = true;
+          } catch (_err) {
+            console.log(source_default.yellow(`   Failed to delete: ${file.path}`));
+          }
+        }
+        result.unusedFiles.files = [];
+        result.unusedFiles.unused = 0;
+        console.log("");
+      }
       if (result.unusedExports && result.unusedExports.exports.length > 0) {
         console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing unused exports (removing "export" keyword)...
 `));
@@ -10272,9 +10341,18 @@ program2.action(async (options) => {
         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--;
+              }
             }
           }
         }
@@ -10284,8 +10362,13 @@ program2.action(async (options) => {
 `));
         }
       }
-    } else if (unusedRoutes.length > 0 || result.unusedExports && result.unusedExports.exports.length > 0) {
-      console.log(source_default.dim(`\uD83D\uDCA1 Run with --fix to automatically clean up unused routes and exports.
+      if (fixedSomething) {
+        result.unused = result.routes.filter((r) => !r.used).length;
+        result.used = result.routes.filter((r) => r.used).length;
+        result.total = result.routes.length;
+      }
+    } else if (unusedRoutes.length > 0 || result.unusedExports && result.unusedExports.exports.length > 0 || result.unusedFiles && result.unusedFiles.files.length > 0) {
+      console.log(source_default.dim(`\uD83D\uDCA1 Run with --fix to automatically clean up unused routes, files, and exports.
 `));
     }
     console.log(source_default.bold(`\uD83D\uDCCA Summary Report

package/package.json

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