pruny 1.10.0 → 1.10.1

package/dist/index.js

@@ -9249,6 +9249,13 @@ async function scanUnusedFiles(config) {
         } else if (imp.startsWith("@/") || imp.startsWith("~/")) {
           const aliasPath = imp.substring(2);
           resolvedFile = resolveImport(cwd, aliasPath, extensions, cwd) || resolveImport(join2(cwd, "src"), aliasPath, extensions, cwd) || resolveImport(join2(cwd, "app"), aliasPath, extensions, cwd);
+          if (!resolvedFile) {
+            const pathParts = currentFile.split(/[/\\]/);
+            if (pathParts.length >= 2 && (pathParts[0] === "apps" || pathParts[0] === "packages")) {
+              const projectRoot = join2(cwd, pathParts[0], pathParts[1]);
+              resolvedFile = resolveImport(projectRoot, aliasPath, extensions, cwd) || resolveImport(join2(projectRoot, "src"), aliasPath, extensions, cwd) || resolveImport(join2(projectRoot, "app"), aliasPath, extensions, cwd);
+            }
+          }
         }
         if (resolvedFile && allFilesSet.has(resolvedFile)) {
           usedFiles.add(resolvedFile);
@@ -9494,17 +9501,34 @@ async function scanUnusedExports(config) {
       if (fileContent) {
         const lines = fileContent.split(`
 `);
+        let fileInMultilineComment = false;
+        let fileInTemplateLiteral = false;
         for (let i = 0;i < lines.length; i++) {
           if (i === exp.line - 1)
             continue;
           const line = lines[i];
           const trimmed = line.trim();
-          if (trimmed.startsWith("//") || trimmed.startsWith("/*") || trimmed.startsWith("*"))
+          if (trimmed.includes("/*"))
+            fileInMultilineComment = true;
+          if (trimmed.includes("*/")) {
+            fileInMultilineComment = false;
+            continue;
+          }
+          if (fileInMultilineComment)
             continue;
+          const backtickCount = (line.match(/`/g) || []).length;
+          if (backtickCount % 2 !== 0) {
+            fileInTemplateLiteral = !fileInTemplateLiteral;
+          }
+          if (fileInTemplateLiteral)
+            continue;
+          if (trimmed.startsWith("//"))
+            continue;
+          const lineWithoutStrings = line.replace(/'[^']*'/g, "''").replace(/"[^"]*"/g, '""');
           const referenceRegex = new RegExp(`\\b${exp.name}\\b`);
-          if (referenceRegex.test(line)) {
-            const codePattern = new RegExp(`\\b${exp.name}\\s*[({.,;)]|\\b${exp.name}\\s*\\)|\\s+${exp.name}\\b`);
-            if (codePattern.test(line)) {
+          if (referenceRegex.test(lineWithoutStrings)) {
+            const codePattern = new RegExp(`\\b${exp.name}\\s*[({.,;<>|&)]|\\b${exp.name}\\s*\\)|\\s+${exp.name}\\b`);
+            if (codePattern.test(lineWithoutStrings)) {
               usedInternally = true;
               break;
             }
@@ -9530,7 +9554,8 @@ async function scanUnusedExports(config) {
 `);
           let inMultilineComment = false;
           let inTemplateLiteral = false;
-          for (const line of lines) {
+          for (let lineIndex = 0;lineIndex < lines.length; lineIndex++) {
+            const line = lines[lineIndex];
             const trimmed = line.trim();
             if (trimmed.includes("/*"))
               inMultilineComment = true;
@@ -9548,11 +9573,11 @@ async function scanUnusedExports(config) {
               continue;
             if (trimmed.startsWith("//"))
               continue;
-            if (trimmed.includes("{/*") || trimmed.includes("*/}"))
-              continue;
-            if (wordBoundaryPattern.test(line)) {
-              const codePattern = new RegExp(`\\b${exp.name}\\s*[({.,;)]|\\b${exp.name}\\s*\\)|\\s+${exp.name}\\b`);
-              if (codePattern.test(line)) {
+            const lineWithoutStrings = line.replace(/'[^']*'/g, "''").replace(/"[^"]*"/g, '""');
+            if (wordBoundaryPattern.test(lineWithoutStrings)) {
+              const codePattern = new RegExp(`\\b${exp.name}\\s*[({.,;<>|&)]|\\b${exp.name}\\s*\\)|\\s+${exp.name}\\b`);
+              const isMatch = codePattern.test(lineWithoutStrings);
+              if (isMatch) {
                 isUsed = true;
                 break;
               }

package/package.json

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