@wix/himalaya-cli 0.1568.0 → 0.1570.0

package/templates/beauty-salon/tier5-src/himi-booking-service/index.ts

@@ -9,6 +9,8 @@ import { stashCopy, copyParam, copyTemplate, copyPlural } from "../_shared/himi-
 import { get, type DbEntity } from "@himalaya/local-db";
 import { wixMediaUrl, WIX_DETAIL_IMAGE, WIX_LIST_IMAGE } from "@himalaya/wix-media";
 import { formatClock, formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
+import { descriptionBody } from "../_shared/rich-body.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
 
 // Offline-first (data-offline): the service detail is a public read-through. On a
 // fetch failure we fall back to the last-synced row for this service written by
@@ -119,6 +121,8 @@ interface S {
   bookableOnline: boolean;
   notBookableOnline: boolean;
   about: string;
+  aboutJson: string;
+  hasAboutJson: boolean;
   noAbout: boolean;
   policyLines: PolicyLine[];
   noPolicy: boolean;
@@ -431,13 +435,6 @@ function serviceShareUrl(service: WixService): string {
   return "";
 }
 
-function plain(text: string | undefined): string {
-  return stringOf(text)
-    .replace(/<[^>]*>/g, " ")
-    .replace(/\s+/g, " ")
-    .trim();
-}
-
 // ---- Class and course ------------------------------------------------------------
 
 const DAY_MS = 86_400_000;
@@ -603,7 +600,7 @@ function derive(s: S): S {
     noCourseCtaFull: !s.courseCtaFull,
     noCourseCtaClosed: !s.courseCtaClosed,
     notBookableOnline: !s.bookableOnline,
-    noAbout: !s.about,
+    noAbout: !s.about && !s.aboutJson,
     noPolicy: s.policyLines.length === 0,
     policyCollapsed: !s.policyExpanded,
     noFacts: !s.courseDates && !s.durationText && !s.spotsText && s.locations.length === 0 && !s.online && !s.staffText && !s.payText,
@@ -617,6 +614,7 @@ function derive(s: S): S {
 }
 
 function withService(s: S, service: WixService): S {
+  const body = descriptionBody(service.description);
   const serviceId = stringOf(service.id) || s.id;
   const name = stringOf(service.name) || "Service";
   const price = priceLine(service);
@@ -667,7 +665,9 @@ function withService(s: S, service: WixService): S {
     paySub: pay.sub,
     requestToBook: service.onlineBooking?.requireManualApproval === true,
     bookableOnline: service.onlineBooking?.enabled !== false,
-    about: plain(service.description),
+    about: body.bodyText,
+    aboutJson: body.bodyJson,
+    hasAboutJson: body.bodyJson !== "",
     policyLines: policyLines(service.bookingPolicy, stringOf(service.type).toUpperCase()),
     shareUrl: serviceShareUrl(service),
     // WS-C — canonical param-less target; the descriptor's choose-time CTA
@@ -696,6 +696,7 @@ const id = inputId();
 const svc = defineService<S, {
   load: (s: S, arg?: unknown) => Promise<S>;
   share: (s: S) => Promise<S>;
+  openLink: (s: S, arg?: unknown) => Promise<undefined>;
   togglePolicy: (s: S) => S;
   toggleSchedule: (s: S) => S;
   openDirections: (s: S, arg?: unknown) => Promise<S>;
@@ -775,6 +776,8 @@ const svc = defineService<S, {
     bookableOnline: true,
     notBookableOnline: false,
     about: "",
+    aboutJson: "",
+    hasAboutJson: false,
     noAbout: true,
     policyLines: [],
     noPolicy: true,
@@ -824,6 +827,7 @@ const svc = defineService<S, {
         return derive({ ...start, status: "ready", errored: true, name: "" });
       }
     },
+    openLink: async (_state, arg) => { await openRichLink(arg); return undefined; },
     share: async (s) => {
       if (!s.name) return s;
       const text = [s.name, s.tagline].filter(Boolean).join(" — ");

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

@@ -0,0 +1,35 @@
+import { defineService } from "@himalaya/state";
+
+// Native renderers animate; this worker only publishes the requested visibility.
+// The host waits for presentation, bounded by the original startup deadline.
+const input = (globalThis as unknown as { himalaya?: { input?: Record<string, unknown> } }).himalaya?.input;
+interface State {
+  title: string;
+  caption: string;
+  iconHidden: boolean;
+  presentationPending: boolean;
+  errorText?: string;
+  customLogoHidden?: boolean;
+  backgroundImageUrl?: string;
+}
+export const splash = defineService<State, { present: (state: State) => State }>("splash", {
+  state: {
+    title: typeof input?.title === "string" ? input.title : "",
+    caption: typeof input?.caption === "string" ? input.caption : "",
+    iconHidden: false,
+    presentationPending: true,
+    // A malformed OTA toggle must not release the native cover as a successful
+    // presentation. The host's existing deadline remains the failure fallback.
+    ...(input?.showIcon !== undefined && typeof input.showIcon !== "boolean"
+      ? { errorText: "Splash showIcon must be a boolean" } : {}),
+    ...(typeof input?.backgroundImageUrl === "string" ? { backgroundImageUrl: input.backgroundImageUrl } : {}),
+    ...(input?.customLogo === true ? { customLogoHidden: true } : {}),
+  },
+  actions: {
+    present: (state) => state.errorText ? state : ({ ...state,
+      iconHidden: input?.showIcon === false || input?.customLogo === true,
+      ...(input?.customLogo === true ? { customLogoHidden: input?.showIcon === false } : {}),
+      presentationPending: false,
+    }),
+  },
+});

package/templates/beauty-salon-owner/config.ts

@@ -39,6 +39,14 @@ export default defineApp({
   },
   capabilities: ["live_activity","push","share","secure_storage","open_url","local_database","clipboard","ui","speech","camera","photos","file_picker","files","presigned_upload","app_info","biometrics","wix_platform","animation"],
   designTokensPath: "./tokens.json",
+  // Native fallback; the T5 splash descriptor owns the editable launch appearance.
+  splash: {
+    "enabled": true,
+    "backgroundColor": "accentPrimary",
+    "caption": "Himalaya Owner",
+    "minVisibleMs": 400,
+    "maxHoldMs": 3000
+  },
   navigation: {
     "navKind": "responsive",
     "surfaces": {

package/templates/beauty-salon-owner/dev/index.ts

@@ -3,6 +3,7 @@
 // fill __HIMI_ID__ sentinels per request.
 import config from "../config.js";
 
+
 const runtimeSetting = (value: unknown): unknown => {
   if (value === "__HIMI_PODCAST_FEED_URL__") return process.env.PODCAST_FEED_URL?.trim() || "";
   if (Array.isArray(value)) return value.map(runtimeSetting);

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

@@ -1,8 +1,8 @@
 // Copy-as-configuration for WORKER-emitted strings (`himi docs designing-himi-screens`,
 // §"Copy is configuration"): a worker never hardcodes user-facing copy — the
 // descriptor bakes the provisioned copy-pack overrides relevant to this worker
-// into its onAppear action params as a `copy` JSON object (key → override
-// string, computed from the app contract at descriptor-build time), and the
+// into its onAppear action params as a `copy` JSON object (customer strings or
+// source-matched stock translations, computed at descriptor-build time), and the
 // worker reads every user-facing string through `copyParam(key, fallback)`.
 //
 // STASHED (the stashed appear-params idiom, himi-branded-lite-home): the
@@ -16,9 +16,13 @@
 // every worker that emits user-facing copy, and copied verbatim into the
 // generated templates' tier5-src/_shared/.
 
-let stashedCopy: Record<string, string> = {};
+/** 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 };
 
-/** Absorb the `copy` onAppear param (a JSON object of key → override string)
+let stashedCopy: Record<string, CopyPackValue> = Object.create(null);
+
+/** Absorb the `copy` onAppear param (customer strings or stock translation records)
  *  from an action arg. Call first in every action that can receive onAppear
  *  params (load/refresh). Non-copy args and malformed packs are ignored — the
  *  stock fallbacks keep rendering. */
@@ -29,9 +33,15 @@ export function stashCopy(arg: unknown): void {
   try {
     const parsed = JSON.parse(raw) as unknown;
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return;
-    const next: Record<string, string> = {};
+    const next: Record<string, CopyPackValue> = Object.create(null);
     for (const [key, value] of Object.entries(parsed as Record<string, unknown>)) {
       if (typeof value === "string") next[key] = value;
+      else if (value && typeof value === "object" && !Array.isArray(value)) {
+        const row = value as Record<string, unknown>;
+        if (typeof row.source === "string" && typeof row.translation === "string") {
+          next[key] = { source: row.source, translation: row.translation };
+        }
+      }
     }
     stashedCopy = next;
   } catch {
@@ -43,7 +53,8 @@ export function stashCopy(arg: unknown): void {
  *  pack / no such key reached this worker. */
 export function copyParam(key: string, fallback: string): string {
   const value = stashedCopy[key];
-  return typeof value === "string" && value !== "" ? value : fallback;
+  if (typeof value === "string") return value !== "" ? value : fallback;
+  return value?.source === fallback && value.translation !== "" ? value.translation : fallback;
 }
 
 /** Interpolate `{name}` placeholders in a (possibly overridden) template:

package/templates/beauty-salon-owner/tier5-src/_shared/rich-body.ts

@@ -32,3 +32,47 @@ export function richBody(richContent: unknown, fallback = "", imageWidth = 1400)
   const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
   return { bodyJson: json, bodyText: text || fallback };
 }
+
+/** A Wix description may be Ricos (including serialized JSON), HTML or ordinary text.
+ * Keep rich documents on the existing bounded encoder path. Non-document JSON and
+ * clearly malformed serialization use an independent fallback. Ambiguous bracketed
+ * prose stays readable; this does not attempt to repair arbitrary JSON syntax. */
+export function descriptionBody(value: unknown, fallback = "", imageWidth = 1400): RichBody {
+  if (typeof value !== "string") return richBody(value, fallback, imageWidth);
+  const text = value.trim();
+  if (/^[{[]/.test(text)) {
+    try {
+      const parsed: unknown = JSON.parse(text);
+      // Passing the parsed value avoids parsing a valid Ricos document twice; a
+      // different JSON structure is rejected by the same existing document check.
+      if (parsed && typeof parsed === "object") return richBody(parsed, fallback, imageWidth);
+    } catch {
+      const objectLike = /^\{\s*(?:["'}]|nodes\b)/.test(text);
+      // Only reject scalar-looking malformed arrays when their syntax is clearly
+      // unfinished (or contains JS's non-JSON `undefined`). Balanced bracketed
+      // prose such as "[1,000]" and "[12:30, 13:30]" is not JSON and stays readable.
+      const arrayTokens = text.replace(/"(?:\\.|[^"\\])*"/g, "")
+        .replace(/\b(?:true|false|null|undefined)\b/g, "")
+        .replace(/-?(?:0|[1-9]\d*)(?:\.\d+)?(?:[eE][+-]?\d+)?/g, "");
+      const arrayLike = /^\[\s*[{"]/.test(text)
+        || (text.startsWith("[") && /^[\s[\]{},:]*$/.test(arrayTokens)
+          && (/,\s*]?$/.test(text) || /\bundefined\b/.test(text) || !text.endsWith("]")));
+      if (objectLike || arrayLike) return { bodyJson: "", bodyText: fallback };
+    }
+  }
+  // Legacy HTML descriptions stay text. Preserve paragraph breaks and ordinary prose's
+  // bare '<' (e.g. "ages < 8"), without relying on browser-only DOM APIs in workers.
+  const plain = text
+    .replace(/<(script|style)\b[^>]*>[\s\S]*?<\/\1\s*>/gi, "")
+    .replace(/<br\s*\/?\s*>/gi, "\n")
+    .replace(/<\/(?:p|div|h[1-6]|li)\s*>/gi, "\n\n")
+    .replace(/<\/?[a-z][^>]*>/gi, "")
+    .replace(/&(?:nbsp|amp|lt|gt|quot|apos|#39);/gi, (entity) => ({
+      "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": '"', "&apos;": "'", "&#39;": "'",
+    })[entity.toLowerCase()] ?? entity)
+    .replace(/[\t\r ]+/g, " ")
+    .replace(/ *\n */g, "\n")
+    .replace(/\n{3,}/g, "\n\n")
+    .trim();
+  return { bodyJson: "", bodyText: plain || fallback };
+}

package/templates/branded-lite/config.ts

@@ -52,6 +52,16 @@ export default defineApp({
     ]
   },
   designTokensPath: "./tokens.json",
+  // Native fallback; the T5 splash descriptor owns the editable launch appearance.
+  splash: {
+    "enabled": true,
+    "backgroundColor": "accentPrimary",
+    "logoAsset": "branded_lite_app_icon",
+    "logoWidth": 192,
+    "layout": "logoOnly",
+    "minVisibleMs": 0,
+    "maxHoldMs": 5000
+  },
   navigation: {
     "navKind": "responsive",
     "scheme": "himalaya-__HIMI_APP_SLUG__",
@@ -71,6 +81,13 @@ export default defineApp({
         "parentScreenId": "himi_account",
         "tabId": "profile"
       },
+      {
+        "screenId": "himi_business_contact",
+        "isPublic": true,
+        "paramKeys": [],
+        "parentScreenId": "himi_account",
+        "tabId": "profile"
+      },
       {
         "screenId": "himi_appearance",
         "isPublic": true,