ddd-node 23.0.1 → 24.1.0

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

@@ -58,7 +58,7 @@ class EventSourcedAggregateBase extends aggregate_base_1.AggregateBase {
     }
     validateEventBeforeApply(event) {
         const { aggregateId, aggregateVersion } = event.source();
-        if (!aggregateId.equals(this._id))
+        if (aggregateId !== this._id)
             throw new Error("Invalid aggregate id");
         if (aggregateVersion !== this.version())
             throw new Error("Invalid aggregate version");
@@ -105,7 +105,7 @@ class EventSourcedAggregateBase extends aggregate_base_1.AggregateBase {
         events.forEach((event) => {
             event.setContext({
                 correlationId: command.context()?.correlationId,
-                causationId: command.id().value,
+                causationId: command.id(),
             });
         });
         this.applyEvents(events);

package/dist/core/enum/enum-builder.d.ts

@@ -0,0 +1,9 @@
+import { ModelBuilder } from "../../model";
+import { AnyEnum, EnumClass, EnumValue } from "./enum";
+export declare class EnumBuilder<T extends AnyEnum> extends ModelBuilder<T> {
+    private enumClass;
+    protected _value?: EnumValue;
+    constructor(enumClass: EnumClass<T>);
+    withValue(value: EnumValue): this;
+    build(): T;
+}

package/dist/core/enum/enum-builder.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EnumBuilder = void 0;
+const model_1 = require("../../model");
+class EnumBuilder extends model_1.ModelBuilder {
+    constructor(enumClass) {
+        super();
+        this.enumClass = enumClass;
+    }
+    withValue(value) {
+        this._value = value;
+        return this;
+    }
+    build() {
+        if (!this._value)
+            throw new Error("Cannot parse enum without value");
+        const { enumClass } = this;
+        let result;
+        enumClass.ownStaticValues().forEach((staticValue) => {
+            if (staticValue.value instanceof enumClass) {
+                const staticEnum = staticValue.value;
+                if (staticEnum.value === this._value && !result) {
+                    result = staticEnum;
+                }
+            }
+        });
+        if (!result)
+            throw new Error(`Invalid provided value for enum ${enumClass.modelName()}`);
+        return result;
+    }
+}
+exports.EnumBuilder = EnumBuilder;

package/dist/core/enum/enum.d.ts

@@ -1,14 +1,12 @@
 import { Class } from "type-fest";
-import { ValueObjectBase } from "..";
+import { ModelBase } from "../../model";
 import { ClassStatic } from "../../types";
 export type EnumValue = string | number;
 export interface EnumProps {
     value: EnumValue;
 }
-export declare class EnumBase extends ValueObjectBase<EnumProps> {
+export declare class EnumBase extends ModelBase<EnumProps> {
     static values(): EnumBase[];
-    static parse<T extends AnyEnum>(this: EnumClass<T>, providedValue: EnumValue): T;
-    static parseSafe<T extends AnyEnum>(this: EnumClass<T>, providedValue: EnumValue): T | null;
     constructor(value: EnumValue);
     value: EnumValue;
 }

package/dist/core/enum/enum.js

@@ -10,36 +10,14 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EnumBase = void 0;
-const __1 = require("..");
 const model_1 = require("../../model");
-let EnumBase = class EnumBase extends __1.ValueObjectBase {
+let EnumBase = class EnumBase extends model_1.ModelBase {
     static values() {
         return Array.from(this.ownStaticValues().values()).map((staticValue) => staticValue.value);
     }
-    static parse(providedValue) {
-        let result = undefined;
-        this.ownStaticValues().forEach((staticValue) => {
-            if (staticValue.value instanceof this) {
-                const staticEnum = staticValue.value;
-                if (staticEnum.value === providedValue && !result) {
-                    result = staticEnum;
-                }
-            }
-        });
-        if (!result)
-            throw new Error(`Invalid provided value for enum ${this.modelName()}`);
-        return result;
-    }
-    static parseSafe(providedValue) {
-        try {
-            return this.parse(providedValue);
-        }
-        catch (error) {
-            return null;
-        }
-    }
     constructor(value) {
-        super({ value });
+        super();
+        this.initializeProps({ value });
     }
 };
 exports.EnumBase = EnumBase;

package/dist/core/enum/index.d.ts

@@ -1 +1,2 @@
 export * from "./enum";
+export * from "./enum-builder";

package/dist/core/enum/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./enum"), exports);
+__exportStar(require("./enum-builder"), exports);

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

@@ -0,0 +1 @@
+export type Id = string;

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

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/core/identifiable-model/identifiable-model.builder.d.ts

@@ -1,9 +1,9 @@
 import { ModelBuilder } from "../../model";
-import { Id } from "../id";
 import { AnyIdentifiableModel } from "./identifiable-model";
+import { Id } from "./id";
 export declare abstract class IdentifiableModelBuilder<T extends AnyIdentifiableModel> extends ModelBuilder<T> {
     protected id: Id;
-    newId(): Id;
+    newId(): string;
     withId(id: Id): this;
     withNewId(): this;
 }

package/dist/core/identifiable-model/identifiable-model.builder.js

@@ -3,14 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentifiableModelBuilder = void 0;
 const uuid_1 = require("uuid");
 const model_1 = require("../../model");
-const id_1 = require("../id");
 class IdentifiableModelBuilder extends model_1.ModelBuilder {
     constructor() {
         super(...arguments);
         this.id = this.newId();
     }
     newId() {
-        return new id_1.Id((0, uuid_1.v4)());
+        return (0, uuid_1.v4)();
     }
     withId(id) {
         this.id = id;

package/dist/core/identifiable-model/identifiable-model.d.ts

@@ -1,5 +1,5 @@
+import { Id } from "./id";
 import { ModelBase, Props } from "../../model";
-import { Id } from "../id";
 export interface IdentifiableModelMetadata {
     id: Id;
 }
@@ -7,7 +7,7 @@ export declare class IdentifiableModel<P extends Props> extends ModelBase<P> {
     protected readonly _id: Id;
     constructor(metadata: IdentifiableModelMetadata);
     metadata(): IdentifiableModelMetadata;
-    id(): Id;
+    id(): string;
     hasId(id: Id): boolean;
 }
 export type AnyIdentifiableModel = IdentifiableModel<Props>;

package/dist/core/identifiable-model/identifiable-model.js

@@ -17,7 +17,7 @@ class IdentifiableModel extends model_1.ModelBase {
         return this._id;
     }
     hasId(id) {
-        return this._id.equals(id);
+        return this._id === id;
     }
 }
 exports.IdentifiableModel = IdentifiableModel;

package/dist/core/identifiable-model/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./id";
 export * from "./identifiable-model";
 export * from "./identifiable-model.builder";

package/dist/core/identifiable-model/index.js

@@ -14,5 +14,6 @@ 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("./id"), exports);
 __exportStar(require("./identifiable-model"), exports);
 __exportStar(require("./identifiable-model.builder"), exports);

package/dist/core/index.d.ts

@@ -1,6 +1,5 @@
 export * from "./value-object";
 export * from "./enum";
-export * from "./id";
 export * from "./identifiable-model";
 export * from "./entity";
 export * from "./aggregate";

package/dist/core/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./value-object"), exports);
 __exportStar(require("./enum"), exports);
-__exportStar(require("./id"), exports);
 __exportStar(require("./identifiable-model"), exports);
 __exportStar(require("./entity"), exports);
 __exportStar(require("./aggregate"), exports);

package/dist/core/message/event/event-model-descriptor.d.ts

@@ -1,5 +1,6 @@
 import { AnyEvent } from ".";
+import { EventType } from "../../../meta";
 import { ModelDescriptor } from "../../../model";
 export interface EventModelDescriptor<T extends AnyEvent> extends ModelDescriptor<T> {
-    eventType: string;
+    eventType: EventType;
 }

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

@@ -2,7 +2,7 @@ import { Class } from "type-fest";
 import { EventType } from "../../../meta";
 import { Props, PropsOf } from "../../../model";
 import { ClassStatic } from "../../../types";
-import { Id } from "../../id";
+import { Id } from "../../identifiable-model";
 import { MessageBase, MessageMetadata } from "../message-base";
 import { EventModelDescriptor } from "./event-model-descriptor";
 export type EventSource = Readonly<{
@@ -22,7 +22,7 @@ export declare abstract class EventBase<P extends Props> extends MessageBase<P>
     metadata(): EventMetadata;
     eventType(): string;
     source(): Readonly<{
-        aggregateId: Id;
+        aggregateId: string;
         aggregateVersion: number;
     }>;
 }

package/dist/core/repository/repository.d.ts

@@ -1,5 +1,5 @@
+import { Id } from "../identifiable-model";
 import { AnyAggregate } from "../aggregate";
-import { Id } from "../id";
 export interface IRepository<T extends AnyAggregate> {
     findById(id: Id): Promise<T | null>;
     save(instance: T): Promise<any>;

package/dist/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"23.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","reflect-metadata":"^0.1.13","tsc-alias":"^1.8.8","type-fest":"^4.20.1","uuid":"^9.0.1"}}
+{"name":"ddd-node","version":"24.1.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": "23.0.1",
+  "version": "24.1.0",
   "description": "Domain Driven Design base for NodeJs",
   "type": "module",
   "main": "dist/index.js",

package/dist/core/id/id.d.ts

@@ -1,8 +0,0 @@
-import { ValueObjectBase } from "../value-object";
-export interface IdProps {
-    value: string;
-}
-export declare class Id extends ValueObjectBase<IdProps> {
-    constructor(idOrValue: Id | string);
-    value: string;
-}

package/dist/core/id/id.js

@@ -1,24 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Id = void 0;
-const model_1 = require("../../model");
-const value_object_1 = require("../value-object");
-class Id extends value_object_1.ValueObjectBase {
-    constructor(idOrValue) {
-        super({ value: idOrValue instanceof Id ? idOrValue.value : idOrValue });
-    }
-}
-exports.Id = Id;
-__decorate([
-    (0, model_1.Prop)(),
-    __metadata("design:type", String)
-], Id.prototype, "value", void 0);

package/dist/core/id/index.d.ts

@@ -1 +0,0 @@
-export * from "./id";

package/dist/core/id/index.js

@@ -1,17 +0,0 @@
-"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("./id"), exports);