@wix/himalaya-cli 0.1387.0 → 0.1389.0

package/templates/events-meetups/tier5-src/_shared/iap-worker.ts

@@ -2,9 +2,9 @@
 // `@himalaya/iap-checkout` → createIapCommerce), shared by every screen that shows or sells an
 // IAP-backed item. Mapping, Apple prices, payment guards, the host scope and the sale live in the
 // SDK; this only supplies the copy and the hydration reset.
-import type { IapPriceCopy } from "@himalaya/iap";
-import type { IapPurchaseCopy } from "@himalaya/iap-checkout";
-import { copyParam } from "./himi-copy.js";
+import { hostSessionFromGlobal, type IapPriceCopy } from "@himalaya/iap";
+import type { IapCommerce, IapPurchaseCopy, IapRestoreResult } from "@himalaya/iap-checkout";
+import { copyParam, copyTemplate } from "./himi-copy.js";
 
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
 export function iapPriceCopy(prefix: string): IapPriceCopy {
@@ -31,6 +31,87 @@ export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
   };
 }
 
+/** The Restore purchases control (App Review 3.1.1) a screen binds. */
+export interface IapRestoreFields {
+  restoreHidden: boolean;
+  restoreLabel: string;
+  restoreDisabled: boolean;
+  restoreMessage: string;
+}
+
+/** Keep these out of hydration: a restore's answer belongs to the run that got it. */
+export const IAP_RESTORE_KEYS = ["restoreHidden", "restoreLabel", "restoreDisabled", "restoreMessage"] as const;
+
+/** The control before the screen knows it sells through Apple. */
+export const NO_IAP_RESTORE: IapRestoreFields = { restoreHidden: true, restoreLabel: "", restoreDisabled: false, restoreMessage: "" };
+
+export interface IapRestoreControl {
+  /** `sellsThroughApple` is the screen's own signal: its item's App Store route, or Account's
+   *  purchase readiness. */
+  fields(sellsThroughApple: boolean): IapRestoreFields;
+  /** Runs the shared `commerce.restore()`, repainting as it starts and when it answers. A tap while
+   *  one runs is ignored. */
+  run(): Promise<void>;
+}
+
+/** Copy from the screen's pack (`<prefix>.restorePurchasesCta`, …). The restore itself, and the access
+ *  re-read after it, are the shared commerce's. */
+export function createIapRestore(
+  commerce: Pick<IapCommerce, "restore">,
+  options: { prefix: string; repaint(): void; /** The session generation; defaults to the host's. */ generation?: () => number },
+): IapRestoreControl {
+  const generation = options.generation ?? (() => hostSessionFromGlobal().current().generation);
+  let running = false;
+  let message = "";
+  let messageGeneration = -1;
+
+  function say(text: string, forGeneration: number): void {
+    message = text;
+    messageGeneration = forGeneration;
+  }
+
+  async function run(): Promise<void> {
+    if (running) return;
+    running = true;
+    const startedFor = generation();
+    say(copyParam(`${options.prefix}.restoringText`, "Restoring…"), startedFor);
+    options.repaint();
+    // Stamped with the session the tap was for: an answer landing after a sign-out is never shown.
+    say(restoreMessage(await restored(commerce), options.prefix), startedFor);
+    running = false;
+    options.repaint();
+  }
+
+  return {
+    fields: (sellsThroughApple) => ({
+      restoreHidden: !sellsThroughApple,
+      restoreLabel: copyParam(`${options.prefix}.restorePurchasesCta`, "Restore purchases"),
+      restoreDisabled: running,
+      // The answer was for the person signed in when it ran; another session never inherits it.
+      restoreMessage: sellsThroughApple && messageGeneration === generation() ? message : "",
+    }),
+    run,
+  };
+}
+
+function restored(commerce: Pick<IapCommerce, "restore">): Promise<IapRestoreResult> {
+  return commerce.restore().catch(() => ({ status: "failed", code: "storeUnavailable" }) as const);
+}
+
+function restoreMessage(result: IapRestoreResult, prefix: string): string {
+  if (result.status === "needsSignIn") return copyParam(`${prefix}.restoreSignInText`, "Sign in to restore your purchases.");
+  if (result.status === "failed") return result.code === "sessionChanged" ? "" : copyParam(`${prefix}.restoreFailedText`, "Couldn't reach the App Store. Try again.");
+  // Every part that happened is said: a recovery never hides a refusal or a purchase still pending.
+  const parts = [
+    result.recovered === 1 ? copyParam(`${prefix}.restoredOneText`, "Restored 1 purchase.") : "",
+    result.recovered > 1 ? copyTemplate(`${prefix}.restoredManyText`, "Restored {count} purchases.", { count: result.recovered }) : "",
+    // Held unfinished because Wix refused it (another member's purchase, say).
+    result.refused > 0 ? copyParam(`${prefix}.restoreRefusedText`, "A purchase on this Apple ID couldn't be added to this account. Contact support.") : "",
+    result.pending > 0 ? copyParam(`${prefix}.restorePendingText`, "A purchase is still being confirmed. Try again in a moment.") : "",
+  ].filter(Boolean);
+  return parts.length ? parts.join(" ") : copyParam(`${prefix}.restoreUpToDateText`, "Your purchases are up to date.");
+}
+
 /** What `notHydrated` does, for a runtime that ignores the option (a binary older than it, still
  *  served new bundles): put the listed keys back to their declared values before any action runs,
  *  so a persisted price or an enabled purchase action never paints as this run's. */

