@wix/himalaya-cli 0.1470.0 → 0.1472.0

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

@@ -10,7 +10,7 @@ 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";
-import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } from "../_shared/owner-editor-value.js";
 import { parseRicosJson } from "@himalaya/wix-rich-content";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -169,7 +169,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteEventFormUploads");
 
 const svc = defineService<EventFormState, {
-  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
+  load: (s: EventFormState, arg?: unknown) => Promise<EventFormState | undefined>;
   descriptionChanged: (s: EventFormState, arg?: unknown) => EventFormState;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
 }>("himiOwnerLiteEventForm", {
@@ -179,7 +179,7 @@ const svc = defineService<EventFormState, {
   // perVisit: a cached embed's warm return starts this run fresh, as a cold boot does (`__resetRunState`).
   perVisit: editorRunKeys("description"),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<EventFormState | undefined> => landsOnLive(svc, s, await (async () => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
       const mode = modeFrom(arg, s.mode);
       // WS-C — nav-param input is PRIMARY (the canonical form bakes no id); the
@@ -262,7 +262,7 @@ const svc = defineService<EventFormState, {
         }
         return shape({ ...s, mode, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
     descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, descriptionEdits: s.descriptionEdits + 1, ...editorChanged(s) }),
     // Laid over the live state ([rico] #3644): what the owner did while the save awaited survives it.

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, holdsLoadedForm } from "../_shared/owner-editor-value.js";
+import { editorSubmitValue, queuedDocument, editorChanged, editorRunKeys, resetHydratedEditorOnOlderRuntime, editorAfterSave, liveState, settleOverLive, holdsLoadedForm, landsOnLive } 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";
@@ -157,7 +157,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLitePostFormUploads");
 
 const svc = defineService<PostFormState, {
-  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState>;
+  load: (s: PostFormState, arg?: unknown) => Promise<PostFormState | undefined>;
   setCover: (s: PostFormState, arg?: unknown) => PostFormState;
   setExcerpt: (s: PostFormState, arg?: unknown) => PostFormState;
   detailsOpen: (s: PostFormState) => PostFormState;
@@ -173,7 +173,7 @@ const svc = defineService<PostFormState, {
   // 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) => {
+    load: async (s, arg): Promise<PostFormState | undefined> => landsOnLive(svc, s, await (async () => {
       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
@@ -240,7 +240,7 @@ const svc = defineService<PostFormState, {
         }
         return shape({ ...s, mode: "edit", id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     setCover: (s, arg) => shape({ ...s, coverUrl: valueOf(arg).trim(), error: "" }),
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),

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

@@ -4,6 +4,7 @@
 // expose, so this form only edits an existing service's name/description via
 // updateService. Bound by buildForm ($service:himiOwnerLiteServiceForm.*).
 
+import { landsOnLive } from "../_shared/owner-editor-value.js";
 import { defineService } from "@himalaya/state";
 import { getService, updateService, type WixService } from "@himalaya/wix-bookings";
 import { ownerLoadError, isOwnerPreviewDemo, ownerDemoFallback, ownerWriteError } from "../_shared/owner-load-error.js";
@@ -108,12 +109,12 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 }
 
 const svc = defineService<ServiceFormState, {
-  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState>;
+  load: (s: ServiceFormState, arg?: unknown) => Promise<ServiceFormState | undefined>;
   submit: (s: ServiceFormState, values?: Record<string, unknown>) => Promise<ServiceFormState>;
 }>("himiOwnerLiteServiceForm", {
   state: shape({ id: initialId }),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<ServiceFormState | undefined> => landsOnLive(svc, s, await (async () => {
       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.
@@ -167,7 +168,7 @@ const svc = defineService<ServiceFormState, {
         }
         return shape({ ...s, id, status: "error", error: ownerLoadError(e) });
       }
-    },
+    })()),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};