@wix/himalaya-cli 0.1570.0 → 0.1571.0

package/templates/branded-lite/dev/index.ts

@@ -37014,6 +37014,29 @@ const SCREENS = runtimeSetting({
                   ]
                 }
               }
+            },
+            {
+              "id": "himi_member.sign_in",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Sign in",
+                  "style": "primary",
+                  "action": {
+                    "actionId": "himi.open",
+                    "params": {
+                      "screenId": "himi_sign_in",
+                      "mode": "signin",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesMemberDetail.noSignIn"
+              }
             }
           ]
         }
@@ -37531,6 +37554,7 @@ const SCREENS = runtimeSetting({
                 }
               },
               "modifiers": {
+                "hiddenPath": "$service:spacesChatThread.signInRequired",
                 "padding": {
                   "leading": 16,
                   "trailing": 16,
@@ -37538,6 +37562,29 @@ const SCREENS = runtimeSetting({
                   "bottom": 0
                 }
               }
+            },
+            {
+              "id": "himi_chat_thread.sign_in",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Sign in",
+                  "style": "primary",
+                  "action": {
+                    "actionId": "himi.open",
+                    "params": {
+                      "screenId": "himi_sign_in",
+                      "mode": "signin",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesChatThread.noSignIn"
+              }
             }
           ]
         }
@@ -57216,6 +57263,29 @@ const SCREENS = runtimeSetting({
                   ]
                 }
               }
+            },
+            {
+              "id": "himi_forum_post.sign_in",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Sign in",
+                  "style": "primary",
+                  "action": {
+                    "actionId": "himi.open",
+                    "params": {
+                      "screenId": "himi_sign_in",
+                      "mode": "signin",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesForumPost.noSignIn"
+              }
             }
           ]
         }
@@ -60393,6 +60463,9 @@ const SCREENS = runtimeSetting({
                           "style": "body",
                           "color": "textSecondary"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.signInRequired"
                       }
                     },
                     {
@@ -60407,6 +60480,32 @@ const SCREENS = runtimeSetting({
                             "actionId": "tier5.himiMyEvents.load"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.signInRequired"
+                      }
+                    },
+                    {
+                      "id": "himi_my_events.retry.sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiMyEvents.noSignIn"
                       }
                     }
                   ]
@@ -60837,7 +60936,11 @@ const SCREENS = runtimeSetting({
           "bottom": 24
         },
         "onAppear": {
-          "actionId": "tier5.himiMyEvents.load"
+          "actionId": "tier5.himiMyEvents.load",
+          "params": {
+            "signInScreenId": "himi_sign_in",
+            "memberOnly": "1"
+          }
         }
       }
     },
@@ -99067,6 +99170,31 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "hiddenPath": "$service:himiBrandedProgram.hidePriceRetry"
                       }
                     },
+                    {
+                      "id": "himi_program.description_rich",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiBrandedProgram.descriptionJson",
+                          "onLink": {
+                            "actionId": "tier5.himiBrandedProgram.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiBrandedProgram.description",
+                                "style": "body",
+                                "color": "textSecondary"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -99078,6 +99206,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "color": "textSecondary",
                           "collapseWhenEmpty": true
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.hasDescriptionJson"
                       }
                     }
                   ]
@@ -102873,6 +103004,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "style": "body",
                           "color": "textSecondary"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.signInRequired"
                       }
                     },
                     {
@@ -102887,6 +103021,32 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "actionId": "tier5.himiBlogPost.retry"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.signInRequired"
+                      }
+                    },
+                    {
+                      "id": "himi_blog_post.retry.sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBlogPost.noSignIn"
                       }
                     }
                   ]
@@ -103591,7 +103751,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
         "onAppear": {
           "actionId": "tier5.himiBlogPost.load",
           "params": {
-            "id": "__HIMI_ID__"
+            "id": "__HIMI_ID__",
+            "signInScreenId": "himi_sign_in"
           }
         }
       }

package/templates/branded-lite/tier5-src/_shared/member-read.ts

@@ -0,0 +1,52 @@
+import { memberAccess, memberAccessChanged, memberAccessDenied, type MemberAccess } from "./member-access.js";
+import { needsSignIn } from "./branded-load-state.js";
+
+/** Public reads stay public. Capture their reader only to reject a result that
+ * belongs to the identity/site which was active before the request. */
+export interface ReadAccess { member: MemberAccess; tenant: string; }
+export async function readAccess(): Promise<ReadAccess> {
+  const member = await memberAccess();
+  const input = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input;
+  return { member, tenant: JSON.stringify([input?.__himiPreferenceAccount ?? "", input?.__himiPreferenceBusiness ?? ""]) };
+}
+
+export async function assertReadAccess(access: ReadAccess): Promise<void> {
+  const current = await readAccess();
+  if (current.member.email !== access.member.email || current.member.scope !== access.member.scope || current.tenant !== access.tenant) throw memberAccessChanged();
+}
+
+/** Bridge errors put the actual status first; codes quoted inside the body are data. */
+function httpStatus(error: unknown): string | undefined {
+  return /^HTTP\s*(\d{3})\b/i.exec(String((error as { message?: unknown })?.message ?? error))?.[1];
+}
+
+export const NO_READ_SIGN_IN = { signInRequired: false, noSignIn: true };
+
+/** An authorization refusal must not fall back to a previously cached article. */
+export function readAccessDenied(error: unknown): boolean {
+  let cause = error;
+  for (let depth = 0; cause && depth < 4; depth++) {
+    const status = httpStatus(cause);
+    if (status ? status === "401" || status === "403" : memberAccessDenied(cause) || needsSignIn(cause)) return true;
+    cause = (cause as { cause?: unknown }).cause;
+  }
+  return false;
+}
+
+/** A permission failure alone says nothing about whether signing in can help.
+ * In particular, a private member profile can be unavailable to members too.
+ * Only an authentication refusal for a current visitor offers Sign in. Follow
+ * SDK wrapper causes (blog getPost preserves its original read error there). */
+export async function readSignInFlags(error: unknown): Promise<typeof NO_READ_SIGN_IN> {
+  let authenticationRequired = false;
+  let permissionRefused = false;
+  let cause = error;
+  for (let depth = 0; cause && depth < 4; depth++) {
+    const status = httpStatus(cause);
+    permissionRefused ||= status === "403";
+    authenticationRequired ||= status ? status === "401" : needsSignIn(cause);
+    cause = (cause as { cause?: unknown }).cause;
+  }
+  const signInRequired = !permissionRefused && authenticationRequired && !(await memberAccess()).email;
+  return { signInRequired, noSignIn: !signInRequired };
+}

package/templates/branded-lite/tier5-src/_shared/program-description.ts

@@ -0,0 +1,11 @@
+import type { WixProgram } from "@himalaya/wix-online-programs";
+
+/** v3 nests the body in description.details; older responses use settings or a
+ * flat description. The body itself may be a Ricos document or serialized text. */
+export function programDescription(program: WixProgram): unknown {
+  const raw = (program as { description?: unknown }).description;
+  const nested = raw && typeof raw === "object" ? raw as { details?: unknown; nodes?: unknown } : undefined;
+  return program.settings?.description ?? nested?.details
+    ?? (typeof raw === "string" || Array.isArray(nested?.nodes) ? raw : undefined)
+    ?? program.details?.description;
+}

package/templates/branded-lite/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/branded-lite/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/branded-lite/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/branded-lite/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;
 }