ddd-node 15.1.1 → 15.3.0

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

@@ -13,16 +13,19 @@ export declare class ModelBase<P extends Props> {
     static isModel(model: any): model is AnyModel;
     static mutable(): boolean;
     static modelName<T extends AnyModel>(this: ModelClass<T>): string;
-    static propsValidator<T extends AnyModel>(this: ModelClass<T>): import("../../meta").PropsValidator<T> | undefined;
+    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 ownPropsMap(): import("../../meta").PropsMap<ModelBase<any>>;
     static propsMap(): import("../../meta").PropsMap<ModelBase<any>>;
     constructor();
-    private redefineModel;
-    protected get currentModelType(): ModelClass<this>;
+    protected redefineModel(): void;
+    protected redefineProp(key: keyof this, propTargetKey: keyof P): void;
+    protected get _modelClass(): ModelClass<this>;
     isMutable(): boolean;
     modelName(): string;
-    propsValidator(): import("../../meta").PropsValidator<this> | undefined;
+    ownPropsValidator(): import("../../meta").PropsValidator<this> | undefined;
+    propsValidators(): import("../../meta").PropsValidator<AnyModel>[];
     ownPropsMap(): import("../../meta").PropsMap<ModelBase<any>>;
     propsMap(): import("../../meta").PropsMap<any>;
     validateProps(props: P): void;

package/dist/core/model/model.js

@@ -17,8 +17,11 @@ class ModelBase {
     static modelName() {
         return (0, meta_1.getModelName)(this);
     }
-    static propsValidator() {
-        return (0, meta_1.getPropsValidator)(this);
+    static ownPropsValidator() {
+        return (0, meta_1.getOwnPropsValidator)(this);
+    }
+    static propsValidators() {
+        return (0, meta_1.getPropsValidators)(this);
     }
     static ownStaticValues() {
         return (0, meta_1.getOwnStaticValues)(this);
@@ -34,38 +37,44 @@ class ModelBase {
         this.redefineModel();
     }
     redefineModel() {
-        this.propsMap().forEach((propKeyTarget, key) => {
-            Object.defineProperty(this, key, {
-                configurable: true,
-                enumerable: true,
-                get() {
-                    return this._props?.[propKeyTarget];
-                },
-            });
+        this.propsMap().forEach((propTargetKey, key) => {
+            this.redefineProp(key, propTargetKey);
         });
     }
-    get currentModelType() {
+    redefineProp(key, propTargetKey) {
+        Object.defineProperty(this, key, {
+            // must be true because the props() method need to recall redefineModel(-> redefineProp)
+            configurable: true,
+            enumerable: true,
+            get() {
+                return this._props?.[propTargetKey];
+            },
+        });
+    }
+    get _modelClass() {
         return this.constructor;
     }
     isMutable() {
-        return this.currentModelType.mutable();
+        return this._modelClass.mutable();
     }
     modelName() {
-        return this.currentModelType.modelName();
+        return this._modelClass.modelName();
+    }
+    ownPropsValidator() {
+        return this._modelClass.ownPropsValidator();
     }
-    propsValidator() {
-        return this.currentModelType.propsValidator();
+    propsValidators() {
+        return this._modelClass.propsValidators();
     }
     ownPropsMap() {
-        return this.currentModelType.ownPropsMap();
+        return this._modelClass.ownPropsMap();
     }
     propsMap() {
         return (0, meta_1.getPropsMap)(Reflect.getPrototypeOf(this));
     }
     validateProps(props) {
-        const propsValidator = this.propsValidator();
-        if (propsValidator)
-            propsValidator(props);
+        const propsValidators = this.propsValidators();
+        propsValidators.forEach((propsValidator) => propsValidator(props));
     }
     validate() {
         this.validateProps(this._props);

package/dist/decorators/aggregate-es/handle.d.ts

@@ -1,2 +1,2 @@
-import { AnyCommand, CommandClass, CommandHandler } from "../../core";
-export declare const Handle: <T extends AnyCommand>(commandClass: CommandClass<T, any[]>) => <U extends CommandHandler<T>>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<U>) => void;
+import { AnyCommand, AnyEventSourcedAggregate, CommandClass, CommandHandler } from "../../core";
+export declare const Handle: <T extends AnyCommand>(commandClass: CommandClass<T, any[]>) => <U extends CommandHandler<T>>(target: AnyEventSourcedAggregate, propertyKey: string, descriptor: TypedPropertyDescriptor<U>) => void;

package/dist/decorators/aggregate-es/when.d.ts

@@ -1,2 +1,2 @@
-import { AnyEvent, EventApplier, EventClass } from "../../core";
-export declare const When: <T extends AnyEvent>(eventClass: EventClass<T, any[]>) => <U extends EventApplier<T>>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<U>) => void;
+import { AnyEvent, AnyEventSourcedAggregate, EventApplier, EventClass } from "../../core";
+export declare const When: <T extends AnyEvent>(eventClass: EventClass<T, any[]>) => <U extends EventApplier<T>>(target: AnyEventSourcedAggregate, propertyKey: string, descriptor: TypedPropertyDescriptor<U>) => void;

package/dist/decorators/model/prop.d.ts

@@ -1,2 +1,2 @@
 import { AnyModel, PropKey, PropsOf } from "../../core";
-export declare const Prop: <T extends AnyModel>(propKey?: keyof PropsOf<T> | undefined) => (target: T, key: PropKey) => void;
+export declare const Prop: <T extends AnyModel>(propTargetKey?: keyof PropsOf<T> | undefined) => (target: T, key: PropKey) => void;

package/dist/decorators/model/prop.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Prop = void 0;
 const meta_1 = require("../../meta");
-const Prop = (propKey) => {
+const Prop = (propTargetKey) => {
     return (target, key) => {
-        (0, meta_1.setProp)(target, key, propKey ?? key);
+        (0, meta_1.setProp)(target, key, propTargetKey ?? key);
     };
 };
 exports.Prop = Prop;

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

@@ -3,13 +3,15 @@ import { StaticValue, StaticValueBuilder } from "./helpers/static-value";
 export declare class PropsMap<T extends AnyModel = AnyModel> extends Map<PropKey, keyof PropsOf<T>> {
 }
 export declare const getOwnPropsMap: <T extends AnyModel = AnyModel>(target: T) => PropsMap<T>;
-export declare const setProp: <T extends AnyModel = AnyModel>(target: T, key: PropKey, targetPropKey?: keyof PropsOf<T> | undefined) => void;
+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 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 getPropsValidator: <T extends AnyModel>(target: object) => PropsValidator<T> | undefined;
+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 getStaticValue: (target: object, key: string | symbol) => AnyModel | undefined;

package/dist/meta/model.metadata.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getStaticValue = exports.setStaticValue = exports.getOwnStaticValues = exports.getPropsValidator = exports.setPropsValidator = 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.getModelName = exports.setModelName = exports.getPropsMap = exports.setProp = exports.getOwnPropsMap = exports.PropsMap = void 0;
 const core_1 = require("../core");
 const static_value_1 = require("./helpers/static-value");
 const OwnPropsMapMetaKey = Symbol.for("OWN_PROPS_MAP");
-// Prop keys map is a Map<Key, TargetPropKey>;
 class PropsMap extends Map {
 }
 exports.PropsMap = PropsMap;
@@ -16,10 +15,10 @@ const getOwnPropsMap = (target) => {
     return ownPropsMap();
 };
 exports.getOwnPropsMap = getOwnPropsMap;
-const setProp = (target, key, targetPropKey) => {
+const setProp = (target, key, propTargetKey) => {
     const ownPropsMap = (0, exports.getOwnPropsMap)(target);
-    if (targetPropKey)
-        ownPropsMap.set(key, targetPropKey);
+    if (propTargetKey)
+        ownPropsMap.set(key, propTargetKey);
 };
 exports.setProp = setProp;
 const PropsMapMetaKey = Symbol.for("PROPS_MAP");
@@ -60,15 +59,32 @@ const getModelName = (target) => {
     return modelName();
 };
 exports.getModelName = getModelName;
-const PropsValidatorMetaKey = Symbol.for("PROPS_VALIDATOR");
+const OwnPropsValidatorMetaKey = Symbol.for("OWN_PROPS_VALIDATOR");
 const setPropsValidator = (target, validator) => {
-    Reflect.defineMetadata(PropsValidatorMetaKey, validator, target);
+    Reflect.defineMetadata(OwnPropsValidatorMetaKey, validator, target);
 };
 exports.setPropsValidator = setPropsValidator;
-const getPropsValidator = (target) => {
-    return Reflect.getMetadata(PropsValidatorMetaKey, target);
+const getOwnPropsValidator = (target) => {
+    return Reflect.getOwnMetadata(OwnPropsValidatorMetaKey, target);
 };
-exports.getPropsValidator = getPropsValidator;
+exports.getOwnPropsValidator = getOwnPropsValidator;
+exports.PropsValidatorsMetaKey = Symbol.for("PROPS_VALIDATORS");
+const getPropsValidators = (target) => {
+    const validators = () => Reflect.getOwnMetadata(exports.PropsValidatorsMetaKey, target);
+    if (validators())
+        return validators();
+    const result = [];
+    let _target = target;
+    do {
+        const ownValidator = (0, exports.getOwnPropsValidator)(_target);
+        if (ownValidator)
+            result.push(ownValidator);
+        _target = Reflect.getPrototypeOf(_target);
+    } while (_target !== null);
+    Reflect.defineMetadata(exports.PropsValidatorsMetaKey, result, target);
+    return validators();
+};
+exports.getPropsValidators = getPropsValidators;
 //
 const OwnStaticValuesMetaKey = Symbol.for("OWN_STATIC_VALUES");
 const getOwnStaticValues = (target) => {

package/dist/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"15.1.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"}}
+{"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"}}

package/package.json

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