@decantr/cli 3.0.2 → 3.4.0

package/dist/bin.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import "./chunk-GN63PIKK.js";
+import "./chunk-ZBGL7RID.js";
 import "./chunk-SIDKK73N.js";
-import "./chunk-B2PJDAMS.js";
-import "./chunk-4NDOHCYY.js";
-import "./chunk-7Z74ETDR.js";
+import "./chunk-EL4KSW7E.js";
+import "./chunk-XUHPMETF.js";
+import "./chunk-XINHWP4T.js";

package/dist/{chunk-B2PJDAMS.js → chunk-EL4KSW7E.js}

@@ -1,7 +1,7 @@
 import {
   createProjectHealthReport,
   listWorkspaceAppCandidates
-} from "./chunk-4NDOHCYY.js";
+} from "./chunk-XUHPMETF.js";
 
 // src/commands/workspace.ts
 import { execFileSync } from "child_process";

package/dist/{chunk-7Z74ETDR.js → chunk-XINHWP4T.js}

@@ -456,6 +456,8 @@ function walkSvelteKitRoutes(dir, baseDir, segments) {
   return routes;
 }
 var ROUTER_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".tsx", ".ts", ".jsx", ".js"]);
+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;
 function collectRouteCandidateFiles(dir, files, depth = 0) {
   if (depth > 5) return;
   let entries;
@@ -496,30 +498,72 @@ function scanReactRouter(projectRoot) {
       continue;
     }
     const isReactRouterFile = content.includes("react-router-dom") || content.includes("react-router") || content.includes("<Routes") || content.includes("createBrowserRouter") || content.includes("createHashRouter") || content.includes("RouterProvider") || content.includes("HashRouter") || content.includes("BrowserRouter");
-    if (!isReactRouterFile) continue;
     const relativePath = relative2(projectRoot, absolutePath);
     const pathMatches = /* @__PURE__ */ new Set();
-    for (const match of content.matchAll(/<Route\b[^>]*\bpath=["'`]([^"'`]+)["'`]/g)) {
-      pathMatches.add(match[1]);
+    if (isReactRouterFile) {
+      for (const match of content.matchAll(/<Route\b[^>]*\bpath=["'`]([^"'`]+)["'`]/g)) {
+        pathMatches.add(match[1]);
+      }
+      for (const match of content.matchAll(/\bpath\s*:\s*["'`]([^"'`]+)["'`]/g)) {
+        pathMatches.add(match[1]);
+      }
     }
-    for (const match of content.matchAll(/\bpath\s*:\s*["'`]([^"'`]+)["'`]/g)) {
-      pathMatches.add(match[1]);
+    for (const route of detectPathnameBranchRoutes(content)) {
+      pathMatches.add(route);
     }
+    if (!isReactRouterFile && pathMatches.size === 0) continue;
     if (pathMatches.size === 0 && (content.includes("<Routes") || content.includes("RouterProvider"))) {
       pathMatches.add("/");
     }
     for (const path of pathMatches) {
-      if (!routeMap.has(path)) {
-        routeMap.set(path, {
-          path,
-          file: relativePath,
-          hasLayout: false
-        });
-      }
+      const routePath = normalizeDetectedRouteLiteral(path);
+      if (!routePath || routeMap.has(routePath)) continue;
+      routeMap.set(routePath, {
+        path: routePath,
+        file: relativePath,
+        hasLayout: false
+      });
     }
   }
   return [...routeMap.values()];
 }
+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 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;
+  }
+  return count;
+}
+function detectPathnameBranchRoutes(content) {
+  const routes = /* @__PURE__ */ new Set();
+  const comparison = new RegExp(
+    `\\b${ROUTE_VARIABLE_NAMES}\\b\\s*(?:===|!==|==|!=)\\s*["'\`](\\/[^"'\`]+)["'\`]`,
+    "g"
+  );
+  const reversedComparison = new RegExp(
+    `["'\`](\\/[^"'\`]+)["'\`]\\s*(?:===|!==|==|!=)\\s*\\b${ROUTE_VARIABLE_NAMES}\\b`,
+    "g"
+  );
+  const strongMatches = collectRouteLiterals(comparison, content, routes) + collectRouteLiterals(reversedComparison, content, routes) + collectRouteLiterals(/\bcase\s+["'`](\/[^"'`]+)["'`]\s*:/g, content, routes);
+  const hasPathnameSignal = /\b(?:window\.|document\.)?location\.pathname\b|\bpathname\b/.test(
+    content
+  );
+  if (strongMatches > 0 || hasPathnameSignal) {
+    collectRouteLiterals(/\b(?:href|to)\s*=\s*["'`](\/[^"'`]+)["'`]/g, content, routes);
+  }
+  return [...routes];
+}
 function hasReactRouterDependency(projectRoot) {
   return hasDependency(projectRoot, ["react-router", "react-router-dom"]);
 }
@@ -693,8 +737,8 @@ function extractCSSVariables(content) {
   const colors = {};
   const variables = [];
   const varRegex = /--([\w-]+)\s*:\s*([^;]+)/g;
-  let match;
-  while ((match = varRegex.exec(content)) !== null) {
+  let match = varRegex.exec(content);
+  while (match !== null) {
     const name = match[1];
     const value = match[2].trim();
     variables.push(`--${name}`);
@@ -714,6 +758,24 @@ function extractCSSVariables(content) {
     if (value.startsWith("#") || value.startsWith("rgb") || value.startsWith("hsl") || colorPatterns.some((p) => name.includes(p))) {
       colors[name] = value;
     }
+    match = varRegex.exec(content);
+  }
+  return { colors, variables };
+}
+function extractTailwindThemeTokens(content) {
+  const colors = {};
+  const variables = [];
+  for (const match of content.matchAll(
+    /\b([a-zA-Z][\w-]*)\s*:\s*['"`](#[0-9a-fA-F]{3,8}|rgba?\([^)]+\)|hsla?\([^)]+\)|oklch\([^)]+\)|var\(--[^)]+\))['"`]/g
+  )) {
+    const name = match[1];
+    const value = match[2];
+    if (/color|bg|background|surface|text|foreground|border|primary|secondary|accent|muted|danger|error|success|warning/i.test(
+      name
+    ) || /^#|^(?:rgba?|hsla?|oklch)\(/i.test(value) || /^var\(--/i.test(value)) {
+      colors[name] = value;
+      variables.push(`theme.colors.${name}`);
+    }
   }
   return { colors, variables };
 }
@@ -875,6 +937,16 @@ function scanStyling(projectRoot) {
     colors = { ...colors, ...extracted.colors };
     cssVariables.push(...extracted.variables);
   }
+  for (const cfg of TAILWIND_CONFIGS) {
+    const configPath = join3(projectRoot, cfg);
+    if (!existsSync3(configPath)) continue;
+    try {
+      const extracted = extractTailwindThemeTokens(readFileSync3(configPath, "utf-8"));
+      colors = { ...colors, ...extracted.colors };
+      cssVariables.push(...extracted.variables);
+    } catch {
+    }
+  }
   cssVariables = [...new Set(cssVariables)];
   const darkMode = detectDarkMode(projectRoot, cssContents);
   if (approach === "unknown" && cssContents.length > 0) {
@@ -1091,9 +1163,37 @@ function routePathname(route) {
 function declaredRouteObserved(route, observedRoutes) {
   return observedRoutes.has(route) || route.includes("?") && observedRoutes.has(routePathname(route));
 }
+function sectionForRoute(essence, route) {
+  const mappedSectionId = essence.blueprint.routes?.[route]?.section;
+  const sections = essence.blueprint.sections ?? [];
+  if (mappedSectionId) {
+    return sections.find((section) => section.id === mappedSectionId) ?? null;
+  }
+  return sections.find(
+    (section) => section.pages?.some((page) => page.route === route || page.route === routePathname(route))
+  ) ?? null;
+}
+function readObservedRouteSource(projectRoot, file) {
+  if (!file || file === ".") return "";
+  try {
+    return readFileSync5(join5(projectRoot, file), "utf-8");
+  } catch {
+    return "";
+  }
+}
+function routeLooksPublicFullBleed(path, file, code) {
+  return /\b(?:pricing|plans|marketing|landing|public|hero|full-bleed|fullbleed|marketing-bleed)\b/i.test(
+    `${path} ${file} ${code}`
+  );
+}
+function routeLooksAppShell(file, code) {
+  return /\b(?:sidebar|side-nav|sidenav|app-frame|dashboard-shell|app-shell)\b|<\s*(?:Sidebar|AppShell|DashboardShell)\b/i.test(
+    `${file} ${code}`
+  );
+}
 function hasDoctrineEffect(essence, key) {
   const effects = essence.dna.constraints?.effects;
-  return Boolean(effects && effects[key]);
+  return Boolean(effects?.[key]);
 }
 function hasActionableDoctrineSource(doctrine, area) {
   return doctrine.sources.some(
@@ -1168,6 +1268,32 @@ function scanBrownfieldIssues(projectRoot, essence) {
       suggestion: "Confirm whether these are generated/dynamic routes or stale contract entries."
     });
   }
+  const shellDriftRoutes = [];
+  for (const route of routes.routes.slice(0, 80)) {
+    const section = sectionForRoute(essence, route.path);
+    const shell = section?.shell ?? "";
+    if (!shell) continue;
+    const source = readObservedRouteSource(projectRoot, route.file);
+    const shellHasSidebar = /\bsidebar\b/i.test(shell);
+    const shellIsPublicLight = /^(?:main-only|main-footer|topnav-main|topnav-main-footer)$/i.test(
+      shell
+    );
+    if (shellHasSidebar && routeLooksPublicFullBleed(route.path, route.file, source)) {
+      shellDriftRoutes.push(`${route.path} (${shell} vs public/full-bleed source)`);
+    } else if (shellIsPublicLight && routeLooksAppShell(route.file, source)) {
+      shellDriftRoutes.push(`${route.path} (${shell} vs app-shell source)`);
+    }
+  }
+  if (shellDriftRoutes.length > 0) {
+    issues.push({
+      type: "warning",
+      rule: "brownfield-shell-drift",
+      message: `Observed route shell signals disagree with the Decantr section shell: ${routeLabel(
+        shellDriftRoutes
+      )}.`,
+      suggestion: "Regenerate and merge a brownfield proposal, or update the affected section shell after reviewing the route source."
+    });
+  }
   const adoptionMode = projectJson.initialized?.adoptionMode;
   const themeId = essence.dna.theme.id;
   if (adoptionMode === "contract-only" && themeId === "luminarum" && (styling.approach !== "unknown" || styling.cssVariables.length > 0)) {