@wix/himalaya-cli 0.1476.0 → 0.1477.0

package/templates/retail-store-owner/tier5-src/_shared/engine-intl.ts

@@ -444,3 +444,24 @@ export function calendarDay(date: Date, timeZone?: string): string {
   }
   return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
 }
+
+/**
+ * [timeZone]'s offset from UTC in ms at instant [at] (Asia/Jerusalem in winter: 7_200_000), or NaN
+ * where it cannot be known — no ECMA-402 (the wrist engines) or a zone this engine does not know.
+ * Callers fall back to the device zone on NaN, as the formatters above do.
+ */
+export function zoneOffsetAt(at: number, timeZone: string): number {
+  if (hasIntl() && Number.isFinite(at)) {
+    try {
+      const parts = new Intl.DateTimeFormat("en-US", {
+        timeZone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit",
+        hour: "2-digit", minute: "2-digit", second: "2-digit",
+      }).formatToParts(new Date(at));
+      const n = (type: string) => Number(parts.find((p) => p.type === type)?.value);
+      return Date.UTC(n("year"), n("month") - 1, n("day"), n("hour") % 24, n("minute"), n("second")) - at;
+    } catch {
+      /* a zone this engine does not know: NaN below */
+    }
+  }
+  return NaN;
+}

package/templates/yoga-studio/tier5-src/_shared/engine-intl.ts

@@ -444,3 +444,24 @@ export function calendarDay(date: Date, timeZone?: string): string {
   }
   return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
 }
+
+/**
+ * [timeZone]'s offset from UTC in ms at instant [at] (Asia/Jerusalem in winter: 7_200_000), or NaN
+ * where it cannot be known — no ECMA-402 (the wrist engines) or a zone this engine does not know.
+ * Callers fall back to the device zone on NaN, as the formatters above do.
+ */
+export function zoneOffsetAt(at: number, timeZone: string): number {
+  if (hasIntl() && Number.isFinite(at)) {
+    try {
+      const parts = new Intl.DateTimeFormat("en-US", {
+        timeZone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit",
+        hour: "2-digit", minute: "2-digit", second: "2-digit",
+      }).formatToParts(new Date(at));
+      const n = (type: string) => Number(parts.find((p) => p.type === type)?.value);
+      return Date.UTC(n("year"), n("month") - 1, n("day"), n("hour") % 24, n("minute"), n("second")) - at;
+    } catch {
+      /* a zone this engine does not know: NaN below */
+    }
+  }
+  return NaN;
+}

package/templates/yoga-studio/tier5-src/_shared/himi-bookings.ts

@@ -16,3 +16,38 @@ export function categoryName(value: unknown): string {
   const name = (value as { name?: unknown }).name;
   return typeof name === "string" ? name.trim() : "";
 }
