@wix/himalaya-cli 0.1173.0 → 0.1175.0

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

@@ -74057,7 +74057,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "FormField",
                         "props": {
-                          "id": "description",
+                          "id": "descriptionText",
                           "label": "Description",
                           "kind": "text",
                           "text": {
@@ -74070,7 +74070,90 @@ const SCREENS = runtimeSetting({
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionFieldHidden"
+                      }
+                    },
+                    {
+                      "id": "product_form.description_slot",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 6,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "Description",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            },
+                            {
+                              "id": "product_description_editor",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContentEditor",
+                                "props": {
+                                  "name": "description",
+                                  "documentPath": "$service:himiOwnerLiteProductForm.descriptionJson",
+                                  "placeholder": "Optional",
+                                  "uploadService": "himiOwnerLiteProductFormUploads",
+                                  "onChange": {
+                                    "actionId": "tier5.himiOwnerLiteProductForm.descriptionChanged"
+                                  },
+                                  "minHeight": 200,
+                                  "fallback": {
+                                    "id": "product_form.description_unavailable",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 4,
+                                        "alignment": "leading",
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "Editor unavailable",
+                                                "style": "title3"
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "The description can’t be edited here right now. Name, price and SKU still save, and the description stays as it is.",
+                                                "style": "footnote",
+                                                "color": "textSecondary"
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionPending"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditorHidden"
                       }
                     }
                   ],
@@ -74339,7 +74422,7 @@ const SCREENS = runtimeSetting({
                                   "onChange": {
                                     "actionId": "tier5.himiOwnerLitePostForm.bodyChanged"
                                   },
-                                  "minHeight": 360,
+                                  "minHeight": 240,
                                   "fallback": {
                                     "id": "post_form.body_unavailable",
                                     "body": {
@@ -74796,7 +74879,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "package": "himalaya",
                         "type": "FormField",
                         "props": {
-                          "id": "description",
+                          "id": "descriptionText",
                           "label": "Description",
                           "kind": "text",
                           "text": {
@@ -74809,7 +74892,90 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       },
                       "modifiers": {
-                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionProtected"
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionFieldHidden"
+                      }
+                    },
+                    {
+                      "id": "product_form.description_slot",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 6,
+                          "alignment": "leading",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "Description",
+                                  "style": "bodyEmphasis"
+                                }
+                              }
+                            },
+                            {
+                              "id": "product_description_editor",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContentEditor",
+                                "props": {
+                                  "name": "description",
+                                  "documentPath": "$service:himiOwnerLiteProductForm.descriptionJson",
+                                  "placeholder": "Optional",
+                                  "uploadService": "himiOwnerLiteProductFormUploads",
+                                  "onChange": {
+                                    "actionId": "tier5.himiOwnerLiteProductForm.descriptionChanged"
+                                  },
+                                  "minHeight": 200,
+                                  "fallback": {
+                                    "id": "product_form.description_unavailable",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "VStack",
+                                      "props": {
+                                        "spacing": 4,
+                                        "alignment": "leading",
+                                        "children": [
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "Editor unavailable",
+                                                "style": "title3"
+                                              }
+                                            }
+                                          },
+                                          {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "The description can’t be edited here right now. Name, price and SKU still save, and the description stays as it is.",
+                                                "style": "footnote",
+                                                "color": "textSecondary"
+                                              }
+                                            }
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionPending"
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiOwnerLiteProductForm.descriptionEditorHidden"
                       }
                     }
                   ],
@@ -75324,7 +75490,7 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "onChange": {
                                     "actionId": "tier5.himiOwnerLitePostForm.bodyChanged"
                                   },
-                                  "minHeight": 360,
+                                  "minHeight": 240,
                                   "fallback": {
                                     "id": "post_form.body_unavailable",
                                     "body": {

package/templates/beauty-salon-owner/tier5-src/_shared/owner-editor-value.ts

@@ -8,7 +8,7 @@
 // drops nodes the owner never touched).
 // 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 { parseRicosJson, RICH_CONTENT_LIMITS, type RicosDocument } from "@himalaya/wix-rich-content";
+import { parseRicosJson, isPlainRicos, RICH_CONTENT_LIMITS, type RicosDocument } from "@himalaya/wix-rich-content";
 
 export type EditorValue =
   | { kind: "absent" }                                  // leave the stored body untouched
@@ -45,12 +45,78 @@ function overLimits(doc: RicosDocument): boolean {
   return false;
 }
 
-/** `raw` is `values[name]`; `seededJson` is the string the form published as the editor's seed. */
-export function editorValue(raw: unknown, seededJson: string): EditorValue {
-  if (typeof raw !== "string" || raw === "") return { kind: "absent" };
-  if (seededJson !== "" && raw === seededJson) return { kind: "unchanged" };
+const TEXT_ONLY = new Set(["PARAGRAPH", "TEXT", "HEADING", "BULLETED_LIST", "ORDERED_LIST", "LIST_ITEM", "BLOCKQUOTE", "CODE_BLOCK"]);
+/** No visible text and no non-text node (an image, a divider, an embed…): an empty body. */
+export function isEmptyDocument(doc: RicosDocument): boolean {
+  const empty = (nodes: RicosDocument["nodes"] | undefined): boolean => (nodes ?? []).every((n) =>
+    TEXT_ONLY.has(String(n?.type)) && !String(n.textData?.text ?? "").trim() && empty(n.nodes));
+  return empty(doc.nodes);
+}
+
+/** A Ricos JSON string checked as every viewer would: the limits first, then the shape. */
+function checkedDocument(raw: string): EditorValue {
   if (utf8Bytes(raw) > RICH_CONTENT_LIMITS.maxBytes) return { kind: "too_large" };
   const doc = parseRicosJson(raw);
   if (!doc) return { kind: "invalid" };
   return overLimits(doc) ? { kind: "too_large" } : { kind: "doc", doc, json: raw };
 }
+
+/** `raw` is `values[name]`; `seededJson` is the string the form published as the editor's seed. */
+export function editorValue(raw: unknown, seededJson: string): EditorValue {
+  if (typeof raw !== "string" || raw === "") return { kind: "absent" };
+  if (seededJson !== "" && raw === seededJson) return { kind: "unchanged" };
+  const checked = checkedDocument(raw);
+  // An empty editor over no body (a record that had none) writes nothing, rather than an empty document.
+  if (checked.kind === "doc" && seededJson === "" && isEmptyDocument(checked.doc)) return { kind: "unchanged" };
+  return checked;
+}
+
+// ── The per-field editor machinery every owner form shares (post body, event / product description,
+// FAQ answer). Each form keeps `<key>Json` (the seed), `<key>Pending` and `<key>Dirty` in its state.
+
+/** `<key>Pending`: until this run's load lands, the descriptor hides the editor — it seeds ONCE, so a
+ *  provisional editor the owner typed into would keep that text over the real document.
+ *  `<key>Dirty`: the editor's on_change fired since the field was loaded or saved. Once ready the bag
+ *  ALWAYS holds a document — the engine's own re-serialization of the seed, not byte-equal to it — so
+ *  only this says the owner edited the field. Every arm fires a pending on_change before it releases a
+ *  Form submit, so an edit made inside the debounce window is reported before the submit reads it. */
+export interface EditorGate { pending: boolean; dirty: boolean }
+
+/** What a live submit does with `values[name]`: only an edit the editor reported counts. */
+export function editorSubmitValue(raw: unknown, seededJson: string, gate: EditorGate): EditorValue {
+  return gate.pending || !gate.dirty ? { kind: "absent" } : editorValue(raw, seededJson);
+}
+
+/** A queued write's document. A replay runs in a FRESH worker with no editor, so the string is checked
+ *  again (shape and limits); "absent" when the item carries none. Never "unchanged": it was an edit. */
+export function queuedDocument(raw: unknown): EditorValue {
+  return typeof raw === "string" && raw !== "" ? checkedDocument(raw) : { kind: "absent" };
+}
+
+/** The editor's on_change: the field is now edited, and a confirmation of an earlier save is stale.
+ *  No timing window: an arm fires the pending on_change BEFORE it releases a submit, so any on_change
+ *  that arrives after a save carries an edit that save did not write. */
+export function editorChanged<S extends { status: string; savedMessage: string }>(s: S): Pick<S, "status" | "savedMessage"> {
+  return { status: s.status === "saved" ? "idle" : s.status, savedMessage: "" };
+}
+
+/** The offline cache's verdict on the stored body (`<key>Protected`): rich unless KNOWN plain. From the
+ *  document when the form knows it; otherwise plain only when the record was loaded as plain. A bundle
+ *  rolled back past the editor reads this flag to decide whether its plain field may overwrite the body. */
+export function cachedRichVerdict(doc: RicosDocument | null, knownPlain: boolean): "true" | "false" {
+  if (doc) return isPlainRicos(doc) ? "false" : "true";
+  return knownPlain ? "false" : "true";
+}
+
+/** Cold boot: the runtime lays this service's last persisted snapshot over its declared state, so the
+ *  editor's first seed would be the document as it was when the screen last ran — and a Save after
+ *  typing would write it over whatever the record holds now. Blank the hydrated seed and reset the gate
+ *  before anything renders, in place (no action has run yet). `extra` resets further UI state. */
+export function resetHydratedEditor(svc: unknown, keys: { json: string; pending: string; dirty: string }, pendingAtBoot: boolean, extra: Record<string, unknown> = {}): void {
+  const booted = (svc as { getState?: () => Record<string, unknown> | undefined }).getState?.();
+  if (!booted || typeof booted !== "object") return;
+  if (booted[keys.json]) booted[keys.json] = "";
+  booted[keys.pending] = pendingAtBoot;
+  booted[keys.dirty] = false;
+  Object.assign(booted, extra);
+}

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

@@ -2,7 +2,7 @@
 // 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";
+import { htmlIsTrivial } from "@himalaya/wix-rich-content";
 
 export { htmlIsTrivial };
 
@@ -16,14 +16,6 @@ export function htmlPreviewText(html: string | null | undefined): string {
     .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 {

package/templates/beauty-salon-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 };