pruny 1.14.0 → 1.15.1

package/dist/index.js

@@ -9621,13 +9621,22 @@ function extractRoutePath(filePath) {
 }
 function extractExportedMethods(content) {
   const methods = [];
+  const methodLines = {};
+  const lines = content.split(`
+`);
   let match2;
+  EXPORTED_METHOD_PATTERN.lastIndex = 0;
   while ((match2 = EXPORTED_METHOD_PATTERN.exec(content)) !== null) {
     if (match2[1]) {
-      methods.push(match2[1]);
+      const methodName = match2[1];
+      methods.push(methodName);
+      const pos = match2.index;
+      const lineNum = content.substring(0, pos).split(`
+`).length;
+      methodLines[methodName] = lineNum;
     }
   }
-  return methods;
+  return { methods, methodLines };
 }
 function extractNestRoutes(filePath, content, globalPrefix = "api") {
   const controllerMatch = content.match(NEST_CONTROLLER_PATTERN);
@@ -9640,12 +9649,16 @@ function extractNestRoutes(filePath, content, globalPrefix = "api") {
   while ((methodMatch = NEST_METHOD_PATTERN.exec(content)) !== null) {
     const methodType = methodMatch[1].toUpperCase();
     const methodPath = methodMatch[2] || "";
+    const pos = methodMatch.index;
+    const lineNum = content.substring(0, pos).split(`
+`).length;
     const fullPath = `/${globalPrefix}/${controllerPath}/${methodPath}`.replace(/\/+/g, "/").replace(/\/$/, "");
     const existing = routes.find((r) => r.path === fullPath);
     if (existing) {
       if (!existing.methods.includes(methodType)) {
         existing.methods.push(methodType);
         existing.unusedMethods.push(methodType);
+        existing.methodLines[methodType] = lineNum;
       }
     } else {
       routes.push({
@@ -9655,7 +9668,8 @@ function extractNestRoutes(filePath, content, globalPrefix = "api") {
         used: false,
         references: [],
         methods: [methodType],
-        unusedMethods: [methodType]
+        unusedMethods: [methodType],
+        methodLines: { [methodType]: lineNum }
       });
     }
   }
@@ -9733,7 +9747,7 @@ async function scan(config) {
   });
   const nextRoutes = nextFiles.map((file) => {
     const content = readFileSync4(join4(cwd, file), "utf-8");
-    const methods = extractExportedMethods(content);
+    const { methods, methodLines } = extractExportedMethods(content);
     return {
       type: "nextjs",
       path: extractRoutePath(file),
@@ -9741,7 +9755,8 @@ async function scan(config) {
       used: false,
       references: [],
       methods,
-      unusedMethods: [...methods]
+      unusedMethods: [...methods],
+      methodLines
     };
   });
   const nestPatterns = ["**/*.controller.ts"];
@@ -9953,7 +9968,7 @@ function findConfigFile(dir) {
 }
 
 // src/fixer.ts
-import { readFileSync as readFileSync6, writeFileSync, unlinkSync } from "node:fs";
+import { readFileSync as readFileSync6, writeFileSync, unlinkSync, existsSync as existsSync5 } from "node:fs";
 import { join as join6 } from "node:path";
 function removeExportFromLine(rootDir, exp) {
   const fullPath = join6(rootDir, exp.file);
@@ -10039,6 +10054,32 @@ function isFileEmpty(content) {
   }
   return true;
 }
+function removeMethodFromRoute(rootDir, filePath, methodName, lineNum) {
+  const fullPath = join6(rootDir, filePath);
+  if (!existsSync5(fullPath))
+    return false;
+  try {
+    const content = readFileSync6(fullPath, "utf-8");
+    const lines = content.split(`
+`);
+    const lineIndex = lineNum - 1;
+    const deletedLines = deleteDeclaration(lines, lineIndex);
+    if (deletedLines > 0) {
+      const newContent = lines.join(`
+`);
+      if (isFileEmpty(newContent)) {
+        unlinkSync(fullPath);
+      } else {
+        writeFileSync(fullPath, newContent, "utf-8");
+      }
+      return true;
+    }
+    return false;
+  } catch (err) {
+    console.error(`Error removing method ${methodName} in ${filePath}:`, err);
+    return false;
+  }
+}
 
 // src/init.ts
 import { writeFileSync as writeFileSync2, existsSync as existsSync6 } from "node:fs";
@@ -10189,6 +10230,7 @@ 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...
 `));
@@ -10197,10 +10239,57 @@ program2.action(async (options) => {
           try {
             rmSync(routeDir, { recursive: true, force: true });
             console.log(source_default.red(`   Deleted: ${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) {
+        console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing partially unused routes...
+`));
+        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);
+            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)...
@@ -10219,6 +10308,12 @@ program2.action(async (options) => {
             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--;
+              }
             }
           }
         }
@@ -10228,8 +10323,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.14.0",
+  "version": "1.15.1",
   "description": "Find and remove unused Next.js API routes & Nest.js Controllers",
   "type": "module",
   "files": [