@wix/himalaya-cli 0.1537.0 → 0.1539.0

package/templates/yoga-studio-owner/tier5-src/_shared/collection-contract.ts

@@ -2,6 +2,8 @@ import { compareText, compareIso } from "./engine-intl.js";
 /** Shared OTA collection contract. No host APIs: used by workers and builders. */
 export interface CollectionConfig {
   rows: string;
+  /** Flat customer history rows, divided rather than boxed. */
+  rowStyle?: "flat";
   instanceInput?: string;
   title: string;
   subtitle?: string;
@@ -84,7 +86,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
   himiBrandedGroups: { rows: 'rows', title: 'name', subtitle: 'description', image: 'image', view: 'grid' },
   himiBrandedCms: { rows: 'rows', title: 'name', subtitle: 'subtitle', view: 'grid' },
   himiBrandedCmsCollection: { instanceInput: 'collection', rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list' },
-  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', view: 'list', backendQuery: true,
+  himiBrandedOrders: { rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', metadata: ['status', 'meta'], rowStyle: 'flat', view: 'list', backendQuery: true,
     searchPlaceholder: 'Search by order number', countNoun: ['order', 'orders'], filterValues: ['Not fulfilled', 'Partially fulfilled', 'Fulfilled'],
     sortLabels: { default: 'Newest', az: 'Oldest', za: 'Order # ↓' } },
   himiBrandedPlans: { rows: 'rows', title: 'name', subtitle: 'description', metadata: ['badge', 'priceLine', 'periodLine', 'trialBadge', 'perk1', 'perk2', 'perk3', 'joinNote'], view: 'grid', gridColumns: 1, metaMaxLines: 8, countNoun: ['plan', 'plans'] },
@@ -139,7 +141,10 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
     density: s.density === 'compact' ? 'compact' : 'comfortable',
     sort: s.sort === 'az' || s.sort === 'za' ? s.sort : 'default',
     query: typeof s.query === 'string' ? s.query.slice(0, 256) : '',
-    filter: typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
+    // Flat collections no longer offer Saved. Migrate its persisted value before
+    // the first backend request so an invisible old filter cannot empty the list.
+    filter: config.rowStyle === 'flat' && s.filter === 'saved' ? 'all'
+      : typeof s.filter === 'string' ? s.filter.slice(0, 256) : config.defaultFilter ?? 'all',
     savedIds: Array.isArray(s.savedIds) ? [...new Set(s.savedIds.filter((id): id is string => typeof id === 'string' && id.length > 0 && id.length <= 256))].slice(0, 500) : [],
     savedViews: Array.isArray(s.savedViews) ? s.savedViews.filter((v): v is SavedCollectionView => !!v && typeof v === 'object' && typeof v.name === 'string' && !!v.name.trim()).slice(0, 8).map((v, i) => ({
       id: `view-${i}`, name: v.name.trim().slice(0, 40),
@@ -147,7 +152,8 @@ export function normalizeCollection(config: CollectionConfig, value: unknown): C
       density: v.density === 'compact' ? 'compact' : 'comfortable',
       sort: v.sort === 'az' || v.sort === 'za' ? v.sort : 'default',
       query: typeof v.query === 'string' ? v.query.slice(0, 256) : '',
-      filter: typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
+      filter: config.rowStyle === 'flat' && v.filter === 'saved' ? 'all'
+        : typeof v.filter === 'string' ? v.filter.slice(0, 256) : 'all',
     })) : [],
   };
 }

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

