@wix/himalaya-cli 0.1588.0 → 0.1590.0

package/templates/beauty-salon/tier5-src/himi-branded-lite-home/index.ts

@@ -19,6 +19,7 @@ import { formatServicePrice } from "../_shared/wix-service-price.js";
 import { cleanTitle, initials } from "../_shared/himi-text.js";
 import { LAYOUT_KEY, type LayoutId, recommendLayout, resolveLayout } from "../_shared/himi-layouts.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
+import { groupMemberCount } from "../_shared/group-member-count.js";
 import { parseWeeklyGoal, weeklyGoalProgress, weeklySessionsFromPages } from "../_shared/weekly-goal.js";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
 import { formatDateMedium } from "../_shared/engine-intl.js";
@@ -736,7 +737,7 @@ function groupCard(group: WixGroup): GroupCard {
   return {
     id: group.id || title,
     title,
-    meta: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
+    meta: count == null ? "" : groupMemberCount(count),
     image,
     initial: (title[0] || "G").toUpperCase(),
     hasImage: !!image,

package/templates/beauty-salon/tier5-src/himi-branded-lite-plans/index.ts

@@ -82,7 +82,7 @@ function money(plan: WixPlan): string {
   const raw = price?.value;
   if (raw == null || raw === "" || Number.isNaN(Number(raw))) return "";
   try {
-    return formatCurrency(Number(raw), price?.currency || "USD", "en");
+    return formatCurrency(Number(raw), price?.currency || "USD");
   } catch {
     return `${raw}`;
   }

package/templates/beauty-salon-owner/tier5-src/_shared/app-locale.ts

@@ -0,0 +1,61 @@
+// The language a worker formats numbers, money and plurals in, and the business's time zone. A worker has no host locale to read,
+// so the screen's `onAppear` hands it over: `appear()` adds `locale` to the load params when the app
+// pins its language, and `stashCopy` stores it here. Absent, every formatter stays on "en" — the
+// house pattern every English app was approved with — so an unpinned app is unchanged.
+//
+// The business time zone comes the same way, from the app's provisioning (`businessTimeZone`, collected
+// at migration time while the site's properties are readable): a worker cannot read it itself, because
+// the site-properties route is owner-scoped. Absent, it is "" and no worker guesses one.
+//
+// Pure, no host globals: bundled into every worker that formats, copied into generated templates.
+
+const TAG = /^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/;
+let tag = "en";
+
+/** Set from a load argument's `locale`; anything that is not a language tag resets to "en". */
+export function setAppLocale(value: unknown): void {
+  tag = typeof value === "string" && TAG.test(value) ? value : "en";
+}
+
+export function appLocale(): string {
+  return tag;
+}
+
+/** An IANA zone such as "Asia/Jerusalem" (or "UTC") that this engine knows. A bare offset, a lowercase
+ *  alias or an engine without ECMA-402 is not one: a zone is never guessed. */
+export function isIanaTimeZone(value: unknown): value is string {
+  if (typeof value !== "string" || !/^(?:UTC|[A-Za-z]+(?:\/[A-Za-z0-9_+-]+)+)$/.test(value)) return false;
+  // An engine without ECMA-402 has no zone database: nothing it holds is a zone it knows.
+  if (typeof Intl === "object" && typeof Intl.DateTimeFormat === "function") {
+    try {
+      new Intl.DateTimeFormat("en-US", { timeZone: value });
+      return true;
+    } catch {
+      return false;
+    }
+  }
+  return false;
+}
+
+let zone = "";
+
+/** Set from a load argument's `businessTimeZone`; anything that is not an IANA zone clears it. */
+export function setBusinessTimeZone(value: unknown): void {
+  zone = isIanaTimeZone(value) ? value : "";
+}
+
+/** The business's IANA zone, or "" when the app has none provisioned. */
+export function businessTimeZone(): string {
+  return zone;
+}
+
+/** Does `count` take the singular form in the app language? CLDR plural rules, so French "0 point"
+ *  and "1,5 point" are singular and Hebrew "2" is not. An engine without PluralRules keeps the
+ *  English rule (exactly one). */
+export function isSingular(count: number, locale = appLocale()): boolean {
+  try {
+    // An engine without ECMA-402 has no `Intl` at all: it keeps the English rule.
+    if (typeof Intl === "object" && typeof Intl.PluralRules === "function") return new Intl.PluralRules(locale).select(count) === "one";
+  } catch { /* malformed tag — use the English rule */ }
+  return count === 1;
+}

package/templates/beauty-salon-owner/tier5-src/_shared/engine-intl.ts

@@ -20,6 +20,8 @@
 // These helpers are the sanctioned way to format across the whole fleet: real ECMA-402 where it
 // exists, a deterministic en-US-shaped fallback where it does not, and never a throw.
 
+import { appLocale } from "./app-locale.js";
+
 /** Is ECMA-402 actually present in THIS engine? Cheap, and safe in a realm without `Intl`. */
 export function hasIntl(): boolean {
   return typeof Intl !== "undefined";
@@ -189,7 +191,7 @@ const CURRENCY_DIGITS: Record<string, number> = {
 export function formatCurrency(
   amount: number,
   currency = "USD",
-  locale = "en",
+  locale = appLocale(),
   /** Omit for the currency's natural digits. Pass 0 to render a whole amount as "$25" rather
    *  than "$25.00" — Intl clamps the minimum down to match, so max<min does not throw here. */
   maximumFractionDigits?: number,
@@ -258,7 +260,7 @@ function groupThousands(fixed: string): string {
  *     inserted commas into the exponent — `1e21` came out as "1e,+21" and `1e-7` as "1,e-7".
  *     Garbage, and silently so, because nothing in the corpus's tidy test numbers reached it.
  */
-export function formatNumber(value: number, locale = "en"): string {
+export function formatNumber(value: number, locale = appLocale()): string {
   if (!Number.isFinite(value)) return "";
   if (hasIntl()) return new Intl.NumberFormat(locale).format(value);
   // `toFixed` itself returns exponential notation at >=1e21, so anything that big keeps the
@@ -409,7 +411,7 @@ export function compareDateDesc(a: string, b: string): number {
 // Customers read that as sloppiness, and a whole "₪70" beside "₪69.50" reads as a different
 // kind of number. So: one money pattern, one clock, one range.
 
-// Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
+// Money uses `formatCurrency(amount, currency)` — English unless the app pins another language, see app-locale — the currency's NATURAL decimals
 // ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
 // SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
 // "₪69.50"), the format the redesigned service screen and services list were approved with. It

package/templates/beauty-salon-owner/tier5-src/_shared/himi-copy.ts

@@ -12,10 +12,12 @@
 // and every read returns `fallback` verbatim — routing a worker string through
 // copyParam is byte-for-byte behavior-preserving.
 //
-// Pure + Hermes-safe (no host globals, no Node APIs, no imports): bundled into
+// Pure + Hermes-safe (no host globals, no Node APIs; its only import is the pure `app-locale` sibling): bundled into
 // every worker that emits user-facing copy, and copied verbatim into the
 // generated templates' tier5-src/_shared/.
 
+import { isSingular, setAppLocale, setBusinessTimeZone } from "./app-locale.js";
+
 /** Customer strings override every read; translated stock is valid only for its
  * original English fallback. Some existing keys serve more than one message. */
 export type CopyPackValue = string | { source: string; translation: string };
@@ -29,6 +31,12 @@ let copyReceived = false;
  *  stock fallbacks keep rendering. */
 export function stashCopy(arg: unknown): void {
   if (!arg || typeof arg !== "object") return;
+  // A param-carrying dispatch names the app language and business zone too (absent: the English house
+  // pattern, and no zone).
+  if ("copy" in arg || "locale" in arg || "businessTimeZone" in arg) {
+    setAppLocale((arg as Record<string, unknown>).locale);
+    setBusinessTimeZone((arg as Record<string, unknown>).businessTimeZone);
+  }
   const raw = (arg as Record<string, unknown>).copy;
   if (typeof raw !== "string" || !raw) return;
   try {
@@ -77,5 +85,5 @@ export function copyPlural(key: string, fallback: string, count: number): string
   const pattern = copyParam(key, fallback);
   const match = /^\{n, plural, one \{([^{}]*)\} other \{([^{}]*)\}\}$/.exec(pattern);
   if (!match) return copyTemplate(key, fallback, { n: count });
-  return (count === 1 ? match[1] : match[2])!.replace(/#/g, String(count));
+  return (isSingular(count) ? match[1] : match[2])!.replace(/#/g, String(count));
 }

package/templates/branded-lite/config.ts

@@ -598,6 +598,13 @@ export default defineApp({
         "parentScreenId": "himi_group",
         "tabId": ""
       },
+      {
+        "screenId": "himi_my_groups",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_groups",
+        "tabId": ""
+      },
       {
         "screenId": "himi_cms",
         "isPublic": true,

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

@@ -66551,6 +66551,25 @@ const SCREENS = runtimeSetting({
                 }
               }
             },
+            {
+              "id": "himi_groups.my_groups",
+              "body": {
+                "package": "himalaya",
+                "type": "Button",
+                "props": {
+                  "title": "See my groups",
+                  "style": "secondary",
+                  "fullWidth": true,
+                  "leadingIcon": "person",
+                  "action": {
+                    "actionId": "himi.open",
+                    "params": {
+                      "screenId": "himi_my_groups"
+                    }
+                  }
+                }
+              }
+            },
             {
               "id": "himi_groups.search",
               "body": {
@@ -69599,6 +69618,456 @@ const SCREENS = runtimeSetting({
       "bundleVersion": "0.0.1"
     }
   },
+  "himi_my_groups": {
+    "screenId": "himi_my_groups",
+    "renderer": "sdui_intent",
+    "title": "",
+    "schemaVersion": 1,
+    "cacheControl": {
+      "maxAge": 0,
+      "staleWhileRevalidate": 0
+    },
+    "payload": {
+      "id": "himi_my_groups.root",
+      "body": {
+        "package": "himalaya",
+        "type": "VStack",
+        "props": {
+          "spacing": 16,
+          "alignment": "leading",
+          "children": [
+            {
+              "id": "himi_my_groups.title",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "My groups",
+                  "style": "title1"
+                }
+              }
+            },
+            {
+              "id": "himi_my_groups.loading",
+              "body": {
+                "package": "himalaya",
+                "type": "Skeleton",
+                "props": {
+                  "height": 160,
+                  "cornerRadius": 8,
+                  "count": 2
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedMyGroups.notLoading"
+              }
+            },
+            {
+              "id": "himi_my_groups.error",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Your groups are temporarily unavailable.",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedMyGroups.errorText",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_my_groups.retry",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Try again",
+                          "style": "secondary",
+                          "action": {
+                            "actionId": "tier5.himiBrandedMyGroups.load"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 4,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "hiddenPath": "$service:himiBrandedMyGroups.notErrored"
+              }
+            },
+            {
+              "id": "himi_my_groups.partial",
+              "body": {
+                "package": "himalaya",
+                "type": "Text",
+                "props": {
+                  "text": "$service:himiBrandedMyGroups.partialText",
+                  "style": "footnote",
+                  "color": "textSecondary",
+                  "collapseWhenEmpty": true
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedMyGroups.noPartial"
+              }
+            },
+            {
+              "id": "himi_my_groups.rows",
+              "body": {
+                "package": "himalaya",
+                "type": "Grid",
+                "props": {
+                  "columns": 1,
+                  "spacing": 10,
+                  "itemsPath": "$service:himiBrandedMyGroups.rows",
+                  "items": [
+                    {
+                      "id": "himi_my_groups.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": 120,
+                                  "contentMode": "fill",
+                                  "contentDescription": "$item.title"
+                                }
+                              },
+                              "modifiers": {
+                                "cornerRadius": 8,
+                                "fillMaxWidth": true,
+                                "hiddenPath": "$item.noImage"
+                              }
+                            },
+                            {
+                              "id": "himi_my_groups.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": 120,
+                                "background": {
+                                  "token": "accentPrimary"
+                                },
+                                "cornerRadius": 8,
+                                "hiddenPath": "$item.hasImage"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.title",
+                                  "style": "bodyEmphasis",
+                                  "maxLines": 2
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.statusLabel",
+                                  "style": "footnote",
+                                  "color": "accentPrimary",
+                                  "maxLines": 1,
+                                  "collapseWhenEmpty": true
+                                }
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.meta",
+                                  "style": "caption",
+                                  "color": "textTertiary",
+                                  "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.title"
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:himiBrandedMyGroups.noRows"
+              }
+            },
+            {
+              "id": "himi_my_groups.empty",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedMyGroups.emptyText",
+                          "style": "body",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 4,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 16,
+                  "bottom": 16
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:himiBrandedMyGroups.noEmpty"
+              }
+            },
+            {
+              "id": "himi_my_groups.member_gate",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 10,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "person",
+                          "size": 28,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_my_groups.member_gate_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Sign in to see your groups",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "The groups you belong to show up here once you sign in.",
+                          "style": "footnote",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_my_groups.member_gate_signin",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "intent": "groups",
+                              "returnScreenId": "himi_my_groups",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
+                          }
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 20,
+                  "bottom": 20
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:himiBrandedMyGroups.noSignIn"
+              }
+            }
+          ]
+        }
+      },
+      "modifiers": {
+        "background": {
+          "token": "surfacePrimary"
+        },
+        "padding": {
+          "leading": 16,
+          "trailing": 16,
+          "top": 18,
+          "bottom": 28
+        },
+        "onAppear": {
+          "actionId": "tier5.himiBrandedMyGroups.load"
+        }
+      }
+    },
+    "logicBundle": {
+      "url": "http://localhost:8190/v1/bundles/himi-branded-lite-my-groups?integrity=",
+      "integrity": "",
+      "contentType": "application/javascript+ts-bundle",
+      "declaredCapabilities": [
+        "wix_api"
+      ],
+      "minBinaryVersion": "0.1.0",
+      "bundleVersion": "0.0.1"
+    }
+  },
   "himi_faq": {
     "screenId": "himi_faq",
     "renderer": "sdui_intent",

package/templates/branded-lite/himalaya.content.json

@@ -172,6 +172,9 @@
     "himi_my_events": {
       "displayName": "My Events"
     },
+    "himi_my_groups": {
+      "displayName": "My Groups"
+    },
     "himi_my_subscriptions": {
       "displayName": "My Subscriptions"
     },