pruny 1.5.0 → 1.6.0

package/dist/index.js

@@ -9402,8 +9402,12 @@ async function scanUnusedExports(config) {
         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(lines[i])) {
+          if (referenceRegex.test(cleanLine)) {
             usedInternally = true;
             break;
           }
@@ -9412,11 +9416,29 @@ async function scanUnusedExports(config) {
       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, usedInternally });
@@ -9430,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) {
@@ -10082,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.5.0",
+  "version": "1.6.0",
   "description": "Find and remove unused Next.js API routes & Nest.js Controllers",
   "type": "module",
   "files": [