ddd-node 15.3.0 → 16.0.1

package/dist/core/aggregate/base.d.ts

@@ -7,6 +7,6 @@ export interface AggregateMetadata extends EntityMetadata {
 export declare abstract class AggregateBase<P extends Props> extends EntityBase<P> {
     protected readonly _version: number;
     constructor(metadata: AggregateMetadata, props?: P);
-    abstract getVersion(): number;
+    abstract version(): number;
     protected newEvent<E extends AnyEvent>(eventClass: EventClassWithTypedConstructor<E>, props: PropsOf<E>): E;
 }

package/dist/core/aggregate/base.js

@@ -11,7 +11,7 @@ class AggregateBase extends entity_1.EntityBase {
         const eventSource = {
             aggregate: this.modelName(),
             id: this.id(),
-            version: this.getVersion(),
+            version: this.version(),
         };
         return eventClass.newEvent(eventSource, props);
     }

package/dist/core/aggregate/event-sourced-aggregate.d.ts

@@ -20,10 +20,10 @@ export declare class EventSourcedAggregateBase<P extends Props> extends Aggregat
     static fromSnapshot<T extends AnyEventSourcedAggregate>(this: EventSourcedAggregateClassWithTypedConstructor<T>, snapshot: Snapshot<T>, pastEventsAfterSnapshot?: AnyEvent[]): T;
     static eventApplierMap<T extends AnyEventSourcedAggregate>(this: EventSourcedAggregateClass<T>): Map<string, EventApplier>;
     static commandHandlerMap<T extends AnyEventSourcedAggregate>(this: EventSourcedAggregateClass<T>): Map<string, CommandHandler>;
-    getVersion(): number;
-    getPastEvents(): AnyEvent[];
-    getEvents(): AnyEvent[];
-    getHandledCommands(): AnyCommand[];
+    version(): number;
+    pastEvents(): AnyEvent[];
+    events(): AnyEvent[];
+    handledCommands(): AnyCommand[];
     eventApplierMap(): Map<string, EventApplier>;
     hasNewEvent(): boolean;
     getApplierForEvent<E extends AnyEvent>(event: E): EventApplier<E>;

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

@@ -34,16 +34,16 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
     static commandHandlerMap() {
         return (0, meta_1.getCommandHandlerMap)(this.prototype);
     }
-    getVersion() {
+    version() {
         return this._version + this._pastEvents.length + this._events.length;
     }
-    getPastEvents() {
+    pastEvents() {
         return [...this._pastEvents];
     }
-    getEvents() {
+    events() {
         return [...this._events];
     }
-    getHandledCommands() {
+    handledCommands() {
         return [...this._handledCommands];
     }
     eventApplierMap() {
@@ -53,19 +53,19 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
         return Boolean(this._events.length);
     }
     getApplierForEvent(event) {
-        const eventName = event.modelName();
-        const applier = this.eventApplierMap().get(eventName);
+        const eventType = event.eventType();
+        const applier = this.eventApplierMap().get(eventType);
         if (!applier)
             throw new Error("Event applier not found");
         return applier;
     }
     validateEventBeforeApply(event) {
-        const eventSource = event.getSource();
+        const eventSource = event.source();
         if (eventSource.aggregate !== this.modelName())
             throw new Error("Invalid source type");
         if (!eventSource.id.equals(this._id))
             throw new Error("Invalid source id");
-        if (eventSource.version !== this.getVersion())
+        if (eventSource.version !== this.version())
             throw new Error("Invalid source version");
     }
     _applyEvent(event) {
@@ -100,8 +100,8 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
         return this.constructor.commandHandlerMap();
     }
     getHandlerForCommand(command) {
-        const commandName = command.modelName();
-        const handler = this.commandHandlerMap().get(commandName);
+        const commandType = command.commandType();
+        const handler = this.commandHandlerMap().get(commandType);
         if (!handler)
             throw new Error("Command handler not found");
         return handler;
@@ -111,7 +111,7 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
         const events = (0, utils_1.toArray)(handler.call(this, command));
         events.forEach((event) => {
             event.setContext({
-                correlationId: command.getContext()?.correlationId,
+                correlationId: command.context()?.correlationId,
                 causationId: command.id().value,
             });
         });
@@ -125,7 +125,7 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
         return {
             metadata: {
                 id: this.id(),
-                version: this.getVersion(),
+                version: this.version(),
             },
             props: this.props(),
         };

package/dist/core/aggregate/state-aggregate.d.ts

@@ -9,8 +9,8 @@ export declare class StateAggregateBase<P extends Props> extends AggregateBase<P
     constructor(metadata: AggregateMetadata, props: P);
     static newAggregate<T extends AnyStateAggregate>(this: StateAggregateClassWithTypedConstructor<T>, props: PropsOf<T>, id?: Id): T;
     props(): P;
-    getVersion(): number;
-    getEvents(): AnyEvent[];
+    version(): number;
+    events(): AnyEvent[];
     protected recordEvent<E extends AnyEvent>(event: E): void;
     protected recordEvent<E extends AnyEvent>(eventClass: EventClass<E>, props: PropsOf<E>): void;
     clearEvents(): void;

package/dist/core/aggregate/state-aggregate.js

@@ -16,10 +16,10 @@ class StateAggregateBase extends base_1.AggregateBase {
     props() {
         return super.props();
     }
-    getVersion() {
+    version() {
         return this._version;
     }
-    getEvents() {
+    events() {
         return this._events;
     }
     recordEvent(param1, param2) {

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

@@ -6,10 +6,10 @@ export interface CommandMetadata extends Omit<MessageMetadata, "messageType"> {
 }
 export declare class CommandBase<P extends Props> extends MessageBase<P> {
     static readonly COMMAND_MESSAGE_TYPE = "command";
-    private _commandType;
     constructor(metadata: CommandMetadata, props: P);
+    static commandType(): string;
     static newCommand<T extends AnyCommand>(this: CommandClassWithTypedConstructor<T>, props: PropsOf<T>, context?: MessageContext, timestamp?: number): T;
-    getCommandType(): void;
+    commandType(): string;
 }
 export type AnyCommand = CommandBase<Props>;
 export interface CommandClass<T extends AnyCommand = AnyCommand, Arguments extends unknown[] = any[]> extends Class<T, Arguments>, ClassStatic<typeof CommandBase<PropsOf<T>>> {

package/dist/core/message/command.js

@@ -2,10 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CommandBase = void 0;
 const message_1 = require("./message");
+const meta_1 = require("../../meta");
 class CommandBase extends message_1.MessageBase {
     constructor(metadata, props) {
         super({ ...metadata, messageType: CommandBase.COMMAND_MESSAGE_TYPE }, props);
-        this._commandType = this.modelName();
+    }
+    static commandType() {
+        return (0, meta_1.getCommandType)(this) || this.modelName();
     }
     static newCommand(props, context, timestamp) {
         return new this({
@@ -14,8 +17,8 @@ class CommandBase extends message_1.MessageBase {
             timestamp,
         }, props);
     }
-    getCommandType() {
-        this._commandType;
+    commandType() {
+        return this.constructor.commandType();
     }
 }
 exports.CommandBase = CommandBase;

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

@@ -14,15 +14,15 @@ export interface EventMetadata extends Omit<MessageMetadata, "messageType"> {
 export declare class EventBase<P extends Props> extends MessageBase<P> {
     static readonly EVENT_MESSAGE_TYPE = "event";
     private readonly _source;
-    private readonly _eventType;
     constructor(metadata: EventMetadata, props: P);
+    static eventType(): string;
     static newEvent<T extends AnyEvent>(this: EventClassWithTypedConstructor<T>, source: EventSource, props: PropsOf<T>, context?: MessageContext, timestamp?: number): T;
-    getSource(): Readonly<{
+    source(): Readonly<{
         aggregate: string;
         id: Id;
         version: number;
     }>;
-    getEventType(): string;
+    eventType(): string;
 }
 export type AnyEvent = EventBase<Props>;
 export interface EventClass<T extends AnyEvent = AnyEvent, Arguments extends unknown[] = any[]> extends Class<T, Arguments>, ClassStatic<typeof EventBase<PropsOf<T>>> {

package/dist/core/message/event.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventBase = void 0;
 const message_1 = require("./message");
+const meta_1 = require("../../meta");
 class EventBase extends message_1.MessageBase {
     constructor(metadata, props) {
         super({ ...metadata, messageType: EventBase.EVENT_MESSAGE_TYPE }, props);
         this._source = metadata.source;
-        this._eventType = this.modelName();
+    }
+    static eventType() {
+        return (0, meta_1.getEventType)(this) || this.modelName();
     }
     static newEvent(source, props, context, timestamp) {
         return new this({
@@ -16,11 +19,11 @@ class EventBase extends message_1.MessageBase {
             timestamp,
         }, props);
     }
-    getSource() {
+    source() {
         return this._source;
     }
-    getEventType() {
-        return this._eventType;
+    eventType() {
+        return this.constructor.eventType();
     }
 }
 exports.EventBase = EventBase;

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

@@ -16,8 +16,8 @@ export declare class MessageBase<P extends Props> extends ModelWithId<P> {
     private _context?;
     protected constructor(metadata: MessageMetadata, props: P);
     props(): P;
-    getMessageType(): string;
-    getTimestamp(): number;
-    getContext(): MessageContext | undefined;
+    messageType(): string;
+    timestamp(): number;
+    context(): MessageContext | undefined;
     setContext(context: Partial<MessageContext>): void;
 }

package/dist/core/message/message.js

@@ -17,13 +17,13 @@ class MessageBase extends model_1.ModelWithId {
     props() {
         return super.props();
     }
-    getMessageType() {
+    messageType() {
         return this._messageType;
     }
-    getTimestamp() {
+    timestamp() {
         return this._timestamp;
     }
-    getContext() {
+    context() {
         return this._context;
     }
     setContext(context) {

package/dist/decorators/aggregate-es/handle.js

@@ -5,8 +5,8 @@ const meta_1 = require("../../meta");
 const Handle = (commandClass) => {
     return (target, propertyKey, descriptor) => {
         if (typeof descriptor.value === "function") {
-            const commandName = (0, meta_1.getModelName)(commandClass);
-            (0, meta_1.defineCommandHandler)(target, commandName, descriptor.value);
+            const commandType = commandClass.commandType();
+            (0, meta_1.defineCommandHandler)(target, commandType, descriptor.value);
         }
     };
 };

package/dist/decorators/aggregate-es/when.js

@@ -5,8 +5,8 @@ const meta_1 = require("../../meta");
 const When = (eventClass) => {
     return (target, propertyKey, descriptor) => {
         if (typeof descriptor.value === "function") {
-            const eventName = (0, meta_1.getModelName)(eventClass);
-            (0, meta_1.defineEventApplier)(target, eventName, descriptor.value);
+            const eventType = eventClass.eventType();
+            (0, meta_1.defineEventApplier)(target, eventType, descriptor.value);
         }
     };
 };

package/dist/decorators/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./aggregate-es";
 export * from "./id";
 export * from "./model";
+export * from "./message";

package/dist/decorators/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./aggregate-es"), exports);
 __exportStar(require("./id"), exports);
 __exportStar(require("./model"), exports);
+__exportStar(require("./message"), exports);

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

@@ -0,0 +1,2 @@
+import { AnyCommand, CommandClass } from "../../core";
+export declare const Command: (commandType: string) => <T extends AnyCommand>(target: CommandClass<T, any[]>) => void;

package/dist/decorators/message/command.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Command = void 0;
+const meta_1 = require("../../meta");
+const Command = (commandType) => {
+    return (target) => {
+        (0, meta_1.setCommandType)(target, commandType);
+    };
+};
+exports.Command = Command;

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

@@ -0,0 +1,2 @@
+import { AnyEvent, EventClass } from "../../core";
+export declare const Event: (eventType: string) => <T extends AnyEvent>(target: EventClass<T, any[]>) => void;

package/dist/decorators/message/event.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Event = void 0;
+const meta_1 = require("../../meta");
+const Event = (eventType) => {
+    return (target) => {
+        (0, meta_1.setEventType)(target, eventType);
+    };
+};
+exports.Event = Event;

package/dist/decorators/message/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./command";
+export * from "./event";

package/dist/decorators/message/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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("./command"), exports);
+__exportStar(require("./event"), exports);

package/dist/meta/aggregate.metadata.d.ts

@@ -2,7 +2,7 @@ import { AnyCommand, AnyEvent, CommandHandler, EventApplier } from "../core";
 import "reflect-metadata";
 export declare const EventApplierMapMetaKey: unique symbol;
 export declare const getEventApplierMap: (target: object) => Map<string, EventApplier>;
-export declare const defineEventApplier: <T extends AnyEvent>(target: object, eventName: string, applier: EventApplier<T>) => void;
+export declare const defineEventApplier: <T extends AnyEvent>(target: object, eventType: string, applier: EventApplier<T>) => void;
 export declare const CommandHandlerMapMetaKey: unique symbol;
 export declare const getCommandHandlerMap: (target: object) => Map<string, CommandHandler>;
-export declare const defineCommandHandler: <T extends AnyCommand>(target: object, commandName: string, handler: CommandHandler<T>) => void;
+export declare const defineCommandHandler: <T extends AnyCommand>(target: object, commandType: string, handler: CommandHandler<T>) => void;

package/dist/meta/aggregate.metadata.js

@@ -12,9 +12,9 @@ const getEventApplierMap = (target) => {
     return eventApplierMap();
 };
 exports.getEventApplierMap = getEventApplierMap;
-const defineEventApplier = (target, eventName, applier) => {
+const defineEventApplier = (target, eventType, applier) => {
     const eventAppliersMap = (0, exports.getEventApplierMap)(target);
-    eventAppliersMap.set(eventName, applier);
+    eventAppliersMap.set(eventType, applier);
 };
 exports.defineEventApplier = defineEventApplier;
 // Command handler map
@@ -27,8 +27,8 @@ const getCommandHandlerMap = (target) => {
     return commandHandlerMap();
 };
 exports.getCommandHandlerMap = getCommandHandlerMap;
-const defineCommandHandler = (target, commandName, handler) => {
+const defineCommandHandler = (target, commandType, handler) => {
     const commandHandlersMap = (0, exports.getCommandHandlerMap)(target);
-    commandHandlersMap.set(commandName, handler);
+    commandHandlersMap.set(commandType, handler);
 };
 exports.defineCommandHandler = defineCommandHandler;

package/dist/meta/command.metadata.d.ts

@@ -0,0 +1,3 @@
+import "reflect-metadata";
+export declare const setCommandType: (target: object, commandType: string) => void;
+export declare const getCommandType: (target: object) => string | undefined;

package/dist/meta/command.metadata.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCommandType = exports.setCommandType = void 0;
+require("reflect-metadata");
+const CommandTypeMetaKey = Symbol.for("COMMAND_TYPE");
+const setCommandType = (target, commandType) => {
+    Reflect.defineMetadata(CommandTypeMetaKey, commandType, target);
+};
+exports.setCommandType = setCommandType;
+const getCommandType = (target) => {
+    return Reflect.getOwnMetadata(CommandTypeMetaKey, target);
+};
+exports.getCommandType = getCommandType;

package/dist/meta/event.metadata.d.ts

@@ -0,0 +1,3 @@
+import "reflect-metadata";
+export declare const setEventType: (target: object, eventType: string) => void;
+export declare const getEventType: (target: object) => string | undefined;

package/dist/meta/event.metadata.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEventType = exports.setEventType = void 0;
+require("reflect-metadata");
+const EventTypeMetaKey = Symbol.for("EVENT_TYPE");
+const setEventType = (target, eventType) => {
+    Reflect.defineMetadata(EventTypeMetaKey, eventType, target);
+};
+exports.setEventType = setEventType;
+const getEventType = (target) => {
+    return Reflect.getOwnMetadata(EventTypeMetaKey, target);
+};
+exports.getEventType = getEventType;

package/dist/meta/index.d.ts

@@ -2,3 +2,5 @@ export * from "./helpers";
 export * from "./aggregate.metadata";
 export * from "./id.metadata";
 export * from "./model.metadata";
+export * from "./event.metadata";
+export * from "./command.metadata";

package/dist/meta/index.js

@@ -18,3 +18,5 @@ __exportStar(require("./helpers"), exports);
 __exportStar(require("./aggregate.metadata"), exports);
 __exportStar(require("./id.metadata"), exports);
 __exportStar(require("./model.metadata"), exports);
+__exportStar(require("./event.metadata"), exports);
+__exportStar(require("./command.metadata"), exports);

package/dist/meta/model.metadata.js

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getStaticValue = exports.setStaticValue = exports.getOwnStaticValues = exports.getPropsValidators = exports.PropsValidatorsMetaKey = exports.getOwnPropsValidator = exports.setPropsValidator = exports.getModelName = exports.setModelName = exports.getPropsMap = exports.setProp = exports.getOwnPropsMap = exports.PropsMap = void 0;
+const lodash_1 = __importDefault(require("lodash"));
 const core_1 = require("../core");
 const static_value_1 = require("./helpers/static-value");
 const OwnPropsMapMetaKey = Symbol.for("OWN_PROPS_MAP");
@@ -73,7 +77,7 @@ const getPropsValidators = (target) => {
     const validators = () => Reflect.getOwnMetadata(exports.PropsValidatorsMetaKey, target);
     if (validators())
         return validators();
-    const result = [];
+    let result = [];
     let _target = target;
     do {
         const ownValidator = (0, exports.getOwnPropsValidator)(_target);
@@ -81,6 +85,7 @@ const getPropsValidators = (target) => {
             result.push(ownValidator);
         _target = Reflect.getPrototypeOf(_target);
     } while (_target !== null);
+    result = lodash_1.default.uniq(result);
     Reflect.defineMetadata(exports.PropsValidatorsMetaKey, result, target);
     return validators();
 };

package/dist/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"15.3.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","nodejs-snowflake":"^2.0.1","reflect-metadata":"^0.1.13","tsc-alias":"^1.8.8","type-fest":"^4.15.0","uuid":"^9.0.1"}}
+{"name":"ddd-node","version":"16.0.1","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","nodejs-snowflake":"^2.0.1","reflect-metadata":"^0.1.13","tsc-alias":"^1.8.8","type-fest":"^4.15.0","uuid":"^9.0.1"}}

package/package.json

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