@wix/himalaya-cli 0.1570.0 → 0.1571.0

package/templates/yoga-studio/tier5-src/himi-blog-post/index.ts

@@ -9,6 +9,7 @@ import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
 import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
+import { readAccess, assertReadAccess, readAccessDenied, readSignInFlags, NO_READ_SIGN_IN } from "../_shared/member-read.js";
 
 // Offline-first (data-offline): the post body is a public read-through — when the
 // live fetch fails (offline) fall back to the last-synced row the feed cached under
@@ -34,6 +35,7 @@ interface CommentRow {
 }
 
 interface S {
+  signInRequired: boolean; noSignIn: boolean; signInScreenId: string;
   status: "loading" | "ready" | "error";
   id: string;
   title: string;
@@ -214,6 +216,7 @@ function derive(s: S): S {
 }
 
 const baseState: S = derive({
+  ...NO_READ_SIGN_IN, signInScreenId: "himi_account",
   status: "loading",
   id: "",
   title: "",
@@ -280,23 +283,28 @@ async function cachedPostState(s: S, id: string): Promise<S> {
   });
 }
 
-async function loadPostState(s: S): Promise<S> {
+let loadVersion = 0;
+async function loadPostState(s: S): Promise<S | undefined> {
+  const version = ++loadVersion;
+  await svc.prepare();
+  const clean = { ...baseState, signInScreenId: s.signInScreenId };
   const id = inputId();
   if (!id) {
-    return derive({ ...s, status: "ready", emptyText: copyParam("blogPost.notFoundText", "Post not found.") });
+    return derive({ ...clean, status: "ready", emptyText: copyParam("blogPost.notFoundText", "Post not found.") });
   }
   try {
-    const [postResult, commentsResult] = await Promise.allSettled([getPost(id), listBlogComments(id)]);
-    if (postResult.status === "rejected") {
-      return cachedPostState(s, id);
-    }
+    const access = await readAccess();
+    const [postResult, commentsResult] = await Promise.allSettled([getPost(id, {}, { preserveAccessErrors: true }), listBlogComments(id)]);
+    if (postResult.status === "rejected") throw postResult.reason;
+    await assertReadAccess(access);
+    if (version !== loadVersion) return undefined;
     const post = (((postResult.value as unknown as { post?: WixPost }).post) ?? postResult.value) as PostWithExtras;
     const commentsUnavailable = commentsResult.status === "rejected";
     const comments = commentsResult.status === "fulfilled" ? commentsResult.value.map(toCommentRow) : [];
     const cover = imageUrl(post);
     const title = post.title || "Untitled post";
     return derive({
-      ...s,
+      ...clean,
       status: "ready",
       id,
       title,
@@ -319,14 +327,23 @@ async function loadPostState(s: S): Promise<S> {
       errorText: "",
       emptyText: "",
     });
-  } catch {
-    return cachedPostState(s, id);
+  } catch (error) {
+    const flags = await readSignInFlags(error);
+    const failed = derive({ ...clean, ...flags, status: "error", id, errorText: copyParam("blogPost.errorText", "This post could not load.") });
+    if (version !== loadVersion) return undefined;
+    if (readAccessDenied(error)) return failed;
+    const access = await readAccess();
+    const cached = await cachedPostState(clean, id);
+    try { await assertReadAccess(access); }
+    catch { return version === loadVersion ? failed : undefined; }
+    return version === loadVersion ? cached : undefined;
   }
 }
 
 const svc = defineService<S, {
-  load: (s: S, arg?: unknown) => Promise<S>;
-  retry: (s: S) => Promise<S>;
+  prepare: (s: S) => S;
+  load: (s: S, arg?: unknown) => Promise<S | undefined>;
+  retry: (s: S) => Promise<S | undefined>;
   like: (s: S) => Promise<S>;
   unlike: (s: S) => Promise<S>;
   toggleSave: (s: S) => S;
@@ -338,7 +355,12 @@ const svc = defineService<S, {
 }>("himiBlogPost", {
   state: baseState,
   actions: {
-    load: (s, arg) => { stashCopy(arg); return loadPostState(s); },
+    prepare: (s) => ({ ...s, ...baseState }),
+    load: (s, arg) => {
+      stashCopy(arg);
+      const target = (arg as { signInScreenId?: unknown })?.signInScreenId;
+      return loadPostState({ ...s, signInScreenId: target === "himi_sign_in" ? target : s.signInScreenId });
+    },
     retry: (s) => loadPostState({ ...s, status: "loading", errorText: "" }),
     like: async (s) => {
       if (!s.id) return derive({ ...s, actionMessage: copyParam("blogPost.noPostMessage", "No post selected.") });
@@ -409,5 +431,6 @@ const svc = defineService<S, {
   },
 });
 
+svc.prepare();
 svc.load();
 export { svc };

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

@@ -1,3 +1,5 @@
+import { descriptionBody } from "../_shared/rich-body.js";
+import { programDescription } from "../_shared/program-description.js";
 import { fetchMemberBookings, type MemberBookingRow } from "../_shared/member-bookings.js";
 import { hostSiteFromInput, hostedExploreCards, hostedHiddenFlags, type HostedExploreCard } from "../_shared/branded-lite-hosted.js";
 import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
@@ -675,11 +677,9 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
       .map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
-        const nestedDetails = desc && typeof desc === "object" ? (desc as { details?: string }).details : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
         const image = programImage(p);
-        const details = (p.settings?.description ?? nestedDetails ?? (typeof desc === "string" ? desc : "") ?? "")
-          .replace(/<[^>]+>/g, " ").replace(/\s+/g, " ").trim();
+        const details = descriptionBody(programDescription(p)).bodyText.replace(/\s+/g, " ").trim();
         return {
           id: p.id || name,
           name,

package/templates/yoga-studio/tier5-src/himi-branded-lite-program/index.ts

@@ -25,6 +25,9 @@ import { offlineWriteMessage, withOnlineWrites } from "../_shared/online-actions
 import { connectivity, defineService as registerService } from "@himalaya/state";
 import { programImage } from "../_shared/himi-media.js";
 import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
+import { descriptionBody } from "../_shared/rich-body.js";
+import { programDescription } from "../_shared/program-description.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
 import {
   getProgram,
   joinProgram,
@@ -54,8 +57,10 @@ interface State {
   /** Outcome line for the Enrol CTA — joined / pending approval / payment / failure. */
   actionMessage: string;
   name: string;
-  /** Full (untruncated) description, tags stripped. */
+  /** Full readable fallback, plus the bounded Ricos body when present. */
   description: string;
+  descriptionJson: string;
+  hasDescriptionJson: boolean;
   /** "N sections · M steps" / "Self-paced" — structure meta line. */
   meta: string;
   /** Formatted price when the payload carries one ("" for free/absent). */
@@ -101,6 +106,7 @@ function derive(state: State): State {
   const empty = state.status === "ready" && !state.name;
   return {
     ...state,
+    hasDescriptionJson: state.descriptionJson !== "",
     isLoading: state.status === "loading",
     notLoading: state.status !== "loading",
     isErrored: state.status === "error",
@@ -118,16 +124,6 @@ function titleOf(p: WixProgram): string {
   return cleanTitle(p.settings?.title ?? nested ?? p.title ?? p.details?.title) || copyParam("program.programFallbackName", "Program");
 }
 
-function detailsOf(p: WixProgram): string {
-  const desc = (p as { description?: unknown }).description;
-  const nested = desc && typeof desc === "object" ? (desc as { details?: string }).details : undefined;
-  const flat = typeof desc === "string" ? desc : undefined;
-  return (p.settings?.description ?? nested ?? flat ?? p.details?.description ?? "")
-    .replace(/<[^>]+>/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
 function metaOf(p: WixProgram): string {
   const summary = (p as { contentSummary?: { stepCount?: number; sectionCount?: number } }).contentSummary;
   const bits: string[] = [];
@@ -155,15 +151,17 @@ function priceOf(p: WixProgram): string {
 function ready(state: State, p: WixProgram | undefined): State {
   const stateOf = ((p?.state ?? p?.status ?? "") as string).toUpperCase();
   if (!p || stateOf === "DRAFT") {
-    return derive({ ...state, status: "ready", name: "", description: "", meta: "", priceLine: "", image: "", initial: "", emptyText: copyParam("program.emptyText", "This program is no longer available.") });
+    return derive({ ...state, status: "ready", name: "", description: "", descriptionJson: "", meta: "", priceLine: "", image: "", initial: "", emptyText: copyParam("program.emptyText", "This program is no longer available.") });
   }
   const name = titleOf(p);
   const image = programImage(p, WIX_DETAIL_IMAGE);
+  const body = descriptionBody(programDescription(p), copyParam("program.descriptionFallback", "Follow this program at your own pace."));
   return derive({
     ...state,
     status: "ready",
     name,
-    description: detailsOf(p) || copyParam("program.descriptionFallback", "Follow this program at your own pace."),
+    description: body.bodyText,
+    descriptionJson: body.bodyJson,
     meta: metaOf(p),
     priceLine: priceOf(p),
     image,
@@ -273,7 +271,7 @@ const pricing = commerce.pricing;
 const PRICING_NOT_HYDRATED = [
   "priceLine", "priceNote", "hidePriceRetry", "enrollDisabled", "enrollNote", "enrollHidden", "buyHidden", "buyLabel", "buyDisabled", "buyNote",
 ] as const;
-const CONTENT_KEYS = ["status", "name", "description", "meta", "image", "initial", "emptyText"] as const;
+const CONTENT_KEYS = ["status", "name", "description", "descriptionJson", "meta", "image", "initial", "emptyText"] as const;
 type Content = Pick<State, (typeof CONTENT_KEYS)[number]>;
 const NO_PRICE: IapPriceFields = { priceText: "", priceNote: "", priceLoading: false, hidePriceRetry: true, actionDisabled: true, actionNote: "" };
 const NOT_APPLE: IapPurchaseFields = { appleRoute: false, accessReady: false, buyLabel: "", buyDisabled: true, buyBusy: false, buyNote: "" };
@@ -463,6 +461,8 @@ const INITIAL_STATE: State = derive({
   actionMessage: "",
   name: "",
   description: "",
+  descriptionJson: "",
+  hasDescriptionJson: false,
   meta: "",
   priceLine: "",
   image: "",
@@ -488,6 +488,7 @@ const INITIAL_STATE: State = derive({
 });
 
 type Actions = {
+  openLink: (state: State, arg?: unknown) => Promise<undefined>;
   load: (state: State, arg?: unknown) => Promise<State | undefined>;
   enroll: (state: State) => Promise<State | undefined>;
   buy: (state: State) => Promise<State | undefined>;
@@ -506,6 +507,7 @@ const svc = defineService<State, Actions>("himiBrandedProgram", {
     enroll: () => enroll(),
     buy,
     pricingPublish: pricedState,
+    openLink: async (_state, arg) => { await openRichLink(arg); return undefined; },
     pricingStart: pricedState,
     pricingRefresh: async () => { await priceProgram(); return undefined; },
     iapPoll: async () => { await commerce.poll(); void svc.pricingPublish(); return undefined; },

package/templates/yoga-studio/tier5-src/himi-branded-lite-programs/index.ts

@@ -17,6 +17,8 @@ import { createIapCommerce } from "@himalaya/iap-checkout";
 import { programImage } from "../_shared/himi-media.js";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
+import { descriptionBody } from "../_shared/rich-body.js";
+import { programDescription } from "../_shared/program-description.js";
 import { iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 
 const SERVICE = "himiBrandedPrograms";
@@ -76,13 +78,7 @@ function programTitle(p: WixProgram): string {
 }
 
 function programDetails(p: WixProgram): string {
-  const desc = (p as { description?: unknown }).description;
-  const nested = desc && typeof desc === "object" ? (desc as { details?: string }).details : undefined;
-  const flat = typeof desc === "string" ? desc : undefined;
-  const raw = (p.settings?.description ?? nested ?? flat ?? p.details?.description ?? "")
-    .replace(/<[^>]+>/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
+  const raw = descriptionBody(programDescription(p)).bodyText.replace(/\s+/g, " ").trim();
   return raw.length > 140 ? `${raw.slice(0, 139).trimEnd()}…` : raw;
 }
 

package/templates/yoga-studio/tier5-src/himi-events-my-events/index.ts

@@ -5,6 +5,8 @@ import { queryEvents, type WixEvent } from "@himalaya/wix-events";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { confirmedRsvpIds, eventStartMillis, normalizeEvent, type EventRow } from "../_shared/himi-events";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { memberAccess } from "../_shared/member-access.js";
+import { readAccess, assertReadAccess, readAccessDenied, readSignInFlags, NO_READ_SIGN_IN } from "../_shared/member-read.js";
 
 // Offline-first (data-offline): My Events is a read-through over the same `events`
 // catalog the list caches — paint the last-synced rows (filtered to this device's
@@ -27,6 +29,7 @@ async function writeCached(rows: CachedEventRow[]): Promise<void> {
 }
 
 interface S {
+  signInRequired: boolean; noSignIn: boolean; signInScreenId: string;
   status: "loading" | "ready";
   events: EventRow[];
   emptyText: string;
@@ -98,11 +101,10 @@ function unverifiedEvent(event: CachedEventRow): CachedEventRow {
   };
 }
 
-/** Keep only the candidate rows the member ACTUALLY still holds an RSVP for, asking
- *  Wix per event. Fail-open per row: a network/permission blip must not blank a row the
- *  member really has (that would look like their RSVP vanished), so an errored probe
- *  keeps the row and only an explicit "no active RSVP" drops it. */
-async function confirmRsvps(candidates: CachedEventRow[]): Promise<{ events: CachedEventRow[]; verificationUnavailable: boolean }> {
+/** Verify device-local candidates against the current member. Member-only mode
+ *  requires successful verification; standalone mode retains failed probes as
+ *  explicitly unverified device-local history. */
+async function confirmRsvps(candidates: CachedEventRow[], memberOnly = false): Promise<{ events: CachedEventRow[]; verificationUnavailable: boolean }> {
   // Raw wixApi chokepoint rather than a generated client: the member RSVP read lives in
   // events **v2**, and `@himalaya/wix-events` is the v1 domain module. Adding a
   // `wix-events-v2` specifier is not an option — the umbrella package deliberately
@@ -122,7 +124,9 @@ async function confirmRsvps(candidates: CachedEventRow[]): Promise<{ events: Cac
         event: held ? { ...event, status: [event.status, copyParam("myEvents.rsvpConfirmed", "RSVP confirmed")].filter(Boolean).join(" · ") } : null,
         verificationUnavailable: false,
       };
-    } catch {
+    } catch (error) {
+      // Device candidates carry no member ownership proof until this read succeeds.
+      if (memberOnly) throw error;
       // Fail-open, but never claim backend confirmation while its member-readable
       // probe is unavailable. The device id remains a candidate, explicitly labeled.
       return { event: unverifiedEvent(event), verificationUnavailable: true };
@@ -134,8 +138,8 @@ async function confirmRsvps(candidates: CachedEventRow[]): Promise<{ events: Cac
   };
 }
 
-const svc = defineService<S, { load: (s: S, arg?: unknown) => Promise<S> }>("himiMyEvents", {
-  state: derive({
+const INITIAL: S = derive({
+    ...NO_READ_SIGN_IN, signInScreenId: "himi_account",
     status: "loading",
     events: [],
     emptyText: "",
@@ -147,45 +151,75 @@ const svc = defineService<S, { load: (s: S, arg?: unknown) => Promise<S> }>("him
     isLoading: true,
     notLoading: false,
     noEmpty: true,
-  }),
+  });
+let memberOnlyRequested = false;
+let loadVersion = 0;
+const svc = defineService<S, { prepare: (s: S) => S; load: (s: S, arg?: unknown) => Promise<S | undefined> }>("himiMyEvents", {
+  state: INITIAL,
   actions: {
-    load: async (s, arg) => {
+    prepare: (s) => ({ ...s, ...INITIAL }),
+    load: async (s, arg): Promise<S | undefined> => {
       stashCopy(arg);
-      const confirmed = new Set(confirmedRsvpIds());
-      const identity = await identityLine();
-      // 1) Instant paint from the on-device cache (offline-safe; empty on first-ever run).
-      const cached = await readCached();
-      const cachedEvents = cached.filter((event) => confirmed.has(event.id)).map(displayEventRow);
-      const base = cached.length
-        ? derive({ ...s, status: "ready", errored: false, events: cachedEvents, identityLine: identity, verificationUnavailable: cachedEvents.length > 0 })
-        : s;
-      // 2) Revalidate from Wix and refresh the cache.
+      const version = ++loadVersion;
+      const options = arg as { memberOnly?: unknown; signInScreenId?: unknown } | undefined;
+      if (options?.memberOnly !== undefined) memberOnlyRequested = options.memberOnly === "1";
+      const memberOnly = memberOnlyRequested;
+      const clean = { ...INITIAL, signInScreenId: options?.signInScreenId === "himi_sign_in" ? "himi_sign_in" : s.signInScreenId };
+      await svc.prepare();
       try {
-        const res = await queryEvents({ limit: 50 });
-        const all = ((res as unknown as { events?: WixEvent[] }).events ?? []).map(cachedEventRow);
-        await writeCached(all);
-        // Phase 3c — make each row AUTHORITATIVE. The device list is only a candidate
-        // set: it never forgets, so an RSVP cancelled elsewhere (web, or by the
-        // business) would otherwise show here forever. Confirm each candidate against
-        // Wix and drop the ones the member no longer holds.
-        //
-        // Per-event by necessity, not by choice: a member CANNOT enumerate their own
-        // RSVPs. Verified live against a real member token — `queryRsvps` (cross-event)
-        // 403s "WIX_EVENTS.READ_RSVP permission required", `listOrders` 403s
-        // READ_ORDERS, and `/rsvps/current` 400s without an eventId. Only the
-        // single-event read is member-readable, so the fan-out below IS the ceiling
-        // until those member scopes exist server-side.
-        const candidates = all.filter((event) => confirmed.has(event.id)).map(displayEventRow);
-        const confirmation = await confirmRsvps(candidates);
-        return derive({ ...base, status: "ready", errored: false, events: confirmation.events, identityLine: identity, verificationUnavailable: confirmation.verificationUnavailable });
-      } catch {
-        // Offline / fetch failure: keep the cached rows instead of a blank error state.
-        return cached.length
-          ? base
-          : derive({ ...s, status: "ready", errored: true, events: [], identityLine: identity });
+        const member = memberOnly ? await readAccess() : null;
+        if (memberOnly && !member?.member.email) throw new Error("Unauthenticated: sign in to see your events");
+        const confirmed = new Set(confirmedRsvpIds());
+        const identity = await identityLine();
+        // 1) Instant paint from the on-device cache (offline-safe; empty on first-ever run).
+        // Device-local candidates have no member ownership proof. Branded must
+        // verify them online rather than show a previous member's cached RSVP list.
+        const cached = memberOnly ? [] : await readCached();
+        const cachedEvents = cached.filter((event) => confirmed.has(event.id)).map(displayEventRow);
+        const base = cached.length
+          ? derive({ ...clean, status: "ready", errored: false, events: cachedEvents, identityLine: identity, verificationUnavailable: cachedEvents.length > 0 })
+          : clean;
+        // 2) Revalidate from Wix and refresh the cache.
+        try {
+          const res = await queryEvents({ limit: 50 });
+          const all = ((res as unknown as { events?: WixEvent[] }).events ?? []).map(cachedEventRow);
+          if (member) await assertReadAccess(member);
+          if (version !== loadVersion) return undefined;
+          await writeCached(all);
+          // Phase 3c — make each row AUTHORITATIVE. The device list is only a candidate
+          // set: it never forgets, so an RSVP cancelled elsewhere (web, or by the
+          // business) would otherwise show here forever. Confirm each candidate against
+          // Wix and drop the ones the member no longer holds.
+          //
+          // Per-event by necessity, not by choice: a member CANNOT enumerate their own
+          // RSVPs. Verified live against a real member token — `queryRsvps` (cross-event)
+          // 403s "WIX_EVENTS.READ_RSVP permission required", `listOrders` 403s
+          // READ_ORDERS, and `/rsvps/current` 400s without an eventId. Only the
+          // single-event read is member-readable, so the fan-out below IS the ceiling
+          // until those member scopes exist server-side.
+          const candidates = all.filter((event) => confirmed.has(event.id)).map(displayEventRow);
+          const confirmation = await confirmRsvps(candidates, memberOnly);
+          if (member) await assertReadAccess(member);
+          if (version !== loadVersion) return undefined;
+          return derive({ ...base, status: "ready", errored: false, events: confirmation.events, identityLine: identity, verificationUnavailable: confirmation.verificationUnavailable });
+        } catch (error) {
+          if (memberOnly && readAccessDenied(error)) throw error;
+          if (member) await assertReadAccess(member);
+          if (version !== loadVersion) return undefined;
+          // Offline / fetch failure: keep the cached rows instead of a blank error state.
+          return cached.length
+            ? base
+            : derive({ ...clean, status: "ready", errored: true, events: [], identityLine: identity });
+        }
+      } catch (error) {
+        const failure = memberOnly && !(await memberAccess()).email ? new Error("Unauthenticated: sign in to see your events") : error;
+        const flags = await readSignInFlags(failure);
+        return version === loadVersion ? derive({ ...clean, ...flags, status: "ready", errored: true, events: [] }) : undefined;
       }
     },
   },
 });
-svc.load();
+// Wait for the descriptor's load action to select member-only or device-local scope.
+// An eager unconfigured read could briefly expose guest KV before Branded opts in.
+svc.prepare();
 export { svc };

package/templates/yoga-studio-owner/config.ts

@@ -37,7 +37,7 @@ export default defineApp({
     actions: "http://localhost:8190/v1/actions",
     sync: "http://localhost:8190/v1/sync",
   },
-  capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui","speech","camera","photos","file_picker","files","presigned_upload","app_info","biometrics","wix_platform","animation"],
+  capabilities: ["push","share","secure_storage","open_url","local_database","clipboard","ui","speech","camera","photos","file_picker","files","presigned_upload","app_info","biometrics","wix_platform","stream","wix_api"],
   designTokensPath: "./tokens.json",
   // Native fallback; the T5 splash descriptor owns the editable launch appearance.
   splash: {