ddd-node 16.4.0 → 17.1.0

package/dist/core/aggregate/base.js

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

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

@@ -61,11 +61,11 @@ class EventSourcedAggregateBase extends base_1.AggregateBase {
     }
     validateEventBeforeApply(event) {
         const eventSource = event.source();
-        if (eventSource.aggregate !== this.modelName())
+        if (eventSource.aggregateModel !== this.modelName())
             throw new Error("Invalid source type");
-        if (!eventSource.id.equals(this._id))
+        if (!eventSource.aggregateId.equals(this._id))
             throw new Error("Invalid source id");
-        if (eventSource.version !== this.version())
+        if (eventSource.aggregateVersion !== this.version())
             throw new Error("Invalid source version");
     }
     _applyEvent(event) {

package/dist/core/domain.d.ts

@@ -1,19 +1,17 @@
+import { ModelName, ModelVersion } from "../meta";
 import { AnyModel, ModelClass } from "./model";
-type ModelName = string;
-type ModelVersion = number;
 export declare class ModelVersionRegistry<T extends AnyModel = AnyModel> extends Map<ModelVersion, ModelClass<T>> {
 }
 export declare class ModelRegistry<T extends AnyModel = AnyModel> extends Map<ModelName, ModelVersionRegistry<T>> {
 }
 export type DomainName = string;
 export declare class Domain {
-    readonly name?: DomainName;
+    readonly name: DomainName;
     private readonly modelRegistry;
-    constructor(name?: DomainName);
+    constructor(name: DomainName);
     getModelVersionRegistry(modelName: ModelName): ModelVersionRegistry<AnyModel>;
     getModel(modelName: ModelName, modelVersion?: ModelVersion): ModelClass<AnyModel> | undefined;
     hasRegisteredModel(modelName: ModelName, modelVersion: ModelVersion): boolean;
     hasRegisteredModel(model: ModelClass): boolean;
     registerModel(modelClass: ModelClass): this;
 }
-export {};

package/dist/core/enum.js

@@ -7,7 +7,7 @@ class EnumBase extends model_1.ModelBase {
         return Array.from(this.ownStaticValues().values()).map((staticValue) => staticValue.value);
     }
     static parseSafe(providedValue) {
-        let key;
+        let key = undefined;
         this.ownStaticValues().forEach((staticValue, staticValueKey) => {
             if (staticValue.value instanceof this) {
                 const staticEnum = staticValue.value;

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

@@ -2,7 +2,7 @@ import { ClassStatic } from "../../types";
 import { Class } from "type-fest";
 import { Props, PropsOf } from "../model";
 import { MessageBase, MessageContext, MessageMetadata } from "./message";
-export type CommandType = string;
+import { CommandType } from "../../meta";
 export interface CommandMetadata extends Omit<MessageMetadata, "messageType"> {
 }
 export declare class CommandBase<P extends Props> extends MessageBase<P> {

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

@@ -3,11 +3,11 @@ import { Class } from "type-fest";
 import { Id } from "../id";
 import { Props, PropsOf } from "../model";
 import { MessageBase, MessageContext, MessageMetadata } from "./message";
-export type EventType = string;
+import { EventType } from "../../meta";
 export type EventSource = Readonly<{
-    aggregate: string;
-    id: Id;
-    version: number;
+    aggregateModel: string;
+    aggregateId: Id;
+    aggregateVersion: number;
 }>;
 export interface EventMetadata extends Omit<MessageMetadata, "messageType"> {
     source: EventSource;
@@ -19,9 +19,9 @@ export declare class EventBase<P extends Props> extends MessageBase<P> {
     static eventType(): EventType;
     static newEvent<T extends AnyEvent>(this: EventClassWithTypedConstructor<T>, source: EventSource, props: PropsOf<T>, context?: MessageContext, timestamp?: number): T;
     source(): Readonly<{
-        aggregate: string;
-        id: Id;
-        version: number;
+        aggregateModel: string;
+        aggregateId: Id;
+        aggregateVersion: number;
     }>;
     eventType(): string;
 }

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

@@ -14,18 +14,20 @@ export declare class ModelBase<P extends Props> {
     static mutable(): boolean;
     static modelName<T extends AnyModel>(this: ModelClass<T>): string;
     static modelVersion<T extends AnyModel>(this: ModelClass<T>): number;
+    static modelId<T extends AnyModel>(this: ModelClass<T>): import("../../meta").ModelId;
     static ownPropsValidator<T extends AnyModel>(this: ModelClass<T>): import("../../meta").PropsValidator<T> | undefined;
     static propsValidators<T extends AnyModel>(this: ModelClass<T>): import("../../meta").PropsValidator<AnyModel>[];
-    static ownStaticValues<T extends AnyModel>(this: ModelClass<T>): Map<string | symbol, import("../../meta").StaticValue<T>>;
+    static ownStaticValues<T extends AnyModel>(this: ModelClass<T>): Map<PropertyKey, import("../../meta").StaticValue<T>>;
     static ownPropsMap(): import("../../meta").PropsMap<ModelBase<any>>;
     static propsMap(): import("../../meta").PropsMap<ModelBase<any>>;
     constructor();
     protected redefineModel(): void;
     protected redefineProp(key: keyof this, propTargetKey: keyof P): void;
-    protected get _modelClass(): ModelClass<this>;
+    protected get _modelClass(): ModelClass<typeof this>;
     isMutable(): boolean;
     modelName(): string;
     modelVersion(): number;
+    modelId(): import("../../meta").ModelId;
     ownPropsValidator(): import("../../meta").PropsValidator<this> | undefined;
     propsValidators(): import("../../meta").PropsValidator<AnyModel>[];
     ownPropsMap(): import("../../meta").PropsMap<ModelBase<any>>;

package/dist/core/model/model.js

@@ -20,6 +20,9 @@ class ModelBase {
     static modelVersion() {
         return (0, meta_1.getModelVersion)(this);
     }
+    static modelId() {
+        return (0, meta_1.getModelId)(this);
+    }
     static ownPropsValidator() {
         return (0, meta_1.getOwnPropsValidator)(this);
     }
@@ -66,6 +69,9 @@ class ModelBase {
     modelVersion() {
         return this._modelClass.modelVersion();
     }
+    modelId() {
+        return this._modelClass.modelId();
+    }
     ownPropsValidator() {
         return this._modelClass.ownPropsValidator();
     }

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

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

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

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

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./meta";
-export * from "./core";
-export * from "./decorators";
 export * from "./types";
 export * from "./utils";
+export * from "./core";
+export * from "./decorators";

package/dist/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./meta"), exports);
-__exportStar(require("./core"), exports);
-__exportStar(require("./decorators"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./core"), exports);
+__exportStar(require("./decorators"), exports);

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

@@ -1,4 +1,4 @@
 import "reflect-metadata";
-import { CommandType } from "../core";
+export type CommandType = string;
 export declare const setCommandType: (target: object, commandType: CommandType) => void;
 export declare const getCommandType: (target: object) => CommandType | undefined;

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

@@ -1,4 +1,4 @@
 import "reflect-metadata";
-import { EventType } from "../core";
+export type EventType = string;
 export declare const setEventType: (target: object, eventType: EventType) => void;
 export declare const getEventType: (target: object) => EventType | undefined;

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

@@ -5,15 +5,31 @@ export declare class PropsMap<T extends AnyModel = AnyModel> extends Map<PropKey
 export declare const getOwnPropsMap: <T extends AnyModel = AnyModel>(target: T) => PropsMap<T>;
 export declare const setProp: <T extends AnyModel = AnyModel>(target: T, key: PropKey, propTargetKey?: keyof PropsOf<T> | undefined) => void;
 export declare const getPropsMap: <T extends AnyModel = AnyModel>(target: T) => PropsMap<T>;
-export declare const setModelName: <T extends AnyModel>(target: ModelClass<T>, name: string) => void;
-export declare const getModelName: <T extends AnyModel>(target: ModelClass<T>) => string;
-export declare const setModelVersion: <T extends AnyModel>(target: ModelClass<T>, version: number) => void;
-export declare const getModelVersion: <T extends AnyModel>(target: ModelClass<T>) => number;
+export type ModelName = string;
+export declare const setModelName: <T extends AnyModel>(target: ModelClass<T>, name: ModelName) => void;
+export declare const getModelName: <T extends AnyModel>(target: ModelClass<T>) => ModelName;
+export type ModelVersion = number;
+export declare const setModelVersion: <T extends AnyModel>(target: ModelClass<T>, version: ModelVersion) => void;
+export declare const getModelVersion: <T extends AnyModel>(target: ModelClass<T>) => ModelVersion;
+export type ModelIdValue = `${ModelName}${typeof ModelId.ValueDivider}${ModelVersion}`;
+export declare class ModelId {
+    readonly modelName: ModelName;
+    readonly modelVersion: ModelVersion;
+    static readonly ValueDivider: "|";
+    static fromValue(value: ModelIdValue): ModelId;
+    static makeValue(modelId: ModelId): ModelIdValue;
+    constructor(modelName: ModelName, modelVersion: ModelVersion);
+    get value(): ModelIdValue;
+    equalsValue(modelIdValue: ModelIdValue): boolean;
+    equals(modelId: ModelId): boolean;
+}
+export declare const setModelId: <T extends AnyModel>(target: ModelClass<T>, modelId: ModelId) => void;
+export declare const getModelId: <T extends AnyModel>(target: ModelClass<T>) => ModelId;
 export type PropsValidator<T extends AnyModel = AnyModel> = (props: PropsOf<T>) => void;
 export declare const setPropsValidator: <T extends AnyModel>(target: object, validator: PropsValidator<T>) => void;
 export declare const getOwnPropsValidator: <T extends AnyModel>(target: object) => PropsValidator<T> | undefined;
 export declare const PropsValidatorsMetaKey: unique symbol;
-export declare const getPropsValidators: (target: object) => PropsValidator<AnyModel>[];
-export declare const getOwnStaticValues: <T extends AnyModel>(target: object) => Map<string | symbol, StaticValue<T>>;
-export declare const setStaticValue: <T extends AnyModel>(target: object, key: string, value: T | StaticValueBuilder<T>) => void;
+export declare const getPropsValidators: (target: object) => PropsValidator[];
+export declare const getOwnStaticValues: <T extends AnyModel>(target: object) => Map<PropertyKey, StaticValue<T>>;
+export declare const setStaticValue: <T extends AnyModel>(target: object, key: PropertyKey, value: T | StaticValueBuilder<T>) => void;
 export declare const getStaticValue: (target: object, key: string | symbol) => AnyModel | undefined;

package/dist/meta/model.metadata.js

@@ -3,10 +3,11 @@ 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.getModelVersion = exports.setModelVersion = exports.getModelName = exports.setModelName = exports.getPropsMap = exports.setProp = exports.getOwnPropsMap = exports.PropsMap = void 0;
+exports.getStaticValue = exports.setStaticValue = exports.getOwnStaticValues = exports.getPropsValidators = exports.PropsValidatorsMetaKey = exports.getOwnPropsValidator = exports.setPropsValidator = exports.getModelId = exports.setModelId = exports.ModelId = exports.getModelVersion = exports.setModelVersion = 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");
+// OWN PROPS MAP
 const OwnPropsMapMetaKey = Symbol.for("OWN_PROPS_MAP");
 class PropsMap extends Map {
 }
@@ -25,6 +26,7 @@ const setProp = (target, key, propTargetKey) => {
         ownPropsMap.set(key, propTargetKey);
 };
 exports.setProp = setProp;
+// PROPS MAP
 const PropsMapMetaKey = Symbol.for("PROPS_MAP");
 const getPropsMap = (target) => {
     const propsMap = () => Reflect.getOwnMetadata(PropsMapMetaKey, target);
@@ -50,7 +52,6 @@ const getPropsMap = (target) => {
     return propsMap();
 };
 exports.getPropsMap = getPropsMap;
-//
 const ModelNameMetaKey = Symbol.for("MODEL_NAME");
 const setModelName = (target, name) => {
     Reflect.defineMetadata(ModelNameMetaKey, name, target);
@@ -63,7 +64,6 @@ const getModelName = (target) => {
     return modelName();
 };
 exports.getModelName = getModelName;
-//
 const ModelVersionMetaKey = Symbol.for("MODEL_VERSION");
 const setModelVersion = (target, version) => {
     Reflect.defineMetadata(ModelVersionMetaKey, version, target);
@@ -76,6 +76,45 @@ const getModelVersion = (target) => {
     return modelVersion();
 };
 exports.getModelVersion = getModelVersion;
+class ModelId {
+    static fromValue(value) {
+        const [modelName, modelVersion] = value.split(this.ValueDivider);
+        return new ModelId(String(modelName), Number(modelVersion));
+    }
+    static makeValue(modelId) {
+        return `${modelId.modelName}${this.ValueDivider}${modelId.modelVersion}`;
+    }
+    constructor(modelName, modelVersion) {
+        this.modelName = modelName;
+        this.modelVersion = modelVersion;
+    }
+    get value() {
+        return ModelId.makeValue(this);
+    }
+    equalsValue(modelIdValue) {
+        return this.value === modelIdValue;
+    }
+    equals(modelId) {
+        return this.equalsValue(modelId.value);
+    }
+}
+exports.ModelId = ModelId;
+ModelId.ValueDivider = "|";
+const ModelIdMetaKey = Symbol.for("MODEL_ID");
+const setModelId = (target, modelId) => {
+    Reflect.defineMetadata(ModelIdMetaKey, modelId, target);
+};
+exports.setModelId = setModelId;
+const getModelId = (target) => {
+    const modelId = () => Reflect.getOwnMetadata(ModelIdMetaKey, target);
+    if (!modelId()) {
+        const modelName = (0, exports.getModelName)(target);
+        const modelVersion = (0, exports.getModelVersion)(target);
+        (0, exports.setModelId)(target, new ModelId(modelName, modelVersion));
+    }
+    return modelId();
+};
+exports.getModelId = getModelId;
 const OwnPropsValidatorMetaKey = Symbol.for("OWN_PROPS_VALIDATOR");
 const setPropsValidator = (target, validator) => {
     Reflect.defineMetadata(OwnPropsValidatorMetaKey, validator, target);

package/dist/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"16.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","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":"17.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","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": "16.4.0",
+  "version": "17.1.0",
   "description": "Domain Driven Design base for NodeJs",
   "type": "module",
   "main": "dist/index.js",