@wix/himalaya-cli 0.1398.0 → 0.1400.0

package/templates/nonprofit-cause-owner/tier5-src/_shared/aria-chat.ts

@@ -2570,6 +2570,14 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
   const duplicate = (s: AriaChatState, content: string): boolean =>
     isDuplicateSend(s, content) || inFlightSend === content;
 
+  const withWidgetQuery = (w: WidgetView, query: string): WidgetView => {
+    const needle = query.toLowerCase();
+    const suggestions = !needle ? w.options : w.options.filter((option) =>
+      `${option.title} ${option.subtitle} ${option.text}`.toLowerCase().includes(needle));
+    return { ...w, query, suggestions, suggestionsEmpty: suggestions.length === 0,
+      noMatches: !!needle && suggestions.length === 0 };
+  };
+
   /** Fold a freshly read server transcript into the observed-count marks.
    *  Takes the RAW messages, not the bubbles — see `countTurns`. */
   /** Carry the owner's SELECTIONS across a rebuild.
@@ -2625,7 +2633,10 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
     }
     // The line explaining an option that could not open is the answer to a
     // tap, and a poll is not a reason to take it back.
-    const kept = prev.notice ? { ...next, notice: prev.notice, noticeHidden: prev.noticeHidden } : next;
+    const withNotice = prev.notice ? { ...next, notice: prev.notice, noticeHidden: prev.noticeHidden } : next;
+    // The same ask retains the owner's search, just as it retains selection.
+    // Derive suggestions from the new canonical rows, never stale old objects.
+    const kept = next.kind === "AUTOCOMPLETE" ? withWidgetQuery(withNotice, prev.query) : withNotice;
     if (!prev.options.some((o, i) => o.selected !== next.options[i].selected)) return kept;
     const options = next.options.map((o, i) => ({ ...o, selected: prev.options[i].selected }));
     return reselect({ ...kept, options }, options);
@@ -2683,9 +2694,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
           const pictureUrl = isWixMediaHost(hostOf(item.imageUrl)) ? item.imageUrl : "";
           return {
             id: `o${i}`, value: item.id, title: item.title, subtitle: item.subtitle,
-            subtitleHidden: !item.subtitle, text: "", textHidden: true,
+            subtitleHidden: !item.subtitle, text: "", textHidden: true, badge: "", badgeHidden: true,
             pictureUrl, pictureHidden: !pictureUrl, buttonLabel: "", buttonHidden: true,
-            listText: "", listHidden: true, selected: false, respondText: "",
+            listText: "", benefits: [], listHidden: true, selected: false, respondText: "",
             actionUrl: "", actionScreenId: "", notSupportedText: "",
           };
         });
@@ -3499,7 +3510,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
     // explains the refusal.
     const limitText = limitReached ? limitReachedText(w.maxSelected) : "";
     const disabled = w.submitting || (w.requiresSelection && chosen === 0);
-    return {
+    const selected = {
       ...w,
       options,
       limitReached,
@@ -3508,6 +3519,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       primaryDisabled: disabled,
       primaryEnabled: !disabled,
     };
+    return w.kind === "AUTOCOMPLETE" ? withWidgetQuery(selected, w.query) : selected;
   };
 
   const impl: AriaChatCore = {
@@ -3713,6 +3725,10 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       const wasFast = s.status === "sending";
       // Read BEFORE the await, compared after: see `turnSeq`.
       const seq = turnSeq;
+      // Empty and failed reads retain the last good widget. Edits may have
+      // committed while this request was pending, so retain its current query.
+      const retainWidgetEdits = (): AriaChatState => s.widget.kind === "AUTOCOMPLETE" && committed
+        ? { ...s, widget: committed.widget } : s;
       try {
         const gm = await getConversationMessages(s._convId);
         const raw = messagesOf(gm);
@@ -3746,9 +3762,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         if (!raw.length) {
           if (slowed && live.takeActivity() === 0) {
             slowed = false;
-            return cadence(s, o.poll.fastMs, o.poll.streamMs ?? null);
+            return cadence(retainWidgetEdits(), o.poll.fastMs, o.poll.streamMs ?? null);
           }
-          return s;
+          return retainWidgetEdits();
         }
         const { messages, pending } = reconcile(server, s._pending, s._pendingAfter, you(), s._pendingId, s._pendingAttach ?? [], s._pendingRefs);
         // …but still never PAINT nothing over something. `messages` is only
@@ -3789,9 +3805,15 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         const withItems = await withWidgetItems(withJob);
         if (turnSeq !== seq || abortingEpochs.has(seq)) return undefined;
         // Slow the ladder the moment the turn is over; leave it alone otherwise.
+        // A query or selection may land while this transcript read is parked.
+        // Retain those latest edits only when the canonical widget is still the
+        // same ask; carrySelection resets them for new rows/kinds/options.
+        const withCurrentQuery = withItems.widget.kind === "AUTOCOMPLETE" && committed
+          ? { ...withItems, widget: carrySelection(withItems.widget, committed.widget) }
+          : withItems;
         if (ended && wasFast) {
           slowed = false;
-          return cadence(withItems, o.poll.idleMs, o.poll.fastMs);
+          return cadence(withCurrentQuery, o.poll.idleMs, o.poll.fastMs);
         }
         // The ladder runs slow only while the stream proves it is delivering.
         // A whole slow interval in which no frame changed anything is a stalled
@@ -3800,10 +3822,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // rate. No clock needed: this tick IS the interval.
         if (slowed && live.takeActivity() === 0) {
           slowed = false;
-          return cadence(withItems, o.poll.fastMs, o.poll.streamMs ?? null);
+          return cadence(withCurrentQuery, o.poll.fastMs, o.poll.streamMs ?? null);
         }
-        return withItems;
-
+        return withCurrentQuery;
       } catch {
         // A read that THREW is exactly as stale as one that resolved: if a turn
         // boundary moved on while it was in flight, returning `s` merges the
@@ -3811,7 +3832,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // guard above prevents on the success path. Only a still-current tick
         // may hold the ladder up by keeping the state as it is.
         if (turnSeq !== seq || abortingEpochs.has(seq)) return undefined;
-        return s;
+        return retainWidgetEdits();
       }
     },
 
@@ -3823,27 +3844,8 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
 
     widgetQuery: (s, arg) => {
       const q = typeof arg === "string" ? arg.trim() : firstString(arg?.value, arg?.text);
-      const w = s.widget;
-      const needle = q.toLowerCase();
-      // Match on everything the owner can SEE. Matching only `title` makes a
-      // subtitle that says "Downtown branch" unsearchable, which reads as the
-      // filter being broken rather than as a deliberate scope.
-      const suggestions = !needle
-        ? w.options
-        : w.options.filter((o) =>
-            `${o.title} ${o.subtitle} ${o.text}`.toLowerCase().includes(needle));
-      return {
-        ...s,
-        widget: {
-          ...w,
-          query: q,
-          suggestions,
-          suggestionsEmpty: suggestions.length === 0,
-          // Typed something and got nothing is a different state from having
-          // typed nothing at all, and says something different to the owner.
-          noMatches: !!needle && suggestions.length === 0,
-        },
-      };
+      // Match title, subtitle and text with the same semantics after a poll.
+      return { ...s, widget: withWidgetQuery(s.widget, q) };
     },
 
     widgetAnswer: (s, arg) => {
@@ -4026,7 +4028,11 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       // to answer for it. The clone's positional form can only say `value`, so
       // a row id there is tried only once no option has claimed it.
       const sectionId = typeof arg === "object" ? firstString(arg?.section) : "";
-      const option = sectionId ? undefined : w.options.find((o) => o.value === which);
+      // Display cards may have no wire selection value. Their descriptor names
+      // them by stable row id; selectable kinds retain the wire-value contract.
+      const option = sectionId ? undefined : w.kind === "VISUAL_DISPLAY"
+        ? w.options.find((o) => o.id === which) ?? w.options.find((o) => o.value === which)
+        : w.options.find((o) => o.value === which);
       const section = sectionId
         ? w.rows.find((r) => r.id === sectionId)
         : (option ? undefined : w.rows.find((r) => r.id === which));

package/templates/nonprofit-cause-owner/tier5-src/_shared/aria-widget-model.ts

@@ -59,14 +59,24 @@ export const WIDGET_KINDS: readonly WidgetKind[] = [
 
 /** One selectable row.
  *
- *  Every field is present and scalar, always — never optional, never null. That
- *  is not tidiness, it is a hard requirement of the renderer: `$item.`
- *  substitutes WHOLE prop values only, a missing field fails substitution for
- *  the entire row, and a non-scalar stringifies to `""`. The existing transcript
+ *  Display fields are scalar because ordinary `$item.` substitutions consume
+ *  whole scalar prop values. Benefit arrays instead use a nested repeater's
+ *  `itemsPath: "$item.benefits"`, which expands each benefit in its own scope. The existing transcript
  *  bubbles already carry fixed `link1..3Label/Url/Hidden` slots for exactly this
  *  reason (`aria-chat.ts`). A row that omits `subtitle` renders nothing at all
  *  rather than rendering without a subtitle. */
