@rotorsoft/act 0.23.2 → 0.24.1

package/dist/index.js

@@ -1483,15 +1483,35 @@ function registerState(state2, states, actions, events) {
     }
     for (const name of Object.keys(state2.events)) {
       if (existing.events[name] === state2.events[name]) continue;
+      if (existing.events[name]) continue;
       if (events[name]) throw new Error(`Duplicate event "${name}"`);
     }
+    const mergedPatch = { ...existing.patch };
+    for (const name of Object.keys(state2.patch)) {
+      const existingP = existing.patch[name];
+      const incomingP = state2.patch[name];
+      if (!existingP) {
+        mergedPatch[name] = incomingP;
+      } else {
+        const existingIsDefault = existingP._passthrough;
+        const incomingIsDefault = incomingP._passthrough;
+        if (!existingIsDefault && !incomingIsDefault && existingP !== incomingP) {
+          throw new Error(
+            `Duplicate custom patch for event "${name}" in state "${state2.name}"`
+          );
+        }
+        if (existingIsDefault && !incomingIsDefault) {
+          mergedPatch[name] = incomingP;
+        }
+      }
+    }
     const merged = {
       ...existing,
       state: mergeSchemas(existing.state, state2.state, state2.name),
       init: mergeInits(existing.init, state2.init),
       events: { ...existing.events, ...state2.events },
       actions: { ...existing.actions, ...state2.actions },
-      patch: { ...existing.patch, ...state2.patch },
+      patch: mergedPatch,
       on: { ...existing.on, ...state2.on },
       given: { ...existing.given, ...state2.given },
       snap: state2.snap || existing.snap
@@ -1772,10 +1792,11 @@ function state(entry) {
       return {
         emits(events) {
           const defaultPatch = Object.fromEntries(
-            Object.keys(events).map((k) => [
-              k,
-              ({ data }) => data
-            ])
+            Object.keys(events).map((k) => {
+              const fn = ({ data }) => data;
+              fn._passthrough = true;
+              return [k, fn];
+            })
           );
           const builder = action_builder({
             events,