@wix/himalaya-cli 0.1079.0 → 0.1080.0

package/templates/yoga-studio-owner/tier5-src/_shared/owner-post-content.ts

@@ -1,35 +1,16 @@
 import type { WixRichContent } from "@himalaya/wix-blog";
+// The rich-content helpers. 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 { ricosToPlainText, isPlainRicos, plainTextToRicos } from "@himalaya/wix-rich-content";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "./himi-store.js";
 
-type Node = { type?: string; nodes?: Node[]; textData?: { text?: string; decorations?: unknown[] }; [key: string]: unknown };
+// Thin wrappers keep the WixRichContent signatures callers compile against.
 /** Join inline runs without adding paragraph breaks between bold/plain spans. */
-export function postBodyText(rich: WixRichContent | null | undefined): string {
-  const inline = (node: Node): string => typeof node.textData?.text === "string"
-    ? node.textData.text : (node.nodes ?? []).map(inline).join("");
-  const blocks = (nodes: Node[]): string[] => nodes.flatMap(node =>
-    node.type === "PARAGRAPH" || node.type === "HEADING" || node.type === "TEXT"
-      ? [inline(node)] : blocks(node.nodes ?? []));
-  return blocks((rich?.nodes ?? []) as Node[]).join("\n\n");
-}
+export const postBodyText = (rich: WixRichContent | null | undefined): string => ricosToPlainText(rich);
 /** The plain editor must not overwrite formatting or any opaque media node.
  *  Rich drafts remain editable for title/excerpt/cover; body stays untouched. */
