@wix/himalaya-cli 0.1378.0 → 0.1379.0

package/templates/branded-lite/tier5-src/himi-branded-lite-wallet/index.ts

@@ -0,0 +1,217 @@
+// Tier-5 bundle: Branded Lite — My Wallet (the member's saved payment methods).
+//
+// The cards a member chose to save at checkout, read from Wix Payments on the member's
+// own site (@himalaya/wix-ecom listMySavedPaymentMethods — the native transport routes it there). Like the site's My Wallet
+// page, a member can make one the default for checkout or remove one — there is no
+// "add a card" here: a card is saved while paying. Only the last four digits, the
+// expiry and the cardholder name ever reach the app.
+import { defineService } from "@himalaya/state";
+import {
+  deleteSavedPaymentMethod,
+  listMySavedPaymentMethods,
+  markSavedPaymentMethodPrimary,
+  type WixSavedPaymentMethod,
+} from "@himalaya/wix-ecom";
+import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
+import { assertMemberAccess, memberAccess, memberAccessDenied, memberChanged, type MemberAccess } from "../_shared/member-access.js";
+import { memberAccountRoutes } from "../_shared/member-account-routes.js";
+import { cardBrand } from "../_shared/saved-card.js";
+
+interface CardRow {
+  id: string;
+  title: string;
+  detail: string;
+  isPrimary: boolean;
+  notPrimary: boolean;
+  confirming: boolean;
+  notConfirming: boolean;
+  hideActions: boolean;
+}
+
+interface State {
+  status: "loading" | "ready" | "error";
+  rows: CardRow[];
+  message: string;
+  errorText: string;
+  needsSignIn: boolean;
+  unavailable: boolean;
+  noUnavailable: boolean;
+  isLoading: boolean;
+  notLoading: boolean;
+  notErrored: boolean;
+  noSignIn: boolean;
+  hideList: boolean;
+  noEmpty: boolean;
+}
+
+let member: MemberAccess | undefined;
+let methods: WixSavedPaymentMethod[] = [];
+let confirmId = "";
+let busy = false;
+
+function rowOf(method: WixSavedPaymentMethod, now: Date): CardRow {
+  const id = method.id ?? "";
+  const card = method.paymentMethod?.cardInfo;
+  const last4 = card?.lastFourDigits?.trim() ?? "";
+  const isPayPal = (method.paymentMethod?.typeId ?? "").toLowerCase() === "paypal";
+  const name = isPayPal ? "PayPal" : cardBrand(card?.bin ?? "") || copyParam("wallet.cardLabel", "Card");
+  const title = last4 ? `${name} •••• ${last4}` : name;
+  const month = card?.expirationMonth, year = card?.expirationYear;
+  let expiry = "";
+  if (month && year) {
+    const mmyy = `${String(month).padStart(2, "0")}/${String(year).slice(-2)}`;
+    // A card is good through the last day of its expiry month.
+    const expired = year < now.getFullYear() || (year === now.getFullYear() && month < now.getMonth() + 1);
+    expiry = expired
+      ? copyTemplate("wallet.expiredLabel", "Expired {date}", { date: mmyy })
+      : copyTemplate("wallet.expiresLabel", "Expires {date}", { date: mmyy });
+  }
+  const isPrimary = method.primary === true;
+  const confirming = id === confirmId;
+  return {
+    id,
+    title,
+    detail: [expiry, card?.cardholderName?.trim()].filter(Boolean).join(" · "),
+    isPrimary,
+    notPrimary: !isPrimary,
+    confirming,
+    notConfirming: !confirming,
+    hideActions: confirming,
+  };
+}
+
+function derive(state: State): State {
+  const ready = state.status === "ready" && !state.unavailable;
+  const now = new Date();
+  // The default card leads, like the site's own page.
+  const ordered = [...methods].sort((a, b) => Number(b.primary === true) - Number(a.primary === true));
+  const rows = ready ? ordered.filter((m) => !!m.id).map((m) => rowOf(m, now)) : [];
+  return {
+    ...state,
+    rows,
+    noUnavailable: !state.unavailable,
+    isLoading: state.status === "loading",
+    notLoading: state.status !== "loading",
+    notErrored: state.status !== "error",
+    noSignIn: !ready || !state.needsSignIn,
+    hideList: !ready || state.needsSignIn || rows.length === 0,
+    noEmpty: !ready || state.needsSignIn || rows.length > 0,
+  };
+}
+
+const INITIAL: State = derive({
+  status: "loading", rows: [], message: "", errorText: "", needsSignIn: false, unavailable: false, noUnavailable: true,
+  isLoading: true, notLoading: false, notErrored: true, noSignIn: true, hideList: true, noEmpty: true,
+});
+
+// 100 per page is the service maximum; the page cap only stops a cursor that never ends.
+const MAX_PAGES = 10;
+
+async function allSavedPaymentMethods(): Promise<WixSavedPaymentMethod[]> {
+  const all: WixSavedPaymentMethod[] = [];
+  let cursor = "";
+  for (let page = 0; page < MAX_PAGES; page++) {
+    const response = await listMySavedPaymentMethods({ limit: 100, ...(cursor ? { cursor } : {}) });
+    all.push(...(response.savedPaymentMethods ?? []));
+    const next = response.pagingMetadata?.cursors?.next ?? "";
+    if (response.pagingMetadata?.hasNext === false || !next || next === cursor) break;
+    cursor = next;
+  }
+  return all;
+}
+
+async function load(state: State, arg?: unknown): Promise<State> {
+  stashCopy(arg);
+  confirmId = "";
+  if (!(await memberAccountRoutes()).wallet) {
+    methods = [];
+    return derive({ ...state, status: "ready", unavailable: true, needsSignIn: false, message: "", errorText: "" });
+  }
+  try {
+    member = await memberAccess();
+    if (!member.email) {
+      methods = [];
+      return derive({ ...state, status: "ready", unavailable: false, needsSignIn: true, message: "", errorText: "" });
+    }
+    const all = await allSavedPaymentMethods();
+    await assertMemberAccess(member);
+    methods = all;
+    // A fresh load drops the last write's confirmation; write() sets it again after this.
+    return derive({ ...state, status: "ready", unavailable: false, needsSignIn: false, message: "", errorText: "" });
+  } catch (error) {
+    methods = [];
+    return derive({
+      ...state,
+      status: "error",
+      unavailable: false,
+      message: "",
+      errorText: memberAccessDenied(error)
+        ? copyParam("wallet.accessErrorText", "Your wallet is unavailable for this account. Try signing in again.")
+        : copyParam("wallet.loadErrorText", "Your saved cards could not be loaded."),
+    });
+  }
+}
+
+function argId(arg: unknown): string {
+  const id = (arg as { id?: unknown } | null)?.id;
+  return typeof id === "string" ? id : "";
+}
+
+async function write(state: State, run: () => Promise<unknown>, done: string, failed: string): Promise<State> {
+  if (busy || !member?.email) return state;
+  busy = true;
+  try {
+    await assertMemberAccess(member);
+    await run();
+    const next = await load(state);
+    return next.status === "ready" ? { ...next, message: done } : next;
+  } catch (error) {
+    if (await memberChanged(member, error)) return load(state);
+    return derive({ ...state, message: failed });
+  } finally {
+    busy = false;
+  }
+}
+
+const svc = defineService<State, {
+  load: (state: State, arg?: unknown) => Promise<State>;
+  retry: (state: State) => Promise<State>;
+  setPrimary: (state: State, arg?: unknown) => Promise<State>;
+  askRemove: (state: State, arg?: unknown) => State;
+  keep: (state: State) => State;
+  remove: (state: State, arg?: unknown) => Promise<State>;
+}>("himiBrandedWallet", {
+  state: INITIAL,
+  actions: {
+    load,
+    retry: (state) => load(derive({ ...state, status: "loading", message: "" })),
+    setPrimary: (state, arg) => {
+      const id = argId(arg);
+      const method = methods.find((m) => m.id === id);
+      if (!id || !method || method.primary) return Promise.resolve(state);
+      return write(state, () => markSavedPaymentMethodPrimary(id),
+        copyParam("wallet.primaryDone", "Default card updated."),
+        copyParam("wallet.primaryFailed", "The default card could not be changed. Try again."));
+    },
+    askRemove: (state, arg) => {
+      const id = argId(arg);
+      if (!methods.some((m) => m.id === id)) return state;
+      confirmId = id;
+      return derive({ ...state, message: "" });
+    },
+    keep: (state) => {
+      confirmId = "";
+      return derive(state);
+    },
+    remove: (state, arg) => {
+      // Only the card the member is confirming — a stale row tap removes nothing.
+      const id = argId(arg);
+      if (!id || id !== confirmId) return Promise.resolve(state);
+      return write(state, () => deleteSavedPaymentMethod(id),
+        copyParam("wallet.removeDone", "Card removed."),
+        copyParam("wallet.removeFailed", "The card could not be removed. Try again."));
+    },
+  },
+});
+
+export { svc };

