@wix/himalaya-cli 0.1388.0 → 0.1389.0

package/templates/gym-fitness/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/gym-fitness-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": [

package/templates/gym-fitness-owner/dev/index.ts

@@ -63880,6 +63880,546 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
+  "himi_owner_lite_wrist_home": {
+    "screenId": "himi_owner_lite_wrist_home",
+    "renderer": "sdui_intent",
+    "title": "Next up",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "telemetryScreenName": "himi_owner_lite_wrist_home",
+    "payload": {
+      "id": "himi_owner_lite_wrist_home.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 8,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "wrist.site",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.siteName",
+                  "style": "caption",
+                  "color": "textSecondary",
+                  "maxLines": 1,
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "wrist.home.message",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.message",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "maxLines": 3,
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "wrist.home.error",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.actionError",
+                  "style": "caption",
+                  "color": "danger",
+                  "maxLines": 3,
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 2,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "wrist.next.label",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Next up",
+                          "style": "caption",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.next.countdown",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.nextUp.countdown",
+                          "style": "title1",
+                          "monospacedDigits": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.next.name",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.nextUp.name",
+                          "style": "bodyEmphasis",
+                          "maxLines": 1
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.next.service",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.nextUp.service",
+                          "style": "footnote",
+                          "maxLines": 1
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.next.range",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.nextUp.rangeLabel",
+                          "style": "caption",
+                          "color": "textSecondary"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.doneToday"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 2,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "wrist.tomorrow.label",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.tomorrowFirst.whenLabel",
+                          "style": "caption",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.tomorrow.time",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.tomorrowFirst.timeLabel",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.tomorrow.name",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:ownerWrist.tomorrowFirst.name",
+                          "style": "footnote",
+                          "maxLines": 1
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.hideTomorrow"
+              }
+            },
+            {
+              "id": "wrist.requests.badge",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "$service:ownerWrist.requestBadge",
+                  "style": "primary",
+                  "fullWidth": true,
+                  "action": {
+                    "actionId": "companion.ownerLite.openRequests"
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.noRequests"
+              }
+            },
+            {
+              "id": "wrist.requests.none",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "No requests waiting",
+                  "style": "caption",
+                  "color": "textSecondary"
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.hideNoRequests"
+              }
+            },
+            {
+              "id": "wrist.later",
+              "body": {
+                "package": "himalaya",
+                "type": "LazyList",
+                "props": {
+                  "spacing": 4,
+                  "itemsPath": "$service:ownerWrist.later",
+                  "items": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 0,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.timeLabel",
+                                  "style": "footnote",
+                                  "monospacedDigits": true
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.name",
+                                  "style": "caption",
+                                  "color": "textSecondary",
+                                  "maxLines": 1
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "padding": {
+          "leading": 6,
+          "trailing": 6,
+          "top": 4,
+          "bottom": 8
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-owner-lite-wrist",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
+  "himi_owner_lite_wrist_request": {
+    "screenId": "himi_owner_lite_wrist_request",
+    "renderer": "sdui_intent",
+    "title": "Booking requests",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "telemetryScreenName": "himi_owner_lite_wrist_request",
+    "payload": {
+      "id": "himi_owner_lite_wrist_request.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 6,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "wrist.request.position",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.requestPosition",
+                  "style": "caption",
+                  "color": "textSecondary"
+                }
+              }
+            },
+            {
+              "id": "wrist.request.message",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.statusMessage",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "maxLines": 3,
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "wrist.request.name",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.current.name",
+                  "style": "bodyEmphasis",
+                  "maxLines": 1
+                }
+              }
+            },
+            {
+              "id": "wrist.request.service",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.current.service",
+                  "style": "footnote",
+                  "maxLines": 1
+                }
+              }
+            },
+            {
+              "id": "wrist.request.when",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.current.dayLabel",
+                  "style": "footnote"
+                }
+              }
+            },
+            {
+              "id": "wrist.request.error",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:ownerWrist.actionError",
+                  "style": "caption",
+                  "color": "danger",
+                  "maxLines": 3,
+                  "collapseWhenEmpty": true
+                }
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 6,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "wrist.request.accept",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Accept",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.ownerWrist.confirm",
+                            "params": {
+                              "bookingId": "$service:ownerWrist.current.bookingId",
+                              "siteId": "$service:ownerWrist.siteId"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.request.decline",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Decline",
+                          "style": "secondary",
+                          "role": "destructive",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.ownerWrist.askDecline"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.confirmingDecline"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 6,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "wrist.request.confirm.prompt",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Decline this request?",
+                          "style": "footnote"
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.request.confirm.decline",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Decline",
+                          "style": "primary",
+                          "role": "destructive",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.ownerWrist.decline",
+                            "params": {
+                              "bookingId": "$service:ownerWrist.current.bookingId",
+                              "siteId": "$service:ownerWrist.siteId"
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "wrist.request.confirm.keep",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Keep",
+                          "style": "secondary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.ownerWrist.cancelDecline"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:ownerWrist.notConfirmingDecline"
+              }
+            },
+            {
+              "id": "wrist.request.back",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "Back",
+                  "style": "plain",
+                  "fullWidth": true,
+                  "action": {
+                    "actionId": "companion.ownerLite.backHome"
+                  }
+                }
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "padding": {
+          "leading": 6,
+          "trailing": 6,
+          "top": 4,
+          "bottom": 8
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-owner-lite-wrist",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
   "himi_owner_lite_products": {
     "screenId": "himi_owner_lite_products",
     "renderer": "sdui_intent",

package/templates/gym-fitness-owner/himalaya.content.json

@@ -186,6 +186,12 @@
     },
     "himi_owner_lite_sites": {
       "displayName": "Sites"
+    },
+    "himi_owner_lite_wrist_home": {
+      "displayName": "Next up"
+    },
+    "himi_owner_lite_wrist_request": {
+      "displayName": "Booking requests"
     }
   },
   "icon": "icon.png",

package/templates/gym-fitness-owner/platforms.json

@@ -1,4 +1,5 @@
 {
   "web": true,
-  "macos": true
+  "macos": true,
+  "watchos": true
 }