@wix/himalaya-cli 0.1613.0 → 0.1615.0

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

@@ -9,7 +9,14 @@ import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { queryServices, type WixService } from "@himalaya/wix-bookings";
 import { getPost, queryPosts, type WixPost } from "@himalaya/wix-blog";
 import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
-import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
+import {
+  listMyParticipations,
+  participationsByProgram,
+  queryJoinApplications,
+  queryPrograms,
+  type WixProgram,
+} from "@himalaya/wix-online-programs";
+import { getMyMember } from "@himalaya/wix-members";
 import { listFeedItems, type WixFeedItem, type WixFeedProfile } from "@himalaya/wix-social-feed";
 import { queryItems as queryMenuItems, querySections as queryMenuSections } from "@himalaya/wix-restaurants";
 import { normalizeEvent, queryEvents } from "../_shared/himi-events.js";
@@ -166,6 +173,13 @@ interface ProgramCard {
   noImage: boolean;
 }
 
+/** A member's own program state, kept separate from the visitor catalog cards. */
+interface MemberProgramCard extends ProgramCard {
+  stateLabel: string;
+  progressFraction: number;
+  hideProgress: boolean;
+}
+
 /** A communityPulse latest-activity Carousel card (design §4.5). */
 interface FeedHighlight {
   id: string;
@@ -308,6 +322,8 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: boolean;
+  memberPrograms: MemberProgramCard[];
+  noMemberPrograms: boolean;
   /** The videos module's carousel — the newest ready Wix Video videos, the channels
    *  taking turns. Guarded on `videos`; same silent-fail contract. */
   homeVideos: (WixVideoCard & CaptionFlags)[];
@@ -549,6 +565,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  memberPrograms: MemberProgramCard[];
   homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
@@ -559,8 +576,17 @@ interface ExtrasSignal {
   menuCategories: MenuCategory[];
 }
 
+let homeProgramCandidates: { generation: number; programs: WixProgram[] } = { generation: 0, programs: [] };
+/** A finite number from a progress field, or `fallback` when the read left it out or sent junk. */
+function finiteOr(value: unknown, fallback: number): number {
+  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
+}
+
+/** How many microtask turns `memberProgramsLoaded` waits for refresh's own result to land (see the action). */
+const MEMBER_PROGRAMS_APPLY_RETRIES = 50;
+
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], memberPrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -670,13 +696,13 @@ async function fetchUpcomingEvents(): Promise<{ entries: EventEntry[]; nextEvent
   }
 }
 
