@zealakit/css-doctor-next 1.0.0 → 1.1.0

package/dist/index.js

@@ -360,7 +360,10 @@ var CssDoctorWebpackPlugin = class {
       pageUsage[page.name] = classes;
       pageUsageCounts[page.name] = classes.length;
     }
-    const pageCoverageApplied = this.pageCoverage.enabled && pageNames.length > 0;
+    const hasPageClasses = pagesResult.pages.some(
+      (page) => page.classes.size > 0
+    );
+    const pageCoverageApplied = this.pageCoverage.enabled && hasPageClasses;
     const diagnostics = {
       plugin: "css-doctor-next",
       generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -449,7 +452,7 @@ var CssDoctorWebpackPlugin = class {
           cssContent: originalCss,
           pageUsage,
           pageCoverage: {
-            enabled: this.pageCoverage.enabled,
+            enabled: pageCoverageApplied,
             minPageRatio: this.pageCoverage.minPageRatio,
             forceCommon: this.pageCoverage.forceCommon
           },
@@ -709,6 +712,7 @@ async function collectPages(compilation, directPageUsage) {
   const pageEntries = [];
   const sharedEntries = [];
   const fallbackEntries = [];
+  const loaderFallbackEntries = [];
   for (const entry of entries) {
     const name = entryName(entry);
     if (!name) {
@@ -725,12 +729,19 @@ async function collectPages(compilation, directPageUsage) {
         name: routeNameForEntry(name) ?? name,
         sourceName: name
       });
+    } else {
+      loaderFallbackEntries.push({
+        entry,
+        name: routeNameForEntry(name) ?? name,
+        sourceName: name
+      });
     }
   }
   const selectedPages = pageEntries.length > 0 ? pageEntries : fallbackEntries;
   const direct = directPageUsage ? Object.keys(directPageUsage).length > 0 : false;
   const pages = /* @__PURE__ */ new Map();
   const pagesByCss = /* @__PURE__ */ new Map();
+  const projectRoot = compilation.compiler?.context ?? process.cwd();
   if (direct && directPageUsage) {
     for (const [rawName, classes] of Object.entries(directPageUsage)) {
       const name = rawName.trim();
@@ -744,10 +755,27 @@ async function collectPages(compilation, directPageUsage) {
         jsFiles: /* @__PURE__ */ new Set()
       });
     }
+    attachEntryAssetsToPages(pages, selectedPages);
+    const orphanPages = [...pages.values()].filter(
+      (page) => page.jsFiles.size === 0
+    );
+    if (orphanPages.length > 0) {
+      const loaderEntries = selectedPages.length > 0 ? selectedPages : loaderFallbackEntries;
+      const fallbackJs = /* @__PURE__ */ new Set();
+      for (const { entry } of loaderEntries) {
+        for (const jsFile of collectEntryJsFiles(entry)) {
+          fallbackJs.add(jsFile);
+        }
+      }
+      for (const page of orphanPages) {
+        for (const jsFile of fallbackJs) {
+          page.jsFiles.add(jsFile);
+        }
+      }
+    }
   } else {
     const sourceCache = /* @__PURE__ */ new Map();
     const sharedClasses = /* @__PURE__ */ new Set();
-    const projectRoot = process.cwd();
     for (const entry of sharedEntries) {
       for (const className of await collectEntryClasses(
         compilation,
@@ -800,19 +828,10 @@ async function collectPages(compilation, directPageUsage) {
   const targetPages = [...pages.keys()];
   for (const { entry, name } of selectedPages) {
     const cssFiles = collectEntryCssFiles(entry);
-    if (direct) {
-      const directPage = pages.get(name);
-      if (directPage) {
-        for (const cssFile of cssFiles) {
-          directPage.cssFiles.add(cssFile);
-        }
-      }
-    } else {
-      const page = pages.get(name);
-      if (page) {
-        for (const cssFile of cssFiles) {
-          page.cssFiles.add(cssFile);
-        }
+    const page = findPageForEntry(pages, name);
+    if (page) {
+      for (const cssFile of cssFiles) {
+        page.cssFiles.add(cssFile);
       }
     }
   }
@@ -837,18 +856,46 @@ async function collectPages(compilation, directPageUsage) {
     pagesByCss
   };
 }
+function attachEntryAssetsToPages(pages, selectedPages) {
+  for (const { entry, name } of selectedPages) {
+    const page = findPageForEntry(pages, name);
+    if (!page) {
+      continue;
+    }
+    for (const jsFile of collectEntryJsFiles(entry)) {
+      page.jsFiles.add(jsFile);
+    }
+    for (const cssFile of collectEntryCssFiles(entry)) {
+      page.cssFiles.add(cssFile);
+    }
+  }
+}
+function findPageForEntry(pages, entryNameValue) {
+  const direct = pages.get(entryNameValue);
+  if (direct) {
+    return direct;
+  }
+  const normalized = normalizeSlashes(entryNameValue).replace(/^\/+/, "");
+  const bare = normalized.replace(/^\//, "");
+  return pages.get(normalized) ?? pages.get(`/${bare}`) ?? pages.get(bare) ?? pages.get(bare.replace(/\//g, "-"));
+}
 async function collectPageSourceClasses(entryName2, projectRoot, sourceCache) {
   const classes = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();
   const normalized = normalizeSlashes(entryName2);
+  const roots = projectSourceRoots(projectRoot);
   const candidates = [];
   if (normalized.startsWith("app/")) {
     const path = normalized.slice(4);
     if (path === "page" || path.endsWith("/page")) {
       const pagePath = path === "page" ? "app/page" : `app/${path}`;
-      candidates.push(resolve2(projectRoot, pagePath));
+      for (const root of roots) {
+        candidates.push(resolve2(root, pagePath));
+      }
       if (path === "_not-found/page") {
-        candidates.push(resolve2(projectRoot, "app/not-found"));
+        for (const root of roots) {
+          candidates.push(resolve2(root, "app/not-found"));
+        }
       }
       const directories = path.split("/").slice(0, -1).filter(Boolean);
       const layoutPaths = ["app"];
@@ -856,16 +903,24 @@ async function collectPageSourceClasses(entryName2, projectRoot, sourceCache) {
         layoutPaths.push(`app/${directories.slice(0, index + 1).join("/")}`);
       }
       for (const layoutPath of layoutPaths) {
-        candidates.push(resolve2(projectRoot, `${layoutPath}/layout`));
+        for (const root of roots) {
+          candidates.push(resolve2(root, `${layoutPath}/layout`));
+        }
       }
     } else {
-      candidates.push(resolve2(projectRoot, normalized));
+      for (const root of roots) {
+        candidates.push(resolve2(root, normalized));
+      }
     }
   } else if (normalized.startsWith("pages/")) {
-    candidates.push(resolve2(projectRoot, normalized));
-    candidates.push(resolve2(projectRoot, "pages/_app"));
+    for (const root of roots) {
+      candidates.push(resolve2(root, normalized));
+      candidates.push(resolve2(root, "pages/_app"));
+    }
   } else {
-    candidates.push(resolve2(projectRoot, normalized));
+    for (const root of roots) {
+      candidates.push(resolve2(root, normalized));
+    }
   }
   for (const candidate of candidates) {
     const file = findSourceFile(candidate);
@@ -878,13 +933,23 @@ async function collectPageSourceClasses(entryName2, projectRoot, sourceCache) {
 async function collectNameSourceClasses(entryName2, projectRoot, sourceCache) {
   const classes = /* @__PURE__ */ new Set();
   const visited = /* @__PURE__ */ new Set();
-  const candidate = resolve2(projectRoot, normalizeSlashes(entryName2));
-  const file = findSourceFile(candidate);
-  if (file) {
-    await scanSourceFile(file, classes, projectRoot, sourceCache, visited);
+  const relative = normalizeSlashes(entryName2);
+  for (const root of projectSourceRoots(projectRoot)) {
+    const file = findSourceFile(resolve2(root, relative));
+    if (file) {
+      await scanSourceFile(file, classes, projectRoot, sourceCache, visited);
+    }
   }
   return classes;
 }
+function projectSourceRoots(projectRoot) {
+  const roots = [projectRoot];
+  const srcRoot = resolve2(projectRoot, "src");
+  if (srcRoot !== projectRoot && existsSync2(srcRoot)) {
+    roots.push(srcRoot);
+  }
+  return roots;
+}
 async function scanSourceFile(filePath, classes, projectRoot, sourceCache, visited) {
   const absolutePath = resolve2(filePath);
   if (visited.has(absolutePath)) {
@@ -968,18 +1033,28 @@ function extractImportSpecifiers(source) {
   return [...specifiers];
 }
 function resolveImportSpecifier(specifier, fromFile, projectRoot) {
-  let basePath;
   if (specifier.startsWith("@/")) {
-    basePath = resolve2(projectRoot, specifier.slice(2));
-  } else if (specifier.startsWith("./") || specifier.startsWith("../")) {
-    basePath = resolve2(dirname2(fromFile), specifier);
-  } else {
+    const relative = specifier.slice(2);
+    for (const root of projectSourceRoots(projectRoot)) {
+      const basePath = resolve2(root, relative);
+      if (isStyleFile(basePath)) {
+        return null;
+      }
+      const found = findSourceFile(basePath);
+      if (found) {
+        return found;
+      }
+    }
     return null;
   }
-  if (isStyleFile(basePath)) {
-    return null;
+  if (specifier.startsWith("./") || specifier.startsWith("../")) {
+    const basePath = resolve2(dirname2(fromFile), specifier);
+    if (isStyleFile(basePath)) {
+      return null;
+    }
+    return findSourceFile(basePath);
   }
-  return findSourceFile(basePath);
+  return null;
 }
 async function collectEntryClasses(compilation, entry, sourceCache) {
   const classes = /* @__PURE__ */ new Set();
@@ -1148,13 +1223,22 @@ function scanClasses(source, classes) {
         continue;
       }
       for (const token of value.split(/\s+/)) {
-        if (/^-?[_a-zA-Z][\w-]*$/.test(token)) {
+        if (isClassToken(token)) {
           classes.add(token.toLowerCase());
         }
       }
     }
   }
 }
+function isClassToken(token) {
+  if (!token || token.length > 256) {
+    return false;
+  }
+  if (/[`${}]/.test(token)) {
+    return false;
+  }
+  return /[A-Za-z_]/.test(token);
+}
 function addCssOwner(pagesByCss, cssFile, page) {
   const owners = pagesByCss.get(cssFile) ?? /* @__PURE__ */ new Set();
   owners.add(page);