@wix/himalaya-cli 0.1025.0 → 0.1027.0

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

@@ -8,6 +8,9 @@ export interface CollectionConfig {
   image?: string;
   filter?: string;
   filterValues?: string[];
+  /** A state key holding `{ label }` rows (e.g. a worker's full category list) whose
+   *  labels are filter choices even when no loaded row carries them yet. */
+  filterValuesFrom?: string;
   searchPlaceholder?: string;
   sortLabels?: { default: string; az: string; za: string };
   metadata?: string[];
@@ -20,15 +23,22 @@ export interface CollectionConfig {
   reviewSelectedAction?: string;
   /** Optional comfortable grid media height for immersive visual catalogs. */
   gridImageHeight?: number;
+  /** The card's primary verb, shown as a visible button beside the overflow.
+   * `screenId` opens that screen with the row id; without it the verb reuses the
+   * row's own tap action (the detail screen that owns the verb). */
+  primaryVerb?: { label: string; screenId?: string };
 }
+/** At or below this many records, with no query/filter narrowing them and no further
+ * page, the list/grid toggle, Refine, chips, search and count are noise. */
+export const COLLECTION_CHROME_MIN_ITEMS = 4;
 export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiStoreShop: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', view: 'grid', backendQuery: true },
-  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
+  himiBookingServices: { rows: 'results', title: 'name', subtitle: 'subtitle', image: 'image', filter: 'category', view: 'grid', backendQuery: true, searchPlaceholder: 'Service name starts with…', primaryVerb: { label: 'Book', screenId: 'himi_time' } },
   himiBookingBookings: { rows: 'rows', title: 'title', subtitle: 'subtitle', metadata: ['status'], view: 'list', backendQuery: true,
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
-  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' } },
-  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', view: 'grid' },
+  himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
+  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },
@@ -45,14 +55,14 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3'], view: 'grid' },
   himiBrandedPrograms: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
-  himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list' },
+  himiBrandedCoupons: { rows: 'coupons', title: 'name', subtitle: 'subtitle', view: 'list', primaryVerb: { label: 'Get code' } },
   himiBrandedNotifications: { rows: 'items', title: 'name', subtitle: 'subtitle', image: 'photo', metadata: ['unreadDot'], view: 'list' },
-  himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid' },
+  himiBrandedLoyalty: { rows: 'rewards', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Redeem' } },
   himiBrandedReviews: { rows: 'reviews', title: 'title', subtitle: 'body', metadata: ['author', 'stars'], view: 'list' },
   himiBrandedPortfolio: { rows: 'projects', title: 'title', subtitle: 'subtitle', image: 'image', view: 'grid', gridImageHeight: 180 },
   himiBrandedInvoices: { rows: 'invoices', title: 'title', subtitle: 'subtitle', view: 'list' },
   himiBrandedBadges: { rows: 'badges', title: 'name', subtitle: 'description', view: 'grid' },
-  himiBrandedDonations: { rows: 'campaigns', title: 'name', subtitle: 'description', view: 'grid' },
+  himiBrandedDonations: { rows: 'campaigns', title: 'name', subtitle: 'description', view: 'grid', primaryVerb: { label: 'Donate' } },
   himiBrandedGiftCards: { rows: 'cards', title: 'name', subtitle: 'description', view: 'grid' },
   himiBrandedVideos: { rows: 'channels', title: 'title', subtitle: 'description', view: 'grid' },
   himiBrandedPodcasts: { rows: 'episodes', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['progressLabel'], view: 'list' },
@@ -114,7 +124,7 @@ export function collectionTitle(row: CollectionRow, config: CollectionConfig): s
   return scalar(row[config.title]) || scalar(row.title) || scalar(row.name) || scalar(row.display) || scalar(row.label);
 }
 /** Does not mutate domain rows, paging, or domain-derived state. */
-export function projectCollection(source: CollectionRow[], config: CollectionConfig, prefs: CollectionPreferences, backendQuery = false) {
+export function projectCollection(source: CollectionRow[], config: CollectionConfig, prefs: CollectionPreferences, backendQuery = false, knownFilters: string[] = []) {
   const query = prefs.query.trim().toLocaleLowerCase();
   const unique = new Set<string>();
   // Menu sections describe their following items; they are not actionable
@@ -130,7 +140,7 @@ export function projectCollection(source: CollectionRow[], config: CollectionCon
     if (unique.has(id)) return false;
     unique.add(id); return true;
   });
-  const filters = config.filterValues ?? [...new Set(rows.map(row => config.filter ? scalar(row[config.filter]) : '').filter(Boolean))].sort();
+  const filters = config.filterValues ?? [...new Set([...knownFilters, ...rows.map(row => config.filter ? scalar(row[config.filter]) : '')].filter(Boolean))].sort();
   const visible = rows.filter(row => {
     if (backendQuery) return true;
     if (prefs.filter === 'saved' && !prefs.savedIds.includes(collectionId(row))) return false;

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

@@ -1,5 +1,5 @@
 import { defineService as register, type ServiceDefinition } from '@himalaya/state';
-import { COLLECTIONS, normalizeCollection, projectCollection, collectionId, type CollectionRow } from './collection-contract.js';
+import { COLLECTIONS, COLLECTION_CHROME_MIN_ITEMS, initialCollection, normalizeCollection, projectCollection, collectionId, type CollectionRow } from './collection-contract.js';
 import { localPreferences, type PreferenceRuntime } from './local-preferences.js';
 import { copyParam, stashCopy } from './himi-copy.js';
 import { createCollectionQuery, type CollectionQuerySource, type CollectionQueryState } from './collection-query.js';
@@ -54,6 +54,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
   /** Navigation can open a collection in a useful, reviewable context. Keep
    * this input additive and constrained to the same criteria the collection UI
    * can select; arbitrary route values must never become backend filters. */
+  /** Labels of the worker-listed filter choices (`filterValuesFrom`), minus the "All" row. */
+  const listedFilters = (state: State): string[] => config.filterValuesFrom && Array.isArray(state[config.filterValuesFrom])
+    ? (state[config.filterValuesFrom] as unknown[]).flatMap(row => {
+      const r = row && typeof row === 'object' ? row as Record<string, unknown> : {};
+      return typeof r.label === 'string' && r.id !== '' ? [r.label] : [];
+    })
+    : [];
+  let pendingFilter = '';
   const applyNavigationCriteria = (arg: unknown, state: State): boolean => {
     const input = object(arg);
     let changed = false;
@@ -70,9 +78,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       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) : [];
+      const known = listedFilters(state);
       const allowed = filter === 'all' || filter === 'saved' ||
-        (filter.startsWith('value:') && [...configured, ...derived].includes(filter.slice(6)));
+        (filter.startsWith('value:') && [...configured, ...derived, ...known].includes(filter.slice(6)));
       if (allowed) { prefs.filter = filter; changed = true; }
+      // A worker-listed choice (e.g. a blog category) may not have loaded yet at boot:
+      // hold it and settle it against the list once the list arrives, instead of
+      // discarding a valid deep link before load().
+      else if (filter.startsWith('value:') && config.filterValuesFrom && known.length === 0) pendingFilter = filter;
     }
     if (changed) {
       prefs.selectedIds = [];
@@ -90,7 +103,12 @@ export function decorateCollection(name: string, def: { state: State; actions?:
   const derive = (s: State): State => {
     syncSaved();
     const rows = Array.isArray(s[config.rows]) ? (s[config.rows] as CollectionRow[]).filter(x => x && typeof x === 'object') : [];
-    const projected = projectCollection(rows, config, prefs, !!backend && config.backendQuery === true);
+    const known = listedFilters(s);
+    if (pendingFilter && known.length) {
+      if (known.includes(pendingFilter.slice(6))) { prefs.filter = pendingFilter; persisted.write(prefs); }
+      pendingFilter = '';
+    }
+    const projected = projectCollection(rows, config, prefs, !!backend && config.backendQuery === true, known);
     projected.items.forEach(row => { row.collectionSelectLabel = row.collectionSelected ? copyParam('collection.selected', 'Selected') : copyParam('collection.select', 'Select'); });
     if (previewId && !rows.some(row => collectionId(row) === previewId)) previewId = '';
     const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
@@ -106,7 +124,14 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     const queryError = typeof backendState?.error === 'string' ? backendState.error.trim() : '';
     const errorMessage = queryError || domainError || copyParam('collection.loadError', 'This collection could not load. Try again.');
     const canRetry = !!backend || typeof def.actions?.refresh === 'function' || typeof def.actions?.load === 'function' || typeof def.actions?.collectionRetry === 'function';
+    // A default view is what the screen opens on; anything else is the member's own
+    // narrowing, which keeps the chrome (and the Clear that undoes it) on screen.
+    // "All" and the collection's own default (e.g. Upcoming) are both un-narrowed: Clear
+    // resets to "All", so showing it on either would offer a reset that changes nothing.
+    const narrowed = !!prefs.query.trim() || (prefs.filter !== 'all' && prefs.filter !== initialCollection(config).filter);
+    const hideChrome = !narrowed && !s.nextCursor && projected.loaded < COLLECTION_CHROME_MIN_ITEMS;
     return { ...s, collection: { ...prefs, ...projected,
+      hideChrome, noActiveCriteria: !narrowed,
       viewName, viewMessage, saveMessage, noSavedViews: prefs.savedViews.length === 0,
       cursor: s.pageError === true || s.loadingMore === true ? '' : s.nextCursor,
       noMore: !s.nextCursor || s.pageError === true || s.loadingMore === true,

package/templates/beauty-salon/tier5-src/_shared/detail-presence.ts

@@ -0,0 +1,51 @@
+// Whether a detail screen's entity is there — the worker half of the shared not-found
+// state (the `detailNotFound` descriptor builder).
+//
+// A detail screen's descriptor asks two questions, both as `hiddenWhen` flags:
+//   • `noEntity`     → hide the entity's content AND its actions (Like, Follow, Send…)
+//   • `hideNotFound` → hide the not-found state
+// Four answers exist, and only one of them shows the not-found state:
+//   loading  — a loading line (`hideLoading` false); no content, no actions, no verdict
+//   found    — content + actions shown
+//   missing  — not-found shown, content + actions hidden
+//   failed   — a load-error line (`hideLoadError` false); no content, no actions
+// A load that FAILS for any reason other than "not found" is `failed`, never `missing`:
+// an offline device must not tell the user their invoice was deleted.
+
+export type Presence = "loading" | "found" | "missing" | "failed";
+
+export interface PresenceFlags {
+  found: boolean;
+  notFound: boolean;
+  noEntity: boolean;
+  hideNotFound: boolean;
+  hideLoading: boolean;
+  hideLoadError: boolean;
+}
+
+export function presence(p: Presence): PresenceFlags {
+  return {
+    found: p === "found", notFound: p === "missing", noEntity: p !== "found", hideNotFound: p !== "missing",
+    hideLoading: p !== "loading", hideLoadError: p !== "failed",
+  };
+}
+
+/** The entity id the host baked into this detail screen (`himi.open` params). */
+export function detailInputId(): string {
+  const v = (globalThis as { himalaya?: { input?: { id?: unknown } } }).himalaya?.input?.id;
+  return typeof v === "string" ? v.trim() : "";
+}
+
+/** True when a Wix read failed because the record does not exist: the SDK rejects
+ *  with "HTTP <code>: <body>", so an HTTP 404, or Wix's `NOT_FOUND` error code. A bare
+ *  "not found" in a message is NOT enough — "capability wix_api not found" or "Method
+ *  not found" is a broken integration, and must not tell the user the record is gone. */
+export function isNotFoundError(error: unknown): boolean {
+  const msg = String((error as { message?: unknown } | null)?.message ?? error ?? "");
+  return /\bHTTP\s*404\b/.test(msg) || /\bNOT_FOUND\b/.test(msg);
+}
+
+/** `missing` for a not-found failure, `failed` (claim nothing) otherwise. */
+export function presenceAfterError(error: unknown): PresenceFlags {
+  return presence(isNotFoundError(error) ? "missing" : "failed");
+}

package/templates/beauty-salon/tier5-src/himi-branded-lite-orders/index.ts

@@ -54,6 +54,7 @@ interface State {
   noEmpty: boolean;
   hideList: boolean;
   needsSignIn?: boolean;
+  noSignIn?: boolean;
   nextCursor?: string;
   complete?: boolean;
   pageError?: boolean;
@@ -127,7 +128,9 @@ function derive(state: State): State {
     notLoading: state.status !== "loading",
     isErrored: state.status === "error",
     notErrored: state.status !== "error",
-    noEmpty: state.status !== "ready" || hasRows,
+    // A guest gets the shared member gate, not the "Browse products" empty card.
+    noEmpty: state.status !== "ready" || hasRows || state.needsSignIn === true,
+    noSignIn: state.status !== "ready" || state.needsSignIn !== true,
     hideList: state.status !== "ready" || state.needsSignIn === true,
   };
 }

package/templates/beauty-salon/tier5-src/wix-spaces-collection-detail/index.ts

@@ -7,19 +7,17 @@ import {
   getStoreCategory,
   type WixCollection,
 } from "@himalaya/wix-stores-collections";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "loading" | "ready"; name: string; subtitle: string; description: string }
+interface S extends PresenceFlags { status: "loading" | "ready"; name: string; subtitle: string; description: string }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesCollectionDetail", {
-  state: { status: "loading", name: "", subtitle: "", description: "" },
+  state: { status: "loading", name: "", subtitle: "", description: "", ...presence("loading") },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      if (!id) return { ...s, status: "ready" };
+      const id = detailInputId();
+      if (!id) return { ...s, status: "ready", ...presence("missing") };
       try {
         const res = await getStoreCategory(id);
         const c = res.category;
@@ -29,6 +27,7 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesCollectionDe
             name: c.name || "Category",
             subtitle: categoryCount(c),
             description: c.description || "",
+            ...presence("found"),
           };
         }
       } catch { /* fall through to V1 */ }
@@ -43,9 +42,10 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesCollectionDe
           name: c.name || "Collection",
           subtitle: n != null ? `${n} ${n === 1 ? "product" : "products"}` : "",
           description: c.description || "",
+          ...presence("found"),
         };
-      } catch {
-        return { ...s, status: "ready" };
+      } catch (e) {
+        return { ...s, status: "ready", ...presenceAfterError(e) };
       }
     },
   },

package/templates/beauty-salon/tier5-src/wix-spaces-create-post/index.ts

@@ -4,6 +4,7 @@
 // create endpoint in the SDK; blog is the available authored-content write.)
 import { defineService } from "@himalaya/state";
 import { createDraftPost, publishDraftPost } from "@himalaya/wix-blog";
+import { memberAccess } from "../_shared/member-access.js";
 
 // `bodyFocus` is a focus TOKEN, not a flag: the body field focuses whenever this
 // becomes a new non-empty value (`TextFieldProps.focus_path`). A monotonic counter
@@ -14,7 +15,11 @@ import { createDraftPost, publishDraftPost } from "@himalaya/wix-blog";
 // the new state), so there is no way to observe an intermediate value while `submit`
 // is awaiting the network. A type that promises a state nobody can ever see reads as
 // an in-flight guard that exists — see `posting` below for the one that works.
-interface S { status: "ready"; title: string; body: string; hint: string; bodyFocus: string }
+// `needsSignIn` / `noSignIn` / `hideForm` drive the member gate: a guest sees the
+// gate and NO form, a member sees the form, and until `load` has asked the
+// host who is signed in, neither shows — so a guest can never start typing a post
+// that would only fail on submit.
+interface S { status: "ready"; title: string; body: string; hint: string; bodyFocus: string; needsSignIn: boolean; noSignIn: boolean; hideForm: boolean }
 
 // The real double-press guard, module-local because it must live OUTSIDE published
 // state for the reason above. One worker instance owns one composer, so a module flag
@@ -33,15 +38,20 @@ function val(arg?: unknown): string {
   return typeof arg === "string" ? arg : ((arg as { value?: string; text?: string })?.value ?? (arg as { text?: string })?.text ?? "");
 }
 
-const svc = defineService<S, { setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S) => Promise<S> }>("spacesCreatePost", {
-  state: { status: "ready", title: "", body: "", hint: "Share something with the community.", bodyFocus: "" },
+const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S) => Promise<S> }>("spacesCreatePost", {
+  state: { status: "ready", title: "", body: "", hint: "Share something with the community.", bodyFocus: "", needsSignIn: false, noSignIn: true, hideForm: true },
   actions: {
+    load: async (s) => {
+      const { email } = await memberAccess();
+      return { ...s, needsSignIn: !email, noSignIn: !!email, hideForm: !email };
+    },
     setTitle: (s, a) => ({ ...s, title: val(a) }),
     setBody: (s, a) => ({ ...s, body: val(a) }),
     // Title's Next key lands here. The keyboard stays up (that is the "next"
     // contract) and the body field takes focus.
     focusBody: (s) => ({ ...s, bodyFocus: bumpToken(s.bodyFocus) }),
     submit: async (s) => {
+      if (s.needsSignIn) return { ...s, hint: "Sign in to post." };
       const title = s.title.trim();
       if (!title) return { ...s, hint: "Please enter a title." };
       // A second press while the first is still in flight is a NO-OP, not a second
@@ -63,7 +73,7 @@ const svc = defineService<S, { setTitle: (s: S, a?: unknown) => S; setBody: (s:
         // steals focus, so those transitions must clear it (see himi-store-account's
         // NO_FOCUS on its mode switches). Same token, opposite fix; the deciding
         // question is always whether the field stays mounted.
-        return { status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
+        return { ...s, status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
       } catch {
         return { ...s, status: "ready", hint: "Couldn't post — check your connection and try again." };
       } finally {

package/templates/beauty-salon/tier5-src/wix-spaces-plan-detail/index.ts

@@ -2,12 +2,10 @@
 // himalaya.input.id carries the plan id; fetched via getPlan.
 import { defineService } from "@himalaya/state";
 import { getPlan, type WixPlan } from "@himalaya/wix-pricing-plans";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "loading" | "ready"; name: string; price: string; description: string; perks: string }
+interface S extends PresenceFlags { status: "loading" | "ready"; name: string; price: string; description: string; perks: string }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 function priceOf(p: WixPlan): string {
   const m = p.pricing?.price as unknown as { formattedAmount?: string; amount?: string; currency?: string } | undefined;
   if (!m) return p.pricing?.freeTrialDays ? "Free trial" : "";
@@ -15,17 +13,17 @@ function priceOf(p: WixPlan): string {
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesPlanDetail", {
-  state: { status: "loading", name: "", price: "", description: "", perks: "" },
+  state: { status: "loading", name: "", price: "", description: "", perks: "", ...presence("loading") },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      if (!id) return { ...s, status: "ready" };
+      const id = detailInputId();
+      if (!id) return { ...s, status: "ready", ...presence("missing") };
       try {
         const res = await getPlan(id);
         const p = ((res as unknown as { plan?: WixPlan }).plan) ?? (res as unknown as WixPlan);
         const perks = (p.perks?.values ?? []).map((v) => `• ${v}`).join("\n");
-        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks };
-      } catch { return { ...s, status: "ready" }; }
+        return { status: "ready", name: p.name || "Plan", price: priceOf(p), description: p.description || "", perks, ...presence("found") };
+      } catch (e) { return { ...s, status: "ready", ...presenceAfterError(e) }; }
     },
   },
 });

package/templates/beauty-salon/tier5-src/wix-spaces-subscription-detail/index.ts

@@ -2,23 +2,23 @@
 import { defineService } from "@himalaya/state";
 import { getPlanOrder, type WixPlanOrder } from "@himalaya/wix-pricing-plans";
 import { formatDateMedium } from "../_shared/engine-intl.js";
+import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
 
-interface S { status: "loading" | "ready"; name: string; subtitle: string; price: string; validity: string }
+interface S extends PresenceFlags { status: "loading" | "ready"; name: string; subtitle: string; price: string; validity: string }
 
-function inputId(): string {
-  return (globalThis as { himalaya?: { input?: { id?: string } } }).himalaya?.input?.id ?? "";
-}
 
+// Shown by hosts without the shared not-found state (the Spaces clone renders `subtitle`
+// directly); branded-lite hides the whole content block behind `notFound`.
 const EMPTY_DETAIL = "Open a subscription from My Subscriptions — detail needs a plan-order id.";
 const LOAD_FAILED = "This subscription could not be loaded. Try again from My Subscriptions.";
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesSubscriptionDetail", {
-  state: { status: "loading", name: "", subtitle: "", price: "", validity: "" },
+  state: { status: "loading", name: "", subtitle: "", price: "", validity: "", ...presence("loading") },
   actions: {
     load: async (s) => {
-      const id = inputId();
-      // Honest empty (not a blank chrome-only screen) when nav lost the order id.
-      if (!id) return { status: "ready", name: "", subtitle: EMPTY_DETAIL, price: "", validity: "" };
+      const id = detailInputId();
+      // No order id (a stale link, a route opened directly) → the shared not-found state.
+      if (!id) return { status: "ready", name: "", subtitle: EMPTY_DETAIL, price: "", validity: "", ...presence("missing") };
       try {
         const res = await getPlanOrder(id);
         const o = (((res as unknown as { order?: WixPlanOrder }).order) ?? (res as unknown as WixPlanOrder)) as unknown as {
@@ -29,9 +29,10 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesSubscription
         const price = o.pricing?.prices?.[0]?.price?.formattedTotal || "";
         const end = o.currentCycle?.endedDate ? `Renews ${formatDateMedium(new Date(o.currentCycle.endedDate))}` : "";
         return { status: "ready", name: o.planName || "Subscription",
-          subtitle: o.status ? o.status.charAt(0) + o.status.slice(1).toLowerCase() : "", price, validity: end };
-      } catch {
-        return { status: "ready", name: "", subtitle: LOAD_FAILED, price: "", validity: "" };
+          subtitle: o.status ? o.status.charAt(0) + o.status.slice(1).toLowerCase() : "", price, validity: end, ...presence("found") };
+      } catch (e) {
+        const flags = presenceAfterError(e);
+        return { status: "ready", name: "", subtitle: flags.notFound ? "" : LOAD_FAILED, price: "", validity: "", ...flags };
       }
     },
   },

package/templates/beauty-salon/tier5-src/wix-spaces-view-profile/index.ts

@@ -3,10 +3,15 @@
 // paint the seeded "apptestercoowner" demo identity when the session is a real
 // member (or a guest — show honesty instead).
 import { defineService } from "@himalaya/state";
-import { dispatch } from "@himalaya/dispatch";
+import { memberAccess } from "../_shared/member-access.js";
 import { getMyData, displayName } from "@himalaya/wix-users";
 
-interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string }
+// `needsSignIn` / `noSignIn` drive the shared member gate: a guest gets the
+// gate with a Sign in button and no placeholder profile. `profileHidden` stays true until
+// `load` has resolved a member, so a guest never glimpses the placeholder avatar while
+// the membership check is still running; `hideLoading` is false for exactly that moment,
+// so the screen shows a loading line instead of going blank.
+interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string; needsSignIn: boolean; noSignIn: boolean; profileHidden: boolean; hideLoading: boolean }
 
 const EMPTY: S = {
   status: "loading",
@@ -15,18 +20,17 @@ const EMPTY: S = {
   about: "No info to display.",
   initial: "?",
   photo: "",
+  needsSignIn: false,
+  noSignIn: true,
+  profileHidden: true,
+  hideLoading: false,
 };
 
+// The SAME member check create-post and orders use (`memberAccess`: the host's
+// memberIdentity, falling back to wix-users only on hosts that predate that action), so
+// one shared gate never gives two answers in one app.
 async function sessionEmail(): Promise<string> {
-  try {
-    const identity = await dispatch("himi.wix.memberIdentity") as unknown;
-    const direct = identity as { email?: unknown } | null;
-    const wrapped = identity as { payload?: { email?: unknown } } | null;
-    const email = direct?.email ?? wrapped?.payload?.email;
-    return typeof email === "string" ? email.trim() : "";
-  } catch {
-    return "";
-  }
+  return (await memberAccess()).email;
 }
 
 function wixApi() {
@@ -37,7 +41,7 @@ function fromParts(name: string, handleRaw: string, about: string, photo = ""):
   const clean = name.trim();
   const handle = "@" + (handleRaw || clean || "member").replace(/\s+/g, "").replace(/^@+/, "").toLowerCase();
   const initial = (clean.split(/\s+/).filter(Boolean).map((w) => w[0]).join("").slice(0, 2) || "?").toUpperCase();
-  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo };
+  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo, needsSignIn: false, noSignIn: true, profileHidden: false, hideLoading: true };
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile", {
@@ -48,11 +52,17 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile"
       if (!email) {
         return {
           status: "ready",
+          // Kept for hosts without the shared member gate (the Spaces clone renders these
+          // fields directly); branded-lite hides the profile block behind `profileHidden`.
           name: "Sign in to view your profile",
           handle: "",
           about: "Your public profile is available after you sign in from Account.",
           initial: "?",
           photo: "",
+          needsSignIn: true,
+          noSignIn: false,
+          profileHidden: true,
+          hideLoading: true,
         };
       }
       try {