ddd-node 34.0.0 → 34.1.0

package/base/decorators/model.d.ts

@@ -1,10 +1,10 @@
-import { ModelPropsValidator } from "../meta";
+import { ModelPropsValidateFn, ModelPropsValidator } from "../meta";
 import { AnyDomainModel, DomainModelClass } from "../model";
 export type ModelOptions<T extends AnyDomainModel = AnyDomainModel> = {
     name?: string;
     version?: number;
     domain?: string;
-    propsValidator?: ModelPropsValidator<T>;
+    propsValidator?: ModelPropsValidator<T> | ModelPropsValidateFn<T>;
     autoRegisterModel?: boolean;
 };
 export declare const DEFAULT_MODEL_OPTIONS: ModelOptions;

package/base/decorators/model.js

@@ -45,8 +45,14 @@ function Model(p1, p2, p3) {
             const domain = domainManager.getDomain(domainName);
             domain.modelRegistry.registerModel(target);
         }
-        if (modelOptions === null || modelOptions === void 0 ? void 0 : modelOptions.propsValidator)
-            (0, meta_1.defineModelPropGettersValidator)(target, modelOptions.propsValidator);
+        if (modelOptions === null || modelOptions === void 0 ? void 0 : modelOptions.propsValidator) {
+            if (typeof modelOptions.propsValidator === "function")
+                (0, meta_1.defineModelPropGettersValidator)(target, {
+                    validate: modelOptions.propsValidator,
+                });
+            else
+                (0, meta_1.defineModelPropGettersValidator)(target, modelOptions.propsValidator);
+        }
     };
 }
 exports.Model = Model;

package/base/decorators/props-validator.d.ts

@@ -1,2 +1,2 @@
-import { AnyDomainModel, DomainModelClass, ModelPropsValidator } from "..";
-export declare const PropsValidator: <T extends AnyDomainModel>(target: DomainModelClass<T>, key: string, propertyDescriptor: TypedPropertyDescriptor<ModelPropsValidator<T>>) => void;
+import { AnyDomainModel, DomainModelClass, ModelPropsValidateFn } from "..";
+export declare const PropsValidator: <T extends AnyDomainModel>(target: DomainModelClass<T>, key: string, propertyDescriptor: TypedPropertyDescriptor<ModelPropsValidateFn<T>>) => void;

package/base/decorators/props-validator.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PropsValidator = void 0;
 const __1 = require("..");
 const PropsValidator = (target, key, propertyDescriptor) => {
-    (0, __1.defineModelPropGettersValidator)(target, propertyDescriptor.value);
+    (0, __1.defineModelPropGettersValidator)(target, {
+        validate: propertyDescriptor.value.bind(target),
+    });
 };
 exports.PropsValidator = PropsValidator;

package/base/meta/model-props-validator.d.ts

@@ -1,5 +1,8 @@
 import { AnyDomainModel, InferredProps } from "../model";
-export type ModelPropsValidator<T extends AnyDomainModel = AnyDomainModel> = (props: InferredProps<T>) => void;
+export interface ModelPropsValidator<T extends AnyDomainModel = AnyDomainModel> {
+    validate(props: InferredProps<T>): void;
+}
+export type ModelPropsValidateFn<T extends AnyDomainModel> = ModelPropsValidator<T>["validate"];
 export declare const defineModelPropGettersValidator: <T extends AnyDomainModel>(target: object, validator: ModelPropsValidator<T>) => void;
 export declare const getOwnModelPropsValidator: <T extends AnyDomainModel>(target: object) => ModelPropsValidator<T> | undefined;
 export declare const MODEL_PROPS_VALIDATORS: unique symbol;

package/base/model/model.js

@@ -43,7 +43,9 @@ class DomainModel {
     }
     validateProps(props) {
         const modelPropsValidators = this.modelDescriptor().modelPropsValidators();
-        modelPropsValidators.forEach((propsValidator) => propsValidator.call(this.constructor, props));
+        modelPropsValidators.forEach((propsValidator) => propsValidator.validate(props)
+        // propsValidator.call(this.constructor, props)
+        );
     }
     validate() {
         this.validateProps(this._props);

package/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"34.0.0","description":"Domain Driven Design base for NodeJs","type":"commonjs","main":"index.js","types":"index.d.ts","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","tsconfig-paths":"^4.2.0","typescript":"^5.2.2"},"dependencies":{"lodash":"^4.17.21","reflect-metadata":"^0.1.13","ts-node":"^10.9.2","tsc-alias":"^1.8.8","type-fest":"^4.20.1","uuid":"^9.0.1"}}
+{"name":"ddd-node","version":"34.1.0","description":"Domain Driven Design base for NodeJs","type":"commonjs","main":"index.js","types":"index.d.ts","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","tsconfig-paths":"^4.2.0","typescript":"^5.2.2"},"dependencies":{"lodash":"^4.17.21","reflect-metadata":"^0.1.13","ts-node":"^10.9.2","tsc-alias":"^1.8.8","type-fest":"^4.20.1","uuid":"^9.0.1"}}