package/templates/events-meetups/tier5-src/_shared/video-caption.ts

@@ -0,0 +1,21 @@
+// The video carousel's two looks: the caption ON the cover (a brand label chip over the
+// image) or UNDER it. Every slide carries both placements; the descriptor's
+// `videoCaption` appear param picks one, and these flags hide the other
+// (`hiddenWhen` hides on TRUE). So a screen switches look by changing ONE param,
+// with no second carousel and no change to the slide tree.
+export type VideoCaption = "overlay" | "below";
+
+/** The placement a param asks for. Anything but "below" is the default, "overlay". */
+export function videoCaptionOf(value: unknown): VideoCaption {
+  return value === "below" ? "below" : "overlay";
+}
+
+export interface CaptionFlags {
+  captionOnImage: boolean;
+  captionBelow: boolean;
+}
+
+/** Stamp each card with the gates its slide reads (`$item.captionOnImage` / `$item.captionBelow`). */
+export function withCaption<T extends object>(cards: T[], caption: VideoCaption): (T & CaptionFlags)[] {
+  return cards.map((card) => ({ ...card, captionOnImage: caption === "overlay", captionBelow: caption === "below" }));
+}

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

@@ -22,12 +22,18 @@ import { formatDateMedium } from "../_shared/engine-intl.js";
 import { readSavedProducts, type SavedProduct } from "../_shared/himi-store-saved.js";
 import { readSavedIds } from "../_shared/himi-blog-saved.js";
 import { wixMediaUrl } from "@himalaya/wix-media";
+import { isWixVideoWebRefusal, listLatestVideos, videoCard, type WixVideoCard } from "@himalaya/wix-video";
+import { videoCaptionOf, withCaption, type CaptionFlags } from "../_shared/video-caption.js";
 
 /** Latched once the member feed is refused because of WHERE the app is running rather
  *  than because of the request — see the catch in `loadExtras`. Module scope, so it
  *  survives every refresh of this worker and is reset only by a fresh boot. */
 let feedSurfaceRefused = false;
 
