@rotorsoft/act 0.6.33 → 0.8.0

package/dist/index.js

@@ -564,6 +564,9 @@ process.once("unhandledRejection", async (arg) => {
   await disposeAndExit("ERROR");
 });
 
+// src/act-builder.ts
+import { ZodObject as ZodObject2 } from "zod";
+
 // src/act.ts
 import { randomUUID as randomUUID2 } from "crypto";
 import EventEmitter from "events";
@@ -689,9 +692,11 @@ var Act = class {
    * Create a new Act orchestrator.
    *
    * @param registry The registry of state, event, and action schemas
+   * @param states Map of state names to their (potentially merged) state definitions
    */
-  constructor(registry) {
+  constructor(registry, _states = /* @__PURE__ */ new Map()) {
     this.registry = registry;
+    this._states = _states;
     dispose(() => {
       this._emitter.removeAllListeners();
       this.stop_correlations();
@@ -809,47 +814,16 @@ var Act = class {
     this.emit("committed", snapshots);
     return snapshots;
   }
-  /**
-   * Loads the current state snapshot for a specific stream.
-   *
-   * Reconstructs the current state by replaying events from the event store.
-   * Uses snapshots when available to optimize loading performance.
-   *
-   * @template SX - State schema type
-   * @template EX - Event schemas type
-   * @template AX - Action schemas type
-   * @param state - The state definition to load
-   * @param stream - The stream ID (state instance identifier)
-   * @param callback - Optional callback invoked with the loaded snapshot
-   * @returns The current state snapshot for the stream
-   *
-   * @example Load current state
-   * ```typescript
-   * const snapshot = await app.load(Counter, "counter-1");
-   * console.log(snapshot.state.count);    // Current count
-   * console.log(snapshot.version);        // Number of events applied
-   * console.log(snapshot.patches);        // Events since last snapshot
-   * ```
-   *
-   * @example With callback
-   * ```typescript
-   * const snapshot = await app.load(User, "user-123", (snap) => {
-   *   console.log("Loaded user:", snap.state.name);
-   * });
-   * ```
-   *
-   * @example Load multiple states
-   * ```typescript
-   * const [user, account] = await Promise.all([
-   *   app.load(User, "user-123"),
-   *   app.load(BankAccount, "account-456")
-   * ]);
-   * ```
-   *
-   * @see {@link Snapshot} for snapshot structure
-   */
-  async load(state2, stream, callback) {
-    return await load(state2, stream, callback);
+  async load(stateOrName, stream, callback) {
+    let merged;
+    if (typeof stateOrName === "string") {
+      const found = this._states.get(stateOrName);
+      if (!found) throw new Error(`State "${stateOrName}" not found`);
+      merged = found;
+    } else {
+      merged = this._states.get(stateOrName.name) || stateOrName;
+    }
+    return await load(merged, stream, callback);
   }
   /**
    * Queries the event store for events matching a filter.
@@ -1074,7 +1048,8 @@ var Act = class {
           );
           fetched.forEach(({ stream, lagging: lagging2, events }) => {
             const payloads = events.flatMap((event) => {
-              const register = this.registry.events[event.name] || [];
+              const register = this.registry.events[event.name];
+              if (!register) return [];
               return [...register.reactions.values()].filter((reaction) => {
                 const resolved = typeof reaction.resolver === "function" ? reaction.resolver(event) : reaction.resolver;
                 return resolved && resolved.target === stream;
@@ -1307,18 +1282,49 @@ var Act = class {
 };
 
 // src/act-builder.ts
+function baseTypeName(zodType) {
+  let t = zodType;
+  while (typeof t.unwrap === "function") {
+    t = t.unwrap();
+  }
+  return t.constructor.name;
+}
+function mergeSchemas(existing, incoming, stateName) {
+  if (existing instanceof ZodObject2 && incoming instanceof ZodObject2) {
+    const existingShape = existing.shape;
+    const incomingShape = incoming.shape;
+    for (const key of Object.keys(incomingShape)) {
+      if (key in existingShape) {
+        const existingBase = baseTypeName(existingShape[key]);
+        const incomingBase = baseTypeName(incomingShape[key]);
+        if (existingBase !== incomingBase) {
+          throw new Error(
+            `Schema conflict in "${stateName}": key "${key}" has type "${existingBase}" but incoming partial declares "${incomingBase}"`
+          );
+        }
+      }
+    }
+    return existing.extend(incomingShape);
+  }
+  return existing;
+}
+function mergeInits(existing, incoming) {
+  return () => ({ ...existing(), ...incoming() });
+}
 var _this_ = ({ stream }) => ({
   source: stream,
   target: stream
 });
 var _void_ = () => void 0;
-function act(states = /* @__PURE__ */ new Set(), registry = {
+function act(states = /* @__PURE__ */ new Map(), registry = {
   actions: {},
   events: {}
 }) {
   const builder = {
     /**
-     * Adds a state to the builder.
+     * Adds a state to the builder. When a state with the same name is already
+     * registered, merges the new partial's actions, events, patches, and handlers
+     * into the existing state (errors on duplicate action/event names).
      *
      * @template SX The type of state
      * @template EX The type of events
@@ -1327,8 +1333,39 @@ function act(states = /* @__PURE__ */ new Set(), registry = {
      * @returns The builder
      */
     with: (state2) => {
-      if (!states.has(state2.name)) {
-        states.add(state2.name);
+      if (states.has(state2.name)) {
+        const existing = states.get(state2.name);
+        for (const name of Object.keys(state2.actions)) {
+          if (registry.actions[name])
+            throw new Error(`Duplicate action "${name}"`);
+        }
+        for (const name of Object.keys(state2.events)) {
+          if (registry.events[name])
+            throw new Error(`Duplicate event "${name}"`);
+        }
+        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 },
+          on: { ...existing.on, ...state2.on },
+          given: { ...existing.given, ...state2.given },
+          snap: state2.snap || existing.snap
+        };
+        states.set(state2.name, merged);
+        for (const name of Object.keys(merged.actions)) {
+          registry.actions[name] = merged;
+        }
+        for (const name of Object.keys(state2.events)) {
+          registry.events[name] = {
+            schema: state2.events[name],
+            reactions: /* @__PURE__ */ new Map()
+          };
+        }
+      } else {
+        states.set(state2.name, state2);
         for (const name of Object.keys(state2.actions)) {
           if (registry.actions[name])
             throw new Error(`Duplicate action "${name}"`);
@@ -1385,7 +1422,7 @@ function act(states = /* @__PURE__ */ new Set(), registry = {
         };
       }
     }),
-    build: () => new Act(registry),
+    build: () => new Act(registry, states),
     events: registry.events
   };
   return builder;