@wix/himalaya-cli 0.1039.0 → 0.1041.0

package/templates/retail-store-owner/tier5-src/himi-owner-lite-drawer/index.ts

@@ -7,75 +7,61 @@
 // attention today — and none of that is knowable when the config is authored.
 //
 // Hosting the panel lets the worker answer it at runtime: the live site, per-site
-// counts on the rows that have them, and a "needs attention" line that simply is
-// not there when the count is zero.
+// counts on the rows that have them, and a "needs attention" section that simply
+// is not there when nothing is waiting.
+//
+// The derived fields (initials, the attention total and header, each row's badge
+// and spoken label, the clear-confirmation flags) live in ./logic.ts so they are
+// unit-tested and can only ever agree with each other.
 //
 // Build: node core/dev-server/tier5-bundles-src/build-all.mjs himi-owner-lite-drawer
 //   → core/dev-server/tier5-bundles/himi-owner-lite-drawer.bundle.js
 
 import { defineService } from "@himalaya/state";
 import { serializeForAgent } from "@himalaya/agent";
+import { activeScreenFromInput, attentionRow, navRow, withDerived, type DrawerState } from "./logic.js";
 
-interface Row {
-  id: string;
-  title: string;
-  icon: string;
-  screenId: string;
-  /** Rendered only when non-empty — an owner does not need a "0". */
-  badge: string;
-}
-
-interface DrawerState {
-  siteName: string;
-  siteInitials: string;
-  nav: Row[];
-  /** Rows an owner should look at today; empty ⇒ the section renders nothing. */
-  attention: Row[];
-  attentionLabel: string;
-  /** TRUE when there is nothing to chase. Feeds `hiddenPath`, which hides on a
-   *  TRUTHY value — so the flag is phrased negatively on purpose. */
-  noAttention: boolean;
-}
-
-const nav = (id: string, title: string, icon: string, screenId: string, badge = ""): Row =>
-  ({ id, title, icon, screenId, badge });
-
-/** Recompute the derived attention summary from the rows. */
-function withAttention(s: Omit<DrawerState, "attentionLabel" | "noAttention">): DrawerState {
-  const n = s.attention.length;
-  return {
-    ...s,
-    noAttention: n === 0,
-    attentionLabel: n === 0 ? "All caught up" : `${n} need${n === 1 ? "s" : ""} attention`,
-  };
-}
+/** The shell passes the screen it is showing as worker input, so the drawer can mark
+ *  that destination selected the way the declarative drawer does. */
+const hostActiveScreen = () => activeScreenFromInput((globalThis as { himalaya?: { input?: unknown } }).himalaya?.input);
 
 const drawer = defineService<DrawerState, {
-  /** Re-read the live site + counts. */
-  refresh: (s: DrawerState) => DrawerState;
-  /** Clear the attention list — proves the section disappears, not just empties. */
+  /** Re-read the active screen from host input (root onAppear). An explicit
+   *  `{ screenId }` wins, for a host that pushes the change instead. */
+  syncActive: (s: DrawerState, args?: { screenId?: string }) => DrawerState;
+  /** First tap on "Mark all handled": ask before hiding anything. */
+  askClearAttention: (s: DrawerState) => DrawerState;
+  /** The owner backed out of the confirmation. */
+  cancelClearAttention: (s: DrawerState) => DrawerState;
+  /** Confirmed: clear the attention list — the section disappears, not just empties. */
   clearAttention: (s: DrawerState) => DrawerState;
 }>("drawer", {
-  state: withAttention({
+  state: withDerived({
     siteName: "My Site",
-    siteInitials: "MS",
     nav: [
-      nav("drawer_home", "Home", "home", "himi_owner_lite_home"),
+      navRow("drawer_home", "Home", "home", "himi_owner_lite_home"),
       // Between Home and Manage deliberately: analytics answers "how is the
       // business doing", which sits with the dashboard, not with the per-entity
       // management areas below it.
-      nav("drawer_analytics", "Analytics", "chart", "himi_owner_lite_analytics"),
-      nav("drawer_manage", "Manage", "grid", "himi_owner_lite_manage"),
-      nav("drawer_account", "Account", "person", "himi_owner_lite_account"),
+      navRow("drawer_analytics", "Analytics", "chart", "himi_owner_lite_analytics"),
+      navRow("drawer_manage", "Manage", "grid", "himi_owner_lite_manage"),
+      navRow("drawer_account", "Account", "person", "himi_owner_lite_account"),
     ],
     attention: [
-      nav("att_orders", "Orders", "cart", "himi_owner_lite_orders", "3"),
-      nav("att_appts", "Appointments", "calendar", "himi_owner_lite_appointments", "1"),
+      attentionRow("att_orders", "Orders", "cart", "himi_owner_lite_orders", 3),
+      attentionRow("att_appts", "Appointments", "calendar", "himi_owner_lite_appointments", 1),
     ],
+    confirmingClear: false,
+    activeScreenId: hostActiveScreen(),
   }),
   actions: {
-    refresh: (s) => snap(withAttention({ ...s, attention: [...s.attention] })),
-    clearAttention: (s) => snap(withAttention({ ...s, attention: [] })),
+    syncActive: (s, args) => snap(withDerived({
+      ...s,
+      activeScreenId: typeof args?.screenId === "string" ? args.screenId : hostActiveScreen(),
+    })),
+    askClearAttention: (s) => snap(withDerived({ ...s, confirmingClear: true })),
+    cancelClearAttention: (s) => snap(withDerived({ ...s, confirmingClear: false })),
+    clearAttention: (s) => snap(withDerived({ ...s, attention: [], confirmingClear: false })),
   },
 });
 

package/templates/retail-store-owner/tier5-src/himi-owner-lite-drawer/logic.ts

@@ -0,0 +1,102 @@
+// himi-owner-lite DRAWER — pure derivations, kept out of index.ts so they are
+// unit-testable without booting a worker.
+//
+// Everything a reader of the panel compares lives here, so the pieces can only ever
+// agree: the header counts ITEMS summed from the same numbers the badges show (it
+// used to count rows, and read "2 need attention" over badges of 3 and 1), and each
+// row's spoken label is built from those same numbers.
+
+export interface Row {
+  id: string;
+  title: string;
+  /** Design-system icon name for the row's leading glyph. */
+  icon: string;
+  screenId: string;
+  /** Items waiting on this row; 0 for a plain destination. */
+  count: number;
+  /** The badge text — the count, or "" (a destination shows no badge). */
+  badge: string;
+  /** The badge read on its own, for a screen reader that keeps a labelled row's
+   *  children reachable (iOS): "3 need attention". "" when there is no badge. */
+  badgeLabel: string;
+  /** What a screen reader announces for the whole row. */
+  a11yLabel: string;
+  /** This row is the screen the owner is on. Only destinations can be. */
+  selected: boolean;
+  /** `!selected`, for `hiddenPath` (which hides on a TRUTHY value). */
+  notSelected: boolean;
+}
+
+/** The authored part of the state; everything else is derived by `withDerived`. */
+export interface DrawerCore {
+  siteName: string;
+  nav: Row[];
+  attention: Row[];
+  /** The owner tapped "Mark all handled" and has not confirmed or cancelled yet. */
+  confirmingClear: boolean;
+  /** The screen the shell is showing, passed in as worker input; "" when unknown. */
+  activeScreenId: string;
+}
+
+export interface DrawerState extends DrawerCore {
+  siteInitials: string;
+  attentionTotal: number;
+  attentionLabel: string;
+  /** TRUE when there is nothing to chase. Feeds `hiddenPath`, which hides on a
+   *  TRUTHY value — so the flag is phrased negatively on purpose. */
+  noAttention: boolean;
+  /** Hides the inline confirmation (same negative phrasing, same reason). */
+  noConfirmClear: boolean;
+  /** The confirmation question, naming how much will be hidden. */
+  clearPrompt: string;
+}
+
+const needs = (n: number) => `${n} need${n === 1 ? "s" : ""} attention`;
+
+export const navRow = (id: string, title: string, icon: string, screenId: string): Row =>
+  ({ id, title, icon, screenId, count: 0, badge: "", badgeLabel: "", a11yLabel: title, selected: false, notSelected: true });
+
+export const attentionRow = (id: string, title: string, icon: string, screenId: string, count: number): Row => {
+  const n = Math.max(0, Math.floor(count));
+  return { id, title, icon, screenId, count: n, badge: n > 0 ? String(n) : "", badgeLabel: n > 0 ? needs(n) : "", a11yLabel: n > 0 ? `${title}, ${needs(n)}` : title, selected: false, notSelected: true };
+};
+
+/** Up to two initials from the site name: "Pottery Studio" → "PS". */
+export function initialsOf(name: string): string {
+  const words = name.trim().split(/\s+/).filter(Boolean);
+  if (words.length === 0) return "?";
+  return words.slice(0, 2).map((w) => [...w][0]!.toUpperCase()).join("");
+}
+
+/** Recompute every derived field. Rows with nothing waiting are dropped, so a
+ *  cleared or all-zero section hides instead of listing zeros. */
+export function withDerived(core: DrawerCore): DrawerState {
+  const attention = core.attention.filter((row) => row.count > 0);
+  const active = core.activeScreenId;
+  const nav = core.nav.map((row) => {
+    const selected = active !== "" && row.screenId === active;
+    return { ...row, selected, notSelected: !selected };
+  });
+  const total = attention.reduce((sum, row) => sum + row.count, 0);
+  const confirmingClear = core.confirmingClear && total > 0;
+  return {
+    ...core,
+    nav,
+    attention,
+    confirmingClear,
+    siteInitials: initialsOf(core.siteName),
+    attentionTotal: total,
+    attentionLabel: total === 0
+      ? "All caught up"
+      : `${total} item${total === 1 ? "" : "s"} ${total === 1 ? "needs" : "need"} attention`,
+    noAttention: total === 0,
+    noConfirmClear: !confirmingClear,
+    clearPrompt: total === 1 ? "Hide this reminder?" : `Hide these ${total} reminders?`,
+  };
+}
+
+/** The active screen from the worker's host input (`himalaya.input.activeScreenId`). */
+export function activeScreenFromInput(input: unknown): string {
+  const v = (input as { activeScreenId?: unknown } | undefined)?.activeScreenId;
+  return typeof v === "string" ? v : "";
+}

package/templates/retail-store-owner/tier5-src/himi-owner-lite-post-form/index.ts

@@ -9,7 +9,7 @@ import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
 import { defineService } from "@himalaya/state";
 import { getDraftPost, createDraftPost, updateDraftPost, type WixDraftPostWrite, type WixRichContent } from "@himalaya/wix-blog";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
-import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
+import { DEMO_POSTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 
@@ -127,6 +127,12 @@ function shape(s: Partial<PostFormState>): PostFormState {
 
 const startMode: Mode = initialInput.mode === "edit" || initialInput.id ? "edit" : "create";
 
+
+/** A demo-preview write refusal: see demoRefusalPatch (a mode, not an error). */
+function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
+  return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
+}
+
 const svc = defineService<PostFormState, {
   load: (s: PostFormState, arg?: unknown) => Promise<PostFormState>;
   setCover: (s: PostFormState, arg?: unknown) => PostFormState;
@@ -140,7 +146,7 @@ const svc = defineService<PostFormState, {
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
       // fallback. An id ⇒ edit; no id anywhere ⇒ the create shell.
       const id = navInputId() || idFrom(arg, s.id);
-      if (!id) return shape({ ...s, mode: "create", id: "", status: "idle", error: "" });
+      if (!id) return shape({ ...s, mode: "create", id: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_POSTS.find((x) => x.id === id);
           if (d) {
@@ -203,7 +209,7 @@ const svc = defineService<PostFormState, {
       return shape({ ...s, coverUrl, error: "" });
     },
     submit: async (s, values) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const title = String(v.title ?? s.title).trim();
       const excerpt = String(v.excerpt ?? s.excerpt).trim();
@@ -272,7 +278,7 @@ const svc = defineService<PostFormState, {
           // Demo / web-preview (no owner bridge; the record came from demo sample
           // data, marked by demoNote): a queued write could never replay, so answer
           // with the demo save note instead of the real-offline write-behind.
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          if (s.demoNote) return demoRefusal(s);
           // Real device offline: cache and queue the edit for reconnect.
           await cachePut(localRow(localId));
           await queueWrite("tier5.himiOwnerLitePostForm.submit", { id: targetId, title, excerpt, body, coverUrl, coverChanged: String(coverChanged), preserveBody: String(preserveBody), isFeatured: String(isFeatured), mode: editing ? "edit" : "create" });

package/templates/retail-store-owner/tier5-src/himi-owner-lite-product-form/index.ts

@@ -18,7 +18,7 @@ import {
 import { get as dbGet, upsert as dbUpsert, remove as dbRemove, enqueue as dbEnqueue, type DbEntity } from "../_shared/owner-local-db.js";
 import { plainText } from "../_shared/himi-store.js";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
-import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE } from "../_shared/owner-preview-demo.js";
+import { DEMO_PRODUCTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch, editablePrice } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
 
 type Mode = "create" | "edit";
@@ -95,9 +95,14 @@ function boolString(value: unknown, fallback: string): string {
 // fall back to the raw numeric if the formatted string is missing.
 function priceOf(p: WixProduct): string {
   const pr = (p as any).price;
-  return (pr?.formatted?.price || (pr?.price != null ? String(pr.price) : "")) as string;
+  // The field is EDITABLE and renderer-validated as an amount, so prefill the
+  // raw number — never the display string ("€10.00"), which would fail the rule
+  // and disable Save before the owner typed anything.
+  if (typeof pr?.price === "number" && Number.isFinite(pr.price)) return pr.price.toFixed(2);
+  return editablePrice(String(pr?.formatted?.price ?? pr?.price ?? ""));
 }
 
+
 function shape(s: Partial<ProductFormState>): ProductFormState {
   const mode: Mode = s.mode ?? "create";
   const id = typeof s.id === "string" ? s.id : "";
@@ -128,6 +133,12 @@ function shape(s: Partial<ProductFormState>): ProductFormState {
 
 const startMode: Mode = initialInput.mode === "edit" || initialInput.id ? "edit" : "create";
 
+
+/** A demo-preview write refusal: see demoRefusalPatch (a mode, not an error). */
+function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
+  return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
+}
+
 const svc = defineService<ProductFormState, {
   load: (s: ProductFormState, arg?: unknown) => Promise<ProductFormState>;
   submit: (s: ProductFormState, values?: Record<string, unknown>) => Promise<ProductFormState>;
@@ -141,13 +152,13 @@ const svc = defineService<ProductFormState, {
       // bakes no id/mode); the onAppear `id` param is the #570 suffixed-build
       // fallback. An id ⇒ edit; no id anywhere ⇒ the create shell.
       const id = navInputId() || idFrom(arg, s.id);
-      if (!id) return shape({ ...s, mode: "create", id: "", status: "idle", error: "" });
+      if (!id) return shape({ ...s, mode: "create", id: "", status: "idle", error: "", demoNote: isOwnerPreviewDemo() ? copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) : "" });
       if (isOwnerPreviewDemo()) {
           const d = DEMO_PRODUCTS.find((p) => p.id === id);
           if (d) {
             return shape({
               ...s, mode: "edit", id, heading: copyParam("ownerProductForm.headingEdit", "Edit product"),
-              name: d.name, price: d.price.replace(/[^\d.]/g, ""), sku: d.sku, description: d.description,
+              name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -178,7 +189,7 @@ const svc = defineService<ProductFormState, {
         if (cached) {
           return shape({
             ...s, mode: "edit", id, heading: "Edit product",
-            name: String(cached.name ?? ""), price: String(cached.price ?? ""), sku: String(cached.sku ?? ""),
+            name: String(cached.name ?? ""), price: editablePrice(String(cached.price ?? "")), sku: String(cached.sku ?? ""),
             visible: cached.visible === "false" ? "false" : "true",
             status: "idle", error: "", savedMessage: "",
           });
@@ -188,7 +199,7 @@ const svc = defineService<ProductFormState, {
           if (d) {
             return shape({
               ...s, mode: "edit", id, heading: copyParam("ownerProductForm.headingEdit", "Edit product"),
-              name: d.name, price: d.price.replace(/[^\d.]/g, ""), sku: d.sku, description: d.description,
+              name: d.name, price: editablePrice(d.price), sku: d.sku, description: d.description,
               visible: d.visible ? "true" : "false",
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
@@ -198,17 +209,22 @@ const svc = defineService<ProductFormState, {
       }
     },
     submit: async (s, values) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const name = String(v.name ?? s.name).trim();
-      const price = String(v.price ?? s.price).trim();
+      const rawPrice = String(v.price ?? s.price).trim();
+      // "12,50" (comma-decimal keypad) is accepted and written as 12.50.
+      const price = editablePrice(rawPrice);
       const sku = String(v.sku ?? s.sku).trim();
       const description = String(v.description ?? s.description).trim();
       const visible = boolString(v.visible, s.visible) === "true";
       if (!name) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.nameRequired", "Name is required"), savedMessage: "" });
       const priceNum = Number(price);
-      if (!price || !Number.isFinite(priceNum)) {
-        return shape({ ...s, name, price, sku, description, visible: visible ? "true" : "false", status: "error", error: copyParam("ownerProductForm.priceInvalid", "Enter a valid price (a number)."), savedMessage: "" });
+      // The renderer already blocks these (declarative `validation`); this is the
+      // worker's own guard for a host or queue replay that skips it. Checked on the
+      // RAW value, so "-5" is refused rather than normalized into "5".
+      if (!/^\d+([.,]\d{1,2})?$/.test(rawPrice) || !Number.isFinite(priceNum)) {
+        return shape({ ...s, name, price, sku, description, visible: visible ? "true" : "false", status: "error", error: copyParam("ownerProductForm.priceInvalid", "Enter a price of 0 or more."), savedMessage: "" });
       }
 
       const write: WixProductWrite = {
@@ -254,7 +270,7 @@ const svc = defineService<ProductFormState, {
           // Demo / web-preview (no owner bridge; the record came from DEMO_PRODUCTS,
           // marked by demoNote): a queued write could never replay, so answer with
           // the demo save note instead of the real-offline write-behind.
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          if (s.demoNote) return demoRefusal(s);
           // Real device offline: the optimistic cache row already shows; queue the
           // write to replay (WriteQueue, idempotent) when connectivity returns.
           await queueWrite("tier5.himiOwnerLiteProductForm.submit", { id: s.id, name, price, sku, visible: String(visible), mode: s.mode });
@@ -269,7 +285,7 @@ const svc = defineService<ProductFormState, {
       }
     },
     remove: async (s) => {
-      if (isOwnerPreviewDemo() || s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE) });
+      if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerProductForm.errorNoDelete", "No product to delete."), savedMessage: "" });
       // Optimistic local delete — the list drops the row immediately.
       await cacheDrop(s.id);
@@ -278,7 +294,7 @@ const svc = defineService<ProductFormState, {
         return shape({ ...s, id: "", status: "saved", error: "", savedMessage: copyParam("ownerProductForm.deletedMessage", "Product deleted."), savedId: "" });
       } catch (e) {
         if (shouldQueueOwnerWrite(e)) {
-          if (s.demoNote) return shape({ ...s, status: "error", error: copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE), savedMessage: "" });
+          if (s.demoNote) return demoRefusal(s);
           await queueWrite("tier5.himiOwnerLiteProductForm.remove", { id: s.id });
           return shape({ ...s, id: "", status: "saved", error: "", savedMessage: copyParam("ownerProductForm.deletedOffline", "Deleted offline — will sync when you reconnect."), savedId: "" });
         }