@wix/himalaya-cli 0.1324.0 → 0.1325.0

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

@@ -1,21 +1,13 @@
-// Tier-5 bundle: himi-branded-lite — public pricing plans (memberships).
-//
-// Visitors can browse the site's public pricing plans (design §3.5 `plans`
-// vertical). The public GA route works on the anonymous visitor rung, so the
-// list paints with no login. Purchasing is NATIVE (Phase 2b): "Join" creates the
-// member's plan order via createOnlineOrder, then settles any balance on the shared
-// in-app pay rail (@wix/himalaya/checkout) — wallet where the app has one, in-app Wix
-// cashier otherwise. A FREE / fully-discounted plan activates with no payment step at
-// all. A plan-carried purchasable URL still wins when present, and any failure degrades
-// gracefully to the site-directing message rather than a dead button.
-// Four-state (loading / error / rows / empty) like the sibling branded workers.
 import { defineService } from "../_shared/collection-service.js";
 import { createOnlineOrder, listPublicPlans, type WixPlan } from "@himalaya/wix-pricing-plans";
 import { createRedirectSession } from "@himalaya/wix-redirects";
 import { open as openUrl } from "@himalaya/open-url";
 import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
-import { payCashierOrder } from "@himalaya/checkout";
+import { activePlanIds, entitlement, payCashierOrder } from "@himalaya/checkout";
+import { hostSessionFromGlobal, iapPriceFields, type IapCatalogItem } from "@himalaya/iap";
+import { createIapCommerce, pricingPlanOrders } from "@himalaya/iap-checkout";
+import { iapPriceCopy, iapPurchaseCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
 
 /** Wix Pricing Plans appDefId — the vertical that owns a plan order, so the `appId` its
@@ -57,6 +49,11 @@ interface PlanRow {
   hasBadge: boolean;
   /** Purchasable URL when the plan data carries one; "" otherwise. */
   joinUrl: string;
+  joined: boolean;
+  appleSupported: boolean;
+  joinLabel: string;
+  joinDisabled: boolean;
+  joinNote: string;
 }
 
 interface State {
@@ -130,7 +127,7 @@ function planRow(plan: WixPlan): PlanRow {
   const trialDays = plan.pricing?.freeTrialDays ?? 0;
   const trialBadge = trialDays > 0 ? copyTemplate("plans.trialBadge", "{days}-day free trial", { days: trialDays }) : "";
   return {
-    id: plan.id || name,
+    id: plan.id || "",
     name,
     description: (plan.description ?? "").trim(),
     trialBadge,
@@ -145,6 +142,8 @@ function planRow(plan: WixPlan): PlanRow {
     noBadge: !badge,
     hasBadge: !!badge,
     joinUrl: joinUrl(plan),
+    appleSupported: plan.pricing?.singlePaymentUnlimited === true,
+    joined: false, joinLabel: copyParam("plans.joinCta", "Join"), joinDisabled: true, joinNote: "",
   };
 }
 
@@ -170,9 +169,97 @@ function idOf(arg: unknown): string {
   return typeof value === "string" ? value : "";
 }
 
+const commerce = createIapCommerce({ adapters: [pricingPlanOrders], onChange: () => { void svc.pricingPublish(); } });
+let rows: PlanRow[] = [];
+let items: IapCatalogItem[] = [];
+let message = "";
+let started = false;
+let loading = 0;
+let contentReady = false;
+const joining = new Set<string>();
+const memberSession = hostSessionFromGlobal();
+let regularGeneration = -1;
+let regularAccess = new Set<string>();
+
+
+function pricedState(state: State): State {
+  if (!contentReady) return state;
+  const priced = rows.map(row => {
+    const reference = { kind: "pricingPlan", id: row.id };
+    const view = commerce.pricing.view(reference);
+    const price = iapPriceFields(view, iapPriceCopy("plans"));
+    const purchase = commerce.purchaseFields(reference, iapPurchaseCopy("plans"));
+    const apple = purchase.appleRoute;
+    const regularReady = regularGeneration === memberSession.current().generation && (!memberSession.identityBound || memberSession.current().kind === "member");
+    const joined = apple ? purchase.accessReady : regularReady && regularAccess.has(row.id);
+    return { ...row, priceLine: view.route === "disabled" ? row.priceLine : price.priceText,
+      periodLine: apple ? price.priceNote : view.route === "regular" || view.route === "disabled" ? row.periodLine : "",
+      trialBadge: apple || price.actionDisabled ? "" : row.trialBadge,
+      noTrialBadge: apple || price.actionDisabled || row.noTrialBadge,
+      joined,
+      joinLabel: joined ? copyParam("plans.joinedLabel", "Current plan") : apple ? purchase.buyLabel : row.joinLabel,
+      joinDisabled: joined || (apple ? purchase.buyDisabled || !row.appleSupported : price.actionDisabled || !regularReady) || joining.has(row.id),
+      joinNote: apple ? row.appleSupported ? purchase.buyNote : iapPriceCopy("plans").purchaseUnavailable : price.actionNote };
+  });
+  const owned = priced.find(row => row.joined);
+  const poll = commerce.pollDirective("himiBrandedPlans.iapPoll");
+  return { ...state, ...ready(priced, owned ? copyTemplate("plans.joinedMessage", "You've joined {name}.", { name: owned.name }) : message), ...(poll ? { _poll: poll } : {}) };
+}
+
+async function regularJoinMessage(row: PlanRow, reference: { kind: string; id: string }): Promise<string> {
+  const generation = memberSession.current().generation;
+  if (row.joinUrl) {
+    try {
+      const result = await openUrl(row.joinUrl, "in_app_browser");
+      if (result.opened) { return ""; }
+    } catch {
+    }
+  }
+  try {
+    const created = await createOnlineOrder(row.id);
+    const snapshotId = created.purchaseFlowId;
+    if (generation !== memberSession.current().generation) return "";
+    if (created.order?.status === "ACTIVE") {
+      regularAccess.add(row.id);
+      return copyTemplate("plans.joinedMessage", "You've joined {name}.", { name: row.name });
+    }
+    const pay = await payCashierOrder({
+      appId: WIX_PRICING_PLANS_APP_ID,
+      snapshotId: snapshotId ?? "",
+      msid: await resolveMsid(),
+      mayCharge: () => commerce.pricing.continueCheckoutGuard(reference).allowed,
+      cashierUrl: async () => {
+        if (!commerce.pricing.continueCheckoutGuard(reference).allowed) return undefined;
+        const redirect = await createRedirectSession({
+          paidPlansCheckout: { planId: row.id },
+          callbacks: { postFlowUrl: "himalaya-himi-branded-lite://screen/himi_plans" },
+        });
+        return redirect.redirectSession?.fullUrl;
+      },
+    });
+    if (pay.kind === "paid") {
+      const access = await entitlement(row.id);
+      if (generation !== memberSession.current().generation) return "";
+      if (access.entitled) regularAccess.add(row.id);
+      return access.entitled
+        ? copyTemplate("plans.joinedMessage", "You've joined {name}.", { name: row.name })
+        : copyParam("plans.purchaseProcessingText", "Processing your purchase…");
+    }
+    if (pay.kind === "handoff") { return ""; }
+    if (pay.kind === "cancelled") {
+      return copyParam("plans.joinCancelledMessage", "Payment cancelled — you haven't joined.");
+    }
+  } catch {
+  }
+  return copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name });
+}
+
 const svc = defineService<State, {
-  load: (state: State, arg?: unknown) => Promise<State>;
-  join: (state: State, arg?: unknown) => Promise<State>;
+  load: (state: State, arg?: unknown) => Promise<State | undefined>;
+  pricingPublish: (state: State) => State;
+  pricingRefresh: (state: State) => Promise<undefined>;
+  iapPoll: (state: State) => Promise<undefined>;
+  join: (state: State, arg?: unknown) => Promise<State | undefined>;
 }>("himiBrandedPlans", {
   state: {
     status: "loading",
@@ -187,13 +274,38 @@ const svc = defineService<State, {
     noRows: true,
     noEmpty: true,
   },
+  notHydrated: ["rows", "actionMessage"],
   actions: {
+    pricingPublish: pricedState,
+    pricingRefresh: async () => { await commerce.loadPrices(items); return undefined; },
+    iapPoll: async () => { await commerce.poll(); void svc.pricingPublish(); return undefined; },
     load: async (state, arg) => {
       stashCopy(arg);
+      const seq = ++loading;
+      const generation = memberSession.current().generation;
+      regularGeneration = -1;
+      regularAccess = new Set();
       try {
         const response = await listPublicPlans();
-        return ready((response.plans ?? []).filter((plan) => !plan.archived).map(planRow));
+        if (seq !== loading) return undefined;
+        message = "";
+        contentReady = true;
+        rows = (response.plans ?? []).filter(plan => !plan.archived).map(planRow);
+        items = rows.map(row => ({ reference: { kind: "pricingPlan", id: row.id }, commerceDisplayPrice: row.priceLine }));
+        void svc.pricingPublish();
+        const access = rows.length > 0 && memberSession.current().kind === "member" ? await activePlanIds() : [];
+        if (seq !== loading || generation !== memberSession.current().generation) return undefined;
+        regularAccess = new Set(access);
+        regularGeneration = generation;
+        await commerce.loadPrices(items);
+        await (started ? commerce.reconcile() : commerce.start());
+        if (seq !== loading || generation !== memberSession.current().generation) return undefined;
+        started = true;
+        void svc.pricingPublish();
+        return undefined;
       } catch {
+        if (seq !== loading || generation !== memberSession.current().generation) return undefined;
+        contentReady = false;
         // Bridge errors (e.g. a 501 from a serve bridge without the route) land
         // here — a graceful error card with retry, never a dead screen.
         return {
@@ -209,57 +321,26 @@ const svc = defineService<State, {
     },
     join: async (state, arg) => {
       const row = state.rows.find((candidate) => candidate.id === idOf(arg));
-      if (!row) return state;
-      // A plan-carried purchasable URL still takes precedence (defensive: no
-      // documented field emits one today, but if a future payload does we honor
-      // it before minting a redirect session).
-      if (row.joinUrl) {
-        try {
-          const result = await openUrl(row.joinUrl, "in_app_browser");
-          if (result.opened) return { ...state, actionMessage: "" };
-        } catch {
-          // fall through to the redirect-session rail below
-        }
+      if (!row || joining.has(row.id)) return undefined;
+      const reference = { kind: "pricingPlan", id: row.id };
+      const purchase = commerce.purchaseFields(reference, iapPurchaseCopy("plans"));
+      if (purchase.accessReady) return undefined;
+      if (purchase.appleRoute) {
+        if (!row.appleSupported) return undefined;
+        await commerce.buy({ reference });
+        void svc.pricingPublish();
+        return undefined;
       }
-      // Phase 2b — NATIVE join: create the member's plan order, then settle any
-      // balance on the shared in-app pay rail. A FREE (or fully-discounted) plan comes
-      // back active with no `purchaseFlowId` and needs no payment step at all, which is
-      // the case the hosted redirect used to make needlessly heavy.
+      if (regularGeneration !== memberSession.current().generation || (memberSession.identityBound && memberSession.current().kind !== "member") || regularAccess.has(row.id) || !commerce.pricing.checkoutGuard(reference).allowed) return undefined;
+      joining.add(row.id);
+      void svc.pricingPublish();
       try {
-        const created = await createOnlineOrder(row.id);
-        const snapshotId = created.purchaseFlowId;
-        if (!snapshotId) {
-          // Nothing to charge ⇒ the membership is already active.
-          return { ...state, actionMessage: copyTemplate("plans.joinedMessage", "You've joined {name}.", { name: row.name }) };
-        }
-        const pay = await payCashierOrder({
-          appId: WIX_PRICING_PLANS_APP_ID,
-          snapshotId,
-          msid: await resolveMsid(),
-          // Wallet-less apps keep the hosted plans checkout, IN-APP — so a site with no
-          // provisioned wallet can still sell memberships (see @wix/himalaya/checkout).
-          cashierUrl: async () => {
-            const redirect = await createRedirectSession({
-              paidPlansCheckout: { planId: row.id },
-              callbacks: { postFlowUrl: "himalaya-himi-branded-lite://screen/himi_plans" },
-            });
-            return redirect.redirectSession?.fullUrl;
-          },
-        });
-        if (pay.kind === "paid") {
-          return { ...state, actionMessage: copyTemplate("plans.joinedMessage", "You've joined {name}.", { name: row.name }) };
-        }
-        if (pay.kind === "handoff") return { ...state, actionMessage: "" };
-        if (pay.kind === "cancelled") {
-          return { ...state, actionMessage: copyParam("plans.joinCancelledMessage", "Payment cancelled — you haven't joined.") };
-        }
-      } catch {
-        // Order/pay failure → graceful site-directing fallback below.
+        message = await regularJoinMessage(row, reference);
+        return undefined;
+      } finally {
+        joining.delete(row.id);
+        void svc.pricingPublish();
       }
-      return {
-        ...state,
-        actionMessage: copyTemplate("plans.joinOnSiteMessage", "Memberships are purchased on the website — visit the site to join {name}.", { name: row.name }),
-      };
     },
   },
 });
@@ -270,5 +351,13 @@ const svc = defineService<State, {
 // loading skeleton indefinitely on iOS. onAppear still fires afterwards and
 // re-loads with the screen's copy pack; it passes no required params here
 // (`appear(..., undefined, "<prefix>.")`), so a param-less first load is safe.
+resetUnhydratedKeysOnOlderRuntime(svc, { ...svc.getState(), rows: [], actionMessage: "" }, ["rows", "actionMessage"]);
+memberSession.subscribe(() => {
+  message = "";
+  regularGeneration = -1;
+  regularAccess = new Set();
+  void svc.pricingPublish();
+  void svc.load();
+});
 svc.load();
 export { svc };

package/templates/yoga-studio/tier5-src/wix-spaces-plan-detail/index.ts

@@ -1,17 +1,22 @@
 // Tier-5 bundle: Wix Spaces clone — Pricing plan detail (ON-DEVICE, site-scoped).
 // himalaya.input.id carries the plan id; fetched via getPlan.
-import { defineService } from "@himalaya/state";
+import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { getPlan, type WixPlan } from "@himalaya/wix-pricing-plans";
 import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
 interface S extends PresenceFlags { status: "loading" | "ready"; name: string; price: string; description: string; perks: string }
 
 function priceOf(p: WixPlan): string {
-  const m = p.pricing?.price as unknown as { formattedAmount?: string; amount?: string; currency?: string } | undefined;
+  const m = p.pricing?.price as unknown as { formattedAmount?: string; amount?: string; value?: string; currency?: string } | undefined;
   if (!m) return p.pricing?.freeTrialDays ? "Free trial" : "";
-  return m.formattedAmount || [m.amount, m.currency].filter(Boolean).join(" ");
+  return m.formattedAmount || [m.amount ?? m.value, m.currency].filter(Boolean).join(" ");
 }
 
+const defineService = withIapPresentation<S>({
+  prefix: "plans", transientKeys: ["price"], contentActions: ["load"],
+  items: state => detailInputId() ? [{ reference: { kind: "pricingPlan", id: detailInputId() }, commerceDisplayPrice: state.price }] : [],
+  present: (state, price) => ({ ...state, price: price(detailInputId()) }),
+});
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesPlanDetail", {
   state: { status: "loading", name: "", price: "", description: "", perks: "", ...presence("loading") },
   actions: {

package/templates/yoga-studio-owner/tier5-src/_shared/collection-contract.ts

@@ -87,7 +87,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
-  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
+  himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3', 'joinNote'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
   himiBrandedPrograms: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },

package/templates/yoga-studio-owner/tier5-src/_shared/collection-service.ts

@@ -323,6 +323,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
 /** Domain-owned page source with shared query controls. Publishing uses a normal
  * reducer and reads the private controller snapshot, never an SDUI payload. */
 export function defineBackendCollection<S extends object, Row extends object>(name: string, options: {
+  register?: typeof register;
   /** Revalidate already opened pages on navigation return; explicit refresh resets. */
   restorePagesOnLoad?: boolean;
   /** The load action's argument (onAppear params beyond `copy`), before the query runs — for a
@@ -342,7 +343,7 @@ export function defineBackendCollection<S extends object, Row extends object>(na
     controller: controller as unknown as BackendCollection['controller'],
     apply: (state, page) => options.apply(state as S, page as unknown as CollectionQueryState<Row>) as State,
   });
-  const handle = register(name, definition);
+  const handle = (options.register ?? register)(name, definition);
   publish = () => handle.collectionDataChanged();
   return handle;
 }
@@ -350,7 +351,7 @@ export function defineBackendCollection<S extends object, Row extends object>(na
 /** Keep the domain service's existing TypeScript API. Extra collection verbs are
  * dispatched through SDUI and do not widen the native capability surface. */
 export const defineService: typeof register = ((name: string, def: ServiceDefinition<unknown>) =>
-  register(name, decorateCollection(name, def as unknown as { state: State; actions?: Record<string, Reducer> }))) as typeof register;
+  register(name, { ...def, ...decorateCollection(name, def as unknown as { state: State; actions?: Record<string, Reducer> }) } as ServiceDefinition<State>)) as typeof register;
 
 /** Domains can supply their existing saved-items store without putting domain
  * data or mutations in the shared collection layer. */

package/templates/yoga-studio-owner/tier5-src/_shared/home-service.ts

@@ -87,4 +87,5 @@ export function decorateHome(def: { state: State; actions?: Record<string, Actio
   actions.homeMoveDown = change(id => { const index = prefs.order.indexOf(id); if (index >= 0 && index < prefs.order.length - 1) [prefs.order[index], prefs.order[index + 1]] = [prefs.order[index + 1], prefs.order[index]]; });
   return { state: derive(def.state), actions };
 }
-export const defineService: typeof register = ((name: string, def: ServiceDefinition<unknown>) => register(name, decorateHome(def as unknown as { state: State; actions?: Record<string, Action> }))) as typeof register;
+export const defineService: typeof register = ((name: string, def: ServiceDefinition<unknown>) =>
+  register(name, { ...def, ...decorateHome(def as unknown as { state: State; actions?: Record<string, Action> }) })) as typeof register;