@wix/himalaya-cli 0.1320.0 → 0.1322.0

package/templates/branded-lite/dev/index.ts

@@ -9655,6 +9655,498 @@ const SCREENS = runtimeSetting({
                 "hiddenPath": "$service:spacesCollectionDetail.noEntity"
               }
             },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 10,
+                  "children": [
+                    {
+                      "id": "himi_collection.skeleton_1",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": []
+                        }
+                      },
+                      "modifiers": {
+                        "height": 96,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8
+                      }
+                    },
+                    {
+                      "id": "himi_collection.skeleton_2",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": []
+                        }
+                      },
+                      "modifiers": {
+                        "height": 96,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8
+                      }
+                    },
+                    {
+                      "id": "himi_collection.skeleton_3",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "ZStack",
+                        "props": {
+                          "alignment": "center",
+                          "children": []
+                        }
+                      },
+                      "modifiers": {
+                        "height": 96,
+                        "background": {
+                          "token": "surfaceSecondary"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesCollectionDetail.hideProductsLoading"
+              }
+            },
+            {
+              "id": "himi_collection.products_retry.block",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 12,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 10,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "warning",
+                                  "size": 18,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "Something did not load.",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Try again when the connection settles.",
+                          "style": "body",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_collection.products_retry",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.spacesCollectionDetail.retryProducts"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 8,
+                "padding": {
+                  "leading": 14,
+                  "trailing": 14,
+                  "top": 14,
+                  "bottom": 14
+                },
+                "hiddenPath": "$service:spacesCollectionDetail.productsNotErrored"
+              }
+            },
+            {
+              "id": "himi_collection.products",
+              "body": {
+                "package": "himalaya",
+                "type": "LazyList",
+                "props": {
+                  "spacing": 10,
+                  "itemsPath": "$service:spacesCollectionDetail.products",
+                  "items": [
+                    {
+                      "id": "himi_collection.row",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 9,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Image",
+                                "props": {
+                                  "url": "$item.image",
+                                  "fillWidth": true,
+                                  "height": 168,
+                                  "contentMode": "fill",
+                                  "contentDescription": "$item.name"
+                                }
+                              },
+                              "modifiers": {
+                                "cornerRadius": 8,
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$item.noImage"
+                              }
+                            },
+                            {
+                              "id": "himi_collection.row.monogram",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "ZStack",
+                                "props": {
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$item.initial",
+                                          "style": "display",
+                                          "color": "textOnAccent",
+                                          "maxLines": 1
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "fillMaxWidth": true,
+                                "height": 168,
+                                "background": {
+                                  "token": "accentPrimary"
+                                },
+                                "cornerRadius": 8,
+                                "hiddenPath": "$item.hasImage"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.name",
+                                  "style": "bodyEmphasis",
+                                  "maxLines": 2
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.subtitle",
+                                  "style": "footnote",
+                                  "color": "accentPrimary",
+                                  "maxLines": 1,
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "background": {
+                          "token": "surfaceElevated"
+                        },
+                        "border": {
+                          "width": 1,
+                          "color": {
+                            "token": "border"
+                          }
+                        },
+                        "cornerRadius": 8,
+                        "padding": {
+                          "leading": 12,
+                          "trailing": 12,
+                          "top": 12,
+                          "bottom": 12
+                        },
+                        "onTap": {
+                          "actionId": "himi.open",
+                          "params": {
+                            "screenId": "$item.detailScreenId",
+                            "id": "$item.id"
+                          }
+                        },
+                        "pressFeedback": "scale",
+                        "haptic": "light",
+                        "accessibilityLabel": "$item.name"
+                      }
+                    }
+                  ],
+                  "onPullToRefresh": {
+                    "actionId": "tier5.spacesCollectionDetail.load"
+                  },
+                  "pagination": {
+                    "cursor": "$service:spacesCollectionDetail.productsCursor",
+                    "onLoadMore": {
+                      "actionId": "tier5.spacesCollectionDetail.loadMoreProducts"
+                    },
+                    "pageSize": 50
+                  }
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesCollectionDetail.hideProducts"
+              }
+            },
+            {
+              "id": "himi_collection.products_more_retry.block",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 12,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "HStack",
+                        "props": {
+                          "spacing": 10,
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "warning",
+                                  "size": 18,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "Something did not load.",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Try again when the connection settles.",
+                          "style": "body",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_collection.products_more_retry",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.spacesCollectionDetail.retryProducts"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 8,
+                "padding": {
+                  "leading": 14,
+                  "trailing": 14,
+                  "top": 14,
+                  "bottom": 14
+                },
+                "hiddenPath": "$service:spacesCollectionDetail.productsNoPageError"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 12,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "bag",
+                          "size": 34,
+                          "tint": "textTertiary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "No products in this category yet.",
+                          "style": "bodyEmphasis",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_collection.products_empty.cta",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Back to categories",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_collections"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "padding": {
+                  "leading": 24,
+                  "trailing": 24,
+                  "top": 24,
+                  "bottom": 24
+                },
+                "hiddenPath": "$service:spacesCollectionDetail.noEmpty"
+              }
+            },
             {
               "id": "",
               "body": {
@@ -85162,6 +85654,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "actionId": "tier5.himiBrandedProgram.enroll"
                           }
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.enrollHidden"
                       }
                     },
                     {
@@ -85175,6 +85670,44 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                           "color": "textSecondary",
                           "collapseWhenEmpty": true
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.enrollHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_program.buy",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "$service:himiBrandedProgram.buyLabel",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "disabledPath": "$service:himiBrandedProgram.buyDisabled",
+                          "action": {
+                            "actionId": "tier5.himiBrandedProgram.buy"
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.buyHidden"
+                      }
+                    },
+                    {
+                      "id": "himi_program.buy_note",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedProgram.buyNote",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedProgram.buyHidden"
                       }
                     },
                     {

package/templates/branded-lite/tier5-src/_shared/iap-worker.ts

@@ -1,49 +1,11 @@
-// Worker-side glue for the shared IAP catalog layer (`@himalaya/iap` → createIapCatalogPricing),
-// shared by every screen that shows or sells an IAP-backed item. Mapping, Apple prices and payment
-// guards live in the SDK; this only supplies the host scope, the copy, and the hydration reset.
-import { get as appInfo } from "@himalaya/app-info";
-import type { IapCatalogScope, IapPriceCopy } from "@himalaya/iap";
+// Worker-side glue for the shared IAP layer (`@himalaya/iap` catalog pricing and
+// `@himalaya/iap-checkout` → createIapCommerce), shared by every screen that shows or sells an
+// IAP-backed item. Mapping, Apple prices, payment guards, the host scope and the sale live in the
+// SDK; this only supplies the copy and the hydration reset.
+import type { IapPriceCopy } from "@himalaya/iap";
+import type { IapPurchaseCopy } from "@himalaya/iap-checkout";
 import { copyParam } from "./himi-copy.js";
 
-export interface HostIapScope {
-  scope: IapCatalogScope;
-  platform: string;
-}
-
-let hostScope: Promise<HostIapScope> | undefined;
-
-/** Read once per worker, and only by an enabled screen: a disabled one makes no app-info call.
- *  App identity and platform come from the host, never a screen param. The site is the host-owned
- *  native preference business (the web partition uses an OAuth client ID); without one, the mapping source's
- *  bound site applies. A failed read leaves identity empty, which fails every item closed — and is
- *  not kept, so the next lookup asks the host again instead of staying invalid for good. */
-export function hostIapScope(): Promise<HostIapScope> {
-  return hostScope ??= readHostScope().then((read) => {
-    if (!hostScopeComplete(read)) hostScope = undefined;
-    return read;
-  });
-}
-
-/** An incomplete scope prices every item `invalidInput`, which the shared layer never offers to
- *  retry — so a screen offers Retry itself while its own host read is what failed. */
-export function hostScopeComplete(read: HostIapScope): boolean {
-  return !!read.scope.appId && !!read.scope.bundleId && !!read.platform;
-}
-
-async function readHostScope(): Promise<HostIapScope> {
-  const identity = await appInfo().catch(() => undefined);
-  const siteId = identity?.platform === "web" ? "" : hostSiteId();
-  return {
-    scope: { appId: identity?.appId ?? "", bundleId: identity?.bundleId ?? "", ...(siteId ? { siteId } : {}) },
-    platform: identity?.platform ?? "",
-  };
-}
-
-function hostSiteId(): string {
-  const value = (globalThis as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input?.__himiPreferenceBusiness;
-  return typeof value === "string" ? value.trim() : "";
-}
-
 /** Price labels from the screen's copy pack (`<prefix>.priceLoadingText`, …). */
 export function iapPriceCopy(prefix: string): IapPriceCopy {
   return {
@@ -54,6 +16,21 @@ export function iapPriceCopy(prefix: string): IapPriceCopy {
   };
 }
 
+/** App Store purchase labels from the screen's copy pack (`<prefix>.buyCta`, …), for
+ *  `iapPurchaseFields`. Customer copy only: no backend names, ids or diagnostics. */
+export function iapPurchaseCopy(prefix: string): IapPurchaseCopy {
+  return {
+    buy: copyParam(`${prefix}.buyCta`, "Get access"),
+    processing: copyParam(`${prefix}.purchaseProcessingText`, "Processing your purchase…"),
+    awaitingApproval: copyParam(`${prefix}.purchaseAwaitingApprovalText`, "Waiting for approval"),
+    unavailable: copyParam(`${prefix}.purchaseTemporarilyUnavailableText`, "Purchasing is temporarily unavailable."),
+    signInRequired: copyParam(`${prefix}.purchaseSignInText`, "Sign in to buy."),
+    retry: copyParam(`${prefix}.purchaseRetryText`, "Something went wrong. Try again."),
+    priceChanged: copyParam(`${prefix}.purchasePriceChangedText`, "The price changed. Check it and try again."),
+    support: copyParam(`${prefix}.purchaseSupportText`, "We couldn't finish this purchase. Contact support."),
+  };
+}
+
 /** What `notHydrated` does, for a runtime that ignores the option (a binary older than it, still
  *  served new bundles): put the listed keys back to their declared values before any action runs,
  *  so a persisted price or an enabled purchase action never paints as this run's. */