ddd-node 3.0.0 → 4.0.0

package/dist/base/aggregate.d.ts

@@ -2,7 +2,7 @@ import { Class } from "../types/class";
 import { ClassStatic } from "../types/class-static";
 import { AnyCommand } from "./command";
 import { Entity, IEntityMetadata } from "./entity";
-import { AnyEvent, EventClass, IEventAggregate, NewEventMetadataOptions } from "./event";
+import { AnyEvent, EventClass, NewEventMetadataOptions } from "./event";
 import { Id } from "./id";
 import { PropsOf } from "./props-envelope";
 export interface IAggregateMetadata extends IEntityMetadata {
@@ -21,7 +21,6 @@ export declare class Aggregate<P extends object> extends Entity<P> implements IA
     getEvents(): AnyEvent[];
     hasEvents(): boolean;
     nextVersion(): number;
-    nextEventAggregate(): IEventAggregate;
     protected newEvent<E extends AnyEvent>(eventClass: EventClass<E>, props: PropsOf<E>, metadata?: NewEventMetadataOptions): E;
     protected addEvent<E extends AnyEvent>(event: E): void;
 }
@@ -32,9 +31,8 @@ export declare class AggregateES<P extends object> extends Aggregate<P> {
     getHandledCommands(): AnyCommand[];
     getPastEvents(): AnyEvent[];
     lastEvent(): AnyEvent | undefined;
-    lastEventVersion(): number;
-    nextEventVersion(): number;
-    nextEventAggregate(): IEventAggregate;
+    currentVersion(): number;
+    nextVersion(): number;
     private addPastEvent;
     private validateEventBeforeApply;
     getEventApplier(eventType: string): AggregateEventApplier<AnyEvent> | null;
@@ -53,4 +51,5 @@ export type AggregateESClassWithProps<P extends object> = Class<AggregateES<P>,
 export type AggregateConstructorParams<T extends AnyAggregate> = AggregateConstructorParamsWithProps<PropsOf<T>>;
 export type AggregateClass<T extends AnyAggregate> = Class<T, AggregateConstructorParams<T>> & ClassStatic<typeof Aggregate<PropsOf<T>>>;
 export type AggregateESClass<T extends AnyAggregateES> = Class<T, AggregateConstructorParams<T>> & ClassStatic<typeof AggregateES<PropsOf<T>>>;
+export type InferAggregateClass<T extends AnyAggregate> = T extends AnyAggregateES ? AggregateESClass<T> : AggregateClass<T>;
 export type AnyAggregateClass = AggregateClass<AnyAggregate>;

package/dist/base/aggregate.js

@@ -38,15 +38,12 @@ class Aggregate extends entity_1.Entity {
     nextVersion() {
         return this.version + 1;
     }
-    nextEventAggregate() {
-        return {
-            type: this.aggregateType(),
+    newEvent(eventClass, props, metadata) {
+        return eventClass.newEvent({
             id: this.id,
+            type: this.aggregateType(),
             version: this.nextVersion(),
-        };
-    }
-    newEvent(eventClass, props, metadata) {
-        return eventClass.newEvent(this.nextEventAggregate(), props, metadata);
+        }, props, metadata);
     }
     addEvent(event) {
         this.events.push(event);
@@ -74,21 +71,14 @@ class AggregateES extends Aggregate {
     lastEvent() {
         return this.hasEvents() ? this.events.at(-1) : this.pastEvents.at(-1);
     }
-    lastEventVersion() {
+    currentVersion() {
         const lastEvent = this.lastEvent();
         if (lastEvent)
             return lastEvent.aggregate.version;
         return this.version;
     }
-    nextEventVersion() {
-        return this.lastEventVersion() + 1;
-    }
-    nextEventAggregate() {
-        return {
-            type: this.aggregateType(),
-            id: this.id,
-            version: this.nextEventVersion(),
-        };
+    nextVersion() {
+        return this.currentVersion() + 1;
     }
     addPastEvent(event) {
         if (this.hasEvents())
@@ -101,7 +91,7 @@ class AggregateES extends Aggregate {
             throw new aggregate_error_1.InvalidEventAggregateTypeError();
         if (id !== this.id)
             throw new aggregate_error_1.InvalidEventAggregateIdError();
-        if (version !== this.nextEventVersion())
+        if (version !== this.nextVersion())
             throw new aggregate_error_1.InvalidEventAggregateVersionError();
     }
     getEventApplier(eventType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddd-node",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "description": "Domain Driven Design base for NodeJs",
   "main": "dist/index.js",
   "scripts": {