@wix/himalaya-cli 0.1000.0 → 0.1002.0

package/templates/retail-store-owner/tier5-src/_shared/aria-widget-view.ts

@@ -13,6 +13,7 @@
 // the transcript bubbles already use for their three link slots.
 
 import type { NormalizedWidget, WidgetKind } from "./aria-widget-model.js";
+import { isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { composeGenericCard } from "./aria-generic-widget.js";
 import { normalizeWidget } from "./aria-widget-kinds.js";
 import { scanEnvelopes, widgetsOfParts } from "./aria-widgets.js";
@@ -333,7 +334,22 @@ export const NO_WIDGET: WidgetView = {
  *
  *  A button with no url is left alone: there is no destination to disclose. */
 function discloseButton(disclose: Disclose, label: string, url: string): string {
-  return url ? disclose({ label, url }) : label;
+  const text = stripMarkdown(label);
+  return url ? disclose({ label: text, url }) : text;
+}
+
+/** A destination this region is willing to EXPOSE.
+ *
+ *  `isWebUrl` guards the sink in `aria-chat.ts`, which stops a non-web scheme
+ *  being opened. It does not stop it being PAINTED: a button whose url is
+ *  `tel:` still has a label and a non-empty url, so it renders, and the owner
+ *  taps a control that silently does nothing. Asking the same question here
+ *  collapses the button instead — which is this screen's own rule, and the
+ *  reason the two checks are not redundant. Same predicate, so they cannot
+ *  drift into disagreeing about what a web url is. */
+function webOnly(url: string | undefined): string {
+  const t = (url ?? "").trim();
+  return isWebUrl(t) ? t : "";
 }
 
 /** One option, flattened. `selected` is passed in because it is worker state
@@ -451,7 +467,12 @@ export function viewOf(
   allowPicture: (url: string) => boolean = (url) => isDisclosedSame(disclose, url),
 ): WidgetView {
   const extra = w.extra as Record<string, unknown>;
-  const title = typeof extra.title === "string" ? extra.title : "";
+  // Markdown, flattened. Aria replies are markdown off the wire and there is no
+  // native markdown renderer, so a marker reaching a `Text` is painted
+  // literally — the catalogue sends `Upgrade to **Business Basic**`, and the
+  // card showed the asterisks while the bubble beside it did not. Same
+  // `stripMarkdown` the transcript uses, so the two cannot disagree.
+  const title = stripMarkdown(typeof extra.title === "string" ? extra.title : "");
   // Through the SAME media check as an option's picture. Counting `imageUrl`
   // towards renderability made an image-only VISUAL_DISPLAY reachable, and the
   // descriptor binds this path straight into an `Image` — so an off-Wix url
@@ -464,13 +485,13 @@ export function viewOf(
 
   const sections = Array.isArray(extra.sections) ? (extra.sections as Record<string, unknown>[]) : [];
   const rows: WidgetRow[] = sections.map((sec, i) => {
-    const subtitle = typeof sec.subtitle === "string" ? sec.subtitle : "";
+    const subtitle = stripMarkdown(typeof sec.subtitle === "string" ? sec.subtitle : "");
     return {
       // A stable id per row. Index-based on purpose: a section has no id of its
       // own, and the list is rebuilt wholesale on every tick, so there is
       // nothing for a content-derived key to preserve.
       id: `s${i}`,
-      title: typeof sec.title === "string" ? sec.title : "",
+      title: stripMarkdown(typeof sec.title === "string" ? sec.title : ""),
       subtitle,
       subtitleHidden: !subtitle,
     };
@@ -540,8 +561,11 @@ export function viewOf(
 
   const providerKey = typeof extra.providerKey === "string" ? extra.providerKey : "";
 
-  const primaryUrl = w.primary?.externalUrl ?? "";
-  const secondaryUrl = w.secondary?.externalUrl ?? "";
+  const primaryUrl = webOnly(w.primary?.externalUrl);
+  const secondaryUrl = webOnly(w.secondary?.externalUrl);
+  const prose = stripMarkdown(w.text);
+  const bottom = stripMarkdown(w.bottomText);
+  const badgeText = stripMarkdown(w.badge);
   // An UNKNOWN kind is the one case where a MISSING `respondText` must not
   // make a control inert.
   //
@@ -563,6 +587,15 @@ export function viewOf(
     || (generic ? (w.secondary?.label ?? "") : "");
   const primaryLabel = w.primary ? discloseButton(disclose, w.primary.label, primaryUrl) : "";
   const secondaryLabel = w.secondary ? discloseButton(disclose, w.secondary.label, secondaryUrl) : "";
+  // Whether each footer button is actually SHOWN — a label to read AND
+  // something to do (a web destination, or text to send). Defined once and
+  // used twice, by the `*Hidden` flags and by `renderable` below, because the
+  // two disagreeing is exactly the blank-card bug: `renderable` counted a bare
+  // label, so a widget whose only content was a button `webOnly` had just
+  // stripped (a `tel:` link with no `respondText`) stayed visible as an empty
+  // card with nothing inside it.
+  const primaryShown = !!(primaryLabel && (primaryUrl || primaryRespondText));
+  const secondaryShown = !!(secondaryLabel && (secondaryUrl || secondaryRespondText));
 
   // Hoisted out of the object literal below so `renderable` can see it. It
   // was computed inline, so naming it in the guard was a ReferenceError that
@@ -587,8 +620,10 @@ export function viewOf(
   // though they had something to show. Hiding a widget that has content is a
   // worse failure than the blank card this guard exists to prevent, so the
   // list has to match what the descriptor renders, not what I remembered.
-  const renderable = !!(w.text || w.bottomText || w.badge || title || imageUrl
-    || description || options.length || primaryLabel || secondaryLabel
+  // The STRIPPED prose, not the raw fields: those are what the card draws, and
+  // a reply of pure markup (`***`, an image-only `![](…)`) strips to nothing.
+  const renderable = !!(prose || bottom || badgeText || title || imageUrl
+    || description || options.length || primaryShown || secondaryShown
     || sections.length || slices.length || steps.length || questions.length
     || asyncMessage || treeJson);
 
@@ -651,10 +686,10 @@ export function viewOf(
       Object.entries(msgs).filter((kv): kv is [string, string] => typeof kv[1] === "string"),
     ),
     submitting: false,
-    text: w.text, textHidden: !w.text,
+    text: prose, textHidden: !prose,
     title, titleHidden: !title,
-    bottomText: w.bottomText, bottomTextHidden: !w.bottomText,
-    badge: w.badge, badgeHidden: !w.badge,
+    bottomText: bottom, bottomTextHidden: !bottom,
+    badge: badgeText, badgeHidden: !badgeText,
     imageUrl, imageHidden: !imageUrl,
     // Shown only when there is a LABEL to read and a DESTINATION to go to.
     //
@@ -671,9 +706,9 @@ export function viewOf(
     // #2605 hid a button that had nothing to DO. Now that `respondText` can be
     // sent, having something to SAY counts too — which is the `&& url` that
     // issue said this one would remove.
-    primaryLabel, primaryHidden: !(primaryLabel && (primaryUrl || primaryRespondText)), primaryUrl,
+    primaryLabel, primaryHidden: !primaryShown, primaryUrl,
     primaryRespondText,
-    secondaryLabel, secondaryHidden: !(secondaryLabel && (secondaryUrl || secondaryRespondText)), secondaryUrl,
+    secondaryLabel, secondaryHidden: !secondaryShown, secondaryUrl,
     secondaryRespondText,
     rows,
   };

package/templates/yoga-studio-owner/tier5-src/_shared/aria-chat.ts

@@ -42,7 +42,7 @@ import {
   type ConversationSummary,
 } from "@himalaya/wix-genie-chat";
 import { proseOfParts, scanEnvelopes, stripHidden } from "./aria-widgets.js";
-import { isWebUrl } from "./aria-widget-model.js";
+import { isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { NO_WIDGET, activeWidgetOf, asyncAdvanced, type SubtreeSlot, type WidgetOptionRow, type WidgetView }
   from "./aria-widget-view.js";
 import { substituteSelection } from "./aria-widget-model.js";
@@ -528,36 +528,16 @@ export function disclosedLabel(link: { label: string; url: string }): string {
   return `${link.label} (${host || UNKNOWN_HOST_LABEL})`;
 }
 
-/** Aria replies come back as markdown. There is no native markdown renderer
- *  (adding one is a CI-blocking parity change across both renderers), so
- *  normalize to clean plain text on-device: drop code fences, unwrap
- *  links/emphasis/headings, turn bullet markers into '•', collapse blank runs.
- *  Safe and idempotent. */
-export function stripMarkdown(src: string): string {
-  if (!src) return "";
-  let t = src;
-  // fenced code blocks -> keep inner text, drop the ``` fences
-  t = t.replace(/```[a-zA-Z0-9]*\n?/g, "").replace(/```/g, "");
-  // inline code `x` -> x
-  t = t.replace(/`([^`]+)`/g, "$1");
-  // images ![alt](url) -> alt ; links [text](url) -> text
-  t = t.replace(/!\[([^\]]*)\]\([^)]*\)/g, "$1");
-  t = t.replace(/\[([^\]]+)\]\([^)]*\)/g, "$1");
-  // bold/italic **x** *x* __x__ _x_ -> x
-  t = t.replace(/\*\*([^*]+)\*\*/g, "$1").replace(/\*([^*]+)\*/g, "$1");
-  t = t.replace(/__([^_]+)__/g, "$1").replace(/_([^_]+)_/g, "$1");
-  // ATX headings: '### Title' -> 'Title'
-  t = t.replace(/^#{1,6}\s+/gm, "");
-  // blockquotes '> ' -> ''
-  t = t.replace(/^>\s?/gm, "");
-  // unordered list markers '- ' / '* ' / '+ ' -> bullet
-  t = t.replace(/^\s*[-*+]\s+/gm, "• ");
-  // horizontal rules
-  t = t.replace(/^\s*([-*_])\1{2,}\s*$/gm, "");
-  // collapse 3+ newlines to a double
-  t = t.replace(/\n{3,}/g, "\n\n");
-  return t.trim();
-}
+/** `stripMarkdown` used to live here. It moved to `aria-widget-model.ts` —
+ *  which imports NOTHING, so the widget view can reach it without closing a
+ *  cycle back through this file. Re-exported rather than relocated silently,
+ *  so every consumer and test that names `aria-chat.ts` still resolves.
+ *
+ *  Imported AND re-exported, and that is not redundant: `export { x } from "y"`
+ *  does not bind `x` in this module's scope, and `toBubbles` below calls it —
+ *  written that way the identifier is unbound at runtime and the whole turn
+ *  machinery dies. (Measured: 20 tests, every one of them about polling.) */
+export { stripMarkdown };
 
 /** A greeting or optimistic bubble: no links, all slots defaulted. */
 export function plainBubble(id: string, role: string, who: string, content: string): AriaBubble {

package/templates/yoga-studio-owner/tier5-src/_shared/aria-widget-model.ts

@@ -167,6 +167,37 @@ export function objectAt(v: unknown): Record<string, unknown> | null {
   return typeof v === "object" && v !== null && !Array.isArray(v) ? (v as Record<string, unknown>) : null;
 }
 
+/** Aria replies come back as markdown. There is no native markdown renderer
+ *  (adding one is a CI-blocking parity change across both renderers), so
+ *  normalize to clean plain text on-device: drop code fences, unwrap
+ *  links/emphasis/headings, turn bullet markers into '•', collapse blank runs.
+ *  Safe and idempotent. */
+export function stripMarkdown(src: string): string {
+  if (!src) return "";
+  let t = src;
+  // fenced code blocks -> keep inner text, drop the ``` fences
+  t = t.replace(/```[a-zA-Z0-9]*\n?/g, "").replace(/```/g, "");
+  // inline code `x` -> x
+  t = t.replace(/`([^`]+)`/g, "$1");
+  // images ![alt](url) -> alt ; links [text](url) -> text
+  t = t.replace(/!\[([^\]]*)\]\([^)]*\)/g, "$1");
+  t = t.replace(/\[([^\]]+)\]\([^)]*\)/g, "$1");
+  // bold/italic **x** *x* __x__ _x_ -> x
+  t = t.replace(/\*\*([^*]+)\*\*/g, "$1").replace(/\*([^*]+)\*/g, "$1");
+  t = t.replace(/__([^_]+)__/g, "$1").replace(/_([^_]+)_/g, "$1");
+  // ATX headings: '### Title' -> 'Title'
+  t = t.replace(/^#{1,6}\s+/gm, "");
+  // blockquotes '> ' -> ''
+  t = t.replace(/^>\s?/gm, "");
+  // unordered list markers '- ' / '* ' / '+ ' -> bullet
+  t = t.replace(/^\s*[-*+]\s+/gm, "• ");
+  // horizontal rules
+  t = t.replace(/^\s*([-*_])\1{2,}\s*$/gm, "");
+  // collapse 3+ newlines to a double
+  t = t.replace(/\n{3,}/g, "\n\n");
+  return t.trim();
+}
+
 /** A display string, whether the wire wrote it bare or wrapped.
  *
  *  QUESTIONNAIRE writes every label as `{ text: "…" }` — question titles,

package/templates/yoga-studio-owner/tier5-src/_shared/aria-widget-view.ts

@@ -13,6 +13,7 @@
 // the transcript bubbles already use for their three link slots.
 
 import type { NormalizedWidget, WidgetKind } from "./aria-widget-model.js";
+import { isWebUrl, stripMarkdown } from "./aria-widget-model.js";
 import { composeGenericCard } from "./aria-generic-widget.js";
 import { normalizeWidget } from "./aria-widget-kinds.js";
 import { scanEnvelopes, widgetsOfParts } from "./aria-widgets.js";
@@ -333,7 +334,22 @@ export const NO_WIDGET: WidgetView = {
  *
  *  A button with no url is left alone: there is no destination to disclose. */
 function discloseButton(disclose: Disclose, label: string, url: string): string {
-  return url ? disclose({ label, url }) : label;
+  const text = stripMarkdown(label);
+  return url ? disclose({ label: text, url }) : text;
+}
+
+/** A destination this region is willing to EXPOSE.
+ *
+ *  `isWebUrl` guards the sink in `aria-chat.ts`, which stops a non-web scheme
+ *  being opened. It does not stop it being PAINTED: a button whose url is
+ *  `tel:` still has a label and a non-empty url, so it renders, and the owner
+ *  taps a control that silently does nothing. Asking the same question here
+ *  collapses the button instead — which is this screen's own rule, and the
+ *  reason the two checks are not redundant. Same predicate, so they cannot
+ *  drift into disagreeing about what a web url is. */
+function webOnly(url: string | undefined): string {
+  const t = (url ?? "").trim();
+  return isWebUrl(t) ? t : "";
 }
 
 /** One option, flattened. `selected` is passed in because it is worker state
@@ -451,7 +467,12 @@ export function viewOf(
   allowPicture: (url: string) => boolean = (url) => isDisclosedSame(disclose, url),
 ): WidgetView {
   const extra = w.extra as Record<string, unknown>;
-  const title = typeof extra.title === "string" ? extra.title : "";
+  // Markdown, flattened. Aria replies are markdown off the wire and there is no
+  // native markdown renderer, so a marker reaching a `Text` is painted
+  // literally — the catalogue sends `Upgrade to **Business Basic**`, and the
+  // card showed the asterisks while the bubble beside it did not. Same
+  // `stripMarkdown` the transcript uses, so the two cannot disagree.
+  const title = stripMarkdown(typeof extra.title === "string" ? extra.title : "");
   // Through the SAME media check as an option's picture. Counting `imageUrl`
   // towards renderability made an image-only VISUAL_DISPLAY reachable, and the
   // descriptor binds this path straight into an `Image` — so an off-Wix url
@@ -464,13 +485,13 @@ export function viewOf(
 
   const sections = Array.isArray(extra.sections) ? (extra.sections as Record<string, unknown>[]) : [];
   const rows: WidgetRow[] = sections.map((sec, i) => {
-    const subtitle = typeof sec.subtitle === "string" ? sec.subtitle : "";
+    const subtitle = stripMarkdown(typeof sec.subtitle === "string" ? sec.subtitle : "");
     return {
       // A stable id per row. Index-based on purpose: a section has no id of its
       // own, and the list is rebuilt wholesale on every tick, so there is
       // nothing for a content-derived key to preserve.
       id: `s${i}`,
-      title: typeof sec.title === "string" ? sec.title : "",
+      title: stripMarkdown(typeof sec.title === "string" ? sec.title : ""),
       subtitle,
       subtitleHidden: !subtitle,
     };
@@ -540,8 +561,11 @@ export function viewOf(
 
   const providerKey = typeof extra.providerKey === "string" ? extra.providerKey : "";
 
-  const primaryUrl = w.primary?.externalUrl ?? "";
-  const secondaryUrl = w.secondary?.externalUrl ?? "";
+  const primaryUrl = webOnly(w.primary?.externalUrl);
+  const secondaryUrl = webOnly(w.secondary?.externalUrl);
+  const prose = stripMarkdown(w.text);
+  const bottom = stripMarkdown(w.bottomText);
+  const badgeText = stripMarkdown(w.badge);
   // An UNKNOWN kind is the one case where a MISSING `respondText` must not
   // make a control inert.
   //
@@ -563,6 +587,15 @@ export function viewOf(
     || (generic ? (w.secondary?.label ?? "") : "");
   const primaryLabel = w.primary ? discloseButton(disclose, w.primary.label, primaryUrl) : "";
   const secondaryLabel = w.secondary ? discloseButton(disclose, w.secondary.label, secondaryUrl) : "";
+  // Whether each footer button is actually SHOWN — a label to read AND
+  // something to do (a web destination, or text to send). Defined once and
+  // used twice, by the `*Hidden` flags and by `renderable` below, because the
+  // two disagreeing is exactly the blank-card bug: `renderable` counted a bare
+  // label, so a widget whose only content was a button `webOnly` had just
+  // stripped (a `tel:` link with no `respondText`) stayed visible as an empty
+  // card with nothing inside it.
+  const primaryShown = !!(primaryLabel && (primaryUrl || primaryRespondText));
+  const secondaryShown = !!(secondaryLabel && (secondaryUrl || secondaryRespondText));
 
   // Hoisted out of the object literal below so `renderable` can see it. It
   // was computed inline, so naming it in the guard was a ReferenceError that
@@ -587,8 +620,10 @@ export function viewOf(
   // though they had something to show. Hiding a widget that has content is a
   // worse failure than the blank card this guard exists to prevent, so the
   // list has to match what the descriptor renders, not what I remembered.
-  const renderable = !!(w.text || w.bottomText || w.badge || title || imageUrl
-    || description || options.length || primaryLabel || secondaryLabel
+  // The STRIPPED prose, not the raw fields: those are what the card draws, and
+  // a reply of pure markup (`***`, an image-only `![](…)`) strips to nothing.
+  const renderable = !!(prose || bottom || badgeText || title || imageUrl
+    || description || options.length || primaryShown || secondaryShown
     || sections.length || slices.length || steps.length || questions.length
     || asyncMessage || treeJson);
 
@@ -651,10 +686,10 @@ export function viewOf(
       Object.entries(msgs).filter((kv): kv is [string, string] => typeof kv[1] === "string"),
     ),
     submitting: false,
-    text: w.text, textHidden: !w.text,
+    text: prose, textHidden: !prose,
     title, titleHidden: !title,
-    bottomText: w.bottomText, bottomTextHidden: !w.bottomText,
-    badge: w.badge, badgeHidden: !w.badge,
+    bottomText: bottom, bottomTextHidden: !bottom,
+    badge: badgeText, badgeHidden: !badgeText,
     imageUrl, imageHidden: !imageUrl,
     // Shown only when there is a LABEL to read and a DESTINATION to go to.
     //
@@ -671,9 +706,9 @@ export function viewOf(
     // #2605 hid a button that had nothing to DO. Now that `respondText` can be
     // sent, having something to SAY counts too — which is the `&& url` that
     // issue said this one would remove.
-    primaryLabel, primaryHidden: !(primaryLabel && (primaryUrl || primaryRespondText)), primaryUrl,
+    primaryLabel, primaryHidden: !primaryShown, primaryUrl,
     primaryRespondText,
-    secondaryLabel, secondaryHidden: !(secondaryLabel && (secondaryUrl || secondaryRespondText)), secondaryUrl,
+    secondaryLabel, secondaryHidden: !secondaryShown, secondaryUrl,
     secondaryRespondText,
     rows,
   };