@wix/himalaya-cli 0.1543.0 → 0.1545.0

package/templates/restaurant-owner/dev/index.ts

@@ -584,7 +584,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -3938,7 +3938,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -7205,7 +7205,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -10379,7 +10379,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -13733,7 +13733,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -17087,7 +17087,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -20441,7 +20441,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -23795,7 +23795,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -27149,7 +27149,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -30503,7 +30503,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -33770,7 +33770,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -36944,7 +36944,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -40298,7 +40298,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -43652,7 +43652,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -46919,7 +46919,7 @@ const SCREENS = runtimeSetting({
                         "package": "himalaya",
                         "type": "Text",
                         "props": {
-                          "text": "Showing saved offline results · may be outdated",
+                          "text": "Showing previously loaded content · may be outdated",
                           "style": "caption",
                           "color": "textSecondary"
                         }
@@ -68594,7 +68594,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -71324,7 +71324,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -73853,7 +73853,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -76388,7 +76388,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }
@@ -79070,7 +79070,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }

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

@@ -1,4 +1,3 @@
-import { withOnlineWrites } from './online-actions.js';
 import { defineService as register, type ServiceDefinition } from '@himalaya/state';
 import { COLLECTIONS, COLLECTION_CHROME_MIN_ITEMS, initialCollection, normalizeCollection, projectCollection, collectionId, collectionActionsLabel, type CollectionRow } from './collection-contract.js';
 import { localPreferences, type PreferenceRuntime } from './local-preferences.js';
@@ -95,10 +94,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       if (sort === 'default' || sort === 'az' || sort === 'za') { prefs.sort = sort; changed = true; }
     }
     if (Object.prototype.hasOwnProperty.call(input, 'collectionFilter')) {
-      const requestedFilter = String(input.collectionFilter ?? '');
-      // Old links to Saved must migrate with the stored preference when this
-      // collection no longer exposes that filter.
-      const filter = config.rowStyle === 'flat' && requestedFilter === 'saved' ? 'all' : requestedFilter;
+      const filter = String(input.collectionFilter ?? '');
       const configured = config.filterValues ?? [];
       const rows = Array.isArray(state[config.rows]) ? state[config.rows] as CollectionRow[] : [];
       const derived = config.filter ? rows.map(row => String(row[config.filter!] ?? '')).filter(Boolean) : [];
@@ -142,7 +138,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
         copyParam('collection.itemActionsFor', 'Actions for {title}'), copyParam('collection.itemActions', 'Item actions'));
     });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
-    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ id: 'saved', label: copyParam('collection.saved', 'Saved') }]),
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
       ...projected.filters.map(label => ({ id: `value:${label}`, label: copyParam(`collection.filter.${label}`, label) }))];
     const loading = s.status === 'loading' || s.isLoading === true;
     // Older domain reducers expose `errored` rather than `isErrored`; backend
@@ -223,7 +219,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
             ? [copyParam(`collection.${name}.countOne`, config.countNoun[0]), copyParam(`collection.${name}.countMany`, config.countNoun[1])] : undefined }),
       selectedSummary: `${prefs.selectedIds.length} ${copyParam('collection.selected', 'selected')}`,
       filterChoices,
-      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};
@@ -374,8 +370,9 @@ export function defineBackendCollection<S extends object, Row extends object>(na
     controller: controller as unknown as BackendCollection['controller'],
     apply: (state, page) => options.apply(state as S, page as unknown as CollectionQueryState<Row>) as State,
   });
-  const registerService = options.onlineWrites ? withOnlineWrites(options.register ?? register, ['confirmCancel', 'confirmOperation', 'retryOperation', 'commitWrite'], { messageFields: options.onlineWriteMessageFields ?? ['actionMessage'] }) : (options.register ?? register);
-  const handle = registerService(name, definition);
+  // Compatibility starters retain their existing mutation behavior; accept the
+  // current authoring contract without enabling the offline-write rollout.
+  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. Rows that came back empty are the

