@wix/himalaya-cli 0.1567.0 → 0.1569.0

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

@@ -1,4 +1,6 @@
-import { withOnlineWrites } from "../_shared/online-actions.js";
+import { dispatch } from "@himalaya/dispatch";
+import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
+import { offlineWriteMessage, withOnlineWrites } from "../_shared/online-actions.js";
 // Tier-5 bundle: himi-branded-lite — single online-program detail (design §3.5
 // `programs` vertical, screen full-potential pass).
 //
@@ -20,7 +22,7 @@ import { withOnlineWrites } from "../_shared/online-actions.js";
 // reads every program as `disabled` and keeps Enrol on its own commerce. An Apple-routed program
 // offers Get access in place of Enrol and sells only through the shared checkout, never through the
 // Wix payment rail.
-import { defineService as registerService } from "@himalaya/state";
+import { connectivity, defineService as registerService } from "@himalaya/state";
 import { programImage } from "../_shared/himi-media.js";
 import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import {
@@ -28,10 +30,12 @@ import {
   joinProgram,
   payableIdOf,
   queryPrograms,
+  searchMemberParticipation,
   type WixProgram,
   type WixProgramFull,
 } from "@himalaya/wix-online-programs";
 import { createRedirectSession } from "@himalaya/wix-redirects";
+import { getMyMember } from "@himalaya/wix-members";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
@@ -183,16 +187,17 @@ async function fetchProgram(id: string): Promise<WixProgram | undefined> {
 /** Whether the existing commerce flow may start (before the join) and continue (before the Wix
  *  payment): a price refresh can move the program onto a route this flow must not charge. */
 interface CommerceGuards {
+  assertMember(): Promise<void>;
   mayStart(): boolean;
   mayContinue(): boolean;
 }
 
-async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<string> {
+async function enrollmentMessage(id: string, name: string, guards: CommerceGuards): Promise<string> {
   const blocked = () => iapPriceCopy("program").purchaseUnavailable;
   if (!guards.mayStart()) return blocked();
   let preparationWithdrawn = false;
   try {
-    const joined = await joinProgram(inputId(), { mayPreparePayment: () => {
+    const joined = await joinProgram(id, { beforeWrite: guards.assertMember, mayPreparePayment: () => {
       if (!guards.mayContinue()) preparationWithdrawn = true;
       return !preparationWithdrawn;
     } });
@@ -218,6 +223,7 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
       return !withdrawn;
     };
     if (!stillAllowed()) return blocked();
+    await guards.assertMember();
     const pay = await payCashierOrder({
       appId: WIX_PROGRAMS_APP_ID,
       snapshotId: payable,
@@ -232,6 +238,7 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
       // Join Applications returns a Wix Payments order id; the payment-request
       // redirect uses that same order handle on the hosted rail.
       cashierUrl: async () => {
+        await guards.assertMember();
         if (!stillAllowed()) return undefined;
         const redirect = await createRedirectSession({
           ecomOrderPaymentRequest: { paymentRequestId: payable },
@@ -247,6 +254,7 @@ async function enrollmentMessage(name: string, guards: CommerceGuards): Promise<
     if (pay.kind === "handoff") return "";
     if (pay.kind === "cancelled") return copyParam("program.joinCancelledMessage", "Payment cancelled — you haven't enrolled.");
   } catch {
+    if (!connectivity().online) return offlineWriteMessage;
     if (preparationWithdrawn) return blocked();
     // fall through to the site-directing message
   }
@@ -274,6 +282,17 @@ let pricedItem: IapCatalogItem | undefined;
 let actionMessage = "";
 let loadSeq = 0;
 let commerceStarted = false;
+let enrollmentInFlight = false;
+// Presentation dedupe only. The host remains the sole authority to resume a join.
+let openedAuthToken = "";
+let signInPresentation: "sheet" | "full_screen" = "sheet";
+const continuationTarget = (id: string) => `program_enrol:${id}`;
+
+async function continuation(operation: "begin" | "check" | "consume" | "cancel", id: string, token = "") {
+  try {
+    return await dispatch("himi.wix.authContinuation", { operation, target: continuationTarget(id), token }) as { supported?: boolean; confirmed?: boolean; account?: string; token?: string } | null;
+  } catch { return { supported: false }; } // Older binaries do not implement this host contract: fail closed.
+}
 
 function contentOf(state: State): Content {
   return Object.fromEntries(CONTENT_KEYS.map((key) => [key, state[key]])) as Content;
@@ -283,13 +302,31 @@ const programReference = () => onlineProgramItem({ id: inputId() })?.reference;
 
 async function load(state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
+  const presentation = (arg as { signInPresentation?: unknown } | undefined)?.signInPresentation;
+  if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
+  const id = inputId();
   const seq = ++loadSeq;
   const found = await fetchProgram(inputId()).then((program) => ({ program }), () => undefined);
   if (seq !== loadSeq) return undefined;
   content = found ? contentOf(ready(state, found.program)) : { ...content, status: "error" };
   pricedItem = found?.program ? onlineProgramItem({ id: inputId() }, priceOf(found.program)) : pricedItem;
   void svc.pricingPublish();
-  if (found?.program) void priceProgram();
+  const prices = found?.program ? priceProgram() : Promise.resolve();
+  if (seq !== loadSeq || inputId() !== id) return undefined;
+  // The host owns the intent across account-scoped worker replacement. The consume is
+  // atomic and destructive. A background guest refresh keeps a pending request; the
+  // host modal boundary cancels it on dismissal. Route params and hydration never
+  // authorize a join. Check prices before spending the one shot.
+  const waiting = await continuation("check", id);
+  if (waiting?.confirmed && found?.program) {
+    await prices;
+    if (seq === loadSeq && inputId() === id) {
+      // Authority stays in the host until the last asynchronous prerequisite completes:
+      // expiry, cancellation or an intervening account switch can still revoke it.
+      const permit = await continuation("consume", id);
+      if (permit?.confirmed && permit.account) await enroll(permit.account);
+    }
+  }
   void resumeCommerce();
   return undefined;
 }
@@ -310,16 +347,88 @@ async function priceProgram(): Promise<void> {
   void svc.pricingPublish();
 }
 
-async function enroll(): Promise<undefined> {
+async function enroll(afterAuthAccount = ""): Promise<undefined> {
+  const id = inputId();
   const reference = programReference();
-  if (!reference) return undefined;
-  // A tap that lands as a refresh starts is refused without a verdict: the route is unknown, not
-  // App Store, and the screen already reads "Loading price…" with Enrol disabled.
-  actionMessage = pricing.checkoutGuard(reference).route === "resolving" ? "" : await enrollmentMessage(content.name, {
-    mayStart: () => pricing.checkoutGuard(reference).allowed,
-    mayContinue: () => pricing.continueCheckoutGuard(reference).allowed,
-  });
+  if (!reference || enrollmentInFlight) return undefined;
+  if (!connectivity().online) {
+    actionMessage = offlineWriteMessage;
+    void svc.pricingPublish();
+    return undefined;
+  }
+  if (!pricing.checkoutGuard(reference).allowed) {
+    actionMessage = pricing.checkoutGuard(reference).route === "resolving" ? "" : iapPriceCopy("program").purchaseUnavailable;
+    void svc.pricingPublish();
+    return undefined;
+  }
+  enrollmentInFlight = true;
   void svc.pricingPublish();
+  try {
+    const member = await memberAccess();
+    if (id !== inputId()) return undefined;
+    if (afterAuthAccount && member.email !== afterAuthAccount) return undefined;
+    if (!member.email) {
+      const request = await continuation("begin", id);
+      if (request?.supported !== true || !request.token) {
+        actionMessage = copyParam("program.signInUpdateRequired", "Update the app to sign in and continue enrollment.");
+        return undefined;
+      }
+      if (openedAuthToken === request.token) return undefined;
+      openedAuthToken = request.token;
+      actionMessage = "";
+      try {
+        await dispatch("himi.open", { screenId: "himi_sign_in", mode: "signin", presentation: signInPresentation, modal: "1", authContinuation: request.token });
+      } catch (error) {
+        openedAuthToken = "";
+        await continuation("cancel", id, request.token);
+        throw error;
+      }
+      return undefined;
+    }
+    await assertMemberAccess(member);
+    if (afterAuthAccount) {
+      // Branded's initPhase refetches participation after NOW_LOGGED_IN, before
+      // joining. A settled participant need not have a current Join Application.
+      const memberId = (await getMyMember()).member?.id;
+      if (!memberId) throw new Error("Current member unavailable");
+      const response = await searchMemberParticipation(id, memberId);
+      await assertMemberAccess(member);
+      if (id !== inputId()) return undefined;
+      if (!Array.isArray(response.participants)) throw new Error("Participation unavailable");
+      const participant = response.participants[0];
+      if (participant) {
+        if (participant.memberId !== memberId || participant.programId !== id) throw new Error("Participation identity changed");
+        const status = (participant.enrollmentStatus ?? "").toUpperCase();
+        const progress = (participant.progressStatus ?? "").toUpperCase();
+        if (status === "JOINED" || ["COMPLETED", "FAILED"].includes(progress)) {
+          actionMessage = ["COMPLETED", "FAILED"].includes(progress)
+            ? copyTemplate("program.participationRecordedMessage", "Your participation in {name} is already recorded.", { name: content.name })
+            : copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name: content.name });
+          return undefined;
+        }
+        if (!["LEFT", "REMOVED"].includes(status)) {
+          actionMessage = copyParam("program.participationUnavailable", "Your current participation cannot be enrolled again.");
+          return undefined;
+        }
+      }
+    }
+    // joinProgram refreshes the current Join Application before creating anything. Its
+    // existing-participant/private/paid and pending-payment guards remain authoritative.
+    const message = await enrollmentMessage(id, content.name, {
+      assertMember: async () => {
+        await assertMemberAccess(member);
+        if (!connectivity().online) throw new Error(offlineWriteMessage);
+      },
+      mayStart: () => id === inputId() && pricing.checkoutGuard(reference).allowed,
+      mayContinue: () => id === inputId() && pricing.continueCheckoutGuard(reference).allowed,
+    });
+    if (id === inputId()) actionMessage = message;
+  } catch {
+    if (id === inputId()) actionMessage = copyTemplate("program.joinOnSiteMessage", "Enrolment happens on the website — visit the site to join {name}.", { name: content.name });
+  } finally {
+    enrollmentInFlight = false;
+    void svc.pricingPublish();
+  }
   return undefined;
 }
 
@@ -343,7 +452,7 @@ function pricedState(state: State): State {
     actionMessage: purchase.accessReady ? copyTemplate("program.joinedMessage", "You're enrolled in {name}.", { name: content.name }) : actionMessage,
     // `disabled`: this app sells nothing through the App Store, so the program shows its own price.
     priceLine: view?.route === "disabled" ? pricedItem?.commerceDisplayPrice ?? "" : price.priceText, priceNote: price.priceNote, hidePriceRetry: view?.route === "disabled" || (price.hidePriceRetry && commerce.scopeComplete()),
-    enrollDisabled: price.actionDisabled, enrollNote: price.actionNote, enrollHidden: purchase.appleRoute,
+    enrollDisabled: price.actionDisabled || enrollmentInFlight, enrollNote: price.actionNote, enrollHidden: purchase.appleRoute,
     buyHidden: !purchase.appleRoute || purchase.accessReady, buyLabel: purchase.buyLabel, buyDisabled: purchase.buyDisabled, buyNote: purchase.buyNote,
     ...(poll ? { _poll: poll } : {}),
   });
@@ -394,7 +503,7 @@ const svc = defineService<State, Actions>("himiBrandedProgram", {
   notHydrated: [...PRICING_NOT_HYDRATED],
   actions: {
     load,
-    enroll,
+    enroll: () => enroll(),
     buy,
     pricingPublish: pricedState,
     pricingStart: pricedState,

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

@@ -0,0 +1,35 @@
+import { defineService } from "@himalaya/state";
+
+// Native renderers animate; this worker only publishes the requested visibility.
+// The host waits for presentation, bounded by the original startup deadline.
+const input = (globalThis as unknown as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input;
+interface State {
+  title: string;
+  caption: string;
+  iconHidden: boolean;
+  presentationPending: boolean;
+  errorText?: string;
+  customLogoHidden?: boolean;
+  backgroundImageUrl?: string;
+}
+export const splash = defineService<State, { present: (state: State) => State }>("splash", {
+  state: {
+    title: typeof input?.title === "string" ? input.title : "",
+    caption: typeof input?.caption === "string" ? input.caption : "",
+    iconHidden: false,
+    presentationPending: true,
+    // A malformed OTA toggle must not release the native cover as a successful
+    // presentation. The host's existing deadline remains the failure fallback.
+    ...(input?.showIcon !== undefined && typeof input.showIcon !== "boolean"
+      ? { errorText: "Splash showIcon must be a boolean" } : {}),
+    ...(typeof input?.backgroundImageUrl === "string" ? { backgroundImageUrl: input.backgroundImageUrl } : {}),
+    ...(input?.customLogo === true ? { customLogoHidden: true } : {}),
+  },
+  actions: {
+    present: (state) => state.errorText ? state : ({ ...state,
+      iconHidden: input?.showIcon === false || input?.customLogo === true,
+      ...(input?.customLogo === true ? { customLogoHidden: input?.showIcon === false } : {}),
+      presentationPending: false,
+    }),
+  },
+});

package/templates/yoga-studio/tier5-src/himi-store-account/index.ts

@@ -19,6 +19,7 @@ import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleS
 import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
 
 interface AuthRouteInput {
+  authContinuation?: string;
   /** Standalone sign-in only: `register` opens the form on Create account. */
   mode?: string;
   intent?: string;
@@ -356,6 +357,9 @@ async function authenticate(s: S, operation: "signIn" | "register"): Promise<S |
     await svc.beginAuth(); // publish busy before waiting for the network
     const raw = await dispatch(operation === "signIn" ? "himi.wix.signInDirect" : "himi.wix.registerDirect", {
       email: s.email.trim(), password,
+      // An opaque host-issued token, never a return route. Native commits it before the
+      // account change can destroy this worker; the replacement does not need this promise.
+      ...(routeInput().authContinuation ? { authContinuation: routeInput().authContinuation } : {}),
       ...(operation === "register" ? { firstName: s.firstName, lastName: s.lastName } : {}),
     });
     rejectResult(raw, operation);

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

@@ -39,6 +39,14 @@ export default defineApp({
   },
   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"],
   designTokensPath: "./tokens.json",
+  // Native fallback; the T5 splash descriptor owns the editable launch appearance.
+  splash: {
+    "enabled": true,
+    "backgroundColor": "accentPrimary",
+    "caption": "Himalaya Owner",
+    "minVisibleMs": 400,
+    "maxHoldMs": 3000
+  },
   navigation: {
     "navKind": "responsive",
     "surfaces": {

package/templates/yoga-studio-owner/dev/index.ts

@@ -3,6 +3,7 @@
 // fill __HIMI_ID__ sentinels per request.
 import config from "../config.js";
 
+
 const runtimeSetting = (value: unknown): unknown => {
   if (value === "__HIMI_PODCAST_FEED_URL__") return process.env.PODCAST_FEED_URL?.trim() || "";
   if (Array.isArray(value)) return value.map(runtimeSetting);

package/templates/yoga-studio-owner/tier5-src/_shared/himi-copy.ts

@@ -1,8 +1,8 @@
 // Copy-as-configuration for WORKER-emitted strings (`himi docs designing-himi-screens`,
 // §"Copy is configuration"): a worker never hardcodes user-facing copy — the
 // descriptor bakes the provisioned copy-pack overrides relevant to this worker
-// into its onAppear action params as a `copy` JSON object (key → override
-// string, computed from the app contract at descriptor-build time), and the
+// into its onAppear action params as a `copy` JSON object (customer strings or
+// source-matched stock translations, computed at descriptor-build time), and the
 // worker reads every user-facing string through `copyParam(key, fallback)`.
 //
 // STASHED (the stashed appear-params idiom, himi-branded-lite-home): the
@@ -16,9 +16,13 @@
 // every worker that emits user-facing copy, and copied verbatim into the
 // generated templates' tier5-src/_shared/.
 
-let stashedCopy: Record<string, string> = {};
+/** Customer strings override every read; translated stock is valid only for its
+ * original English fallback. Some existing keys serve more than one message. */
+export type CopyPackValue = string | { source: string; translation: string };
 
-/** Absorb the `copy` onAppear param (a JSON object of key → override string)
+let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+
+/** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
  *  params (load/refresh). Non-copy args and malformed packs are ignored — the
  *  stock fallbacks keep rendering. */
@@ -29,9 +33,15 @@ export function stashCopy(arg: unknown): void {
   try {
     const parsed = JSON.parse(raw) as unknown;
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return;
-    const next: Record<string, string> = {};
+    const next: Record<string, CopyPackValue> = Object.create(null);
     for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
       if (typeof value === "string") next[key] = value;
+      else if (value && typeof value === "object" && !Array.isArray(value)) {
+        const row = value as Record<string, unknown>;
+        if (typeof row.source === "string" && typeof row.translation === "string") {
+          next[key] = { source: row.source, translation: row.translation };
+        }
+      }
     }
     stashedCopy = next;
   } catch {
@@ -43,7 +53,8 @@ export function stashCopy(arg: unknown): void {
  *  pack / no such key reached this worker. */
 export function copyParam(key: string, fallback: string): string {
   const value = stashedCopy[key];
-  return typeof value === "string" && value !== "" ? value : fallback;
+  if (typeof value === "string") return value !== "" ? value : fallback;
+  return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }
 
 /** Interpolate `{name}` placeholders in a (possibly overridden) template:

package/templates/yoga-studio-owner/tier5-src/_shared/rich-body.ts

@@ -32,3 +32,47 @@ export function richBody(richContent: unknown, fallback = "", imageWidth = 1400)
   const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
   return { bodyJson: json, bodyText: text || fallback };
 }
+
+/** A Wix description may be Ricos (including serialized JSON), HTML or ordinary text.
+ * Keep rich documents on the existing bounded encoder path. Non-document JSON and
+ * clearly malformed serialization use an independent fallback. Ambiguous bracketed
+ * prose stays readable; this does not attempt to repair arbitrary JSON syntax. */
+export function descriptionBody(value: unknown, fallback = "", imageWidth = 1400): RichBody {
+  if (typeof value !== "string") return richBody(value, fallback, imageWidth);
+  const text = value.trim();
+  if (/^[{[]/.test(text)) {
+    try {
+      const parsed: unknown = JSON.parse(text);
+      // Passing the parsed value avoids parsing a valid Ricos document twice; a
+      // different JSON structure is rejected by the same existing document check.
+      if (parsed && typeof parsed === "object") return richBody(parsed, fallback, imageWidth);
+    } catch {
+      const objectLike = /^\{\s*(?:["'}]|nodes\b)/.test(text);
+      // Only reject scalar-looking malformed arrays when their syntax is clearly
+      // unfinished (or contains JS's non-JSON `undefined`). Balanced bracketed
+      // prose such as "[1,000]" and "[12:30, 13:30]" is not JSON and stays readable.
+      const arrayTokens = text.replace(/"(?:\\.|[^"\\])*"/g, "")
+        .replace(/\b(?:true|false|null|undefined)\b/g, "")
+        .replace(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/g, "");
+      const arrayLike = /^\[\s*[{"]/.test(text)
+        || (text.startsWith("[") && /^[\s[\]{},:]*$/.test(arrayTokens)
+          && (/,\s*]?$/.test(text) || /\bundefined\b/.test(text) || !text.endsWith("]")));
+      if (objectLike || arrayLike) return { bodyJson: "", bodyText: fallback };
+    }
+  }
+  // Legacy HTML descriptions stay text. Preserve paragraph breaks and ordinary prose's
+  // bare '<' (e.g. "ages < 8"), without relying on browser-only DOM APIs in workers.
+  const plain = text
+    .replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1\s*>/gi, "")
+    .replace(/<br\s*\/?\s*>/gi, "\n")
+    .replace(/<\/(?:p|div|h[1-6]|li)\s*>/gi, "\n\n")
+    .replace(/<\/?[a-z][^>]*>/gi, "")
+    .replace(/&(?:nbsp|amp|lt|gt|quot|apos|#39);/gi, (entity) => ({
+      "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": '"', "&apos;": "'", "&#39;": "'",
+    })[entity.toLowerCase()] ?? entity)
+    .replace(/[\t\r ]+/g, " ")
+    .replace(/ *\n */g, "\n")
+    .replace(/\n{3,}/g, "\n\n")
+    .trim();
+  return { bodyJson: "", bodyText: plain || fallback };
+}