@decantr/verifier 3.5.0 → 3.5.4

package/dist/index.js

@@ -2363,6 +2363,8 @@ var STYLE_EXTENSIONS = /* @__PURE__ */ new Set([".css", ".scss", ".sass", ".less
 var PAGE_EXTENSIONS = /* @__PURE__ */ new Set([".ts", ".tsx", ".js", ".jsx", ".vue", ".svelte", ".html"]);
 var ROUTE_VARIABLE_NAMES = "(?:path|pathname|route|currentPath|currentRoute|locationPath|activePath)";
 var ROUTE_ASSET_EXTENSION_RE = /\.(?:avif|bmp|css|gif|ico|jpeg|jpg|js|json|map|mp4|pdf|png|svg|webp|woff2?)$/i;
+var JSX_ROUTE_PATH_RE = /<(?:Route|[A-Z][\w.]*Route)\b[^>]*\bpath\s*=\s*(?:"([^"]+)"|'([^']+)'|{\s*"([^"]+)"\s*}|{\s*'([^']+)'\s*}|{\s*`([^`]+)`\s*})/g;
+var OBJECT_ROUTE_PATH_RE = /\bpath\s*:\s*(?:"([^"]+)"|'([^']+)'|`([^`]+)`)/g;
 var MAX_FILE_READ_BYTES = 512 * 1024;
 var MAX_WALK_FILES = 5e3;
 var MAX_REPORT_ROUTES = 80;
