@wix/himalaya-cli 0.1618.0 → 0.1620.0

package/templates/branded-lite/tier5-src/himi-branded-lite-shop/index.ts

@@ -652,6 +652,20 @@ const register = withIapPresentation<S>({
   },
 });
 
+/** A read that answers at once (a cache, a local fixture, a headless run whose transport never
+ *  suspends) is over before the action that started it returns. Its `readChanged` is a dispatch
+ *  of this same service from a detached job, which a headless run never services after the active
+ *  action returns, and which on a device would commit under the skeleton the action is about to
+ *  return. Wait a bounded number of turns and fold the settled status into the action's own
+ *  result instead; a read that is still in flight keeps the skeleton and lands through
+ *  `readChanged` as before. `undefined` means a newer action took over while this one waited. */
+async function settledWithin(next: S, category: string, gen: number): Promise<S | undefined> {
+  const controller = reader(category);
+  for (let i = 0; i < 500 && controller.getStatus().refreshing; i++) await Promise.resolve();
+  if (gen !== generation) return undefined;
+  return controller.getStatus().refreshing ? next : currentReadState(next);
+}
+
 type A = (s: S, arg?: unknown) => S | undefined | Promise<S | undefined>;
 const svc = register<S, Record<string, A>>("himiBrandedShop", {
   state: BOOT,
@@ -659,8 +673,12 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
   actions: {
     load: (s, arg) => load(s, arg),
     // Pull to refresh: the categories and the scope again, from Wix.
-    refresh: (s, arg) => load(s, arg, true),
-    retry: (s) => showScope(s, s.categorySelected, true),
+    refresh: async (s, arg) => {
+      const next = await load(s, arg, true);
+      // The result owns its scope; another action may have changed the globals during load.
+      return next ? settledWithin(next, next.categorySelected, next.scopeGen) : undefined;
+    },
+    retry: (s) => settledWithin(showScope(s, s.categorySelected, true), s.categorySelected, generation),
     recover: async () => { await fetchScope(selectedCategory, generation, true); return undefined; },
     readChanged: (s, arg) => {
       if (!arg || typeof arg !== 'object') return undefined;
@@ -683,7 +701,7 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
     // A background page landed for the current scope.
     scopeGrew: (s) => derive(s),
     // Single-select: one chip is always chosen.
-    selectCategory: (s, arg) => {
+    selectCategory: async (s, arg) => {
       // The chip row sends { selectedIds }; a deselected chip falls back to All.
       const selection = arg as { selectedIds?: unknown; refresh?: boolean } | undefined;
       const id = selection?.selectedIds !== undefined ? selected(arg)[0] ?? ALL : idOf(arg);
@@ -691,12 +709,15 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
       const cancelsPendingRoute = !!pendingLink || selectedCategory !== id;
       categoryIntentVersion++;
       pendingLink = undefined;
-      if (id !== ALL && !categories.some((c) => c.id === id)) return s;
+      // undefined, not s: s is the snapshot from before any in-flight load, loading flag included.
+      if (id !== ALL && !categories.some((c) => c.id === id)) return undefined;
       // showScope compares the prior selection before committing the requested category.
       // categorySelected is committed with the tap (showScope), so a tap back to the chip
       // on screen while another category loads is a no-op on the right scope.
-      if (id === s.categorySelected) return cancelsPendingRoute || refresh ? showScope(s, id, refresh) : s;
-      const next = showScope(s, id, refresh);
+      if (id === s.categorySelected) return cancelsPendingRoute || refresh ? settledWithin(showScope(s, id, refresh), id, generation) : undefined;
+      const shown = showScope(s, id, refresh);
+      const next = await settledWithin(shown, id, generation);
+      if (!next) return undefined;
       const pending = pendingAuxiliary;
       if (pending && pending.version === auxiliaryVersion && pending.cartCount >= 0) {
         pendingAuxiliary = undefined;

package/templates/brandy/dev/index.ts

@@ -347,10 +347,11 @@ export default {
   config,
   homeScreenId: "site_home",
   screens: {
-    // A fresh copy per build: descriptors are pure functions of the site block.
+    // A fresh copy per build: descriptors are pure functions of the site block. A JSON round
+    // trip, not structuredClone: `himi test` builds screens in the contained realm, which withholds it.
     exact: {
-      ...Object.fromEntries(Object.keys(SCREENS).map((id) => [id, () => structuredClone(SCREENS[id])])),
-      himi_notification_settings: () => structuredClone(NOTIFICATIONS),
+      ...Object.fromEntries(Object.keys(SCREENS).map((id) => [id, () => JSON.parse(JSON.stringify(SCREENS[id]))])),
+      himi_notification_settings: () => JSON.parse(JSON.stringify(NOTIFICATIONS)),
     },
     templated: [],
   },

package/templates/retail-store/tier5-src/himi-branded-lite-shop/index.ts

@@ -652,6 +652,20 @@ const register = withIapPresentation<S>({
   },
 });
 
+/** A read that answers at once (a cache, a local fixture, a headless run whose transport never
+ *  suspends) is over before the action that started it returns. Its `readChanged` is a dispatch
+ *  of this same service from a detached job, which a headless run never services after the active
+ *  action returns, and which on a device would commit under the skeleton the action is about to
+ *  return. Wait a bounded number of turns and fold the settled status into the action's own
+ *  result instead; a read that is still in flight keeps the skeleton and lands through
+ *  `readChanged` as before. `undefined` means a newer action took over while this one waited. */
+async function settledWithin(next: S, category: string, gen: number): Promise<S | undefined> {
+  const controller = reader(category);
+  for (let i = 0; i < 500 && controller.getStatus().refreshing; i++) await Promise.resolve();
+  if (gen !== generation) return undefined;
+  return controller.getStatus().refreshing ? next : currentReadState(next);
+}
+
 type A = (s: S, arg?: unknown) => S | undefined | Promise<S | undefined>;
 const svc = register<S, Record<string, A>>("himiBrandedShop", {
   state: BOOT,
@@ -659,8 +673,12 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
   actions: {
     load: (s, arg) => load(s, arg),
     // Pull to refresh: the categories and the scope again, from Wix.
-    refresh: (s, arg) => load(s, arg, true),
-    retry: (s) => showScope(s, s.categorySelected, true),
+    refresh: async (s, arg) => {
+      const next = await load(s, arg, true);
+      // The result owns its scope; another action may have changed the globals during load.
+      return next ? settledWithin(next, next.categorySelected, next.scopeGen) : undefined;
+    },
+    retry: (s) => settledWithin(showScope(s, s.categorySelected, true), s.categorySelected, generation),
     recover: async () => { await fetchScope(selectedCategory, generation, true); return undefined; },
     readChanged: (s, arg) => {
       if (!arg || typeof arg !== 'object') return undefined;
@@ -683,7 +701,7 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
     // A background page landed for the current scope.
     scopeGrew: (s) => derive(s),
     // Single-select: one chip is always chosen.
-    selectCategory: (s, arg) => {
+    selectCategory: async (s, arg) => {
       // The chip row sends { selectedIds }; a deselected chip falls back to All.
       const selection = arg as { selectedIds?: unknown; refresh?: boolean } | undefined;
       const id = selection?.selectedIds !== undefined ? selected(arg)[0] ?? ALL : idOf(arg);
@@ -691,12 +709,15 @@ const svc = register<S, Record<string, A>>("himiBrandedShop", {
       const cancelsPendingRoute = !!pendingLink || selectedCategory !== id;
       categoryIntentVersion++;
       pendingLink = undefined;
-      if (id !== ALL && !categories.some((c) => c.id === id)) return s;
+      // undefined, not s: s is the snapshot from before any in-flight load, loading flag included.
+      if (id !== ALL && !categories.some((c) => c.id === id)) return undefined;
       // showScope compares the prior selection before committing the requested category.
       // categorySelected is committed with the tap (showScope), so a tap back to the chip
       // on screen while another category loads is a no-op on the right scope.
-      if (id === s.categorySelected) return cancelsPendingRoute || refresh ? showScope(s, id, refresh) : s;
-      const next = showScope(s, id, refresh);
+      if (id === s.categorySelected) return cancelsPendingRoute || refresh ? settledWithin(showScope(s, id, refresh), id, generation) : undefined;
+      const shown = showScope(s, id, refresh);
+      const next = await settledWithin(shown, id, generation);
+      if (!next) return undefined;
       const pending = pendingAuxiliary;
       if (pending && pending.version === auxiliaryVersion && pending.cartCount >= 0) {
         pendingAuxiliary = undefined;