@wix/himalaya-cli 0.1568.0 → 0.1569.0

package/templates/events-meetups/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/events-meetups/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/events-meetups/tier5-src/himi-branded-lite-group/index.ts

@@ -9,6 +9,8 @@ import { WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 import { get as dbGet, upsert as dbUpsert, type DbEntity } from "@himalaya/local-db";
 import { isOfflineFailure, writeMayHaveLanded } from "../_shared/owner-load-error";
+import { descriptionBody } from "../_shared/rich-body.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
 
 interface MemberAvatar {
   initials: string;
@@ -42,7 +44,8 @@ async function cachePutMembership(state: State, joined: boolean): Promise<void>
       noImage: state.noImage,
       detailScreenId: "himi_group",
     };
-    await dbUpsert(ENTITY, { ...existing, id: state.id, joined: joined ? "true" : "false" });
+    await dbUpsert(ENTITY, { ...existing, id: state.id, description: state.description,
+      descriptionJson: state.descriptionJson, joined: joined ? "true" : "false" });
   } catch { /* capability not granted */ }
 }
 
@@ -51,6 +54,8 @@ interface State {
   id: string;
   name: string;
   description: string;
+  descriptionJson: string;
+  hasDescriptionJson: boolean;
   privacy: string;
   memberCount: string;
   /** Member avatar strip (photo or initials per member) — best-effort: the
@@ -132,6 +137,8 @@ const initial: State = {
   id: "",
   name: "",
   description: "",
+  descriptionJson: "",
+  hasDescriptionJson: false,
   privacy: "",
   memberCount: "",
   memberAvatars: [],
@@ -162,6 +169,7 @@ const svc = defineService<State, {
   load: (state: State, arg?: unknown) => Promise<State>;
   join: (state: State) => Promise<State>;
   leave: (state: State) => Promise<State>;
+  openLink: (state: State, arg?: unknown) => Promise<undefined>;
 }>("himiBrandedGroup", {
   state: initial,
   actions: {
@@ -179,12 +187,16 @@ const svc = defineService<State, {
         const privacyLabel = privacy[0].toUpperCase() + privacy.slice(1);
         const signedIn = Boolean(await signedInEmail());
         const memberAvatars = await memberAvatarsOf(id);
+        const body = descriptionBody(group.description, descriptionBody(group.teaser,
+          copyParam("group.descriptionFallback", "Join this group to connect with other members.")).bodyText);
         const loaded: State = {
           ...state,
           status: "ready",
           id,
           name,
-          description: group.description || group.teaser || copyParam("group.descriptionFallback", "Join this group to connect with other members."),
+          description: body.bodyText,
+          descriptionJson: body.bodyJson,
+          hasDescriptionJson: body.bodyJson !== "",
           privacy: privacyLabel,
           memberCount: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
           memberAvatars,
@@ -209,12 +221,16 @@ const svc = defineService<State, {
           const name = (String(cached.title ?? cached.name ?? "Group")).trim() || "Group";
           const image = String(cached.image ?? "");
           const signedIn = Boolean(await signedInEmail());
+          const body = descriptionBody(cached.descriptionJson || cached.description || cached.subtitle,
+            copyParam("group.descriptionFallback", "Join this group to connect with other members."));
           const loaded: State = {
             ...state,
             status: "ready",
             id,
             name,
-            description: String(cached.subtitle ?? cached.description ?? "Join this group to connect with other members."),
+            description: body.bodyText,
+            descriptionJson: body.bodyJson,
+            hasDescriptionJson: body.bodyJson !== "",
             privacy: "Unknown",
             memberCount: String(cached.meta ?? ""),
             image,
@@ -233,6 +249,7 @@ const svc = defineService<State, {
         return { ...state, id, status: "error", isLoading: false, notLoading: true, isErrored: true, notErrored: false, hideContent: true };
       }
     },
+    openLink: async (_state, arg) => { await openRichLink(arg); return undefined; },
     join: async (state) => {
       const signedIn = Boolean(await signedInEmail());
       if (!signedIn) return membershipState({ ...state, message: copyParam("group.joinSignInMessage", "Sign in from Profile to join groups.") }, false, false);

package/templates/events-meetups/tier5-src/himi-branded-lite-groups/index.ts

@@ -3,6 +3,7 @@ import { queryGroups, type WixGroup } from "@himalaya/wix-groups";
 import { groupImage } from "../_shared/himi-media.js";
 import { copyParam, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
+import { descriptionBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): the groups list is a public read-through — paint the
 // last-synced rows from the on-device store first (instant, works offline), then
@@ -13,7 +14,11 @@ import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 // seam that keeps this shared bundle safe across every consuming app.
 const ENTITY = "groups";
 async function readCached(): Promise<GroupRow[]> {
-  try { return (await getAll(ENTITY)) as unknown as GroupRow[]; } catch { return []; }
+  try {
+    const rows = (await getAll(ENTITY)) as unknown as GroupRow[];
+    return rows.map((row) => ({ ...row, subtitle: snippet(descriptionBody(row.subtitle).bodyText
+      || descriptionBody(row.descriptionJson || row.description).bodyText) }));
+  } catch { return []; }
 }
 async function writeCached(rows: GroupRow[]): Promise<void> {
   try { for (const r of rows) await upsert(ENTITY, r as unknown as DbEntity); } catch { /* capability not granted → online-only */ }
@@ -23,6 +28,8 @@ interface GroupRow {
   id: string;
   title: string;
   subtitle: string;
+  description: string;
+  descriptionJson: string;
   meta: string;
   image: string;
   initial: string;
@@ -45,14 +52,23 @@ interface State {
   noEmpty: boolean;
 }
 
+function snippet(value: string): string {
+  const text = value.replace(/\s+/g, " ");
+  return text.length > 140 ? `${text.slice(0, 139).trimEnd()}…` : text;
+}
+
 function groupRow(group: WixGroup): GroupRow {
   const title = (group.name || copyParam("groups.groupFallbackName", "Group")).trim();
   const count = group.membersCount ?? group.memberCount;
   const image = groupImage(group);
+  const teaser = descriptionBody(group.teaser).bodyText;
+  const body = descriptionBody(group.description, teaser, ROW_IMAGE_WIDTH);
   return {
     id: group.id || title,
     title,
-    subtitle: group.teaser || group.description || copyParam("groups.subtitleFallback", "Join the conversation."),
+    subtitle: snippet(teaser) || snippet(body.bodyText) || copyParam("groups.subtitleFallback", "Join the conversation."),
+    description: body.bodyText,
+    descriptionJson: body.bodyJson,
     meta: count == null ? "" : `${count} ${count === 1 ? "member" : "members"}`,
     image,
     initial: (title[0] || "G").toUpperCase(),

package/templates/events-meetups/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/events-meetups-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/events-meetups-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/events-meetups-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/events-meetups-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/gym-fitness/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__",