@wix/himalaya-cli 0.1441.0 → 0.1443.0

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

@@ -4,7 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } 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";
@@ -165,18 +165,24 @@ const svc = defineService<PostFormState, {
   bodyChanged: (s: PostFormState, arg?: unknown) => PostFormState;
   submit: (s: PostFormState, values?: Record<string, unknown>) => Promise<PostFormState>;
 }>("himiOwnerLitePostForm", {
-  state: shape({ mode: startMode, id: initialInput.id ?? "", bodyPending: startMode === "edit" }),
+  // The editor stays hidden until this run's load lands, however the form was opened (an id as input or in the params).
+  state: shape({ mode: startMode, id: initialInput.id ?? "", bodyPending: true }),
   // [rico] #3644 — this run's editor state and UI: a cold boot takes these from `state`, never from
   // the persisted snapshot (the editor seeds once; last run's sheet is not this run's).
   notHydrated: [...editorRunKeys("body"), "detailsOpen"],
+  // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
+  perVisit: [...editorRunKeys("body"), "detailsOpen"],
   actions: {
     load: async (s, arg) => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical create-or-edit shell
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
       // fallback. An id ⇒ edit; no id anywhere ⇒ the create shell.
-      const id = navInputId() || idFrom(arg, s.id);
-      if (!id) return shape({ ...s, ...BODY_LOADED, mode: "create", id: "", bodyJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
+      // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
+      const id = navInputId() || idFrom(arg, arg === undefined ? s.id : "");
+      if (holdsLoadedForm(s, { id, mode: id ? "edit" : "create" }, "body")) return s;
+      // A form that held a record (the one just saved) opens blank.
+      if (!id) return shape({ ...(s.id ? {} : s), ...BODY_LOADED, mode: "create", id: "", bodyJson: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_POSTS.find((x) => x.id === id);
           if (d) {

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

@@ -254,6 +254,8 @@ const IDLE: State = {
 
 /** Rebuilt on `load`, because the allowlist arrives with the descriptor. */
 let coordinator: ReturnType<typeof createGroupedSearch> | undefined;
+/** The allowlist the coordinator was built for. */
+let coordinatorSources = "";
 let published: State = IDLE;
 const memory = localPreferences("ownerSearch", normalizeMemory);
 
@@ -279,6 +281,15 @@ const svc = defineService<State, {
   actions: {
     load: async (_state, arg) => {
       stashCopy(arg);
+      // The screen coming back re-runs its search behind what it shows: a warm worker's refresh calls `load` bare (no allowlist),
+      // and its onAppear repeats the allowlist the coordinator was built for.
+      const sources = str(arg, "sources");
+      if (coordinator && (!sources || sources === coordinatorSources)) {
+        await coordinator.revalidate();
+        remember();
+        return published;
+      }
+      coordinatorSources = sources;
       const allowed = (() => {
         try {
           return JSON.parse(str(arg, "sources") || "[]");

package/templates/yoga-studio-owner/tier5-src/himi-owner-lite-search/logic.ts

@@ -446,7 +446,13 @@ export function createGroupedSearch(
     };
   };
 
-  const emit = () => { if (!disposed) publish(snapshot()); };
+  /** The revalidation running behind the shown rows (0: none): its snapshots are held back until it is done. */
+  let holding = 0, holds = 0;
+  /** The depth the running revalidation restores, so one that overlaps it starts from the owner's depth, not
+   *  from its reset; and the revalidation itself, which a "look further" tapped meanwhile waits for. */
+  let heldDepth: Record<string, number> = {};
+  let revalidation: Promise<void> | undefined;
+  const emit = () => { if (!disposed && !holding) publish(snapshot()); };
 
   /** Identity merge: a re-fetched row REPLACES its predecessor in place, so a
    *  refresh cannot reorder the list under the user's finger or duplicate a row
@@ -604,6 +610,7 @@ export function createGroupedSearch(
      *  the wrong result set. */
     async search(raw: unknown): Promise<void> {
       if (disposed) return;
+      holding = 0;
       const next = normalizeQuery(raw);
       query = next;
       for (const id of order) {
@@ -627,6 +634,7 @@ export function createGroupedSearch(
      */
     async restore(raw: unknown, depth: Record<string, number> = {}): Promise<void> {
       if (disposed) return;
+      holding = 0;
       const next = normalizeQuery(raw);
       query = next;
       for (const id of order) {
@@ -637,8 +645,34 @@ export function createGroupedSearch(
       if (!next) return;
       await fanOut(order, depth);
     },
+    /** A returning screen (a cached embed's warm worker): the same search re-run to the depth each group
+     *  shows, behind the rows it shows, and published once. Rows are a live claim about records, so they
+     *  are re-fetched, never repainted; a search typed meanwhile takes over at once. */
+    async revalidate(): Promise<void> {
+      if (disposed || !query) return;
+      const depth: Record<string, number> = holding ? { ...heldDepth } : {};
+      for (const id of order) { const pages = groups.get(id)?.pages ?? 0; if (pages > Math.max(1, depth[id] ?? 0)) depth[id] = pages; }
+      heldDepth = depth;
+      const held = ++holds;
+      holding = held;
+      for (const id of order) {
+        groups.set(id, idleGroup(byId.get(id)!));
+        sourceGeneration.set(id, (sourceGeneration.get(id) ?? 0) + 1);
+      }
+      const run = (async () => {
+        try {
+          await fanOut(order, depth);
+        } finally {
+          if (holding === held) { holding = 0; heldDepth = {}; emit(); }
+        }
+      })();
+      revalidation = run;
+      await run;
+    },
     /** One group's next page. */
     async loadMore(id: unknown): Promise<void> {
+      // Tapped while a revalidation re-fetches behind the shown rows: page on from what it lands.
+      while (holding && revalidation) await revalidation;
       const adapter = typeof id === "string" ? byId.get(id) : undefined;
       if (!adapter || disposed || !query) return;
       await runSource(adapter, true);

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

@@ -117,7 +117,8 @@ const svc = defineService<ServiceFormState, {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
       // onAppear `id` param is the #570 suffixed-build fallback.
-      const id = navInputId() || idFrom(arg, s.id);
+      // The held id is for the host's bare refresh only (no argument): an onAppear without an id is a create screen.
+      const id = navInputId() || idFrom(arg, arg === undefined ? s.id : "");
       if (!id) return shape({ ...s, status: "error", error: copyParam("ownerServiceForm.errorNoService", "No service to edit.") });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_SERVICES.find((x) => x.id === id);