@wix/himalaya-cli 0.1471.0 → 0.1473.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/dev-server/src/app-config.d.ts

@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
 import type { DerivedAppMeta } from "./app-module.js";
 import { type WixCachePolicy } from "./wix-cache-policy.js";
 import type { NetMocksFile, WixMockRule } from "./wix-gateway.js";
-import { gateScreenIdProblem } from "../../ts/src/auth-gate-screen.js";
+import { gateScreenIdProblem, liftAuthBlock } from "../../ts/src/auth-gate-screen.js";
 import { type UnmappedPushDestination } from "../../ts/src/wix-push-links.js";
 import type { PushConfig, FlagConfig, AppControl, TabBarConfig, DrawerConfig, SidebarConfig, SplashConfig, LocaleConfig, NavKind, OrientationConfig, StreamPolicy } from "@wix/himalaya/core";
 export type { PushConfig, FlagConfig, AppControl, TabBarConfig, DrawerConfig, SidebarConfig, SplashConfig, LocaleConfig, NavKind, OrientationConfig, StreamPolicy };
@@ -202,14 +202,11 @@ export { gateScreenIdProblem };
 /** Derive the OTA authConfig block from a defineApp auth block
  *  ({ providerId, config }). `required` is read from `config.required === true`
  *  and lifted to the top level, as is `config.gateScreenId` (#4651); secret-ish
- *  keys are scrubbed. When the app's screens are given, a `gateScreenId` naming none
- *  of them is DROPPED (the shell falls back to the stock login) and warned about —
- *  never thrown: this runs on every app-config serve and hot reload, and
- *  `himalaya-dev app validate` is where a bad id fails ([gateScreenIdProblem]). */
-export declare function deriveAuthConfig(auth: {
-    providerId: string;
-    config: Record<string, unknown>;
-} | undefined, screenIds?: readonly string[]): AuthConfigBlock | undefined;
+ *  keys are scrubbed — the same `liftAuthBlock` the auth bake runs (#4818). When
+ *  the app's screens are given, a `gateScreenId` naming none of them is DROPPED
+ *  (the shell falls back to the stock login) and warned about — never thrown: this
+ *  runs on every app-config serve and hot reload, and `himalaya-dev app validate` is where a bad id fails ([gateScreenIdProblem]). */
+export declare function deriveAuthConfig(auth: Parameters<typeof liftAuthBlock>[0], screenIds?: readonly string[]): AuthConfigBlock | undefined;
 /** Derive a baseline NavigationConfig from the loaded app's derived meta. */
 /** What `deriveNavigationConfig` needs to finish an app-level nav bundle ref.
  *

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/_types/core/ts/src/auth-gate-screen.d.ts

@@ -8,3 +8,32 @@ export declare function gateScreenIdProblem(auth: {
     providerId: string;
     config: Record<string, unknown>;
 } | undefined, screenIds: readonly string[]): string | null;
+/** Keys never lifted into a client auth block — the baked auth.json or the OTA authConfig (defense in
+ *  depth: public OAuth client ids are safe; anything secret-shaped is not). */
+export declare const AUTH_SECRET_KEY_RE: RegExp;
+/** The client auth block: what auth.json bakes and what the OTA `authConfig` serves. */
+export interface LiftedAuthBlock {
+    providerId: string;
+    required: boolean;
+    /** #4651 — the app's own auth gate screen; absent ⇒ the stock login. */
+    gateScreenId?: string;
+    config: Record<string, unknown>;
+}
+/** #4818 — the one lift from an auth block to the client shape, shared by the auth bake and the OTA
+ *  authConfig so the two cannot drift. Accepts the defineApp shape (`config.required`,
+ *  `config.gateScreenId`) AND an already-lifted block (top-level `required` / `gateScreenId`, as an
+ *  existing auth.json or a seed's `authConfig` carries them): re-lifting a lifted block is the
+ *  identity, so a re-bake never fails open. `required` is true when either place says so; a
+ *  `config.gateScreenId` wins over a top-level one. Secret-ish config keys are scrubbed. Returns null
+ *  when there is no usable providerId. */
+export declare function liftAuthBlock(auth: {
+    providerId?: unknown;
+    required?: unknown;
+    gateScreenId?: unknown;
+    config?: Record<string, unknown>;
+} | undefined | null): LiftedAuthBlock | null;
+/** The raw gate id of either auth shape (`config.gateScreenId` first), unvalidated — for the checks. */
+export declare function liftedGateScreenId(auth: {
+    gateScreenId?: unknown;
+    config?: Record<string, unknown>;
+}): unknown;

package/dist/cli.mjs

@@ -10034,7 +10034,6 @@ function webViewOriginAllowed(url, origins) {
 }
 var init_webview_origin = __esm({
   "../../core/ts/src/webview-origin.ts"() {
-    "use strict";
   }
 });
 
@@ -31153,8 +31152,29 @@ function gateScreenIdProblem(auth, screenIds) {
   if (screenIds.includes(gateId)) return null;
   return `defineApp: auth.config.gateScreenId is "${gateId}", which is not one of the app's exact screens \u2014 a required-auth launch would have no login to show (a release serves exact screens, so a templated route 404s). Name an exact screen, or drop gateScreenId to use the stock login.`;
 }
+function liftAuthBlock(auth) {
+  if (!auth || typeof auth.providerId !== "string" || auth.providerId.length === 0) return null;
+  const config = {};
+  for (const [key3, value] of Object.entries(auth.config ?? {})) {
+    if (key3 === "required" || key3 === "gateScreenId") continue;
+    if (AUTH_SECRET_KEY_RE.test(key3)) continue;
+    config[key3] = value;
+  }
+  const gateScreenId = liftedGateScreenId(auth);
+  return {
+    providerId: auth.providerId,
+    required: auth.config?.required === true || auth.required === true,
+    ...typeof gateScreenId === "string" && gateScreenId.length > 0 ? { gateScreenId } : {},
+    config
+  };
+}
+function liftedGateScreenId(auth) {
+  return auth.config?.gateScreenId ?? auth.gateScreenId;
+}
+var AUTH_SECRET_KEY_RE;
 var init_auth_gate_screen = __esm({
   "../../core/ts/src/auth-gate-screen.ts"() {
+    AUTH_SECRET_KEY_RE = /secret|private/i;
   }
 });
 
@@ -31350,22 +31370,15 @@ function deriveTelemetryConfig(app) {
   return cfg;
 }
 function deriveAuthConfig(auth, screenIds) {
-  if (!auth?.providerId) return void 0;
-  const config = {};
-  for (const [key3, value] of Object.entries(auth.config ?? {})) {
-    if (key3 === "required" || key3 === "gateScreenId") continue;
-    if (AUTH_SECRET_KEY_RE.test(key3)) continue;
-    config[key3] = value;
+  const lifted = liftAuthBlock(auth);
+  if (!lifted) return void 0;
+  const gateScreenId = liftedGateScreenId(auth);
+  const problem = gateScreenId !== void 0 && screenIds ? gateScreenIdProblem({ providerId: lifted.providerId, config: { gateScreenId } }, screenIds) : null;
+  if (problem) {
+    console.warn(`[app-config] ${problem} \u2014 serving the stock login instead.`);
+    delete lifted.gateScreenId;
   }
-  const gateScreenId = auth.config?.gateScreenId;
-  const problem = typeof gateScreenId === "string" && screenIds ? gateScreenIdProblem(auth, screenIds) : null;
-  if (problem) console.warn(`[app-config] ${problem} \u2014 serving the stock login instead.`);
-  return {
-    providerId: auth.providerId,
-    required: auth.config?.required === true,
-    ...typeof gateScreenId === "string" && gateScreenId.length > 0 && !problem ? { gateScreenId } : {},
-    config
-  };
+  return lifted;
 }
 function expandNavBundle(ref, ctx) {
   const url = ref.url ?? "";
@@ -31559,7 +31572,7 @@ function handleAppConfigRequest(req, res, meta, override, bundleCtx, devNetMocks
   });
   res.end(body);
 }
-var SHARED_WIX_SENTRY_DSN, AUTH_SECRET_KEY_RE, NAV_OVERRIDES;
+var SHARED_WIX_SENTRY_DSN, NAV_OVERRIDES;
 var init_app_config = __esm({
   "../../core/dev-server/src/app-config.ts"() {
     init_wix_cache_policy();
@@ -31568,7 +31581,6 @@ var init_app_config = __esm({
     init_preview_surfaces();
     init_wix_push_links();
     SHARED_WIX_SENTRY_DSN = "https://5dfa4f23057c43149b6219c07d177472@sentry.io/84240";
-    AUTH_SECRET_KEY_RE = /secret|private/i;
     NAV_OVERRIDES = {
       reference: {
         deepLinkPatterns: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wix/himalaya-cli",
-  "version": "0.1471.0",
+  "version": "0.1473.0",
   "type": "module",
   "description": "himi — the Himalaya authoring CLI. Build a Tier-5 content package on your own machine, push it to the production serve as a draft, preview it on web + Himi Player, and read worker logs back — the remote dev loop. Wraps @himalaya/serve-cli for transport.",
   "keywords": [
@@ -71,5 +71,5 @@
       "artifactId": "himalaya-cli"
     }
   },
-  "falconPackageHash": "cd4d5ceeaf1823831031129d85d33f4d35a9aa4e5bfd8804fe964fe1"
+  "falconPackageHash": "f58b0d57918c163a9918dbe6f1170839ea6c6d6cf0d2b9c38b7a7004"
 }

package/templates/beauty-salon/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/beauty-salon/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
-  // starts its first load as before, never from rows it chose not to restore.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/beauty-salon-owner/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/beauty-salon-owner/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
-  // starts its first load as before, never from rows it chose not to restore.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

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

@@ -140,6 +140,20 @@ export function liveState(svc: unknown): Record<string, unknown> | undefined {
  *  state it started from) are written, so anything the owner did while it awaited — an edit, a field in
  *  the details sheet, closing the sheet — survives a save that lands after it, success or failure. A
  *  key both changed goes to the action. Where the host gives no live state, the result as it is. */
+/** An awaited load's result, unless the form moved to another record while it read. On a warm return the host's bare
+ *  refresh and the screen's onAppear run together: after a save the refresh fetches the record just saved while the
+ *  onAppear of a create screen opens a blank form, and the refresh landing last turned the new form into that record's
+ *  edit. Nothing lands then (`undefined`, the runtime's no-op), nor from a load that changes nothing: started with the
+ *  same state as the onAppear, it would put back the record that one replaced. A load for the record the form still
+ *  holds lands as it is; so does any load where the host gives no live state. */
+export function landsOnLive<S extends object>(svc: unknown, start: S, result: S): S | undefined {
+  if (result === start) return undefined;
+  const now = liveState(svc);
+  if (!now || now === start) return result;
+  const s0 = start as Record<string, unknown>;
+  return now.id !== s0.id || now.mode !== s0.mode ? undefined : result;
+}
+
 export function settleOverLive<S extends object>(svc: unknown, start: S, result: S): S {
   const now = liveState(svc) as S | undefined;
   if (!now || now === start || now === result) return result;

package/templates/beauty-salon-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/beauty-salon-owner/tier5-src/himi-owner-lite-product-form/index.ts

@@ -18,7 +18,7 @@ import {
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, type DbEntity } from "../_shared/owner-local-db.js";
 import { htmlIsTrivial, htmlPreviewText } from "../_shared/owner-rich-guard.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";
@@ -190,7 +190,7 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
 ricosUploadService("himiOwnerLiteProductFormUploads");
 
 const svc = defineService<ProductFormState, {
-  load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState>;
+  load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState | undefined>;
   descriptionChanged: (s: ProductFormState, arg?: unknown) => ProductFormState;
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
   remove: (s: ProductFormState) => Promise<ProductFormState>;
@@ -202,7 +202,7 @@ const svc = defineService<ProductFormState, {
   // 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<ProductFormState | 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
@@ -287,7 +287,7 @@ const svc = defineService<ProductFormState, {
         }
         return shape({ ...s, mode: "edit", 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/beauty-salon-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 ?? {};

package/templates/branded-lite/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/branded-lite/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
-  // starts its first load as before, never from rows it chose not to restore.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/community-club/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/community-club/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
-  // starts its first load as before, never from rows it chose not to restore.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/community-club-owner/tier5-src/_shared/collection-query.ts

@@ -66,9 +66,10 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
   const snapshot = (): CollectionQueryState<Row> => ({ ...state, criteria: copyQuery(state.criteria), items: [...state.items] });
   const emit = () => {
     if (disposed || revalidating === generation) return;
-    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept.
+    // A settled answer replaces it, an empty one included: rows the live query proved gone are never kept, and a list
+    // with nothing in it comes back as its empty state, never its loading look.
     if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
-      lastShown = state.items.length > 0 ? { state: snapshot(), loadedPages } : undefined;
+      lastShown = { state: snapshot(), loadedPages };
     }
     publish(snapshot());
   };
@@ -161,12 +162,13 @@ export function createCollectionQuery<Row>(source: CollectionQuerySource<Row>, p
       return { state: { ...page, criteria: copyQuery(page.criteria), items: [...page.items] }, loadedPages: lastShown.loadedPages };
     },
     /** A cold boot restored from disk: what the last run showed becomes what this one shows, so its first `load`
-     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page. */
+     *  revalidates behind it instead of starting empty. Only before the first query, and only a well-formed page; an
+     *  empty one is the list's empty state. */
     seed(page: unknown): boolean {
       const candidate = page && typeof page === 'object' ? page as Partial<CollectionShownPage<Row>> : undefined;
       const restored = candidate?.state;
       if (generation !== 0 || state.status !== 'idle' || !restored || restored.status !== 'ready'
-        || !Array.isArray(restored.items) || restored.items.length === 0 || typeof restored.nextCursor !== 'string') return false;
+        || !Array.isArray(restored.items) || typeof restored.nextCursor !== 'string') return false;
       try { restored.items.forEach(item => { if (!source.id(item)) throw new Error('A backend collection row requires an identity'); }); } catch { return false; }
       state = { ...state, ...restored, criteria: normalize(restored.criteria ?? {}), items: [...restored.items], status: 'ready',
         loadingMore: false, pageError: false, provisional: false, error: '' };

package/templates/community-club-owner/tier5-src/_shared/collection-service.ts

@@ -352,11 +352,14 @@ export function defineBackendCollection<S extends object, Row extends object>(na
   const handle = (options.register ?? register)(name, definition);
   // Registration restored the state a cold boot saved: the page it showed is this run's, before the first load. Only
   // when the service's own rows came back with it: a bundle that keeps them out of the restore (its `notHydrated`)
-  // starts its first load as before, never from rows it chose not to restore.
+  // starts its first load as before, never from rows it chose not to restore. Rows that came back empty are the
+  // list's own only when the page it showed was empty too; a page with rows means they were kept out.
   const restored = (handle as { getState?: () => State }).getState?.();
   const rowsKey = COLLECTIONS[name]?.rows;
   const restoredRows = rowsKey ? restored?.[rowsKey] : undefined;
-  if (Array.isArray(restoredRows) && restoredRows.length > 0) controller.seed(restored?.collectionShown);
+  const shownItems = (restored?.collectionShown as { state?: { items?: unknown } } | undefined)?.state?.items;
+  const shownEmpty = Array.isArray(shownItems) && shownItems.length === 0;
+  if (Array.isArray(restoredRows) && (restoredRows.length > 0 || shownEmpty)) controller.seed(restored?.collectionShown);
   publish = () => handle.collectionDataChanged();
   return handle;
 }

package/templates/community-club-owner/tier5-src/_shared/owner-editor-value.ts

@@ -140,6 +140,20 @@ export function liveState(svc: unknown): Record<string, unknown> | undefined {
  *  state it started from) are written, so anything the owner did while it awaited — an edit, a field in
  *  the details sheet, closing the sheet — survives a save that lands after it, success or failure. A
  *  key both changed goes to the action. Where the host gives no live state, the result as it is. */
+/** An awaited load's result, unless the form moved to another record while it read. On a warm return the host's bare
+ *  refresh and the screen's onAppear run together: after a save the refresh fetches the record just saved while the
+ *  onAppear of a create screen opens a blank form, and the refresh landing last turned the new form into that record's
+ *  edit. Nothing lands then (`undefined`, the runtime's no-op), nor from a load that changes nothing: started with the
+ *  same state as the onAppear, it would put back the record that one replaced. A load for the record the form still
+ *  holds lands as it is; so does any load where the host gives no live state. */
+export function landsOnLive<S extends object>(svc: unknown, start: S, result: S): S | undefined {
+  if (result === start) return undefined;
+  const now = liveState(svc);
+  if (!now || now === start) return result;
+  const s0 = start as Record<string, unknown>;
+  return now.id !== s0.id || now.mode !== s0.mode ? undefined : result;
+}
+
 export function settleOverLive<S extends object>(svc: unknown, start: S, result: S): S {
   const now = liveState(svc) as S | undefined;
   if (!now || now === start || now === result) return result;

package/templates/community-club-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.