package/templates/branded-lite/tier5-src/himi-store-account/index.ts

@@ -13,6 +13,7 @@ import { dispatch } from "@himalaya/dispatch";
 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";
 
 interface AuthRouteInput {
   intent?: string;
@@ -205,6 +206,14 @@ interface S {
   activityEmptyText: string;
   hasActivity: boolean;
   noActivity: boolean;
+  /** Set once a descriptor asks for the member-account links (appear param
+   *  `memberAccountLinks: "1"`). Only then does the probe read app_info, so a descriptor
+   *  that renders no such link need not declare that capability. */
+  memberAccountLinks: boolean;
+  /** Hides My Addresses where this runtime cannot reach the address book. */
+  noMemberAddresses: boolean;
+  /** Hides My Wallet where this runtime cannot reach saved cards. */
+  noMemberWallet: boolean;
 }
 
 function derive(s: S): S {
@@ -278,6 +287,8 @@ async function orderRows(memberEmail: string): Promise<AccountActivityRow[]> {
 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 routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
     try {
@@ -301,6 +312,9 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     noMemberImage: profile.noMemberImage,
     email: profile.memberEmail || s.email,
     message: "",
+    memberAccountLinks,
+    noMemberAddresses: !routes.addresses,
+    noMemberWallet: !routes.wallet,
     activityRows,
     activityTitle: copyParam("storeAccount.activityTitle", "Previous orders"),
     activitySummary: activityRows.length
@@ -394,6 +408,9 @@ const svc = defineService<S, {
     activityEmptyText: "No previous orders for this member yet.",
     hasActivity: false,
     noActivity: true,
+    memberAccountLinks: false,
+    noMemberAddresses: true,
+    noMemberWallet: true,
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },

package/templates/community-club/dev/index.ts

@@ -3187,6 +3187,7 @@ const SCREENS = runtimeSetting({
         "onAppear": {
           "actionId": "tier5.himiStoreAccount.refresh",
           "params": {
+            "memberAccountLinks": "1",
             "copy": "{\"account.subtitle\":\"RSVPs, groups and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — RSVPs and groups stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — RSVPs and groups stay with you.\"}"
           }
         }
@@ -3197,7 +3198,8 @@ const SCREENS = runtimeSetting({
       "integrity": "",
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
-        "wix_api"
+        "wix_api",
+        "app_info"
       ],
       "minBinaryVersion": "0.2.0",
       "bundleVersion": "0.0.1"

package/templates/community-club/tier5-src/_shared/branded-lite-hosted.ts

@@ -65,6 +65,8 @@ export const VERTICAL_ROOT_SCREENS: Readonly<Record<string, readonly string[]>>
  *  (`brandedLiteScreenOwners`, checked by the app's hosted-mode tests), so a screen added
  *  to a vertical without being listed here fails the build. */
 export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLiteVertical[]>> = {
+  himi_address: ["restaurants", "store"],
+  himi_addresses: ["restaurants", "store"],
   himi_badge: ["badges"],
   himi_badges: ["badges"],
   himi_blog: ["blog"],
@@ -127,6 +129,7 @@ export const HOSTED_SCREEN_VERTICALS: Readonly<Record<string, readonly BrandedLi
   himi_video: ["videos"],
   himi_video_channel: ["videos"],
   himi_videos: ["videos"],
+  himi_wallet: ["bookings", "plans", "restaurants", "store"],
 };
 
 /** The templated (`<prefix>[_/]<id>`) detail routes each vertical owns, pinned the same way. */

package/templates/community-club/tier5-src/_shared/member-access.ts

@@ -36,3 +36,17 @@ export async function assertMemberAccess(member: MemberAccess): Promise<void> {
 export function memberAccessDenied(error: unknown): boolean {
   return (error as { name?: string } | null)?.name === "MemberAccessChanged" || /(?:HTTP\s*(?:401|403)|READ_ORDER_FORBIDDEN|permission denied|forbidden)/i.test(String(error));
 }
+
+/** Did this write fail because the member changed (signed out, or another account)? Then
+ *  the screen reloads for whoever is signed in now. A 401/403 for the SAME member is only a
+ *  failed write: the caller keeps what the member typed and says so. */
+export async function memberChanged(member: MemberAccess | undefined, error: unknown): Promise<boolean> {
+  if ((error as { name?: string } | null)?.name === "MemberAccessChanged") return true;
+  if (!member || !memberAccessDenied(error)) return false;
+  try {
+    await assertMemberAccess(member);
+    return false;
+  } catch {
+    return true;
+  }
+}

package/templates/community-club/tier5-src/_shared/member-account-routes.ts

@@ -0,0 +1,43 @@
+// Can this host reach the member account routes My Addresses and My Wallet need?
+//
+// Both are served OFF www.wixapis.com (the address book on ecom.wix.com, saved cards on
+// the member's own site), so only a native runtime whose WixApiCapability pins them can
+// call them: HimalayaCore 1.4.0 and later. The web bridges refuse absolute URLs, and a
+// hosted app (Spaces) signs its calls with a capability pinned to www.wixapis.com. Saved
+// cards also need the shell to have bound its own site (app_info `memberSiteBound`): a
+// multi-app host such as Himi Player binds none, so its wallet route has no host. The
+// Account screen hides a link whose route is unreachable, and the screen says so instead
+// of failing a load.
+import { get as getAppInfo } from "@himalaya/app-info";
+import { isHostedWorker } from "./hosted-checkout.js";
+
+/** The HimalayaCore version whose WixApiCapability pins these routes. Checked here, at run
+ *  time: the screens declare no `minBinaryVersion`, because a release takes its highest
+ *  screen floor as its own and would then refuse every older binary. */
+export const MEMBER_ACCOUNT_ROUTES_MIN_BINARY = "1.4.0";
+
+function atLeast(version: string, floor: string): boolean {
+  const parts = (v: string) => v.split("-")[0].split(".").map((p) => Number.parseInt(p, 10) || 0);
+  const a = parts(version), b = parts(floor);
+  for (let i = 0; i < Math.max(a.length, b.length); i++) {
+    const x = a[i] ?? 0, y = b[i] ?? 0;
+    if (x !== y) return x > y;
+  }
+  return true;
+}
+
+export interface MemberAccountRoutes {
+  /** The address book on ecom.wix.com (My Addresses). */
+  addresses: boolean;
+  /** Saved cards on the member's own site (My Wallet). */
+  wallet: boolean;
+}
+
+export async function memberAccountRoutes(): Promise<MemberAccountRoutes> {
+  if (isHostedWorker()) return { addresses: false, wallet: false };
+  const info = await getAppInfo().catch(() => undefined);
+  if (!info) return { addresses: false, wallet: false };
+  const native = info.platform === "ios" || info.platform === "android" || info.platform === "macos";
+  const addresses = native && atLeast(info.binaryVersion ?? "", MEMBER_ACCOUNT_ROUTES_MIN_BINARY);
+  return { addresses, wallet: addresses && info.memberSiteBound === true };
+}

package/templates/community-club/tier5-src/himi-store-account/index.ts

@@ -13,6 +13,7 @@ import { dispatch } from "@himalaya/dispatch";
 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";
 
 interface AuthRouteInput {
   intent?: string;
@@ -205,6 +206,14 @@ interface S {
   activityEmptyText: string;
   hasActivity: boolean;
   noActivity: boolean;
+  /** Set once a descriptor asks for the member-account links (appear param
+   *  `memberAccountLinks: "1"`). Only then does the probe read app_info, so a descriptor
+   *  that renders no such link need not declare that capability. */
+  memberAccountLinks: boolean;
+  /** Hides My Addresses where this runtime cannot reach the address book. */
+  noMemberAddresses: boolean;
+  /** Hides My Wallet where this runtime cannot reach saved cards. */
+  noMemberWallet: boolean;
 }
 
 function derive(s: S): S {
@@ -278,6 +287,8 @@ async function orderRows(memberEmail: string): Promise<AccountActivityRow[]> {
 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 routes = memberAccountLinks ? await memberAccountRoutes() : { addresses: false, wallet: false };
   let activityRows: AccountActivityRow[] = [];
   if (profile.isMember) {
     try {
@@ -301,6 +312,9 @@ async function probe(s: S, arg?: unknown): Promise<S> {
     noMemberImage: profile.noMemberImage,
     email: profile.memberEmail || s.email,
     message: "",
+    memberAccountLinks,
+    noMemberAddresses: !routes.addresses,
+    noMemberWallet: !routes.wallet,
     activityRows,
     activityTitle: copyParam("storeAccount.activityTitle", "Previous orders"),
     activitySummary: activityRows.length
@@ -394,6 +408,9 @@ const svc = defineService<S, {
     activityEmptyText: "No previous orders for this member yet.",
     hasActivity: false,
     noActivity: true,
+    memberAccountLinks: false,
+    noMemberAddresses: true,
+    noMemberWallet: true,
   }),
   actions: {
     load: (s, arg) => { stashCopy(arg); return probe(s, arg); },

package/templates/community-club-owner/dev/index.ts

@@ -60950,22 +60950,6 @@ const SCREENS = runtimeSetting({
                                   "props": {
                                     "spacing": 8,
                                     "children": [
-                                      {
-                                        "id": "",
-                                        "body": {
-                                          "package": "himalaya",
-                                          "type": "Text",
-                                          "props": {
-                                            "text": "$service:himiOwnerLiteAria.widget.badge",
-                                            "style": "footnote",
-                                            "color": "textSecondary",
-                                            "maxLines": 12
-                                          }
-                                        },
-                                        "modifiers": {
-                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.badgeHidden"
-                                        }
-                                      },
                                       {
                                         "id": "",
                                         "body": {
@@ -61002,21 +60986,21 @@ const SCREENS = runtimeSetting({
                                           "package": "himalaya",
                                           "type": "Text",
                                           "props": {
-                                            "text": "$service:himiOwnerLiteAria.widget.bottomText",
+                                            "text": "$service:himiOwnerLiteAria.widget.notice",
                                             "style": "footnote",
                                             "color": "textSecondary",
                                             "maxLines": 12
                                           }
                                         },
                                         "modifiers": {
-                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.bottomTextHidden"
+                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.noticeHidden"
                                         }
                                       },
                                       {
                                         "id": "himi_owner_lite_aria.widget.OAUTH_REQUIRED.footer",
                                         "body": {
                                           "package": "himalaya",
-                                          "type": "HStack",
+                                          "type": "VStack",
                                           "props": {
                                             "spacing": 8,
                                             "children": [
@@ -61028,6 +61012,7 @@ const SCREENS = runtimeSetting({
                                                   "props": {
                                                     "title": "$service:himiOwnerLiteAria.widget.primaryLabel",
                                                     "style": "primary",
+                                                    "fullWidth": true,
                                                     "action": {
                                                       "actionId": "tier5.himiOwnerLiteAria.widgetPrimary"
                                                     }
@@ -61045,6 +61030,7 @@ const SCREENS = runtimeSetting({
                                                   "props": {
                                                     "title": "$service:himiOwnerLiteAria.widget.secondaryLabel",
                                                     "style": "secondary",
+                                                    "fullWidth": true,
                                                     "action": {
                                                       "actionId": "tier5.himiOwnerLiteAria.widgetSecondary"
                                                     }
@@ -61053,14 +61039,6 @@ const SCREENS = runtimeSetting({
                                                 "modifiers": {
                                                   "hiddenPath": "$service:himiOwnerLiteAria.widget.secondaryHidden"
                                                 }
-                                              },
-                                              {
-                                                "id": "",
-                                                "body": {
-                                                  "package": "himalaya",
-                                                  "type": "Spacer",
-                                                  "props": {}
-                                                }
                                               }
                                             ]
                                           }