@@ -2629,9 +2631,12 @@ function fileRouteFromPath(file, baseDir) {
 function scanFileRoutes(projectRoot, baseDir, extensions = PAGE_EXTENSIONS) {
   const fullBase = join3(projectRoot, baseDir);
   if (!existsSync3(fullBase)) return [];
-  return walkFiles(fullBase, { extensions }).map((file) => {
+  return walkFiles(fullBase, { extensions }).flatMap((file) => {
+    const baseName = file.split("/").pop() ?? file;
+    const routeFileName = baseName.slice(0, -extname3(baseName).length);
+    if (routeFileName.startsWith("_")) return [];
     const rel = relative3(projectRoot, join3(fullBase, file)).replace(/\\/g, "/");
-    return { path: fileRouteFromPath(rel, baseDir), file: rel, hasLayout: false };
+    return [{ path: fileRouteFromPath(rel, baseDir), file: rel, hasLayout: false }];
   });
 }
 function scanReactRouter(projectRoot) {
@@ -2642,37 +2647,57 @@ function scanReactRouter(projectRoot) {
     const content = readTextFile(join3(projectRoot, file));
     if (!content) continue;
     if (content.includes("HashRouter") || content.includes("createHashRouter")) hashRouting = true;
-    const jsxRouteRegex = /<Route\b[^>]*\bpath\s*=\s*["']([^"']+)["']/g;
-    for (const match of content.matchAll(jsxRouteRegex)) {
-      const route = normalizeDetectedRouteLiteral(match[1] || "/");
-      if (route) routes.set(route, { path: route, file, hasLayout: false });
+    for (const match of content.matchAll(JSX_ROUTE_PATH_RE)) {
+      const literal = firstRouteLiteralMatch(match);
+      for (const route of normalizeDetectedRouteLiterals(literal || "/")) {
+        routes.set(route, { path: route, file, hasLayout: false });
+      }
     }
-    const objectRouteRegex = /\bpath\s*:\s*["']([^"']+)["']/g;
-    for (const match of content.matchAll(objectRouteRegex)) {
-      const route = normalizeDetectedRouteLiteral(match[1] || "/");
-      if (route) routes.set(route, { path: route, file, hasLayout: false });
+    for (const match of content.matchAll(OBJECT_ROUTE_PATH_RE)) {
+      const literal = firstRouteLiteralMatch(match);
+      for (const route of normalizeDetectedRouteLiterals(literal || "/")) {
+        routes.set(route, { path: route, file, hasLayout: false });
+      }
     }
     for (const route of detectPathnameBranchRoutes(content)) {
       routes.set(route, { path: route, file, hasLayout: false });
     }
+    for (const route of detectDeclarativeRouteSpecRoutes(content)) {
+      routes.set(route, { path: route, file, hasLayout: false });
+    }
   }
   return { routes: [...routes.values()], hashRouting };
 }
-function normalizeDetectedRouteLiteral(value) {
-  const cleaned = value.trim().split(/[?#]/)[0];
-  if (!cleaned || cleaned === "/") return "/";
-  if (cleaned === "*" || cleaned === "**" || cleaned.startsWith("#")) return null;
-  if (!cleaned.startsWith("/") || cleaned.startsWith("//")) return null;
-  if (ROUTE_ASSET_EXTENSION_RE.test(cleaned)) return null;
-  return cleaned.replace(/\/+$/g, "") || "/";
+function firstRouteLiteralMatch(match) {
+  return match.slice(1).find((value) => typeof value === "string") ?? null;
+}
+function normalizeDetectedRouteLiterals(value) {
+  const withoutHash = value.trim().split("#")[0];
+  const cleaned = withoutHash.includes("?") && !withoutHash.endsWith(")?") ? withoutHash.split("?")[0] : withoutHash;
+  if (!cleaned || cleaned === "/") return ["/"];
+  if (cleaned === "*" || cleaned === "**" || cleaned.startsWith("#")) return [];
+  if (cleaned === "/*" || cleaned === "/**") return [];
+  if (!cleaned.startsWith("/") || cleaned.startsWith("//")) return [];
+  if (ROUTE_ASSET_EXTENSION_RE.test(cleaned)) return [];
+  const optionalGroup = cleaned.match(/^\/\(([^()]+)\)\?$/);
+  if (optionalGroup) {
+    return [
+      "/",
+      ...optionalGroup[1].split("|").map((segment) => segment.trim()).filter(Boolean).map((segment) => `/${segment}`)
+    ];
+  }
+  const withoutTrailingWildcard = cleaned.endsWith("*") && !cleaned.endsWith("/*") && !/:\w+\*$/.test(cleaned) ? cleaned.slice(0, -1) : cleaned;
+  const normalized = withoutTrailingWildcard.replace(/\/+$/g, "") || "/";
+  if (normalized === "/*" || normalized === "/**") return [];
+  return [normalized];
 }
 function collectRouteLiterals(pattern, content, routes) {
   let count = 0;
   for (const match of content.matchAll(pattern)) {
-    const route = normalizeDetectedRouteLiteral(match[1] ?? "");
-    if (!route) continue;
-    routes.add(route);
-    count += 1;
+    for (const route of normalizeDetectedRouteLiterals(match[1] ?? "")) {
+      routes.add(route);
+      count += 1;
+    }
   }
   return count;
 }
@@ -2695,6 +2720,17 @@ function detectPathnameBranchRoutes(content) {
   }
   return [...routes];
 }
+function detectDeclarativeRouteSpecRoutes(content) {
+  const routes = /* @__PURE__ */ new Set();
+  const hasRouteSpecSignal = content.includes("@wasp.sh/spec") || /\b(?:const|export\s+const)\s+\w*Spec\b/.test(content) || /\bapp\s*\(\s*\{[\s\S]*\bspec\s*:/.test(content);
+  if (!hasRouteSpecSignal) return [];
+  collectRouteLiterals(
+    /\broute\s*\(\s*["'`][^"'`]*["'`]\s*,\s*["'`](\/[^"'`]*)["'`]\s*,\s*page\s*\(/g,
+    content,
+    routes
+  );
+  return [...routes];
+}
 function scanRoutes(projectRoot, detection) {
   const appRoutes = ["src/app", "app"].flatMap(
     (dir) => existsSync3(join3(projectRoot, dir)) ? walkNextAppRoutes(join3(projectRoot, dir), projectRoot, []) : []