-export function hasRichBody(rich: WixRichContent | null | undefined): boolean {
-  return (rich?.nodes ?? []).some(raw => {
-    if (!raw || typeof raw !== "object") return true;
-    const node = raw as Node;
-    if (node.type !== "PARAGRAPH") return true;
-    if (Object.keys(node).some(key => !["type", "id", "nodes", "paragraphData"].includes(key))) return true;
-    if (node.paragraphData && Object.keys(node.paragraphData as object).length) return true;
-    return (node.nodes ?? []).some(child => child.type !== "TEXT"
-      || !!child.textData?.decorations?.length
-      || Object.keys(child).some(key => !["type", "id", "textData", "nodes"].includes(key)));
-  });
-}
-export function plainPostBody(body: string): WixRichContent {
-  return { nodes: body.split("\n\n").map(text => ({
-    type: "PARAGRAPH", nodes: [{ type: "TEXT", textData: { text, decorations: [] } }],
-  })) };
-}
+export const hasRichBody = (rich: WixRichContent | null | undefined): boolean => !isPlainRicos(rich);
+export const plainPostBody = (body: string): WixRichContent => plainTextToRicos(body);
 /** Current Blog media shape plus older coverImage projections. */
 export function postCoverUrl(raw: Record<string, any> | null | undefined): string {
   if (!raw) return "";

package/templates/yoga-studio-owner/tier5-src/_shared/owner-rich-guard.ts

@@ -1,17 +1,10 @@
-// [rico] #3363 — may a plain owner form round-trip this body? Ricos uses owner-post-content's
-// hasRichBody; these cover the Stores HTML description and the FAQ's legacy DraftJS answer.
-// [rico] #3365 moves htmlIsTrivial into @himalaya/wix-rich-content with these exact semantics.
+// May a plain owner form round-trip this body? The Ricos and HTML checks are @himalaya/wix-rich-content's;
+// this file adds the read-only previews the forms show for a locked body, and the FAQ's legacy DraftJS answer.
+// 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 { htmlIsTrivial, isPlainRicos } from "@himalaya/wix-rich-content";
 
-/** A tag opener (`<p`, `</p`, `<!--`), as opposed to a bare `<` in prose ("cups < 8 cm"). */
-const TAG = /<[a-z!/?]/i;
-
-/** True when a plain text field can hold this HTML without losing anything: empty, bare text
- *  (no tag — a lone `<` in prose is text), or exactly one attribute-less `<p>…</p>` with no
- *  inner tags. */
-export function htmlIsTrivial(html: string | null | undefined): boolean {
-  const s = (html ?? "").trim();
-  return !s || !TAG.test(s) || /^<p>[^<>]*<\/p>$/.test(s);
-}
+export { htmlIsTrivial };
 
 const ENTITIES: Record<string, string> = { "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": "\"", "&#39;": "'" };
 
@@ -23,35 +16,13 @@ export function htmlPreviewText(html: string | null | undefined): string {
     .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
 }
 
-type RicosNode = { type?: unknown; nodes?: unknown; textData?: { decorations?: unknown }; paragraphData?: unknown; [key: string]: unknown };
-const onlyKeys = (o: object, allowed: string[]) => Object.keys(o).every((k) => allowed.includes(k));
-const emptyObject = (v: unknown) => v === undefined || (!!v && typeof v === "object" && Object.keys(v as object).length === 0);
-
-/** The paragraph styling a PLAIN paragraph still carries on the Ricos wire (Events v3 sends
- *  `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). */
-function defaultParagraphData(pd: unknown): boolean {
-  if (pd === undefined) return true;
-  if (!pd || typeof pd !== "object" || !onlyKeys(pd, ["textStyle", "indentation"])) return false;
-  const { textStyle, indentation } = pd as { textStyle?: unknown; indentation?: unknown };
-  if (indentation !== undefined && indentation !== 0) return false;
-  if (textStyle === undefined) return true;
-  if (!textStyle || typeof textStyle !== "object" || !onlyKeys(textStyle, ["textAlignment"])) return false;
-  const align = (textStyle as { textAlignment?: unknown }).textAlignment;
-  return align === undefined || align === "AUTO";
-}
-
 /** True when a plain text field can round-trip this Ricos document: no document styling, and
- *  only paragraphs of undecorated text whose paragraph data is the wire default. Anything else —
- *  a heading, list, link, bold run, media node, alignment or indent — is rich. */
-export function ricosIsPlain(doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean {
-  if (!doc || !emptyObject(doc.documentStyle)) return false;
-  const nodes = Array.isArray(doc.nodes) ? (doc.nodes as RicosNode[]) : [];
-  return nodes.every((n) => !!n && typeof n === "object" && n.type === "PARAGRAPH"
-    && onlyKeys(n, ["type", "id", "nodes", "paragraphData"]) && defaultParagraphData(n.paragraphData)
-    && (Array.isArray(n.nodes) ? (n.nodes as RicosNode[]) : []).every((t) => !!t && typeof t === "object" && t.type === "TEXT"
-      && onlyKeys(t, ["type", "id", "textData", "nodes"]) && (!Array.isArray(t.nodes) || t.nodes.length === 0)
-      && !(Array.isArray(t.textData?.decorations) && t.textData.decorations.length)));
-}
+ *  only paragraphs of undecorated text whose paragraph data is the wire default (Events v3 sends
+ *  `{ textStyle: { textAlignment: "AUTO" }, indentation: 0 }` on every paragraph). Anything else —
+ *  a heading, list, link, bold run, media node, alignment or indent — is rich, and so is a missing
+ *  document (callers decide what an absent body means). */
+export const ricosIsPlain = (doc: { nodes?: unknown; documentStyle?: unknown } | null | undefined): boolean =>
+  !!doc && isPlainRicos(doc);
 
 /** Preview text for a legacy DraftJS document: its `blocks[].text` joined by a blank line, or ""
  *  when the payload is not DraftJS JSON (never a throw). */

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -10,8 +10,8 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-// Not owner-post-content's hasRichBody: Events v3 sends default paragraphData on EVERY paragraph
-// (which hasRichBody reads as formatting) and a documentStyle it never looks at.
+// Events v3 sends default paragraphData on EVERY paragraph and an empty documentStyle; ricosIsPlain
+// reads both as plain.
 import { ricosIsPlain } from "../_shared/owner-rich-guard.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";