@wix/himalaya-cli 0.1241.0 → 0.1242.0

package/templates/retail-store-owner/tier5-src/himi-owner-lite-sites/index.ts

@@ -13,6 +13,7 @@ import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
 import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
+import { readSelectedSite } from "../_shared/owner-selected-site.js";
 
 // Offline-first (data-offline): the owner's last-synced businesses are the
 // READ-THROUGH cache for the `sites` entity — paint them instantly (works
@@ -33,6 +34,8 @@ interface SiteRow {
   id: string;        // metaSiteId
   name: string;
   meta: string;
+  /** A complete, useful spoken name for the row's tap target. */
+  spokenLabel: string;
   initial: string;
 }
 
@@ -55,12 +58,13 @@ interface SitesState {
 }
 
 function normalize(raw: WixSite): SiteRow {
-  const name = raw.displayName || (raw as { name?: string }).name || raw.id || "Site";
+  const name = raw.displayName || (raw as { name?: string }).name || copyParam("ownerSites.unnamedBusiness", "Business");
   const studio = (raw as { namespace?: string }).namespace === "WIX_STUDIO";
   return {
     id: raw.id || "",
     name,
     meta: studio ? "Wix Studio site" : "Wix site",
+    spokenLabel: [name, studio ? "Wix Studio site" : "Wix site"].join(", "),
     initial: (name.trim()[0] || "S").toUpperCase(),
   };
 }
@@ -70,6 +74,30 @@ function applySearch(rows: SiteRow[], query: string): SiteRow[] {
   return q ? rows.filter((r) => r.name.toLowerCase().includes(q)) : rows;
 }
 
+/** Upgrade rows cached by older bundles, which used the private site id as a fallback name. */
+function repairCachedRow(row: SiteRow, selected: ReturnType<typeof readSelectedSite>): SiteRow {
+  // Rows written by this bundle already carry a spoken name, so preserve valid
+  // Wix display names even when a business name happens to equal its site ID.
+  if (typeof row.spokenLabel === "string" && row.spokenLabel) return row;
+  // A legacy cache has no provenance bit. For the currently selected business,
+  // the picker kept the Wix display name separately; use it to distinguish a
+  // legitimate same-as-ID name from the old private-ID fallback.
+  const selectedName = selected?.id === row.id
+    && (selected.name !== row.id || selected.nameFromWix === true)
+    ? selected.name : "";
+  const name = selectedName || (row.name && row.name !== row.id
+    ? row.name
+    : copyParam("ownerSites.unnamedBusiness", "Business"));
+  const meta = typeof row.meta === "string" ? row.meta : "";
+  return {
+    ...row,
+    name,
+    meta,
+    spokenLabel: [name, ...meta.split(" · ")].filter(Boolean).join(", "),
+    initial: (name.trim()[0] || "S").toUpperCase(),
+  };
+}
+
 function emptyFor(query = ""): string {
   return query.trim()
     ? copyParam("ownerSites.emptySearch", "No businesses match that search.")
@@ -106,6 +134,7 @@ function demoList(s: SitesState): SitesState {
     id: d.id,
     name: d.name,
     meta: [d.domain, d.plan].filter(Boolean).join(" · "),
+    spokenLabel: [d.name, d.domain, d.plan].filter(Boolean).join(", "),
     initial: (d.name[0] || "S").toUpperCase(),
   }));
   return shape({
@@ -122,8 +151,10 @@ async function loadList(s: SitesState): Promise<SitesState> {
   if (isOwnerPreviewDemo()) return demoList(s);
   // 1) Instant paint from the on-device cache (offline-safe; empty on first-ever run).
   const cached = await readCachedRows();
-  const base = cached.length
-    ? shape({ ...s, status: "ready", allSites: cached, sites: applySearch(cached, s.searchQuery), error: "", demoNote: "" })
+  const selected = readSelectedSite();
+  const repairedCache = cached.map((row) => repairCachedRow(row, selected));
+  const base = repairedCache.length
+    ? shape({ ...s, status: "ready", allSites: repairedCache, sites: applySearch(repairedCache, s.searchQuery), error: "", demoNote: "" })
     : s;
   // 2) Revalidate from Wix and refresh the cache.
   try {
@@ -133,7 +164,7 @@ async function loadList(s: SitesState): Promise<SitesState> {
     return shape({ ...s, status: "ready", allSites: rows, sites: applySearch(rows, s.searchQuery), resultSummary: `${rows.length} ${rows.length === 1 ? "business" : "businesses"}`, error: "", demoNote: "" });
   } catch (e) {
     // Offline / fetch failure: keep the last-synced cache BEFORE the demo/error fallbacks.
-    if (cached.length) return base;
+    if (repairedCache.length) return base;
     if (isBridgeUnavailable(e)) return demoList(s);
     return shape({ ...s, status: "error", allSites: [], sites: [], error: ownerLoadError(e) });
   }

package/templates/yoga-studio-owner/dev/index.ts

@@ -61588,7 +61588,7 @@ const SCREENS = runtimeSetting({
                                 },
                                 "pressFeedback": "scale",
                                 "haptic": "light",
-                                "accessibilityLabel": "himi_owner_lite.site_row"
+                                "accessibilityLabel": "$item.spokenLabel"
                               }
                             }
                           ]
@@ -62148,7 +62148,7 @@ const SCREENS = runtimeSetting({
                                 },
                                 "pressFeedback": "scale",
                                 "haptic": "light",
-                                "accessibilityLabel": "himi_owner_lite.overview_row"
+                                "accessibilityLabel": "$item.spokenLabel"
                               }
                             }
                           ]