-async function fetchHomePrograms(): Promise<ProgramCard[]> {
+async function fetchHomePrograms(): Promise<{ cards: ProgramCard[]; programs: WixProgram[] }> {
   try {
     const response = await queryPrograms({ cursorPaging: { limit: 12 } });
-    return (response.programs ?? [])
+    const programs = (response.programs ?? [])
       .filter((p: WixProgram) => ((p.state ?? p.status ?? "").toUpperCase()) !== "DRAFT")
-      .slice(0, 6)
-      .map((p: WixProgram) => {
+      .slice(0, 12);
+    const cards = programs.slice(0, 6).map((p: WixProgram) => {
         const desc = (p as { description?: unknown }).description;
         const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
         const name = cleanTitle(p.settings?.title ?? nestedTitle ?? p.title) || copyParam("home.programFallbackName", "Program");
@@ -692,7 +718,112 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
           noImage: !image,
         };
       });
+    return { cards, programs };
   } catch {
+    return { cards: [], programs: [] };
+  }
+}
+
+/** Member state is best-effort Home enrichment: visitors and unsupported member sessions
+ * collapse the rail, while the public Programs section remains available. */
+async function fetchMemberProgramCards(programs: WixProgram[]): Promise<MemberProgramCard[]> {
+  try {
+    const member = await memberAccess();
+    if (!member.email) return [];
+    const memberId = (await getMyMember()).member?.id;
+    if (!memberId) return [];
+
+    const [participantResult, applicationResult] = await Promise.allSettled([
+      listMyParticipations(memberId, { maxPages: 2 }),
+      queryJoinApplications({ memberId, limit: 100 }),
+    ]);
+    // These are independent member reads. An unverified participant-query permission
+    // must not also hide applications that the member-scoped endpoint can return.
+    const participants = participantResult.status === "fulfilled" ? participantResult.value : [];
+    const applications = applicationResult.status === "fulfilled" ? applicationResult.value : { joinApplications: [] };
+    const participation = participationsByProgram(participants);
+    // An application that already became a participant keeps its status and carries `participantId`
+    // (the SDK's PENDING_JOIN_APPLICATION_STATUSES note): the participation is the standing, and a member
+    // who later left must not read as "Approved" from the application that once admitted them. Newest
+    // first, one per program, and only programs with no participation of their own — so the admitted
+    // rows a joined member accumulates never take the lookup slots of a real pending request.
+    const applicationByProgram = new Map<string, { status?: string }>();
+    for (const application of applications.joinApplications ?? []) {
+      if (!application.programId || application.participantId || participation.has(application.programId)) continue;
+      if (!applicationByProgram.has(application.programId)) applicationByProgram.set(application.programId, application);
+    }
+    // The public catalog preview is intentionally capped at 12. Resolve the
+    // member's six most recent enrolled programs and six open applications
+    // outside that window in one filtered query so both remain visible.
+    const knownIds = new Set(programs.map((program) => program.id).filter((id): id is string => !!id));
+    const participantProgramIds = [...participation.keys()].slice(0, 6);
+    const applicationProgramIds = [...applicationByProgram.keys()].filter((id) => !participantProgramIds.includes(id)).slice(0, 6);
+    const candidateIds = [...participantProgramIds, ...applicationProgramIds].slice(0, 12);
+    const missingIds = candidateIds.filter((id) => !knownIds.has(id));
+    const extraPrograms = missingIds.length
+      ? await queryPrograms({ filter: { id: { $in: missingIds } }, cursorPaging: { limit: missingIds.length } })
+          .then((response) => response.programs ?? []).catch(() => [])
+      : [];
+    const memberPrograms = [...programs, ...extraPrograms.filter((program) => !!program.id && !knownIds.has(program.id))];
+    await assertMemberAccess(member);
+
+    return memberPrograms.flatMap((program) => {
+      if (!program.id) return [];
+      const participant = participation.get(program.id);
+      const application = applicationByProgram.get(program.id);
+      if (!participant && !application) return [];
+      const desc = (program as { description?: unknown }).description;
+      const nestedTitle = desc && typeof desc === "object" ? (desc as { title?: string }).title : undefined;
+      const name = cleanTitle(program.settings?.title ?? nestedTitle ?? program.title) || copyParam("home.programFallbackName", "Program");
+      const image = programImage(program);
+      // Progress may be absent (a `fields` the read did not ask for, or a program with no steps): the
+      // bar then sits at 0 and the label comes from `progressStatus`, never from NaN arithmetic.
+      const available = finiteOr(participant?.progress?.totalStepsAvailable, 0);
+      const completed = finiteOr(participant?.progress?.totalStepsCompleted, 0);
+      const percentage = finiteOr(participant?.progress?.completionPercentage, Number.NaN);
+      const hasProgress = available > 0 || Number.isFinite(percentage);
+      const rawFraction = available > 0 ? completed / available : Number.isFinite(percentage) ? percentage / 100 : 0;
+      const progressFraction = Math.max(0, Math.min(1, rawFraction));
+      let stateLabel: string;
+      if (participant) {
+        const enrollmentStatus = (participant.enrollmentStatus ?? "").toUpperCase();
+        const progressStatus = (participant.progressStatus ?? "").toUpperCase();
+        stateLabel = enrollmentStatus === "SUSPENDED"
+          ? copyParam("home.memberProgramSuspended", "Access paused")
+          : progressStatus === "COMPLETED" || enrollmentStatus === "COMPLETED"
+          ? copyParam("home.memberProgramCompleted", "Completed")
+          : progressStatus === "FAILED"
+            ? copyParam("home.memberProgramFailed", "Failed")
+          : progressStatus === "IN_PROGRESS" || (progressStatus !== "NOT_STARTED" && progressFraction > 0)
+            ? copyParam("home.memberProgramInProgress", "In progress")
+            : copyParam("home.memberProgramNotStarted", "Not started");
+      } else {
+        const status = (application?.status ?? "").toUpperCase();
+        stateLabel = status === "INVITED"
+          ? copyParam("home.memberProgramInvited", "Invitation")
+          : status === "APPROVED"
+            ? copyParam("home.memberProgramApproved", "Approved")
+            : status === "SUSPENDED"
+              ? copyParam("home.memberProgramSuspended", "Access paused")
+            : copyParam("home.memberProgramPending", "Request pending");
+      }
+      return [{
+        id: program.id,
+        name,
+        description: "",
+        image,
+        initial: initials(name),
+        hasImage: !!image,
+        noImage: !image,
+        stateLabel,
+        progressFraction,
+        hideProgress: !hasProgress || !participant || (participant.enrollmentStatus ?? "").toUpperCase() === "SUSPENDED",
+      }];
+    });
+  } catch (error) {
+    // The member rail is optional; never let a member-state refusal blank public Home.
+    const status = (error as { status?: unknown } | null)?.status ?? /\bHTTP (\d{3})\b/.exec(String(error))?.[1];
+    console.warn("[home.member-programs] member state unavailable", status !== undefined ? `HTTP ${String(status)}` : (error as { name?: string } | null)?.name ?? "unknown");
     return [];
   }
 }
@@ -747,7 +878,7 @@ function groupCard(group: WixGroup): GroupCard {
   };
 }
 
-async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
+async function fetchExtrasSignal(arg: unknown, generation: number): Promise<ExtrasSignal> {
   const verticals = parseVerticals(arg);
   const extras = emptyExtrasSignal();
   const jobs: Promise<void>[] = [];
@@ -758,7 +889,12 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
     }));
   }
   if (verticals.includes("programs")) {
-    jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
+    jobs.push(fetchHomePrograms().then(({ cards, programs }) => {
+      extras.homePrograms = cards;
+      // An older refresh can finish this query after a newer one. Keep its
+      // candidates from replacing the current generation's member-read input.
+      if (generation === refreshGen) homeProgramCandidates = { generation, programs };
+    }));
   }
   if (verticals.includes("videos") && !videoSurfaceRefused) {
     const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
@@ -883,6 +1019,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noMemberPrograms: state.memberPrograms.length === 0,
     noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
@@ -977,6 +1114,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    memberPrograms: [],
+    noMemberPrograms: true,
     homeVideos: [],
     noHomeVideos: true,
     feedHighlights: [],
@@ -1026,7 +1165,7 @@ async function refreshPublic(state: State, arg?: unknown): Promise<State | undef
   // failure just collapses their blocks), so a store outage cannot blank them
   // and vice versa. paramValue() stashes the appear params on first read, so the
   // arg-less fallback below still resolves the stashed verticals.
-  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg), fetchSavedSignal(arg)]);
+  const [bookings, extras, saved] = await Promise.all([fetchBookingsSignal(arg), fetchExtrasSignal(arg, gen), fetchSavedSignal(arg)]);
   if (gen !== refreshGen) return undefined;
   // A screen that declares no "store" vertical renders no products rail, so there is
   // nothing to fetch and nothing that could be "not loaded" — skip the call outright
