@wix/himalaya-cli 0.1523.0 → 0.1525.0

package/templates/beauty-salon/tier5-src/himi-store-product/index.ts

@@ -93,6 +93,25 @@ function productPolicyBody(product: StoreProduct, kind: "returns" | "shipping"):
  *  DIFFERENT product (drop the picks) from the same product coming back (keep them). */
 let lastLoadedId: string | undefined;
 let productLoadSequence = 0;
+let booting = true;
+let bootLoad: { id: string; state: Promise<S> } | undefined;
+
+/** The host replays the screen's onAppear load right after the module-scope one: that one replay
+ *  joins the boot load instead of reading the product, cart and App Store prices again. Any later
+ *  entry loads afresh, since the cart, the saved flag or a purchase may have changed meanwhile. */
+function joinedLoad(id: string, load: () => Promise<S>): Promise<S> {
+  if (booting) {
+    booting = false;
+    const current = { id, state: load() };
+    bootLoad = current;
+    const settle = () => { if (bootLoad === current) bootLoad = undefined; };
+    current.state.then(settle, settle);
+    return current.state;
+  }
+  const replayed = bootLoad;
+  bootLoad = undefined;
+  return replayed?.id === id ? replayed.state : load();
+}
 
 interface OptionSlots {
   opt1Label: string; opt1Chips: OptionChip[]; opt1Selected: string[]; opt1SelectedId: string; opt1Placeholder: string; noOpt1: boolean;
@@ -576,144 +595,146 @@ const svc = defineService<S, {
     purchasedNote: "",
   }),
   actions: {
-    load: async (s, arg): Promise<S> => {
+    load: (s, arg): Promise<S> => {
       stashCopy(arg);
-      enterCheckout();
-      const sequence = ++productLoadSequence;
-      lastProduct = undefined;
-      const id = inputId();
-      // Storage problems must not prevent browsing or buying a product.
-      let saved = false;
-      try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
-      s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
-      // A fresh navigation into the product resets any quantity left over
-      // from a previous visit to the same worker instance.
-      if (!id) {
+      return joinedLoad(inputId(), async (): Promise<S> => {
+        enterCheckout();
+        const sequence = ++productLoadSequence;
         lastProduct = undefined;
-        lastLoadedId = undefined;
-        return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
-      }
-      // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
-      // of after it — it used to add a whole cart round trip before the page could paint.
-      const cartCount = cartItemCount();
-      // The badge must never hold the page: remember the count if it is already in, and
-      // publish it separately if it lands after the product (#3468 review).
-      let cartKnown: number | undefined;
-      void cartCount.then((n) => { cartKnown = n; }, () => {});
-      // The live product read goes out FIRST too — the local-db read below must never delay it.
-      // Settled into a value so a failure is handled where it is awaited, never unhandled.
-      // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
-      const live = getStoreProduct(id, ["DESCRIPTION"]).then(
-        (r) => ({ ok: true as const, r }),
-        () => ({ ok: false as const }),
-      );
-      // Paint at once from the row the list already synced (name, price, image) — the page used
-      // to sit on its skeleton for the product round trip even when the list had just shown it.
-      // The live read then fills in the description and gallery.
-      const synced = await readCachedProduct(id);
-      let painted = false;
-      if (synced && s.status === "loading") {
-        await svc.paintCached(synced);
-        painted = true;
-      }
-      const outcome = await live;
-      if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
-      // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
-      // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
-      // they did — overwriting it would untick a stored save, reset the quantity, and drop the
-      // in-flight add's `adding` guard (a second tap would add the line twice).
-      const base: S = painted ? (svc.getState() as S) : s;
-      const keep = painted
-        ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
-        : { cartHint: "", quantity: 1 };
-      const badge = (): number => {
-        if (painted && (base.adding || base.added)) return base.cartCount;
-        if (cartKnown !== undefined) return cartKnown;
-        const epoch = cartBadgeEpoch;
-        void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
-        return base.cartCount;
-      };
-      if (outcome.ok) {
-        const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
-        const name = cleanTitle(p.name) || "Product";
-        const image = productImage(p, WIX_DETAIL_IMAGE);
-        lastProduct = p;
-        // A group with exactly one choice is chosen for the shopper; a real choice
-        // is left blank so the pick is deliberate.
-        const optionGroups = productOptions(p);
-        const sale = productSale(p);
-        // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
-        // trip to the cart and back silently clears the size the shopper picked and
-        // re-disables the CTA with no explanation. Carry the picks when this is the SAME
-        // product, and only for a choice the product still offers — a stale id would
-        // resolve to no variant and block the cart just as silently.
-        const carried: StoreOptionSelection = {};
-        if (id === lastLoadedId) {
-          for (const g of optionGroups) {
-            const chosen = s.selection[g.id];
-            if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+        const id = inputId();
+        // Storage problems must not prevent browsing or buying a product.
+        let saved = false;
+        try { saved = isProductSaved(id); } catch { /* save action reports a retryable error */ }
+        s = { ...s, saved, saveHint: "", shareHint: "", adding: false, added: false, addedSheetPresented: false, quantity: 1, showOptionErrors: false, returnPolicyExpanded: false, shippingInfoExpanded: false };
+        // A fresh navigation into the product resets any quantity left over
+        // from a previous visit to the same worker instance.
+        if (!id) {
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({ ...s, status: "ready", quantity: 1, optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.notFoundText", "Product not found.") });
+        }
+        // The cart count only feeds the top-bar badge: ask for it NOW, beside the product, instead
+        // of after it — it used to add a whole cart round trip before the page could paint.
+        const cartCount = cartItemCount();
+        // The badge must never hold the page: remember the count if it is already in, and
+        // publish it separately if it lands after the product (#3468 review).
+        let cartKnown: number | undefined;
+        void cartCount.then((n) => { cartKnown = n; }, () => {});
+        // The live product read goes out FIRST too — the local-db read below must never delay it.
+        // Settled into a value so a failure is handled where it is awaited, never unhandled.
+        // DESCRIPTION widens the default fieldset with the V3 Ricos description (a V1 catalog ignores it).
+        const live = getStoreProduct(id, ["DESCRIPTION"]).then(
+          (r) => ({ ok: true as const, r }),
+          () => ({ ok: false as const }),
+        );
+        // Paint at once from the row the list already synced (name, price, image) — the page used
+        // to sit on its skeleton for the product round trip even when the list had just shown it.
+        // The live read then fills in the description and gallery.
+        const synced = await readCachedProduct(id);
+        let painted = false;
+        if (synced && s.status === "loading") {
+          await svc.paintCached(synced);
+          painted = true;
+        }
+        const outcome = await live;
+        if (sequence !== productLoadSequence || id !== inputId()) return svc.getState() as S;
+        // Once painted the page is INTERACTIVE while the live read is on the wire: the visitor may
+        // save, change the quantity or add to cart. Build on the state as it is NOW, and keep what
+        // they did — overwriting it would untick a stored save, reset the quantity, and drop the
+        // in-flight add's `adding` guard (a second tap would add the line twice).
+        const base: S = painted ? (svc.getState() as S) : s;
+        const keep = painted
+          ? { saved: base.saved, saveHint: base.saveHint, quantity: base.quantity, adding: base.adding, added: base.added, cartHint: base.cartHint }
+          : { cartHint: "", quantity: 1 };
+        const badge = (): number => {
+          if (painted && (base.adding || base.added)) return base.cartCount;
+          if (cartKnown !== undefined) return cartKnown;
+          const epoch = cartBadgeEpoch;
+          void cartCount.then((n) => { void svc.setCartCount({ count: n, epoch }); }, () => {});
+          return base.cartCount;
+        };
+        if (outcome.ok) {
+          const p = (outcome.r.product ?? (outcome.r as unknown as StoreProduct)) as StoreProduct;
+          const name = cleanTitle(p.name) || "Product";
+          const image = productImage(p, WIX_DETAIL_IMAGE);
+          lastProduct = p;
+          // A group with exactly one choice is chosen for the shopper; a real choice
+          // is left blank so the pick is deliberate.
+          const optionGroups = productOptions(p);
+          const sale = productSale(p);
+          // A pooled screen re-appearing re-runs `load`. Wiping `selection` there means a
+          // trip to the cart and back silently clears the size the shopper picked and
+          // re-disables the CTA with no explanation. Carry the picks when this is the SAME
+          // product, and only for a choice the product still offers — a stale id would
+          // resolve to no variant and block the cart just as silently.
+          const carried: StoreOptionSelection = {};
+          if (id === lastLoadedId) {
+            for (const g of optionGroups) {
+              const chosen = s.selection[g.id];
+              if (chosen && g.choices.some((c) => c.id === chosen)) carried[g.id] = chosen;
+            }
           }
+          lastLoadedId = id;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups,
+            selection: { ...defaultSelection(optionGroups), ...carried },
+            optionsUnknown: false,
+            name,
+            ...sale,
+            commercePrice: sale.price,
+            skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
+            returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
+            ...productBody(p),
+            image,
+            gallery: productGallery(p),
+            initial: (name[0] || "#").toUpperCase(),
+            shareUrl: productShareUrl(p),
+            cartCount: badge(),
+            emptyText: "",
+          });
+        }
+        // Offline: fall back to the last-synced cached product row before the error state.
+        if (synced) {
+          const name = String(synced.name ?? "") || "Product";
+          const image = String(synced.image ?? "");
+          // The cached list row carries no options, and guessing "none" would offer
+          // a one-tap Add to cart for a product that needs a colour and a size. So
+          // the offline detail shows no picker AND marks the options UNKNOWN, which
+          // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
+          // refuses. `cartHint` carries the reason, because the options card is hidden
+          // on `noOptions` and would otherwise leave a dead button unexplained.
+          lastProduct = undefined;
+          lastLoadedId = undefined;
+          return derive({
+            ...base,
+            ...keep,
+            status: "ready",
+            optionGroups: [],
+            selection: {},
+            optionsUnknown: true,
+            name,
+            price: String(synced.subtitle ?? ""),
+            wasPrice: "",
+            skuLabel: "",
+            returnPolicyBody: "",
+            shippingInfoBody: "",
+            description: "",
+            descriptionJson: "",
+            image,
+            initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
+            cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
+            cartCount: badge(),
+            emptyText: "",
+          });
         }
-        lastLoadedId = id;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups,
-          selection: { ...defaultSelection(optionGroups), ...carried },
-          optionsUnknown: false,
-          name,
-          ...sale,
-          commercePrice: sale.price,
-          skuLabel: skuOf(p) ? `SKU: ${skuOf(p)}` : "",
-          returnPolicyBody: productPolicyBody(p, "returns") || copyParam("product.returnPolicyBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          shippingInfoBody: productPolicyBody(p, "shipping") || copyParam("product.shippingInfoBody", "") || copyParam("product.policyUnavailable", "Policy details have not been provided by this store."),
-          ...productBody(p),
-          image,
-          gallery: productGallery(p),
-          initial: (name[0] || "#").toUpperCase(),
-          shareUrl: productShareUrl(p),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      // Offline: fall back to the last-synced cached product row before the error state.
-      if (synced) {
-        const name = String(synced.name ?? "") || "Product";
-        const image = String(synced.image ?? "");
-        // The cached list row carries no options, and guessing "none" would offer
-        // a one-tap Add to cart for a product that needs a colour and a size. So
-        // the offline detail shows no picker AND marks the options UNKNOWN, which
-        // keeps `optionsIncomplete` true: the CTA stays disabled and `addToCart`
-        // refuses. `cartHint` carries the reason, because the options card is hidden
-        // on `noOptions` and would otherwise leave a dead button unexplained.
         lastProduct = undefined;
         lastLoadedId = undefined;
-        return derive({
-          ...base,
-          ...keep,
-          status: "ready",
-          optionGroups: [],
-          selection: {},
-          optionsUnknown: true,
-          name,
-          price: String(synced.subtitle ?? ""),
-          wasPrice: "",
-          skuLabel: "",
-          returnPolicyBody: "",
-          shippingInfoBody: "",
-          description: "",
-          descriptionJson: "",
-          image,
-          initial: String(synced.initial ?? "") || (name[0] || "#").toUpperCase(),
-          cartHint: copyParam("product.cartHintOffline", "Reconnect to choose options and add this to your cart."),
-          cartCount: badge(),
-          emptyText: "",
-        });
-      }
-      lastProduct = undefined;
-      lastLoadedId = undefined;
-      return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+        return derive({ ...s, status: "error", optionGroups: [], selection: {}, optionsUnknown: false, descriptionJson: "", emptyText: copyParam("product.errorText", "Product could not load.") });
+      });
     },
     // The stepper fires onChange with { value } on every tap; clamp 1–99 and
     // ignore unparsable/garbage args instead of silently zeroing the quantity.

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

@@ -2,9 +2,8 @@ import { getStoreProduct } from "../_shared/himi-store.js";
 import { iapPriceCopy } from "../_shared/iap-worker.js";
 import { withIapPresentation } from "../_shared/iap-presentation.js";
 import { type IapCommerce, classifyCart } from "@himalaya/iap-checkout";
-import { addCouponToCurrentCart, calculateCurrentCart, createCheckoutFromCurrentCart, createOrder, getCurrentCart, removeCouponFromCurrentCart, removeLineItemsFromCurrentCart, updateLineItemsQuantity, type WixCartDetail, type WixCartLineItemDetail } from "@himalaya/wix-ecom";
+import { addCouponToCurrentCart, calculateCurrentCart, createCheckoutFromCurrentCart, getCurrentCart, removeCouponFromCurrentCart, removeLineItemsFromCurrentCart, updateLineItemsQuantity, type WixCartDetail, type WixCartLineItemDetail } from "@himalaya/wix-ecom";
 import { createRedirectSession } from "@himalaya/wix-redirects";
-import { session as wixPlatformSession } from "@himalaya/wix-platform";
 import { payCashierOrder } from "@himalaya/checkout";
 import { hostedCheckoutOpener, isHostedWorker } from "../_shared/hosted-checkout.js";
 import { formatCurrency } from "../_shared/engine-intl.js";
@@ -14,16 +13,6 @@ import { formatCurrency } from "../_shared/engine-intl.js";
 const WIX_STORES_CATALOG_ID = "215238eb-22a5-4c36-9e7b-e7c08025e04e";
 const WIX_STORES_APP_ID = "1380b703-ce81-ff05-f115-39571d94dfcd";
 
-/** The site's metaSiteId for the cashier payment config. Best-effort — the native
- *  cashier can also resolve it from the app's signed Wix session, so "" is tolerated. */
-async function resolveMsid(): Promise<string> {
-  try {
-    const st = await wixPlatformSession.signedInstanceStatus();
-    return st.msid ?? "";
-  } catch {
-    return "";
-  }
-}
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, remove as dbRemove, type DbEntity } from "@himalaya/local-db";
 import { isOfflineFailure, writeMayHaveLanded } from "../_shared/owner-load-error.js";
@@ -387,30 +376,6 @@ function couponDetails(result: unknown): { id: string; code: string } {
   return { id: coupon?.coupon?.id ?? coupon?.id ?? "", code: coupon?.coupon?.code ?? coupon?.code ?? "" };
 }
 
-/** The state slice a SETTLED order leaves behind: the order consumed the cart, so the
- *  lines AND the subtotal go with it (`refresh` and the error path both clear the pair —
- *  leaving a stale subtotal in state is the class of defect #864 fixed on the render side).
- *
- *  `emptyText` is cleared deliberately: the empty card would otherwise nudge "Your cart is
- *  empty." underneath the confirmation, which is noise at the moment of a successful
- *  payment. The next `load` restores it.
- *
- *  This used to be written inline as `{ items: [], itemCount: 0, checkoutHint: ... }`.
- *  `itemCount` is not a field of `State` and never was — a write to nowhere, which is why
- *  the subtotal and emptyText resets were missing. It survived because nothing typechecks
- *  Tier-5 workers: esbuild erases types, and no tsconfig includes tier5-bundles-src.
- */
-function cartConsumedByOrder(): Pick<State, "items" | "subtotal" | "emptyText" | "checkoutHint" | "showPaidToast" | "promoCode" | "appliedCode" | "couponId" | "discount"> {
-  return {
-    items: [],
-    subtotal: "",
-    emptyText: "",
-    checkoutHint: copyParam("cart.checkoutPaidMessage", "Order placed. Thanks!"),
-    showPaidToast: true,
-    promoCode: "", appliedCode: "", couponId: "", discount: "",
-  };
-}
-
 let cartPricing: IapCommerce;
 const defineService = withIapPresentation<State>({
   onCreate: commerce => { cartPricing = commerce; },
@@ -544,13 +509,7 @@ const svc = defineService<State, {
         return derive({ ...state, checkoutHint: copyParam("cart.quantityFailedMessage", "Could not update the quantity.") });
       }
     },
-    // Phase 2a — cart checkout collects payment IN-APP through the shared pay rail
-    // (@wix/himalaya/checkout) instead of always bouncing to the hosted checkout:
-    //   createCheckoutFromCurrentCart → ecom.createOrder → payCashierOrder
-    // A wallet-equipped app settles with NO navigation at all; every other app hands
-    // off to the in-app Wix cashier (the previous behaviour), so nothing regresses.
-    // `createOrder` returning no paymentGatewayOrderId means there is nothing to
-    // charge (fully covered / zero total) — the order already stands.
+    // Physical checkout collects shipping before the site's checkout creates the order.
     checkout: async (state) => {
       let validatedLines: WixCartLineItemDetail[] = [];
       const signature = (lines: WixCartLineItemDetail[]) => JSON.stringify(lines.map(line => [line.id, line.quantity, (line as WixCartLineItemDetail & { catalogReference?: Row["catalogReference"] }).catalogReference]));
@@ -577,21 +536,11 @@ const svc = defineService<State, {
         if (!checkout.checkoutId) return derive({ ...state, checkoutHint: copyParam("cart.checkoutIdMissingMessage", "Wix did not return a checkout id.") });
         const checkoutId = checkout.checkoutId;
 
-        // Hosted (Spaces): the site's own checkout page creates the order (RN's
-        // route) — creating it here first fails on a site with no payment method set up, before the
-        // member ever reaches the checkout. The host opens the checkout as the lent member.
         const hosted = isHostedWorker();
-        const order = hosted ? { paymentGatewayOrderId: "" } : await createOrder(checkoutId);
-        const snapshotId = order.paymentGatewayOrderId ?? "";
-        if (!snapshotId && !hosted) {
-          await writeCachedItems([]);
-          return derive({ ...state, ...cartConsumedByOrder() });
-        }
-
         const pay = await payCashierOrder({
           appId: WIX_STORES_APP_ID,
-          snapshotId,
-          msid: await resolveMsid(),
+          snapshotId: "",
+          msid: "",
           mayCharge: async () => {
             const latest = await getCurrentCart();
             if (signature(latest.lineItems ?? []) !== signature(validatedLines)) return false;
@@ -611,19 +560,11 @@ const svc = defineService<State, {
             return redirect.redirectSession?.fullUrl;
           },
         });
-        if (pay.kind === "paid") {
-          // Settled in place — the cart is consumed by the order.
-          await writeCachedItems([]);
-          return derive({ ...state, ...cartConsumedByOrder() });
-        }
         if (pay.kind === "handoff") {
           // Do NOT clear the cart: payment completes in the cashier and the order is
           // only confirmed once it lands, so the cart must survive a bail-out.
           return derive({ ...state, checkoutHint: copyParam("cart.checkoutOpenedMessage", "Checkout opened.") });
         }
-        if (pay.kind === "cancelled") {
-          return derive({ ...state, checkoutHint: copyParam("cart.checkoutCancelledMessage", "Payment cancelled — your cart is still here.") });
-        }
         return derive({ ...state, checkoutHint: copyParam("cart.checkoutFailedMessage", "Checkout could not start.") });
       } catch {
         return derive({ ...state, checkoutHint: copyParam("cart.checkoutFailedMessage", "Checkout could not start.") });