pruny 1.21.0 → 1.22.0

package/dist/index.js

@@ -10068,15 +10068,24 @@ function removeExportFromLine(rootDir, exp) {
   }
 }
 function findDeclarationIndex(lines, name, hintIndex) {
-  if (hintIndex < lines.length && lines[hintIndex].includes(name))
+  let searchName = name;
+  if (/^(GET|POST|PUT|DELETE|PATCH|OPTIONS|HEAD|ALL)$/.test(name)) {
+    searchName = "@" + name.charAt(0).toUpperCase() + name.slice(1).toLowerCase();
+  }
+  if (hintIndex >= 0 && hintIndex < lines.length && lines[hintIndex] && lines[hintIndex].includes(searchName)) {
     return hintIndex;
+  }
   for (let i = 1;i < 50; i++) {
-    if (hintIndex - i >= 0 && lines[hintIndex - i].includes(name))
-      return hintIndex - i;
-    if (hintIndex + i < lines.length && lines[hintIndex + i].includes(name))
-      return hintIndex + i;
+    const prev = hintIndex - i;
+    if (prev >= 0 && prev < lines.length && lines[prev] && lines[prev].includes(searchName)) {
+      return prev;
+    }
+    const next = hintIndex + i;
+    if (next >= 0 && next < lines.length && lines[next] && lines[next].includes(searchName)) {
+      return next;
+    }
   }
-  return lines.findIndex((l) => l.includes(name));
+  return lines.findIndex((l) => l && l.includes(searchName));
 }
 function findDeclarationStart(lines, lineIndex) {
   let current = lineIndex;
@@ -10085,7 +10094,19 @@ function findDeclarationStart(lines, lineIndex) {
     if (prevLine.startsWith("@") || prevLine.startsWith("//") || prevLine.startsWith("/*")) {
       current--;
     } else if (prevLine === "") {
-      if (current > 1 && lines[current - 2].trim().startsWith("@")) {
+      let foundDecoratorAbove = false;
+      for (let k = 1;k <= 3; k++) {
+        if (current - 1 - k >= 0) {
+          const checkLine = lines[current - 1 - k].trim();
+          if (checkLine.startsWith("@")) {
+            foundDecoratorAbove = true;
+            break;
+          }
+          if (checkLine !== "")
+            break;
+        }
+      }
+      if (foundDecoratorAbove) {
         current--;
       } else {
         break;
@@ -10112,59 +10133,50 @@ function deleteDeclaration(lines, startLine, name) {
     return 0;
   let endLine = startLine;
   let braceCount = 0;
+  let foundMethodDefinition = false;
   let foundBodyOpening = false;
-  let reachedSignature = name === null;
   let foundClosing = false;
+  const methodDefRegex = /^(?:export\s+)?(?:public|private|protected|static|async|readonly|\s)*[a-zA-Z0-9_$]+\s*[=(<]/;
+  const methodDefRegexSimple = /^[a-zA-Z0-9_$]+\s*\(/;
   for (let i = startLine;i < lines.length; i++) {
     const line = lines[i];
     const trimmed = line.trim();
-    if (!reachedSignature && name && line.includes(name)) {
-      reachedSignature = true;
+    const isCommentOrEmpty = trimmed.startsWith("//") || trimmed.startsWith("/*") || trimmed === "";
+    const isDecorator = trimmed.startsWith("@");
+    if (!foundMethodDefinition && !isDecorator && !isCommentOrEmpty && braceCount === 0) {
+      if (methodDefRegex.test(trimmed) || methodDefRegexSimple.test(trimmed) || name && (trimmed.includes(` ${name}(`) || trimmed.startsWith(`${name}(`))) {
+        foundMethodDefinition = true;
+      }
     }
     const openBraces = (line.match(/{/g) || []).length;
     const closeBraces = (line.match(/}/g) || []).length;
-    braceCount += openBraces - closeBraces;
-    if (reachedSignature && !foundBodyOpening && openBraces > 0) {
-      foundBodyOpening = true;
-    }
-    if (foundBodyOpening && braceCount <= 0) {
-      endLine = i;
-      foundClosing = true;
-      break;
-    }
-    if (reachedSignature && !foundBodyOpening && braceCount === 0) {
-      if (trimmed.endsWith(";") || trimmed.includes("};")) {
+    if (foundMethodDefinition) {
+      braceCount += openBraces - closeBraces;
+      if (!foundBodyOpening && openBraces > 0) {
+        foundBodyOpening = true;
+      }
+      if (foundBodyOpening && braceCount <= 0) {
         endLine = i;
         foundClosing = true;
         break;
       }
-      if (i > startLine && (trimmed.startsWith("@") || trimmed.match(/^(?:export\s+)?(?:async\s+)?(?:function|const|class|let|var|public|private|protected)\s+/))) {
-        endLine = i - 1;
+      if (!foundBodyOpening && trimmed.endsWith(";") && braceCount === 0) {
+        endLine = i;
         foundClosing = true;
         break;
       }
-      if (i > startLine + 10) {
-        endLine = i - 1;
-        foundClosing = true;
+    } else {
+      if (i > startLine + 50) {
         break;
       }
     }
   }
-  if (!foundClosing && reachedSignature && lines.length > startLine) {
-    endLine = startLine;
-    for (let k = startLine;k < Math.min(lines.length, startLine + 10); k++) {
-      if (lines[k].trim().endsWith(";") || lines[k].trim().includes("};")) {
-        endLine = k;
-        foundClosing = true;
-        break;
-      }
-    }
+  if (foundClosing) {
+    const linesToDelete = endLine - startLine + 1;
+    lines.splice(startLine, linesToDelete);
+    return linesToDelete;
   }
-  if (!foundClosing)
-    endLine = startLine;
-  const linesToDelete = endLine - startLine + 1;
-  lines.splice(startLine, linesToDelete);
-  return linesToDelete;
+  return 0;
 }
 function isFileEmpty(content) {
   return content.split(`

package/package.json

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