+/** The same latch for Wix Video: its gateway is reachable from the native apps only, so a
+ *  web bridge's refusal is permanent for this boot and the rail stays collapsed. */
+let videoSurfaceRefused = false;
+
 /** True for the one refusal that can never change while the app keeps running: the web
  *  bridge reporting that this host is not reachable from a browser at all. Deliberately
  *  narrower than `isBridgeUnavailable` — a 502/503 is an outage worth retrying, and only
@@ -292,6 +298,10 @@ interface State {
   noNextEvent: boolean;
   homePrograms: ProgramCard[];
   noHomePrograms: 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)[];
+  noHomeVideos: boolean;
   feedHighlights: FeedHighlight[];
   noFeedHighlights: boolean;
   /** communityPulse member strip — the author directory of the SAME feed read
@@ -529,6 +539,7 @@ interface ExtrasSignal {
   upcomingEvents: EventEntry[];
   nextEventCards: NextEventCard[];
   homePrograms: ProgramCard[];
+  homeVideos: (WixVideoCard & CaptionFlags)[];
   feedHighlights: FeedHighlight[];
   memberAvatars: CoachAvatar[];
   groupCards: GroupCard[];
@@ -539,7 +550,7 @@ interface ExtrasSignal {
 }
 
 function emptyExtrasSignal(): ExtrasSignal {
-  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
+  return { upcomingEvents: [], nextEventCards: [], homePrograms: [], homeVideos: [], feedHighlights: [], memberAvatars: [], groupCards: [], announcementTitle: "", postCards: [], popularDishes: [], menuCategories: [] };
 }
 
 /** Cover URL probe for a blog post — the himi-blog-feed imageUrl fallbacks
@@ -679,6 +690,18 @@ async function fetchHomePrograms(): Promise<ProgramCard[]> {
   }
 }
 
+/** ONE Wix Video read for the videos module. A failure collapses the module; the web
+ *  bridges' refusal of the gateway also latches it off for the rest of this boot. */
+async function fetchHomeVideos(): Promise<WixVideoCard[]> {
+  try {
+    const untitled = copyParam("home.videoFallbackTitle", "Video");
+    return (await listLatestVideos({ limit: 8 })).map((entry) => videoCard(entry, untitled));
+  } catch (error) {
+    if (isWixVideoWebRefusal(error)) videoSurfaceRefused = true;
+    return [];
+  }
+}
+
 function homeFeedText(item: WixFeedItem): string {
   const blocks = item.content?.blocks;
   if (Array.isArray(blocks)) {
@@ -731,6 +754,10 @@ async function fetchExtrasSignal(arg: unknown): Promise<ExtrasSignal> {
   if (verticals.includes("programs")) {
     jobs.push(fetchHomePrograms().then((cards) => { extras.homePrograms = cards; }));
   }
+  if (verticals.includes("videos") && !videoSurfaceRefused) {
+    const caption = videoCaptionOf(paramValue(arg, "videoCaption"));
+    jobs.push(fetchHomeVideos().then((cards) => { extras.homeVideos = withCaption(cards, caption); }));
+  }
   if (verticals.includes("blog")) {
     // ONE limit-8 posts query feeds BOTH the communityPulse announcement
     // (posts[0].title — the frozen contract) and the showcaseFirst/episodeFirst
@@ -847,6 +874,7 @@ function derive(state: State): State {
     noUpcomingEvents: state.upcomingEvents.length === 0,
     noNextEvent: state.nextEventCards.length === 0,
     noHomePrograms: state.homePrograms.length === 0,
+    noHomeVideos: state.homeVideos.length === 0,
     noFeedHighlights: state.feedHighlights.length === 0,
     noMemberAvatars: state.memberAvatars.length === 0,
     noGroupCards: state.groupCards.length === 0,
@@ -938,6 +966,8 @@ function baseState(): State {
     noNextEvent: true,
     homePrograms: [],
     noHomePrograms: true,
+    homeVideos: [],
+    noHomeVideos: true,
     feedHighlights: [],
     noFeedHighlights: true,
     memberAvatars: [],

package/templates/events-meetups/tier5-src/himi-store-account/index.ts

@@ -14,6 +14,8 @@ import { searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
+import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
+import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
 
 interface AuthRouteInput {
   intent?: string;
@@ -152,7 +154,7 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
   }
 }
 
-interface S {
+interface S extends IapRestoreFields {
   status: "loading" | "ready";
   isMember: boolean;
   notMember: boolean;
@@ -214,6 +216,27 @@ interface S {
   noMemberAddresses: boolean;
   /** Hides My Wallet where this runtime cannot reach saved cards. */
   noMemberWallet: boolean;
+  /** Set once a descriptor asks for the Restore purchases row (appear param
+   *  `restorePurchases: "1"`). Only then does the worker reach the App Store layer, so a
+   *  descriptor that renders no such row need not declare `iap`. */
+  restorePurchases: boolean;
+}
+
+// Restore purchases (App Review 3.1.1) for every vertical the app sells through the App Store. The
+// row shows once purchasing is ready on this host (a bound iOS binary with managed StoreKit), to a
+// guest too: the restore itself asks them to sign in.
+const commerce = createIapCommerce({
+  adapters: [onlineProgramOrders, pricingPlanOrders, ...(storesAppleSalesEnabled() ? [storesProductOrders] : [])],
+  onChange: () => { void svc.restorePublish(); },
+});
+const restore = createIapRestore(commerce, { prefix: "storeAccount", repaint: () => { void svc.restorePublish(); } });
+let commerceEntered = false;
+
+/** The first entry reads readiness and recovers held purchases; later ones reconcile, as on any
+ *  screen that sells. */
+function enterCommerce(): void {
+  void (commerceEntered ? commerce.reconcile() : commerce.start());
+  commerceEntered = true;
 }
 
 function derive(s: S): S {
@@ -234,6 +257,7 @@ function derive(s: S): S {
     hideSignInChoices: isRegistering || isRecovering,
     hasActivity,
     noActivity: !hasActivity,
+    ...restore.fields(s.restorePurchases && commerce.readiness().status === "ready"),
     authTitle: headline.authTitle,
     authBody: headline.authBody,
     hasReturnPath,
@@ -288,6 +312,8 @@ async function probe(s: S, arg?: unknown): Promise<S> {
   const intent = authIntentFromArg(arg, s);
   const profile = await loadMemberProfile(copyParam("storeAccount.guestDetail", "Sign in to keep your cart and orders connected."));
   const memberAccountLinks = s.memberAccountLinks || strField(arg, "memberAccountLinks") === "1";
+  const restorePurchases = s.restorePurchases || strField(arg, "restorePurchases") === "1";
+  if (restorePurchases) enterCommerce();
   const routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
@@ -313,6 +339,7 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     email: profile.memberEmail || s.email,
     message: "",
     memberAccountLinks,
+    restorePurchases,
     noMemberAddresses: !routes.addresses,
     noMemberWallet: !routes.wallet,
     activityRows,
@@ -365,7 +392,10 @@ const svc = defineService<S, {
   signIn: (s: S) => Promise<S | undefined>;
   register: (s: S) => Promise<S | undefined>;
   signOut: (s: S) => Promise<S>;
+  restorePublish: (s: S) => S;
+  iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
+  notHydrated: [...IAP_RESTORE_KEYS],
   state: derive({
     status: "loading",
     isMember: false,
@@ -411,6 +441,8 @@ const svc = defineService<S, {
     memberAccountLinks: false,
     noMemberAddresses: true,
     noMemberWallet: true,
+    restorePurchases: false,
+    ...NO_IAP_RESTORE,
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },
@@ -503,8 +535,11 @@ const svc = defineService<S, {
       };
       return derive(cleared);
     },
+    restorePublish: (s) => derive(s),
+    iapRestore: async () => { await restore.run(); return undefined; },
   },
 });
 
+resetUnhydratedKeysOnOlderRuntime(svc, { ...svc.getState(), ...NO_IAP_RESTORE }, IAP_RESTORE_KEYS);
 svc.load();
 export { svc };

package/templates/events-meetups-owner/config.ts

@@ -41,6 +41,17 @@ export default defineApp({
   designTokensPath: "./tokens.json",
   navigation: {
     "navKind": "responsive",
+    "surfaces": {
+      "watch": {
+        "destinations": [
+          "home"
+        ],
+        "navKind": "single",
+        "screenIds": {
+          "home": "himi_owner_lite_wrist_home"
+        }
+      }
+    },
     "scheme": "himalaya-__HIMI_APP_SLUG__",
     "deepLinkPatterns": [],
     "linkableScreens": [