@wix/himalaya-cli 0.1173.0 → 0.1175.0

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

@@ -4,8 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorValue } from "../_shared/owner-editor-value.js";
-import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { editorSubmitValue, queuedDocument, editorChanged, resetHydratedEditor } from "../_shared/owner-editor-value.js";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
@@ -43,15 +42,10 @@ interface PostFormState {
   bodyJson: string;
   /** The "Post details" sheet (excerpt + cover) is open. */
   detailsOpen: boolean;
-  /** The editor's on_change fired since the body was last loaded or saved. The bag ALWAYS holds a
-   *  document once the editor is ready — the engine's own serialization of the seed, which is not
-   *  byte-equal to it — so only this says the owner actually edited the body. */
+  /** The editor gate (`EditorGate` in _shared/owner-editor-value.ts): the editor's on_change fired since
+   *  the body was loaded or saved, and (edit mode) the editor is hidden until this run's load lands. */
   bodyDirty: boolean;
-  /** Edit mode, until `load` lands: the descriptor hides the editor, because a provisional editor
-   *  the owner typed into keeps that text when the real document arrives (the seed latch). */
   bodyPending: boolean;
-  /** When a save last wrote the body (ms), so its own trailing on_change does not undo "Post updated.". */
-  bodySavedAt: number;
   coverUrl: string;
   originalCoverUrl: string;
   coverPreview: string;
@@ -104,9 +98,7 @@ function boolString(value: unknown, fallback: string): string {
   return fallback;
 }
 /** What every load that publishes a document resets: the editor may show it, nothing is edited yet. */
-const BODY_LOADED = { bodyPending: false, bodyDirty: false, bodySavedAt: 0, detailsOpen: false } as const;
-/** How long after a body save its own debounced on_change may still arrive (the arm waits 500 ms). */
-const TRAILING_CHANGE_MS = 1500;
+const BODY_LOADED = { bodyPending: false, bodyDirty: false, detailsOpen: false } as const;
 const valueOf = (arg: unknown): string =>
   String(typeof arg === "string" ? arg : (arg as { value?: unknown; text?: unknown } | undefined)?.value ?? (arg as { text?: unknown } | undefined)?.text ?? "");
 const docJson = (doc: unknown): string => (doc ? JSON.stringify(doc) : "");
@@ -128,7 +120,6 @@ function shape(s: Partial<PostFormState>): PostFormState {
     detailsOpen: s.detailsOpen ?? false,
     bodyDirty: s.bodyDirty ?? false,
     bodyPending: s.bodyPending ?? false,
-    bodySavedAt: s.bodySavedAt ?? 0,
     coverUrl: s.coverUrl ?? "",
     originalCoverUrl: s.originalCoverUrl ?? "",
     coverPreview: wixMediaUrl(s.coverUrl ?? "", WIX_DETAIL_IMAGE),
@@ -244,13 +235,8 @@ const svc = defineService<PostFormState, {
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),
     detailsClose: (s) => shape({ ...s, detailsOpen: false }),
-    // The editor's debounced `on_change` carries `args.dirty` only; the document stays in the form
-    // bag. A body edited after a save is no longer saved, so drop the stale confirmation — unless
-    // this is the trailing on_change of the very edit that save wrote.
-    bodyChanged: (s) => {
-      const trailing = s.status === "saved" && s.bodySavedAt > 0 && Date.now() - s.bodySavedAt < TRAILING_CHANGE_MS;
-      return shape({ ...s, bodyDirty: true, ...(trailing ? {} : { savedMessage: "", status: s.status === "saved" ? "idle" : s.status }) });
-    },
+    // The editor's `on_change` carries `args.dirty` only; the document stays in the form bag.
+    bodyChanged: (s) => shape({ ...s, bodyDirty: true, ...editorChanged(s) }),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
@@ -277,14 +263,15 @@ const svc = defineService<PostFormState, {
       let bodyRaw = "";
       let bodyTooLarge = false;
       if (replay) {
-        const queued = typeof v.richContentJson === "string" ? parseRicosJson(v.richContentJson) : null;
-        if (queued) { richContent = queued as unknown as WixRichContent; bodyRaw = String(v.richContentJson); }
+        const queued = queuedDocument(v.richContentJson);
+        // A queued body that no longer reads (or is past the limits) writes NOTHING, and says so.
+        if (queued.kind === "invalid" || queued.kind === "too_large") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.queuedBodyError", "The post body saved offline could not be read, so nothing was written. Edit it again."), savedMessage: "" });
+        if (queued.kind === "doc") { richContent = queued.doc as unknown as WixRichContent; bodyRaw = queued.json; }
         else if (v.preserveBody === "false") { richContent = plainPostBody(String(v.body ?? "")); bodyRaw = docJson(richContent); }
       } else {
-        // Only an edit the editor reported counts: before load lands the editor is hidden (a body
-        // here was typed into the provisional empty editor), and an untouched bag holds the engine's
-        // re-serialization of the seed, which must not be written back.
-        const ev = s.bodyPending || !s.bodyDirty ? { kind: "absent" as const } : editorValue(v.body, s.bodyJson);
+        // Only an edit the editor reported counts (EditorGate): before load lands the editor is hidden,
+        // and an untouched bag holds the engine's re-serialization of the seed.
+        const ev = editorSubmitValue(v.body, s.bodyJson, { pending: s.bodyPending, dirty: s.bodyDirty });
         if (ev.kind === "invalid") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.bodyInvalid", "Couldn’t read the post body from the editor. Nothing was saved; try again."), savedMessage: "" });
         if (ev.kind === "doc") { richContent = ev.doc as unknown as WixRichContent; bodyRaw = ev.json; }
         // A body past the rich-content limits is not written (every viewer would show its
@@ -308,7 +295,7 @@ const svc = defineService<PostFormState, {
       const savedState = (id: string, savedMessage: string) => shape({
         ...s, mode: "edit", id, heading: copyParam("ownerPostForm.headingEdit", "Edit post"),
         title, excerpt, body: postBodyText(kept), richContent: kept, bodyJson: bodyEdited ? bodyRaw : s.bodyJson,
-        bodyDirty: bodyEdited ? false : s.bodyDirty, bodySavedAt: bodyEdited ? Date.now() : 0,
+        bodyDirty: bodyEdited ? false : s.bodyDirty,
         coverUrl, originalCoverUrl: coverUrl, isFeatured: isFeatured ? "true" : "false",
         status: "saved", savedMessage, savedId: id,
         error: bodyTooLarge ? copyParam("ownerPostForm.bodyTooLarge", "The post body is too long to save, so it was left as it was. Your other changes were saved.") : "",
@@ -366,20 +353,8 @@ const svc = defineService<PostFormState, {
   },
 });
 
-// [rico] #3371 — adopter contract (#3368's review): the editor seeds ONCE, from the first
-// document `bodyJson` holds. A cold boot hydrates this service from its last persisted snapshot, so
-// that first value would be the document as it was when this screen last ran — and a Save after
-// typing would write it over whatever the post holds now. Blank the hydrated seed before anything
-// renders: the editor stays provisional (writes nothing) until `load` publishes the fresh document.
-// In place, at boot, because no action has run yet; the state object is the runtime's own merge.
-{
-  const booted = (svc as { getState?: () => Partial<PostFormState> | undefined }).getState?.();
-  if (booted && typeof booted === "object") {
-    if (booted.bodyJson) booted.bodyJson = "";
-    // Nor does it carry this run's UI over: the editor waits for this run's load, the sheet is shut.
-    booted.bodyPending = startMode === "edit";
-    booted.detailsOpen = false;
-  }
-}
+// [rico] #3371 — adopter contract: the editor seeds once, so a cold boot must not seed it with the last
+// run's document. Nor does it carry this run's UI over: the details sheet is shut.
+resetHydratedEditor(svc, { json: "bodyJson", pending: "bodyPending", dirty: "bodyDirty" }, startMode === "edit", { detailsOpen: false });
 
 export { svc };

package/templates/events-meetups-owner/tier5-src/_shared/owner-rich-guard.ts

@@ -1,35 +0,0 @@
-// 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";
-
-export { htmlIsTrivial };
-
-const ENTITIES: Record<string, string> = { "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": "\"", "&#39;": "'" };
-
-/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
- *  `<` in prose is kept), the basic entities decode, and blank lines drop. */
-export function htmlPreviewText(html: string | null | undefined): string {
-  return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
-    .replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
-    .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
-}
-
-/** 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 (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). */
-export function draftjsText(raw: string | null | undefined): string {
-  try {
-    const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
-    const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
-    return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
-  } catch { return ""; }
-}

package/templates/nonprofit-cause-owner/tier5-src/_shared/owner-rich-guard.ts

@@ -1,35 +0,0 @@
-// 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";
-
-export { htmlIsTrivial };
-
-const ENTITIES: Record<string, string> = { "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": "\"", "&#39;": "'" };
-
-/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
- *  `<` in prose is kept), the basic entities decode, and blank lines drop. */
-export function htmlPreviewText(html: string | null | undefined): string {
-  return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
-    .replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
-    .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
-}
-
-/** 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 (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). */
-export function draftjsText(raw: string | null | undefined): string {
-  try {
-    const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
-    const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
-    return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
-  } catch { return ""; }
-}

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

@@ -1,35 +0,0 @@
-// 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";
-
-export { htmlIsTrivial };
-
-const ENTITIES: Record<string, string> = { "&nbsp;": " ", "&amp;": "&", "&lt;": "<", "&gt;": ">", "&quot;": "\"", "&#39;": "'" };
-
-/** Read-only preview text for an HTML body: block closes become lines, tags are stripped (a bare
- *  `<` in prose is kept), the basic entities decode, and blank lines drop. */
-export function htmlPreviewText(html: string | null | undefined): string {
-  return (html ?? "").replace(/<br\s*\/?>/gi, "\n").replace(/<\/(p|h[1-6]|li|div|blockquote|pre|tr)>/gi, "\n")
-    .replace(/<\/?[a-z!?][^>]*>/gi, "").replace(/&(nbsp|amp|lt|gt|quot|#39);/g, (m) => ENTITIES[m] ?? m)
-    .split("\n").map((l) => l.replace(/\s+/g, " ").trim()).filter(Boolean).join("\n");
-}
-
-/** 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 (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). */
-export function draftjsText(raw: string | null | undefined): string {
-  try {
-    const doc = JSON.parse(raw ?? "") as { blocks?: Array<{ text?: unknown }> } | null;
-    const blocks = Array.isArray(doc?.blocks) ? doc.blocks : [];
-    return blocks.map((b) => (typeof b?.text === "string" ? b.text : "")).join("\n\n").trim();
-  } catch { return ""; }
-}