@@ -95,7 +95,10 @@ 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 filter = String(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 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) : [];
@@ -139,7 +142,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') }, { id: 'saved', label: copyParam('collection.saved', 'Saved') },
+    const filterChoices = [{ id: 'all', label: copyParam('collection.all', 'All') }, ...(config.rowStyle === 'flat' ? [] : [{ 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
@@ -220,7 +223,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 ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
+      chips: config.filterValues && config.rowStyle !== 'flat' ? filterChoices.filter(choice => ['all', 'saved', prefs.filter].includes(choice.id)) : filterChoices,
     } };
   };
   const actions: Record<string, Reducer> = {};

package/templates/yoga-studio-owner/tier5-src/_shared/engine-intl.ts

@@ -410,8 +410,11 @@ export function compareDateDesc(a: string, b: string): number {
 // kind of number. So: one money pattern, one clock, one range.
 
 // Money uses `formatCurrency(amount, currency, "en")` — the currency's NATURAL decimals
-// ("₪70.00", "¥500"). Passing 0 fraction digits for whole amounts is what made a list read
-// "₪70 · ₪69.50".
+// ("₪70.00", "¥500") — for Shop, Menu and every other price. The one exception is a Bookings
+// SERVICE price (`_shared/wix-service-price.ts`): it drops the cents of a whole amount ("₪70",
+// "₪69.50"), the format the redesigned service screen and services list were approved with. It
+// must read the same on every screen that shows a service (the list, the service screen, the
+// time screen, Home, the agenda); do not put those back on natural decimals one screen at a time.
 
 const KNOWN_SYMBOLS = new Set(Object.values(CURRENCY_SYMBOL));
 

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

@@ -1,170 +0,0 @@
-// Tier-5 bundle: Wix Spaces clone — Collection detail (ON-DEVICE, site-scoped).
-// Prefer Catalog V3 `getStoreCategory`; V1 `getCollection` 428s on CATALOG_V3 sites.
-//
-// #4155 — the screen showed the category header ("N products") and never the products.
-// Once the category resolves, its products load through `searchStoreProducts({ categoryId })`
-// with the same row shape as `himi-store-shop`, so a category reads as a filtered Shop.
-//
-// Two lifecycles, deliberately kept apart:
-//   • the CATEGORY — presence flags (loading / found / missing / failed), as every detail screen;
-//   • its PRODUCTS — a cursor-paged list (`createCollectionQuery`) with its own loading, failed
-//     and empty states. A product read that fails leaves a FOUND category found: the header
-//     stays and the list offers a retry. It never turns into "Category not found".
-import { defineService } from "@himalaya/state";
-import {
-  categoryCount,
-  getCollection,
-  getStoreCategory,
-  type WixCollection,
-} from "@himalaya/wix-stores-collections";
-import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
-import { createCollectionQuery, type CollectionQueryState } from "../_shared/collection-query.js";
-import { productImage, productPrice, searchStoreProducts, type StoreProduct } from "../_shared/himi-store.js";
-import { cleanTitle, initials } from "../_shared/himi-text.js";
-
-interface Row {
-  id: string;
-  name: string;
-  subtitle: string;
-  image: string;
-  initial: string;
-  hasImage: boolean;
-  noImage: boolean;
-  detailScreenId: string;
-}
-
-interface S extends PresenceFlags {
-  status: "loading" | "ready";
-  name: string;
-  subtitle: string;
-  description: string;
-  /** Which `load` the committed state belongs to — a products snapshot is only ever
-   *  projected onto the category it was fetched for. */
-  loadId: number;
-  products: Row[];
-  /** Load-more cursor — non-empty while another page exists and none is in flight. */
-  productsCursor: string;
-  hideProducts: boolean;
-  hideProductsLoading: boolean;
-  /** Gates the products retry block (the category's own failure is `hideLoadError`). */
-  productsNotErrored: boolean;
-  /** Gates the "next page failed" retry under the list. A failed load-more keeps the rows
-   *  and clears the cursor, so without this the list would just stop and read as complete. */
-  productsNoPageError: boolean;
-  /** One plain line for a screen that has no dedicated empty / error blocks ("" otherwise). */
-  productsMessage: string;
-  /** Gates the "no products in this category" block (screen-kit `emptyBlock` reads `noEmpty`). */
-  noEmpty: boolean;
-}
-
-/** The same row `himi-store-shop` emits, so the screen reuses the Shop tile. */
-function row(p: StoreProduct): Row {
-  const name = cleanTitle(p.name) || "Product";
-  const image = productImage(p);
-  return {
-    id: p.id ?? "",
-    name,
-    subtitle: productPrice(p),
-    image,
-    initial: initials(name),
-    hasImage: !!image,
-    noImage: !image,
-    detailScreenId: "himi_product",
-  };
-}
-
-let categoryId = "";
-let loadId = 0;
-const products = createCollectionQuery<Row>({
-  id: (item) => item.id,
-  async fetch(_criteria, cursor) {
-    const response = await searchStoreProducts({ categoryId, limit: 50, cursor: cursor || undefined });
-    return {
-      items: (response.products ?? []).map(row).filter((item) => !!item.id),
-      nextCursor: response.pagingMetadata?.cursors?.next ?? "",
-      total: response.pagingMetadata?.total,
-    };
-  },
-}, () => { void svc.productsChanged(); });
-
-/** Project the products snapshot onto a state whose category is FOUND. Anything else
- *  (loading, missing, failed) shows no product UI at all. */
-function withProducts(s: S, page: CollectionQueryState<Row> = products.getState()): S {
-  const found = s.found;
-  const items = found ? page.items : [];
-  const loading = page.status === "idle" || page.status === "loading";
-  return {
-    ...s,
-    products: items,
-    productsCursor: found && !page.pageError && !page.loadingMore ? page.nextCursor : "",
-    hideProducts: items.length === 0,
-    hideProductsLoading: !(found && loading && items.length === 0),
-    productsNotErrored: !(found && page.status === "error"),
-    productsNoPageError: !(found && page.pageError),
-    noEmpty: !(found && page.status === "ready" && items.length === 0),
-    productsMessage: !found ? ""
-      : page.status === "error" || page.pageError ? "Products couldn't load. Pull to refresh to try again."
-        : page.status === "ready" && items.length === 0 ? "No products in this category yet." : "",
-  };
-}
-
-const NO_PRODUCTS = { products: [], productsCursor: "", hideProducts: true, hideProductsLoading: true,
-  productsNotErrored: true, productsNoPageError: true, noEmpty: true, productsMessage: "" };
-
-const initial: S = { status: "loading", name: "", subtitle: "", description: "", loadId: 0, ...NO_PRODUCTS, ...presence("loading") };
-
-/** The category header for `id`: V3 category first, V1 collection as the fallback. */
-async function readCategory(id: string): Promise<Pick<S, "name" | "subtitle" | "description">> {
-  try {
-    const c = (await getStoreCategory(id)).category;
-    if (c?.id || c?.name) return { name: c.name || "Category", subtitle: categoryCount(c), description: c.description || "" };
-  } catch { /* fall through to V1 */ }
-  const res = await getCollection(id);
-  const c = (((res as unknown as { collection?: WixCollection }).collection) ?? (res as unknown as WixCollection)) as unknown as {
-    name?: string; numberOfProducts?: number; description?: string;
-  };
-  const n = c.numberOfProducts;
-  return {
-    name: c.name || "Collection",
-    subtitle: n != null ? `${n} ${n === 1 ? "product" : "products"}` : "",
-    description: c.description || "",
-  };
-}
-
-const svc = defineService<S, {
-  load: (s: S) => Promise<S | undefined>;
-  productsChanged: (s: S) => S | undefined;
-  loadMoreProducts: (s: S) => Promise<undefined>;
-  retryProducts: (s: S) => Promise<undefined>;
-}>("spacesCollectionDetail", {
-  state: initial,
-  // A cold boot must not paint another category's products from last run's snapshot.
-  notHydrated: ["products", "productsCursor", "hideProducts", "hideProductsLoading", "productsNotErrored", "productsNoPageError", "noEmpty", "productsMessage", "loadId"],
-  actions: {
-    load: async (s) => {
-      const run = ++loadId;
-      const id = detailInputId();
-      if (!id) return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presence("missing") };
-      let header: Pick<S, "name" | "subtitle" | "description">;
-      try {
-        header = await readCategory(id);
-      } catch (e) {
-        if (run !== loadId) return undefined;
-        return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presenceAfterError(e) };
-      }
-      // A newer load (onAppear after the boot load, pull-to-refresh) owns the screen now.
-      if (run !== loadId) return undefined;
-      categoryId = id;
-      // Starts the first page; its snapshots land through `productsChanged`, which ignores
-      // them until THIS state (stamped `run`) is committed. The "loading" snapshot is read
-      // synchronously below, so the header paints with the products skeleton under it.
-      void products.query({});
-      return withProducts({ ...s, ...header, loadId: run, status: "ready", ...presence("found") });
-    },
-    productsChanged: (s) => (s.loadId === loadId && s.found ? withProducts(s) : undefined),
-    loadMoreProducts: async () => { await products.loadMore(); return undefined; },
-    retryProducts: async () => { await products.retry(); return undefined; },
-  },
-});
-svc.load();
-export { svc };

