@almadar/std 4.0.0 → 5.1.0

package/dist/behaviors/index.js

@@ -728,19 +728,14 @@ function buildTrait(c) {
   const actionEvents = /* @__PURE__ */ new Set();
   for (const a of c.headerActions) actionEvents.add(a.event);
   for (const a of c.itemActions) actionEvents.add(a.event);
-  for (const re of c.refreshEvents) actionEvents.add(re);
   const events = [
     { key: "INIT", name: "Initialize" },
     ...Array.from(actionEvents).map((e) => {
       const needsId = c.itemActions.some((a) => a.event === e);
-      const isRefresh = c.refreshEvents.includes(e);
-      if (isRefresh) {
-        return { key: e, name: e, payload: [{ name: "data", type: "object", required: true }] };
-      }
       return needsId ? { key: e, name: e, payload: [{ name: "id", type: "string", required: true }, { name: "row", type: "object" }] } : { key: e, name: e };
     })
   ];
-  const listensDecl = c.refreshEvents.length > 0 ? c.refreshEvents.map((evt) => ({ event: evt, triggers: evt })) : void 0;
+  const listensDecl = c.refreshEvents.length > 0 ? c.refreshEvents.map((evt) => ({ event: evt, triggers: "INIT" })) : void 0;
   return {
     name: c.traitName,
     linkedEntity: entityName,
@@ -777,14 +772,7 @@ function buildTrait(c) {
               ]
             }]
           ]
-        },
-        // Refresh self-loops: when modal atoms fire SAVE etc., re-fetch data
-        ...c.refreshEvents.map((evt) => ({
-          from: "browsing",
-          to: "browsing",
-          event: evt,
-          effects: [["ref", entityName]]
-        }))
+        }
       ]
     }
   };
@@ -842,6 +830,8 @@ function resolve2(params) {
       }
     ]
   };
+  const saveEvent = params.saveEvent ?? "SAVE";
+  const emitOnSave = params.emitOnSave ?? saveEvent;
   return {
     entityName,
     fields,
@@ -855,9 +845,9 @@ function resolve2(params) {
     openPayload: params.openPayload ?? [],
     closeEvent: params.closeEvent ?? "CLOSE",
     openEffects: params.openEffects ?? [],
-    saveEvent: params.saveEvent ?? null,
+    saveEvent,
     saveEffects: params.saveEffects ?? [],
-    emitOnSave: params.emitOnSave ?? null,
+    emitOnSave,
     standalone: params.standalone ?? true,
     pageName: params.pageName ?? `${entityName}ModalPage`,
     pagePath: params.pagePath ?? `/${p.toLowerCase()}/modal`,
@@ -871,11 +861,9 @@ function buildTrait2(c) {
   const events = [
     { key: "INIT", name: "Initialize" },
     { key: c.openEvent, name: "Open", ...c.openPayload.length > 0 ? { payload: c.openPayload } : {} },
-    { key: c.closeEvent, name: "Close" }
+    { key: c.closeEvent, name: "Close" },
+    { key: c.saveEvent, name: "Save", payload: [{ name: "data", type: "object", required: true }] }
   ];
-  if (c.saveEvent) {
-    events.push({ key: c.saveEvent, name: "Save", payload: [{ name: "data", type: "object", required: true }] });
-  }
   const transitions = [
     // INIT: closed → closed
     {
@@ -928,41 +916,44 @@ function buildTrait2(c) {
       }]] : []
     ] }
   ];
