@wix/himalaya-cli 0.1145.0 → 0.1147.0

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

@@ -10,6 +10,8 @@ import {
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { formatDateMedium } from "../_shared/engine-intl.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): a collection's items are a public read-through against
 // the on-device `cms_items` store. Rows are cached per collection (the persisted key is
@@ -23,9 +25,10 @@ async function readCached(collectionId: string): Promise<ItemRow[]> {
   try {
     const prefix = `${collectionId}::`;
     const rows = await getAll(ENTITY);
+    // A row cached before [rico] #3372 carries no document fields: it shows its plain text.
     return rows
       .filter((r) => typeof r.id === "string" && r.id.startsWith(prefix))
-      .map((r) => ({ ...(r as unknown as ItemRow), id: (r.id as string).slice(prefix.length) }));
+      .map((r) => ({ bodyJson: "", hasBodyJson: false, bodyText: "", ...(r as unknown as Partial<ItemRow>), id: (r.id as string).slice(prefix.length) }) as ItemRow);
   } catch { return []; }
 }
 async function writeCached(collectionId: string, rows: ItemRow[]): Promise<void> {
@@ -41,6 +44,13 @@ interface ItemRow {
   initial: string;
   hasImage: boolean;
   noImage: boolean;
+  /** [rico] #3372 — the item's first RICH_CONTENT field as ONE document string for the row's RichContent; ""
+   *  when the collection has none, the item left it empty, or the encoder rejected it. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the row's plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** That field's plain text: the RichContent fallback. */
+  bodyText: string;
 }
 
 interface State {
@@ -86,10 +96,26 @@ function dateValue(value: unknown): string {
   return Number.isNaN(date.getTime()) ? raw : formatDateMedium(date);
 }
 
+/** [rico] #3372 — RICH_TEXT is HTML: its text, with the tags removed and the common entities decoded, so a
+ *  row never shows raw markup. A block or line-break tag separates words; an inline one (`W<i>ix</i>`) joins. */
+export function stripHtml(html: string): string {
+  return html
+    .replace(/<\/?(?:p|div|br|li|ul|ol|h[1-6]|tr|td|th|blockquote|section|article)\b[^>]*>/gi, " ")
+    .replace(/<[^>]+>/g, "")
+    .replace(/&nbsp;/g, " ")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, "\"")
+    .replace(/&#39;/g, "'")
+    .replace(/&amp;/g, "&")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
 function displayValue(value: unknown, type = ""): string {
   if (value == null) return "";
   if (type.includes("DATE")) return dateValue(value);
-  if (typeof value === "string") return value.trim();
+  if (typeof value === "string") return type.includes("RICH_TEXT") ? stripHtml(value) : value.trim();
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   if (Array.isArray(value)) return value.map((entry) => displayValue(entry)).filter(Boolean).slice(0, 3).join(", ");
   if (typeof value === "object") {
@@ -116,13 +142,16 @@ function imageValue(data: Record<string, unknown>, fields: CmsFieldDefinition[])
 function itemRow(item: WixDataItem, collection: CmsCollectionDefinition, index: number): ItemRow {
   const data = item.data ?? {};
   const primary = displayValue(data[collection.displayField], collection.fields.find((field) => field.key === collection.displayField)?.type);
+  // A RICH_CONTENT field renders as the row's document, never as a detail line.
   const details = collection.fields
-    .filter((field) => field.key !== collection.displayField && !field.type.includes("IMAGE"))
+    .filter((field) => field.key !== collection.displayField && !field.type.includes("IMAGE") && !field.type.includes("RICH_CONTENT"))
     .map((field) => ({ label: field.displayName, value: displayValue(data[field.key], field.type) }))
     .filter((entry) => entry.value)
     .slice(0, 2);
   const title = primary || copyTemplate("cmsCollection.itemFallbackTitle", "Item {n}", { n: index + 1 });
   const image = imageValue(data, collection.fields);
+  const rich = collection.fields.find((field) => field.type.includes("RICH_CONTENT"));
+  const { bodyJson, bodyText } = richBody(rich ? data[rich.key] : null, "", ROW_IMAGE_WIDTH);
   return {
     id: item.id || String(data._id ?? `${collection.id}-${index}`),
     title,
@@ -132,6 +161,9 @@ function itemRow(item: WixDataItem, collection: CmsCollectionDefinition, index:
     initial: (title[0] || "C").toUpperCase(),
     hasImage: Boolean(image),
     noImage: !image,
+    bodyJson,
+    hasBodyJson: bodyJson !== "",
+    bodyText,
   };
 }
 
@@ -202,6 +234,8 @@ let loadingCollectionId = "";
 const svc = defineService<State, {
   load: (state: State, arg?: unknown) => Promise<State>;
   search: (state: State, arg?: unknown) => State;
+  /** [rico] #3372 — a row RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (state: State, arg?: unknown) => Promise<State>;
 }>("himiBrandedCmsCollection", {
   state: initial,
   actions: {
@@ -255,6 +289,12 @@ const svc = defineService<State, {
         : state.all;
       return { ...state, rows, noRows: rows.length === 0, noEmpty: rows.length > 0, emptyText: query ? copyParam("cmsCollection.searchEmptyText", "No items match your search.") : copyParam("cmsCollection.emptyText", "This collection has no published items yet.") };
     },
+    // Only http(s), mailto and tel links reach open_url; the collection has no message line, so a refused
+    // link simply does nothing.
+    openLink: async (state, arg) => {
+      await openRichLink(arg);
+      return state;
+    },
   },
 });
 

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

@@ -5,12 +5,20 @@ import {
   type WixCategory,
   type WixQuestionEntry,
 } from "@himalaya/wix-faq";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 interface FaqQuestion {
   id: string;
   categoryId: string;
   question: string;
+  /** The PLAIN_TEXT answer: the RichContent fallback, and what shows with no trusted document. */
   answer: string;
+  /** [rico] #3372 — the RICH_CONTENT answer as ONE document string, used ONLY when its text matches the plain
+   *  answer (a legacy DraftJS record converts unreliably); "" otherwise. */
+  answerJson: string;
+  /** answerJson !== "" — gates the plain answer, because RichContent draws nothing for "". */
+  hasAnswerJson: boolean;
   sortOrder?: number;
   status: string;
 }
@@ -25,6 +33,8 @@ interface QuestionRow {
   id: string;
   title: string;
   answer: string;
+  answerJson: string;
+  hasAnswerJson: boolean;
   expanded: boolean;
 }
 
@@ -94,6 +104,9 @@ function parseStaticFaq(raw: unknown): FaqQuestion[] {
       categoryId: STATIC_CATEGORY.id,
       question,
       answer,
+      // The site's own pairs are plain strings: there is no document to render.
+      answerJson: "",
+      hasAnswerJson: false,
       sortOrder: out.length,
       status: "VISIBLE",
     });
@@ -129,6 +142,8 @@ function sectionsFor(state: Pick<FaqState, "categories" | "questions" | "query"
     id: question.id,
     title: question.question,
     answer: question.answer,
+    answerJson: question.answerJson,
+    hasAnswerJson: question.hasAnswerJson,
     expanded: expanded.has(question.id),
   });
   const sections = state.categories
@@ -213,8 +228,25 @@ async function allCategories(): Promise<FaqCategory[]> {
   return uniqueById(rows);
 }
 
-async function allQuestions(): Promise<FaqQuestion[]> {
-  const rows: FaqQuestion[] = [];
+/** The answer's text with every whitespace run collapsed to one space: PLAIN_TEXT and a document's plain text
+ *  may separate blocks differently ("\n" vs "\n\n"), and that is not a garbled conversion, but a space inside
+ *  the text is content ("New York" is not "NewYork"). */
+const normalizeSpace = (text: string): string => text.replace(/\s+/g, " ").trim();
+
+/** [rico] #3372 — the RICH_CONTENT answer as a document string, trusted ONLY when its text matches the
+ *  PLAIN_TEXT answer. Wix converts a legacy DraftJS answer to Ricos unreliably, and the plain answer is
+ *  the one a visitor has always been shown, so a document that disagrees with it is dropped. */
+function richAnswer(plain: string, rich: unknown): string {
+  // richBody encodes FIRST, so a document past the viewer's limits (too deep included) is rejected without an
+  // unbounded plain-text walk, and gives "". Answers render in a list, so their media are list-sized.
+  const { bodyJson, bodyText } = richBody(rich, "", ROW_IMAGE_WIDTH);
+  return bodyJson && normalizeSpace(bodyText) === normalizeSpace(plain) ? bodyJson : "";
+}
+
+/** Every question entry in one content format, following THAT query's own cursors: a cursor belongs to the
+ *  request that returned it, so the two formats never share one. */
+async function entriesIn(contentFormat: "PLAIN_TEXT" | "RICH_CONTENT"): Promise<WixQuestionEntry[]> {
+  const rows: WixQuestionEntry[] = [];
   const seen = new Set<string>();
   let cursor = "";
   do {
@@ -223,23 +255,41 @@ async function allQuestions(): Promise<FaqQuestion[]> {
         cursorPaging: { limit: PAGE_SIZE, ...(cursor ? { cursor } : {}) },
         filter: { status: { $in: ["VISIBLE", "UNKNOWN"] } },
       },
-      contentFormat: "PLAIN_TEXT",
+      contentFormat,
     });
-    rows.push(...(response.questionEntries ?? []).map((question: WixQuestionEntry) => ({
-      id: question.id ?? "",
-      categoryId: question.categoryId ?? "",
-      question: (question.question ?? "").trim(),
-      answer: (question.plainText ?? "").trim(),
-      ...(typeof question.sortOrder === "number" ? { sortOrder: question.sortOrder } : {}),
-      status: question.status ?? "UNKNOWN",
-    })).filter((question) =>
-      question.id && question.question && question.status.toUpperCase() !== "HIDDEN",
-    ));
+    rows.push(...(response.questionEntries ?? []));
     const next = response.pagingMetadata?.cursors?.next ?? "";
     if (!next || seen.has(next)) break;
     seen.add(next);
     cursor = next;
   } while (cursor);
+  return rows;
+}
+
+async function allQuestions(): Promise<FaqQuestion[]> {
+  // Both formats are read in parallel, each paged on its own. PLAIN_TEXT is the list; a RICH_CONTENT read
+  // that fails only costs the documents — every answer keeps its plain text.
+  const [plain, rich] = await Promise.all([
+    entriesIn("PLAIN_TEXT"),
+    entriesIn("RICH_CONTENT").catch(() => [] as WixQuestionEntry[]),
+  ]);
+  const richById = new Map(rich.map((question: WixQuestionEntry) => [question.id ?? "", question.richContent]));
+  const rows = plain.map((question: WixQuestionEntry) => {
+    const answer = (question.plainText ?? "").trim();
+    const answerJson = richAnswer(answer, richById.get(question.id ?? ""));
+    return {
+      id: question.id ?? "",
+      categoryId: question.categoryId ?? "",
+      question: (question.question ?? "").trim(),
+      answer,
+      answerJson,
+      hasAnswerJson: answerJson !== "",
+      ...(typeof question.sortOrder === "number" ? { sortOrder: question.sortOrder } : {}),
+      status: question.status ?? "UNKNOWN",
+    };
+  }).filter((question) =>
+    question.id && question.question && question.status.toUpperCase() !== "HIDDEN",
+  );
   return uniqueById(rows);
 }
 
@@ -308,6 +358,12 @@ const svc = defineService("himiBrandedFaq", {
         : [...state.expandedIds, id];
       return commit(ready({ ...state, expandedIds }));
     },
+    // [rico] #3372 — an answer RichContent's on_link: `{ url }` of the tapped link. Only http(s), mailto and
+    // tel links reach open_url; the FAQ has no message line, so a refused link simply does nothing.
+    openLink: async (state: FaqState, arg?: unknown) => {
+      await openRichLink(arg);
+      return state;
+    },
   },
 });
 

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

@@ -23,6 +23,8 @@ import { signedInEmail } from "../_shared/himi-account";
 import { initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 import { formatMonthDay } from "../_shared/engine-intl.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 interface FeedRow {
   id: string;
@@ -33,8 +35,15 @@ interface FeedRow {
   avatar: string;
   hasAvatar: boolean;
   noAvatar: boolean;
+  /** The post's plain text: RichContent's fallback, and what shows for a post with no Ricos document. */
   text: string;
-  /** First inline IMAGE node in the post content ("" for text-only posts). */
+  /** [rico] #3372 — a Ricos post's `content` as ONE document string for the row's RichContent; "" for a
+   *  DraftJS-blocks post, a lean one, or a document the encoder rejected. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the row's plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** First inline IMAGE node in the post content ("" for text-only posts). Shown only for a row with no
+   *  document: RichContent draws the document's images itself. */
   image: string;
   hasImage: boolean;
   noImage: boolean;
@@ -161,7 +170,10 @@ function feedRow(item: WixFeedItem, profiles: WixFeedProfile[]): FeedRow {
   const author = authorName(item, profiles);
   const count = Array.isArray(item.reactionsList) ? item.reactionsList.length : 0;
   const avatar = authorAvatar(item, profiles);
-  const image = contentImage(item);
+  // A Ricos post's plain text is the whole document's (every node level), not feedText's one-level read.
+  const { bodyJson, bodyText: text } = richBody(item.content, feedText(item), ROW_IMAGE_WIDTH);
+  // A Ricos post draws its own images in RichContent, so the separate row image would repeat the first one.
+  const image = bodyJson ? "" : contentImage(item);
   return {
     id: item.feedItemId || "",
     author,
@@ -169,7 +181,9 @@ function feedRow(item: WixFeedItem, profiles: WixFeedProfile[]): FeedRow {
     avatar,
     hasAvatar: !!avatar,
     noAvatar: !avatar,
-    text: feedText(item),
+    text,
+    bodyJson,
+    hasBodyJson: bodyJson !== "",
     image,
     hasImage: !!image,
     noImage: !image,
@@ -292,6 +306,8 @@ const svc = defineService<State, {
   filter: (state: State, arg?: unknown) => State;
   post: (state: State, arg?: unknown) => Promise<State>;
   react: (state: State, arg?: unknown) => Promise<State>;
+  /** [rico] #3372 — a row RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (state: State, arg?: unknown) => Promise<State>;
 }>("himiBrandedFeed", {
   state: derive({
     status: "loading",
@@ -367,6 +383,10 @@ const svc = defineService<State, {
         return state;
       }
     },
+    // Only http(s), mailto and tel links reach open_url; one that does not open says so in the message line.
+    openLink: async (state, arg) => ((await openRichLink(arg))
+      ? state
+      : { ...state, message: copyParam("feed.linkOpenFailed", "This link could not be opened.") }),
   },
 });
 

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

@@ -508,7 +508,12 @@ async function fetchBookingsSignal(arg: unknown): Promise<BookingsSignal> {
   try {
     const response = await queryServices({ query: { paging: { limit: 50 } } });
     return bookingsSignal(response.services ?? []);
-  } catch {
+  } catch (e) {
+    // The block collapses without a word on screen, so say why where an agent looks:
+    // the DEV panel's Console tab and `himi logs`. The status only — a Wix failure's
+    // message carries part of the upstream body, which may hold personal data.
+    const status = (e as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(e))?.[1];
+    console.warn("[home.bookings] services query failed; showcase hidden", status !== undefined ? `HTTP ${String(status)}` : "");
     return emptyBookingsSignal();
   }
 }

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

@@ -35,6 +35,8 @@ import {
 } from "../_shared/himi-events";
 import { initials } from "../_shared/himi-text.js";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 
 interface MapMarker {
   latitude: number;
@@ -88,7 +90,13 @@ interface S {
   initial: string;
   when: string;
   location: string;
+  /** The plain-text description: RichContent's fallback, the calendar notes, and what shows with no document. */
   description: string;
+  /** [rico] #3372 — the v3 Ricos `description` (read with `fields=TEXTS`) as ONE document string for
+   *  RichContent; "" when the event has none or the encoder rejected it. */
+  descriptionJson: string;
+  /** descriptionJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasDescriptionJson: boolean;
   image: string;
   hasImage: boolean;
   noImage: boolean;
@@ -212,6 +220,7 @@ function derive(s: S): S {
   const hasAttendees = s.attendeeAvatars.length > 0;
   return {
     ...s,
+    hasDescriptionJson: s.descriptionJson !== "",
     noMap: !s.mapUrl,
     hasMapMarkers,
     noMapMarkers: !hasMapMarkers,
@@ -357,6 +366,14 @@ async function attendeeSummary(eventId: string): Promise<{ goingLabel: string; a
   }
 }
 
+/** The description pair: the v3 Ricos `description` for RichContent, and its plain text. A string description
+ *  (or none) keeps `eventDescription`'s legacy read, with no document. */
+function eventBody(e: WixEvent): { description: string; descriptionJson: string } {
+  const legacy = eventDescription(e);
+  const { bodyJson, bodyText } = richBody((e as unknown as { description?: unknown }).description, legacy);
+  return { description: bodyText, descriptionJson: bodyJson };
+}
+
 /** getEvent returns the slim BASE fieldset (no `registration`); enrich from the
  *  richer query when the type is unknown — best-effort, find-by-id. */
 async function enrichRegistration(id: string, e: WixEvent): Promise<WixEvent> {
@@ -364,7 +381,11 @@ async function enrichRegistration(id: string, e: WixEvent): Promise<WixEvent> {
   try {
     const list = await queryEvents({ limit: 100 });
     const match = (list.events ?? []).find((candidate) => candidate.id === id);
-    return match ?? e;
+    if (!match) return e;
+    // [rico] #3372 — the query's rows are read without TEXTS, so they carry no Ricos `description`: keep the
+    // one this detail fetched, or the enrichment would silently drop the document on every real site.
+    const description = (e as unknown as { description?: unknown }).description;
+    return description === undefined ? match : ({ ...match, description } as unknown as WixEvent);
   } catch {
     return e;
   }
@@ -377,6 +398,8 @@ const svc = defineService<S, {
   openRegistration: (s: S) => Promise<S>;
   share: (s: S) => Promise<S>;
   addToCalendar: (s: S) => Promise<S>;
+  /** [rico] #3372 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: S, arg?: unknown) => Promise<S>;
 }>("himiEventDetail", {
   state: derive({
     status: "loading",
@@ -386,6 +409,8 @@ const svc = defineService<S, {
     when: "",
     location: "",
     description: "",
+    descriptionJson: "",
+    hasDescriptionJson: false,
     image: "",
     hasImage: false,
     noImage: true,
@@ -433,7 +458,8 @@ const svc = defineService<S, {
       const id = s.id || inputId();
       if (!id) return derive({ ...s, status: "ready", errored: true });
       try {
-        const res = await getEvent(id);
+        // TEXTS adds the Ricos `description` to the base fieldset (a bare read returns none).
+        const res = await getEvent(id, { fields: ["TEXTS"] });
         let e = ((res as unknown as { event?: WixEvent }).event ?? res) as WixEvent;
         e = await enrichRegistration(id, e);
         const attendees = await attendeeSummary(id);
@@ -460,7 +486,9 @@ const svc = defineService<S, {
           initial: (title.trim()[0] || "E").toUpperCase(),
           when: eventWhen(e),
           location: eventLocation(e),
-          description: eventDescription(e),
+          // The Ricos description when the event has one (its own text is the plain copy); the legacy
+          // string fields otherwise.
+          ...eventBody(e),
           image,
           hasImage: !!image,
           noImage: !image,
@@ -491,6 +519,9 @@ const svc = defineService<S, {
             initial: (title.trim()[0] || "E").toUpperCase(),
             when: cached.dateLine,
             location: cached.location,
+            // The cached list row carries no description: an offline retry of THIS event keeps the pair it
+            // already shows, and any other event's is cleared together, so neither half can linger alone.
+            ...(s.id === id ? {} : { description: "", descriptionJson: "" }),
             image: cached.image,
             hasImage: !!cached.image,
             noImage: !cached.image,
@@ -665,6 +696,12 @@ const svc = defineService<S, {
         return derive({ ...s, actionMessage: copyParam("event.calendarAddFailed", "Could not add this event to calendar."), isAddingCalendar: false });
       }
     },
+    // Only http(s), mailto and tel links reach open_url; a refused link, or one nothing opened, says so, and a
+    // link that opens clears an earlier message.
+    openLink: async (s, arg) => derive({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("event.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });
 svc.load();

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

@@ -10,6 +10,8 @@ import { cleanTitle } from "../_shared/himi-text.js";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { isProductSaved, toggleSavedProduct } from "../_shared/himi-store-saved.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): the detail is a public READ-THROUGH — when the live
 // product fetch fails (offline) fall back to the last-synced row the catalog cached
@@ -120,11 +122,27 @@ function optionsHint(groups: StoreOption[], selection: StoreOptionSelection): st
   return copyTemplate("product.optionsChoose", "Choose {options}", { options: missing.join(", ") });
 }
 
+/** The description pair. V3's `description` is a Ricos OBJECT (the HTML `plainText` would throw on it): it
+ *  becomes the RichContent document, and `plainDescription` (or the document's own text) the plain copy. A V1
+ *  `description` is an HTML string: stripped text, no document. */
+function productBody(p: StoreProduct): { description: string; descriptionJson: string } {
+  const raw = (p as { description?: unknown }).description;
+  const html = plainText(p.plainDescription || (typeof raw === "string" ? raw : ""));
+  const { bodyJson, bodyText } = richBody(typeof raw === "string" ? null : raw, html);
+  return { description: html || bodyText, descriptionJson: bodyJson };
+}
+
 interface S {
   status: "loading" | "ready" | "error";
   name: string;
   price: string;
+  /** The plain-text description: RichContent's fallback, and what shows with no document. */
   description: string;
+  /** [rico] #3372 — a V3 product's Ricos `description` (read with `fields=DESCRIPTION`) as ONE document string
+   *  for RichContent; "" for a V1 HTML description, none, or a document the encoder rejected. */
+  descriptionJson: string;
+  /** descriptionJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasDescriptionJson: boolean;
   image: string;
   /** FULL media gallery (media.items[] with the main image first) — the detail
    *  screen renders a Carousel over it when 2+ images exist. */
@@ -253,6 +271,7 @@ function derive(s: S): S {
   const overflow = groups.length > OPTION_SLOTS;
   return {
     ...s,
+    hasDescriptionJson: s.descriptionJson !== "",
     ...slotsOf(groups, s.selection),
     hasOptions: groups.length > 0,
     noOptions: groups.length === 0,
@@ -296,12 +315,16 @@ const svc = defineService<S, {
   setCartCount: (s: S, arg?: unknown) => S;
   share: (s: S) => Promise<S>;
   toggleSave: (s: S) => S;
+  /** [rico] #3372 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: S, arg?: unknown) => Promise<S>;
 }>("himiStoreProduct", {
   state: derive({
     status: "loading",
     name: "",
     price: "",
     description: "",
+    descriptionJson: "",
+    hasDescriptionJson: false,
     image: "",
     gallery: [],
     hasGallery: false,
@@ -354,7 +377,7 @@ const svc = defineService<S, {
       if (!id) {
         lastProduct = undefined;
         lastLoadedId = undefined;
-        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, emptyText: copyParam("product.notFoundText", "Product not found.") });
+        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
       }
       // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
       // of after it — it used to add a whole cart round trip before the page could paint.
@@ -365,7 +388,8 @@ const svc = defineService<S, {
       void cartCount.then((n) => { cartKnown = n; }, () => {});
       // The live product read goes out FIRST too — the local-db read below must never delay it.
       // Settled into a value so a failure is handled where it is awaited, never unhandled.
-      const live = getStoreProduct(id).then(
+      // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
+      const live = getStoreProduct(id, ["DESCRIPTION"]).then(
         (r) => ({ ok: true as const, r }),
         () => ({ ok: false as const }),
       );
@@ -424,7 +448,7 @@ const svc = defineService<S, {
           optionsUnknown: false,
           name,
           price: productPrice(p),
-          description: plainText(p.plainDescription || p.description),
+          ...productBody(p),
           image,
           gallery: productGallery(p),
           initial: (name[0] || "#").toUpperCase(),
@@ -455,6 +479,7 @@ const svc = defineService<S, {
           name,
           price: String(synced.subtitle ?? ""),
           description: "",
+          descriptionJson: "",
           image,
           initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
           cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
@@ -464,7 +489,7 @@ const svc = defineService<S, {
       }
       lastProduct = undefined;
       lastLoadedId = undefined;
-      return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, emptyText: copyParam("product.errorText", "Product could not load.") });
+      return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
     },
     // The stepper fires onChange with { value } on every tap; clamp 1–99 and
     // ignore unparsable/garbage args instead of silently zeroing the quantity.
@@ -519,6 +544,7 @@ const svc = defineService<S, {
         name,
         price: String(row.subtitle ?? ""),
         description: "",
+        descriptionJson: "",
         image: String(row.image ?? ""),
         gallery: [],
         initial: String(row.initial ?? "") || (name[0] || "#").toUpperCase(),
@@ -605,6 +631,11 @@ const svc = defineService<S, {
         return derive({ ...s, added: false, cartHint: copyParam("product.shareUnavailable", "Sharing is not available on this device.") });
       }
     },
+    // Only http(s), mailto and tel links reach open_url; a refused link, or one nothing opened, says so in the
+    // hint line (`added: false`, as for share, so it never renders inside the add-to-cart confirmation).
+    openLink: async (s, arg) => ((await openRichLink(arg))
+      ? s
+      : derive({ ...s, added: false, cartHint: copyParam("product.linkOpenFailed", "This link could not be opened.") })),
   },
 });
 

package/templates/branded-lite/tier5-src/wix-spaces-forum-post/index.ts

@@ -2,10 +2,22 @@
 // himalaya.input.id carries the post id; fetched via getPost. "Like"/"Unlike" react to the
 // post and "Post Comment" creates a real comment, via the Wix Forum + comments APIs.
 import { defineService } from "@himalaya/state";
-import { getPost, reactToPost, removePostReaction, createForumComment, type WixPost } from "@himalaya/wix-forum";
+import { getPost, reactToPost, removePostReaction, createForumComment, forumPostContent, type WixPost } from "@himalaya/wix-forum";
 import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 
-interface S extends PresenceFlags { status: "loading" | "ready"; id: string; title: string; author: string; subtitle: string; body: string; initial: string; likeHint: string; commentText: string; commentHint: string }
+interface S extends PresenceFlags {
+  status: "loading" | "ready"; id: string; title: string; author: string; subtitle: string;
+  /** The plain-text body (`contentText`): RichContent's fallback, and what shows when there is no document. */
+  body: string;
+  /** [rico] #3372 — the post's Ricos `content` as ONE document string for RichContent; "" when it has none or
+   *  the encoder rejected it. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  initial: string; likeHint: string; commentText: string; commentHint: string;
+}
 
 function plain(html?: string): string {
   return (html || "").replace(/<[^>]+>/g, "").replace(/\s+/g, " ").trim();
@@ -20,8 +32,10 @@ const svc = defineService<S, {
   unlike: (s: S) => Promise<S>;
   setComment: (s: S, a?: unknown) => S;
   comment: (s: S) => Promise<S>;
+  /** [rico] #3372 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: S, a?: unknown) => Promise<S>;
 }>("spacesForumPost", {
-  state: { status: "loading", id: "", title: "", author: "", subtitle: "", body: "", initial: "", likeHint: "", commentText: "", commentHint: "", ...presence("loading") },
+  state: { status: "loading", id: "", title: "", author: "", subtitle: "", body: "", bodyJson: "", hasBodyJson: false, initial: "", likeHint: "", commentText: "", commentHint: "", ...presence("loading") },
   actions: {
     load: async (s) => {
       const id = detailInputId();
@@ -29,13 +43,21 @@ const svc = defineService<S, {
       try {
         const res = await getPost(id);
         const p = ((res as unknown as { post?: WixPost }).post) ?? (res as unknown as WixPost);
-        const pp = p as unknown as { title?: string; contentText?: string; content?: string; writer?: { name?: string }; commentCount?: number; viewCount?: number };
+        const pp = p as unknown as { title?: string; contentText?: string; content?: unknown; writer?: { name?: string }; commentCount?: number; viewCount?: number };
         const author = pp.writer?.name || "Member";
         const bits: string[] = [];
         if (pp.commentCount != null) bits.push(`${pp.commentCount} comments`);
         if (pp.viewCount != null) bits.push(`${pp.viewCount} views`);
+        const doc = forumPostContent(p);
+        // A string `content` is legacy HTML only when it is not a serialized Ricos document, which must never
+        // surface as raw JSON text.
+        const legacy = plain(pp.contentText || (typeof pp.content === "string" && !doc ? pp.content : ""));
+        // The Ricos `content`, drawn by RichContent; bodyJson "" (none, or rejected) shows the plain body instead,
+        // which is the document's own text when there is no contentText.
+        const { bodyJson, bodyText } = richBody(doc, legacy);
+        const body = legacy || bodyText || "No content.";
         return { status: "ready", id, title: pp.title || "Post", author, subtitle: bits.join(" · "),
-          body: plain(pp.contentText || pp.content) || "No content.", initial: (author[0] || "#").toUpperCase(),
+          body, bodyJson, hasBodyJson: bodyJson !== "", initial: (author[0] || "#").toUpperCase(),
           likeHint: "", commentText: "", commentHint: "", ...presence("found") };
       } catch (e) { return { ...s, status: "ready", id, ...presenceAfterError(e) }; }
     },
@@ -59,6 +81,8 @@ const svc = defineService<S, {
       try { await createForumComment(s.id, text); return { ...s, commentText: "", commentHint: "Comment posted ✓" }; }
       catch { return { ...s, commentHint: "Couldn't post comment — try again." }; }
     },
+    // Only http(s), mailto and tel links reach open_url; one that does not open says so here.
+    openLink: async (s, a) => ((await openRichLink(a)) ? s : { ...s, commentHint: "This link could not be opened." }),
   },
 });
 svc.load();