pruny 1.18.0 → 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 = [];
@@ -9704,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) {
@@ -9895,7 +9913,7 @@ var DEFAULT_CONFIG = {
     ]
   },
   extensions: [".ts", ".tsx", ".js", ".jsx"],
-  nestGlobalPrefix: "api",
+  nestGlobalPrefix: "",
   extraRoutePatterns: []
 };
 function loadConfig(options) {

package/package.json

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