@wix/himalaya-cli 0.1523.0 → 0.1525.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/apple-iap-contract.d.ts

@@ -76,10 +76,14 @@ export type IapEligibility = {
 };
 /** `open`: a pending order the cashier can charge. `granted`: the vertical already gives the
  *  member access, so nothing is sold. */
-export type OrderAttempt = ({
+export type OrderAttempt = (
+/** `placed`: the order was created by this call, so it cannot have a charge yet. Only an adapter
+ *  that never returns an existing order may say so; an order it reuses must be listed first. */
+{
     status: "open";
     cashierOrderId: string;
     verticalRef: VerticalRef;
+    placed?: boolean;
 } | {
     status: "granted";
 } | {

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/stdlib/flows/iap-checkout/src/cashier-charges.d.ts

@@ -15,6 +15,9 @@ export type AppleIapChargeResult = {
     status: "closed" | "inOtherPayment" | "refused" | "notConfigured" | "invalidResponse" | "unavailable" | "notEnabled" | "sessionChanged";
 };
 export declare function ensureAppleIapCharge(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<AppleIapChargeResult>;
+/** An order created in this same call has no charges, so List would only cost a round trip. A
+ *  lost answer is still reconciled through List. */
+export declare function chargePlacedOrder(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<AppleIapChargeResult>;
 export declare function listOrderCharges(bridge: SessionBoundBridge, route: CashierRoute, orderId: string): Promise<{
     status: "ok";
     charges: CashierCharge[];

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap-checkout.mjs

@@ -810,10 +810,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }
@@ -1570,12 +1583,19 @@ function storesAppleSalesEnabled() {
 
 // ../../stdlib/flows/iap-checkout/src/cashier-charges.ts
 async function ensureAppleIapCharge(bridge, route, orderId) {
-  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
-  if (!orderId) return { status: "invalidResponse" };
+  const invalid = invalidRequest(route, orderId);
+  if (invalid) return invalid;
   const listed = await listOrderCharges(bridge, route, orderId);
   if (listed.status !== "ok") return listed;
   return decideFromCharges(listed.charges) ?? chargeThenReconcile(bridge, route, orderId);
 }
+async function chargePlacedOrder(bridge, route, orderId) {
+  return invalidRequest(route, orderId) ?? chargeThenReconcile(bridge, route, orderId);
+}
+function invalidRequest(route, orderId) {
+  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
+  return orderId ? null : { status: "invalidResponse" };
+}
 async function listOrderCharges(bridge, route, orderId) {
   const answer = await bridge.call("GET", chargesPath(route, orderId));
   if (answer.status !== "ok") return failureOf(answer);
@@ -1892,7 +1912,7 @@ function createWixOrderBackend(deps) {
   async function startOrderFor(sale) {
     const ordered = await orderFor(sale);
     if (isStop(ordered)) return contextResult(sale.catalogRef, ordered);
-    const charged = await chargeFor(sale, ordered, { reordered: false });
+    const charged = await chargeFor(sale, ordered.ref, { reordered: false, placed: ordered.placed });
     if (isStop(charged)) return contextResult(sale.catalogRef, charged);
     return startFor(sale, charged);
   }
@@ -1952,7 +1972,9 @@ function createWixOrderBackend(deps) {
       return true;
     };
     const attempt3 = existing?.cashierOrderId && existing.verticalRef ? await reopenOrOpen(sale, { cashierOrderId: existing.cashierOrderId, verticalRef: existing.verticalRef }) : await sale.adapter.openOrder(sale.item, sale.bridge, beforeCreate);
-    return prevented ?? recordOrder(sale, existing, attempt3);
+    if (prevented) return prevented;
+    const ref = recordOrder(sale, existing, attempt3);
+    return isStop(ref) ? ref : { ref, placed: isPlaced(attempt3) };
   }
   async function reopenOrOpen(sale, order) {
     const reopened = await sale.adapter.reopenOrder(order, sale.bridge);
@@ -1978,7 +2000,7 @@ function createWixOrderBackend(deps) {
     });
   }
   async function chargeFor(sale, ref, options) {
-    const charge = await ensureAppleIapCharge(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
+    const charge = await (options.placed ? chargePlacedOrder : ensureAppleIapCharge)(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
     switch (charge.status) {
       case "pending":
         return persist(sale, { ...ref, stage: "charged", wixTransactionId: charge.transactionId, updatedAt: now() });
@@ -2002,8 +2024,9 @@ function createWixOrderBackend(deps) {
   async function reorder(sale) {
     if (sale.adapter.repeatable) return stopWith("rejected", "orderClosed");
     if (!forget(sale, sale.catalogRef)) return stopWith("rejected", "storageUnavailable");
-    const recorded = recordOrder(sale, void 0, await sale.adapter.openOrder(sale.item, sale.bridge));
-    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true });
+    const attempt3 = await sale.adapter.openOrder(sale.item, sale.bridge);
+    const recorded = recordOrder(sale, void 0, attempt3);
+    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true, placed: isPlaced(attempt3) });
   }
   async function alreadyPaid(sale, ref) {
     const access = await sale.adapter.readAccess(ref.verticalRef ?? {}, sale.bridge);
@@ -2237,6 +2260,9 @@ function unassociatedHold(transaction, updatedAt) {
 function acknowledgementOf(transaction, scopeKey) {
   return { transactionId: transaction.transactionId, productId: transaction.productId, environment: transaction.environment, scopeKey };
 }
+function isPlaced(attempt3) {
+  return attempt3.status === "open" && attempt3.placed === true;
+}
 function refAt(partition, key) {
   return partition.refs().find((ref) => ref.key === key);
 }
@@ -3267,7 +3293,7 @@ async function readAccess3(verticalRef, bridge) {
 async function placedOrder(body, bridge) {
   if (!isObject7(body) || !isNonEmpty3(body.orderId)) return ORDER_REFUSED;
   const verticalRef = { orderId: body.orderId };
-  if (isNonEmpty3(body.paymentGatewayOrderId)) return { status: "open", cashierOrderId: body.paymentGatewayOrderId, verticalRef };
+  if (isNonEmpty3(body.paymentGatewayOrderId)) return { status: "open", cashierOrderId: body.paymentGatewayOrderId, verticalRef, placed: true };
   const access = await readAccess3(verticalRef, bridge);
   if (access === "granted") return GRANTED;
   return access === "sessionChanged" || access === "unavailable" ? { status: access } : ORDER_REFUSED;

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap.mjs

@@ -787,10 +787,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/screens.mjs

@@ -1352,10 +1352,23 @@ function enabledPricing(source, deps) {
   let selling = "active";
   let lookupRevision = 0;
   let answeredRoutes;
+  let inFlight;
+  const sharedAnswer = (request) => {
+    const key = JSON.stringify(request);
+    if (inFlight?.key === key) return inFlight.answer;
+    const answer = Promise.resolve(source.mapping.resolve(request));
+    const asked = { key, answer };
+    inFlight = asked;
+    const settle = () => {
+      if (inFlight === asked) inFlight = void 0;
+    };
+    answer.then(settle, settle);
+    return answer;
+  };
   const mapping = {
     resolve: async (request) => {
       const asked = lookupRevision;
-      const answer = await source.mapping.resolve(request);
+      const answer = await sharedAnswer(request);
       if (asked === lookupRevision) answeredRoutes = routesAnswered(answer);
       return answer;
     }
@@ -2130,12 +2143,19 @@ function itemPaymentEnabled() {
 
 // ../../stdlib/flows/iap-checkout/src/cashier-charges.ts
 async function ensureAppleIapCharge(bridge, route, orderId) {
-  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
-  if (!orderId) return { status: "invalidResponse" };
+  const invalid = invalidRequest(route, orderId);
+  if (invalid) return invalid;
   const listed = await listOrderCharges(bridge, route, orderId);
   if (listed.status !== "ok") return listed;
   return decideFromCharges(listed.charges) ?? chargeThenReconcile(bridge, route, orderId);
 }
+async function chargePlacedOrder(bridge, route, orderId) {
+  return invalidRequest(route, orderId) ?? chargeThenReconcile(bridge, route, orderId);
+}
+function invalidRequest(route, orderId) {
+  if (!isRoutePrefix2(route.prefix)) return { status: "notConfigured" };
+  return orderId ? null : { status: "invalidResponse" };
+}
 async function listOrderCharges(bridge, route, orderId) {
   const answer = await bridge.call("GET", chargesPath(route, orderId));
   if (answer.status !== "ok") return failureOf(answer);
@@ -2452,7 +2472,7 @@ function createWixOrderBackend(deps) {
   async function startOrderFor(sale) {
     const ordered = await orderFor(sale);
     if (isStop(ordered)) return contextResult(sale.catalogRef, ordered);
-    const charged = await chargeFor(sale, ordered, { reordered: false });
+    const charged = await chargeFor(sale, ordered.ref, { reordered: false, placed: ordered.placed });
     if (isStop(charged)) return contextResult(sale.catalogRef, charged);
     return startFor(sale, charged);
   }
@@ -2512,7 +2532,9 @@ function createWixOrderBackend(deps) {
       return true;
     };
     const attempt4 = existing?.cashierOrderId && existing.verticalRef ? await reopenOrOpen(sale, { cashierOrderId: existing.cashierOrderId, verticalRef: existing.verticalRef }) : await sale.adapter.openOrder(sale.item, sale.bridge, beforeCreate);
-    return prevented ?? recordOrder(sale, existing, attempt4);
+    if (prevented) return prevented;
+    const ref = recordOrder(sale, existing, attempt4);
+    return isStop(ref) ? ref : { ref, placed: isPlaced(attempt4) };
   }
   async function reopenOrOpen(sale, order) {
     const reopened = await sale.adapter.reopenOrder(order, sale.bridge);
@@ -2538,7 +2560,7 @@ function createWixOrderBackend(deps) {
     });
   }
   async function chargeFor(sale, ref, options) {
-    const charge = await ensureAppleIapCharge(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
+    const charge = await (options.placed ? chargePlacedOrder : ensureAppleIapCharge)(sale.bridge, deps.cashier, ref.cashierOrderId ?? "");
     switch (charge.status) {
       case "pending":
         return persist(sale, { ...ref, stage: "charged", wixTransactionId: charge.transactionId, updatedAt: now() });
@@ -2562,8 +2584,9 @@ function createWixOrderBackend(deps) {
   async function reorder(sale) {
     if (sale.adapter.repeatable) return stopWith("rejected", "orderClosed");
     if (!forget(sale, sale.catalogRef)) return stopWith("rejected", "storageUnavailable");
-    const recorded = recordOrder(sale, void 0, await sale.adapter.openOrder(sale.item, sale.bridge));
-    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true });
+    const attempt4 = await sale.adapter.openOrder(sale.item, sale.bridge);
+    const recorded = recordOrder(sale, void 0, attempt4);
+    return isStop(recorded) ? recorded : chargeFor(sale, recorded, { reordered: true, placed: isPlaced(attempt4) });
   }
   async function alreadyPaid(sale, ref) {
     const access = await sale.adapter.readAccess(ref.verticalRef ?? {}, sale.bridge);
@@ -2797,6 +2820,9 @@ function unassociatedHold(transaction, updatedAt) {
 function acknowledgementOf(transaction, scopeKey) {
   return { transactionId: transaction.transactionId, productId: transaction.productId, environment: transaction.environment, scopeKey };
 }
+function isPlaced(attempt4) {
+  return attempt4.status === "open" && attempt4.placed === true;
+}
 function refAt(partition, key) {
   return partition.refs().find((ref) => ref.key === key);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1523.0",
+  "version": "0.1525.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "8f950043abdc722ba0a43abad424c1ee3b45eb177439da3261420ff7"
+  "falconPackageHash": "4d57d913fdf7e7ed0944f6605a9a5093b4fe45fb1efa09885218796d"
 }

package/templates/beauty-salon/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.") });