package/templates/branded-lite/tier5-src/wix-spaces-collection-detail/index.ts

@@ -1,170 +0,0 @@
-// Tier-5 bundle: Wix Spaces clone — Collection detail (ON-DEVICE, site-scoped).
-// Prefer Catalog V3 `getStoreCategory`; V1 `getCollection` 428s on CATALOG_V3 sites.
-//
-// #4155 — the screen showed the category header ("N products") and never the products.
-// Once the category resolves, its products load through `searchStoreProducts({ categoryId })`
-// with the same row shape as `himi-store-shop`, so a category reads as a filtered Shop.
-//
-// Two lifecycles, deliberately kept apart:
-//   • the CATEGORY — presence flags (loading / found / missing / failed), as every detail screen;
-//   • its PRODUCTS — a cursor-paged list (`createCollectionQuery`) with its own loading, failed
-//     and empty states. A product read that fails leaves a FOUND category found: the header
-//     stays and the list offers a retry. It never turns into "Category not found".
-import { defineService } from "@himalaya/state";
-import {
-  categoryCount,
-  getCollection,
-  getStoreCategory,
-  type WixCollection,
-} from "@himalaya/wix-stores-collections";
-import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
-import { createCollectionQuery, type CollectionQueryState } from "../_shared/collection-query.js";
-import { productImage, productPrice, searchStoreProducts, type StoreProduct } from "../_shared/himi-store.js";
-import { cleanTitle, initials } from "../_shared/himi-text.js";
-
-interface Row {
-  id: string;
-  name: string;
-  subtitle: string;
-  image: string;
-  initial: string;
-  hasImage: boolean;
-  noImage: boolean;
-  detailScreenId: string;
-}
-
-interface S extends PresenceFlags {
-  status: "loading" | "ready";
-  name: string;
-  subtitle: string;
-  description: string;
-  /** Which `load` the committed state belongs to — a products snapshot is only ever
-   *  projected onto the category it was fetched for. */
-  loadId: number;
-  products: Row[];
-  /** Load-more cursor — non-empty while another page exists and none is in flight. */
-  productsCursor: string;
-  hideProducts: boolean;
-  hideProductsLoading: boolean;
-  /** Gates the products retry block (the category's own failure is `hideLoadError`). */
-  productsNotErrored: boolean;
-  /** Gates the "next page failed" retry under the list. A failed load-more keeps the rows
-   *  and clears the cursor, so without this the list would just stop and read as complete. */
-  productsNoPageError: boolean;
-  /** One plain line for a screen that has no dedicated empty / error blocks ("" otherwise). */
-  productsMessage: string;
-  /** Gates the "no products in this category" block (screen-kit `emptyBlock` reads `noEmpty`). */
-  noEmpty: boolean;
-}
-
-/** The same row `himi-store-shop` emits, so the screen reuses the Shop tile. */
-function row(p: StoreProduct): Row {
-  const name = cleanTitle(p.name) || "Product";
-  const image = productImage(p);
-  return {
-    id: p.id ?? "",
-    name,
-    subtitle: productPrice(p),
-    image,
-    initial: initials(name),
-    hasImage: !!image,
-    noImage: !image,
-    detailScreenId: "himi_product",
-  };
-}
-
-let categoryId = "";
-let loadId = 0;
-const products = createCollectionQuery<Row>({
-  id: (item) => item.id,
-  async fetch(_criteria, cursor) {
-    const response = await searchStoreProducts({ categoryId, limit: 50, cursor: cursor || undefined });
-    return {
-      items: (response.products ?? []).map(row).filter((item) => !!item.id),
-      nextCursor: response.pagingMetadata?.cursors?.next ?? "",
-      total: response.pagingMetadata?.total,
-    };
-  },
-}, () => { void svc.productsChanged(); });
-
-/** Project the products snapshot onto a state whose category is FOUND. Anything else
- *  (loading, missing, failed) shows no product UI at all. */
-function withProducts(s: S, page: CollectionQueryState<Row> = products.getState()): S {
-  const found = s.found;
-  const items = found ? page.items : [];
-  const loading = page.status === "idle" || page.status === "loading";
-  return {
-    ...s,
-    products: items,
-    productsCursor: found && !page.pageError && !page.loadingMore ? page.nextCursor : "",
-    hideProducts: items.length === 0,
-    hideProductsLoading: !(found && loading && items.length === 0),
-    productsNotErrored: !(found && page.status === "error"),
-    productsNoPageError: !(found && page.pageError),
-    noEmpty: !(found && page.status === "ready" && items.length === 0),
-    productsMessage: !found ? ""
-      : page.status === "error" || page.pageError ? "Products couldn't load. Pull to refresh to try again."
-        : page.status === "ready" && items.length === 0 ? "No products in this category yet." : "",
-  };
-}
-
-const NO_PRODUCTS = { products: [], productsCursor: "", hideProducts: true, hideProductsLoading: true,
-  productsNotErrored: true, productsNoPageError: true, noEmpty: true, productsMessage: "" };
-
-const initial: S = { status: "loading", name: "", subtitle: "", description: "", loadId: 0, ...NO_PRODUCTS, ...presence("loading") };
-
-/** The category header for `id`: V3 category first, V1 collection as the fallback. */
-async function readCategory(id: string): Promise<Pick<S, "name" | "subtitle" | "description">> {
-  try {
-    const c = (await getStoreCategory(id)).category;
-    if (c?.id || c?.name) return { name: c.name || "Category", subtitle: categoryCount(c), description: c.description || "" };
-  } catch { /* fall through to V1 */ }
-  const res = await getCollection(id);
-  const c = (((res as unknown as { collection?: WixCollection }).collection) ?? (res as unknown as WixCollection)) as unknown as {
-    name?: string; numberOfProducts?: number; description?: string;
-  };
-  const n = c.numberOfProducts;
-  return {
-    name: c.name || "Collection",
-    subtitle: n != null ? `${n} ${n === 1 ? "product" : "products"}` : "",
-    description: c.description || "",
-  };
-}
-
-const svc = defineService<S, {
-  load: (s: S) => Promise<S | undefined>;
-  productsChanged: (s: S) => S | undefined;
-  loadMoreProducts: (s: S) => Promise<undefined>;
-  retryProducts: (s: S) => Promise<undefined>;
-}>("spacesCollectionDetail", {
-  state: initial,
-  // A cold boot must not paint another category's products from last run's snapshot.
-  notHydrated: ["products", "productsCursor", "hideProducts", "hideProductsLoading", "productsNotErrored", "productsNoPageError", "noEmpty", "productsMessage", "loadId"],
-  actions: {
-    load: async (s) => {
-      const run = ++loadId;
-      const id = detailInputId();
-      if (!id) return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presence("missing") };
-      let header: Pick<S, "name" | "subtitle" | "description">;
-      try {
-        header = await readCategory(id);
-      } catch (e) {
-        if (run !== loadId) return undefined;
-        return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presenceAfterError(e) };
-      }
-      // A newer load (onAppear after the boot load, pull-to-refresh) owns the screen now.
-      if (run !== loadId) return undefined;
-      categoryId = id;
-      // Starts the first page; its snapshots land through `productsChanged`, which ignores
-      // them until THIS state (stamped `run`) is committed. The "loading" snapshot is read
-      // synchronously below, so the header paints with the products skeleton under it.
-      void products.query({});
-      return withProducts({ ...s, ...header, loadId: run, status: "ready", ...presence("found") });
-    },
-    productsChanged: (s) => (s.loadId === loadId && s.found ? withProducts(s) : undefined),
-    loadMoreProducts: async () => { await products.loadMore(); return undefined; },
-    retryProducts: async () => { await products.retry(); return undefined; },
-  },
-});
-svc.load();
-export { svc };

