@wix/himalaya-cli 0.1028.0 → 0.1030.0

package/templates/gym-fitness/tier5-src/_shared/collection-contract.ts

@@ -14,6 +14,9 @@ export interface CollectionConfig {
   searchPlaceholder?: string;
   sortLabels?: { default: string; az: string; za: string };
   metadata?: string[];
+  /** Numeric 0–5 row field rendered as a Rating (accessible "N out of 5") instead of
+   *  folding a "★★★★☆" glyph string into the metadata line, so screen readers get a value. */
+  rating?: string;
   sectioned?: boolean;
   view: 'list' | 'grid';
   backendQuery?: boolean;
@@ -58,7 +61,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
   himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Redeem' } },
-  himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author', 'stars'], view: 'list' },
+  himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author'], rating: 'rating', view: 'list' },
   himiBrandedPortfolio: { rows: 'projects', title: 'title', subtitle: 'subtitle', image: 'image', view: 'grid', gridImageHeight: 180 },
   himiBrandedInvoices: { rows: 'invoices', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedBadges: { rows: 'badges', title: 'name', subtitle: 'description', view: 'grid' },

package/templates/gym-fitness/tier5-src/himi-branded-lite-appearance/index.ts

@@ -1,5 +1,6 @@
 import { defineService } from "@himalaya/state";
 import {
+  ACCENT_IDS,
   ACCENT_KEY,
   ACCENT_META,
   DEFAULT_ACCENT,
@@ -29,6 +30,10 @@ interface State {
   accentHex_sage: string;
   accentHex_plum: string;
   accentHex_ocean: string;
+  // Per-accent selection flags for the radio group (`selected_<id>`) and the
+  // check mark on the swatch (`notSelected_<id>`, hiddenWhen hides on TRUE). Flat
+  // fields for the same reason as the hex ones: the swatches are static nodes.
+  [flag: `selected_${string}` | `notSelected_${string}`]: boolean | string;
 }
 
 interface StorageLike {
@@ -50,7 +55,13 @@ function paramValue(arg: unknown, key: string): string {
 }
 
 function build(pendingAccent: string, brandAccent: string): State {
+  const flags: Record<string, boolean> = {};
+  for (const id of ACCENT_IDS) {
+    flags[`selected_${id}`] = id === pendingAccent;
+    flags[`notSelected_${id}`] = id !== pendingAccent;
+  }
   return {
+    ...flags,
     pendingAccent,
     brandAccent,
     accentHex_brand: brandAccent || ACCENT_META.amber.hex,
@@ -85,7 +96,7 @@ const svc = defineService<State, {
     selectAccent: (state, arg) => {
       const id = paramValue(arg, "id");
       if (!isAccentId(id)) return state;
-      return { ...state, pendingAccent: id };
+      return build(id, state.brandAccent);
     },
     // Apply: persist the accent; the home worker re-reads it on launch.
     apply: (state) => {

package/templates/gym-fitness/tier5-src/himi-store-product/index.ts

@@ -55,6 +55,12 @@ interface S {
   shareUrl: string;
   cartHint: string;
   cartCount: number;
+  /** An add-to-cart write is in flight (pending line under the CTA). */
+  adding: boolean;
+  notAdding: boolean;
+  /** The last add succeeded (confirmation + View cart under the CTA). */
+  added: boolean;
+  notAdded: boolean;
   emptyText: string;
   isLoading: boolean;
   notLoading: boolean;
@@ -145,6 +151,8 @@ function derive(s: S): S {
   return {
     ...s,
     saveLabel: s.saved ? copyParam("product.saved", "Saved") : copyParam("product.save", "Save product"),
+    notAdding: !s.adding,
+    notAdded: !s.added,
     isLoading: s.status === "loading",
     notLoading: s.status !== "loading",
     isErrored: s.status === "error",
@@ -163,6 +171,7 @@ const svc = defineService<S, {
   load: (s: S, arg?: unknown) => Promise<S>;
   setQuantity: (s: S, arg?: unknown) => S;
   addToCart: (s: S) => Promise<S>;
+  beginAdd: (s: S, arg?: unknown) => S;
   share: (s: S) => Promise<S>;
   toggleSave: (s: S) => S;
 }>("himiStoreProduct", {
@@ -179,6 +188,10 @@ const svc = defineService<S, {
     shareUrl: "",
     cartHint: "",
     cartCount: 0,
+    adding: false,
+    notAdding: true,
+    added: false,
+    notAdded: true,
     emptyText: "",
     isLoading: true,
     notLoading: false,
@@ -201,7 +214,7 @@ const svc = defineService<S, {
       // Storage problems must not prevent browsing or buying a product.
       let saved = false;
       try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-      s = { ...s, saved, saveHint: "" };
+      s = { ...s, saved, saveHint: "", adding: false, added: false };
       // A fresh navigation into the product resets any quantity left over
       // from a previous visit to the same worker instance.
       if (!id) return derive({ ...s, status: "ready", quantity: 1, emptyText: copyParam("product.notFoundText", "Product not found.") });
@@ -254,25 +267,42 @@ const svc = defineService<S, {
       const quantity = parseQuantity(argValue(arg, "value"));
       return quantity ? derive({ ...s, quantity }) : s;
     },
+    // The pending half of addToCart, as its own reducer so it PUBLISHES before the
+    // network write starts: the pending line shows and the top-bar badge ticks up in the same
+    // interaction, instead of the tap looking dead until the round-trip (and the badge re-read)
+    // settle. Called from addToCart, not from the descriptor.
+    beginAdd: (s, arg) => {
+      const quantity = parseQuantity(argValue(arg, "quantity")) ?? 1;
+      return derive({ ...s, adding: true, added: false, cartHint: "", cartCount: s.cartCount + quantity });
+    },
     addToCart: async (s) => {
       const id = inputId();
       if (!id) return derive({ ...s, cartHint: copyParam("product.cartHintNoProduct", "No product to add.") });
+      // A second tap while the first write is in flight must not add the line twice.
+      if (s.adding) return s;
       const quantity = s.quantity > 0 ? s.quantity : 1;
+      const before = s.cartCount;
+      await svc.beginAdd({ quantity: String(quantity) });
+      s = svc.getState() as S;
       // Optimistic local cart line — the cart repaints from cache immediately (offline or not).
       const line: DbEntity = { id: `line-${id}`, productId: id, name: s.name || "product", title: s.name || "product", subtitle: `Qty ${quantity}`, quantity: String(quantity) };
       await cartPut(line);
       try {
         await addToCurrentCart(id, quantity);
-        return derive({ ...s, cartHint: copyTemplate("product.cartHintAdded", "Added {name} to cart.", { name: s.name || "product" }), cartCount: await cartItemCount() });
       } catch (e) {
         if (isBridgeUnavailable(e)) {
           // Offline / no bridge: the optimistic cache line already shows; queue the
           // add to replay (WriteQueue, idempotent) when connectivity returns.
           await queueWrite("tier5.himiStoreProduct.addToCart", { id });
-          return derive({ ...s, cartHint: copyTemplate("product.cartHintQueued", "Added {name} to cart. Will sync when you reconnect.", { name: s.name || "product" }) });
+          return derive({ ...s, adding: false, added: false, cartHint: copyTemplate("product.cartHintQueued", "Added {name} to cart. Will sync when you reconnect.", { name: s.name || "product" }) });
         }
-        return derive({ ...s, cartHint: copyParam("product.cartHintFailed", "Could not add to cart. Try again.") });
+        // Roll the optimistic badge back — nothing was added.
+        return derive({ ...s, adding: false, added: false, cartCount: before, cartHint: copyParam("product.cartHintFailed", "Could not add to cart. Try again.") });
       }
+      // The write LANDED. The badge re-read is outside the write's try on purpose: a failed
+      // count must never be mistaken for a failed add. Server count wins; else keep optimistic.
+      const count = await cartItemCount().catch(() => 0);
+      return derive({ ...s, adding: false, added: true, cartHint: copyTemplate("product.cartHintAdded", "Added {name} to cart.", { name: s.name || "product" }), cartCount: count || s.cartCount });
     },
     toggleSave: (s) => {
       if (s.status !== "ready" || !s.name || !inputId()) return s;
@@ -291,7 +321,8 @@ const svc = defineService<S, {
         await shareSheet({ subject: s.name, text: s.name, ...(s.shareUrl ? { url: s.shareUrl } : {}) });
         return s;
       } catch {
-        return derive({ ...s, cartHint: copyParam("product.shareUnavailable", "Sharing is not available on this device.") });
+        // `added: false` — this hint must not render inside the add-to-cart confirmation.
+        return derive({ ...s, added: false, cartHint: copyParam("product.shareUnavailable", "Sharing is not available on this device.") });
       }
     },
   },

package/templates/gym-fitness/tier5-src/wix-spaces-app-language/index.ts

@@ -5,11 +5,12 @@
 import { defineService } from "@himalaya/state";
 import { dispatch } from "@himalaya/dispatch";
 
-interface Row { id: string; name: string; subtitle: string }
+/** `selected` drives the row's radio; `subtitle` stays for older descriptors. */
+interface Row { id: string; name: string; subtitle: string; selected: boolean }
 interface S { status: "ready"; options: Row[] }
 
 /** Locales with catalogs (`tools/l10n/catalog.<tag>.json`) + LocaleStore support. */
-const LOCALE_OPTIONS: Omit<Row, "subtitle">[] = [
+const LOCALE_OPTIONS: Omit<Row, "subtitle" | "selected">[] = [
   { id: "en", name: "English" },
   { id: "es", name: "Español" },
   { id: "he", name: "עברית" },
@@ -19,6 +20,7 @@ function withSelected(selected: string): Row[] {
   return LOCALE_OPTIONS.map((o) => ({
     ...o,
     subtitle: o.id === selected ? "Selected" : "",
+    selected: o.id === selected,
   }));
 }
 

package/templates/gym-fitness-owner/dev/index.ts

@@ -55262,7 +55262,7 @@ const SCREENS = runtimeSetting({
                           "spacing": 3,
                           "children": [
                             {
-                              "id": "himi_owner_lite_aria.msg_$item.id.who",
+                              "id": "himi_owner_lite_aria.msg_$item.id.content",
                               "body": {
                                 "package": "himalaya",
                                 "type": "HStack",
@@ -55281,43 +55281,34 @@ const SCREENS = runtimeSetting({
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.bubble",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
                                         "props": {
-                                          "text": "$item.who",
-                                          "style": "footnote",
-                                          "color": "textSecondary",
-                                          "maxLines": 1
+                                          "text": "$item.content",
+                                          "style": "body",
+                                          "maxLines": 50
                                         }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_owner_lite_aria.msg_$item.id.content",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Spacer",
-                                        "props": {}
                                       },
                                       "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "padding": {
+                                          "leading": 16,
+                                          "trailing": 16,
+                                          "top": 8,
+                                          "bottom": 8
+                                        },
+                                        "background": {
+                                          "token": "surfaceSecondary"
+                                        },
+                                        "cornerRadius": 20,
+                                        "maxWidth": 300,
                                         "hiddenPath": "$item.notUser"
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "himi_owner_lite_aria.msg_$item.id.text",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
@@ -55326,6 +55317,10 @@ const SCREENS = runtimeSetting({
                                           "style": "body",
                                           "maxLines": 50
                                         }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityLabel": "$item.spoken",
+                                        "hiddenPath": "$item.notAria"
                                       }
                                     }
                                   ]

package/templates/gym-fitness-owner/tier5-src/_shared/aria-chat.ts

@@ -83,6 +83,11 @@ export interface AriaBubble {
    *  that right-aligns the owner renders two templates and collapses one. */
   notUser: boolean;
   notAria: boolean;
+  /** What a screen reader says for the row: the author, then the words. A
+   *  screen that draws the speaker only as a bubble and a side of the screen
+   *  (`messageStyle: 'userBubble'`) has no visible author line to read, and
+   *  without this the owner's question and Aria's reply sound the same. */
+  spoken: string;
   link1Label: string; link1Url: string; link1Hidden: boolean;
   link2Label: string; link2Url: string; link2Hidden: boolean;
   link3Label: string; link3Url: string; link3Hidden: boolean;
@@ -561,9 +566,23 @@ export function disclosedLabel(link: { label: string; url: string }): string {
  *  machinery dies. (Measured: 20 tests, every one of them about polling.) */
 export { stripMarkdown };
 
+/** The screen-reader line for a bubble — see `AriaBubble.spoken`. */
+export function spokenOf(who: string, content: string): string {
+  return who ? `${who}: ${content}` : content;
+}
+
+/** A persisted transcript from before `spoken` existed, made whole. A `$item.`
+ *  path missing on a row does not substitute, so a row without the field would
+ *  announce the literal binding until the next rebuild replaced it. */
+export function withSpoken(bubbles: AriaBubble[]): AriaBubble[] {
+  return bubbles.every((b) => typeof b.spoken === "string")
+    ? bubbles
+    : bubbles.map((b) => (typeof b.spoken === "string" ? b : { ...b, spoken: spokenOf(b.who, b.content) }));
+}
+
 /** A greeting or optimistic bubble: no links, all slots defaulted. */
 export function plainBubble(id: string, role: string, who: string, content: string): AriaBubble {
-  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", ...linkFieldsOf("", role) };
+  return { id, role, who, content, notUser: role !== "USER", notAria: role === "USER", spoken: spokenOf(who, content), ...linkFieldsOf("", role) };
 }
 
 /** Server transcript → bubbles. USER text is literal; ASSISTANT replies are
@@ -644,6 +663,7 @@ function bubbleOf(id: string, role: string, who: string, raw: string, writing: b
     content,
     notUser: role !== "USER",
     notAria: role === "USER",
+    spoken: spokenOf(who, content),
     ...linkFieldsOf(prose, role),
   };
 }
@@ -2004,7 +2024,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // a rehydrated turn there was no ladder at all, leaving "Aria is
         // typing…" on screen with nothing ever fetching the answer.
         if (s._pending || s.status === "sending") {
-          const held: AriaChatState = { ...s, status: "sending", prompts: [] };
+          const held: AriaChatState = { ...s, status: "sending", prompts: [], messages: withSpoken(s.messages) };
           return cadence(held, o.poll ? o.poll.fastMs : null, null);
         }
         // …but the self-kick pass runs BEFORE the pack is stashed, so the
@@ -2013,7 +2033,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // still the only thing on screen — `prompts` is already recomputed
         // here, and a chip pack that localizes beside a greeting that does not
         // is the visible half of the same bug.
-        const messages = isGreetingOnly(s.messages) ? greetingOnly() : s.messages;
+        const messages = isGreetingOnly(s.messages) ? greetingOnly() : withSpoken(s.messages);
         return { ...s, status: "ready", messages, prompts: promptsFor(messages, promptList()) };
       }
       try {

package/templates/gym-fitness-owner/tier5-src/_shared/collection-contract.ts

@@ -14,6 +14,9 @@ export interface CollectionConfig {
   searchPlaceholder?: string;
   sortLabels?: { default: string; az: string; za: string };
   metadata?: string[];
+  /** Numeric 0–5 row field rendered as a Rating (accessible "N out of 5") instead of
+   *  folding a "★★★★☆" glyph string into the metadata line, so screen readers get a value. */
+  rating?: string;
   sectioned?: boolean;
   view: 'list' | 'grid';
   backendQuery?: boolean;
@@ -58,7 +61,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
   himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Redeem' } },
-  himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author', 'stars'], view: 'list' },
+  himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author'], rating: 'rating', view: 'list' },
   himiBrandedPortfolio: { rows: 'projects', title: 'title', subtitle: 'subtitle', image: 'image', view: 'grid', gridImageHeight: 180 },
   himiBrandedInvoices: { rows: 'invoices', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedBadges: { rows: 'badges', title: 'name', subtitle: 'description', view: 'grid' },