@wix/himalaya-cli 0.1634.0 → 0.1636.0

package/templates/branded-lite/l10n/en.json

@@ -1,6 +1,6 @@
 {
   "$source": "en",
-  "$generated": "2026-11-10T08:42:54.071Z",
+  "$generated": "2026-11-10T10:43:25.380Z",
   "messages": {
     "h_042c862e4467": {
       "source": "Try again",
@@ -47,7 +47,6 @@
         "himi_my_groups#payload.body.props.children[2].body.props.children[2].body.props.title",
         "himi_faq#payload.body.props.children[6].body.props.children[2].body.props.title",
         "himi_steps#payload.body.props.children[4].body.props.children[2].body.props.title",
-        "himi_cms#payload.body.props.children[3].body.props.children[7].body.props.children[2].body.props.title",
         "himi_donations#payload.body.props.children[4].body.props.children[8].body.props.children[2].body.props.title",
         "himi_gift_cards#payload.body.props.children[4].body.props.children[8].body.props.children[2].body.props.title",
         "himi_videos#payload.body.props.children[7].body.props.children[8].body.props.children[2].body.props.title",
@@ -164,7 +163,7 @@
       "kind": "modifier.accessibilityLabel",
       "occurrences": [
         "himi_chat_thread#stickyFooter.body.props.children[0].body.props.children[0].modifiers.accessibilityLabel",
-        "himi_business_chat#stickyFooter.body.props.children[1].body.props.children[0].modifiers.accessibilityLabel"
+        "himi_business_chat#stickyFooter.body.props.children[1].body.props.children[0].body.props.children[1].modifiers.accessibilityLabel"
       ],
       "translation": "",
       "key": "chatThread.composerLabel"
@@ -298,7 +297,7 @@
       "kind": "TextField.placeholder",
       "occurrences": [
         "himi_chat_thread#stickyFooter.body.props.children[0].body.props.children[0].body.props.placeholder",
-        "himi_business_chat#stickyFooter.body.props.children[1].body.props.children[0].body.props.placeholder"
+        "himi_business_chat#stickyFooter.body.props.children[1].body.props.children[0].body.props.children[1].body.props.placeholder"
       ],
       "translation": "",
       "key": "chatThread.composerPlaceholder"
@@ -425,7 +424,6 @@
         "himi_forum_post#payload.body.props.children[3].body.props.title",
         "himi_my_events#payload.body.props.children[1].body.props.children[3].body.props.title",
         "himi_my_groups#payload.body.props.children[6].body.props.children[3].body.props.title",
-        "himi_cms#payload.body.props.children[3].body.props.children[7].body.props.children[3].body.props.title",
         "himi_donations#payload.body.props.children[4].body.props.children[8].body.props.children[3].body.props.title",
         "himi_gift_cards#payload.body.props.children[4].body.props.children[8].body.props.children[3].body.props.title",
         "himi_videos#payload.body.props.children[7].body.props.children[8].body.props.children[3].body.props.title",

package/templates/branded-lite/tier5-src/_shared/collection-contract.ts

@@ -92,7 +92,6 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
     searchPlaceholder: 'Customer name, email or order #', sortLabels: { default: 'Newest', az: 'Customer A–Z', za: 'Customer Z–A' },
     filterValues: ['Recent 7 days', 'Paid', 'Unpaid', 'Partially paid', 'Pending', 'Refunded', 'Partly refunded'] },
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
-  himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['status', 'meta'], rowStyle: 'flat', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],

package/templates/branded-lite/tier5-src/_shared/himi-cms.ts

@@ -1,5 +1,6 @@
 import {
   queryDataItems as queryWixDataItems,
+  countDataItems,
   insertDataItem,
   updateDataItem,
   removeDataItem,
@@ -8,7 +9,7 @@ import {
 } from "@himalaya/wix-data";
 
 export type { WixDataItem, WixQueryDataItemsResponse };
-export { insertDataItem, updateDataItem, removeDataItem };
+export { countDataItems, insertDataItem, updateDataItem, removeDataItem };
 
 export interface CmsFieldDefinition {
   key: string;

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

@@ -1,58 +1,135 @@
 import { defineService } from "../_shared/collection-service.js";
-import { collectionDefinitions, type CmsCollectionDefinition } from "../_shared/himi-cms";
-import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { collectionDefinitions, countDataItems, type CmsCollectionDefinition } from "../_shared/himi-cms";
+import { copyParam, copyPlural, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 
 // Offline-first (data-offline): this catalog is derived from the app's BAKED CMS
 // contract (himalaya.input.cmsCollections) — there is no live wixApi fetch to
-// revalidate, so it is structurally read-only. We still add the read-through seam
-// around that baked load path: the derived rows are mirrored into the on-device store,
+// revalidate the NAMES, so they are structurally read-only. We still add the read-through seam
+// around that baked load path: the derived entries are mirrored into the on-device store,
 // and if the contract ever arrives empty we fall back to the last-synced cache.
 // DEGRADES GRACEFULLY: every local-db call is wrapped so a build that hasn't granted
 // `local_database` (+ declared the `cms_collections` entity) behaves exactly as before.
+//
+// The item COUNT under each name is the one live read. It is never cached: a stale number would
+// read as the business's own, and a count the API did not return is not shown at all.
 const ENTITY = "cms_collections";
-async function readCached(): Promise<CollectionRow[]> {
-  try { return (await getAll(ENTITY)) as unknown as CollectionRow[]; } catch { return []; }
+
+/** What the screen needs to know about a collection, with no per-visit state. Mirrored to the cache. */
+interface Entry {
+  id: string;
+  title: string;
+  detailScreenId: string;
+  isMembersOnly: boolean;
+}
+
+async function readCached(): Promise<Entry[]> {
+  try {
+    return (await getAll(ENTITY)).map((r) => {
+      const stored = r as unknown as Partial<Entry> & { meta?: string };
+      return {
+        id: String(stored.id ?? ""),
+        title: typeof stored.title === "string" ? stored.title : String(stored.id ?? ""),
+        detailScreenId: typeof stored.detailScreenId === "string" ? stored.detailScreenId : `himi_cms_collection_${encodeURIComponent(String(stored.id ?? ""))}`,
+        // A row cached before counts carried its "Members only" label in `meta`.
+        isMembersOnly: stored.isMembersOnly ?? Boolean(stored.meta),
+      };
+    }).filter((entry) => entry.id !== "");
+  } catch { return []; }
 }
-async function writeCached(rows: CollectionRow[]): Promise<void> {
-  try { for (const r of rows) await upsert(ENTITY, r as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
+async function writeCached(entries: Entry[]): Promise<void> {
+  try { for (const e of entries) await upsert(ENTITY, e as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
 }
 
+/** "pending" until the count call settles; "none" for a members-only collection, which shows a lock instead. */
+type CountStatus = "pending" | "ready" | "error" | "none";
+
 interface CollectionRow {
   id: string;
   title: string;
-  subtitle: string;
-  meta: string;
-  initial: string;
   detailScreenId: string;
+  isMembersOnly: boolean;
+  membersOnlyText: string;
+  countStatus: CountStatus;
+  countText: string;
+  /** The row's accessible name: the collection, then whichever caption it shows. */
+  accessibilityLabel: string;
+  // The descriptor hides a node when its bound flag is TRUE, so each caption has its inverse.
+  noCountLoading: boolean;
+  noCountText: boolean;
+  noMembersOnly: boolean;
 }
 
 interface State {
   status: "ready";
-  all: CollectionRow[];
   rows: CollectionRow[];
-  emptyText: string;
-  noRows: boolean;
+  /** More than 5 collections: the name search shows. */
+  showSearch: boolean;
+  hideSearch: boolean;
+  /** The contract holds no collection at all. */
   noEmpty: boolean;
+  /** A search matched none of them. */
+  noNoMatch: boolean;
+  noRows: boolean;
 }
 
-function row(collection: CmsCollectionDefinition): CollectionRow {
-  const title = collection.displayName.trim() || collection.id;
-  // No field count and no "Available to visitors": both are back-office schema/permission
-  // metadata, meaningless to the visitor reading the card ([branded-lite-qa] #3077). "Members
-  // only" stays — it tells the visitor they will need to sign in, which is theirs to know.
+/** A name search earns its place only past this many collections. */
+const SEARCH_THRESHOLD = 5;
+
+let entries: Entry[] = [];
+let query = "";
+/** A settled count by collection id. A failed refresh never replaces a count already known. */
+const counts = new Map<string, { status: "ready" | "error"; count: number }>();
+/** Ids with a count call on the wire, so a second `load` (onAppear fires on every visit) does not double it. */
+const inFlight = new Set<string>();
+
+function entryFor(collection: CmsCollectionDefinition): Entry {
   return {
     id: collection.id,
-    title,
-    subtitle: "",
-    meta: collection.readRole === "ANYONE" ? "" : copyParam("cms.membersOnlyAccessLabel", "Members only"),
-    initial: (title[0] || "C").toUpperCase(),
+    title: collection.displayName.trim() || collection.id,
     detailScreenId: `himi_cms_collection_${encodeURIComponent(collection.id)}`,
+    isMembersOnly: collection.readRole !== "ANYONE",
   };
 }
 
-function ready(all: CollectionRow[], rows = all, emptyText = copyParam("cms.emptyText", "No CMS collections are published to this app yet.")): State {
-  return { status: "ready", all, rows, emptyText, noRows: rows.length === 0, noEmpty: rows.length > 0 };
+function rowFor(entry: Entry): CollectionRow {
+  const membersOnlyText = copyParam("cms.membersOnlyAccessLabel", "Members only");
+  const known = counts.get(entry.id);
+  const countStatus: CountStatus = entry.isMembersOnly ? "none" : known?.status ?? "pending";
+  const countText = countStatus === "ready" && known
+    ? copyPlural("cms.itemCount", "{n, plural, one {# item} other {# items}}", known.count)
+    : "";
+  const caption = entry.isMembersOnly ? membersOnlyText : countText;
+  return {
+    id: entry.id,
+    title: entry.title,
+    detailScreenId: entry.detailScreenId,
+    isMembersOnly: entry.isMembersOnly,
+    membersOnlyText,
+    countStatus,
+    countText,
+    accessibilityLabel: caption ? `${entry.title}, ${caption}` : entry.title,
+    noCountLoading: countStatus !== "pending",
+    noCountText: countStatus !== "ready",
+    noMembersOnly: !entry.isMembersOnly,
+  };
+}
+
+/** Every visible field, derived from the module's truth at the moment of the call, so an action that
+ *  settles later (a count arriving, a search typed) can never publish an older picture of it. */
+function view(): State {
+  const needle = query.trim().toLowerCase();
+  const shown = needle ? entries.filter((entry) => entry.title.toLowerCase().includes(needle)) : entries;
+  const showSearch = entries.length > SEARCH_THRESHOLD;
+  return {
+    status: "ready",
+    rows: shown.map(rowFor),
+    showSearch,
+    hideSearch: !showSearch,
+    noEmpty: entries.length > 0,
+    noNoMatch: entries.length === 0 || shown.length > 0,
+    noRows: shown.length === 0,
+  };
 }
 
 function value(arg: unknown, key: string): string {
@@ -61,30 +138,74 @@ function value(arg: unknown, key: string): string {
   return typeof result === "string" ? result : "";
 }
 
+/** The count the API returned, or undefined: a missing or malformed total is never read as zero. */
+function totalOf(response: { totalCount?: number } | undefined): number | undefined {
+  const total = response?.totalCount;
+  return typeof total === "number" && Number.isFinite(total) && total >= 0 ? total : undefined;
+}
+
+/** One count call per readable collection, all at once; each row fills as ITS call returns. */
+function startCounts(): void {
+  for (const entry of entries) {
+    if (entry.isMembersOnly || inFlight.has(entry.id)) continue;
+    inFlight.add(entry.id);
+    const settle = (total: number | undefined) => { inFlight.delete(entry.id); void svc.countSettled({ id: entry.id, total }); };
+    countDataItems(entry.id).then((response) => settle(totalOf(response)), () => settle(undefined));
+  }
+}
+
 const inputCollections = (globalThis as { himalaya?: { input?: { cmsCollections?: unknown } } }).himalaya?.input?.cmsCollections;
+entries = collectionDefinitions(typeof inputCollections === "string" ? inputCollections : "").map(entryFor);
+const initialState = view();
+const derivedStateKeys = Object.keys(initialState) as Array<keyof State>;
 
 const svc = defineService<State, {
-  load: (state: State, arg?: unknown) => Promise<State>;
+  load: (state: State, arg?: unknown) => Promise<State | undefined>;
   search: (state: State, arg?: unknown) => State;
+  countSettled: (state: State, arg: { id: string; total: number | undefined }) => State;
 }>("himiBrandedCms", {
-  state: ready(collectionDefinitions(typeof inputCollections === "string" ? inputCollections : "").map(row)),
+  state: initialState,
+  // Rows and visibility are derived from this run's contract/query/counts.
+  // A prior search or count must not override them on a cold boot. Collection
+  // definitions already have their own explicit local-database cache.
+  notHydrated: derivedStateKeys,
+  notPersisted: derivedStateKeys,
   actions: {
-    load: async (_state, arg) => {
+    load: async (state, arg) => {
       stashCopy(arg);
-      const all = collectionDefinitions(value(arg, "collections")).map(row);
-      if (all.length) { await writeCached(all); return ready(all); }
-      // No baked contract rows: fall back to the last-synced cache (offline), else empty.
-      const cached = await readCached();
-      return cached.length ? ready(cached) : ready(all);
+      // The remounted SearchField starts empty. Reset before awaiting the cache so
+      // a search typed during this load is not cleared by its eventual completion.
+      query = "";
+      const given = value(arg, "collections");
+      const baked = collectionDefinitions(given).map(entryFor);
+      if (baked.length) {
+        entries = baked;
+        await writeCached(baked);
+      } else if (given !== "" || !entries.length) {
+        // The contract named no collection (or nothing at all seeded this screen): what was seeded from the
+        // input no longer stands. Fall back to the last-synced cache (offline), else the empty state.
+        entries = await readCached();
+      }
+      startCounts();
+      // Actions are not serialized: a count that settles while this one is still committing would be
+      // overwritten by the older picture returned here. The names normally match what the screen already
+      // shows (the same contract seeded it), so then there is nothing to commit and nothing to overwrite.
+      const next = view();
+      return JSON.stringify(next) === JSON.stringify(state) ? undefined : next;
+    },
+    search: (_state, arg) => {
+      query = value(arg, "value");
+      return view();
     },
-    search: (state, arg) => {
-      const query = value(arg, "value").trim().toLowerCase();
-      const rows = query
-        ? state.all.filter((item) => `${item.title} ${item.subtitle} ${item.meta}`.toLowerCase().includes(query))
-        : state.all;
-      return ready(state.all, rows, query ? copyParam("cms.searchEmptyText", "No collections match your search.") : undefined);
+    countSettled: (_state, arg) => {
+      if (arg.total !== undefined) counts.set(arg.id, { status: "ready", count: arg.total });
+      else if (counts.get(arg.id)?.status !== "ready") counts.set(arg.id, { status: "error", count: 0 });
+      return view();
     },
   },
 });
 
+// NO module-scope `startCounts()`: a bridge call made during the bundle's own evaluation stalls on
+// the Android WebView (see himi-owner-lite-aria-history). The names paint from the baked input, and
+// onAppear's `load` starts the counts right after that first frame.
 export { svc };