ddd-node 24.2.0 → 24.4.0

package/dist/core/aggregate/event-sourced-aggregate/event-sourced-aggregate.js

@@ -103,10 +103,8 @@ class EventSourcedAggregateBase extends aggregate_base_1.AggregateBase {
         const handler = this.getHandlerForCommand(command);
         const events = (0, utils_1.toArray)(handler.call(this, command));
         events.forEach((event) => {
-            event.setContext({
-                correlationId: command.context()?.correlationId,
-                causationId: command.id(),
-            });
+            event.setCausationId(command.id());
+            event.setCorrelationIds(command.context().correlationIds || {});
         });
         this.applyEvents(events);
         this._handledCommands.push(command);

package/dist/core/message/command/command.d.ts

@@ -7,7 +7,7 @@ import { CommandModelDescriptor } from "./command-model-descriptor";
 export interface CommandMetadata extends MessageMetadata {
     commandType: CommandType;
 }
-export declare abstract class CommandBase<P extends Props> extends MessageBase<P> {
+export declare class CommandBase<P extends Props> extends MessageBase<P> {
     protected readonly _commandType: CommandType;
     static commandType(): string;
     constructor(metadata: Omit<CommandMetadata, "commandType">, props: P);

package/dist/core/message/event/event.d.ts

@@ -13,7 +13,7 @@ export interface EventMetadata extends MessageMetadata {
     eventType: EventType;
     source: EventSource;
 }
-export declare abstract class EventBase<P extends Props> extends MessageBase<P> {
+export declare class EventBase<P extends Props> extends MessageBase<P> {
     private readonly _eventType;
     private readonly _source;
     constructor(metadata: Omit<EventMetadata, "eventType">, props: P);

package/dist/core/message/message-base/message.d.ts

@@ -2,8 +2,11 @@ import { Class } from "type-fest";
 import { Props, PropsOf } from "../../../base";
 import { ClassStatic } from "../../../types";
 import { IdentifiableModel, IdentifiableModelMetadata } from "../../identifiable-model";
+export interface CorrelationIds {
+    [type: string]: string;
+}
 export interface MessageContext {
-    correlationId?: string;
+    correlationIds?: CorrelationIds;
     causationId?: string;
 }
 export interface MessageMetadata extends IdentifiableModelMetadata {
@@ -12,13 +15,15 @@ export interface MessageMetadata extends IdentifiableModelMetadata {
 }
 export declare class MessageBase<P extends Props> extends IdentifiableModel<P> {
     private readonly _timestamp;
-    private _context?;
+    private _context;
     constructor(metadata: MessageMetadata, props: P);
     props(): P;
     metadata(): MessageMetadata;
     timestamp(): number;
-    context(): MessageContext | undefined;
-    setContext(context: Partial<MessageContext>): void;
+    context(): MessageContext;
+    setCausationId(causationId: string): void;
+    addCorrelationId(type: string, correlationId: string): void;
+    setCorrelationIds(correlationIds: CorrelationIds): void;
 }
 export type AnyMessage = MessageBase<Props>;
 export interface MessageClass<T extends AnyMessage = AnyMessage, Arguments extends unknown[] = any[]> extends Class<T, Arguments>, ClassStatic<typeof MessageBase<PropsOf<T>>> {

package/dist/core/message/message-base/message.js

@@ -8,12 +8,8 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MessageBase = void 0;
-const lodash_1 = __importDefault(require("lodash"));
 const base_1 = require("../../../base");
 const identifiable_model_1 = require("../../identifiable-model");
 let MessageBase = class MessageBase extends identifiable_model_1.IdentifiableModel {
@@ -39,8 +35,19 @@ let MessageBase = class MessageBase extends identifiable_model_1.IdentifiableMod
     context() {
         return this._context;
     }
-    setContext(context) {
-        this._context = lodash_1.default.merge(this._context, context);
+    setCausationId(causationId) {
+        if (!this._context.causationId)
+            this._context.causationId = causationId;
+    }
+    addCorrelationId(type, correlationId) {
+        if (!this._context.correlationIds)
+            this._context.correlationIds = {};
+        if (!this._context.correlationIds[type])
+            this._context.correlationIds[type] = correlationId;
+    }
+    setCorrelationIds(correlationIds) {
+        if (!this._context.correlationIds)
+            this._context.correlationIds = correlationIds;
     }
 };
 exports.MessageBase = MessageBase;

package/dist/event-pubsub/decorators/index.d.ts

@@ -1 +1 @@
-export * from "./event-subscriber";
+export * from "./subscribe-to-events";

package/dist/event-pubsub/decorators/index.js

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./event-subscriber"), exports);
+__exportStar(require("./subscribe-to-events"), exports);

package/dist/event-pubsub/event-publisher.js

@@ -6,7 +6,8 @@ class EventPublisher {
         this.subscriberRegistry = subscriberRegistry;
     }
     async publish(event) {
-        const subscribers = this.subscriberRegistry.getSubscribersForEvent(event.constructor);
+        const subscribers = this.subscriberRegistry.getAllSubscribersForEvent(event.constructor);
+        // TODO: should convert to for await (subscriber be called sequently) ?
         await Promise.all(subscribers.map((subscriber) => subscriber.handleEvent(event)));
     }
 }

package/dist/event-pubsub/event-subscriber-registry.d.ts

@@ -1,8 +1,9 @@
 import { AnyEvent, EventClass } from "../core";
-import { IEventSubscriber, IEventSubscriberRegistry } from "./interfaces";
+import { IEventSubscriber, IEventSubscriberRegistry, IGlobalEventSubscriber, Unsubscriber } from "./interfaces";
 export declare class EventSubscriberRegistry implements IEventSubscriberRegistry {
     private static _instance;
     static instance(): EventSubscriberRegistry;
+    private _globalSubscribers;
     private _subscribers;
     constructor(subscribers?: IEventSubscriber[]);
     private _setSubscribersForEvent;
@@ -11,8 +12,12 @@ export declare class EventSubscriberRegistry implements IEventSubscriberRegistry
     private _hasSubscriber;
     private _addSubscriber;
     private _removeSubscriber;
-    registerSubscriber(subscriber: IEventSubscriber): () => void;
+    registerGlobalSubscriber(subscriber: IGlobalEventSubscriber): Unsubscriber;
+    deregisterGlobalSubscriber(subscriber: IGlobalEventSubscriber): void;
+    registerSubscriber(subscriber: IEventSubscriber): Unsubscriber;
     deregisterSubscriber(subscriber: IEventSubscriber<AnyEvent>): void;
-    getSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T, any[]>): IEventSubscriber<T>[];
+    getGlobalSubscribers(): IGlobalEventSubscriber[];
     getSubscribers(): IEventSubscriber[];
+    getSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T>): IEventSubscriber<T>[];
+    getAllSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T>): (IGlobalEventSubscriber | IEventSubscriber<T>)[];
 }

package/dist/event-pubsub/event-subscriber-registry.js

@@ -9,6 +9,7 @@ class EventSubscriberRegistry {
         return this._instance;
     }
     constructor(subscribers = []) {
+        this._globalSubscribers = new Set();
         this._subscribers = new Map();
         subscribers.forEach((subscriber) => {
             this.registerSubscriber(subscriber);
@@ -40,6 +41,13 @@ class EventSubscriberRegistry {
         const subscribers = this._getSubscribersForEvent(subscribedEvent);
         this._setSubscribersForEvent(subscribedEvent, subscribers.filter((_subscriber) => _subscriber !== subscriber));
     }
+    registerGlobalSubscriber(subscriber) {
+        this._globalSubscribers.add(subscriber);
+        return () => this.deregisterGlobalSubscriber(subscriber);
+    }
+    deregisterGlobalSubscriber(subscriber) {
+        this._globalSubscribers.delete(subscriber);
+    }
     registerSubscriber(subscriber) {
         const subscribedEvents = (0, utils_1.toArray)(subscriber.subscribeToEvents());
         subscribedEvents.forEach((subscribedEvent) => {
@@ -53,11 +61,20 @@ class EventSubscriberRegistry {
             this._removeSubscriber(subscribedEvent, subscriber);
         });
     }
-    getSubscribersForEvent(eventType) {
-        return Array.from(this._getSubscribersForEvent(eventType));
+    getGlobalSubscribers() {
+        return Array.from(this._globalSubscribers);
     }
     getSubscribers() {
         return Array.from(this._subscribers.values()).flat();
     }
+    getSubscribersForEvent(eventType) {
+        return Array.from(this._getSubscribersForEvent(eventType));
+    }
+    getAllSubscribersForEvent(eventType) {
+        return [
+            ...this.getGlobalSubscribers(),
+            ...this.getSubscribersForEvent(eventType),
+        ];
+    }
 }
 exports.EventSubscriberRegistry = EventSubscriberRegistry;

package/dist/event-pubsub/interfaces/event-subscriber-registry.interface.d.ts

@@ -1,9 +1,13 @@
 import { AnyEvent, EventClass } from "../../core";
-import { IEventSubscriber } from "./event-subscriber.interface";
+import { IEventSubscriber, IGlobalEventSubscriber } from "./event-subscriber.interface";
 export type Unsubscriber = () => void;
 export interface IEventSubscriberRegistry {
+    registerGlobalSubscriber(subscriber: IGlobalEventSubscriber): Unsubscriber;
+    deregisterGlobalSubscriber(subscriber: IGlobalEventSubscriber): void;
     registerSubscriber(subscriber: IEventSubscriber): Unsubscriber;
     deregisterSubscriber(subscriber: IEventSubscriber): void;
-    getSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T>): IEventSubscriber<T>[];
+    getGlobalSubscribers(): IGlobalEventSubscriber[];
     getSubscribers(): IEventSubscriber[];
+    getSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T>): IEventSubscriber<T>[];
+    getAllSubscribersForEvent<T extends AnyEvent = AnyEvent>(eventType: EventClass<T>): (IGlobalEventSubscriber | IEventSubscriber<T>)[];
 }

package/dist/event-pubsub/interfaces/event-subscriber.interface.d.ts

@@ -1,4 +1,7 @@
 import { AnyEvent, EventClass } from "../../core";
+export interface IGlobalEventSubscriber {
+    handleEvent(event: AnyEvent): Promise<void>;
+}
 export interface IEventSubscriber<T extends AnyEvent = AnyEvent> {
     subscribeToEvents(): EventClass<T> | EventClass<T>[];
     handleEvent(event: T): Promise<void>;

package/dist/meta/aggregate-es/command-handler-map.js

@@ -30,8 +30,8 @@ const getCommandHandlerMap = (target) => {
                 _target = Reflect.getPrototypeOf(_target);
             } while (_target !== null);
             ownCommandHandlerMaps.forEach((ownCommandHandlerMap) => {
-                ownCommandHandlerMap.forEach((commandHandler, methodName) => {
-                    result.set(methodName, commandHandler);
+                ownCommandHandlerMap.forEach((commandHandler, commandType) => {
+                    result.set(commandType, commandHandler);
                 });
             });
             return result;

package/dist/meta/aggregate-es/event-applier-map.js

@@ -30,8 +30,8 @@ const getEventApplierMap = (target) => {
                 _target = Reflect.getPrototypeOf(_target);
             } while (_target !== null);
             ownEventApplierMaps.forEach((ownEventApplierMap) => {
-                ownEventApplierMap.forEach((eventApplier, methodName) => {
-                    result.set(methodName, eventApplier);
+                ownEventApplierMap.forEach((eventApplier, eventType) => {
+                    result.set(eventType, eventApplier);
                 });
             });
             return result;

package/dist/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"24.2.0","description":"Domain Driven Design base for NodeJs","type":"commonjs","main":"index.js","types":"index.d.ts","files":["dist"],"repository":{"type":"git","url":"https://github.com/nqd881/ddd-node"},"keywords":["ddd","ddd-node","ddd-base","ddd-ts","ddd-js"],"author":"Quoc Dai","license":"ISC","devDependencies":{"@types/chai":"^4.3.16","@types/lodash":"^4.14.200","@types/mocha":"^10.0.6","@types/uuid":"^9.0.6","chai":"^5.1.1","chai-deep-match":"^1.2.1","ddd-node":"file:dist","mocha":"^10.4.0","ts-node":"^10.9.1","tsconfig-paths":"^4.2.0","typescript":"^5.2.2"},"dependencies":{"lodash":"^4.17.21","reflect-metadata":"^0.1.13","tsc-alias":"^1.8.8","type-fest":"^4.20.1","uuid":"^9.0.1"}}
+{"name":"ddd-node","version":"24.4.0","description":"Domain Driven Design base for NodeJs","type":"commonjs","main":"index.js","types":"index.d.ts","files":["dist"],"repository":{"type":"git","url":"https://github.com/nqd881/ddd-node"},"keywords":["ddd","ddd-node","ddd-base","ddd-ts","ddd-js"],"author":"Quoc Dai","license":"ISC","devDependencies":{"@types/chai":"^4.3.16","@types/lodash":"^4.14.200","@types/mocha":"^10.0.6","@types/uuid":"^9.0.6","chai":"^5.1.1","chai-deep-match":"^1.2.1","ddd-node":"file:dist","mocha":"^10.4.0","ts-node":"^10.9.1","tsconfig-paths":"^4.2.0","typescript":"^5.2.2"},"dependencies":{"lodash":"^4.17.21","reflect-metadata":"^0.1.13","tsc-alias":"^1.8.8","type-fest":"^4.20.1","uuid":"^9.0.1"}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddd-node",
-  "version": "24.2.0",
+  "version": "24.4.0",
   "description": "Domain Driven Design base for NodeJs",
   "type": "module",
   "main": "dist/index.js",