@shirudo/ddd-kit 1.0.0-rc.5 → 1.0.0-rc.6

package/dist/index.js

@@ -571,26 +571,26 @@ var AggregateRoot = class extends Entity {
   }
   _config;
   _autoVersionBump;
-  _domainEvents = [];
+  _pendingEvents = [];
   /**
-   * Returns a read-only list of domain events recorded by this aggregate.
-   * These events are side-effects of state changes.
+   * Read-only list of domain events recorded on this aggregate that have
+   * not yet been flushed to the outbox / persistence layer.
    */
-  get domainEvents() {
-    return Object.freeze(this._domainEvents.slice());
+  get pendingEvents() {
+    return Object.freeze(this._pendingEvents.slice());
   }
   /**
-   * Clears the list of recorded domain events.
-   * Call this after dispatching the events.
+   * Clears the pending-event list. Call this after the events have been
+   * dispatched (typically `markPersisted` handles it for you).
    */
-  clearDomainEvents() {
-    this._domainEvents = [];
+  clearPendingEvents() {
+    this._pendingEvents = [];
   }
   /**
    * Post-save hook called by a `Repository.save()` implementation to push
-   * the persisted version back into the in-memory aggregate and clear the
-   * recorded domain events (they are now safely on the write side / in
-   * the outbox).
+   * the persisted version back into the in-memory aggregate and clear
+   * pendingEvents (they are now safely on the write side / in the
+   * outbox).
    *
    * Use this so `save()` can keep its `Promise<void>` return type: the
    * caller holds the aggregate reference, which is up to date after this
@@ -598,7 +598,7 @@ var AggregateRoot = class extends Entity {
    */
   markPersisted(version) {
     this.setVersion(version);
-    this._domainEvents = [];
+    this._pendingEvents = [];
   }
   /**
    * Mutates state and records the resulting domain events in the
@@ -687,7 +687,7 @@ var AggregateRoot = class extends Entity {
    * @param event - The domain event to record
    */
   addDomainEvent(event) {
-    this._domainEvents.push(event);
+    this._pendingEvents.push(event);
   }
   /**
    * Manually bumps the aggregate version.
@@ -749,8 +749,9 @@ var AggregateRoot = class extends Entity {
    * ```
    */
   restoreFromSnapshot(snapshot) {
-    this.validateState(snapshot.state);
-    this._state = freezeShallow(snapshot.state);
+    const cloned = structuredClone(snapshot.state);
+    this.validateState(cloned);
+    this._state = freezeShallow(cloned);
     this.setVersion(snapshot.version);
   }
 };
@@ -826,7 +827,6 @@ var EventSourcedAggregate = class extends Entity {
   }
   // --- Event tracking ---
   _pendingEvents = [];
-  _autoVersionBump;
   get pendingEvents() {
     return Object.freeze(this._pendingEvents.slice());
   }
@@ -843,9 +843,8 @@ var EventSourcedAggregate = class extends Entity {
     this.setVersion(version);
     this._pendingEvents = [];
   }
-  constructor(id, initialState, config) {
+  constructor(id, initialState) {
     super(id, initialState);
-    this._autoVersionBump = config?.autoVersionBump ?? true;
   }
   // --- Event application ---
   /**
@@ -893,18 +892,9 @@ var EventSourcedAggregate = class extends Entity {
     this._state = freezeShallow(nextState);
     if (isNew) {
       this._pendingEvents.push(event);
-      if (this._autoVersionBump) {
-        this.setVersion(this._version + 1);
-      }
+      this.setVersion(this._version + 1);
     }
   }
-  /**
-   * Manually bumps the aggregate version.
-   * Only needed if `autoVersionBump` is disabled.
-   */
-  bumpVersion() {
-    this.setVersion(this._version + 1);
-  }
   // --- History & Snapshots ---
   /**
    * Reconstitutes the aggregate from an event history. Catches `DomainError`
@@ -930,15 +920,6 @@ var EventSourcedAggregate = class extends Entity {
     this.setVersion(startVersion + history.length);
     return ok();
   }
-  hasPendingEvents() {
-    return this._pendingEvents.length > 0;
-  }
-  getEventCount() {
-    return this._pendingEvents.length;
-  }
-  getLatestEvent() {
-    return this._pendingEvents[this._pendingEvents.length - 1];
-  }
   /**
    * Creates a snapshot of the current aggregate state.
    */
@@ -962,7 +943,7 @@ var EventSourcedAggregate = class extends Entity {
   restoreFromSnapshotWithEvents(snapshot, eventsAfterSnapshot) {
     const previousState = this._state;
     const previousVersion = this._version;
-    this._state = freezeShallow(snapshot.state);
+    this._state = freezeShallow(structuredClone(snapshot.state));
     this.setVersion(snapshot.version);
     for (const event of eventsAfterSnapshot) {
       try {
@@ -982,10 +963,9 @@ var CommandBus = class {
   static {
     __name(this, "CommandBus");
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   handlers = /* @__PURE__ */ new Map();
   register(commandType, handler) {
-    this.handlers.set(commandType, handler);
+    this.handlers.set(commandType, (cmd) => handler(cmd));
   }
   async execute(command) {
     const handler = this.handlers.get(command.type);
@@ -1004,13 +984,21 @@ var CommandBus = class {
 
 // src/app/handler.ts
 async function withCommit(deps, fn) {
-  const { result, events } = await deps.scope.transactional(async (ctx) => {
-    const fnResult = await fn(ctx);
-    if (fnResult.events.length > 0) {
-      await deps.outbox.add(fnResult.events);
+  const { result, aggregates, events } = await deps.scope.transactional(
+    async (ctx) => {
+      const fnResult = await fn(ctx);
+      const harvested = fnResult.aggregates.flatMap(
+        (agg) => agg.pendingEvents
+      );
+      if (harvested.length > 0) {
+        await deps.outbox.add(harvested);
+      }
+      return { ...fnResult, events: harvested };
     }
-    return fnResult;
-  });
+  );
+  for (const agg of aggregates) {
+    agg.markPersisted(agg.version);
+  }
   if (deps.bus && events.length > 0) {
     await deps.bus.publish(events);
   }
@@ -1021,10 +1009,9 @@ var QueryBus = class {
   static {
     __name(this, "QueryBus");
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   handlers = /* @__PURE__ */ new Map();
   register(queryType, handler) {
-    this.handlers.set(queryType, handler);
+    this.handlers.set(queryType, (query) => handler(query));
   }
   async execute(query) {
     const handler = this.handlers.get(query.type);
@@ -1045,7 +1032,7 @@ var QueryBus = class {
     if (!handler) {
       throw new Error(`No handler registered for query type: ${query.type}`);
     }
-    return handler(query);
+    return await handler(query);
   }
 };
 
@@ -1054,7 +1041,6 @@ var EventBusImpl = class {
   static {
     __name(this, "EventBusImpl");
   }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   handlers = /* @__PURE__ */ new Map();
   subscribe(eventType, handler) {
     const type = eventType;
@@ -1154,6 +1140,29 @@ var EventBusImpl = class {
   }
 };
 
-export { AggregateNotFoundError, AggregateRoot, CommandBus, ConcurrencyConflictError, DomainError, Entity, EventBusImpl, EventSourcedAggregate, InfrastructureError, MissingHandlerError, QueryBus, ValueObject, copyMetadata, createDomainEvent, createDomainEventWithMetadata, deepEqual, deepEqualExcept, deepFreeze, deepOmit, entityIds, findEntityById, freezeShallow, hasEntityId, mergeMetadata, removeEntityById, replaceEntityById, resetClockFactory, resetEventIdFactory, sameEntity, sameVersion, setClockFactory, setEventIdFactory, updateEntityById, vo, voEquals, voEqualsExcept, voWithValidation, withCommit };
+// src/events/outbox.ts
+var InMemoryOutbox = class {
+  static {
+    __name(this, "InMemoryOutbox");
+  }
+  pending = /* @__PURE__ */ new Map();
+  async add(events) {
+    for (const event of events) {
+      this.pending.set(event.eventId, {
+        dispatchId: event.eventId,
+        event
+      });
+    }
+  }
+  async getPending(limit) {
+    const all = [...this.pending.values()];
+    return typeof limit === "number" ? all.slice(0, limit) : all;
+  }
+  async markDispatched(dispatchIds) {
+    for (const id of dispatchIds) this.pending.delete(id);
+  }
+};
+
+export { AggregateNotFoundError, AggregateRoot, CommandBus, ConcurrencyConflictError, DomainError, Entity, EventBusImpl, EventSourcedAggregate, InMemoryOutbox, InfrastructureError, MissingHandlerError, QueryBus, ValueObject, copyMetadata, createDomainEvent, createDomainEventWithMetadata, deepEqual, deepEqualExcept, deepFreeze, deepOmit, entityIds, findEntityById, freezeShallow, hasEntityId, mergeMetadata, removeEntityById, replaceEntityById, resetClockFactory, resetEventIdFactory, sameEntity, sameVersion, setClockFactory, setEventIdFactory, updateEntityById, vo, voEquals, voEqualsExcept, voWithValidation, withCommit };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map