@wix/himalaya-cli 0.1583.0 → 0.1585.0

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

@@ -1,3 +1,4 @@
+import { descriptionBody } from "../_shared/rich-body.js";
 import { defineService } from "@himalaya/state";
 import { LOADING, loaded, loadFailed, needsSignIn, type LoadFlags } from "../_shared/branded-load-state.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
@@ -54,7 +55,7 @@ const svc = defineService<S, { reset: (s: S) => S; load: (s: S, arg?: unknown) =
           if (!channel || !video || video.status !== "VISIBLE") next = unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));
           else {
             next.title = video.title ?? "";
-            next.description = video.description ?? "";
+            next.description = descriptionBody(video.description).bodyText;
             if (video.content?.status !== "READY") next = isVideoProcessing(video) ?
               unavailable(next, "processing", copyParam("video.processingText", "Video is processing. Try again later.")) :
               unavailable(next, "unavailable", copyParam("video.unavailableText", "This video is unavailable."));

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

@@ -35,8 +35,10 @@ import {
   type EventRow,
 } from "../_shared/himi-events";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
+import { eventPageUrlOf, eventStatus, registrationKindOf, registrationUi, registrationUrlOf, type RegistrationKind } from "../_shared/event-registration.js";
+export { eventPageUrlOf, registrationKindOf, registrationUrlOf, type RegistrationKind };
 import { openRichLink } from "../_shared/rich-content-link.js";
-import { richBody } from "../_shared/rich-body.js";
+import { descriptionBody } from "../_shared/rich-body.js";
 import { mayUseRegularTicketCheckout } from "../_shared/iap-attendance.js";
 import { ATTENDANCE_INITIAL, ATTENDANCE_NOT_HYDRATED, createAttendancePurchase, type AttendancePurchaseFields } from "../_shared/iap-attendance-purchase.js";
 import { resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
@@ -88,9 +90,6 @@ interface TicketTierRow {
   notAvailable?: boolean;
 }
 
-/** Registration CTA kind derived from the event's registration/eventType. */
-export type RegistrationKind = "rsvp" | "tickets" | "external" | "none";
-
 // Offline-first (data-offline): the event detail is a read-through single-item read —
 // it shares the `events` entity written by the list, and also write-throughs its own
 // fetched row so a deep-linked detail is cached for the next offline open. On a failed
@@ -302,7 +301,7 @@ function loadedTiers(defs: WixAvailableTicket[]): { rows: TicketTierRow[]; ticke
       const ticket = tickets.get(row.ticketDefinitionId ?? row.id);
       if (!ticket) return { ...row, quantity: 0, description: "", feeNote: "", policy: "", noPolicy: true, notAvailable: !row.available, notGuestPrice: !row.isGuestPrice, maxQuantity: 0 };
       const policy = (ticket as unknown as { policy?: string; policyText?: string }).policyText || (ticket as unknown as { policy?: string }).policy || "";
-      return { ...row, quantity: 0, description: ticket.description || "", feeNote: ((ticket as unknown as { wixFeeConfig?: { type?: string }; feeType?: string }).wixFeeConfig?.type ?? (ticket as unknown as { feeType?: string }).feeType) === "FEE_ADDED_AT_CHECKOUT" ? detailCopy("event.serviceFee", "+ ticket service fee") : "", policy, noPolicy: !policy, notAvailable: !row.available, notGuestPrice: !row.isGuestPrice, priceAmount: row.priceAmount ?? Number(ticket.price?.amount ?? 0), rowLimit: row.available ? ticket.limitPerCheckout ?? 99 : 0, maxQuantity: row.available ? ticket.limitPerCheckout ?? 99 : 0 };
+      return { ...row, quantity: 0, description: descriptionBody(ticket.description).bodyText, feeNote: ((ticket as unknown as { wixFeeConfig?: { type?: string }; feeType?: string }).wixFeeConfig?.type ?? (ticket as unknown as { feeType?: string }).feeType) === "FEE_ADDED_AT_CHECKOUT" ? detailCopy("event.serviceFee", "+ ticket service fee") : "", policy, noPolicy: !policy, notAvailable: !row.available, notGuestPrice: !row.isGuestPrice, priceAmount: row.priceAmount ?? Number(ticket.price?.amount ?? 0), rowLimit: row.available ? ticket.limitPerCheckout ?? 99 : 0, maxQuantity: row.available ? ticket.limitPerCheckout ?? 99 : 0 };
     });
     return { rows, tickets };
 }