+
+import { zoneOffsetAt } from "./engine-intl.js";
+
+const HAS_OFFSET = /(?:Z|[+-]\d{2}:?\d{2})$/i;
+const LOCAL_TIME = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(?::(\d{2}))?/;
+
+/** The instant (ms) a slot starts. Wix may list a slot's `startDate` as a LOCAL wall time with its
+ *  `timezone` beside it ("2026-11-02T18:30:00" in America/New_York is 23:30Z); a bare `Date.parse`
+ *  would read that in the device's zone. So a local time is placed in the slot's own zone when this
+ *  engine has Intl and knows the zone, and read in the device's zone only when it cannot be. */
+export function slotStartInstant(slot: { startDate?: string; timezone?: unknown }): number {
+  const start = slot.startDate ?? "";
+  if (!start) return NaN;
+  const local = LOCAL_TIME.exec(start);
+  if (HAS_OFFSET.test(start) || !local || typeof slot.timezone !== "string" || !slot.timezone) return Date.parse(start);
+  const wall = Date.UTC(+local[1], +local[2] - 1, +local[3], +local[4], +local[5], +(local[6] ?? 0));
+  const offset = zoneOffsetAt(wall, slot.timezone);
+  if (!Number.isFinite(offset)) return Date.parse(start);
+  // Once more at the corrected instant, so a wall time beside a DST change lands on the right side.
+  const again = zoneOffsetAt(wall - offset, slot.timezone);
+  return wall - (Number.isFinite(again) ? again : offset);
+}
+
+/** The slot a host asked to open at (`himi_time` input `start`, an ISO 8601 instant): the id of the
+ *  slot that starts at that same instant, or "" when none does (taken since, or out of the window).
+ *  Compared as instants, so `…T16:30:00Z` finds a slot listed as `…T18:30:00+02:00`, or as a local
+ *  `…T18:30:00` beside `timezone: "Asia/Jerusalem"`. */
+export function slotIdAt(slots: Iterable<[string, { startDate?: string; timezone?: unknown }]>, start: string): string {
+  const at = start ? Date.parse(start) : NaN;
+  if (!Number.isFinite(at)) return "";
+  for (const [id, slot] of slots) {
+    if (slotStartInstant(slot) === at) return id;
+  }
+  return "";
+}

package/templates/yoga-studio/tier5-src/_shared/host-events.ts

@@ -1,26 +1,65 @@
 // Host events — what a member screen tells the app hosting it about something the member did
-// (a booking confirmed), so a host such as Symphony can say so in its chat and refresh what it shows.
+// (a booking confirmed or cancelled), so a host such as Symphony can say so in its chat and refresh
+// what it shows.
 //
 // A worker dispatches `host.event` with `{ type, ...fields }` (string values only: a dispatch carries
 // one string params map). An embed (`HimalayaEmbed`) hands it to the host's `onAction` as an action
 // with that id; anywhere else nothing handles it and it is dropped. It is a notice, never a request:
 // the host owns what happens next, and the worker never waits on it or depends on its answer.
+//
+// The contract (hosts parse exactly this — Symphony's `PlaceHostEvent`):
+//   type         booking.created | booking.cancelled | plan.used
+//   serviceName  the class / service title (bookings)      planName   the plan's name (plan.used)
+//   start, end   ISO 8601 instants WITH an offset (`Z` or `+02:00`); a local time is left out
+//   remaining    sessions left on the plan, when known (a whole number)
+//   bookingId, serviceId, planId   when known
 
 import { dispatch } from "@himalaya/dispatch";
 
 export const HOST_EVENT_ACTION_ID = "host.event";
 
 /** The events a member screen reports. */
-export type HostEventType = "booking.created";
+export type HostEventType = "booking.created" | "booking.cancelled" | "plan.used";
 
