ddd-node 34.2.0 → 35.0.0

package/core/model/message/message.d.ts

@@ -1,36 +1,26 @@
 import { Class } from "type-fest";
 import { DomainModelClass, InferredProps, Props } from "../../../base";
 import { ClassStatic } from "../../../types";
-import { ModelWithId, ModelWithIdMetadata } from "../model-with-id";
+import { Id, IdentifiedModel } from "../identified-model";
+export type Timestamp = number;
+export type CausationId = string;
 export interface CorrelationIds {
     [type: string]: string | undefined;
 }
-export interface MessageMetadata extends ModelWithIdMetadata {
-    timestamp: number;
-    causationId?: string;
-    correlationIds: CorrelationIds;
-}
-export type MessageMetadataInput = Partial<MessageMetadata>;
-export declare class Message<P extends Props> extends ModelWithId<P> {
-    static createMetadata: (metadata?: MessageMetadataInput) => {
-        timestamp: number;
-        causationId?: string;
-        correlationIds: CorrelationIds;
-        id: import("../model-with-id").Id;
-    };
-    static buildMessage<T extends AnyMessage>(this: MessageClassWithTypedConstructor<T>, props: InferredProps<T>, metadata?: MessageMetadataInput): T;
-    private readonly _timestamp;
+export declare class Message<P extends Props> extends IdentifiedModel<P> {
+    private _timestamp;
     private _causationId?;
     private _correlationIds;
-    constructor(metadata: MessageMetadata, props: P);
+    constructor(id: Id, timestamp: Timestamp, props: P, causationId?: CausationId, correlationIds?: CorrelationIds);
     props(): P;
-    metadata(): MessageMetadata;
-    timestamp(): number;
-    correlationIds(): CorrelationIds;
-    causationId(): string | undefined;
+    get timestamp(): number;
+    get correlationIds(): CorrelationIds;
+    get causationId(): string | undefined;
+    setTimestamp(timestamp: number): void;
     setCausationId(causationId: string): void;
-    addCorrelationId(type: string, correlationId: string): void;
+    setCorrelationId(type: string, correlationId: string): void;
     setCorrelationIds(correlationIds: CorrelationIds): void;
+    mergeCorrelationIds(correlationIds: CorrelationIds): void;
 }
 export type AnyMessage = Message<Props>;
 export type MessageClass<T extends AnyMessage = AnyMessage, Arguments extends unknown[] = any[]> = DomainModelClass<T> & Class<T, Arguments> & ClassStatic<typeof Message<InferredProps<T>>>;

package/core/model/message/message.js

@@ -8,63 +8,52 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Message = void 0;
-const uuid_1 = require("uuid");
+const lodash_1 = __importDefault(require("lodash"));
 const base_1 = require("../../../base");
-const model_with_id_1 = require("../model-with-id");
-let Message = class Message extends model_with_id_1.ModelWithId {
-    static buildMessage(props, metadata) {
-        return new this(this.createMetadata(metadata), props);
-    }
-    constructor(metadata, props) {
-        super(metadata);
-        this._timestamp = metadata.timestamp;
-        this._causationId = metadata.causationId;
-        this._correlationIds = metadata.correlationIds;
+const identified_model_1 = require("../identified-model");
+let Message = class Message extends identified_model_1.IdentifiedModel {
+    constructor(id, timestamp, props, causationId, correlationIds) {
+        super(id);
+        this._timestamp = timestamp;
+        this._causationId = causationId;
+        this._correlationIds = correlationIds ?? {};
         this.initializeProps(props);
     }
     props() {
         return super.props();
     }
-    metadata() {
-        return {
-            ...super.metadata(),
-            timestamp: this._timestamp,
-            correlationIds: this._correlationIds,
-            causationId: this._causationId,
-        };
-    }
-    timestamp() {
+    get timestamp() {
         return this._timestamp;
     }
-    correlationIds() {
+    get correlationIds() {
         return this._correlationIds;
     }
-    causationId() {
+    get causationId() {
         return this._causationId;
     }
+    setTimestamp(timestamp) {
+        this._timestamp = timestamp;
+    }
     setCausationId(causationId) {
-        if (!this._causationId)
-            this._causationId = causationId;
+        this._causationId = causationId;
     }
-    addCorrelationId(type, correlationId) {
+    setCorrelationId(type, correlationId) {
         this._correlationIds[type] = correlationId;
     }
     setCorrelationIds(correlationIds) {
         this._correlationIds = correlationIds;
     }
+    mergeCorrelationIds(correlationIds) {
+        this.setCorrelationIds(lodash_1.default.merge(this._correlationIds, correlationIds));
+    }
 };
 exports.Message = Message;
-Message.createMetadata = (metadata) => {
-    return {
-        id: (0, uuid_1.v4)(),
-        timestamp: Date.now(),
-        correlationIds: {},
-        ...metadata,
-    };
-};
 exports.Message = Message = __decorate([
     (0, base_1.Mutable)(false),
-    __metadata("design:paramtypes", [Object, Object])
+    __metadata("design:paramtypes", [String, Number, Object, String, Object])
 ], Message);

package/package.json

@@ -1 +1 @@
-{"name":"ddd-node","version":"34.2.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.9.3"},"dependencies":{"class-transformer":"^0.5.1","is-class":"^0.0.9","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"},"peerDependencies":{"class-validator":"^0.14.2"}}
+{"name":"ddd-node","version":"35.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.9.3"},"dependencies":{"class-transformer":"^0.5.1","is-class":"^0.0.9","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"},"peerDependencies":{"class-validator":"^0.14.2"}}

package/core/model/model-with-id/index.d.ts

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

package/core/model/model-with-id/model-with-id.d.ts

@@ -1,13 +0,0 @@
-import { Id } from "./id";
-import { DomainModel, Props } from "../../../base";
-export interface ModelWithIdMetadata {
-    id: Id;
-}
-export declare class ModelWithId<P extends Props> extends DomainModel<P> {
-    protected readonly _id: Id;
-    constructor(metadata: ModelWithIdMetadata);
-    metadata(): ModelWithIdMetadata;
-    id(): string;
-    hasId(id: Id): boolean;
-}
-export type AnyModelWithId = ModelWithId<Props>;

package/core/model/model-with-id/model-with-id.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelWithId = void 0;
-const base_1 = require("../../../base");
-class ModelWithId extends base_1.DomainModel {
-    constructor(metadata) {
-        super();
-        this._id = metadata.id;
-    }
-    metadata() {
-        return {
-            ...super.metadata(),
-            id: this._id,
-        };
-    }
-    id() {
-        return this._id;
-    }
-    hasId(id) {
-        return this._id === id;
-    }
-}
-exports.ModelWithId = ModelWithId;