@sonordev/site-kit 4.3.0 → 4.3.2

package/dist/cli/index.mjs

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { traverse, isJSXIdentifier, isJSXAttribute, isFunctionDeclaration, isVariableDeclarator, isIdentifier, isStringLiteral, isJSXMemberExpression, isJSXExpressionContainer, isTemplateLiteral, isArrayExpression, isObjectExpression, isJSXText } from '../chunk-JOYMIGR2.mjs';
 import { parse } from '../chunk-5YA6SI4Z.mjs';
-import { buildOgHtml, TITLE_MAX_PX, OG_REPORT_ATTR } from '../chunk-SRJSR6YP.mjs';
+import { buildOgHtml, TITLE_MAX_PX, OG_REPORT_ATTR } from '../chunk-UJ6CHZAI.mjs';
 import { require_main } from '../chunk-NNZDWY3L.mjs';
 import { findAppDirForDiscovery, discoverNextJsRoutes } from '../chunk-XIJ4F6IE.mjs';
-import { SITE_KIT_VERSION } from '../chunk-2X5ZB5D7.mjs';
+import { SITE_KIT_VERSION } from '../chunk-NQNSATTA.mjs';
 import { __commonJS, __require, __toESM, __export, __privateAdd, __publicField, __privateGet, __privateMethod, __privateSet, __privateWrapper } from '../chunk-BEXTDHO4.mjs';
 import { EventEmitter } from 'events';
 import childProcess, { execFile as execFile$1, execSync, spawnSync, spawn } from 'child_process';
@@ -27218,6 +27218,10 @@ async function statusCommand(options) {
 }
 
 // src/og/pages.ts
