@nestjs/cqrs 11.0.2 → 12.0.0

package/dist/services/explorer.service.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -8,21 +7,19 @@ 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);
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExplorerService = void 0;
-const common_1 = require("@nestjs/common");
-const modules_container_1 = require("@nestjs/core/injector/modules-container");
-const constants_1 = require("../decorators/constants");
+import { Injectable } from '@nestjs/common';
+import { ModulesContainer } from '@nestjs/core/injector/modules-container.js';
+import { COMMAND_HANDLER_METADATA, EVENTS_HANDLER_METADATA, QUERY_HANDLER_METADATA, SAGA_METADATA, } from '../decorators/constants.js';
 let ExplorerService = class ExplorerService {
     constructor(modulesContainer) {
         this.modulesContainer = modulesContainer;
     }
     explore() {
         const modules = [...this.modulesContainer.values()];
-        const commands = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, constants_1.COMMAND_HANDLER_METADATA));
-        const queries = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, constants_1.QUERY_HANDLER_METADATA));
-        const events = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, constants_1.EVENTS_HANDLER_METADATA));
-        const sagas = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, constants_1.SAGA_METADATA));
+        const commands = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, COMMAND_HANDLER_METADATA));
+        const queries = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, QUERY_HANDLER_METADATA));
+        const events = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, EVENTS_HANDLER_METADATA));
+        const sagas = this.flatMap(modules, (instance) => this.filterByMetadataKey(instance, SAGA_METADATA));
         return { commands, queries, events, sagas };
     }
     flatMap(modules, callback) {
@@ -32,22 +29,19 @@ let ExplorerService = class ExplorerService {
         return items.filter((item) => !!item);
     }
     filterByMetadataKey(wrapper, metadataKey) {
-        const { instance } = wrapper;
-        if (!instance) {
+        const clsRef = wrapper.instance?.constructor ?? wrapper.metatype;
+        if (!clsRef) {
             return;
         }
-        if (!instance.constructor) {
-            return;
-        }
-        const metadata = Reflect.getMetadata(metadataKey, instance.constructor);
+        const metadata = Reflect.getMetadata(metadataKey, clsRef);
         if (!metadata) {
             return;
         }
         return wrapper;
     }
 };
-exports.ExplorerService = ExplorerService;
-exports.ExplorerService = ExplorerService = __decorate([
-    (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [modules_container_1.ModulesContainer])
+ExplorerService = __decorate([
+    Injectable(),
+    __metadata("design:paramtypes", [ModulesContainer])
 ], ExplorerService);
+export { ExplorerService };

package/dist/storages/aggregate-root.storage.d.ts

@@ -1,8 +1,8 @@
 import { Type } from '@nestjs/common';
-import { AggregateRoot } from '../aggregate-root';
-import { EventBus } from '../event-bus';
+import { IAggregateRoot } from '../interfaces/index.js';
+import { EventBus } from '../event-bus.js';
 export declare class AggregateRootStorage {
     private static storage;
-    static add(type: Type<AggregateRoot>): void;
+    static add(type: Type<IAggregateRoot>): void;
     static mergeContext(eventBus: EventBus): void;
 }

package/dist/storages/aggregate-root.storage.js

@@ -1,7 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AggregateRootStorage = void 0;
-class AggregateRootStorage {
+export class AggregateRootStorage {
     static add(type) {
         this.storage.push(type);
     }
@@ -17,5 +14,4 @@ class AggregateRootStorage {
         this.storage = [];
     }
 }
-exports.AggregateRootStorage = AggregateRootStorage;
 AggregateRootStorage.storage = [];

package/dist/unhandled-exception-bus.d.ts

@@ -1,8 +1,8 @@
 import { Type } from '@nestjs/common';
 import 'reflect-metadata';
 import { Observable } from 'rxjs';
-import { CqrsModuleOptions, ICommand, IEvent, IUnhandledExceptionPublisher, UnhandledExceptionInfo } from './interfaces';
-import { ObservableBus } from './utils/observable-bus';
+import { CqrsModuleOptions, ICommand, IEvent, IUnhandledExceptionPublisher, UnhandledExceptionInfo } from './interfaces/index.js';
+import { ObservableBus } from './utils/observable-bus.js';
 /**
  * A bus that publishes unhandled exceptions.
  * @template Cause The type of the cause of the exception.

package/dist/unhandled-exception-bus.js

@@ -1,4 +1,3 @@
-"use strict";
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -11,19 +10,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnhandledExceptionBus = void 0;
-const common_1 = require("@nestjs/common");
-require("reflect-metadata");
-const rxjs_1 = require("rxjs");
-const constants_1 = require("./constants");
-const default_unhandled_exception_pubsub_1 = require("./helpers/default-unhandled-exception-pubsub");
-const observable_bus_1 = require("./utils/observable-bus");
+import { Inject, Injectable, Optional } from '@nestjs/common';
+import 'reflect-metadata';
+import { filter } from 'rxjs';
+import { CQRS_MODULE_OPTIONS } from './constants.js';
+import { DefaultUnhandledExceptionPubSub } from './helpers/default-unhandled-exception-pubsub.js';
+import { ObservableBus } from './utils/observable-bus.js';
 /**
  * A bus that publishes unhandled exceptions.
  * @template Cause The type of the cause of the exception.
  */
-let UnhandledExceptionBus = class UnhandledExceptionBus extends observable_bus_1.ObservableBus {
+let UnhandledExceptionBus = class UnhandledExceptionBus extends ObservableBus {
     constructor(options) {
         super();
         this.options = options;
@@ -44,7 +41,7 @@ let UnhandledExceptionBus = class UnhandledExceptionBus extends observable_bus_1
      */
     static ofType(...types) {
         const isInstanceOf = (exceptionInfo) => !!types.find((classType) => exceptionInfo.exception instanceof classType);
-        return (source) => source.pipe((0, rxjs_1.filter)(isInstanceOf));
+        return (source) => source.pipe(filter(isInstanceOf));
     }
     /**
      * Gets the publisher of the bus.
@@ -66,13 +63,13 @@ let UnhandledExceptionBus = class UnhandledExceptionBus extends observable_bus_1
         return this._publisher.publish(info);
     }
     useDefaultPublisher() {
-        this._publisher = new default_unhandled_exception_pubsub_1.DefaultUnhandledExceptionPubSub(this.subject$);
+        this._publisher = new DefaultUnhandledExceptionPubSub(this.subject$);
     }
 };
-exports.UnhandledExceptionBus = UnhandledExceptionBus;
-exports.UnhandledExceptionBus = UnhandledExceptionBus = __decorate([
-    (0, common_1.Injectable)(),
-    __param(0, (0, common_1.Optional)()),
-    __param(0, (0, common_1.Inject)(constants_1.CQRS_MODULE_OPTIONS)),
+UnhandledExceptionBus = __decorate([
+    Injectable(),
+    __param(0, Optional()),
+    __param(0, Inject(CQRS_MODULE_OPTIONS)),
     __metadata("design:paramtypes", [Object])
 ], UnhandledExceptionBus);
+export { UnhandledExceptionBus };

package/dist/utils/index.d.ts

@@ -1 +1 @@
-export * from './observable-bus';
+export * from './observable-bus.js';

package/dist/utils/index.js

@@ -1,17 +1 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./observable-bus"), exports);
+export * from './observable-bus.js';

package/dist/utils/observable-bus.js

@@ -1,15 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObservableBus = void 0;
-const rxjs_1 = require("rxjs");
-class ObservableBus extends rxjs_1.Observable {
+import { Observable, Subject } from 'rxjs';
+export class ObservableBus extends Observable {
     constructor() {
         super();
-        this._subject$ = new rxjs_1.Subject();
+        this._subject$ = new Subject();
         this.source = this._subject$;
     }
     get subject$() {
         return this._subject$;
     }
 }
-exports.ObservableBus = ObservableBus;

package/package.json

@@ -1,14 +1,29 @@
 {
   "name": "@nestjs/cqrs",
-  "version": "11.0.2",
+  "version": "12.0.0",
   "description": "A lightweight CQRS module for Nest framework (node.js)",
+  "type": "module",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "engines": {
+    "node": "^20.19.0 || >=22.12.0"
+  },
   "license": "MIT",
   "url": "https://github.com/nestjs/cqrs#readme",
   "scripts": {
-    "test": "jest",
+    "test": "vitest run",
     "build": "tsc -p tsconfig.build.json",
     "format": "prettier --write \"**/*.ts\"",
-    "lint": "eslint \"src/**/*.ts\" --fix",
+    "lint": "oxlint src/",
     "prepublish:next": "npm run build",
     "publish:next": "npm publish --access public --tag next",
     "prepublish:npm": "npm run build",
@@ -16,36 +31,29 @@
     "prerelease": "npm run build",
     "release": "release-it",
     "prepare": "husky",
-    "test:e2e": "jest --config ./test/jest-e2e.json --runInBand"
+    "test:e2e": "vitest run --config vitest.config.e2e.ts"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.7.1",
-    "@commitlint/config-angular": "19.7.1",
-    "@eslint/eslintrc": "3.2.0",
-    "@eslint/js": "9.20.0",
-    "@nestjs/common": "11.0.9",
-    "@nestjs/core": "11.0.9",
-    "@nestjs/testing": "11.0.9",
-    "@types/jest": "29.5.14",
-    "@types/node": "22.13.1",
-    "eslint": "9.20.1",
-    "eslint-config-prettier": "10.0.1",
-    "eslint-plugin-prettier": "5.2.3",
-    "globals": "15.14.0",
+    "@commitlint/cli": "21.2.2",
+    "@commitlint/config-angular": "21.2.2",
+    "@nestjs/common": "12.0.1",
+    "@nestjs/core": "12.0.1",
+    "@nestjs/testing": "12.0.1",
+    "@types/node": "24.13.3",
     "husky": "9.1.7",
-    "jest": "29.7.0",
-    "lint-staged": "15.4.3",
-    "prettier": "3.5.0",
+    "lint-staged": "17.3.0",
+    "oxlint": "1.80.0",
+    "prettier": "3.9.6",
     "reflect-metadata": "0.2.2",
-    "release-it": "18.1.2",
-    "rxjs": "7.8.1",
-    "ts-jest": "29.2.5",
-    "typescript": "5.7.3",
-    "typescript-eslint": "8.24.0"
+    "release-it": "21.0.2",
+    "rxjs": "7.8.2",
+    "typescript": "7.0.2",
+    "vite": "8.2.2",
+    "vitest": "4.1.11"
   },
   "peerDependencies": {
-    "@nestjs/common": "^10.0.0 || ^11.0.0",
-    "@nestjs/core": "^10.0.0 || ^11.0.0",
+    "@nestjs/common": "^12.0.0",
+    "@nestjs/core": "^12.0.0",
     "reflect-metadata": "^0.1.13 || ^0.2.0",
     "rxjs": "^7.2.0"
   },

package/test/e2e/basic-flows.spec.ts

@@ -1,20 +1,24 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { setTimeout } from 'timers/promises';
-import { CommandBus, QueryBus } from '../../src';
-import { AppModule } from '../src/app.module';
-import { DropAncientItemHandler } from '../src/heroes/commands/handlers/drop-ancient-item.handler';
-import { KillDragonHandler } from '../src/heroes/commands/handlers/kill-dragon.handler';
-import { DropAncientItemCommand } from '../src/heroes/commands/impl/drop-ancient-item.command';
-import { KillDragonCommand } from '../src/heroes/commands/impl/kill-dragon.command';
-import { HeroFoundItemHandler } from '../src/heroes/events/handlers/hero-found-item.handler';
-import { HeroKilledDragonHandler } from '../src/heroes/events/handlers/hero-killed-dragon.handler';
-import { HeroFoundItemEvent } from '../src/heroes/events/impl/hero-found-item.event';
-import { HeroKilledDragonEvent } from '../src/heroes/events/impl/hero-killed-dragon.event';
-import { GetHeroesQuery } from '../src/heroes/queries/impl';
-import { HERO_ID } from '../src/heroes/repository/fixtures/user';
-import { ANCIENT_ITEM_ID } from '../src/heroes/sagas/heroes.sagas';
-import { NoopHandler } from '../src/noop/events/handlers/noop.handler';
-import { waitImmediate } from '../utils/wait-immediate';
+import type { MockInstance } from 'vitest';
+import { CommandBus, QueryBus } from '../../src/index.js';
+import { AppModule } from '../src/app.module.js';
+import { DropAncientItemHandler } from '../src/heroes/commands/handlers/drop-ancient-item.handler.js';
+import { KillDragonHandler } from '../src/heroes/commands/handlers/kill-dragon.handler.js';
+import { DropAncientItemCommand } from '../src/heroes/commands/impl/drop-ancient-item.command.js';
+import { KillDragonCommand } from '../src/heroes/commands/impl/kill-dragon.command.js';
+import { DragonDiedHandler } from '../src/heroes/events/handlers/dragon-died.handler.js';
+import { HeroFoundItemHandler } from '../src/heroes/events/handlers/hero-found-item.handler.js';
+import { HeroKilledDragonHandler } from '../src/heroes/events/handlers/hero-killed-dragon.handler.js';
+import { DragonDiedEvent } from '../src/heroes/events/impl/dragon-died.event.js';
+import { HeroFoundItemEvent } from '../src/heroes/events/impl/hero-found-item.event.js';
+import { HeroKilledDragonEvent } from '../src/heroes/events/impl/hero-killed-dragon.event.js';
+import { DRAGON_ID } from '../src/heroes/repository/fixtures/dragon.js';
+import { GetHeroesQuery, GetHeroQuery } from '../src/heroes/queries/impl/index.js';
+import { HERO_ID } from '../src/heroes/repository/fixtures/user.js';
+import { ANCIENT_ITEM_ID } from '../src/heroes/sagas/heroes.sagas.js';
+import { NoopHandler } from '../src/noop/events/handlers/noop.handler.js';
+import { waitImmediate } from '../utils/wait-immediate.js';
 
 describe('Basic flows', () => {
   let moduleRef: TestingModule;
@@ -28,23 +32,26 @@ describe('Basic flows', () => {
   });
 
   describe('when "KillDragonCommand" command is dispatched', () => {
-    let killDragonExecuteSpy: jest.SpyInstance;
-    let heroKilledDragonHandleSpy: jest.SpyInstance;
-    let noopEventHandleSpy: jest.SpyInstance;
+    let killDragonExecuteSpy: MockInstance;
+    let heroKilledDragonHandleSpy: MockInstance;
+    let dragonDiedHandleSpy: MockInstance;
+    let noopEventHandleSpy: MockInstance;
     let command: KillDragonCommand;
 
     beforeAll(async () => {
       const killDragonHandler = moduleRef.get(KillDragonHandler);
       const heroKilledDragonHandler = moduleRef.get(HeroKilledDragonHandler);
+      const dragonDiedHandler = moduleRef.get(DragonDiedHandler);
       const noopHandler = moduleRef.get(NoopHandler);
 
-      killDragonExecuteSpy = jest.spyOn(killDragonHandler, 'execute');
-      heroKilledDragonHandleSpy = jest.spyOn(heroKilledDragonHandler, 'handle');
-      noopEventHandleSpy = jest.spyOn(noopHandler, 'handle');
+      killDragonExecuteSpy = vi.spyOn(killDragonHandler, 'execute');
+      heroKilledDragonHandleSpy = vi.spyOn(heroKilledDragonHandler, 'handle');
+      dragonDiedHandleSpy = vi.spyOn(dragonDiedHandler, 'handle');
+      noopEventHandleSpy = vi.spyOn(noopHandler, 'handle');
 
       const commandBus = moduleRef.get(CommandBus);
       const heroId = HERO_ID;
-      const dragonId = 'dragonId';
+      const dragonId = DRAGON_ID;
 
       command = new KillDragonCommand(heroId, dragonId);
       await commandBus.execute(command);
@@ -60,19 +67,24 @@ describe('Basic flows', () => {
       expect(heroKilledDragonHandleSpy).toHaveBeenCalledWith(event);
     });
 
+    it('should handle "DragonDiedEvent" event from aggregate root', () => {
+      const event = new DragonDiedEvent(DRAGON_ID);
+      expect(dragonDiedHandleSpy).toHaveBeenCalledWith(event);
+    });
+
     it('should not trigger "NoopHandler" event', () => {
       expect(noopEventHandleSpy).not.toHaveBeenCalled();
     });
 
     describe('when saga triggered', () => {
-      let dropAncientExecuteSpy: jest.SpyInstance;
-      let heroFoundItemSpy: jest.SpyInstance;
+      let dropAncientExecuteSpy: MockInstance;
+      let heroFoundItemSpy: MockInstance;
 
       beforeAll(async () => {
         const dropAncientItemHandler = moduleRef.get(DropAncientItemHandler);
         const heroFoundItemHandler = moduleRef.get(HeroFoundItemHandler);
-        dropAncientExecuteSpy = jest.spyOn(dropAncientItemHandler, 'execute');
-        heroFoundItemSpy = jest.spyOn(heroFoundItemHandler, 'handle');
+        dropAncientExecuteSpy = vi.spyOn(dropAncientItemHandler, 'execute');
+        heroFoundItemSpy = vi.spyOn(heroFoundItemHandler, 'handle');
 
         // Wait 1 second for saga to be triggered
         await setTimeout(1000);
@@ -100,6 +112,14 @@ describe('Basic flows', () => {
     });
   });
 
+  describe('when "GetHeroQuery" query is executed', () => {
+    it('should return a single hero', async () => {
+      const queryBus = moduleRef.get(QueryBus);
+      const hero = await queryBus.execute(new GetHeroQuery(1234));
+      expect(hero).toEqual(expect.objectContaining({ id: HERO_ID }));
+    });
+  });
+
   afterAll(async () => {
     await moduleRef.close();
   });

package/test/e2e/generics.spec.ts

@@ -1,4 +1,4 @@
-import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper';
+import { InstanceWrapper } from '@nestjs/core/injector/instance-wrapper.js';
 import { Test, TestingModule } from '@nestjs/testing';
 import {
   Command,
@@ -6,8 +6,8 @@ import {
   ICommandHandler,
   Query,
   QueryBus,
-} from '../../src';
-import { AppModule } from '../src/app.module';
+} from '../../src/index.js';
+import { AppModule } from '../src/app.module.js';
 
 describe('Generics', () => {
   let moduleRef: TestingModule;

package/test/e2e/request-scope.spec.ts

@@ -1,19 +1,20 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { setTimeout } from 'timers/promises';
-import { AsyncContext, CommandBus, QueryBus } from '../../src';
-import { AppModule } from '../src/app.module';
-import { HERO_ID } from '../src/heroes/repository/fixtures/user';
-import { ANCIENT_ITEM_ID } from '../src/heroes/sagas/heroes.sagas';
-import { ScopedDropAncientItemHandler } from '../src/scoped/commands/handlers/scoped-drop-ancient-item.handler';
-import { ScopedKillDragonHandler } from '../src/scoped/commands/handlers/scoped-kill-dragon.handler';
-import { ScopedDropAncientItemCommand } from '../src/scoped/commands/impl/scoped-drop-ancient-item.command';
-import { ScopedKillDragonCommand } from '../src/scoped/commands/impl/scoped-kill-dragon.command';
-import { ScopedHeroFoundItemHandler } from '../src/scoped/events/handlers/scoped-hero-found-item.handler';
-import { ScopedHeroKilledDragonHandler } from '../src/scoped/events/handlers/scoped-hero-killed-dragon.handler';
-import { ScopedHeroFoundItemEvent } from '../src/scoped/events/impl/hero-found-item.event';
-import { ScopedHeroKilledDragonEvent } from '../src/scoped/events/impl/hero-killed-dragon.event';
-import { ScopedGetHeroesQuery } from '../src/scoped/queries/impl';
-import { waitImmediate } from '../utils/wait-immediate';
+import type { MockInstance } from 'vitest';
+import { AsyncContext, CommandBus, QueryBus } from '../../src/index.js';
+import { AppModule } from '../src/app.module.js';
+import { HERO_ID } from '../src/heroes/repository/fixtures/user.js';
+import { ANCIENT_ITEM_ID } from '../src/heroes/sagas/heroes.sagas.js';
+import { ScopedDropAncientItemHandler } from '../src/scoped/commands/handlers/scoped-drop-ancient-item.handler.js';
+import { ScopedKillDragonHandler } from '../src/scoped/commands/handlers/scoped-kill-dragon.handler.js';
+import { ScopedDropAncientItemCommand } from '../src/scoped/commands/impl/scoped-drop-ancient-item.command.js';
+import { ScopedKillDragonCommand } from '../src/scoped/commands/impl/scoped-kill-dragon.command.js';
+import { ScopedHeroFoundItemHandler } from '../src/scoped/events/handlers/scoped-hero-found-item.handler.js';
+import { ScopedHeroKilledDragonHandler } from '../src/scoped/events/handlers/scoped-hero-killed-dragon.handler.js';
+import { ScopedHeroFoundItemEvent } from '../src/scoped/events/impl/hero-found-item.event.js';
+import { ScopedHeroKilledDragonEvent } from '../src/scoped/events/impl/hero-killed-dragon.event.js';
+import { ScopedGetHeroesQuery } from '../src/scoped/queries/impl/index.js';
+import { waitImmediate } from '../utils/wait-immediate.js';
 
 describe('Request scope', () => {
   let moduleRef: TestingModule;
@@ -29,8 +30,8 @@ describe('Request scope', () => {
   describe('when "ScopedKillDragonCommand" command is dispatched', () => {
     const asyncContext = new AsyncContext();
 
-    let killDragonExecuteSpy: jest.SpyInstance;
-    let heroKilledDragonHandleSpy: jest.SpyInstance;
+    let killDragonExecuteSpy: MockInstance;
+    let heroKilledDragonHandleSpy: MockInstance;
     let command: ScopedKillDragonCommand;
 
     beforeAll(async () => {
@@ -45,8 +46,8 @@ describe('Request scope', () => {
         asyncContext.id,
       );
 
-      killDragonExecuteSpy = jest.spyOn(killDragonHandler, 'execute');
-      heroKilledDragonHandleSpy = jest.spyOn(heroKilledDragonHandler, 'handle');
+      killDragonExecuteSpy = vi.spyOn(killDragonHandler, 'execute');
+      heroKilledDragonHandleSpy = vi.spyOn(heroKilledDragonHandler, 'handle');
 
       const commandBus = moduleRef.get(CommandBus);
       const heroId = HERO_ID;
@@ -70,8 +71,8 @@ describe('Request scope', () => {
     });
 
     describe('when saga triggered', () => {
-      let dropAncientExecuteSpy: jest.SpyInstance;
-      let heroFoundItemSpy: jest.SpyInstance;
+      let dropAncientExecuteSpy: MockInstance;
+      let heroFoundItemSpy: MockInstance;
 
       beforeAll(async () => {
         const dropAncientItemHandler = await moduleRef.resolve(
@@ -82,8 +83,8 @@ describe('Request scope', () => {
           ScopedHeroFoundItemHandler,
           asyncContext.id,
         );
-        dropAncientExecuteSpy = jest.spyOn(dropAncientItemHandler, 'execute');
-        heroFoundItemSpy = jest.spyOn(heroFoundItemHandler, 'handle');
+        dropAncientExecuteSpy = vi.spyOn(dropAncientItemHandler, 'execute');
+        heroFoundItemSpy = vi.spyOn(heroFoundItemHandler, 'handle');
 
         // Wait 1 second for saga to be triggered
         await setTimeout(1000);

package/test/e2e/sync-event-handlers-app.spec.ts

@@ -0,0 +1,123 @@
+import { Test, TestingModule } from '@nestjs/testing';
+import { MockInstance, vi } from 'vitest';
+import { AsyncHandlersAppModule } from '../src/sync-event-handlers/async-handlers-app.module.js';
+import { EventBus } from '../../src/event-bus.js';
+import { HeroKilledDragon2SlowHandler } from '../src/sync-event-handlers/events/handlers/hero-killed-dragon2-slow.handler.js';
+import { HeroKilledDragonSlowHandler } from '../src/sync-event-handlers/events/handlers/hero-killed-dragon-slow.handler.js';
+import { HeroFoundItemSlowHandler } from '../src/sync-event-handlers/events/handlers/hero-found-item-slow.handler.js';
+import { SyncHandlersAppModule } from '../src/sync-event-handlers/sync-handlers-app.module.js';
+import { HeroFoundItemEvent } from '../src/heroes/events/impl/hero-found-item.event.js';
+import { HeroKilledDragonEvent } from '../src/heroes/events/impl/hero-killed-dragon.event.js';
+
+describe('Sync event handlers', () => {
+  let moduleRef: TestingModule;
+  let eventBus: EventBus;
+  let heroFoundItemHandler: HeroFoundItemSlowHandler;
+  let heroFoundItemEnded: MockInstance;
+  let heroKilledDragonHandler: HeroKilledDragonSlowHandler;
+  let heroKilledDragonEnded: MockInstance;
+  let heroKilledDragon2Handler: HeroKilledDragon2SlowHandler;
+  let heroKilledDragon2Ended: MockInstance;
+
+  beforeEach(() => {
+    heroFoundItemEnded.mockClear();
+    heroKilledDragonEnded.mockClear();
+    heroKilledDragon2Ended.mockClear();
+  });
+
+  describe('when event handlers are fully asynchronous', () => {
+    beforeAll(async () => {
+      moduleRef = await Test.createTestingModule({
+        imports: [AsyncHandlersAppModule],
+      }).compile();
+
+      await moduleRef.init();
+      eventBus = moduleRef.get(EventBus);
+      heroFoundItemHandler = moduleRef.get(HeroFoundItemSlowHandler);
+      heroKilledDragonHandler = moduleRef.get(HeroKilledDragonSlowHandler);
+      heroKilledDragon2Handler = moduleRef.get(HeroKilledDragon2SlowHandler);
+      heroFoundItemEnded = vi.spyOn(heroFoundItemHandler, 'end');
+      heroKilledDragonEnded = vi.spyOn(heroKilledDragonHandler, 'end');
+      heroKilledDragon2Ended = vi.spyOn(heroKilledDragon2Handler, 'end');
+    });
+
+    describe('when "HeroFoundItemEvent" event is published', () => {
+      it('should wait for the event handlers to complete', async () => {
+        const event = new HeroFoundItemEvent('hero1', 'item1');
+
+        await eventBus.publish(event);
+
+        expect(heroFoundItemEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragonEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragon2Ended).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when "HeroKilledDragonEvent" event is published', () => {
+      it('should wait for the event handlers to complete', async () => {
+        const event = new HeroKilledDragonEvent('hero1', 'dragon1');
+
+        await eventBus.publish(event);
+
+        expect(heroFoundItemEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragonEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragon2Ended).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  describe('when event handlers are synchronous', () => {
+    beforeAll(async () => {
+      moduleRef = await Test.createTestingModule({
+        imports: [SyncHandlersAppModule],
+      }).compile();
+
+      await moduleRef.init();
+      eventBus = moduleRef.get(EventBus);
+      heroFoundItemHandler = moduleRef.get(HeroFoundItemSlowHandler);
+      heroKilledDragonHandler = moduleRef.get(HeroKilledDragonSlowHandler);
+      heroKilledDragon2Handler = moduleRef.get(HeroKilledDragon2SlowHandler);
+      heroFoundItemEnded = vi.spyOn(heroFoundItemHandler, 'end');
+      heroKilledDragonEnded = vi.spyOn(heroKilledDragonHandler, 'end');
+      heroKilledDragon2Ended = vi.spyOn(heroKilledDragon2Handler, 'end');
+    });
+
+    describe('when "HeroFoundItemEvent" event is published', () => {
+      it('should wait for the event handlers to complete', async () => {
+        const event = new HeroFoundItemEvent('hero1', 'item1');
+
+        await eventBus.publish(event);
+
+        expect(heroFoundItemEnded).toHaveBeenCalledTimes(1);
+        expect(heroKilledDragonEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragon2Ended).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when "HeroKilledDragonEvent" event is published', () => {
+      it('should wait for the event handlers to complete', async () => {
+        const event = new HeroKilledDragonEvent('hero1', 'dragon1');
+
+        await eventBus.publish(event);
+
+        expect(heroFoundItemEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragonEnded).toHaveBeenCalledTimes(1);
+        expect(heroKilledDragon2Ended).toHaveBeenCalledTimes(1);
+      });
+    });
+
+    describe('when an unknown event is published', () => {
+      it('should return directly', async () => {
+        await eventBus.publish({ id: 'unknown event' });
+
+        expect(heroFoundItemEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragonEnded).not.toHaveBeenCalled();
+        expect(heroKilledDragon2Ended).not.toHaveBeenCalled();
+      });
+    });
+  });
+
+  afterAll(async () => {
+    await moduleRef.close();
+  });
+});