ddd-node 24.1.1 → 24.1.2

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

@@ -9,6 +9,7 @@ export declare class EnumBase extends ModelBase<EnumProps> {
     static values(): EnumBase[];
     constructor(value: EnumValue);
     value: EnumValue;
+    valueOf(): EnumValue;
 }
 export type AnyEnum = EnumBase;
 export interface EnumClass<T extends AnyEnum = AnyEnum, Arguments extends unknown[] = any[]> extends Class<T, Arguments>, ClassStatic<typeof EnumBase> {

package/dist/core/enum/enum.js

@@ -19,6 +19,9 @@ let EnumBase = class EnumBase extends model_1.ModelBase {
         super();
         this.initializeProps({ value });
     }
+    valueOf() {
+        return this.value;
+    }
 };
 exports.EnumBase = EnumBase;
 __decorate([

package/dist/core/value-object/value-object.d.ts

@@ -6,6 +6,8 @@ export declare class ValueObjectBase<P extends Props> extends ModelBase<P> {
     props(): P;
     equals<V extends AnyValueObject>(vo: V): boolean;
     with(props: Partial<P>): typeof this;
+    getEqualityValue(): string;
+    getEqualityObject(): any;
 }
 export type AnyValueObject = ValueObjectBase<Props>;
 export interface ValueObjectClass<T extends AnyValueObject = AnyValueObject> extends Class<T>, ClassStatic<typeof ValueObjectBase<PropsOf<T>>> {

package/dist/core/value-object/value-object.js

@@ -11,11 +11,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var ValueObjectBase_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ValueObjectBase = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 const model_1 = require("../../model");
-let ValueObjectBase = class ValueObjectBase extends model_1.ModelBase {
+let ValueObjectBase = ValueObjectBase_1 = class ValueObjectBase extends model_1.ModelBase {
     constructor(props) {
         super();
         this.initializeProps(props);
@@ -25,16 +26,36 @@ let ValueObjectBase = class ValueObjectBase extends model_1.ModelBase {
     }
     equals(vo) {
         const equalsType = vo instanceof this.constructor;
-        const equalsValue = JSON.stringify(vo.props()) === JSON.stringify(this.props());
+        const equalsValue = this.getEqualityValue() === vo.getEqualityValue();
         return equalsType && equalsValue;
     }
     with(props) {
         const newProps = lodash_1.default.merge(this.props(), props);
         return new this.constructor(newProps);
     }
+    getEqualityValue() {
+        return JSON.stringify(this.getEqualityObject());
+    }
+    getEqualityObject() {
+        const result = {};
+        const props = this.props();
+        const valueOf = (v) => v instanceof ValueObjectBase_1 ? v.getEqualityObject() : v;
+        for (let [key, value] of Object.entries(props)) {
+            if (Array.isArray(value)) {
+                result[key] = value.map((v) => valueOf(v));
+                result[key].sort((a, b) => {
+                    const stringValueOf = (v) => JSON.stringify(v);
+                    return stringValueOf(a).localeCompare(stringValueOf(b));
+                });
+                continue;
+            }
+            result[key] = valueOf(value);
+        }
+        return result;
+    }
 };
 exports.ValueObjectBase = ValueObjectBase;
-exports.ValueObjectBase = ValueObjectBase = __decorate([
+exports.ValueObjectBase = ValueObjectBase = ValueObjectBase_1 = __decorate([
     (0, model_1.Mutable)(false),
     __metadata("design:paramtypes", [Object])
 ], ValueObjectBase);

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

@@ -1,4 +1,4 @@
-import { Class } from "type-fest";
+import { AbstractClass, Class } from "type-fest";
 import { ModelId, ModelName, ModelVersion, PropsMap, PropsValidator, StaticValuesMap } from "../meta";
 import { ClassStatic } from "../../types";
 import { ModelDescriptor } from "./model-descriptor";
@@ -36,3 +36,5 @@ export type AnyModel = ModelBase<Props>;
 export type PropsOf<T extends AnyModel> = T extends ModelBase<infer P extends Props> ? P : never;
 export interface ModelClass<T extends AnyModel = AnyModel> extends Class<T>, ClassStatic<typeof ModelBase<PropsOf<T>>> {
 }
+export interface AbstractModelClass<T extends AnyModel = AnyModel> extends AbstractClass<T>, ClassStatic<typeof ModelBase<PropsOf<T>>> {
+}

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

@@ -1,2 +1,2 @@
-import { ModelClass } from "../core";
-export declare const Mutable: (mutable?: boolean) => (target: ModelClass) => void;
+import { AbstractModelClass, ModelClass } from "../core";
+export declare const Mutable: (mutable?: boolean) => <T extends ModelClass<import("../core").AnyModel> | AbstractModelClass<import("../core").AnyModel>>(target: T) => void;

package/dist/package.json

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