pruny 1.17.1 → 1.19.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 = [];
@@ -9680,14 +9687,21 @@ function extractNestRoutes(filePath, content, globalPrefix = "api") {
   return routes;
 }
 function shouldIgnore(path2, ignorePatterns) {
-  const normalizedPath = path2.replace(/\\/g, "/").replace(/^\.\//, "");
+  const cleanPath = path2.replace(/\\/g, "/").replace(/^\//, "").replace(/^\.\//, "");
   return ignorePatterns.some((pattern) => {
-    const normalizedPattern = pattern.replace(/\\/g, "/").replace(/^\.\//, "");
-    if (minimatch(normalizedPath, normalizedPattern))
+    let cleanPattern = pattern.replace(/\\/g, "/").replace(/^\.\//, "");
+    const isAbsolute = cleanPattern.startsWith("/");
+    if (isAbsolute)
+      cleanPattern = cleanPattern.substring(1);
+    if (minimatch(cleanPath, cleanPattern))
       return true;
-    const folderPattern = normalizedPattern.endsWith("/") ? normalizedPattern : normalizedPattern + "/";
-    if (normalizedPath.startsWith(folderPattern))
+    const folderPattern = cleanPattern.endsWith("/") ? cleanPattern : cleanPattern + "/";
+    if (cleanPath.startsWith(folderPattern))
       return true;
+    if (!isAbsolute && !cleanPattern.includes("/") && !cleanPattern.includes("*")) {
+      if (cleanPath.endsWith("/" + cleanPattern) || cleanPath === cleanPattern)
+        return true;
+    }
     return false;
   });
 }
@@ -9697,21 +9711,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) {
@@ -9808,7 +9833,7 @@ async function scan(config) {
     } catch {}
   }
   for (const route of routes) {
-    if (shouldIgnore(route.path, config.ignore.routes)) {
+    if (shouldIgnore(route.path, config.ignore.routes) || shouldIgnore(route.filePath, config.ignore.routes)) {
       route.used = true;
       route.references.push("(ignored by config)");
       route.unusedMethods = [];
@@ -9888,7 +9913,7 @@ var DEFAULT_CONFIG = {
     ]
   },
   extensions: [".ts", ".tsx", ".js", ".jsx"],
-  nestGlobalPrefix: "api",
+  nestGlobalPrefix: "",
   extraRoutePatterns: []
 };
 function loadConfig(options) {
@@ -9930,7 +9955,7 @@ function loadConfig(options) {
         return prefixed.includes("/") ? `**/${prefixed}` : `**/${prefixed}`;
       };
       if (config.ignore?.routes)
-        mergedIgnore.routes.push(...config.ignore.routes.map(prefixPattern));
+        mergedIgnore.routes.push(...config.ignore.routes);
       if (config.ignore?.folders)
         mergedIgnore.folders.push(...config.ignore.folders.map(prefixPattern));
       if (config.ignore?.files)
@@ -10253,47 +10278,70 @@ program2.action(async (options) => {
       if (unusedRoutes.length > 0) {
         console.log(source_default.yellow.bold(`\uD83D\uDDD1️  Deleting unused routes...
 `));
-        for (const route of unusedRoutes) {
-          const fullPath = join8(config.dir, route.filePath);
+        const routesByFile = new Map;
+        for (const r of unusedRoutes) {
+          const list = routesByFile.get(r.filePath) || [];
+          list.push(r);
+          routesByFile.set(r.filePath, list);
+        }
+        for (const [filePath, fileRoutes] of routesByFile) {
+          const fullPath = join8(config.dir, filePath);
+          if (!existsSync7(fullPath))
+            continue;
+          const route = fileRoutes[0];
           const routeDir = dirname4(fullPath);
           try {
-            if (!existsSync7(fullPath))
-              continue;
             if (route.type === "nextjs") {
-              if (route.filePath.includes("app/api") || route.filePath.includes("pages/api")) {
+              if (filePath.includes("app/api") || 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}`));
+                console.log(source_default.red(`   Deleted File: ${filePath}`));
               }
+              fixedSomething = true;
             } else if (route.type === "nestjs") {
-              const isInternallyUnused = result.unusedFiles?.files.some((f) => f.path === route.filePath);
-              if (isInternallyUnused || route.filePath.includes("api/")) {
+              const isInternallyUnused = result.unusedFiles?.files.some((f) => f.path === filePath);
+              if (isInternallyUnused || filePath.includes("api/")) {
                 rmSync(fullPath, { force: true });
-                console.log(source_default.red(`   Deleted File: ${route.filePath}`));
+                console.log(source_default.red(`   Deleted File: ${filePath}`));
                 fixedSomething = true;
               } else {
-                console.log(source_default.yellow(`   Skipped Deletion (internally used): ${route.filePath}`));
+                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).`));
-                continue;
+                const allMethodsToPrune = [];
+                for (const r of fileRoutes) {
+                  for (const m of r.unusedMethods) {
+                    if (r.methodLines[m] !== undefined) {
+                      allMethodsToPrune.push({ method: m, line: r.methodLines[m] });
+                    }
+                  }
+                }
+                allMethodsToPrune.sort((a, b) => b.line - a.line);
+                for (const { method, line } of allMethodsToPrune) {
+                  if (removeMethodFromRoute(config.dir, filePath, method, line)) {
+                    console.log(source_default.green(`      Fixed: Removed ${method} from ${filePath}`));
+                    fixedSomething = true;
+                  }
+                }
               }
             } else {
               rmSync(fullPath, { force: true });
-              console.log(source_default.red(`   Deleted File: ${route.filePath}`));
+              console.log(source_default.red(`   Deleted File: ${filePath}`));
               fixedSomething = true;
             }
-            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}`));
+            for (const r of fileRoutes) {
+              const idx = result.routes.indexOf(r);
+              if (idx !== -1)
+                result.routes.splice(idx, 1);
+            }
+          } catch (err) {
+            console.log(source_default.yellow(`   Failed to fix: ${filePath}`));
           }
         }
         console.log("");
       }
-      const partiallyRoutes = result.routes.filter((r) => r.used && r.unusedMethods.length > 0);
+      const partiallyRoutes = result.routes.filter((r) => r.used && r.unusedMethods && r.unusedMethods.length > 0);
       if (partiallyRoutes.length > 0) {
         console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing partially unused routes...
 `));

package/package.json

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