ddd-node 14.0.1 → 15.0.0

package/dist/core/id/common/snowflake.d.ts

@@ -1,9 +1,8 @@
 import { SnowflakeOpts } from "nodejs-snowflake";
 import { IIdService } from "../interface";
-export declare class SnowflakeIdService implements IIdService<string> {
+export declare class SnowflakeIdService implements IIdService {
     private _snowflake;
     constructor(options?: SnowflakeOpts);
     validateValue(value: string): void;
     generateValue(): string;
-    compareValue(v1: string, v2: string): boolean;
 }

package/dist/core/id/common/snowflake.js

@@ -7,7 +7,4 @@ export class SnowflakeIdService {
     generateValue() {
         return this._snowflake.getUniqueID().toString(16);
     }
-    compareValue(v1, v2) {
-        return v1 === v2;
-    }
 }

package/dist/core/id/common/uuid4.d.ts

@@ -1,6 +1,5 @@
 import { IIdService } from "../interface";
-export declare class Uuid4Service implements IIdService<string> {
+export declare class Uuid4Service implements IIdService {
     validateValue(value: string): void;
     generateValue(): string;
-    compareValue(v1: string, v2: string): boolean;
 }

package/dist/core/id/common/uuid4.js

@@ -11,7 +11,4 @@ export class Uuid4Service {
     generateValue() {
         return v4();
     }
-    compareValue(v1, v2) {
-        return v1 === v2;
-    }
 }

package/dist/core/id/id.d.ts

@@ -1,8 +1,6 @@
-import { IId, IIdService } from "./interface";
-export declare class Id<T = any> implements IId<T> {
-    private _service;
+export declare class Id {
     private _value;
-    constructor(service: IIdService<T>, idOrValue?: Id<T> | T);
-    get value(): T;
-    equals(id: Id<T>): boolean;
+    constructor(idOrValue: Id | string);
+    get value(): string;
+    equals(id: Id): boolean;
 }

package/dist/core/id/id.js

@@ -1,20 +1,11 @@
 export class Id {
-    constructor(service, idOrValue) {
-        this._service = service;
-        if (idOrValue) {
-            if (idOrValue instanceof Id)
-                this._value = idOrValue.value;
-            else
-                this._value = idOrValue;
-        }
-        else
-            this._value = this._service.generateValue();
-        this._service.validateValue(this._value);
+    constructor(idOrValue) {
+        this._value = idOrValue instanceof Id ? idOrValue.value : idOrValue;
     }
     get value() {
         return this._value;
     }
     equals(id) {
-        return this._service.compareValue(id._value, this._value);
+        return id._value === this._value;
     }
 }

package/dist/core/id/interface.d.ts

@@ -1,10 +1,4 @@
-export interface IId<T = any> {
-    value: T;
-    equals(id: IId<T>): boolean;
-}
-export type IdValueOf<T extends IId> = T extends IId<infer V> ? V : never;
-export interface IIdService<T = any> {
-    validateValue(value: T): void;
-    generateValue(): T;
-    compareValue(v1: T, v2: T): boolean;
+export interface IIdService {
+    validateValue(value: string): void;
+    generateValue(): string;
 }

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

@@ -19,7 +19,7 @@ export declare class EventBase<P extends Props> extends MessageBase<P> {
     static newEvent<T extends AnyEvent>(this: EventClassWithTypedConstructor<T>, source: EventSource, props: PropsOf<T>, context?: MessageContext, timestamp?: number): T;
     getSource(): Readonly<{
         aggregate: string;
-        id: Id<any>;
+        id: Id;
         version: number;
     }>;
     getEventType(): string;

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

@@ -3,10 +3,9 @@ import { ModelBase, Props } from "./model";
 export declare class ModelWithId<P extends Props> extends ModelBase<P> {
     protected readonly _id: Id;
     constructor(id: Id);
-    static idService(): import("../id").IIdService<any>;
-    static id<T = any>(id?: Id<T> | T): Id<any>;
-    id(): Id<any>;
+    static idService(): import("../id").IIdService;
+    static id(id?: Id | string): Id;
+    id(): Id;
     hasId(id: Id): boolean;
-    rawId(): any;
 }
 export type AnyModelWithId = ModelWithId<Props>;

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

@@ -11,7 +11,7 @@ export class ModelWithId extends ModelBase {
     }
     static id(id) {
         const idService = this.idService();
-        return new Id(idService, id);
+        return new Id(id ?? idService.generateValue());
     }
     id() {
         return this._id;
@@ -19,7 +19,4 @@ export class ModelWithId extends ModelBase {
     hasId(id) {
         return this._id.equals(id);
     }
-    rawId() {
-        return this._id.value;
-    }
 }

package/package.json

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