package/templates/yoga-studio-owner/tier5-src/_shared/owner-selected-site.ts

@@ -27,6 +27,8 @@ type Host = typeof globalThis & { himalaya?: { storage?: StorageLike; input?: Re
 export interface SelectedSite {
   id: string;
   name: string;
+  /** True when the picker wrote this from a current, repaired Wix site row. */
+  nameFromWix?: boolean;
 }
 
 const KEY = "himi.ownerLite.selectedSite.v1";
@@ -60,13 +62,15 @@ export function readSelectedSite(): SelectedSite | null {
     if (account && account !== me) return null;
     // An entry the picker wrote before the host knew the owner is CLAIMED by the first
     // worker that does know it, so from then on no other owner on the device reads it.
-    if (!account && me) host()?.storage?.setItem(KEY, JSON.stringify({ id, name, account: me }));
+    if (!account && me) host()?.storage?.setItem(KEY, JSON.stringify({
+      id, name, ...(parsed.nameFromWix === true ? { nameFromWix: true } : {}), account: me,
+    }));
     // A screen opened FOR a specific business (a deep link or push carrying
     // `business`) names that business's data; a name recorded for another one would
     // sit over the wrong numbers, so it falls back instead.
     const opened = inputString("business");
     if (opened && opened !== id) return null;
-    return { id, name };
+    return { id, name, ...(parsed.nameFromWix === true ? { nameFromWix: true } : {}) };
   } catch {
     return null; // a corrupt entry reads as "nothing picked", never as a crash
   }
@@ -80,7 +84,9 @@ export function rememberSelectedSite(site: SelectedSite): void {
   if (!id || !name) return;
   const account = inputString("__himiPreferenceAccount");
   try {
-    host()?.storage?.setItem(KEY, JSON.stringify(account ? { id, name, account } : { id, name }));
+    host()?.storage?.setItem(KEY, JSON.stringify(account
+      ? { id, name, nameFromWix: true, account }
+      : { id, name, nameFromWix: true }));
   } catch {
     // Quota / storage disabled: the chrome falls back to the build-time name.
   }

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-overview/index.ts

@@ -44,6 +44,8 @@ const PER_SITE_LIMIT = 50;
 interface OverviewRow {
   id: string;
   name: string;
+  /** A complete, useful spoken name for the row's tap target. */
+  spokenLabel: string;
   initial: string;
   /** "3", "50+", or "—" when that business could not be read. */
   attention: string;
@@ -79,21 +81,24 @@ function countLabel(n: number | null): string {
 
 function rowFor(id: string, name: string, count: number | null): OverviewRow {
   const needs = count !== null && count > 0;
+  const attention = countLabel(count);
+  const attentionLabel = count === null
+    ? copyParam("ownerOverview.unavailable", "Couldn’t read this business")
+    : count === 0
+      ? copyParam("ownerOverview.allClear", "All clear")
+      : count === 1
+        ? copyParam("ownerOverview.oneNeedsAttention", "order needs attention")
+        : copyParam("ownerOverview.manyNeedAttention", "orders need attention");
   return {
     id,
     name,
+    spokenLabel: [name, attention, attentionLabel].filter(Boolean).join(", "),
     initial: initialOf(name),
-    attention: countLabel(count),
+    attention,
     // Reads as ONE phrase with the count rendered beside it — "3" + "orders need
     // attention". So the label never repeats the number, or the row would say "1 · 1 order
     // needs attention".
-    attentionLabel: count === null
-      ? copyParam("ownerOverview.unavailable", "Couldn’t read this business")
-      : count === 0
-        ? copyParam("ownerOverview.allClear", "All clear")
-        : count === 1
-          ? copyParam("ownerOverview.oneNeedsAttention", "order needs attention")
-          : copyParam("ownerOverview.manyNeedAttention", "orders need attention"),
+    attentionLabel,
     needsAttention: needs,
     calm: !needs,
   };
@@ -179,7 +184,7 @@ async function loadRollup(): Promise<OverviewState> {
       .filter((r: WixSite) => r?.id)
       .map((r: WixSite) => ({
         id: r.id || "",
-        name: r.displayName || (r as { name?: string }).name || r.id || "Site",
+        name: r.displayName || (r as { name?: string }).name || copyParam("ownerOverview.unnamedBusiness", "Business"),
       }));
     if (businesses.length === 0) return shape({ status: "ready", rows: [] });
 

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-sites/index.ts

@@ -13,6 +13,7 @@ import { DEMO_SITES, DEMO_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "../_shared/owner-local-db.js";
 import { pickSite, pickedSite } from "../_shared/owner-site-pick.js";
+import { readSelectedSite } from "../_shared/owner-selected-site.js";
 
 // Offline-first (data-offline): the owner's last-synced businesses are the
 // READ-THROUGH cache for the `sites` entity — paint them instantly (works
@@ -33,6 +34,8 @@ interface SiteRow {
   id: string;        // metaSiteId
   name: string;
   meta: string;
+  /** A complete, useful spoken name for the row's tap target. */
+  spokenLabel: string;
   initial: string;
 }
 
@@ -55,12 +58,13 @@ interface SitesState {
 }
 
 function normalize(raw: WixSite): SiteRow {
-  const name = raw.displayName || (raw as { name?: string }).name || raw.id || "Site";
+  const name = raw.displayName || (raw as { name?: string }).name || copyParam("ownerSites.unnamedBusiness", "Business");
   const studio = (raw as { namespace?: string }).namespace === "WIX_STUDIO";
   return {
     id: raw.id || "",
     name,
     meta: studio ? "Wix Studio site" : "Wix site",
+    spokenLabel: [name, studio ? "Wix Studio site" : "Wix site"].join(", "),
     initial: (name.trim()[0] || "S").toUpperCase(),
   };
 }
@@ -70,6 +74,30 @@ function applySearch(rows: SiteRow[], query: string): SiteRow[] {
   return q ? rows.filter((r) => r.name.toLowerCase().includes(q)) : rows;
 }
 
+/** Upgrade rows cached by older bundles, which used the private site id as a fallback name. */
+function repairCachedRow(row: SiteRow, selected: ReturnType<typeof readSelectedSite>): SiteRow {
+  // Rows written by this bundle already carry a spoken name, so preserve valid
+  // Wix display names even when a business name happens to equal its site ID.
+  if (typeof row.spokenLabel === "string" && row.spokenLabel) return row;
+  // A legacy cache has no provenance bit. For the currently selected business,
+  // the picker kept the Wix display name separately; use it to distinguish a
+  // legitimate same-as-ID name from the old private-ID fallback.
+  const selectedName = selected?.id === row.id
+    && (selected.name !== row.id || selected.nameFromWix === true)
+    ? selected.name : "";
+  const name = selectedName || (row.name && row.name !== row.id
+    ? row.name
+    : copyParam("ownerSites.unnamedBusiness", "Business"));
+  const meta = typeof row.meta === "string" ? row.meta : "";
+  return {
+    ...row,
+    name,
+    meta,
+    spokenLabel: [name, ...meta.split(" · ")].filter(Boolean).join(", "),
+    initial: (name.trim()[0] || "S").toUpperCase(),
+  };
+}
+
 function emptyFor(query = ""): string {
   return query.trim()
     ? copyParam("ownerSites.emptySearch", "No businesses match that search.")
@@ -106,6 +134,7 @@ function demoList(s: SitesState): SitesState {
     id: d.id,
     name: d.name,
     meta: [d.domain, d.plan].filter(Boolean).join(" · "),
+    spokenLabel: [d.name, d.domain, d.plan].filter(Boolean).join(", "),
     initial: (d.name[0] || "S").toUpperCase(),
   }));
   return shape({
@@ -122,8 +151,10 @@ async function loadList(s: SitesState): Promise<SitesState> {
   if (isOwnerPreviewDemo()) return demoList(s);
   // 1) Instant paint from the on-device cache (offline-safe; empty on first-ever run).
   const cached = await readCachedRows();
-  const base = cached.length
-    ? shape({ ...s, status: "ready", allSites: cached, sites: applySearch(cached, s.searchQuery), error: "", demoNote: "" })
+  const selected = readSelectedSite();
+  const repairedCache = cached.map((row) => repairCachedRow(row, selected));
+  const base = repairedCache.length
+    ? shape({ ...s, status: "ready", allSites: repairedCache, sites: applySearch(repairedCache, s.searchQuery), error: "", demoNote: "" })
     : s;
   // 2) Revalidate from Wix and refresh the cache.
   try {
@@ -133,7 +164,7 @@ async function loadList(s: SitesState): Promise<SitesState> {
     return shape({ ...s, status: "ready", allSites: rows, sites: applySearch(rows, s.searchQuery), resultSummary: `${rows.length} ${rows.length === 1 ? "business" : "businesses"}`, error: "", demoNote: "" });
   } catch (e) {
     // Offline / fetch failure: keep the last-synced cache BEFORE the demo/error fallbacks.
-    if (cached.length) return base;
+    if (repairedCache.length) return base;
     if (isBridgeUnavailable(e)) return demoList(s);
     return shape({ ...s, status: "error", allSites: [], sites: [], error: ownerLoadError(e) });
   }