@wix/himalaya-cli 0.1105.0 → 0.1107.0

package/templates/yoga-studio-owner/dev/index.ts

@@ -74011,6 +74011,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": {
@@ -74385,7 +74427,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/yoga-studio-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 };
+}

package/templates/yoga-studio-owner/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/yoga-studio-owner/tier5-src/himi-owner-lite-post/index.ts

@@ -7,6 +7,9 @@ import { postCoverUrl } from "../_shared/owner-post-content.js";
 
 import { defineService } from "@himalaya/state";
 import { getPost, getDraftPost, publishDraftPost, revertDraftPost, deleteDraftPost } from "@himalaya/wix-blog";
+import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody } from "../_shared/rich-body.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -25,6 +28,14 @@ async function cachePut(row: DbEntity): Promise<void> { try { await dbUpsert(ENT
 async function cacheDrop(id: string): Promise<void> { try { await dbRemove(ENTITY, id); } catch { /* capability not granted */ } }
 async function cacheGet(id: string): Promise<DbEntity | null> { try { return await dbGet(ENTITY, id); } catch { return null; } }
 async function queueWrite(actionId: string, params: Record<string, string>): Promise<void> { try { await dbEnqueue(actionId, params); } catch { /* capability not granted */ } }
+/** [rico] #3370 — keep the body's plain text with the post's cached row, so the offline detail shows it. It is
+ *  merged into the row the posts list wrote rather than replacing it; a later list re-sync writes its own rows
+ *  and drops it again, until the detail is next opened online. */
+async function cacheBodyText(s: PostState): Promise<void> {
+  if (s.status !== "ready" || !s.id) return;
+  const prev = await cacheGet(s.id);
+  await cachePut(prev ? { ...prev, bodyText: s.bodyText } : cacheRow(s));
+}
 
 interface PostState {
   id: string;
@@ -38,6 +49,14 @@ interface PostState {
   summary: string;
   initial: string;
   image: string;
+  // Body ([rico] #3370) — RichContent binds bodyJson; the plain text shows when there is no document.
+  /** The body as ONE Ricos document JSON string for RichContent, from the draft when there is one; "" when the post
+   *  has none, the encoder rejected it, or this is the offline copy. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** Plain text of the body: RichContent's `fallback`, and the offline copy's body. */
+  bodyText: string;
   // Info rows
   postStatus: string;
   category: string;
@@ -118,6 +137,9 @@ function shape(s: Partial<PostState>): PostState {
     summary: s.summary ?? "",
     initial: s.initial ?? "?",
     image,
+    bodyJson: s.bodyJson ?? "",
+    hasBodyJson: !!s.bodyJson,
+    bodyText: s.bodyText ?? "",
     postStatus: s.postStatus ?? statusLabel(raw),
     category: s.category ?? "—",
     published: s.published ?? "—",
@@ -153,6 +175,8 @@ function demoDetail(s: PostState, id: string): PostState | null {
     summary: d.excerpt,
     initial: (d.title[0] || "?").toUpperCase(),
     image: "",
+    bodyJson: "",
+    bodyText: d.body,
     postStatus: d.postStatus,
     category: d.category,
     published: d.published,
@@ -173,6 +197,8 @@ function cacheRow(s: PostState): DbEntity {
     summary: s.summary,
     initial: s.initial,
     image: s.image,
+    // The plain text only: the offline copy shows it, and a stale document is never drawn from cache.
+    bodyText: s.bodyText,
     postStatus: s.postStatus,
     category: s.category,
     published: s.published,
@@ -194,6 +220,10 @@ function cachedDetail(s: PostState, row: DbEntity): PostState {
     summary: String(row.summary ?? row.excerpt ?? ""),
     initial: String(row.initial ?? (title[0] || "?")).slice(0, 1).toUpperCase(),
     image: String(row.image ?? ""),
+    bodyJson: "",
+    // The post form upserts a whole row with `body` and no `bodyText`; cacheBodyText later merges `bodyText` into it.
+    // So a present `bodyText` is the newer value, and an explicit "" (a body cleared online) is kept.
+    bodyText: String(row.bodyText ?? row.body ?? ""),
     postStatus: row.postStatus != null ? String(row.postStatus) : statusLabel(raw),
     category: String(row.category ?? "—"),
     published: String(row.published ?? "—"),
@@ -221,6 +251,10 @@ async function refresh(prev: PostState, id: string, actionMessage = ""): Promise
   const slug = draft?.seoSlug || post?.slug || "";
   const draftHidesCover = (draft?.media ?? draft?.coverMedia)?.displayed === false;
   const image = draftHidesCover ? "" : coverUrl(draft) || coverUrl(post);
+  // The draft carries the owner's latest edits, so its body wins over the published one. With no usable
+  // document, the published post's own plain text (CONTENT_TEXT) is the body.
+  const body = richBody(parseRicosJson(draft?.richContent) ? draft?.richContent : post?.richContent,
+    typeof post?.contentText === "string" ? post.contentText.trim() : "");
   return shape({
     ...prev,
     id,
@@ -230,6 +264,7 @@ async function refresh(prev: PostState, id: string, actionMessage = ""): Promise
     summary: (draft?.excerpt || post?.excerpt || "").trim(),
     initial: (title[0] || "?").toUpperCase(),
     image,
+    ...body,
     postStatus: statusLabel(raw),
     category: "—",
     published: fmtDate(post?.firstPublishedDate),
@@ -247,6 +282,8 @@ const svc = defineService<PostState, {
   publish: (s: PostState) => Promise<PostState>;
   unpublish: (s: PostState) => Promise<PostState>;
   delete: (s: PostState) => Promise<PostState>;
+  /** [rico] #3370 — RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (s: PostState, arg?: unknown) => Promise<PostState>;
 }>("himiOwnerLitePost", {
   state: shape({ status: "loading" }),
   actions: {
@@ -261,7 +298,9 @@ const svc = defineService<PostState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, id, status: "loading" }), id);
+        const loaded = await refresh(shape({ ...s, id, status: "loading" }), id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         // Offline: fall back to the last-synced local row before the demo/error paths.
         const cached = await cacheGet(id);
@@ -282,7 +321,9 @@ const svc = defineService<PostState, {
         return shape({ ...s, status: "error", error: "Sample item not found." });
       }
       try {
-        return await refresh(shape({ ...s, status: "loading" }), s.id);
+        const loaded = await refresh(shape({ ...s, status: "loading" }), s.id);
+        await cacheBodyText(loaded);
+        return loaded;
       } catch (e) {
         const cached = await cacheGet(s.id);
         if (cached) return cachedDetail(s, cached);
@@ -347,6 +388,12 @@ const svc = defineService<PostState, {
         return shape({ ...s, actionMessage: ownerLoadError(e) });
       }
     },
+    // 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) => shape({
+      ...s,
+      actionMessage: (await openRichLink(arg)) ? "" : copyParam("ownerPost.linkOpenFailed", "This link could not be opened."),
+    }),
   },
 });