@wix/himalaya-cli 0.1320.0 → 0.1322.0

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

@@ -7,16 +7,17 @@
 // screen; enrolling stays a hosted-site flow.
 // Four-state (loading / error / rows / empty) like the sibling branded workers.
 //
-// App Store prices come from the shared IAP catalog layer (@himalaya/iap). Until a mapping backend
-// is connected it is disabled, and this worker runs exactly its pre-pricing path.
+// App Store prices come from the shared IAP catalog layer (@himalaya/iap). An app that sells nothing
+// through the App Store reads every program as `disabled` and shows no price line.
 import { defineService as register } from "@himalaya/state";
 import { decorateCollection } from "../_shared/collection-service.js";
 import { queryPrograms, type WixProgram } from "@himalaya/wix-online-programs";
-import { createIapCatalogPricing, iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { iapPriceFields, onlineProgramItem, type IapPollDirective } from "@himalaya/iap";
+import { createIapCommerce } from "@himalaya/iap-checkout";
 import { wixMediaUrl } from "@himalaya/wix-media";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
-import { hostIapScope, hostScopeComplete, iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
+import { iapPriceCopy, resetUnhydratedKeysOnOlderRuntime } from "../_shared/iap-worker.js";
 
 const SERVICE = "himiBrandedPrograms";
 
@@ -133,10 +134,6 @@ function programFields(p: WixProgram): Omit<ProgramRow, "priceLine"> {
   };
 }
 
-function programRow(p: WixProgram): ProgramRow {
-  return { ...programFields(p), priceLine: "" };
-}
-
 function programContent(p: WixProgram): ProgramContent {
   return { ...programFields(p), wixId: p.id ?? "" };
 }
@@ -177,28 +174,22 @@ async function fetchPrograms(): Promise<WixProgram[]> {
   return (response.programs ?? []).filter((p) => !isDraft(p));
 }
 
-async function load(state: State, arg?: unknown): Promise<State> {
-  stashCopy(arg);
-  try {
-    return ready((await fetchPrograms()).map(programRow));
-  } catch {
-    return errored(state);
-  }
-}
-
-// ── App Store pricing (enabled only when a mapping backend is connected) ─────
+// ── Content and App Store prices ─────
 //
-// One writer: `loadPriced` keeps its content here and every state change goes through the
+// One writer: `load` keeps its content here and every state change goes through the
 // synchronous `pricingPublish`, which re-reads the latest content and prices. An async action
 // that returned its own state could land after a newer publication and repaint stale prices.
 
-const pricing = createIapCatalogPricing({ onChange: () => { void svc.pricingPublish(); } });
+// Prices only: the list sells nothing (each card opens the program, whose screen owns the sale),
+// so its composition has no adapters and never starts a checkout.
+const commerce = createIapCommerce({ onChange: () => { void svc.pricingPublish(); } });
+const pricing = commerce.pricing;
 const PRICING_NOT_HYDRATED = ["rows", "collection", "hidePriceRetry"] as const;
 let content: { status: State["status"]; programs: ProgramContent[] } = { status: "loading", programs: [] };
 let scopeIncomplete = false;
 let loadSeq = 0;
 
-async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
+async function load(_state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const seq = ++loadSeq;
   const programs = await fetchPrograms().catch(() => undefined);
@@ -212,12 +203,10 @@ async function loadPriced(_state: State, arg?: unknown): Promise<undefined> {
 /** Prices the programs on screen now. Content never waits on this, and the host scope is re-read
  *  each time, so a failed app-info read recovers on the next refresh. */
 async function priceContent(): Promise<void> {
-  // The Retry action is declared in both modes; with no backend it must not reach the host.
-  if (!pricing.enabled) return;
-  const host = await hostIapScope();
-  scopeIncomplete = !hostScopeComplete(host);
   if (content.status !== "ready") return;
-  await pricing.load({ ...host, items: content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []) });
+  const items = content.programs.flatMap((program) => onlineProgramItem({ id: program.wixId }) ?? []);
+  scopeIncomplete = !(await commerce.loadPrices(items)).scopeComplete;
+  void svc.pricingPublish();
 }
 
 function pricedState(state: State): State {
@@ -232,7 +221,8 @@ function pricedState(state: State): State {
   return {
     ...state, ...shown, programs: content.programs,
     // Retry re-prices the programs on screen, which only a ready list has.
-    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && (scopeIncomplete || view.retryable)),
+    // `disabled`: this app sells nothing through the App Store, so there is no price lookup to retry.
+    hidePriceRetry: content.status !== "ready" || !views.some((view) => view && view.route !== "disabled" && (scopeIncomplete || view.retryable)),
     priceRetryText: copyParam("programs.priceRetryText", "Some prices could not be loaded."),
   };
 }
@@ -260,7 +250,7 @@ type Actions = {
 };
 
 const actions: Actions = {
-  load: pricing.enabled ? loadPriced : load,
+  load,
   pricingPublish: pricedState,
   pricingStart: (state) => ({ ...pricedState(state), _poll: pricing.pollDirective(`${SERVICE}.pricingRefresh`) }),
   pricingRefresh: async () => { await priceContent(); return undefined; },
@@ -269,18 +259,14 @@ const actions: Actions = {
 // The collection decorator's own `defineService` drops `notHydrated`, so the decorated definition
 // is registered directly: this run's prices must never be restored from a cold-boot snapshot.
 const decorated = decorateCollection(SERVICE, { state: INITIAL_STATE, actions } as unknown as Parameters<typeof decorateCollection>[1]);
-const svc = register<State, Actions>(SERVICE, (pricing.enabled
-  ? { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] }
-  : decorated) as unknown as Parameters<typeof register<State, Actions>>[1]);
+const svc = register<State, Actions>(SERVICE, { ...decorated, notHydrated: [...PRICING_NOT_HYDRATED] } as unknown as Parameters<typeof register<State, Actions>>[1]);
 
-if (pricing.enabled) {
-  const booted = svc.getState();
-  if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
-    content = { status: booted.status, programs: booted.programs };
-  }
-  resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
-  void svc.pricingStart();
+const booted = svc.getState();
+if ((booted.status === "ready" || booted.status === "error") && Array.isArray(booted.programs)) {
+  content = { status: booted.status, programs: booted.programs };
 }
+resetUnhydratedKeysOnOlderRuntime(svc, decorated.state as unknown as State, PRICING_NOT_HYDRATED);
+void svc.pricingStart();
 
 // Kick the first load at module scope, like every other list bundle
 // (himi-store-shop, himi-booking-services, himi-events-list, himi-blog-feed …).