pruny 1.44.4 → 1.44.6

package/dist/index.js

@@ -14198,7 +14198,7 @@ function getAppName(filePath) {
 }
 function makeCodePattern(name) {
   const escaped = escapeRegExp(name);
-  return new RegExp(`\\b${escaped}\\s*[({.,;<>|&\\[=)]` + `|\\b${escaped}\\s*\\)` + `|\\.[\\s\\n]*${escaped}\\b` + `|\\b${escaped}\\s*:[^:]` + `|:\\s*${escaped}\\b`);
+  return new RegExp(`\\b${escaped}\\s*[({.,;<>|&\\[=)]` + `|\\b${escaped}\\s*\\)` + `|\\.[\\s\\n]*${escaped}\\b` + `|\\b${escaped}\\s*:[^:]` + `|:\\s*${escaped}\\b` + `|<\\/?${escaped}(?=[\\s/>]|$)`);
 }
 function escapeRegExp(string) {
   return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
@@ -15460,6 +15460,7 @@ function deleteDeclaration(lines, startLine, name) {
     return 0;
   let endLine = startLine;
   let braceCount = 0;
+  let bracketCount = 0;
   let parenCount = 0;
   let foundMethodDefinition = false;
   let foundBodyOpening = false;
@@ -15485,7 +15486,7 @@ function deleteDeclaration(lines, startLine, name) {
         const extraOpens = (afterTick.match(/{/g) || []).length;
         const extraCloses = (afterTick.match(/}/g) || []).length;
         braceCount += extraOpens - extraCloses;
-        if (foundBodyOpening && braceCount <= 0) {
+        if (foundBodyOpening && braceCount <= 0 && bracketCount <= 0) {
           endLine = i;
           foundClosing = true;
           break;
@@ -15493,15 +15494,20 @@ function deleteDeclaration(lines, startLine, name) {
       }
       continue;
     }
+    let lineToSanitize = line;
     if (backtickCount % 2 !== 0) {
       inTemplateLiteral = true;
+      const firstTick = lineForBackticks.indexOf("`");
+      lineToSanitize = line.slice(0, firstTick);
     }
     const isDecorator = trimmed.startsWith("@");
-    const cleanLine = sanitizeLine(line);
+    const cleanLine = sanitizeLine(lineToSanitize);
     const openBraces = (cleanLine.match(/{/g) || []).length;
     const closeBraces = (cleanLine.match(/}/g) || []).length;
     const openParens = (cleanLine.match(/\(/g) || []).length;
     const closeParens = (cleanLine.match(/\)/g) || []).length;
+    const openBrackets = (cleanLine.match(/\[/g) || []).length;
+    const closeBrackets = (cleanLine.match(/\]/g) || []).length;
     if (!foundMethodDefinition) {
       if (isDecorator || currentDecoratorParenDepth > 0 || currentDecoratorBraceDepth > 0) {
         currentDecoratorParenDepth += openParens - closeParens;
@@ -15520,11 +15526,12 @@ function deleteDeclaration(lines, startLine, name) {
           }
           foundMethodDefinition = true;
           braceCount = openBraces - closeBraces;
+          bracketCount = openBrackets - closeBrackets;
           parenCount = openParens - closeParens;
-          if (openBraces > 0 && parenCount === 0) {
+          if ((openBraces > 0 || bracketCount > 0) && parenCount === 0) {
             foundBodyOpening = true;
           }
-          if (foundBodyOpening && braceCount <= 0) {
+          if (foundBodyOpening && braceCount <= 0 && bracketCount <= 0) {
             endLine = i;
             foundClosing = true;
             break;
@@ -15533,11 +15540,12 @@ function deleteDeclaration(lines, startLine, name) {
       }
     } else {
       braceCount += openBraces - closeBraces;
+      bracketCount += openBrackets - closeBrackets;
       parenCount += openParens - closeParens;
-      if (!foundBodyOpening && openBraces > 0 && parenCount === 0) {
+      if (!foundBodyOpening && (openBraces > 0 || openBrackets > 0) && parenCount === 0) {
         foundBodyOpening = true;
       }
-      if (foundBodyOpening && braceCount <= 0) {
+      if (foundBodyOpening && braceCount <= 0 && bracketCount <= 0) {
         endLine = i;
         foundClosing = true;
         break;

package/package.json

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