@@ -1186,8 +1325,17 @@ async function refresh(state: State, arg?: unknown): Promise<State | undefined>
   void refreshPersonal(generation, arg);
   const publicState = await refreshPublic(state, arg);
   if (!publicState || generation !== personalGeneration) return undefined;
+  // The member-only read runs after public Home has landed. It is deliberately not awaited:
+  // a slow member endpoint must not hold the public catalog or hero behind authentication.
+  const programCandidates = homeProgramCandidates;
+  if (programCandidates.generation === refreshGen && parseVerticals(arg).includes("programs")) {
+    void fetchMemberProgramCards(programCandidates.programs).then((rows) => {
+      void svc.memberProgramsLoaded({ generation: programCandidates.generation, rows });
+    });
+  }
   const current = svc.getState();
-  return derive({ ...publicState, nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
+  return derive({ ...publicState, memberPrograms: current.memberPrograms, noMemberPrograms: current.noMemberPrograms,
+    nextBooking: current.nextBooking, hideNextBooking: current.hideNextBooking,
     memberProgressLabel: current.memberProgressLabel, memberProgressFraction: current.memberProgressFraction,
     hideMemberProgress: current.hideMemberProgress, personalError: current.personalError, hidePersonalError: current.hidePersonalError,
     // The weekly goal is PERSONAL (member bookings); the public refresh resets it, so keep it.
@@ -1214,6 +1362,7 @@ const svc = defineService<State, {
   refresh: (state: State, arg?: unknown) => Promise<State | undefined>;
   dismissOnboarding: (state: State) => State;
   clearPersonal: (state: State) => State;
+  memberProgramsLoaded: (state: State, arg: { generation: number; rows: MemberProgramCard[]; attempt?: number }) => State | undefined;
   openShopCategory: (state: State, arg?: unknown) => State;
   personalLoaded: (state: State, arg: { generation: number; rows: MemberBookingRow[]; progress: { label: string; fraction: number }; error: boolean; weekly: { count: number; fraction: number; label: string } | null }) => State;
   categoriesLoaded: (state: State, arg: { generation: number; categories: StoreCategoryCard[] }) => State | undefined;
@@ -1221,10 +1370,27 @@ const svc = defineService<State, {
   state: baseState(),
   // The host's site is read fresh at every boot: a snapshot of the last session's site must not
   // decide this one's verticals or name (an owner installs or removes one; another site opens).
-  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories"],
+  notHydrated: ["hosted", "hostedName", "hostedCards", "homeCategories", "noHomeCategories", "memberPrograms", "noMemberPrograms"],
+  // A member's standing never reaches the on-device snapshot either: the next boot may be another member's.
+  notPersisted: ["memberPrograms", "noMemberPrograms"],
   actions: {
-    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, personalError: false, hidePersonalError: true,
+    clearPersonal: state => derive({ ...state, nextBooking: [], hideNextBooking: true, memberProgressLabel: "", memberProgressFraction: 0, hideMemberProgress: true, memberPrograms: [], noMemberPrograms: true, personalError: false, hidePersonalError: true,
       weeklyClassCount: 0, weeklyClassGoalFraction: 0, weeklyGoalLabel: "" }),
+    // The member read starts inside `refresh` and, for a visitor (identity answers synchronously),
+    // resolves within the same microtask turn — BEFORE the runtime has applied refresh's own result.
+    // The `state` handed here is then refresh's PRE-state (status "loading", every rail empty), and
+    // spreading it wrote a loading home over the ready one; the description-projection test caught
+    // exactly that. So an early arrival re-queues itself (a microtask at a time, bounded) until the
+    // state it would spread is the applied one. A stale generation keeps the current state
+    // (`undefined`), never its own stale snapshot.
+    memberProgramsLoaded: (state, arg) => {
+      if (arg.generation !== refreshGen) return undefined;
+      if (state.status === "loading" && (arg.attempt ?? 0) < MEMBER_PROGRAMS_APPLY_RETRIES) {
+        void Promise.resolve().then(() => svc.memberProgramsLoaded({ ...arg, attempt: (arg.attempt ?? 0) + 1 }));
+        return undefined;
+      }
+      return derive({ ...state, memberPrograms: arg.rows, noMemberPrograms: arg.rows.length === 0 });
+    },
     openShopCategory: (state, arg) => {
       const category = String((arg as { category?: unknown } | undefined)?.category ?? "");
       if (!category) return state;

package/templates/gym-fitness/tier5-src/_shared/branded-load-state.ts

@@ -35,11 +35,14 @@ export interface LoadFlags {
   notMock: boolean;
   notMockEmpty: boolean;
   notMockUnavailable: boolean;
+  /** hiddenWhen gate for the empty state: false ONLY when the site answered with no rows
+   *  (`notMockEmpty` is true then — it gates the sample banner, not the empty state). */
+  hideEmpty: boolean;
 }
 
 export const LOADING: LoadFlags = {
   status: "loading", error: "", signInRequired: false, notErrored: true, notLoading: false, busy: true, noSignIn: true,
-  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true,
+  isMock: false, notMock: true, notMockEmpty: true, notMockUnavailable: true, hideEmpty: true,
 };
 
 const READY: LoadFlags = { ...LOADING, status: "ready", notLoading: true, busy: false };
@@ -78,7 +81,7 @@ type Rows<K extends string, T> = { [P in K]: T[] } & { emptyText: string } & Loa
 export function loaded<K extends string, T>(key: K, rows: T[], copy: LoadCopy<T>): Rows<K, T> {
   if (rows.length) return { ...READY, [key]: rows, emptyText: "" } as Rows<K, T>;
   if (samplesRequested()) return sampleRows(key, copy, "empty");
-  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty) } as Rows<K, T>;
+  return { ...READY, [key]: [], emptyText: copyParam(`${copy.prefix}.emptyText`, copy.empty), hideEmpty: false } as Rows<K, T>;
 }
 
 /** A query threw. Never rows the customer did not create. */

package/templates/gym-fitness/tier5-src/_shared/himi-account.ts

@@ -1,6 +1,8 @@
 import { dispatch } from "@himalaya/dispatch";
 // Relative for node resolution (see himi-store.ts note); rewritten off-repo.
 import { displayName, getMyData, initials, type WixMyData } from "@himalaya/wix-users";
+import { getMyMember } from "@himalaya/wix-members";
+import { wixMediaUrl } from "@himalaya/wix-media";
 import { formatDateMedium, formatWeekdayDateTime } from "../_shared/engine-intl.js";
 
 export interface AccountProfile {
@@ -82,6 +84,31 @@ function profileFromData(data: WixMyData, fallbackEmail = ""): AccountProfile {
   };
 }
 
+/** The signed-in site member's name and photo from their member record, or undefined when it
+ *  cannot be read or names nobody (the caller then shows the email). */
+async function siteMemberProfile(email: string): Promise<AccountProfile | undefined> {
+  try {
+    const member = (await getMyMember({ fieldsets: ["FULL"] }))?.member;
+    const name = [member?.contact?.firstName, member?.contact?.lastName].map((part) => (part ?? "").trim()).filter(Boolean).join(" ")
+      || (member?.profile?.nickname ?? "").trim();
+    if (!name) return undefined;
+    const image = wixMediaUrl(member?.profile?.photo?.url) || wixMediaUrl(member?.profile?.photo?.id) || "";
+    return {
+      isMember: true,
+      identityLine: "Signed in",
+      detailLine: email || name,
+      memberName: name,
+      memberEmail: email || member?.loginEmail || "",
+      memberImage: image,
+      memberInitials: initialsFromName(name) || "M",
+      hasMemberImage: !!image,
+      noMemberImage: !image,
+    };
+  } catch {
+    return undefined;
+  }
+}
+
 export function guestProfile(detailLine: string): AccountProfile {
   return {
     isMember: false,
@@ -118,6 +145,10 @@ export async function loadMemberProfile(guestDetailLine: string): Promise<Accoun
     const data = await getMyData();
     return profileFromData(data, storedEmail);
   } catch {
+    // The account profile is an owner endpoint: the web host refuses it, and a site member need
+    // not have one. The member's own record (the Members API) still names them.
+    const member = await siteMemberProfile(storedEmail);
+    if (member) return member;
     return {
       isMember: true,
       identityLine: "Signed in",

package/templates/gym-fitness/tier5-src/_shared/himi-booking-saved.ts

@@ -0,0 +1,88 @@
+// Saved (favorite) booking services use the host's durable, app-scoped KV, shared by every
+// screen worker — the service detail toggles a row (himi-booking-service `toggleSaved`), the
+// Favorites list reads them (himi-booking-saved). Same model as _shared/himi-store-saved.ts: a
+// failed write must never claim that a save succeeded.
+export interface SavedService {
+  id: string;
+  name: string;
+  /** The price line as the detail showed it ("$250"), kept so the list paints offline. */
+  price: string;
+  /** The duration line ("1 hr"). */
+  duration: string;
+  image: string;
+  category: string;
+  /** A course: the list's Book passes `course` to the time screen, which then refuses a course
+   *  whose record failed to load instead of offering its sessions one by one. */
+  course?: boolean;
+}
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+type Host = { himalaya?: { storage?: StorageLike; input?: Record<string, unknown> }; localStorage?: StorageLike };
+const BASE = "himi-booking:saved-services:v1";
+function storage(): StorageLike {
+  const host = globalThis as Host;
+  const kv = host.himalaya?.storage ?? host.localStorage;
+  if (!kv) throw new Error("Saved-service storage is unavailable");
+  return kv;
+}
+const validPart = (value: unknown): value is string => typeof value === "string" && /^[A-Za-z0-9_.:-]{1,128}$/.test(value) && value !== "default";
+/** Saves belong to whoever made them. A signed-in member's live under the host's authenticated
+ *  account + business — the partition collection preferences use, so a second member on the same
+ *  device never sees them; a visitor's live on the device. A member's partition, read for the
+ *  first time, takes the visitor's saves on this device (signing in carries them, like a cart),
+ *  once — the device list is then emptied. */
+function storeKey(kv: StorageLike): string {
+  const input = (globalThis as Host).himalaya?.input;
+  const account = input?.__himiPreferenceAccount, business = input?.__himiPreferenceBusiness;
+  if (!validPart(account) || !validPart(business)) return BASE;
+  const key = `${BASE}.${account}.${encodeURIComponent(business)}`;
+  if (kv.getItem(key) === null) {
+    const visitor = kv.getItem(BASE);
+    if (visitor !== null) {
+      kv.setItem(key, visitor);
+      // Empty the device list only once the member's copy is confirmed: a web host may swallow a
+      // failed write, and clearing then would lose the visitor's saves.
+      if (kv.getItem(key) === visitor) kv.setItem(BASE, "[]");
+    }
+  }
+  return key;
+}
+const str = (value: unknown): string => (typeof value === "string" ? value : "");
+export function readSavedServices(): SavedService[] {
+  const kv = storage();
+  const raw = kv.getItem(storeKey(kv));
+  if (!raw) return [];
+  const parsed: unknown = JSON.parse(raw);
+  if (!Array.isArray(parsed)) throw new Error("Invalid saved-service data");
+  const rows = new Map<string, SavedService>();
+  for (const value of parsed) {
+    if (!value || typeof value !== "object") continue;
+    const row = value as Record<string, unknown>;
+    if (typeof row.id !== "string" || !row.id.trim() || typeof row.name !== "string") continue;
+    rows.set(row.id, { id: row.id, name: row.name, price: str(row.price), duration: str(row.duration), image: str(row.image), category: str(row.category), ...(row.course === true ? { course: true } : {}) });
+  }
+  return [...rows.values()];
+}
+
+export function isServiceSaved(id: string): boolean {
+  return readSavedServices().some(row => row.id === id);
+}
+export function writeSavedServices(rows: SavedService[]): void {
+  const kv = storage();
+  const key = storeKey(kv);
+  const value = JSON.stringify(rows);
+  kv.setItem(key, value);
+  // Web hosts may swallow quota/security errors. Confirm the synchronous write
+  // before displaying success; a missing/mismatched read is a failed save.
+  if (kv.getItem(key) !== value) throw new Error("Saved-service write did not persist");
+}
+/** Save or unsave; returns the new saved state. The newest save is listed first. */
+export function toggleSavedService(service: SavedService): boolean {
+  if (!service.id.trim() || !service.name.trim()) throw new Error("No service to save");
+  const rows = readSavedServices();
+  const saved = !rows.some(row => row.id === service.id);
+  writeSavedServices(saved ? [service, ...rows] : rows.filter(row => row.id !== service.id));
+  return saved;
+}
+export function removeSavedService(id: string): void {
+  writeSavedServices(readSavedServices().filter(row => row.id !== id));
+}

package/templates/gym-fitness/tier5-src/himi-booking-service/index.ts

@@ -22,6 +22,7 @@ import { wixMediaUrl, WIX_DETAIL_IMAGE, WIX_LIST_IMAGE } from "@himalaya/wix-med
 import { formatClock, formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { descriptionBody } from "../_shared/rich-body.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
+import { isServiceSaved, toggleSavedService } from "../_shared/himi-booking-saved.js";
 
 // Offline-first (data-offline): the service detail is a public read-through. On a
 // fetch failure we fall back to the last-synced row for this service written by
@@ -182,6 +183,13 @@ interface S {
   sessionMessageOk: boolean;
   sessionMessageFailed: boolean;
   noSessionMessage: boolean;
+  // ---- Favorites (the heart an app adds with withServiceSaveToggle; _shared/himi-booking-saved.ts) ----
+  saved: boolean;
+  notSaved: boolean;
+  /** The heart's spoken label: what a tap does now. */
+  saveLabel: string;
+  /** "" unless the last save or unsave failed. */
+  saveMessage: string;
 }
 
 function inputId(): string {
@@ -790,6 +798,10 @@ function derive(s: S): S {
     // Change Time opens the time screen, which cannot book a service closed to online booking.
     noChangeTime: (control !== "book" && control !== "waitlist" && control !== "closed") || !s.bookableOnline,
     noSessionMessage: !s.sessionMessage,
+    notSaved: !s.saved,
+    saveLabel: s.saved
+      ? copyParam("service.unsaveLabel", "Remove from favorites")
+      : copyParam("service.saveLabel", "Save to favorites"),
     notBookableOnline: !s.bookableOnline,
     noAbout: !s.about && !s.aboutJson,
     noPolicy: s.policyLines.length === 0,
@@ -866,9 +878,16 @@ function withService(s: S, service: WixService): S {
     // WS-C — canonical param-less target; the descriptor's choose-time CTA
     // binds the separate `id` state field as a first-class nav param.
     timeScreenId: "himi_time",
+    saved: savedNow(serviceId),
   });
 }
 
+/** Whether the service is a favorite. Unreadable storage reads as not saved: the heart is a
+ *  convenience and never holds the screen back. */
+function savedNow(id: string): boolean {
+  try { return !!id && isServiceSaved(id); } catch { return false; }
+}
+
 /** The service record: with staff details when this token may read them, else without. */
 async function fetchService(id: string): Promise<WixService | undefined> {
   try {
@@ -897,9 +916,10 @@ const svc = defineService<S, {
   book: (s: S) => S;
   changeTime: (s: S) => S;
   joinWaitlist: (s: S, arg?: unknown) => Promise<S>;
+  toggleSaved: (s: S) => S;
 }>("himiBookingService", {
   // A join's outcome belongs to that visit: a cold start must not replay it from saved state.
-  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage"],
+  notHydrated: ["sessionMessage", "sessionMessageOk", "sessionMessageFailed", "noSessionMessage", "saveMessage"],
   state: derive({
     status: "loading",
     id,
@@ -1005,6 +1025,10 @@ const svc = defineService<S, {
     noChangeTime: true,
     ...NO_SESSION_MESSAGE,
     noSessionMessage: true,
+    saved: false,
+    notSaved: true,
+    saveLabel: "",
+    saveMessage: "",
   }),
   actions: {
     load: async (s, arg) => {
@@ -1012,14 +1036,16 @@ const svc = defineService<S, {
       rememberSignIn(arg);
       if (!s.id) return derive({ ...s, status: "ready", errored: true });
       // A new view: a join's outcome from before is not news when the screen shows again.
-      const start = { ...s, policyExpanded: false, scheduleExpanded: false, ...NO_SESSION_MESSAGE };
+      const start = { ...s, policyExpanded: false, scheduleExpanded: false, saveMessage: "", ...NO_SESSION_MESSAGE };
       try {
         const service = await fetchService(s.id);
         if (!service) return withSession(derive({ ...start, status: "ready" }), undefined);
         loadedService = service;
         // The session the Agenda row opened on, read beside the service-wide availability.
         const [shown, sel] = await Promise.all([withGroupAvailability(withService(start, service), service), readSessionBounded(service)]);
-        return withSession(shown, sel);
+        // The heart is read again after the waits (the session read takes up to 10 s): a toggle
+        // tapped meanwhile wrote storage, and the snapshot taken before would undo it.
+        return withSession({ ...shown, saved: savedNow(s.id) }, sel);
       } catch {
         // Offline: paint from the last-synced services cache (written by the list
         // worker) before falling back to the error state. The cache holds the name,
@@ -1038,6 +1064,7 @@ const svc = defineService<S, {
             category: String(cached.category ?? ""),
             images: image ? [{ url: image, alt: name }] : [],
             timeScreenId: `himi_time_${s.id}`,
+            saved: savedNow(s.id),
           }, undefined);
         }
         return withSession({ ...start, status: "ready", errored: true, name: "" }, undefined);
@@ -1056,6 +1083,26 @@ const svc = defineService<S, {
     },
     togglePolicy: (s) => derive({ ...s, policyExpanded: !s.policyExpanded }),
     toggleSchedule: (s) => derive({ ...s, scheduleExpanded: !s.scheduleExpanded }),
+    // The heart: save or unsave this service on the device (the member's own list once signed
+    // in). The row keeps what the Favorites list shows offline; a failed write says so and never
+    // shows the heart as saved.
+    toggleSaved: (s) => {
+      if (!s.id || !s.hasService || s.errored) return s;
+      try {
+        const saved = toggleSavedService({
+          id: s.id,
+          name: s.name,
+          price: s.priceIsText ? "" : s.priceText,
+          duration: s.durationText,
+          image: s.image,
+          category: s.category,
+          ...(s.isCourse ? { course: true } : {}),
+        });
+        return derive({ ...s, saved, saveMessage: "" });
+      } catch {
+        return derive({ ...s, saved: savedNow(s.id), saveMessage: copyParam("service.saveError", "Could not update your favorites. Try again.") });
+      }
+    },
     // The footer button opens the time screen for the loaded service. A worker directive,
     // not a `himi.open` with a `$service:` id param: the iOS and Android sticky footers
     // dispatch their taps without resolving `$service:` params, so the id never arrived.