pruny 1.44.3 → 1.44.5

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, "\\$&");
@@ -14964,7 +14964,6 @@ async function scanUnusedExports(config, routes = [], options = {}) {
                 console.log(`[DEBUG USE] ${exp.name} used internally in ${file} at line ${i + 1}: ${line.trim()}`);
               }
               usedInternally = true;
-              isUsed = true;
               break;
             }
           }
@@ -14985,6 +14984,10 @@ async function scanUnusedExports(config, routes = [], options = {}) {
         const absoluteOtherFileFixed = isAbsolute2(otherFile) ? otherFile : join4(scanCwd, otherFile);
         const hasIgnoreRanges = ignoreRanges.has(absoluteOtherFileFixed);
         const isGeneric = GENERIC_METHOD_NAMES.has(exp.name);
+        const hasSelfImport = new RegExp(`import.*\\b${escapeRegExp(exp.name)}\\b.*from`).test(content);
+        const hasSelfDecl = new RegExp(`(?:export\\s+)?(?:abstract\\s+)?(?:interface|class|enum)\\s+${escapeRegExp(exp.name)}\\b|` + `(?:export\\s+)?(?:async\\s+)?(?:function)\\s+${escapeRegExp(exp.name)}\\b|` + `(?:export\\s+)?(?:const|let|var|type)\\s+${escapeRegExp(exp.name)}\\s*[=<]`).test(content);
+        if (hasSelfDecl && !hasSelfImport)
+          continue;
         if (!hasIgnoreRanges && !isGeneric) {
           const jsxPattern = new RegExp(`<${exp.name}[\\s/>]`);
           if (jsxPattern.test(content)) {
@@ -15325,11 +15328,18 @@ function removeExportFromLine(rootDir, exp) {
     const content = readFileSync7(fullPath, "utf-8");
     const lines = content.split(`
 `);
-    const lineIndex = findDeclarationIndex(lines, exp.name, exp.line - 1);
+    let lineIndex = findDeclarationIndex(lines, exp.name, exp.line - 1);
+    if (lineIndex === -1) {
+      lineIndex = findDeclarationIndex(lines, exp.name, 0);
+    }
     if (!exp.usedInternally) {
+      if (lineIndex === -1) {
+        return removeFromBlockExport(lines, fullPath, exp.name, exp.line);
+      }
       const trueStartLine = findDeclarationStart(lines, lineIndex);
       const deletedLines = deleteDeclaration(lines, trueStartLine, exp.name);
       if (deletedLines > 0) {
+        removeFromBlockExport(lines, fullPath, exp.name, exp.line);
         const newContent = lines.join(`
 `);
         if (isFileEmpty(newContent)) {
@@ -15341,7 +15351,12 @@ function removeExportFromLine(rootDir, exp) {
       }
       return false;
     }
+    if (lineIndex === -1) {
+      return removeFromBlockExport(lines, fullPath, exp.name, exp.line);
+    }
     const originalLine = lines[lineIndex];
+    if (!originalLine)
+      return false;
     if (originalLine.trim().startsWith("export ")) {
       const newLine = originalLine.replace(/(\s*)export\s+/, "$1");
       lines[lineIndex] = newLine;
@@ -15349,12 +15364,31 @@ function removeExportFromLine(rootDir, exp) {
 `), "utf-8");
       return true;
     }
-    return false;
+    return removeFromBlockExport(lines, fullPath, exp.name, exp.line);
   } catch (err) {
     console.error(`Error fixing export in ${exp.file}:`, err);
     return false;
   }
 }
+function removeFromBlockExport(lines, fullPath, name, exportLine) {
+  const lineIdx = exportLine - 1;
+  const line = lines[lineIdx];
+  if (!line)
+    return false;
+  if (!/^export\s*\{/.test(line.trim()))
+    return false;
+  const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  let newLine = line.replace(new RegExp(`\\b${escaped}\\b\\s*,\\s*`), "").replace(new RegExp(`,\\s*\\b${escaped}\\b`), "").replace(new RegExp(`\\b${escaped}\\b`), "");
+  newLine = newLine.replace(/\{\s*\}/, "{}").replace(/\{\s+/, "{ ").replace(/\s+\}/, " }");
+  if (newLine.trim() === "export {}" || newLine.trim() === "export { }") {
+    lines.splice(lineIdx, 1);
+  } else {
+    lines[lineIdx] = newLine;
+  }
+  writeFileSync(fullPath, lines.join(`
+`), "utf-8");
+  return true;
+}
 function findDeclarationIndex(lines, name, startLine = 0) {
   const methodRegex = new RegExp(`(?:public|private|protected|static|async|readonly)?\\s*(?:async)?\\s*${name}\\s*[(<]`);
   const declRegex = new RegExp(`(?:export\\s+)?(?:default\\s+)?(?:(?:abstract|async|static|readonly)\\s+)*(?:class|interface|type|enum|function|const|let|var)\\s+${name}\\b`);
@@ -15426,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;
@@ -15446,6 +15481,16 @@ function deleteDeclaration(lines, startLine, name) {
     if (inTemplateLiteral) {
       if (backtickCount % 2 !== 0) {
         inTemplateLiteral = false;
+        const lastTick = line.lastIndexOf("`");
+        const afterTick = sanitizeLine(line.slice(lastTick + 1));
+        const extraOpens = (afterTick.match(/{/g) || []).length;
+        const extraCloses = (afterTick.match(/}/g) || []).length;
+        braceCount += extraOpens - extraCloses;
+        if (foundBodyOpening && braceCount <= 0 && bracketCount <= 0) {
+          endLine = i;
+          foundClosing = true;
+          break;
+        }
       }
       continue;
     }
@@ -15458,6 +15503,8 @@ function deleteDeclaration(lines, startLine, name) {
     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;
@@ -15476,11 +15523,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;
@@ -15489,11 +15537,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;
@@ -18372,6 +18421,8 @@ Analyzing cascading impact...`));
       result.used = result.routes.filter((r) => r.used).length;
       result.total = result.routes.length;
     }
+    if (options.cleanup)
+      return "exit";
     console.log("");
     continue;
   }

package/package.json

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