pruny 1.4.0 → 1.6.0

package/dist/index.js

@@ -9394,17 +9394,54 @@ async function scanUnusedExports(config) {
   for (const [file, exports] of exportMap.entries()) {
     for (const exp of exports) {
       let isUsed = false;
+      let usedInternally = false;
+      const fileContent = totalContents.get(file);
+      if (fileContent) {
+        const lines = fileContent.split(`
+`);
+        for (let i = 0;i < lines.length; i++) {
+          if (i === exp.line - 1)
+            continue;
+          const line = lines[i];
+          if (isCommentOrString(line))
+            continue;
+          const cleanLine = stripStringsAndComments(line);
+          const referenceRegex = new RegExp(`\\b${exp.name}\\b`);
+          if (referenceRegex.test(cleanLine)) {
+            usedInternally = true;
+            break;
+          }
+        }
+      }
       for (const [otherFile, content] of totalContents.entries()) {
         if (file === otherFile)
           continue;
-        const referenceRegex = new RegExp(`\\b${exp.name}\\b`);
-        if (referenceRegex.test(content)) {
+        const jsxPattern = new RegExp(`<${exp.name}[\\s/>]`);
+        const importPattern = new RegExp(`import.*\\b${exp.name}\\b.*from`);
+        const destructurePattern = new RegExp(`\\{[^}]*\\b${exp.name}\\b[^}]*\\}`);
+        if (jsxPattern.test(content) || importPattern.test(content)) {
           isUsed = true;
           break;
         }
+        if (!isUsed) {
+          const lines = content.split(`
+`);
+          for (const line of lines) {
+            if (isCommentOrString(line))
+              continue;
+            const cleanLine = stripStringsAndComments(line);
+            const codeUsagePattern = new RegExp(`\\b${exp.name}\\s*[({]|\\b${exp.name}\\s*\\.|\\b${exp.name}\\s*,|\\b${exp.name}\\s*;|\\b${exp.name}\\s*\\)`);
+            if (codeUsagePattern.test(cleanLine)) {
+              isUsed = true;
+              break;
+            }
+          }
+        }
+        if (isUsed)
+          break;
       }
       if (!isUsed) {
-        unusedExports.push(exp);
+        unusedExports.push({ ...exp, usedInternally });
       }
     }
   }
@@ -9415,6 +9452,24 @@ async function scanUnusedExports(config) {
     exports: unusedExports
   };
 }
+function isCommentOrString(line) {
+  const trimmed = line.trim();
+  if (trimmed.startsWith("//"))
+    return true;
+  if (trimmed.startsWith("/*") || trimmed.startsWith("*"))
+    return true;
+  if (trimmed.includes("{/*") || trimmed.includes("*/}"))
+    return true;
+  return false;
+}
+function stripStringsAndComments(line) {
+  let result = line;
+  result = result.replace(/\/\/.*$/g, "");
+  result = result.replace(/'([^'\\]|\\.)*'/g, "''");
+  result = result.replace(/"([^"\\]|\\.)*"/g, '""');
+  result = result.replace(/`([^`\\]|\\.)*`/g, "``");
+  return result;
+}
 
 // src/scanner.ts
 function extractRoutePath(filePath) {
@@ -9742,7 +9797,7 @@ function findConfigFile(dir) {
 }
 
 // src/fixer.ts
-import { readFileSync as readFileSync6, writeFileSync } from "node:fs";
+import { readFileSync as readFileSync6, writeFileSync, unlinkSync } from "node:fs";
 import { join as join6 } from "node:path";
 function removeExportFromLine(rootDir, exp) {
   const fullPath = join6(rootDir, exp.file);
@@ -9751,6 +9806,20 @@ function removeExportFromLine(rootDir, exp) {
     const lines = content.split(`
 `);
     const lineIndex = exp.line - 1;
+    if (!exp.usedInternally) {
+      const deletedLines = deleteDeclaration(lines, lineIndex);
+      if (deletedLines > 0) {
+        const newContent = lines.join(`
+`);
+        if (isFileEmpty(newContent)) {
+          unlinkSync(fullPath);
+          return true;
+        }
+        writeFileSync(fullPath, newContent, "utf-8");
+        return true;
+      }
+      return false;
+    }
     const originalLine = lines[lineIndex];
     const exportPrefixRegex = /^(export\s+(?:async\s+)?)/;
     if (exportPrefixRegex.test(originalLine.trim())) {
@@ -9766,13 +9835,61 @@ function removeExportFromLine(rootDir, exp) {
     return false;
   }
 }
+function deleteDeclaration(lines, startLine) {
+  if (startLine >= lines.length)
+    return 0;
+  let endLine = startLine;
+  let braceCount = 0;
+  let foundClosing = false;
+  for (let i = startLine;i < lines.length; i++) {
+    const line = lines[i];
+    const openBraces = (line.match(/{/g) || []).length;
+    const closeBraces = (line.match(/}/g) || []).length;
+    braceCount += openBraces - closeBraces;
+    if (braceCount === 0) {
+      if (line.includes(";") || line.includes("};")) {
+        endLine = i;
+        foundClosing = true;
+        break;
+      }
+      if (i > startLine && line.trim() === "}") {
+        endLine = i;
+        foundClosing = true;
+        break;
+      }
+    }
+  }
+  if (!foundClosing && braceCount === 0) {
+    endLine = startLine;
+  }
+  const linesToDelete = endLine - startLine + 1;
+  lines.splice(startLine, linesToDelete);
+  return linesToDelete;
+}
+function isFileEmpty(content) {
+  const lines = content.split(`
+`);
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed)
+      continue;
+    if (trimmed.startsWith("//") || trimmed.startsWith("/*") || trimmed.startsWith("*"))
+      continue;
+    if (trimmed.startsWith("import ") || trimmed.startsWith("export "))
+      continue;
+    if (trimmed === '"use client";' || trimmed === '"use server";' || trimmed === "'use client';" || trimmed === "'use server';")
+      continue;
+    return false;
+  }
+  return true;
+}
 
 // src/init.ts
-import { writeFileSync as writeFileSync2, existsSync as existsSync5 } from "node:fs";
+import { writeFileSync as writeFileSync2, existsSync as existsSync6 } from "node:fs";
 import { join as join7 } from "node:path";
 function init(cwd = process.cwd()) {
   const configPath = join7(cwd, "pruny.config.json");
-  if (existsSync5(configPath)) {
+  if (existsSync6(configPath)) {
     console.log(source_default.yellow("⚠️  pruny.config.json already exists. Skipping."));
     return;
   }
@@ -10005,11 +10122,21 @@ program2.action(async (options) => {
       if (result.unusedExports && result.unusedExports.exports.length > 0) {
         console.log(source_default.yellow.bold(`\uD83D\uDD27 Fixing unused exports (removing "export" keyword)...
 `));
-        let fixedCount = 0;
+        const exportsByFile = new Map;
         for (const exp of result.unusedExports.exports) {
-          if (removeExportFromLine(config.dir, exp)) {
-            console.log(source_default.green(`   Fixed: ${exp.name} in ${exp.file}`));
-            fixedCount++;
+          if (!exportsByFile.has(exp.file)) {
+            exportsByFile.set(exp.file, []);
+          }
+          exportsByFile.get(exp.file).push(exp);
+        }
+        let fixedCount = 0;
+        for (const [file, exports] of exportsByFile.entries()) {
+          const sortedExports = exports.sort((a, b) => b.line - a.line);
+          for (const exp of sortedExports) {
+            if (removeExportFromLine(config.dir, exp)) {
+              console.log(source_default.green(`   Fixed: ${exp.name} in ${exp.file}`));
+              fixedCount++;
+            }
           }
         }
         if (fixedCount > 0) {

package/package.json

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