+/** One PLANS benefit. `color` is the semantic tint; the three `*Hidden` flags pick which of the
+ *  descriptor's statically tinted icons shows it, because a token prop cannot be `$item.`-bound
+ *  and still pass static token validation. */
+export interface WidgetBenefit {
+  text: string; icon: string; color: string; colorHex: string;
+  successHidden: boolean; plainHidden: boolean; customHidden: boolean;
+}
+
 export interface WidgetOption {
+  benefits?: WidgetBenefit[];
+  /** A visual variant card badge, absent on ordinary selectable rows. */
+  badge?: string;
   title: string;
   subtitle: string;
   text: string;
@@ -294,6 +304,7 @@ export function optionsOf(o: Record<string, unknown> | null): WidgetOption[] {
     const sections = objectsAt(opt, "sections");
     const first = sections[0] ?? null;
     return {
+      ...(badgeTextOf(opt) ? {badge: badgeTextOf(opt)} : {}),
       title: textAt(opt, "title") || textAt(first, "title"),
       subtitle: textAt(opt, "subtitle") || textAt(first, "subtitle"),
       text: textAt(opt, "text"),
@@ -306,6 +317,17 @@ export function optionsOf(o: Record<string, unknown> | null): WidgetOption[] {
       actionScreenId: stringAt(objectAt(action?.screen), "id"),
       notSupportedText: textAt(objectAt(action?.notSupported), "description"),
       listText: objectsAt(opt, "list").map((x) => textOf(x)).filter(Boolean).join("\n"),
+      ...(objectsAt(opt, "list").length ? { benefits: objectsAt(opt, "list").map((entry) => {
+        const spec = objectAt(entry.icon);
+        const name = stringAt(spec, "name");
+        const color = stringAt(spec, "color");
+        const hex = /^#[0-9a-f]{6}$/i.test(color);
+        const tint = hex ? "accentPrimary" : !name || name === "Confirm" ? "success" : "textPrimary";
+        return { text: stripMarkdown(textOf(entry)),
+          icon: name === "Gift" ? "gift" : name === "Send" ? "paper_plane" : "check",
+          color: tint, colorHex: hex ? color : "",
+          successHidden: tint !== "success", plainHidden: tint !== "textPrimary", customHidden: tint !== "accentPrimary" };
+      }) } : {}),
     };
   });
 }