package/templates/gym-fitness/tier5-src/wix-spaces-collection-detail/index.ts

@@ -1,170 +0,0 @@
-// Tier-5 bundle: Wix Spaces clone — Collection detail (ON-DEVICE, site-scoped).
-// Prefer Catalog V3 `getStoreCategory`; V1 `getCollection` 428s on CATALOG_V3 sites.
-//
-// #4155 — the screen showed the category header ("N products") and never the products.
-// Once the category resolves, its products load through `searchStoreProducts({ categoryId })`
-// with the same row shape as `himi-store-shop`, so a category reads as a filtered Shop.
-//
-// Two lifecycles, deliberately kept apart:
-//   • the CATEGORY — presence flags (loading / found / missing / failed), as every detail screen;
-//   • its PRODUCTS — a cursor-paged list (`createCollectionQuery`) with its own loading, failed
-//     and empty states. A product read that fails leaves a FOUND category found: the header
-//     stays and the list offers a retry. It never turns into "Category not found".
-import { defineService } from "@himalaya/state";
-import {
-  categoryCount,
-  getCollection,
-  getStoreCategory,
-  type WixCollection,
-} from "@himalaya/wix-stores-collections";
-import { presence, presenceAfterError, detailInputId, type PresenceFlags } from "../_shared/detail-presence.js";
-import { createCollectionQuery, type CollectionQueryState } from "../_shared/collection-query.js";
-import { productImage, productPrice, searchStoreProducts, type StoreProduct } from "../_shared/himi-store.js";
-import { cleanTitle, initials } from "../_shared/himi-text.js";
-
-interface Row {
-  id: string;
-  name: string;
-  subtitle: string;
-  image: string;
-  initial: string;
-  hasImage: boolean;
-  noImage: boolean;
-  detailScreenId: string;
-}
-
-interface S extends PresenceFlags {
-  status: "loading" | "ready";
-  name: string;
-  subtitle: string;
-  description: string;
-  /** Which `load` the committed state belongs to — a products snapshot is only ever
-   *  projected onto the category it was fetched for. */
-  loadId: number;
-  products: Row[];
-  /** Load-more cursor — non-empty while another page exists and none is in flight. */
-  productsCursor: string;
-  hideProducts: boolean;
-  hideProductsLoading: boolean;
-  /** Gates the products retry block (the category's own failure is `hideLoadError`). */
-  productsNotErrored: boolean;
-  /** Gates the "next page failed" retry under the list. A failed load-more keeps the rows
-   *  and clears the cursor, so without this the list would just stop and read as complete. */
-  productsNoPageError: boolean;
-  /** One plain line for a screen that has no dedicated empty / error blocks ("" otherwise). */
-  productsMessage: string;
-  /** Gates the "no products in this category" block (screen-kit `emptyBlock` reads `noEmpty`). */
-  noEmpty: boolean;
-}
-
-/** The same row `himi-store-shop` emits, so the screen reuses the Shop tile. */
-function row(p: StoreProduct): Row {
-  const name = cleanTitle(p.name) || "Product";
-  const image = productImage(p);
-  return {
-    id: p.id ?? "",
-    name,
-    subtitle: productPrice(p),
-    image,
-    initial: initials(name),
-    hasImage: !!image,
-    noImage: !image,
-    detailScreenId: "himi_product",
-  };
-}
-
-let categoryId = "";
-let loadId = 0;
-const products = createCollectionQuery<Row>({
-  id: (item) => item.id,
-  async fetch(_criteria, cursor) {
-    const response = await searchStoreProducts({ categoryId, limit: 50, cursor: cursor || undefined });
-    return {
-      items: (response.products ?? []).map(row).filter((item) => !!item.id),
-      nextCursor: response.pagingMetadata?.cursors?.next ?? "",
-      total: response.pagingMetadata?.total,
-    };
-  },
-}, () => { void svc.productsChanged(); });
-
-/** Project the products snapshot onto a state whose category is FOUND. Anything else
- *  (loading, missing, failed) shows no product UI at all. */
-function withProducts(s: S, page: CollectionQueryState<Row> = products.getState()): S {
-  const found = s.found;
-  const items = found ? page.items : [];
-  const loading = page.status === "idle" || page.status === "loading";
-  return {
-    ...s,
-    products: items,
-    productsCursor: found && !page.pageError && !page.loadingMore ? page.nextCursor : "",
-    hideProducts: items.length === 0,
-    hideProductsLoading: !(found && loading && items.length === 0),
-    productsNotErrored: !(found && page.status === "error"),
-    productsNoPageError: !(found && page.pageError),
-    noEmpty: !(found && page.status === "ready" && items.length === 0),
-    productsMessage: !found ? ""
-      : page.status === "error" || page.pageError ? "Products couldn't load. Pull to refresh to try again."
-        : page.status === "ready" && items.length === 0 ? "No products in this category yet." : "",
-  };
-}
-
-const NO_PRODUCTS = { products: [], productsCursor: "", hideProducts: true, hideProductsLoading: true,
-  productsNotErrored: true, productsNoPageError: true, noEmpty: true, productsMessage: "" };
-
-const initial: S = { status: "loading", name: "", subtitle: "", description: "", loadId: 0, ...NO_PRODUCTS, ...presence("loading") };
-
-/** The category header for `id`: V3 category first, V1 collection as the fallback. */
-async function readCategory(id: string): Promise<Pick<S, "name" | "subtitle" | "description">> {
-  try {
-    const c = (await getStoreCategory(id)).category;
-    if (c?.id || c?.name) return { name: c.name || "Category", subtitle: categoryCount(c), description: c.description || "" };
-  } catch { /* fall through to V1 */ }
-  const res = await getCollection(id);
-  const c = (((res as unknown as { collection?: WixCollection }).collection) ?? (res as unknown as WixCollection)) as unknown as {
-    name?: string; numberOfProducts?: number; description?: string;
-  };
-  const n = c.numberOfProducts;
-  return {
-    name: c.name || "Collection",
-    subtitle: n != null ? `${n} ${n === 1 ? "product" : "products"}` : "",
-    description: c.description || "",
-  };
-}
-
-const svc = defineService<S, {
-  load: (s: S) => Promise<S | undefined>;
-  productsChanged: (s: S) => S | undefined;
-  loadMoreProducts: (s: S) => Promise<undefined>;
-  retryProducts: (s: S) => Promise<undefined>;
-}>("spacesCollectionDetail", {
-  state: initial,
-  // A cold boot must not paint another category's products from last run's snapshot.
-  notHydrated: ["products", "productsCursor", "hideProducts", "hideProductsLoading", "productsNotErrored", "productsNoPageError", "noEmpty", "productsMessage", "loadId"],
-  actions: {
-    load: async (s) => {
-      const run = ++loadId;
-      const id = detailInputId();
-      if (!id) return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presence("missing") };
-      let header: Pick<S, "name" | "subtitle" | "description">;
-      try {
-        header = await readCategory(id);
-      } catch (e) {
-        if (run !== loadId) return undefined;
-        return { ...s, ...NO_PRODUCTS, loadId: run, status: "ready", ...presenceAfterError(e) };
-      }
-      // A newer load (onAppear after the boot load, pull-to-refresh) owns the screen now.
-      if (run !== loadId) return undefined;
-      categoryId = id;
-      // Starts the first page; its snapshots land through `productsChanged`, which ignores
-      // them until THIS state (stamped `run`) is committed. The "loading" snapshot is read
-      // synchronously below, so the header paints with the products skeleton under it.
-      void products.query({});
-      return withProducts({ ...s, ...header, loadId: run, status: "ready", ...presence("found") });
-    },
-    productsChanged: (s) => (s.loadId === loadId && s.found ? withProducts(s) : undefined),
-    loadMoreProducts: async () => { await products.loadMore(); return undefined; },
-    retryProducts: async () => { await products.retry(); return undefined; },
-  },
-});
-svc.load();
-export { svc };