pruny 1.43.8 → 1.43.10

package/dist/index.js

@@ -14255,7 +14255,7 @@ function parseTsConfigPaths(searchDir) {
 function readTsConfigWithExtends(configPath) {
   try {
     const raw = readFileSync2(configPath, "utf-8");
-    const cleaned = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "").replace(/,(\s*[}\]])/g, "$1");
+    const cleaned = raw.replace(/("(?:\\.|[^"\\])*")|\/\/.*$|\/\*[\s\S]*?\*\//gm, (_m, str) => str ?? "").replace(/,(\s*[}\]])/g, "$1");
     const config = JSON.parse(cleaned);
     let basePaths = {};
     let baseUrl;
@@ -14290,7 +14290,7 @@ async function scanUnusedFiles(config) {
   process.stdout.write(`   \uD83D\uDCC2 Scanning source files...`);
   const allFiles = await import_fast_glob2.default(extGlob, {
     cwd: searchDir,
-    ignore: [...config.ignore.folders, ...config.ignore.files],
+    ignore: config.ignore.folders,
     absolute: true
   });
   process.stdout.write(` ${allFiles.length} files found
@@ -14299,6 +14299,15 @@ async function scanUnusedFiles(config) {
     return { total: 0, used: 0, unused: 0, files: [] };
   }
   const allFilesSet = new Set(allFiles);
+  const ignoredFileSet = new Set;
+  if (config.ignore.files.length > 0) {
+    for (const file of allFiles) {
+      const relPath = relative(searchDir, file);
+      if (config.ignore.files.some((pattern) => minimatch(relPath, pattern, { dot: true }))) {
+        ignoredFileSet.add(file);
+      }
+    }
+  }
   const entryFiles = new Set;
   const entryPatterns = [
     "**/page.{ts,tsx,js,jsx}",
@@ -14367,6 +14376,8 @@ async function scanUnusedFiles(config) {
     if (isEntry)
       entryFiles.add(file);
   }
+  for (const file of ignoredFileSet)
+    entryFiles.add(file);
   const aliasMap = parseTsConfigPaths(searchDir);
   if (process.env.DEBUG_PRUNY && aliasMap.size > 0) {
     console.log(`[DEBUG] Loaded ${aliasMap.size} path aliases from tsconfig.json`);
@@ -14418,16 +14429,18 @@ async function scanUnusedFiles(config) {
       }
     } catch {}
   }
-  const files = allFiles.filter((f) => !usedFiles.has(f)).map((f) => {
+  const files = allFiles.filter((f) => !usedFiles.has(f) && !ignoredFileSet.has(f)).map((f) => {
     const s = statSync(f);
     return {
       path: relative(config.dir, f),
       size: s.size
     };
   });
+  const candidateCount = allFiles.length - ignoredFileSet.size;
+  const usedCandidateCount = candidateCount - files.length;
   return {
-    total: allFiles.length,
-    used: usedFiles.size,
+    total: candidateCount,
+    used: usedCandidateCount,
     unused: files.length,
     files
   };
@@ -14731,7 +14744,7 @@ async function scanUnusedExports(config, routes = [], options = {}) {
   }
   const referenceFiles = await import_fast_glob3.default(extGlob, {
     cwd: referenceCwd,
-    ignore: [...DEFAULT_IGNORE, ...config.ignore.folders, ...config.ignore.files],
+    ignore: [...DEFAULT_IGNORE, ...config.ignore.folders],
     absolute: true
   });
   if (process.env.DEBUG_PRUNY) {
@@ -15876,13 +15889,13 @@ var import_fast_glob9 = __toESM(require_out4(), 1);
 import { readFileSync as readFileSync9, existsSync as existsSync7 } from "node:fs";
 import { join as join7 } from "node:path";
 var LINK_PATTERNS = [
-  /<Link\s+[^>]*href\s*=\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /router\.(push|replace)\s*\(\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /(?:redirect|permanentRedirect)\s*\(\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /href\s*:\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /<a\s+[^>]*href\s*=\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /revalidatePath\s*\(\s*['"`](\/[^'"`\s{}$]+)['"`]/g,
-  /pathname\s*===?\s*['"`](\/[^'"`\s{}$]+)['"`]/g
+  /<Link\s+[^>]*href\s*=\s*(?:\{\s*)?['"`](\/[^'"`\s]+)['"`](?:\s*\})?/g,
+  /router\.(push|replace)\s*\(\s*['"`](\/[^'"`\s]+)['"`]/g,
+  /(?:redirect|permanentRedirect)\s*\(\s*['"`](\/[^'"`\s]+)['"`]/g,
+  /href\s*:\s*['"`](\/[^'"`\s]+)['"`]/g,
+  /<a\s+[^>]*href\s*=\s*(?:\{\s*)?['"`](\/[^'"`\s]+)['"`](?:\s*\})?/g,
+  /revalidatePath\s*\(\s*['"`](\/[^'"`\s]+)['"`]/g,
+  /pathname\s*===?\s*['"`](\/[^'"`\s]+)['"`]/g
 ];
 function extractPath(match2) {
   if (match2[2] && match2[2].startsWith("/"))
@@ -15891,6 +15904,11 @@ function extractPath(match2) {
     return match2[1];
   return null;
 }
+function normalizePath(raw) {
+  let out = raw.replace(/\$\{[^}]*\}/g, "[id]");
+  out = out.replace(/[{}]/g, "");
+  return out;
+}
 function shouldSkipPath(path2) {
   if (/^https?:\/\//.test(path2))
     return true;
@@ -15984,7 +16002,7 @@ function isGitignoredPublicFile(appDir, linkPath) {
       continue;
     try {
       const patterns = readFileSync9(gitignorePath, "utf-8").split(`
-`).map((l) => l.trim()).filter((l) => l && !l.startsWith("#"));
+`).map((l) => l.trim()).filter((l) => l && !l.startsWith("#") && !l.startsWith("!"));
       for (const pattern of patterns) {
         if (minimatch(publicRelPath, pattern, { dot: true }) || minimatch(linkPath.slice(1), pattern, { dot: true }) || minimatch(`**/public${linkPath}`, pattern, { dot: true })) {
           return true;
@@ -16060,9 +16078,10 @@ async function scanBrokenLinks(config) {
         pattern.lastIndex = 0;
         let match2;
         while ((match2 = pattern.exec(content)) !== null) {
-          const rawPath = extractPath(match2);
-          if (!rawPath)
+          const extracted = extractPath(match2);
+          if (!extracted)
             continue;
+          const rawPath = normalizePath(extracted);
           if (shouldSkipPath(rawPath))
             continue;
           const cleaned = cleanPath(rawPath);

package/package.json

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