package/templates/nonprofit-cause-owner/tier5-src/_shared/aria-widget-view.ts

@@ -12,10 +12,11 @@
 // every collapsible element carries its own `*Hidden` boolean — the same shape
 // the transcript bubbles already use for their three link slots.
 
-import type { NormalizedWidget, WidgetKind, WidgetOption } from "./aria-widget-model.js";
+import type { NormalizedWidget, WidgetBenefit, WidgetKind, WidgetOption } from "./aria-widget-model.js";
 import { SELECTED_TOKEN, VALUES_TOKEN, isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { oauthView } from "./aria-widget-oauth.js";
 import { composeGenericCard } from "./aria-generic-widget.js";
+import { formatNumber } from "./engine-intl.js";
 import { normalizeWidget } from "./aria-widget-kinds.js";
 import { scanEnvelopes, widgetsOfParts } from "./aria-widgets.js";
 
@@ -90,9 +91,12 @@ export interface WidgetOptionRow {
   /** The per-option button's label, already host-disclosed. */
   buttonLabel: string;
   buttonHidden: boolean;
-  /** PLANS' benefit list, joined — an array cannot ride on a templated row. */
+  /** PLANS benefit prose plus nested repeater rows carrying each icon. */
   listText: string;
+  benefits: WidgetBenefit[];
   listHidden: boolean;
+  badge: string;
+  badgeHidden: boolean;
   selected: boolean;
   /** This option's own button `respondText`, before substitution. Carried on
    *  the row because the row is what a tap identifies. */
@@ -114,6 +118,7 @@ export interface WidgetOptionRow {
 export interface WidgetSlice {
   label: string;
   value: number;
+  color: string;
 }
 
 /** One step of a TODO_PLAN, shaped for `Timeline`. */
@@ -218,6 +223,9 @@ export interface WidgetView {
    *  negation: an EMPTY chart is neither, so hiding each component on the
    *  other's flag left both on screen as blank boxes. */
   chartPieHidden: boolean;
+  chartRingHidden: boolean;
+  chartPlainPieHidden: boolean;
+  chartLegend: { label: string; color: string; marker: "dot"; value: string }[];
   chartSeriesHidden: boolean;
   chartEmptyHidden: boolean;
   /** Hide the async spinner. `asyncUntracked` is not the right flag: a TRACKED
@@ -526,7 +534,7 @@ export const NO_WIDGET: WidgetView = {
   optionsGridHidden: true, optionsListHidden: false,
   footerRowHidden: false, footerColumnHidden: true,
   slices: [], values: [], chartIsPie: false, chartIsSeries: false, chartKind: "",
-  chartPieHidden: true, chartSeriesHidden: true, chartEmptyHidden: true,
+  chartPieHidden: true, chartRingHidden: true, chartPlainPieHidden: true, chartLegend: [], chartSeriesHidden: true, chartEmptyHidden: true,
   asyncSpinnerHidden: true, itemsLoadingHidden: true,
   chartEmpty: true, description: "", descriptionHidden: true,
   steps: [], stepsEmpty: true, progress: 0, progressText: "",
@@ -574,11 +582,20 @@ function webOnly(url: string | undefined): string {
 /** One option, flattened. `selected` is passed in because it is worker state
  *  rather than anything the payload said — except on the first build, where the
  *  service's `isPreselected` seeds it. */
+/** An option that would draw nothing — every line stripped to empty, no picture, badge,
+ *  benefit or usable button — is dropped rather than rendered as a blank card or an
+ *  unlabeled row, and does not count toward `renderable`. */
+function hasVisibleContent(row: WidgetOptionRow): boolean {
+  return !!(row.title || row.subtitle || row.text || row.pictureUrl || row.badge
+    || row.benefits.length || !row.buttonHidden);
+}
+
 function optionRow(
   o: {
     value: string; title: string; subtitle: string; text: string;
     pictureUrl: string; buttonLabel: string; actionUrl: string; listText: string;
-    respondText: string; actionScreenId?: string; notSupportedText?: string;
+    respondText: string; actionScreenId?: string; notSupportedText?: string; badge?: string;
+    benefits?: WidgetBenefit[];
   },
   i: number,
   selected: boolean,
@@ -629,22 +646,33 @@ function optionRow(
   // RADIO_BUTTON option, which may carry `text` and no `title` at all, renders
   // as an empty row. So fold here rather than in each case's composition: the
   // raw `text` is still exported below for anything that wants both.
-  const hasTitle = !!o.title;
-  const rowTitle = hasTitle ? o.title : (o.text || o.subtitle);
+  // "Has a title" is judged on the STRIPPED title: a title of pure markup (`***`) falls back
+  // to the option's other prose exactly as a missing one does.
+  const strippedTitle = stripMarkdown(o.title);
+  const hasTitle = !!strippedTitle;
+  const rowTitle = hasTitle ? strippedTitle : stripMarkdown(o.text || o.subtitle);
   const rowSubtitle = hasTitle
-    ? (o.subtitle || o.text)
-    : (o.text && o.subtitle ? o.subtitle : "");
+    ? stripMarkdown(o.subtitle || o.text)
+    : stripMarkdown(o.text && o.subtitle ? o.subtitle : "");
+  // Every `*Hidden` flag follows the STRIPPED value: prose that is only markup
+  // (`---`, `***`, an image with empty alt) strips to "" and must not paint an
+  // empty node.
+  const text = stripMarkdown(o.text);
+  const listText = stripMarkdown(o.listText);
+  const benefits = (o.benefits ?? []).filter((b) => b.text);
+  const badge = stripMarkdown(o.badge || "");
   return {
     id: `o${i}`,
     value: o.value,
     title: rowTitle,
     subtitle: rowSubtitle, subtitleHidden: !rowSubtitle,
-    text: o.text, textHidden: !o.text,
+    text, textHidden: !text,
     pictureUrl, pictureHidden: !pictureUrl,
     // A label is not enough: the button has to be able to DO something — say
     // its text, go to its url, or explain why its screen is not here.
     buttonLabel, buttonHidden: !(buttonLabel && (respondText || actionUrl || actionScreenId)),
-    listText: o.listText, listHidden: !o.listText,
+    listText, benefits, listHidden: !listText && !benefits.length,
+    badge, badgeHidden: !badge,
     selected,
     respondText,
     actionUrl,
@@ -757,22 +785,27 @@ export function viewOf(
         // or screen destination, so that row must be removed.
         return !rawUrl || isWebUrl(rawUrl);
       })
-    : mappedOptions;
+        .filter(hasVisibleContent)
+    : mappedOptions.filter(hasVisibleContent);
 
   // CHART. `pieSlices` is the only shape the catalogue sends, but `chartType`
   // decides the component: a pie is a `DonutChart` at zero thickness, anything
   // else a `Chart` over the same magnitudes.
   const rawSlices = Array.isArray(extra.slices) ? (extra.slices as { label?: unknown; value?: unknown }[]) : [];
-  const slices: WidgetSlice[] = rawSlices.map((sl) => ({
-    label: typeof sl.label === "string" ? sl.label : "",
+  // The first-party chart cycles the same palette for sectors and legend dots.
+  const chartColors = ["ariaChartBlue", "ariaChartGreen", "ariaChartPurple", "ariaChartGray"];
+  const slices: WidgetSlice[] = rawSlices.map((sl, i) => ({
+    label: typeof sl.label === "string" ? stripMarkdown(sl.label) : "Other",
     value: typeof sl.value === "number" && Number.isFinite(sl.value) ? sl.value : 0,
+    color: chartColors[i % chartColors.length],
   }));
   const chartKind = typeof extra.chartType === "string" ? extra.chartType : "";
   // "doughnut" is the spelling the reference catalogue uses; "donut" is the
   // component's. Accepting only the component's spelling classified the real
   // payload as a SERIES and drew it as bars.
   const isPie = !chartKind || chartKind === "pie" || chartKind === "donut" || chartKind === "doughnut";
-  const description = typeof extra.description === "string" ? extra.description : "";
+  const isRing = chartKind === "donut" || chartKind === "doughnut";
+  const description = typeof extra.description === "string" ? stripMarkdown(extra.description) : "";
 
   // TODO_PLAN. `status` is the service's word; `done` is what `Timeline` draws.
   const rawItems = Array.isArray(extra.items) ? (extra.items as { label?: unknown; status?: unknown }[]) : [];
@@ -811,11 +844,16 @@ export function viewOf(
     // A single-select starts with at most ONE preselected choice, whatever the
     // payload marked — a radio group showing two ticks is a state the control
     // cannot otherwise reach.
+    // A choice with nothing to show (a markup-only title and no prose) is dropped like any
+    // other empty option; the preselection seed counts only choices that are drawn, and each
+    // keeps its original index so its id is stable.
     let seeded = false;
-    const choices = raw.map((o, j) => {
+    const choices: WidgetOptionRow[] = [];
+    raw.forEach((o, j) => {
+      if (!hasVisibleContent(optionRow(o, j, false, disclose, allowPicture))) return;
       const pre = !!o.preselected && (type !== "single-select" || !seeded);
       if (pre) seeded = true;
-      return optionRow(o, j, pre, disclose, allowPicture);
+      choices.push(optionRow(o, j, pre, disclose, allowPicture));
     });
     // A question with no choices and no free-text option of its own can still
     // be answered — text is the only thing it can take — so it gets the field.
@@ -947,6 +985,15 @@ export function viewOf(
     chartIsPie: w.kind === "CHART" && isPie && slices.length > 0,
     chartIsSeries: w.kind === "CHART" && !isPie && slices.length > 0,
     chartPieHidden: !(w.kind === "CHART" && isPie && slices.length > 0),
+    chartRingHidden: !(w.kind === "CHART" && isRing && slices.length > 0),
+    chartPlainPieHidden: !(w.kind === "CHART" && isPie && !isRing && slices.length > 0),
+    // Name AND value per row: the legend is the only place a slice's magnitude
+    // is spelled out, and the a11y contract reads both. The worker formats it,
+    // not each renderer, through the shared cross-engine formatter.
+    // Only the wedges the donut actually draws: every renderer drops a slice
+    // whose value is not positive, so its legend row would name nothing.
+    chartLegend: slices.filter((s) => s.value > 0).map(({ label, color, value }) => ({ label, color, marker: "dot" as const,
+      value: formatNumber(value) })),
     chartSeriesHidden: !(w.kind === "CHART" && !isPie && slices.length > 0),
     chartKind,
     chartEmpty: w.kind === "CHART" && slices.length === 0,