@@ -451,29 +450,6 @@ function calendarFallbackUrl(s: S, end: number): string {
  *  shortDescription: REGISTRATION fills eventType, which skips the query enrichment that used to supply them. */
 export const EVENT_DETAIL_FIELDSETS: WixEventFieldset[] = ["DETAILS", "TEXTS", "REGISTRATION", "URLS", "FORM", "AGENDA"];
 
-/** Map registration status and decoded eventType onto the CTA variant. The decoded
- *  `eventType` already folds registration.type / registration.initialType /
- *  the legacy flat `type` (decodeEvent, #478). Without a recognized type or
- *  status there is no registration action to offer. */
-export function registrationKindOf(e: WixEvent): RegistrationKind {
-  const raw = e as unknown as { registration?: { type?: string; initialType?: string; status?: string } };
-  const value = (raw.registration?.type ?? e.eventType ?? raw.registration?.initialType ?? "").toUpperCase();
-  if (value === "NONE" || value.includes("NO_REGISTRATION")) return "none";
-  // Open statuses select the footer action, so they must also select the
-  // inventory read and action guards when type metadata is absent or stale.
-  switch (raw.registration?.status?.toUpperCase()) {
-    case "OPEN_TICKETS": return "tickets";
-    case "OPEN_EXTERNAL": return "external";
-    case "OPEN_RSVP":
-    case "OPEN_RSVP_WAITLIST_ONLY":
-    case "SCHEDULED_RSVP": return "rsvp";
-  }
-  if (value.includes("EXTERNAL")) return "external";
-  if (value.includes("TICKET")) return "tickets";
-  if (value.includes("RSVP")) return "rsvp";
-  return "none";
-}
-
 function detailCopy(key: string, fallback: string): string { return copyParam(key, fallback); }
 
 function detailDate(e: WixEvent): { line: string; zone: string; start: number; end: number } {
@@ -536,69 +512,17 @@ function detailPlace(e: WixEvent): { value: string; mapUrl: string; hideMapTap:
   return { value, mapUrl: mapped, hideMapTap: !mapped, icon: "location" };
 }
 
-function eventStatus(e: WixEvent): string {
-  const raw = e as unknown as { status?: string };
-  return (raw.status ?? e.eventStatus ?? "").toUpperCase();
-}
-
-function registrationUi(e: WixEvent, now: number): { state: string; label: string; action: string; caption: string; notice: string } {
-  const raw = e as unknown as { registration?: { status?: string; registrationPaused?: boolean; registrationDisabled?: boolean; allowedGuestTypes?: string; rsvp?: { startDate?: string }; tickets?: { soldOut?: boolean }; external?: { url?: string } }; form?: { messages?: { registrationClosed?: { message?: string; exploreEventsActionLabel?: string }; ticketsUnavailable?: { message?: string; exploreEventsActionLabel?: string } } } };
-  const r = raw.registration ?? {};
-  const status = eventStatus(e);
-  const type = registrationKindOf(e);
-  if (status === "CANCELED") return { state: "notice", label: "", action: "", caption: "", notice: detailCopy("event.canceledNotice", "This event was canceled.") };
-  if (status === "ENDED") return { state: "notice", label: "", action: "", caption: "", notice: detailCopy("event.endedNotice", "This event has ended.") };
-  if (type === "none" || r.registrationDisabled) return { state: "none", label: "", action: "", caption: "", notice: "" };
-  const ownerClosed = raw.form?.messages?.registrationClosed?.message;
-  const ownerSold = raw.form?.messages?.ticketsUnavailable?.message;
-  if (["CLOSED_AUTOMATICALLY", "CLOSED_MANUALLY"].includes(r.status || "") || r.registrationPaused) return { state: "notice", label: "", action: "", caption: "", notice: ownerClosed || detailCopy("event.closedNotice", "Registration is closed.") };
-  if (type === "tickets" && r.tickets?.soldOut) return { state: "notice", label: "", action: "", caption: "", notice: ownerSold || detailCopy("event.soldOutNotice", "Tickets are sold out.") };
-  if (r.status === "SCHEDULED_RSVP") return { state: "scheduled", label: detailCopy("event.rsvpCta", "RSVP"), action: "", caption: detailCopy("event.opensCaption", "RSVP opens {date}.").replace("{date}", r.rsvp?.startDate ? formatWeekdayDateTime(new Date(r.rsvp.startDate)) : ""), notice: "" };
-  if (r.status === "OPEN_RSVP_WAITLIST_ONLY") return { state: "waitlist", label: detailCopy("event.waitlistCta", "Join Waitlist"), action: "himi.open", caption: detailCopy("event.fullCaption", "This event is full."), notice: "" };
-  if (r.status === "OPEN_TICKETS" || type === "tickets") return { state: "tickets", label: detailCopy("event.ticketsCta", "Buy Tickets"), action: "openTickets", caption: "", notice: "" };
-  if (r.status === "OPEN_EXTERNAL" || type === "external") return registrationUrlOf(e)
-    ? { state: "external", label: detailCopy("event.externalCta", "Register"), action: "openRegistration", caption: "", notice: "" }
-    : { state: "none", label: "", action: "", caption: "", notice: "" };
-  if (type === "rsvp" && r.status === "OPEN_RSVP") return { state: "rsvp", label: detailCopy("event.rsvpCta", "RSVP"), action: "himi.open", caption: "", notice: "" };
-  if (r.status === "OPEN_RSVP" || (type === "rsvp" && !r.status)) return { state: "rsvp", label: detailCopy("event.rsvpCta", "RSVP"), action: "himi.open", caption: "", notice: "" };
-  void now;
-  return { state: "none", label: "", action: "", caption: "", notice: "" };
-}
-
-/** External registration URL / event page URL from the raw payload ("" when absent). */
-export function registrationUrlOf(e: WixEvent): string {
-  const raw = e as unknown as {
-    registration?: { external?: { registration?: string; url?: string } };
-    eventPageUrl?: { base?: string; path?: string } | string;
-  };
-  const external = raw.registration?.external?.registration ?? raw.registration?.external?.url;
-  if (typeof external === "string" && /^https?:\/\//i.test(external)) return external;
-  return eventPageUrlOf(e);
-}
-
 /** Event slug for createRedirectSession({ eventsCheckout }) — "" when absent. */
 export function eventSlugOf(e: WixEvent): string {
   const slug = e.slug ?? (e as unknown as { slug?: string }).slug;
   return typeof slug === "string" ? slug.trim() : "";
 }
 
-/** The event's public page URL when the payload carries one ("" otherwise). */
-export function eventPageUrlOf(e: WixEvent): string {
-  const raw = e as unknown as { eventPageUrl?: { base?: string; path?: string } | string };
-  const page = raw.eventPageUrl;
-  if (typeof page === "string" && /^https?:\/\//i.test(page)) return page;
-  if (page && typeof page === "object" && typeof page.base === "string" && page.base) {
-    const path = typeof page.path === "string" ? page.path : "";
-    return `${page.base.replace(/\/$/, "")}${path && !path.startsWith("/") ? "/" : ""}${path}`;
-  }
-  return "";
-}
-
 /** 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);
+  const legacy = eventDescription({ ...e, description: undefined });
+  const { bodyJson, bodyText } = descriptionBody((e as unknown as { description?: unknown }).description, descriptionBody(legacy).bodyText);
   return { description: bodyText, descriptionJson: bodyJson };
 }
 
@@ -1132,6 +1056,8 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
             }).sort((a, b) => (eventStartMillis(a) ?? 0) - (eventStartMillis(b) ?? 0)).map((item) => ({ id: item.id ?? "", date: eventWhen(item) })).filter((item) => !!item.id);
           } catch { moreDates = []; optionalReadFailed = true; }
         }
+        const body = eventBody(e);
+        const shortDescription = descriptionBody(rawEvent.shortDescription).bodyText;
         const readyState = derive({
           ...s,
           status: "ready",
@@ -1153,9 +1079,9 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
           price,
           zone: dates.zone,
           mapUrl: place.mapUrl,
-          shortDescription: rawEvent.shortDescription || "",
-          noShortDescription: !rawEvent.shortDescription || rawEvent.shortDescription === eventBody(e).description,
-          noDescription: !eventBody(e).description && !eventBody(e).descriptionJson,
+          shortDescription,
+          noShortDescription: !shortDescription || shortDescription === body.description,
+          noDescription: !body.description && !body.descriptionJson,
           noDate: !dates.line,
           registrationState: registration.state,
           footerLabel: registration.label,
@@ -1177,7 +1103,7 @@ const svc: ReturnType<typeof defineService<S, DetailActions>> = defineService<S,
           noMoreDates: moreDates.length === 0,
           // The Ricos description when the event has one (its own text is the plain copy); the legacy
           // string fields otherwise.
-          ...eventBody(e),
+          ...body,
           image,
           hasImage: !!image,
           noImage: !image,

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

@@ -5,6 +5,8 @@ import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { normalizeEvent, type EventRow } from "../_shared/himi-events";
 import { offsetPage } from "../_shared/offset-page.js";
 import { copyParam } from "../_shared/himi-copy.js";
+import { eventPageUrlOf, registrationUi } from "../_shared/event-registration.js";
+import { share as shareSheet } from "@himalaya/share";
 
 // Offline-first (data-offline): the public events list is a read-through catalog —
 // paint the last-synced rows from the on-device store first (instant, works offline),
@@ -13,8 +15,37 @@ import { copyParam } from "../_shared/himi-copy.js";
 // (+ declared the `events` entity in its dataSchema) just falls back to today's
 // online-only path — the try/catch is the seam that keeps this shared bundle safe.
 const ENTITY = "events";
-async function readCached(): Promise<EventRow[]> {
-  try { return (await getAll(ENTITY)) as unknown as EventRow[]; } catch { return []; }
+interface ListEventRow extends EventRow {
+  dateBadge: string; noDateBadge: boolean;
+  /** This card's verb (Register / RSVP / Buy Tickets / Join Waitlist) from the SAME rule the detail uses; hidden when none applies. */
+  actionLabel: string; noAction: boolean;
+  /** The event page URL (when the payload carries one) for Share. */
+  shareUrl: string;
+}
+
+// The day monogram is a title initial for undated events. Only an actual calendar
+// date becomes a badge; derive it for old cached rows too, without a cache migration.
+// The month must be the three-letter abbreviation: rows cached by an older worker on an
+// Intl-less engine can hold a whole "11/10/2030, 12:00:00 PM" there.
+function withDateBadge(row: EventRow): ListEventRow {
+  const dated = typeof row.month === "string" && /^[A-Z]{3}$/.test(row.month)
+    && /^(?:[1-9]|[12]\d|3[01])$/.test(row.day);
+  const known = row as Partial<ListEventRow>;
+  // Rows cached by an older build carry no registration data: they show no verb until a refresh, never a wrong one.
+  return { ...row, dateBadge: dated ? `${row.day}\n${row.month}` : "", noDateBadge: !dated,
+    actionLabel: known.actionLabel ?? "", noAction: known.noAction ?? true, shareUrl: known.shareUrl ?? "" };
+}
+
+/** The card's action, from the event's own registration (REGISTRATION + URLS fieldsets). Cancelled, ended,
+ *  closed, sold-out and registration-less events offer none, so a card never promises "Register" the detail refuses. */
+function withRegistration(raw: WixEvent, row: ListEventRow): ListEventRow {
+  const ui = registrationUi(raw, Date.now());
+  const offers = ui.state !== "notice" && ui.state !== "none" && ui.state !== "scheduled" && !!ui.label;
+  return { ...row, actionLabel: offers ? ui.label : "", noAction: !offers, shareUrl: eventPageUrlOf(raw) };
+}
+
+async function readCached(): Promise<ListEventRow[]> {
+  try { return ((await getAll(ENTITY)) as unknown as EventRow[]).map(withDateBadge); } catch { return []; }
 }
 async function writeCached(rows: EventRow[]): Promise<void> {
   try { for (const r of rows) await upsert(ENTITY, r as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
@@ -22,12 +53,12 @@ async function writeCached(rows: EventRow[]): Promise<void> {
 
 interface S {
   status: "loading" | "ready";
-  query: string; all: EventRow[]; results: EventRow[]; emptyText: string; countLabel: string;
+  query: string; all: ListEventRow[]; results: ListEventRow[]; emptyText: string; countLabel: string;
   errored: boolean; notErrored: boolean; isLoading: boolean; notLoading: boolean; noEmpty: boolean;
   nextCursor?: string; complete?: boolean; total?: number; loadingMore?: boolean; pageError?: boolean; fromCache?: boolean;
 }
 let queryNow = new Date().toISOString();
-const svc = defineBackendCollection<S, EventRow>("himiEvents", {
+const svc = defineBackendCollection<S, ListEventRow>("himiEvents", {
   restorePagesOnLoad: true,
   state: { status: "loading", query: "", all: [], results: [], emptyText: "", countLabel: "", errored: false, notErrored: true,
     isLoading: true, notLoading: false, noEmpty: true },
@@ -62,10 +93,10 @@ const svc = defineBackendCollection<S, EventRow>("himiEvents", {
         ];
       }
       if (criteria.filter === "value:Past") filter["dateAndTimeSettings.startDate"] = { $lt: queryNow };
-      const res = await queryEvents({ limit: 50, offset: Number(cursor || 0), query: { filter,
+      const res = await queryEvents({ limit: 50, offset: Number(cursor || 0), fields: ["DETAILS", "REGISTRATION", "URLS"], query: { filter,
         sort: [{ fieldName: criteria.sort === "default" ? "dateAndTimeSettings.startDate" : "title", order: criteria.sort === "za" ? "DESC" : "ASC" }, { fieldName: "id", order: "ASC" }] } });
       const raw = res.events ?? [];
-      const items = raw.filter(row => !!row.id).map(normalizeEvent);
+      const items = raw.filter(row => !!row.id).map(row => withRegistration(row, withDateBadge(normalizeEvent(row))));
       await writeCached(items);
       const metadata = (res as { pagingMetadata?: { total?: number } }).pagingMetadata;
       return { items, ...offsetPage(cursor, raw.length, 50, metadata), metadata: { fromCache: false } };
@@ -78,6 +109,16 @@ const svc = defineBackendCollection<S, EventRow>("himiEvents", {
       fromCache: page.metadata?.fromCache === true, errored, notErrored: !errored, isLoading: loading, notLoading: !loading,
       noEmpty: true, countLabel: "", emptyText: errored ? copyParam("events.errorText", "Events could not be loaded.") : "" };
   },
+  actions: {
+    // Share a card's event: its title and date line, plus the event page when the payload carried one.
+    share: async (s, arg) => {
+      const id = typeof arg === "string" ? arg : String((arg as { id?: unknown } | undefined)?.id ?? "");
+      const row = s.results.find(item => item.id === id);
+      if (!row) return undefined;
+      try { await shareSheet({ subject: row.title, text: [row.title, row.dateLine].filter(Boolean).join(" — "), ...(row.shareUrl ? { url: row.shareUrl } : {}) }); } catch { /* the sheet is best-effort: nothing to undo */ }
+      return undefined;
+    },
+  },
 });
 svc.load();
 export { svc };

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

@@ -20,6 +20,7 @@ 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 { descriptionBody } from "../_shared/rich-body.js";
+import { PRODUCT_DETAIL_FIELDS, productInfoSections, type ProductInfoSection } from "../_shared/store-product-info.js";
 
 /** Live cart size (sum of line-item quantities) for the top-bar cart badge.
  *  Best-effort: a cart error just yields 0 (badge hidden), never fails the screen. */
@@ -201,6 +202,7 @@ interface S {
   wasPriceEmpty: boolean;
   noSku: boolean;
   skuLabel: string;
+  infoSections: ProductInfoSection[];
   returnPolicyBody: string;
   shippingInfoBody: string;
   noReturnPolicyBody: boolean;
@@ -535,6 +537,7 @@ const svc = onlineService<S, {
     wasPriceEmpty: false,
     skuLabel: "",
     noSku: true,
+    infoSections: [],
     returnPolicyBody: "",
     shippingInfoBody: "",
     noReturnPolicyBody: true,
@@ -625,7 +628,7 @@ const svc = onlineService<S, {
       try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
       s = { ...s, saved, saveHint: "",
         optionValidationTarget: "",
-        ...(id !== lastLoadedId ? { adding: false, added: false, shareHint: "", addedSheetPresented: false, quantity: 1, showOptionErrors: false, optionValidationRequest: 0, galleryIndex: 0, returnPolicyExpanded: false, shippingInfoExpanded: false } : {}) };
+        ...(id !== lastLoadedId ? { adding: false, added: false, shareHint: "", addedSheetPresented: false, quantity: 1, showOptionErrors: false, optionValidationRequest: 0, galleryIndex: 0, returnPolicyExpanded: false, shippingInfoExpanded: false, infoSections: [] } : {}) };
       // A fresh navigation into the product resets any quantity left over
       // from a previous visit to the same worker instance.
       if (!id) {
@@ -642,8 +645,8 @@ const svc = onlineService<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.
-      // Read both the Ricos description and choice-linked images; V3 omits these fields by default.
-      const live = getStoreProduct(id, ["DESCRIPTION", "PRODUCT_CHOICES_DISPLAY_IMAGE"], readOptions(arg)).then(
+      // Read the Ricos description, the Product Info sections (V3) and choice-linked images; V3 omits them by default.
+      const live = getStoreProduct(id, [...PRODUCT_DETAIL_FIELDS, "PRODUCT_CHOICES_DISPLAY_IMAGE"], readOptions(arg)).then(
         (r) => ({ ok: true as const, r }),
         (error) => ({ ok: false as const, error }),
       );
@@ -702,6 +705,7 @@ const svc = onlineService<S, {
           ...sale,
           commercePrice: sale.price,
           skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+          infoSections: productInfoSections(p, base.infoSections),
           returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
           shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
           ...productBody(p),
@@ -721,6 +725,12 @@ const svc = onlineService<S, {
       const quantity = parseQuantity(argValue(arg, "value"));
       return quantity ? derive({ ...s, quantity }) : s;
     },
+    toggleInfoSection: (s, arg) => {
+      const id = argValue(arg, "id");
+      if (!s.infoSections.some(section => section.id === id && !section.noTitle)) return s;
+      return derive({ ...s, infoSections: s.infoSections.map(section => section.id === id
+        ? { ...section, expanded: !section.expanded, collapsed: section.expanded } : section) });
+    },
     toggleReturnPolicy: s => derive({ ...s, returnPolicyExpanded: !s.returnPolicyExpanded }),
     toggleShippingInfo: s => derive({ ...s, shippingInfoExpanded: !s.shippingInfoExpanded }),
     // One chip row per option group. `group` is the descriptor slot ("1".."3");

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

@@ -5,7 +5,7 @@ import { defineService } from "@himalaya/state";
 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";
+import { richBody, descriptionBody } from "../_shared/rich-body.js";
 
 import { readAccess, assertReadAccess, readSignInFlags, NO_READ_SIGN_IN } from "../_shared/member-read.js";
 
@@ -62,7 +62,8 @@ const svc = defineService<S, {
         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 : ""));
+        const legacy = pp.contentText ? plain(pp.contentText)
+          : descriptionBody(typeof pp.content === "string" && !doc ? pp.content : "").bodyText;
         // 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);

package/templates/branded-lite/tier5-src/wix-spaces-member-detail/index.ts

@@ -14,7 +14,7 @@ import {
 } from "@himalaya/wix-members";
 import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-import { readAccess, assertReadAccess, readSignInFlags, NO_READ_SIGN_IN } from "../_shared/member-read.js";
+import { readAccess, assertReadAccess, readSignInFlags, NO_READ_SIGN_IN, type ReadAccess } from "../_shared/member-read.js";
 
 interface S extends PresenceFlags {
   signInRequired: boolean; noSignIn: boolean;
@@ -27,8 +27,8 @@ interface S extends PresenceFlags {
   photo: string;
   followHint: string;
   isFollowing: boolean;
-  followers: number;
-  following: number;
+  followers: number | null;
+  following: number | null;
   followLabel: string;
   followCount: string;
 }
@@ -42,8 +42,8 @@ function name(m: WixMember): string {
 function followLabelFor(isFollowing: boolean): string {
   return isFollowing ? "Following ✓" : "Follow";
 }
-function followCountFor(followers: number, following: number): string {
-  return followers + " Followers · " + following + " Following";
+function followCountFor(followers: number | null, following: number | null): string {
+  return followers === null || following === null ? "" : followers + " Followers · " + following + " Following";
 }
 
 const INITIAL: S = {
@@ -56,22 +56,24 @@ const INITIAL: S = {
     photo: "",
     followHint: "",
     isFollowing: false,
-    followers: 0,
-    following: 0,
+    followers: null,
+    following: null,
     followLabel: "Follow",
-    followCount: "0 Followers · 0 Following",
+    followCount: "",
     ...presence("loading"), ...NO_READ_SIGN_IN,
   };
 let loadVersion = 0;
+let loadedAccess: ReadAccess | undefined;
+const pendingFollows = new Set<string>();
 
 const svc = defineService<S, {
   prepare: (s: S) => S;
   load: (s: S) => Promise<S | undefined>;
-  toggleFollow: (s: S) => Promise<S>;
+  toggleFollow: (s: S) => Promise<S | undefined>;
 }>("spacesMemberDetail", {
   state: INITIAL,
   actions: {
-    prepare: (s) => ({ ...s, ...INITIAL }),
+    prepare: (s) => { loadedAccess = undefined; return { ...s, ...INITIAL }; },
     load: async (s): Promise<S | undefined> => {
       const version = ++loadVersion;
       await svc.prepare();
@@ -83,15 +85,15 @@ const svc = defineService<S, {
         const m = ((res as unknown as { member?: WixMember }).member) ?? (res as unknown as WixMember);
         const n = name(m);
 
-        // Each relationship read is best-effort: a 403 (site privacy config) must
-        // default rather than blank the screen.
-        let followers = 0;
-        let following = 0;
+        // A forbidden/missing aggregate is unknown, while the public profile
+        // remains readable. The descriptor collapses an empty count label.
+        let followers: number | null = null;
+        let following: number | null = null;
         try {
           const counts = await getFollowCounts(id);
           followers = counts.followers;
           following = counts.following;
-        } catch { /* default 0 / 0 */ }
+        } catch { /* unavailable counts stay hidden */ }
 
         let isFollowing = false;
         try {
@@ -100,6 +102,7 @@ const svc = defineService<S, {
 
         await assertReadAccess(access);
         if (version !== loadVersion) return undefined;
+        loadedAccess = access;
         return {
           ...INITIAL, status: "ready",
           id,
@@ -125,35 +128,48 @@ const svc = defineService<S, {
     // adjusts the follower total, then recomputes the label + count strings.
     toggleFollow: async (s) => {
       if (!s.id) return { ...s, followHint: "No member selected." };
-      if (s.isFollowing) {
-        try {
-          await unfollowMember(s.id);
-          const followers = Math.max(0, s.followers - 1);
-          return {
-            ...s,
-            isFollowing: false,
-            followers,
-            followLabel: followLabelFor(false),
-            followCount: followCountFor(followers, s.following),
-            followHint: "Unfollowed.",
-          };
-        } catch {
-          return { ...s, followHint: "Couldn't unfollow — try again." };
-        }
-      }
+      const access = loadedAccess;
+      if (!access || detailInputId() !== s.id) return undefined;
+      const pendingKey = JSON.stringify([access.tenant, access.member.scope, access.member.email, s.id]);
+      if (pendingFollows.has(pendingKey)) return undefined;
+      const version = loadVersion;
+      const current = () => version === loadVersion && access === loadedAccess && detailInputId() === s.id;
+      // Serialize this reader's writes to one member within this worker, including after
+      // navigation back to it. Another member or reader/site can act while this request is
+      // pending. Separate worker instances are isolated contexts and cannot share this guard.
+      pendingFollows.add(pendingKey);
       try {
-        await followMember(s.id);
-        const followers = s.followers + 1;
+        await assertReadAccess(access);
+        if (!current()) return undefined;
+        if (s.isFollowing) await unfollowMember(s.id);
+        else await followMember(s.id);
+        await assertReadAccess(access);
+        if (!current()) {
+          // The write is confirmed, but a reload overlapped it and may have read the old
+          // relationship. Same reader and member: re-read instead of leaving a stale label.
+          if (detailInputId() === s.id) await svc.load();
+          return undefined;
+        }
+        const isFollowing = !s.isFollowing;
+        const followers = s.followers === null ? null : Math.max(0, s.followers + (isFollowing ? 1 : -1));
         return {
           ...s,
-          isFollowing: true,
+          isFollowing,
           followers,
-          followLabel: followLabelFor(true),
+          followLabel: followLabelFor(isFollowing),
           followCount: followCountFor(followers, s.following),
-          followHint: "Following ✓",
+          followHint: isFollowing ? "Following ✓" : "Unfollowed.",
         };
       } catch {
-        return { ...s, followHint: "Couldn't follow — try again." };
+        // A failed write belongs only to the reader who loaded this profile.
+        // Compare explicitly: a context change discards this completion, while a
+        // failure for the same reader produces the retry hint below.
+        const now = await readAccess();
+        if (now.member.email !== access.member.email || now.member.scope !== access.member.scope || now.tenant !== access.tenant) return undefined;
+        if (!current()) return undefined;
+        return { ...s, followHint: s.isFollowing ? "Couldn't unfollow — try again." : "Couldn't follow — try again." };
+      } finally {
+        pendingFollows.delete(pendingKey);
       }
     },
   },