-  if (c.saveEvent) {
-    const mainRefresh = c.standalone ? [["ref", c.entityName], ["render-ui", "main", {
-      type: "stack",
-      direction: "vertical",
-      gap: "lg",
-      children: [
-        { type: "stack", direction: "horizontal", gap: "md", justify: "space-between", children: [
-          { type: "stack", direction: "horizontal", gap: "md", children: [
-            { type: "icon", name: c.headerIcon, size: "lg" },
-            { type: "typography", content: c.modalTitle, variant: "h2" }
-          ] },
-          { type: "button", label: "Open", event: c.openEvent, variant: "primary", icon: c.headerIcon }
+  const mainRefresh = c.standalone ? [["ref", c.entityName], ["render-ui", "main", {
+    type: "stack",
+    direction: "vertical",
+    gap: "lg",
+    children: [
+      { type: "stack", direction: "horizontal", gap: "md", justify: "space-between", children: [
+        { type: "stack", direction: "horizontal", gap: "md", children: [
+          { type: "icon", name: c.headerIcon, size: "lg" },
+          { type: "typography", content: c.modalTitle, variant: "h2" }
         ] },
-        { type: "divider" },
-        { type: "empty-state", icon: c.headerIcon, title: "Nothing open", description: "Click Open to view details in a modal overlay." }
-      ]
-    }]] : [];
-    transitions.push({
-      from: "open",
-      to: "closed",
-      event: c.saveEvent,
-      effects: [
-        ...c.saveEffects,
-        ["render-ui", "modal", null],
-        // Emit after persist succeeds so browse traits can fetch fresh data
-        ...c.emitOnSave ? [["emit", c.emitOnSave]] : [],
-        ...mainRefresh
-      ]
-    });
-  }
+        { type: "button", label: "Open", event: c.openEvent, variant: "primary", icon: c.headerIcon }
+      ] },
+      { type: "divider" },
+      { type: "empty-state", icon: c.headerIcon, title: "Nothing open", description: "Click Open to view details in a modal overlay." }
+    ]
+  }]] : [];
+  transitions.push({
+    from: "open",
+    to: "closed",
+    event: c.saveEvent,
+    effects: [
+      ...c.saveEffects,
+      ["render-ui", "modal", null],
+      // Emit after persist succeeds so browse traits can fetch fresh data.
+      // Skip the emit when emitOnSave equals saveEvent — that's a self-emit
+      // that the runtime would short-circuit anyway, and avoids double
+      // dispatch on every save.
+      ...c.emitOnSave !== c.saveEvent ? [["emit", c.emitOnSave]] : [],
+      ...mainRefresh
+    ]
+  });
   return {
     name: c.traitName,
     linkedEntity: c.entityName,
     category: "interaction",
-    ...c.emitOnSave ? { emits: [{ event: c.emitOnSave }] } : {},
+    // Phase F.10: emits[] is always populated (default emitOnSave = saveEvent).
+    // If a molecule supplies a distinct emitOnSave, declare both events.
+    emits: c.emitOnSave === c.saveEvent ? [{ event: c.saveEvent }] : [{ event: c.saveEvent }, { event: c.emitOnSave }],
     stateMachine: {
       states: [{ name: "closed", isInitial: true }, { name: "open" }],
       events,
@@ -991,6 +982,8 @@ function resolve3(params) {
   const fields = ensureIdField(params.fields);
   const nonIdFields = fields.filter((f) => f.name !== "id");
   const p = plural(entityName);
+  const confirmEvent = params.confirmEvent ?? "CONFIRM";
+  const emitOnConfirm = params.emitOnConfirm ?? confirmEvent;
   return {
     entityName,
     fields,
@@ -1004,9 +997,9 @@ function resolve3(params) {
     cancelLabel: params.cancelLabel ?? "Cancel",
     headerIcon: params.headerIcon ?? "shield-check",
     requestEvent: params.requestEvent ?? "REQUEST",
-    confirmEvent: params.confirmEvent ?? "CONFIRM",
+    confirmEvent,
     confirmEffects: params.confirmEffects ?? [],
-    emitOnConfirm: params.emitOnConfirm ?? null,
+    emitOnConfirm,
     standalone: params.standalone ?? true,
     pageName: params.pageName ?? `${entityName}ConfirmPage`,
     pagePath: params.pagePath ?? `/${p.toLowerCase()}/confirm`,
@@ -1086,7 +1079,9 @@ function buildTrait3(c) {
     name: c.traitName,
     linkedEntity: entityName,
     category: "interaction",
-    ...c.emitOnConfirm ? { emits: [{ event: c.emitOnConfirm }] } : {},
+    // Phase F.10: emits[] always populated. When emitOnConfirm equals
+    // confirmEvent, declare just the one. When they differ, declare both.
+    emits: c.emitOnConfirm === c.confirmEvent ? [{ event: c.confirmEvent }] : [{ event: c.confirmEvent }, { event: c.emitOnConfirm }],
     stateMachine: {
       states: [
         { name: "idle", isInitial: true },
@@ -1123,7 +1118,9 @@ function buildTrait3(c) {
           effects: [
             ...c.confirmEffects,
             ...dismissAndRefresh,
-            ...c.emitOnConfirm ? [["emit", c.emitOnConfirm]] : []
+            // Skip self-emit when emitOnConfirm == confirmEvent (the runtime
+            // would short-circuit anyway).
+            ...c.emitOnConfirm !== c.confirmEvent ? [["emit", c.emitOnConfirm]] : []
           ]
         },
         {
@@ -8982,6 +8979,7 @@ function stdList(params) {
   const UPPER = entityName.replace(/([a-z])([A-Z])/g, "$1_$2").toUpperCase();
   const CREATED = `${UPPER}_CREATED`;
   const UPDATED = `${UPPER}_UPDATED`;
+  const DELETED = `${UPPER}_DELETED`;
   const browseTrait = extractTrait(stdBrowse({
     entityName,
     fields,
@@ -9002,7 +9000,7 @@ function stdList(params) {
       { label: "Edit", event: "EDIT" },
       { label: "Delete", event: "DELETE", variant: "danger" }
     ],
-    refreshEvents: [CREATED, UPDATED]
+    refreshEvents: [CREATED, UPDATED, DELETED]
   }));
   const createTrait = extractTrait(stdModal({
     standalone: false,
@@ -9048,62 +9046,20 @@ function stdList(params) {
     closeEvent: "CLOSE",
     openEffects: [["fetch", entityName, { id: "@payload.id" }]]
   }));
-  const sm = browseTrait.stateMachine;
-  sm.states.push({ name: "deleting" });
-  const deleteEvent = sm.events.find((e) => e.key === "DELETE");
-  if (deleteEvent && !deleteEvent.payload) {
-    deleteEvent.payload = [{ name: "id", type: "string" }, { name: "row", type: "object" }];
-  }
-  const existingKeys = new Set(sm.events.map((e) => e.key));
-  if (!existingKeys.has("CONFIRM_DELETE")) sm.events.push({ key: "CONFIRM_DELETE", name: "Confirm Delete" });
-  if (!existingKeys.has("CANCEL")) sm.events.push({ key: "CANCEL", name: "Cancel" });
-  if (!existingKeys.has("CLOSE")) sm.events.push({ key: "CLOSE", name: "Close" });
-  const initTransition = sm.transitions[0];
-  const initRenderEffect = initTransition.effects.find(
-    (e) => Array.isArray(e) && e[0] === "render-ui" && e[1] === "main"
-  );
-  const browseMainView = initRenderEffect ? initRenderEffect[2] : null;
-  sm.transitions.push(
-    // DELETE: browsing → deleting (fetch entity by ID, show confirmation modal)
-    { from: "browsing", to: "deleting", event: "DELETE", effects: [
-      ["fetch", entityName, { id: "@payload.id" }],
-      ["render-ui", "modal", {
-        type: "stack",
-        direction: "vertical",
-        gap: "md",
-        children: [
-          { type: "stack", direction: "horizontal", gap: "sm", children: [
-            { type: "icon", name: "trash-2", size: "md" },
-            { type: "typography", content: `Delete ${entityName}`, variant: "h3" }
-          ] },
-          { type: "divider" },
-          { type: "typography", content: `@entity.${c.nonIdFields[0]?.name ?? "name"}`, variant: "h4" },
-          { type: "typography", content: c.deleteMessage, variant: "body" },
-          { type: "stack", direction: "horizontal", gap: "sm", justify: "end", children: [
-            { type: "button", label: "Cancel", event: "CANCEL", variant: "ghost" },
-            { type: "button", label: "Delete", event: "CONFIRM_DELETE", variant: "danger", icon: "trash" }
-          ] }
-        ]
-      }]
-    ] },
-    // CONFIRM_DELETE: deleting → browsing (persist delete, dismiss modal, re-render main)
-    { from: "deleting", to: "browsing", event: "CONFIRM_DELETE", effects: [
-      ["persist", "delete", entityName, "@entity.id"],
-      ["render-ui", "modal", null],
-      ["render-ui", "main", browseMainView]
-    ] },
-    // CANCEL/CLOSE from deleting (dismiss modal, re-render main)
-    { from: "deleting", to: "browsing", event: "CANCEL", effects: [
-      ["render-ui", "modal", null],
-      ["fetch", entityName],
-      ["render-ui", "main", browseMainView]
-    ] },
-    { from: "deleting", to: "browsing", event: "CLOSE", effects: [
-      ["render-ui", "modal", null],
-      ["fetch", entityName],
-      ["render-ui", "main", browseMainView]
-    ] }
-  );
+  const deleteTrait = extractTrait(stdConfirmation({
+    standalone: false,
+    entityName,
+    fields,
+    traitName: `${entityName}Delete`,
+    confirmTitle: `Delete ${entityName}`,
+    confirmMessage: c.deleteMessage,
+    confirmLabel: "Delete",
+    headerIcon: "trash-2",
+    requestEvent: "DELETE",
+    confirmEvent: "CONFIRM_DELETE",
+    confirmEffects: [["persist", "delete", entityName, "@entity.pendingId"]],
+    emitOnConfirm: DELETED
+  }));
   const entity = makeEntity({ name: entityName, fields, persistence: c.persistence, collection: c.collection });
   const page = {
     name: c.pageName,
@@ -9113,13 +9069,14 @@ function stdList(params) {
       { ref: browseTrait.name },
       { ref: createTrait.name },
       { ref: editTrait.name },
-      { ref: viewTrait.name }
+      { ref: viewTrait.name },
+      { ref: deleteTrait.name }
     ]
   };
   return {
     name: `${entityName}Orbital`,
     entity,
-    traits: [browseTrait, createTrait, editTrait, viewTrait],
+    traits: [browseTrait, createTrait, editTrait, viewTrait, deleteTrait],
     pages: [page]
   };
 }
@@ -9607,17 +9564,9 @@ function stdInventory(params) {
     headerIcon: "trash-2",
     requestEvent: "DROP",
     confirmEvent: "CONFIRM_DROP",
-    confirmEffects: [["persist", "delete", entityName, "@payload.id"]],
+    confirmEffects: [["persist", "delete", entityName, "@entity.pendingId"]],
     emitOnConfirm: "CONFIRM_DROP"
   }));
-  const dropSm = dropTrait.stateMachine;
-  if (dropSm && "events" in dropSm) {
-    const events = dropSm.events;
-    const confirmDropEvt = events.find((e) => e.key === "CONFIRM_DROP");
-    if (confirmDropEvt && !confirmDropEvt.payload) {
-      confirmDropEvt.payload = [{ name: "id", type: "string", required: true }];
-    }
-  }
   const instances = [
     { id: "item-1", name: "Health Potion", description: "Restores 50 HP", status: "active", pendingId: "" },
     { id: "item-2", name: "Iron Sword", description: "A sturdy blade", status: "active", pendingId: "" },