ddd-node 8.1.0 → 9.1.0

package/dist/core/aggregate.d.ts

@@ -11,15 +11,15 @@ export interface AggregateBaseMetadata extends EntityMetadata {
 export declare abstract class AggregateBase<Props extends object> extends Entity<Props> {
     protected readonly _version: number;
     constructor(metadata: AggregateBaseMetadata, props?: Props);
-    abstract version: number;
+    abstract getVersion(): number;
     protected newEvent<E extends AnyEvent>(eventClass: EventClassWithTypedConstructor<E>, props: PropsOf<E>): E;
 }
 export declare class Aggregate<Props extends object> extends AggregateBase<Props> {
     private _events;
     constructor(metadata: AggregateBaseMetadata, props: Props);
     static newAggregate<T extends AnyAggregate>(this: AggregateClassWithTypedConstructor<T>, props: PropsOf<T>, id?: Id): T;
-    get version(): number;
-    get events(): AnyEvent[];
+    getVersion(): number;
+    getEvents(): AnyEvent[];
     protected recordEvent<E extends AnyEvent>(event: E): void;
     protected recordEvent<E extends AnyEvent>(eventClass: EventClass<E>, props: PropsOf<E>): void;
     clearEvents(): void;
@@ -40,9 +40,10 @@ export declare class AggregateES<Props extends object> extends AggregateBase<Pro
     static fromSnapshot<T extends AnyAggregateES>(this: AggregateESClassWithTypedConstructor<T>, snapshot: Snapshot<T>, events?: AnyEvent[]): T;
     static eventAppliersMap<T extends AnyAggregateES>(this: AggregateESClass<T>): Map<string, EventApplier>;
     static commandHandlersMap<T extends AnyAggregateES>(this: AggregateESClass<T>): Map<string, CommandHandler>;
-    get version(): number;
-    get events(): AnyEvent[];
-    get handledCommands(): AnyCommand[];
+    getVersion(): number;
+    getPastEvents(): AnyEvent[];
+    getEvents(): AnyEvent[];
+    getHandledCommands(): AnyCommand[];
     eventAppliersMap(): Map<string, EventApplier>;
     hasEvent(): boolean;
     getApplierForEvent<E extends AnyEvent>(event: E): EventApplier<E>;

package/dist/core/aggregate.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregateES = exports.Aggregate = exports.AggregateBase = void 0;
 const to_array_1 = require("../utils/to-array");
 const entity_1 = require("./entity");
-const id_1 = require("./id");
 const metadata_1 = require("./metadata");
 class AggregateBase extends entity_1.Entity {
     constructor(metadata, props) {
@@ -12,9 +11,9 @@ class AggregateBase extends entity_1.Entity {
     }
     newEvent(eventClass, props) {
         const eventSource = {
-            type: this.type,
-            id: this.id,
-            version: this.version,
+            type: this.getType(),
+            id: this.getId(),
+            version: this.getVersion(),
         };
         return eventClass.newEvent(eventSource, props);
     }
@@ -27,14 +26,14 @@ class Aggregate extends AggregateBase {
     }
     static newAggregate(props, id) {
         return new this({
-            id: id !== null && id !== void 0 ? id : id_1.Uuid4.new(),
+            id: this.id(id),
             version: 0,
         }, props);
     }
-    get version() {
+    getVersion() {
         return this._version;
     }
-    get events() {
+    getEvents() {
         return this._events;
     }
     recordEvent(param1, param2) {
@@ -61,7 +60,7 @@ class AggregateES extends AggregateBase {
     }
     static newStream(id) {
         return new this({
-            id: id !== null && id !== void 0 ? id : id_1.Uuid4.new(),
+            id: this.id(id),
             version: 0,
         });
     }
@@ -82,14 +81,16 @@ class AggregateES extends AggregateBase {
     static commandHandlersMap() {
         return (0, metadata_1.getCommandHandlersMap)(this.prototype);
     }
-    get version() {
-        return (this._version +
-            (this.hasEvent() ? this._events.length : this._pastEvents.length));
+    getVersion() {
+        return this._version + this._pastEvents.length + this._events.length;
     }
-    get events() {
+    getPastEvents() {
+        return this._pastEvents;
+    }
+    getEvents() {
         return this._events;
     }
-    get handledCommands() {
+    getHandledCommands() {
         return this._handledCommands;
     }
     eventAppliersMap() {
@@ -99,19 +100,19 @@ class AggregateES extends AggregateBase {
         return Boolean(this._events.length);
     }
     getApplierForEvent(event) {
-        const { type } = event;
-        const applier = this.eventAppliersMap().get(type);
+        const eventType = event.getType();
+        const applier = this.eventAppliersMap().get(eventType);
         if (!applier)
             throw new Error("Event applier not found");
         return applier;
     }
     validateEventBeforeApply(event) {
-        const { source } = event;
-        if (source.type !== this.type)
+        const eventSource = event.getSource();
+        if (eventSource.type !== this.getType())
             throw new Error("Invalid source type");
-        if (!source.id.equals(this.id))
+        if (!eventSource.id.equals(this._id))
             throw new Error("Invalid source id");
-        if (source.version !== this.version)
+        if (eventSource.version !== this.getVersion())
             throw new Error("Invalid source version");
     }
     _applyEvent(event) {
@@ -143,8 +144,8 @@ class AggregateES extends AggregateBase {
         return this.constructor.commandHandlersMap();
     }
     getHandlerForCommand(command) {
-        const { type } = command;
-        const handler = this.commandHandlersMap().get(type);
+        const commandType = command.getType();
+        const handler = this.commandHandlersMap().get(commandType);
         if (!handler)
             throw new Error("Command handler not found");
         return handler;
@@ -155,8 +156,8 @@ class AggregateES extends AggregateBase {
         events.forEach((event) => {
             var _a;
             event.setContext({
-                correlationId: (_a = command.context) === null || _a === void 0 ? void 0 : _a.correlationId,
-                causationId: command.id.value,
+                correlationId: (_a = command.getContext()) === null || _a === void 0 ? void 0 : _a.correlationId,
+                causationId: command.getId().value,
             });
         });
         this.applyEvents(events);
@@ -168,8 +169,8 @@ class AggregateES extends AggregateBase {
             throw new Error();
         return {
             metadata: {
-                id: this.id,
-                version: this.version,
+                id: this.getId(),
+                version: this.getVersion(),
             },
             props: this.props(),
         };

package/dist/core/command.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Command = void 0;
-const id_1 = require("./id");
 const message_1 = require("./message");
 class Command extends message_1.Message {
     constructor(metadata, props) {
@@ -9,7 +8,7 @@ class Command extends message_1.Message {
     }
     static newCommand(props, context) {
         return new this({
-            id: id_1.Uuid4.new(),
+            id: this.id(),
             timestamp: Date.now(),
             context,
         }, props);

package/dist/core/entity.d.ts

@@ -1,15 +1,16 @@
 import { Class } from "../types/class";
 import { ClassStatic } from "../types/class-static";
 import { Id } from "./id";
-import { Model, PropsOf } from "./model";
+import { PropsOf } from "./model";
+import { ModelWithId } from "./model-with-id";
 export interface EntityMetadata {
     readonly id: Id;
 }
-export declare class Entity<Props extends object> extends Model<Props> {
-    private readonly _id;
+export declare class Entity<Props extends object> extends ModelWithId<Props> {
+    protected readonly _id: Id;
     constructor(metadata: EntityMetadata, props?: Props);
-    static newEntity<T extends AnyEntity>(this: EntityClassWithTypedConstructor<T>, props: PropsOf<T>): T;
-    get id(): Id;
+    static newEntity<T extends AnyEntity>(this: EntityClassWithTypedConstructor<T>, props: PropsOf<T>, id?: Id): T;
+    getId(): Id;
     hasId(id: Id): boolean;
 }
 export type AnyEntity = Entity<object>;

package/dist/core/entity.js

@@ -1,23 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = void 0;
-const id_1 = require("./id");
-const model_1 = require("./model");
-class Entity extends model_1.Model {
+const model_with_id_1 = require("./model-with-id");
+class Entity extends model_with_id_1.ModelWithId {
     constructor(metadata, props) {
         super(props);
         this._id = metadata.id;
     }
-    static newEntity(props) {
+    static newEntity(props, id) {
         return new this({
-            id: id_1.Uuid4.new(),
+            id: this.id(id),
         }, props);
     }
-    get id() {
+    getId() {
         return this._id;
     }
     hasId(id) {
-        return this.id.equals(id);
+        return this._id.equals(id);
     }
 }
 exports.Entity = Entity;

package/dist/core/error.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelError = void 0;
 class ModelError extends Error {
     constructor(model, message) {
-        super(`[${model.type}] ${message}`);
+        super(`[${model.getType()}] ${message}`);
     }
 }
 exports.ModelError = ModelError;

package/dist/core/event.d.ts

@@ -16,7 +16,7 @@ export declare class Event<Props extends object> extends Message<Props> {
     private readonly _source;
     constructor(metadata: EventMetadata, props: Props);
     static newEvent<T extends AnyEvent>(this: EventClassWithTypedConstructor<T>, source: EventSource, props: PropsOf<T>, context?: MessageContext): T;
-    get source(): Readonly<{
+    getSource(): Readonly<{
         type: `${string}#${string}`;
         id: Id;
         version: number;

package/dist/core/event.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Event = void 0;
-const id_1 = require("./id");
 const message_1 = require("./message");
 class Event extends message_1.Message {
     constructor(metadata, props) {
@@ -10,13 +9,13 @@ class Event extends message_1.Message {
     }
     static newEvent(source, props, context) {
         return new this({
-            id: id_1.Uuid4.new(),
+            id: this.id(),
             timestamp: Date.now(),
             source,
             context,
         }, props);
     }
-    get source() {
+    getSource() {
         return this._source;
     }
 }

package/dist/core/id.d.ts

@@ -4,9 +4,14 @@ export declare class Id {
     get value(): string;
     equals(id: Id): boolean;
 }
-export declare class Uuid4 extends Id {
-    private constructor();
-    static new(): Uuid4;
-    static from(value: string): Uuid4;
-    static validate(value: string): boolean;
+export declare abstract class IdGenerator {
+    abstract generateValue(): string;
+    abstract validateValue(value: string): void;
+    fromValue(value: string): Id;
+    fromId(id: Id): Id;
+    newId(): Id;
+}
+export declare class Uuid4Generator extends IdGenerator {
+    generateValue(): string;
+    validateValue(value: string): boolean;
 }

package/dist/core/id.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Uuid4 = exports.Id = void 0;
+exports.Uuid4Generator = exports.IdGenerator = exports.Id = void 0;
 const uuid_1 = require("uuid");
 class Id {
     constructor(value) {
@@ -14,22 +14,27 @@ class Id {
     }
 }
 exports.Id = Id;
-class Uuid4 extends Id {
-    constructor(value) {
-        super(value);
+class IdGenerator {
+    fromValue(value) {
+        this.validateValue(value);
+        return new Id(value);
+    }
+    fromId(id) {
+        return this.fromValue(id.value);
     }
-    static new() {
-        const newValue = (0, uuid_1.v4)();
-        return this.from(newValue);
+    newId() {
+        return this.fromValue(this.generateValue());
     }
-    static from(value) {
-        this.validate(value);
-        return new Uuid4(value);
+}
+exports.IdGenerator = IdGenerator;
+class Uuid4Generator extends IdGenerator {
+    generateValue() {
+        return (0, uuid_1.v4)();
     }
-    static validate(value) {
+    validateValue(value) {
         const isUuid = (0, uuid_1.validate)(value);
         const isV4 = (0, uuid_1.version)(value) === 4;
         return isUuid && isV4;
     }
 }
-exports.Uuid4 = Uuid4;
+exports.Uuid4Generator = Uuid4Generator;

package/dist/core/index.d.ts

@@ -8,6 +8,7 @@ export * from "./message";
 export * from "./metadata";
 export * from "./model";
 export * from "./model-type";
+export * from "./model-with-id";
 export * from "./registry";
 export * from "./repository";
 export * from "./value-object";

package/dist/core/index.js

@@ -24,6 +24,7 @@ __exportStar(require("./message"), exports);
 __exportStar(require("./metadata"), exports);
 __exportStar(require("./model"), exports);
 __exportStar(require("./model-type"), exports);
+__exportStar(require("./model-with-id"), exports);
 __exportStar(require("./registry"), exports);
 __exportStar(require("./repository"), exports);
 __exportStar(require("./value-object"), exports);

package/dist/core/message.d.ts

@@ -1,5 +1,5 @@
 import { Id } from "./id";
-import { Model } from "./model";
+import { ModelWithId } from "./model-with-id";
 export interface MessageContext {
     correlationId?: string;
     causationId?: string;
@@ -9,13 +9,13 @@ export interface MessageMetadata {
     readonly timestamp: number;
     context?: MessageContext;
 }
-export declare class Message<Props extends object> extends Model<Props> {
+export declare class Message<Props extends object> extends ModelWithId<Props> {
     private readonly _id;
     private readonly _timestamp;
     private _context?;
     protected constructor(metadata: MessageMetadata, props: Props);
-    get id(): Id;
-    get timestamp(): number;
-    get context(): MessageContext | undefined;
+    getId(): Id;
+    getTimestamp(): number;
+    getContext(): MessageContext | undefined;
     setContext(context: Partial<MessageContext>): void;
 }

package/dist/core/message.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const model_1 = require("./model");
-class Message extends model_1.Model {
+const model_with_id_1 = require("./model-with-id");
+class Message extends model_with_id_1.ModelWithId {
     constructor(metadata, props) {
         var _a;
         super(props);
@@ -14,17 +14,17 @@ class Message extends model_1.Model {
         this._timestamp = metadata.timestamp;
         this._context = (_a = metadata === null || metadata === void 0 ? void 0 : metadata.context) !== null && _a !== void 0 ? _a : {};
     }
-    get id() {
+    getId() {
         return this._id;
     }
-    get timestamp() {
+    getTimestamp() {
         return this._timestamp;
     }
-    get context() {
+    getContext() {
         return this._context;
     }
     setContext(context) {
-        this._context = lodash_1.default.merge(this.context, context);
+        this._context = lodash_1.default.merge(this._context, context);
     }
 }
 exports.Message = Message;

package/dist/core/metadata.d.ts

@@ -3,9 +3,13 @@ import { CommandHandler, EventApplier } from "./aggregate";
 import { AnyCommand } from "./command";
 import { AnyEvent } from "./event";
 import { ModelTypePattern } from "./model-type";
+import { IdGenerator } from "./id";
 export declare const MODEL_TYPE = "MODEL_TYPE";
 export declare const defineModelType: (target: object, type: ModelTypePattern) => void;
 export declare const getModelType: (target: object) => ModelTypePattern;
+export declare const ID_GENERATOR = "ID_GENERATOR";
+export declare const defineIdGenerator: (target: object, idGenerator: IdGenerator) => void;
+export declare const getIdGenerator: (target: object) => any;
 export declare const EVENT_APPLIERS = "EVENT_APPLIERS";
 export declare const getEventAppliersMap: (target: object) => Map<string, EventApplier>;
 export declare const defineEventApplier: <T extends AnyEvent>(target: object, eventType: string, applier: EventApplier<T>) => void;

package/dist/core/metadata.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineCommandHandler = exports.getCommandHandlersMap = exports.COMMAND_HANDLERS = exports.defineEventApplier = exports.getEventAppliersMap = exports.EVENT_APPLIERS = exports.getModelType = exports.defineModelType = exports.MODEL_TYPE = void 0;
+exports.defineCommandHandler = exports.getCommandHandlersMap = exports.COMMAND_HANDLERS = exports.defineEventApplier = exports.getEventAppliersMap = exports.EVENT_APPLIERS = exports.getIdGenerator = exports.defineIdGenerator = exports.ID_GENERATOR = exports.getModelType = exports.defineModelType = exports.MODEL_TYPE = void 0;
 require("reflect-metadata");
 // Model type
 exports.MODEL_TYPE = "MODEL_TYPE";
@@ -15,6 +15,16 @@ const getModelType = (target) => {
     return type;
 };
 exports.getModelType = getModelType;
+// Id generator
+exports.ID_GENERATOR = "ID_GENERATOR";
+const defineIdGenerator = (target, idGenerator) => {
+    Reflect.defineMetadata(exports.ID_GENERATOR, idGenerator, target);
+};
+exports.defineIdGenerator = defineIdGenerator;
+const getIdGenerator = (target) => {
+    return Reflect.getMetadata(exports.ID_GENERATOR, target);
+};
+exports.getIdGenerator = getIdGenerator;
 // Event applier map
 exports.EVENT_APPLIERS = "EVENT_APPLIERS";
 const getEventAppliersMap = (target) => {

package/dist/core/model-with-id.d.ts

@@ -0,0 +1,6 @@
+import { Id, IdGenerator } from "./id";
+import { Model } from "./model";
+export declare class ModelWithId<Props extends object> extends Model<Props> {
+    static getIdGenerator(this: any): IdGenerator;
+    static id(id?: Id): Id;
+}

package/dist/core/model-with-id.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModelWithId = void 0;
+const id_1 = require("./id");
+const metadata_1 = require("./metadata");
+const model_1 = require("./model");
+class ModelWithId extends model_1.Model {
+    static getIdGenerator() {
+        return (0, metadata_1.getIdGenerator)(this) || new id_1.Uuid4Generator();
+    }
+    static id(id) {
+        const generator = this.getIdGenerator();
+        return id ? generator.fromId(id) : generator.newId();
+    }
+}
+exports.ModelWithId = ModelWithId;

package/dist/core/model.d.ts

@@ -6,7 +6,7 @@ export declare class Model<Props extends object> {
     static type(): `${string}#${string}`;
     protected initializeProps(props: Props): void;
     validate(): void;
-    get type(): `${string}#${string}`;
+    getType(): `${string}#${string}`;
     props(): Props;
 }
 export type AnyModel = Model<object>;

package/dist/core/model.js

@@ -24,7 +24,7 @@ class Model {
         }
     }
     validate() { }
-    get type() {
+    getType() {
         return (0, metadata_1.getModelType)(Object.getPrototypeOf(this));
     }
     props() {

package/dist/decorators/id.d.ts

@@ -0,0 +1,2 @@
+import { IdGenerator } from "../core/id";
+export declare const id: <T extends IdGenerator>(idGenerator: T) => (target: object) => void;

package/dist/decorators/id.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.id = void 0;
+const metadata_1 = require("../core/metadata");
+const id = (idGenerator) => {
+    return (target) => {
+        console.log("Target", target);
+        (0, metadata_1.defineIdGenerator)(target, idGenerator);
+    };
+};
+exports.id = id;

package/dist/decorators/index.d.ts

@@ -2,5 +2,6 @@ export * from "./aggregate";
 export * from "./command";
 export * from "./entity";
 export * from "./event";
+export * from "./id";
 export * from "./model";
 export * from "./value-object";

package/dist/decorators/index.js

@@ -18,5 +18,6 @@ __exportStar(require("./aggregate"), exports);
 __exportStar(require("./command"), exports);
 __exportStar(require("./entity"), exports);
 __exportStar(require("./event"), exports);
+__exportStar(require("./id"), exports);
 __exportStar(require("./model"), exports);
 __exportStar(require("./value-object"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddd-node",
-  "version": "8.1.0",
+  "version": "9.1.0",
   "description": "Domain Driven Design base for NodeJs",
   "main": "dist/index.js",
   "scripts": {