package/templates/restaurant-owner/tier5-src/_shared/owner-module-data.ts

@@ -45,7 +45,7 @@ const LIMIT = 50;
 let zoneLookup: Promise<string | undefined> | undefined;
 function siteZone(): Promise<string | undefined> {
   // `Promise.resolve().then` so a bridge that throws synchronously is caught here too.
-  zoneLookup ??= Promise.resolve().then(getSiteTimeZone).catch(() => undefined);
+  zoneLookup ??= Promise.resolve().then(() => getSiteTimeZone()).catch(() => undefined);
   return zoneLookup;
 }
 

package/templates/retail-store/dev/index.ts

@@ -6833,6 +6833,21 @@ const SCREENS = runtimeSetting({
                         }
                       }
                     },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:himiBrandedShop.readMessage",
+                          "style": "body",
+                          "color": "textSecondary"
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedShop.noReadMessage"
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -6843,6 +6858,9 @@ const SCREENS = runtimeSetting({
                           "style": "body",
                           "color": "textSecondary"
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedShop.hasReadMessage"
                       }
                     },
                     {
@@ -18793,7 +18811,7 @@ const SCREENS = runtimeSetting({
                                 "package": "himalaya",
                                 "type": "Text",
                                 "props": {
-                                  "text": "Showing saved offline results · may be outdated",
+                                  "text": "Showing previously loaded content · may be outdated",
                                   "style": "caption",
                                   "color": "textSecondary"
                                 }

package/templates/retail-store/tier5-src/_shared/collection-query-legacy.ts

@@ -0,0 +1,194 @@
+import { initialReadStatus, type ReadStatus } from '@himalaya/state';
+
+/** Backend collection lifecycle shared by domain workers. The domain supplies
+ * the query and row mapper; this layer never calls a domain API or mutates it. */
+export interface CollectionQuery {
+  query: string;
+  filter: string;
+  sort: 'default' | 'az' | 'za';
+  savedIds: string[];
+}
+export interface CollectionPage<Row> {
+  items: Row[];
+  nextCursor: string;
+  total?: number;
+  metadata?: Record<string, unknown>;
+  complete?: boolean;
+}
+export interface CollectionQueryState<Row> extends CollectionPage<Row> {
+  criteria: CollectionQuery;
+  status: 'idle' | 'loading' | 'ready' | 'error';
+  loadingMore: boolean;
+  pageError: boolean;
+  complete: boolean;
+  error: string;
+  read: ReadStatus;
+  /** The rows are the source's `cached` page, shown while the live read is still out. */
+  provisional?: boolean;
+}
+/** What a collection showed, as `shownPage` hands it out and `seed` takes it back on a restored boot. */
+export interface CollectionShownPage<Row> {
+  state: CollectionQueryState<Row>;
+  loadedPages: number;
+}
+export interface CollectionQuerySource<Row> {
+  fetch(criteria: CollectionQuery, cursor: string): Promise<CollectionPage<Row>>;
+  /** Optional public cache for immediate paint; always incomplete, never a paging authority. */
+  cached?(criteria: CollectionQuery): Promise<CollectionPage<Row> | undefined>;
+  id(row: Row): string;
+  errorMessage?(error: unknown): string;
+  /** Private collections must discard prior rows when access or identity changes. A revalidation keeps the
+   *  rows it shows through any other failure: safe because one worker never serves two identities (its pool
+   *  key carries the account, and a purge tears parked workers down). */
+  clearOnError?(error: unknown): boolean;
+}
+const normalize = (q: Partial<CollectionQuery>): CollectionQuery => ({
+  query: typeof q.query === 'string' ? q.query.trim().slice(0, 256) : '',
+  filter: typeof q.filter === 'string' ? q.filter.slice(0, 256) : 'all',
+  sort: q.sort === 'az' || q.sort === 'za' ? q.sort : 'default',
+  savedIds: Array.isArray(q.savedIds) ? [...new Set(q.savedIds.filter(id => typeof id === 'string' && id.length > 0 && id.length <= 256))].slice(0, 500) : [],
+});
+const copyQuery = (q: CollectionQuery): CollectionQuery => ({ ...q, savedIds: [...q.savedIds] });
+
+/** New criteria cancel the old result logically, including an in-flight next
+ * page. Failures preserve the cursor and rows for an explicit retry. Callers
+ * publish each snapshot through their ordinary service reducer, so loading and
+ * filtered-empty never masquerade as a successfully completed query. */
+export function createLegacyCollectionQuery<Row>(source: CollectionQuerySource<Row>, publish: (state: CollectionQueryState<Row>) => void) {
+  let generation = 0, disposed = false;
+  let loadedPages = 0, restoringPages = 0;
+  let state: CollectionQueryState<Row> = { criteria: normalize({}), items: [], nextCursor: '', status: 'idle', loadingMore: false, pageError: false, complete: false, error: '', read: initialReadStatus() };
+  /** The query a revalidation is running under: its snapshots are held back until it is done. */
+  let revalidating = -1;
+  /** The last page the screen showed whole (rows ready, nothing paging, failing or standing in): what a revalidation
+   *  keeps on screen and restores when it fails, and what a restored boot shows. A next page loading or failing after
+   *  it leaves those rows on screen, so it is still this. */
+  let lastShown: { state: CollectionQueryState<Row>; loadedPages: number } | undefined;
+  const sameCriteria = (a: CollectionQuery, b: CollectionQuery) => JSON.stringify(a) === JSON.stringify(b);
+  let clearedByError = false;
+  const snapshot = (): CollectionQueryState<Row> => ({ ...state, read: { ...state.read }, 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.
+    if (state.status === 'ready' && !state.pageError && !state.loadingMore && !state.provisional) {
+      lastShown = { state: snapshot(), loadedPages };
+    }
+    publish(snapshot());
+  };
+  const merge = (old: Row[], page: Row[]): Row[] => {
+    const positions = new Map<string, number>(), result: Row[] = [];
+    for (const item of [...old, ...page]) {
+      const id = source.id(item);
+      if (!id) throw new Error('A backend collection row requires an identity');
+      const index = positions.get(id);
+      if (index === undefined) { positions.set(id, result.length); result.push(item); }
+      else result[index] = item;
+    }
+    return result;
+  };
+  /** [keepRows]: a search typed over the rows on screen leaves them there until its answer arrives (status stays
+   *  `loading`, and nothing pages under the old answer), so the list is not blanked on each keystroke. */
+  const fetch = async (append: boolean, keepRows = false): Promise<void> => {
+    if (disposed || (append && (state.loadingMore || state.status === 'loading' || !state.nextCursor))) return;
+    const revision = append ? generation : ++generation;
+    const cursor = append ? state.nextCursor : '';
+    const criteria = copyQuery(state.criteria);
+    if (!append) loadedPages = 0;
+    state = { ...state, status: append ? 'ready' : 'loading', loadingMore: append, pageError: false, error: '',
+      ...(append ? {} : keepRows ? { nextCursor: '', complete: false, provisional: false }
+        : { items: [], nextCursor: '', total: undefined, metadata: undefined, complete: false, provisional: false }) };
+    emit();
+    try {
+      if (!append && source.cached) {
+        const cached = await source.cached(criteria).catch(() => undefined);
+        if (disposed || generation !== revision) return;
+        if (cached?.items.length) {
+          state = { ...state, items: merge([], cached.items), metadata: cached.metadata, status: 'ready', complete: false, provisional: true };
+          emit();
+        }
+      }
+      const page = await source.fetch(criteria, cursor);
+      if (disposed || generation !== revision) return;
+      if (!Array.isArray(page.items) || typeof page.nextCursor !== 'string' || (cursor && page.nextCursor === cursor)) throw new Error('Invalid collection page');
+      state = { ...state, items: merge(append ? state.items : [], page.items), nextCursor: page.nextCursor,
+        total: typeof page.total === 'number' && Number.isFinite(page.total) && page.total >= 0 ? page.total : (append ? state.total : undefined),
+        metadata: page.metadata ?? (append ? state.metadata : undefined),
+        status: 'ready', loadingMore: false, pageError: false, complete: page.complete ?? !page.nextCursor, provisional: false };
+      loadedPages++;
+    } catch (error) {
+      if (disposed || generation !== revision) return;
+      const clear = source.clearOnError?.(error) === true;
+      // Revoked access always ends what a revalidation showed, whether or not the source clears its rows.
+      clearedByError = clear || /HTTP 40[13]\b/.test(String(error));
+      if (clearedByError) lastShown = undefined;
+      if (clear) loadedPages = 0;
+      // The rows a typed search kept on screen while it ran were never its answer: a failed one shows none of them.
+      const drop = clear || keepRows;
+      state = { ...state, ...(drop ? { items: [], nextCursor: '', total: undefined, metadata: undefined } : {}),
+        status: append && !clear ? 'ready' : 'error', loadingMore: false, pageError: append && !clear, complete: false,
+        provisional: false, error: source.errorMessage?.(error) ?? '' };
+    }
+    emit();
+  };
+  return {
+    getState: snapshot,
+    /** [revalidate]: a screen coming back re-queries the rows it shows. They stay on screen until every
+     *  page is in, and a failure keeps them; revoked access still clears them, and other criteria reset. */
+    async query(criteria: Partial<CollectionQuery>, restorePages = false, revalidate = false): Promise<void> {
+      if (disposed) return Promise.resolve();
+      const next = normalize(criteria);
+      const same = JSON.stringify(next) === JSON.stringify(state.criteria);
+      const count = restorePages && same ? Math.max(loadedPages, restoringPages, 1) : 1;
+      const showing = lastShown && sameCriteria(lastShown.state.criteria, next) ? lastShown : undefined;
+      restoringPages = count;
+      // Only the search text changed: the user is typing over the rows on screen, also while the last keystroke's
+      // search is still out.
+      const typing = !same && (state.status === 'ready' || state.status === 'loading')
+        && sameCriteria({ ...state.criteria, query: '' }, { ...next, query: '' });
+      state = { ...state, criteria: next };
+      if (revalidate && showing) { revalidating = generation + 1; clearedByError = false; }
+      const pending = fetch(false, typing);
+      const revision = generation;
+      await pending;
+      // Re-appearance revalidates every previously opened page using fresh
+      // cursors. A changed query, error or revoked access stops the restoration.
+      while (!disposed && generation === revision && loadedPages < count && state.status === 'ready'
+        && !state.pageError && !state.loadingMore && state.nextCursor) await fetch(true);
+      if (generation === revision) restoringPages = 0;
+      if (revalidating === revision) {
+        revalidating = -1;
+        if (generation !== revision) return;
+        if ((state.status !== 'ready' || state.pageError) && showing && !clearedByError) {
+          state = { ...showing.state, criteria: next };
+          loadedPages = showing.loadedPages;
+        }
+        emit();
+      }
+    },
+    /** The page the screen shows (rows ready, nothing failing or still paging), for the service to keep with its
+     *  state; undefined when it shows none. */
+    shownPage(): CollectionShownPage<Row> | undefined {
+      if (!lastShown || !sameCriteria(lastShown.state.criteria, state.criteria)) return undefined;
+      const page = lastShown.state;
+      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. */
+    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) || 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: '', read: restored.read ? { ...restored.read } : initialReadStatus() };
+      loadedPages = Math.max(1, Math.floor(Number(candidate?.loadedPages) || 1));
+      lastShown = { state: snapshot(), loadedPages };
+      return true;
+    },
+    refresh: () => { restoringPages = 0; return fetch(false); },
+    loadMore: () => fetch(true),
+    retry: () => fetch(state.pageError),
+    dispose() { disposed = true; generation++; },
+  };
+}