@wix/himalaya-cli 0.1105.0 → 0.1106.0

package/dist/cli.mjs

@@ -6762,7 +6762,6 @@ function walk(node, registry, path2, out2) {
 var SYSTEM_FONT_FAMILY, TONAL_ELEVATION_ALPHA;
 var init_tokens = __esm({
   "../../core/ts/src/tokens.ts"() {
-    "use strict";
     SYSTEM_FONT_FAMILY = "$system";
     TONAL_ELEVATION_ALPHA = [0, 0.05, 0.08, 0.11, 0.12, 0.14];
   }

package/fixtures/wix-canned.json

@@ -1646,6 +1646,152 @@
       }
     }
   },
+  "GET /blog/v3/posts/rico-post": {
+    "post": {
+      "id": "rico-post",
+      "title": "Raku glazes, step by step",
+      "slug": "raku-glazes",
+      "excerpt": "How we fire raku in the studio yard.",
+      "firstPublishedDate": "2026-06-03T08:00:00.000Z",
+      "minutesToRead": 3,
+      "richContent": {
+        "nodes": [
+          {
+            "type": "HEADING",
+            "id": "rp-h",
+            "headingData": {
+              "level": 2
+            },
+            "nodes": [
+              {
+                "type": "TEXT",
+                "id": "rp-h-t",
+                "textData": {
+                  "text": "Before you fire",
+                  "decorations": []
+                }
+              }
+            ]
+          },
+          {
+            "type": "PARAGRAPH",
+            "id": "rp-p",
+            "nodes": [
+              {
+                "type": "TEXT",
+                "id": "rp-p-t1",
+                "textData": {
+                  "text": "Always wear gloves.",
+                  "decorations": [
+                    {
+                      "type": "BOLD"
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "TEXT",
+                "id": "rp-p-t2",
+                "textData": {
+                  "text": " Then ",
+                  "decorations": []
+                }
+              },
+              {
+                "type": "TEXT",
+                "id": "rp-p-t3",
+                "textData": {
+                  "text": "read the firing guide",
+                  "decorations": [
+                    {
+                      "type": "LINK",
+                      "linkData": {
+                        "link": {
+                          "url": "https://www.wix.com/raku-guide",
+                          "target": "BLANK"
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              {
+                "type": "TEXT",
+                "id": "rp-p-t4",
+                "textData": {
+                  "text": ".",
+                  "decorations": []
+                }
+              }
+            ]
+          },
+          {
+            "type": "BULLETED_LIST",
+            "id": "rp-l",
+            "nodes": [
+              {
+                "type": "LIST_ITEM",
+                "id": "rp-l-0",
+                "nodes": [
+                  {
+                    "type": "PARAGRAPH",
+                    "id": "rp-l-0-p",
+                    "nodes": [
+                      {
+                        "type": "TEXT",
+                        "id": "rp-l-0-t",
+                        "textData": {
+                          "text": "Bisque first",
+                          "decorations": []
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              {
+                "type": "LIST_ITEM",
+                "id": "rp-l-1",
+                "nodes": [
+                  {
+                    "type": "PARAGRAPH",
+                    "id": "rp-l-1-p",
+                    "nodes": [
+                      {
+                        "type": "TEXT",
+                        "id": "rp-l-1-t",
+                        "textData": {
+                          "text": "Glaze thin",
+                          "decorations": []
+                        }
+                      }
+                    ]
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "type": "IMAGE",
+            "id": "rp-img",
+            "imageData": {
+              "image": {
+                "src": {
+                  "id": "8ce05f_d81f257ab773486d83187e34816ce1a4~mv2.png"
+                },
+                "width": 1024,
+                "height": 1024
+              },
+              "altText": "Dawn over the mountains behind the studio"
+            }
+          }
+        ],
+        "metadata": {
+          "version": 1
+        }
+      }
+    }
+  },
   "GET /comments/v1/comments/list-by-resource": {
     "comments": [],
     "commentCount": 0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1105.0",
+  "version": "0.1106.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -67,5 +67,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "fdff476ebcee837f6678db8dfdabdd6584593650a4d17b9f5a264669"
+  "falconPackageHash": "faa54f382a4c5a4903c112395c7bf69887e9b0d8ff91ea2e682af85d"
 }

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

@@ -28514,103 +28514,45 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                       }
                     },
                     {
-                      "id": "himi_blog_post.blocks",
+                      "id": "post_body",
                       "body": {
                         "package": "himalaya",
-                        "type": "Grid",
+                        "type": "RichContent",
                         "props": {
-                          "columns": 1,
-                          "spacing": 12,
-                          "itemsPath": "$service:himiBlogPost.blocks",
-                          "items": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 0,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "himi_blog_post.block_heading",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$item.text",
-                                          "style": "title3",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "padding": {
-                                          "top": 8,
-                                          "bottom": 2
-                                        },
-                                        "hiddenPath": "$item.notHeading"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$item.text",
-                                          "style": "body",
-                                          "color": "textPrimary",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$item.notText"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Image",
-                                        "props": {
-                                          "url": "$item.image",
-                                          "fillWidth": true,
-                                          "height": 220,
-                                          "contentMode": "fill"
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityRole": "decorative",
-                                        "cornerRadius": 8,
-                                        "fillMaxWidth": true,
-                                        "hiddenPath": "$item.notImage"
-                                      }
-                                    }
-                                  ]
-                                }
+                          "documentJsonPath": "$service:himiBlogPost.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.himiBlogPost.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiBlogPost.bodyText",
+                                "style": "body",
+                                "color": "textPrimary",
+                                "collapseWhenEmpty": true
                               }
                             }
-                          ]
+                          }
                         }
-                      },
-                      "modifiers": {
-                        "hiddenPath": "$service:himiBlogPost.noBlocks"
                       }
                     },
                     {
-                      "id": "",
+                      "id": "post_body_text",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "$service:himiBlogPost.body",
+                          "text": "$service:himiBlogPost.bodyText",
                           "style": "body",
                           "color": "textPrimary",
                           "collapseWhenEmpty": true
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiBlogPost.hasBlocks"
+                        "hiddenPath": "$service:himiBlogPost.hasBodyJson"
                       }
                     },
                     {
@@ -29011,7 +28953,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "declaredCapabilities": [
         "wix_api",
         "share",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"

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

@@ -0,0 +1,28 @@
+// [rico] #3370 — an entity's Ricos body, prepared for a RichContent component and its plain-text fallback.
+// One rule for every worker that renders a body (the blog post and the owner post detail today; #3372's
+// verticals next), so they cannot drift apart.
+// Inside the platform source this import is a relative path, so node test runs resolve it; an app's copy
+// imports "@himalaya/wix-rich-content".
+import { encodeRichContent, parseRicosJson, ricosToPlainText } from "@himalaya/wix-rich-content";
+
+/** What a body-rendering worker publishes: `<name>Json` for `documentJsonPath`, and the plain text. */
+export interface RichBody {
+  /** The document as ONE JSON string (media sized, disallowed links dropped); "" when there is no document
+   *  or the encoder rejected it. RichContent draws nothing for "", so a screen gates its plain text on it. */
+  bodyJson: string;
+  /** The plain text: the document's own text when it has any, else `fallback`. */
+  bodyText: string;
+}
+
+/** Prepares `richContent` (a Ricos document, as a Wix API returns it, or its JSON string). No document, or one
+ *  that is not a document, gives `{ bodyJson: "", bodyText: fallback }`. A document past the viewer's limits
+ *  gives bodyJson "" and its plain text — except one rejected as too deep, which is not walked again (the
+ *  plain-text walk has no depth limit), so `fallback` stands in for it. */
+export function richBody(richContent: unknown, fallback = ""): RichBody {
+  const doc = parseRicosJson(richContent);
+  if (!doc) return { bodyJson: "", bodyText: fallback };
+  // 1400 px — the detail-image budget, which is also the encoder's maximum.
+  const { json, rejected } = encodeRichContent(doc, { imageWidth: 1400 });
+  const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
+  return { bodyJson: json, bodyText: text || fallback };
+}

package/templates/beauty-salon/tier5-src/_shared/rich-content-link.ts

@@ -0,0 +1,34 @@
+// [rico] #3370 — a RichContent `on_link` tap reaches the worker as `{ url }` (the renderers merge the tapped
+// link into the action's args). Only http(s) with a host, mailto and tel ever reach the OS; anything
+// else is dropped here, before any dispatch. The renderers already refuse other schemes, but the action
+// arrives here as plain data, so the worker checks it again rather than trusting whoever sent it.
+import { open, defaultMode } from "@himalaya/open-url";
+
+/** The viewer's link rule, verbatim (`LINK` in @himalaya/wix-rich-content's display.ts, which the package does
+ *  not export); a parity test pins this copy to the original. */
+const LINK = /^(https?:\/\/[^\s/?#]\S*|mailto:\S+|tel:\S+)$/i;
+/** ASCII whitespace only, as the viewer trims a link before applying the rule. */
+const trimAscii = (s: string): string => s.replace(/^[\t\n\v\f\r ]+|[\t\n\v\f\r ]+$/g, "");
+
+/** The url of a link tap (`{ url }`, `{ args: { url } }` or a bare string), or "" when it is missing or
+ *  not an http(s), mailto or tel link. */
+export function richLinkUrl(arg: unknown): string {
+  const a = arg as { url?: unknown; args?: { url?: unknown } } | null | undefined;
+  const raw = typeof arg === "string" ? arg
+    : typeof a?.url === "string" ? a.url
+      : typeof a?.args?.url === "string" ? a.args.url : "";
+  const url = trimAscii(raw);
+  return LINK.test(url) ? url : "";
+}
+
+/** Opens a link tap through `capability.open_url` (http(s) in the in-app browser, mailto/tel in the system
+ *  handler). False when the link is blocked, nothing took it, or the host threw. */
+export async function openRichLink(arg: unknown): Promise<boolean> {
+  const url = richLinkUrl(arg);
+  if (!url) return false;
+  try {
+    return (await open(url, defaultMode(url))).opened;
+  } catch {
+    return false;
+  }
+}

package/templates/beauty-salon/tier5-src/himi-blog-post/index.ts

@@ -3,11 +3,12 @@ import { defineService } from "@himalaya/state";
 import { share as shareSheet } from "@himalaya/share";
 import { getPost, likePost, unlikePost, type WixPost } from "@himalaya/wix-blog";
 import { comments, BLOG_COMMENTS_APP_ID, blogCommentRow, listBlogComments, type WixBlogCommentRow } from "@himalaya/wix-comments";
-import { wixMediaUrl, WIX_DETAIL_IMAGE } from "@himalaya/wix-media";
 import { get, type DbEntity } from "@himalaya/local-db";
 import { isSavedId, toggleSavedId } from "../_shared/himi-blog-saved";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): the post body is a public read-through — when the
 // live fetch fails (offline) fall back to the last-synced row the feed cached under
@@ -26,23 +27,6 @@ interface CommentRow {
   meta: string;
 }
 
-/** One rich-content block row for the mixed-row body template: a text
- *  paragraph, a heading, or an inline image — exactly one variant renders per
- *  row (per-$item hiddenWhen, the himi_menu mixed-row contract). Rendering the
- *  ricos `richContent` this way keeps INLINE IMAGES (previously lost by the
- *  plainContent flattening). */
-interface BlockRow {
-  id: string;
-  isText: boolean;
-  notText: boolean;
-  isHeading: boolean;
-  notHeading: boolean;
-  isImage: boolean;
-  notImage: boolean;
-  text: string;
-  image: string;
-}
-
 interface S {
   status: "loading" | "ready" | "error";
   id: string;
@@ -54,12 +38,13 @@ interface S {
   /** "N likes · M comments" from post.metrics — collapses at zero/absent. */
   countsLine: string;
   excerpt: string;
-  body: string;
-  /** Rich-content block rows (paragraphs / headings / inline images). When
-   *  present the screen renders these INSTEAD of the flattened `body`. */
-  blocks: BlockRow[];
-  hasBlocks: boolean;
-  noBlocks: boolean;
+  /** [rico] #3370 — the body as ONE Ricos document JSON string for RichContent: the encoder has
+   *  sized its media and dropped disallowed links. "" when the post has none, or the encoder rejected it. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** Plain text of the body: RichContent's `fallback`, and what shows when there is no document. */
+  bodyText: string;
   /** Share payload — the post's public URL when the payload carries one. */
   shareUrl: string;
   cover: string;
@@ -101,55 +86,6 @@ type PostWithExtras = WixPost & {
   author?: { name?: string; nickname?: string } | string;
 };
 
-/** One ricos node's plain text (joins the leaf textData runs). */
-function ricosText(node: unknown): string {
-  const n = node as { textData?: { text?: string }; nodes?: unknown[] } | undefined;
-  const own = typeof n?.textData?.text === "string" ? n.textData.text : "";
-  const nested = Array.isArray(n?.nodes) ? n.nodes.map(ricosText).join("") : "";
-  return own + nested;
-}
-
-/** A ricos IMAGE node's URL — direct `src.url` or a wixstatic media id. */
-function ricosImageUrl(node: unknown): string {
-  const src = (node as { imageData?: { image?: { src?: { url?: string; id?: string } } } } | undefined)
-    ?.imageData?.image?.src;
-  return wixMediaUrl(src?.url ?? src?.id, WIX_DETAIL_IMAGE);
-}
-
-/** ricos richContent.nodes → mixed block rows (paragraphs, headings, inline
- *  images). Anything unrecognized flattens to its text (or is dropped). */
-export function richContentBlocks(richContent: unknown): BlockRow[] {
-  const nodes = (richContent as { nodes?: unknown[] } | undefined)?.nodes;
-  if (!Array.isArray(nodes)) return [];
-  const rows: BlockRow[] = [];
-  const push = (kind: "text" | "heading" | "image", text: string, image: string) => {
-    rows.push({
-      id: `block_${rows.length}`,
-      isText: kind === "text",
-      notText: kind !== "text",
-      isHeading: kind === "heading",
-      notHeading: kind !== "heading",
-      isImage: kind === "image",
-      notImage: kind !== "image",
-      text,
-      image,
-    });
-  };
-  for (const node of nodes) {
-    const type = String((node as { type?: unknown } | undefined)?.type ?? "").toUpperCase();
-    if (type === "IMAGE") {
-      const url = ricosImageUrl(node);
-      if (url) push("image", "", url);
-      continue;
-    }
-    const text = ricosText(node).trim();
-    if (!text) continue;
-    if (type.startsWith("HEADING")) push("heading", text, "");
-    else push("text", text, "");
-  }
-  return rows;
-}
-
 /** "By <name>" from the payload's writer-ish fields ("" when absent). */
 function bylineOf(post: PostWithExtras): string {
   const author = typeof post.author === "string" ? post.author : undefined;
@@ -260,8 +196,7 @@ function derive(s: S): S {
     noPost: !hasPost,
     hasCover: Boolean(s.cover),
     noCover: !s.cover,
-    hasBlocks: s.blocks.length > 0,
-    noBlocks: s.blocks.length === 0,
+    hasBodyJson: s.bodyJson !== "",
     notLiked: !s.liked,
     notSaved: !s.saved,
     commentsAvailable: !s.commentsUnavailable,
@@ -276,10 +211,9 @@ const baseState: S = derive({
   byline: "",
   countsLine: "",
   excerpt: "",
-  body: "",
-  blocks: [],
-  hasBlocks: false,
-  noBlocks: true,
+  bodyJson: "",
+  hasBodyJson: false,
+  bodyText: "",
   shareUrl: "",
   cover: "",
   hasCover: false,
@@ -321,7 +255,9 @@ async function cachedPostState(s: S, id: string): Promise<S> {
     title,
     subtitle: String(cached.meta ?? ""),
     excerpt: String(cached.excerpt ?? "").trim(),
-    body: String(cached.body ?? cached.excerpt ?? "This post has no readable body yet."),
+    // The feed caches no Ricos body, so the offline copy is plain text (the descriptor's gated text shows it).
+    bodyJson: "",
+    bodyText: String(cached.body ?? cached.excerpt ?? "This post has no readable body yet."),
     cover: String(cached.cover ?? ""),
     initial: String(cached.initial ?? "") || (title[0] || "#").toUpperCase(),
     liked: false,
@@ -358,8 +294,8 @@ async function loadPostState(s: S): Promise<S> {
       byline: bylineOf(post),
       countsLine: countsLineOf(post),
       excerpt: (post.excerpt || "").trim(),
-      body: bodyText(post),
-      blocks: richContentBlocks(post.richContent),
+      // No Ricos body, or one the encoder rejects: bodyJson "" and the gated plain text shows bodyText.
+      ...richBody(post.richContent, bodyText(post)),
       shareUrl: postShareUrl(post),
       cover,
       initial: (title[0] || "#").toUpperCase(),
@@ -387,6 +323,8 @@ const svc = defineService<S, {
   share: (s: S) => Promise<S>;
   setComment: (s: S, arg?: unknown) => S;
   submitComment: (s: S) => Promise<S>;
+  /** [rico] #3370 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: S, arg?: unknown) => Promise<S>;
 }>("himiBlogPost", {
   state: baseState,
   actions: {
@@ -452,6 +390,12 @@ const svc = defineService<S, {
         });
       }
     },
+    // Only http(s), mailto and tel links reach open_url; a refused link, or one nothing opened, says so, and
+    // a link that opens clears that message rather than leaving an earlier failure on screen.
+    openLink: async (s, arg) => derive({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("blogPost.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });
 

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

@@ -78410,6 +78410,48 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
+                    {
+                      "id": "post_body",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:himiOwnerLitePost.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.himiOwnerLitePost.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:himiOwnerLitePost.bodyText",
+                                "style": "body",
+                                "color": "textPrimary",
+                                "collapseWhenEmpty": true
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "post_body_text",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiOwnerLitePost.bodyText",
+                          "style": "body",
+                          "color": "textPrimary",
+                          "collapseWhenEmpty": true
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLitePost.hasBodyJson"
+                      }
+                    },
                     {
                       "id": "post_info_card",
                       "body": {
@@ -78783,7 +78825,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"

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

@@ -0,0 +1,28 @@
+// [rico] #3370 — an entity's Ricos body, prepared for a RichContent component and its plain-text fallback.
+// One rule for every worker that renders a body (the blog post and the owner post detail today; #3372's
+// verticals next), so they cannot drift apart.
+// Inside the platform source this import is a relative path, so node test runs resolve it; an app's copy
+// imports "@himalaya/wix-rich-content".
+import { encodeRichContent, parseRicosJson, ricosToPlainText } from "@himalaya/wix-rich-content";
+
+/** What a body-rendering worker publishes: `<name>Json` for `documentJsonPath`, and the plain text. */
+export interface RichBody {
+  /** The document as ONE JSON string (media sized, disallowed links dropped); "" when there is no document
+   *  or the encoder rejected it. RichContent draws nothing for "", so a screen gates its plain text on it. */
+  bodyJson: string;
+  /** The plain text: the document's own text when it has any, else `fallback`. */
+  bodyText: string;
+}
+
+/** Prepares `richContent` (a Ricos document, as a Wix API returns it, or its JSON string). No document, or one
+ *  that is not a document, gives `{ bodyJson: "", bodyText: fallback }`. A document past the viewer's limits
+ *  gives bodyJson "" and its plain text — except one rejected as too deep, which is not walked again (the
+ *  plain-text walk has no depth limit), so `fallback` stands in for it. */
+export function richBody(richContent: unknown, fallback = ""): RichBody {
+  const doc = parseRicosJson(richContent);
+  if (!doc) return { bodyJson: "", bodyText: fallback };
+  // 1400 px — the detail-image budget, which is also the encoder's maximum.
+  const { json, rejected } = encodeRichContent(doc, { imageWidth: 1400 });
+  const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
+  return { bodyJson: json, bodyText: text || fallback };
+}