-/** Tell the host about [type]. Never throws: a host that does not listen must not break the screen. */
-export async function emitHostEvent(type: HostEventType, fields: Record<string, string | undefined> = {}): Promise<void> {
+export interface HostEventFields {
+  bookingId?: string;
+  serviceId?: string;
+  serviceName?: string;
+  planId?: string;
+  planName?: string;
+  start?: string;
+  end?: string;
+  remaining?: number | string;
+}
+
+const WITH_OFFSET = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}(?::\d{2}(?:\.\d+)?)?(?:Z|[+-]\d{2}:?\d{2})$/i;
+
+/** [value] when it is an ISO 8601 instant that names its offset, else "". A slot's LOCAL wall time
+ *  ("2026-11-02T18:30:00") would be read in the host's zone, i.e. a wrong hour, so it is left out. */
+export function hostEventInstant(value: unknown): string {
+  return typeof value === "string" && WITH_OFFSET.test(value) && Number.isFinite(Date.parse(value)) ? value : "";
+}
+
+/** The `host.event` params for [type] and [fields]: unset and empty fields are left out, times
+ *  without an offset are left out, and `remaining` is a whole number ≥ 0 or nothing. */
+export function hostEventParams(type: HostEventType, fields: HostEventFields = {}): Record<string, string> {
   const params: Record<string, string> = { type };
   for (const [key, value] of Object.entries(fields)) {
-    if (typeof value === "string" && value !== "") params[key] = value;
+    let out = "";
+    if (key === "start" || key === "end") out = hostEventInstant(value);
+    else if (key === "remaining") {
+      const n = typeof value === "number" ? value : typeof value === "string" && value.trim() !== "" ? Number(value) : NaN;
+      out = Number.isInteger(n) && n >= 0 ? String(n) : "";
+    } else if (typeof value === "string") out = value.trim();
+    if (out) params[key] = out;
   }
+  return params;
+}
+
+/** Tell the host about [type]. Never throws: a host that does not listen must not break the screen. */
+export async function emitHostEvent(type: HostEventType, fields: HostEventFields = {}): Promise<void> {
   try {
-    await dispatch(HOST_EVENT_ACTION_ID, params);
+    await dispatch(HOST_EVENT_ACTION_ID, hostEventParams(type, fields));
   } catch {
     // Not embedded, or the host has no handler: nothing to tell.
   }

package/templates/yoga-studio/tier5-src/himi-booking-bookings/index.ts

@@ -4,6 +4,7 @@ import { navigate } from "@himalaya/state";
 import { copyParam } from "../_shared/himi-copy.js";
 import { memberAccess, assertMemberAccess, memberAccessChanged, memberAccessDenied, type MemberAccess } from "../_shared/member-access.js";
 import { fetchMemberBookings, type MemberBookingRow } from "../_shared/member-bookings.js";
+import { emitHostEvent } from "../_shared/host-events.js";
 import { dayKey, dayLabel } from "@himalaya/time";
 import { localPreferences } from "../_shared/local-preferences.js";
 import { parseWeeklyGoal, weeklyGoalProgress, weeklySessionsFromPages } from "../_shared/weekly-goal.js";
@@ -136,6 +137,9 @@ const svc = defineBackendCollection<S, MemberBookingRow>("himiBookingBookings",
         await cancelBookingAsMember(target.row.id, target.row.revision);
         await assertMemberAccess(target.member);
         cancelTarget = undefined;
+        // Told to the app hosting this screen (an embed's `onAction`); dropped where nothing hosts it.
+        await emitHostEvent("booking.cancelled", { bookingId: target.row.id, serviceId: target.row.serviceId,
+          serviceName: target.row.title, start: target.row.start, end: target.row.end });
         await svc.refresh();
         return derive({ ...(svc.getState() as unknown as S), actionMessage: copyParam("bookings.cancelDone", "Booking cancelled.") });
       } catch (error) {

package/templates/yoga-studio/tier5-src/himi-booking-time/index.ts

@@ -16,7 +16,8 @@ import { formatServicePrice, serviceIsChargeable } from "../_shared/wix-service-
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "@himalaya/local-db";
 import { isBridgeUnavailable } from "../_shared/owner-load-error.js";
-import { emitHostEvent } from "../_shared/host-events.js";
+import { emitHostEvent, hostEventInstant } from "../_shared/host-events.js";
+import { slotIdAt } from "../_shared/himi-bookings.js";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 
 // Offline-first (data-offline): booking a slot is WRITE-BEHIND against the
@@ -147,12 +148,23 @@ function inputId(): string {
   // `id` nav param (himi.open { screenId: "himi_time", id }) into worker input.
   // The screenId-slice below is #570 back-compat for pre-params releases with
   // baked `himi_time_<id>` screenIds — do not author against this.
-  const input = (globalThis as { himalaya?: { input?: { id?: unknown; screenId?: unknown } } }).himalaya?.input;
+  // `serviceId` is the same thing under the name a HOST uses to open this screen (the deep-entry
+  // contract: Branded Lite README, "Opening at a booking").
+  const input = (globalThis as { himalaya?: { input?: { id?: unknown; serviceId?: unknown; screenId?: unknown } } }).himalaya?.input;
   if (typeof input?.id === "string" && input.id) return input.id;
+  if (typeof input?.serviceId === "string" && input.serviceId) return input.serviceId;
   const screenId = typeof input?.screenId === "string" ? input.screenId : "";
   return screenId.startsWith("himi_time_") ? screenId.slice("himi_time_".length) : "";
 }
 
+/** The time a host opened this screen at (`himalaya.input.start`, ISO 8601), or "". Every load
+ *  preselects that slot (or opens on its day) until the member picks a day or a time themselves —
+ *  not just the first, because the boot load and the screen's own `load` can overlap. */
+let pendingStart = (() => {
+  const start = (globalThis as { himalaya?: { input?: { start?: unknown } } }).himalaya?.input?.start;
+  return typeof start === "string" && Number.isFinite(Date.parse(start)) ? start : "";
+})();
+
 function strOf(arg: unknown): string {
   if (typeof arg === "string") return arg;
   const a = arg as { value?: string; text?: string } | undefined;
@@ -534,15 +546,20 @@ const svc = defineService<S, {
         const days = daysOf(rows);
         // Keep the customer's day across a reload when it still has times;
         // otherwise open on the first day that has any.
+        // A host's `start` (deep entry): that slot preselected, or — taken since — its day.
+        const wantedStart = pendingStart;
+        const startRow = wantedStart ? rows.find((r) => r.id === slotIdAt(slotsById, wantedStart)) : undefined;
+        // The requested day even with no time left on it: "taken since" opens there, nothing selected.
+        const startDay = wantedStart ? days.find((d) => d.id === dayKey(wantedStart)) : undefined;
         const keep = days.find((d) => d.id === next.selectedDay && d.hasSlots);
-        const initialDay = keep?.id ?? days.find((d) => d.hasSlots)?.id ?? days[0]?.id ?? "";
-        const selectionAlive = slotsById.has(next.selectedSlotId);
+        const initialDay = startRow?.dayKey ?? startDay?.id ?? keep?.id ?? days.find((d) => d.hasSlots)?.id ?? days[0]?.id ?? "";
+        const selectionAlive = !!startRow || slotsById.has(next.selectedSlotId);
         const header = serviceHeaderFields(serviceRes.service);
         return derive(withDay({
           ...next,
           days,
-          selectedSlotId: selectionAlive ? next.selectedSlotId : "",
-          selectedLine: selectionAlive ? next.selectedLine : "",
+          selectedSlotId: startRow ? startRow.id : selectionAlive ? next.selectedSlotId : "",
+          selectedLine: startRow ? [startRow.day, startRow.title, startRow.subtitle].filter(Boolean).join(" · ") : selectionAlive ? next.selectedLine : "",
           status: "ready",
           errored: false,
           serviceName: serviceRes.service?.name || copyParam("time.serviceNameFallback", "Choose a time"),
@@ -567,6 +584,7 @@ const svc = defineService<S, {
     selectDay: (s, arg) => {
       const day = chosenDay(arg);
       if (!day || !s.days.some((d) => d.id === day)) return derive(s);
+      pendingStart = "";
       return derive(withDay(s, day));
     },
     refreshMember: (s, arg) => { stashCopy(arg); return probeMember(s); },
@@ -575,6 +593,7 @@ const svc = defineService<S, {
         ? arg
         : ((arg as { id?: string; slotId?: string })?.slotId ?? (arg as { id?: string })?.id ?? "");
       const selected = allRows.find((slot) => slot.id === slotId);
+      if (selected) pendingStart = "";
       return derive({
         ...s,
         selectedSlotId: selected ? slotId : s.selectedSlotId,
@@ -638,12 +657,14 @@ const svc = defineService<S, {
       if (!slot) return derive({ ...s, message: copyParam("time.bookSlotGone", "That time is no longer available. Try again.") });
       // A confirmed booking is reported to the app hosting this screen (an embed's `onAction`), so a
       // host chat can say so and refresh what it shows. Dropped where nothing hosts the screen.
-      const reportBooked = (bookingId: string | undefined) => emitHostEvent("booking.created", {
-        bookingId,
+      // The booking's own instants carry an offset; a slot's may be LOCAL to its timezone, which
+      // `emitHostEvent` leaves out rather than let the host read it in its own zone.
+      const reportBooked = (booking: { id?: string; startDate?: string; endDate?: string } | undefined) => emitHostEvent("booking.created", {
+        bookingId: booking?.id,
         serviceId: s.id,
         serviceName: s.serviceName,
-        start: slot.startDate,
-        end: slot.endDate,
+        start: hostEventInstant(booking?.startDate) || slot.startDate,
+        end: hostEventInstant(booking?.endDate) || slot.endDate,
       });
       // PAID service — FULLY NATIVE in-app payment (mirrors Wix's RN apps): NO
       // hosted-checkout WebView / browser redirect. The chain is
@@ -679,7 +700,7 @@ const svc = defineService<S, {
           const orderRes = hosted ? { paymentGatewayOrderId: "" } : await createOrder(checkoutId);
           const snapshotId = orderRes.paymentGatewayOrderId ?? "";
           if (!snapshotId && !hosted) {
-            await reportBooked(bookingId);
+            await reportBooked(created.booking);
             return derive({ ...pending, bookingInFlight: false, successMessage: copyParam("time.successMessage", "Booked. Your confirmation is ready in My Bookings."), message: "" });
           }
           // 4. Collect payment IN-APP — wallet when this app has one wired, otherwise
@@ -701,7 +722,7 @@ const svc = defineService<S, {
             },
           });
           if (pay.kind === "paid") {
-            await reportBooked(bookingId);
+            await reportBooked(created.booking);
             return derive({ ...pending, bookingInFlight: false, successMessage: copyParam("time.successMessage", "Booked. Your confirmation is ready in My Bookings."), message: "" });
           }
           if (pay.kind === "handoff") {
@@ -740,7 +761,7 @@ const svc = defineService<S, {
         // Reconcile the optimistic local id with the server-assigned booking id.
         const realId = created.booking?.id;
         if (realId && realId !== localId) { await cacheDrop(localId); await cachePut(localRow(realId)); }
-        await reportBooked(realId);
+        await reportBooked(created.booking);
         return derive({
           ...pending,
           bookingInFlight: false,

package/templates/yoga-studio-owner/tier5-src/_shared/engine-intl.ts

@@ -444,3 +444,24 @@ export function calendarDay(date: Date, timeZone?: string): string {
   }
   return `${date.getFullYear()}-${pad2(date.getMonth() + 1)}-${pad2(date.getDate())}`;
 }
+
+/**
+ * [timeZone]'s offset from UTC in ms at instant [at] (Asia/Jerusalem in winter: 7_200_000), or NaN
+ * where it cannot be known — no ECMA-402 (the wrist engines) or a zone this engine does not know.
+ * Callers fall back to the device zone on NaN, as the formatters above do.
+ */
+export function zoneOffsetAt(at: number, timeZone: string): number {
+  if (hasIntl() && Number.isFinite(at)) {
+    try {
+      const parts = new Intl.DateTimeFormat("en-US", {
+        timeZone, hourCycle: "h23", year: "numeric", month: "2-digit", day: "2-digit",
+        hour: "2-digit", minute: "2-digit", second: "2-digit",
+      }).formatToParts(new Date(at));
+      const n = (type: string) => Number(parts.find((p) => p.type === type)?.value);
+      return Date.UTC(n("year"), n("month") - 1, n("day"), n("hour") % 24, n("minute"), n("second")) - at;
+    } catch {
+      /* a zone this engine does not know: NaN below */
+    }
+  }
+  return NaN;
+}