+var DYNAMIC = "*";
+function pathSegments(path27) {
+  return path27.split("/").filter(Boolean);
+}
 function stripBrandSuffix(title, brand) {
   const cleaned = title.replace(/\s*[|–—-]\s*[^|–—-]+$/, "").trim();
   if (!cleaned) return title.trim();
@@ -27225,14 +27229,15 @@ function stripBrandSuffix(title, brand) {
   return cleaned;
 }
 function titleFromPath(path27) {
-  const last = path27.split("/").filter(Boolean).pop();
+  const last = pathSegments(path27).filter((s) => s !== DYNAMIC).pop();
   if (!last) return "Home";
   return last.replace(/[-_]+/g, " ").replace(/\b\w/g, (c) => c.toUpperCase()).trim();
 }
 function kickerFromPath(path27, fallback) {
-  const parts = path27.split("/").filter(Boolean);
-  if (parts.length < 2) return fallback;
-  return parts.slice(0, -1).join(" / ").replace(/[-_]+/g, " ");
+  const parts = pathSegments(path27);
+  const section = parts.includes(DYNAMIC) ? parts.filter((s) => s !== DYNAMIC) : parts.slice(0, -1);
+  if (!section.length) return fallback;
+  return section.join(" / ").replace(/[-_]+/g, " ");
 }
 function clampSubtitle(text, max = 100) {
   if (!text) return void 0;
@@ -27254,9 +27259,14 @@ function kickerIsRedundant(kicker, title) {
   return k2.split(" ").every((w) => titleWords.has(w));
 }
 function slugForPath(path27) {
-  const trimmed = path27.replace(/^\/+|\/+$/g, "");
-  if (!trimmed) return "home";
-  return trimmed.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
+  const segments = pathSegments(path27);
+  if (!segments.length) return "home";
+  return segments.map((s) => s === DYNAMIC ? "any" : s).join("-").replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "").toLowerCase();
+}
+function unmatchedCardKeys(cards, paths) {
+  if (!cards) return [];
+  const known = new Set(paths.flatMap((p) => [p, slugForPath(p)]));
+  return Object.keys(cards).filter((key) => !known.has(key));
 }
 function pageCardConfig(base, route, brand) {
   const override = base.cards?.[route.path] ?? base.cards?.[slugForPath(route.path)];
@@ -27287,6 +27297,7 @@ function pageCardConfig(base, route, brand) {
 // src/cli/commands/og.ts
 var execFileAsync5 = promisify(execFile$1);
 var RENDER_CONCURRENCY = 4;
+var CARD_KEY_FIX = "Key `cards` by route path (`/services/garage`) or slug (`services-garage`). A dynamic route is one `*` per dynamic level \u2014 `/services/*` for `[slug]`, plus a star for each nested `[param]`.";
 var CHROME_CANDIDATES = [
   process.env.SONOR_CHROME_PATH,
   "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome",
@@ -27411,7 +27422,7 @@ async function compressCard(pngPath, cwd) {
 }
 function discoverDynamicSegments(appDir) {
   const found = [];
-  const walk = (dir, urlSegments) => {
+  const walk = (dir, urlSegments, pattern) => {
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
       if (!entry.isDirectory()) continue;
       if (entry.name.startsWith("_") || entry.name.startsWith(".")) continue;
@@ -27420,14 +27431,17 @@ function discoverDynamicSegments(appDir) {
       const isGroup = entry.name.startsWith("(") && entry.name.endsWith(")");
       const isDynamic = entry.name.startsWith("[") && entry.name.endsWith("]");
       const nextUrl = isGroup || isDynamic ? urlSegments : [...urlSegments, entry.name];
+      const nextPattern = isGroup ? pattern : [...pattern, isDynamic ? DYNAMIC : entry.name];
       if (isDynamic) {
         const hasPage = ["tsx", "jsx", "ts", "js"].some((ext2) => existsSync(path10.join(full, `page.${ext2}`)));
-        if (hasPage) found.push({ dir: full, urlish: `/${urlSegments.join("/")}` });
+        if (hasPage) {
+          found.push({ dir: full, path: `/${nextPattern.join("/")}`, parent: `/${urlSegments.join("/")}` });
+        }
       }
-      walk(full, nextUrl);
+      walk(full, nextUrl, nextPattern);
     }
   };
-  walk(appDir, []);
+  walk(appDir, [], []);
   return found;
 }
 async function pooled(items, limit, fn) {
@@ -27505,6 +27519,7 @@ async function runOg(options) {
   }
   const outPath = path10.resolve(cwd, options.out || "public/og.png");
   let clean = true;
+  let cardKeyFix = null;
   let pageCardsWritten = 0;
   let totalCardBytes = 0;
   const spinner = ora("Rendering the site card...").start();
@@ -27546,11 +27561,32 @@ async function runOg(options) {
         const brand = config2.content.title.replace(/\n/g, " ").trim();
         const copyByPath = new Map(withCopy.map((r) => [r.path, r]));
         const dynamic = discoverDynamicSegments(appDir).map((seg) => ({
-          ...copyByPath.get(seg.urlish) ?? { path: seg.urlish },
-          path: `${seg.urlish}/*`,
+          ...copyByPath.get(seg.parent) ?? {},
+          path: seg.path,
           dir: seg.dir
         }));
         const targets = [...withCopy, ...dynamic];
+        const strayKeys = unmatchedCardKeys(config2.cards, targets.map((t) => t.path));
+        if (strayKeys.length) {
+          const patterns = targets.filter((t) => t.path.includes(DYNAMIC)).map((t) => t.path);
+          console.log(
+            source_default.yellow(
+              `    ! ${strayKeys.length} \`cards\` key${strayKeys.length === 1 ? "" : "s"} in og.config.ts matched no route: ${strayKeys.join(", ")}`
+            )
+          );
+          console.log(source_default.gray(`      ${CARD_KEY_FIX}`));
+          if (patterns.length) {
+            console.log(source_default.gray(`      Dynamic routes here: ${patterns.join(", ")}`));
+          }
+          checks.push({
+            id: "og.cards",
+            title: "Unmatched `cards` keys",
+            level: "warn",
+            message: `${strayKeys.join(", ")} matched no rendered route, so the override was ignored`,
+            fix: CARD_KEY_FIX
+          });
+          cardKeyFix = CARD_KEY_FIX;
+        }
         const reports = await pooled(targets, RENDER_CONCURRENCY, async (route, i) => {
           const pageConfig = pageCardConfig(config2, route, brand);
           const dir = route.dir ?? routeOutputDir(appDir, route.path);
@@ -27623,7 +27659,7 @@ async function runOg(options) {
     summary: clean ? `${cards} card${cards === 1 ? "" : "s"} rendered, all fitting` : `${cards} card${cards === 1 ? "" : "s"} rendered, some do not fit`,
     data: { cards, bytes: totalCardBytes },
     checks,
-    nextSteps: problems.map((p) => p.fix)
+    nextSteps: [...problems.map((p) => p.fix), ...cardKeyFix ? [cardKeyFix] : []]
   };
 }
 function cardCheck(label, file, report) {
@@ -31978,7 +32014,7 @@ export const GET = createLLMsFullTxtHandler({ preferStatic: true })
       {
         path: path10.join(cwd, "proxy.ts"),
         label: "Proxy (security headers; redirects resolve at the 404 boundary)",
-        content: `import { createProxy } from '@sonordev/site-kit/middleware'
+        content: `import { createProxy } from '@sonordev/site-kit/proxy'
 
 // redirects: false \u2014 managed redirects resolve in app/not-found.tsx via
 // resolveManagedRedirect() instead of on every request. The proxy still
@@ -31987,7 +32023,7 @@ export default createProxy({ redirects: false })
 
 // Inlined on purpose: Next statically parses \`config.matcher\` at build time
 // and rejects an imported value (Turbopack build error). Keep in sync with
-// siteKitMatcher in @sonordev/site-kit/middleware.
+// siteKitMatcher in @sonordev/site-kit/proxy.
 export const config = {
   matcher: [
     '/((?!_next/static|_next/image|favicon\\\\.ico|.*\\\\.(?:ico|png|jpg|jpeg|gif|webp|svg|woff2?)$).*)',