@wix/himalaya-cli 0.1046.0 → 0.1047.0

package/dist/cli.mjs

@@ -42838,7 +42838,7 @@ function serializeAt(node, src, open) {
   const indent = lineIndent(src, open);
   return JSON.stringify(node, null, 2).split("\n").map((line, i) => i === 0 ? line : indent + line).join("\n");
 }
-function patchGrids(src, installed, patch) {
+function patchGrids(src, installed, patch, keepFaq = false, dropFaq = false) {
   const OPEN = /"id": "([A-Za-z_0-9]+(?:\.[A-Za-z_0-9]+)*\.verticals)"/g;
   let out = "";
   let cursor = 0;
@@ -42859,12 +42859,17 @@ function patchGrids(src, installed, patch) {
     const prefix = m[1].slice(0, -".verticals".length);
     const baked = /* @__PURE__ */ new Map();
     const foreignCells = [];
-    for (const item of items) {
-      const id = item.id;
-      const legacy = item.modifiers?.accessibilityLabel;
+    let faqCell;
+    const claimOf = (item) => {
+      const id = item?.id;
+      const legacy = item?.modifiers?.accessibilityLabel;
       const claim = typeof id === "string" && id ? id : typeof legacy === "string" ? legacy : "";
-      const vertical = claim.startsWith(`${prefix}.`) ? claim.slice(prefix.length + 1) : "";
+      return claim.startsWith(`${prefix}.`) ? claim.slice(prefix.length + 1) : "";
+    };
+    for (const item of items) {
+      const vertical = claimOf(item);
       if (isKnown(vertical)) baked.set(vertical, item);
+      else if (vertical === "faq" && keepFaq) faqCell = item;
       else if (!GRID_VERTICAL_LABELS.has(vertical)) foreignCells.push(item);
     }
     const wanted = [];
@@ -42882,10 +42887,36 @@ function patchGrids(src, installed, patch) {
       wanted.push(vertical);
     }
     const shape = baked.values().next().value ?? items[0];
+    const bakedFaq = faqCell;
+    if (keepFaq && !faqCell && hasScreen(src, FAQ_CARD.screenId)) {
+      faqCell = cloneCell(shape, prefix, "faq", FAQ_CARD);
+    }
+    if (!installed.size) {
+      if (dropFaq) {
+        const kept = items.filter((item) => claimOf(item) !== "faq");
+        if (kept.length !== items.length && kept.length > 0) {
+          node.body.props.items = kept;
+          out += src.slice(cursor, open) + serializeAt(node, src, open);
+          cursor = close;
+          OPEN.lastIndex = close;
+        }
+        continue;
+      }
+      const lastIsVertical = GRID_VERTICAL_LABELS.has(claimOf(items[items.length - 1]));
+      if (!bakedFaq && faqCell && (items.length < EXPLORE_MAX_CELLS || lastIsVertical)) {
+        if (items.length >= EXPLORE_MAX_CELLS) items.pop();
+        items.push(faqCell);
+        out += src.slice(cursor, open) + serializeAt(node, src, open);
+        cursor = close;
+        OPEN.lastIndex = close;
+      }
+      continue;
+    }
+    const cap = faqCell ? EXPLORE_MAX_CELLS - 1 : EXPLORE_MAX_CELLS;
     const next = [...foreignCells];
     const cells = [];
     for (const vertical of wanted) {
-      if (next.length >= EXPLORE_MAX_CELLS) break;
+      if (next.length >= cap) break;
       const bakedCell = baked.get(vertical);
       if (bakedCell) {
         next.push(bakedCell);
@@ -42901,6 +42932,7 @@ function patchGrids(src, installed, patch) {
       cells.push(vertical);
       patch.added.push(vertical);
     }
+    if (faqCell && next.length < EXPLORE_MAX_CELLS) next.push(faqCell);
     if (!cells.length) continue;
     patch.cells = cells;
     node.body.props.items = next;
@@ -43015,16 +43047,19 @@ function patchStoreCtas(src, verticals, homeActionId) {
     dropped
   };
 }
-function patchHomeForVerticals(src, verticals, homeActionId) {
+function patchHomeForVerticals(src, verticals, homeActionId, opts = {}) {
   const installed = new Set(verticals.filter(isKnown));
   const patch = { src, cells: [], added: [], droppedModules: [], droppedCtas: [], unreachable: [] };
-  if (!installed.size) return patch;
-  const ctas = patchStoreCtas(patchModules(patchGrids(src, installed, patch), installed, patch), [...installed], homeActionId);
+  if (!installed.size) {
+    if (opts.keepFaq || opts.dropFaq) patch.src = patchGrids(src, installed, patch, !!opts.keepFaq, !opts.keepFaq && !!opts.dropFaq);
+    return patch;
+  }
+  const ctas = patchStoreCtas(patchModules(patchGrids(src, installed, patch, opts.keepFaq), installed, patch), [...installed], homeActionId);
   patch.src = ctas.src;
   patch.droppedCtas = ctas.dropped;
   return patch;
 }
-var EXPLORE_CARDS, EXPLORE_ORDER, EXPLORE_MAX_CELLS, MODULE_SOURCE_VERTICALS, isKnown, GRID_VERTICAL_LABELS, escapeRe2, textProps, STORE_SCREENS, isStoreScreen, screenDeclarations, isNode2;
+var EXPLORE_CARDS, EXPLORE_ORDER, EXPLORE_MAX_CELLS, MODULE_SOURCE_VERTICALS, isKnown, GRID_VERTICAL_LABELS, FAQ_CARD, escapeRe2, textProps, STORE_SCREENS, isStoreScreen, screenDeclarations, isNode2;
 var init_home_descriptor = __esm({
   "src/site-analyze/home-descriptor.ts"() {
     init_types2();
@@ -43096,6 +43131,7 @@ var init_home_descriptor = __esm({
     };
     isKnown = (v) => KNOWN_VERTICALS.includes(v);
     GRID_VERTICAL_LABELS = /* @__PURE__ */ new Set([...KNOWN_VERTICALS, "faq"]);
+    FAQ_CARD = { icon: "help", screenId: "himi_faq", title: "FAQ", body: "Find answers to common questions." };
     escapeRe2 = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     textProps = (n) => n?.body?.props;
     STORE_SCREENS = /* @__PURE__ */ new Set([
@@ -54141,7 +54177,28 @@ function deriveTailoring(ctx, overrides = {}, revision = "site-derived") {
   };
   return { appName, iconSource: deriveIconSource(ctx), provisioning, missing };
 }
-var clean, ID_MAX, NAME_MAX, TYPE_MAX, CONTROL_CHARS, HAS_CONTROL_CHAR, plain, shown;
+function bounded(s, max) {
+  if (s.length <= max) return s;
+  const cut = s.slice(0, max - 1);
+  const space = cut.lastIndexOf(" ");
+  return `${(space > max * 0.6 ? cut.slice(0, space) : cut).trimEnd()}\u2026`;
+}
+function deriveStaticFaq(faq) {
+  if (!Array.isArray(faq)) return [];
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of faq) {
+    if (out.length >= STATIC_FAQ_LIMITS.pairs) break;
+    const pair = raw && typeof raw === "object" ? raw : {};
+    const q = bounded(oneLine(pair.q), STATIC_FAQ_LIMITS.question);
+    const a = bounded(oneLine(pair.a), STATIC_FAQ_LIMITS.answer);
+    if (!q || !a || seen.has(q.toLowerCase())) continue;
+    seen.add(q.toLowerCase());
+    out.push({ q, a });
+  }
+  return out;
+}
+var clean, ID_MAX, NAME_MAX, TYPE_MAX, CONTROL_CHARS, HAS_CONTROL_CHAR, plain, shown, STATIC_FAQ_LIMITS, oneLine;
 var init_derive = __esm({
   "src/site-analyze/derive.ts"() {
     init_types2();
@@ -54153,6 +54210,8 @@ var init_derive = __esm({
     HAS_CONTROL_CHAR = /[\u0000-\u001F\u007F]/;
     plain = (value, max) => (value ?? "").replace(CONTROL_CHARS, "").trim().slice(0, max);
     shown = (value) => (typeof value === "string" ? JSON.stringify(value) : String(value)).slice(0, 64);
+    STATIC_FAQ_LIMITS = { pairs: 20, question: 200, answer: 1500 };
+    oneLine = (s) => typeof s === "string" ? s.replace(/[\u0000-\u001F\u007F\s]+/g, " ").trim() : "";
   }
 });
 
@@ -57211,7 +57270,8 @@ function mergeCustomerOwned(committed, overlay) {
     "navigation",
     "locale",
     "wix",
-    "copy"
+    "copy",
+    "faq"
   ];
   const customer = {};
   for (const key2 of CUSTOMER_OWNED) {
@@ -57305,12 +57365,56 @@ function buildMergedContract(options) {
   staged.push(localPath);
   return { path: path2, staged };
 }
+function catalogTypography(overlay, template) {
+  const typography = {};
+  const notes = [];
+  const base = template && typeof template === "object" ? template : {};
+  const usable = (family) => typeof family === "string" && family.trim() !== "" && (family === SYSTEM_FONT_FAMILY || canonicalFamilyName(family) !== void 0);
+  for (const [role, token] of Object.entries(overlay ?? {})) {
+    const family = token?.family;
+    if (typeof family !== "string" || family.trim() === "") {
+      typography[role] = token;
+      continue;
+    }
+    if (family === SYSTEM_FONT_FAMILY) {
+      typography[role] = token;
+      continue;
+    }
+    const canonical3 = canonicalFamilyName(family.trim());
+    if (canonical3) {
+      typography[role] = { ...token, family: canonical3 };
+      continue;
+    }
+    const kept = base[role]?.family;
+    const using = usable(kept) ? `the template's ${kept}` : `the template's default (${TIER1_FLOOR[0]})`;
+    notes.push(`site font "${family}" (${role}) isn't in the font catalog; using ${using}`);
+  }
+  return { typography, notes };
+}
+function staticFaqFor(overlay, overlayPath) {
+  const own3 = overlay.faq;
+  if (own3 !== void 0) return deriveStaticFaq(own3);
+  const bookPath = join59(dirname32(resolve45(overlayPath)), "book.json");
+  if (!existsSync61(bookPath)) return void 0;
+  try {
+    const book = JSON.parse(readFileSync72(bookPath, "utf8"));
+    const copy = book?.copy;
+    if (!copy || typeof copy !== "object" || copy.unavailable) return void 0;
+    const pairs = deriveStaticFaq(copy.faq);
+    if (!pairs.length && copy.partial) return void 0;
+    return pairs;
+  } catch {
+    return void 0;
+  }
+}
 async function applyOverlays(input) {
   const cwd = resolve45(input.cwd);
   const shell = input.shell ?? DEFAULT_BRANDABLE_SHELL;
   assertKnownShell(shell);
   const overlay = JSON.parse(readFileSync72(input.overlayPath, "utf8"));
   const tokens = JSON.parse(readFileSync72(input.tokensPath, "utf8"));
+  const faq = staticFaqFor(overlay, input.overlayPath);
+  if (faq !== void 0) overlay.faq = faq;
   const wrote = [];
   const notes = [];
   const repoRoot2 = findRepoRoot(cwd);
@@ -57344,9 +57448,11 @@ async function applyOverlays(input) {
   }
   const pkgProv = join59(cwd, "provisioning.json");
   assertNotCommitted(pkgProv, input.forbiddenProvisioning);
+  let packageFaq = faq;
   if (existsSync61(pkgProv)) {
     const cur = JSON.parse(readFileSync72(pkgProv, "utf8"));
     const merged = deepMerge4(cur, overlay);
+    packageFaq = merged.faq;
     writeFileSync27(pkgProv, JSON.stringify(merged, null, 2) + "\n");
     wrote.push(pkgProv);
   } else {
@@ -57356,7 +57462,13 @@ async function applyOverlays(input) {
   const pkgTokens = join59(cwd, "tokens.json");
   if (existsSync61(pkgTokens) && (tokens.colors || tokens.typography)) {
     const cur = JSON.parse(readFileSync72(pkgTokens, "utf8"));
-    const merged = deepMerge4(cur, tokens);
+    let tokensIn = tokens;
+    if (tokens.typography) {
+      const fonts = catalogTypography(tokens.typography, cur.typography);
+      notes.push(...fonts.notes);
+      tokensIn = { ...tokens, typography: fonts.typography };
+    }
+    const merged = deepMerge4(cur, tokensIn);
     const mergedColors = merged.colors;
     if (mergedColors && typeof mergedColors === "object" && !Array.isArray(mergedColors)) {
       merged.colors = alignAccentsToSurfaces(mergedColors, tokens.colors);
@@ -57379,8 +57491,16 @@ async function applyOverlays(input) {
     const prev = readFileSync72(homeSrc, "utf8");
     const patched = patchBrandParams(prev, overlay, homeAction);
     let next = patched.src;
-    if (!patched.foreign && overlay.installedVerticals?.length) {
-      const home = patchHomeForVerticals(next, overlay.installedVerticals, homeAction);
+    if (!patched.foreign && faq?.length && prev.includes('"tier5.himiBrandedFaq.load"') && !prev.includes('"staticFaq"')) {
+      notes.push(
+        "the site's FAQ pairs were saved to provisioning.json, but this package's FAQ screen predates the site-FAQ fallback and will not show them \u2014 re-scaffold from the current template to pick it up"
+      );
+    }
+    const keepFaq = Array.isArray(packageFaq) && packageFaq.length > 0;
+    const dropFaq = Array.isArray(faq) && faq.length === 0;
+    const ownsHome = prev.includes(`"actionId": "${homeAction}"`);
+    if (ownsHome && !patched.foreign && (overlay.installedVerticals?.length || keepFaq || dropFaq)) {
+      const home = patchHomeForVerticals(next, overlay.installedVerticals ?? [], homeAction, { keepFaq, dropFaq });
       next = home.src;
       if (home.droppedCtas.length) {
         notes.push(`removed the home's store call(s) to action (${home.droppedCtas.join(", ")}) \u2014 this site has no store`);
@@ -57426,10 +57546,18 @@ function patchBrandParams(src, overlay, homeActionId) {
   const layout = overlay.appearance?.homeLayout;
   const accent = overlay.branding?.primaryColor;
   const verts = overlay.installedVerticals;
+  const faq = overlay.faq;
   const edits = [
     ...layout ? [{ pattern: /"ownerDefaultLayout": "[^"]*"/g, replacement: `"ownerDefaultLayout": ${JSON.stringify(layout)}` }] : [],
     ...accent ? [{ pattern: /"brandAccent": "[^"]*"/g, replacement: `"brandAccent": ${JSON.stringify(accent)}` }] : [],
-    ...verts?.length ? [{ pattern: /"verticals": "\[[^\]]*\]"/g, replacement: `"verticals": ${JSON.stringify(JSON.stringify(verts))}` }] : []
+    ...verts?.length ? [{ pattern: /"verticals": "\[[^\]]*\]"/g, replacement: `"verticals": ${JSON.stringify(JSON.stringify(verts))}` }] : [],
+    // The FAQ screen's fallback pairs (#3276), a JSON STRING like `verticals` because action
+    // params are string-valued. The pattern matches any escaped string, so re-applying a
+    // package whose pairs are already written replaces them instead of missing. A function
+    // replacement, because the pairs are customer text and may contain `$&`. Patched whenever
+    // the analysis SAID something, `[]` included, so a re-apply clears pairs an earlier one
+    // baked in rather than leaving the worker another site's FAQ.
+    ...faq ? [{ pattern: /"staticFaq": "(?:[^"\\]|\\.)*"/g, replacement: `"staticFaq": ${JSON.stringify(JSON.stringify(faq))}` }] : []
   ];
   if (!edits.length) return { src, applied: 0, unparsed: 0, foreign: false };
   if (!src.includes(`"actionId": "${homeActionId}"`)) {
@@ -57474,7 +57602,7 @@ function patchBrandParams(src, overlay, homeActionId) {
       pattern.lastIndex = 0;
       if (!pattern.test(block)) continue;
       pattern.lastIndex = 0;
-      block = block.replace(pattern, replacement);
+      block = block.replace(pattern, () => replacement);
       applied += 1;
     }
     out += src.slice(cursor, open) + block;
@@ -57492,6 +57620,10 @@ var init_apply2 = __esm({
     init_branding_derive();
     init_brand_color_math();
     init_home_descriptor();
+    init_derive();
+    init_catalog();
+    init_plan_fonts();
+    init_tokens();
     STAGED = ".himi/brand";
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1046.0",
+  "version": "0.1047.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -65,5 +65,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "920a07437cf238c0bf1e34b799a4fe38573b57c6da92541fc2836079"
+  "falconPackageHash": "9a5f5cd39f2e85af3f506141935613aebbda4942b8cb91683db7492f"
 }

package/templates/branded-lite/dev/index.ts

@@ -58239,7 +58239,8 @@ const SCREENS = runtimeSetting({
         "onAppear": {
           "actionId": "tier5.himiBrandedFaq.load",
           "params": {
-            "otherCategory": "Other"
+            "otherCategory": "Other",
+            "staticFaq": "[]"
           }
         }
       }

package/templates/branded-lite/tier5-src/himi-branded-lite-faq/index.ts

@@ -58,6 +58,55 @@ interface FaqState {
 
 const PAGE_SIZE = 100;
 
+/** Caps on the static pairs, matching `BRANDED_LITE_FAQ_LIMITS` in the app contract. The
+ *  param is re-bounded here because a worker must not trust a descriptor it did not build. */
+const STATIC_LIMITS = { pairs: 20, question: 200, answer: 1500 } as const;
+const STATIC_CATEGORY: FaqCategory = { id: "himi-static-faq", title: "" };
+
+/** The site's own FAQ pairs — questions it publishes as page sections rather than
+ *  through the Wix FAQ app, carried in by `site analyze --apply` as the `staticFaq` onAppear
+ *  param (a JSON string: action params are string-valued). They are the FALLBACK: shown only
+ *  when the FAQ app yields no visible question, so an owner-edited Wix FAQ always wins. */
+let staticQuestions: FaqQuestion[] = [];
+
+function parseStaticFaq(raw: unknown): FaqQuestion[] {
+  let pairs: unknown = raw;
+  if (typeof raw === "string") {
+    try {
+      pairs = JSON.parse(raw);
+    } catch {
+      // A malformed param is a DESCRIPTOR bug, not an empty FAQ: there is no fallback to
+      // offer, so the screen shows exactly what the Wix FAQ read says — its content, its
+      // empty card, or its error card — rather than pretending the site has no questions.
+      pairs = undefined;
+    }
+  }
+  if (!Array.isArray(pairs)) return [];
+  const out: FaqQuestion[] = [];
+  for (const pair of pairs) {
+    if (out.length >= STATIC_LIMITS.pairs) break;
+    const row = pair && typeof pair === "object" ? pair as { q?: unknown; a?: unknown } : {};
+    const question = typeof row.q === "string" ? row.q.trim().slice(0, STATIC_LIMITS.question) : "";
+    const answer = typeof row.a === "string" ? row.a.trim().slice(0, STATIC_LIMITS.answer) : "";
+    if (!question || !answer) continue;
+    out.push({
+      id: `himi-static-faq-${out.length}`,
+      categoryId: STATIC_CATEGORY.id,
+      question,
+      answer,
+      sortOrder: out.length,
+      status: "VISIBLE",
+    });
+  }
+  return out;
+}
+
+/** The site's pairs as a ready state, or undefined when there are none to fall back to. */
+function staticFallback(state: FaqState): FaqState | undefined {
+  if (!staticQuestions.length) return undefined;
+  return ready({ ...state, categories: [STATIC_CATEGORY], questions: staticQuestions });
+}
+
 function sortByWixOrder<T extends { id: string; sortOrder?: number }>(left: T, right: T): number {
   const a = Number.isFinite(left.sortOrder) ? left.sortOrder! : Number.POSITIVE_INFINITY;
   const b = Number.isFinite(right.sortOrder) ? right.sortOrder! : Number.POSITIVE_INFINITY;
@@ -101,7 +150,8 @@ function ready(state: FaqState): FaqState {
   const rows = sections.flatMap((section) => section.questions.map((question, index) => ({
     ...question,
     categoryTitle: section.title,
-    categoryHeaderHidden: index !== 0,
+    // An untitled section (the static fallback's) has no header to show.
+    categoryHeaderHidden: index !== 0 || !section.title,
   })));
   return {
     ...state,
@@ -218,17 +268,28 @@ function commit(state: FaqState): FaqState {
   return state;
 }
 
-async function loadFaq(state: FaqState, arg?: { otherCategory?: string }): Promise<FaqState> {
+async function loadFaq(state: FaqState, arg?: { otherCategory?: string; staticFaq?: unknown }): Promise<FaqState> {
   latestState = state;
+  // Only when the caller passed the param: `retry` is dispatched with no params and must keep
+  // the pairs the screen's onAppear delivered.
+  if (arg && "staticFaq" in arg) staticQuestions = parseStaticFaq(arg.staticFaq);
   const generation = ++loadGeneration;
   try {
     const [categories, questions] = await Promise.all([allCategories(), allQuestions()]);
     if (generation !== loadGeneration) return latestState;
     const otherTitle = String(arg?.otherCategory ?? latestState.otherTitle).trim() || latestState.otherTitle;
-    return commit(ready({ ...latestState, categories, questions, otherTitle }));
+    const live = ready({ ...latestState, categories, questions, otherTitle });
+    // The Wix FAQ app answered but holds nothing a visitor can see — the site's own pairs,
+    // when it has any, instead of an empty state over a site whose FAQ is right there.
+    if (questions.length === 0) return commit(staticFallback(live) ?? live);
+    return commit(live);
   } catch (error) {
     if (generation !== loadGeneration) return latestState;
     const status = httpStatus(error);
+    // No FAQ app (428), no visitor access (403) or a failed read: a site whose FAQ is page
+    // content still has an FAQ to show, so its pairs replace the failure card.
+    const fallback = staticFallback(latestState);
+    if (fallback) return commit(fallback);
     return commit(failure(latestState, status === 403 ? "forbidden" : status === 428 ? "notInstalled" : "error"));
   }
 }
@@ -250,4 +311,4 @@ const svc = defineService("himiBrandedFaq", {
   },
 });
 
-export { svc, sectionsFor, httpStatus };
+export { svc, sectionsFor, httpStatus, parseStaticFaq };