@grupodiariodaregiao/bunstone 0.5.3 → 0.5.4

package/dist/index.js

@@ -43116,6 +43116,7 @@ function mapProvidersWithType(providers = [], type) {
             result.set(provider, []);
           }
           result.get(provider)?.push({
+            name: method.name,
             expression: method.expression,
             delay: method.delay,
             methodName: method.methodName
@@ -100673,7 +100674,6 @@ function toPublicBucketPath(key) {
   return `/${normalizeS3Key(key)}`;
 }
 // lib/app-startup.ts
-import { mkdir as mkdir2 } from "fs/promises";
 import { cors } from "@elysiajs/cors";
 import { html } from "@elysiajs/html";
 import jwt2 from "@elysiajs/jwt";
@@ -116663,6 +116663,7 @@ var ClientType;
 var import_node_cron = __toESM(require_node_cron(), 1);
 var import_reflect_metadata15 = __toESM(require_Reflect(), 1);
 import Elysia from "elysia";
+import { mkdir as mkdir2 } from "fs/promises";
 import React15 from "react";
 import { renderToReadableStream } from "react-dom/server";
 
@@ -116903,12 +116904,28 @@ class CommandBus {
   }
   async execute(command) {
     const commandType = command.constructor;
-    const handler = this.handlers.get(commandType);
+    const handler = this.getHandler(commandType);
     if (!handler) {
       throw CqrsError.noCommandHandler(commandType.name);
     }
     return handler.execute(command);
   }
+  getHandler(commandType) {
+    const exactHandler = this.handlers.get(commandType);
+    if (exactHandler) {
+      return exactHandler;
+    }
+    if (typeof commandType !== "function" || !commandType.name) {
+      return;
+    }
+    let matchedHandler;
+    for (const [registeredType, handler] of this.handlers.entries()) {
+      if (typeof registeredType === "function" && registeredType.name === commandType.name) {
+        matchedHandler = handler;
+      }
+    }
+    return matchedHandler;
+  }
 }
 CommandBus = __legacyDecorateClassTS([
   Injectable()
@@ -116989,7 +117006,7 @@ class EventBus {
   }
   publish(event) {
     const eventType = event.constructor;
-    const handlers = this.handlers.get(eventType) || [];
+    const handlers = this.getHandlers(eventType);
     handlers.forEach((handler) => {
       handler.handle(event);
     });
@@ -117002,6 +117019,26 @@ class EventBus {
       this.listeners.push(callback);
     });
   }
+  getHandlers(eventType) {
+    const exactHandlers = this.handlers.get(eventType);
+    if (exactHandlers) {
+      return exactHandlers;
+    }
+    if (typeof eventType !== "function" || !eventType.name) {
+      return [];
+    }
+    const matchedHandlers = [];
+    for (const [registeredType, handlers] of this.handlers.entries()) {
+      if (typeof registeredType === "function" && registeredType.name === eventType.name) {
+        for (const handler of handlers) {
+          if (!matchedHandlers.includes(handler)) {
+            matchedHandlers.push(handler);
+          }
+        }
+      }
+    }
+    return matchedHandlers;
+  }
 }
 EventBus = __legacyDecorateClassTS([
   Injectable()
@@ -117035,12 +117072,28 @@ class QueryBus {
   }
   async execute(query) {
     const queryType = query.constructor;
-    const handler = this.handlers.get(queryType);
+    const handler = this.getHandler(queryType);
     if (!handler) {
       throw CqrsError.noQueryHandler(queryType.name);
     }
     return handler.execute(query);
   }
+  getHandler(queryType) {
+    const exactHandler = this.handlers.get(queryType);
+    if (exactHandler) {
+      return exactHandler;
+    }
+    if (typeof queryType !== "function" || !queryType.name) {
+      return;
+    }
+    let matchedHandler;
+    for (const [registeredType, handler] of this.handlers.entries()) {
+      if (typeof registeredType === "function" && registeredType.name === queryType.name) {
+        matchedHandler = handler;
+      }
+    }
+    return matchedHandler;
+  }
 }
 QueryBus = __legacyDecorateClassTS([
   Injectable()
@@ -117896,9 +117949,20 @@ class AppStartup {
     AppStartup.registerTimeouts(module);
     AppStartup.registerCronJobs(module);
     AppStartup.registerBullMqWorkers(module);
-    AppStartup.registerCqrsHandlers(module);
     AppStartup.registerRabbitMQConsumers(module);
     const modules = Reflect.getMetadata("dip:modules", module) || [];
+    for (const mod of modules) {
+      const modIsGlobal = Reflect.getMetadata("dip:module:global", mod);
+      if (modIsGlobal) {
+        const modInjectables = Reflect.getMetadata("dip:injectables", mod);
+        if (modInjectables) {
+          for (const [key, value] of modInjectables.entries()) {
+            GlobalRegistry.register(key, value);
+          }
+        }
+      }
+    }
+    AppStartup.registerCqrsHandlers(module);
     for (const mod of modules) {
       await AppStartup.registerModules(mod);
     }
@@ -118346,9 +118410,9 @@ class AppStartup {
     const injectables = Reflect.getMetadata("dip:injectables", module);
     if (!injectables)
       return;
-    const commandBus = injectables.get(CommandBus);
-    const queryBus = injectables.get(QueryBus);
-    const eventBus = injectables.get(EventBus);
+    const commandBus = injectables.get(CommandBus) || GlobalRegistry.get(CommandBus);
+    const queryBus = injectables.get(QueryBus) || GlobalRegistry.get(QueryBus);
+    const eventBus = injectables.get(EventBus) || GlobalRegistry.get(EventBus);
     const commandHandlers = [];
     const queryHandlers = [];
     const eventHandlers = [];

package/dist/lib/cqrs/command-bus.d.ts

@@ -16,4 +16,5 @@ export declare class CommandBus {
      * @throws CqrsError if no handler is found for the command.
      */
     execute<T extends ICommand, R = any>(command: T): Promise<R>;
+    private getHandler;
 }

package/dist/lib/cqrs/event-bus.d.ts

@@ -25,6 +25,7 @@ export declare class EventBus {
      * Used primarily by Sagas.
      */
     get stream(): IEventStream;
+    private getHandlers;
 }
 /**
  * Filters events by type in a Saga stream.

package/dist/lib/cqrs/query-bus.d.ts

@@ -16,4 +16,5 @@ export declare class QueryBus {
      * @throws CqrsError if no handler is found for the query.
      */
     execute<T extends IQuery, R = any>(query: T): Promise<R>;
+    private getHandler;
 }

package/lib/app-startup.ts

@@ -1,6 +1,3 @@
-import { statSync } from "node:fs";
-import { mkdir, readdir } from "node:fs/promises";
-import { basename, extname, join, resolve } from "node:path";
 import { cors } from "@elysiajs/cors";
 import { html } from "@elysiajs/html";
 import jwt from "@elysiajs/jwt";
@@ -9,6 +6,7 @@ import { swagger } from "@elysiajs/swagger";
 import { type Job, Worker } from "bullmq";
 import Elysia from "elysia";
 import scheduler from "node-cron";
+import { mkdir } from "node:fs/promises";
 import React from "react";
 import { renderToReadableStream } from "react-dom/server";
 import "reflect-metadata";
@@ -44,7 +42,6 @@ import { RateLimitService } from "./ratelimit/ratelimit.service";
 import { RENDER_METADATA } from "./render";
 import type { Options, RateLimitGlobalConfig } from "./types/options";
 import { Bundler } from "./utils/bundler";
-import { cwd } from "./utils/cwd";
 import {
 	GlobalRegistry,
 	resolveDependencies,
@@ -373,11 +370,29 @@ export class AppStartup {
 		AppStartup.registerTimeouts(module);
 		AppStartup.registerCronJobs(module);
 		AppStartup.registerBullMqWorkers(module);
-		AppStartup.registerCqrsHandlers(module);
 		AppStartup.registerRabbitMQConsumers(module);
 
 		const modules = Reflect.getMetadata("dip:modules", module) || [];
 
+		// Pre-register global sub-modules so their injectables (e.g. CqrsModule buses)
+		// are available in GlobalRegistry before CQRS handlers are registered
+		for (const mod of modules) {
+			const modIsGlobal = Reflect.getMetadata("dip:module:global", mod);
+			if (modIsGlobal) {
+				const modInjectables: Map<any, any> | undefined = Reflect.getMetadata(
+					"dip:injectables",
+					mod,
+				);
+				if (modInjectables) {
+					for (const [key, value] of modInjectables.entries()) {
+						GlobalRegistry.register(key, value);
+					}
+				}
+			}
+		}
+
+		AppStartup.registerCqrsHandlers(module);
+
 		for (const mod of modules) {
 			await AppStartup.registerModules(mod);
 		}
@@ -1135,9 +1150,10 @@ export class AppStartup {
 
 		if (!injectables) return;
 
-		const commandBus = injectables.get(CommandBus);
-		const queryBus = injectables.get(QueryBus);
-		const eventBus = injectables.get(EventBus);
+		const commandBus =
+			injectables.get(CommandBus) || GlobalRegistry.get(CommandBus);
+		const queryBus = injectables.get(QueryBus) || GlobalRegistry.get(QueryBus);
+		const eventBus = injectables.get(EventBus) || GlobalRegistry.get(EventBus);
 
 		const commandHandlers: any[] = [];
 		const queryHandlers: any[] = [];

package/lib/cqrs/command-bus.ts

@@ -34,10 +34,33 @@ export class CommandBus {
 	 */
 	async execute<T extends ICommand, R = any>(command: T): Promise<R> {
 		const commandType = command.constructor;
-		const handler = this.handlers.get(commandType);
+		const handler = this.getHandler(commandType);
 		if (!handler) {
 			throw CqrsError.noCommandHandler(commandType.name);
 		}
 		return handler.execute(command);
 	}
+
+	private getHandler(commandType: any): ICommandHandler | undefined {
+		const exactHandler = this.handlers.get(commandType);
+		if (exactHandler) {
+			return exactHandler;
+		}
+
+		if (typeof commandType !== "function" || !commandType.name) {
+			return undefined;
+		}
+
+		let matchedHandler: ICommandHandler | undefined;
+		for (const [registeredType, handler] of this.handlers.entries()) {
+			if (
+				typeof registeredType === "function" &&
+				registeredType.name === commandType.name
+			) {
+				matchedHandler = handler;
+			}
+		}
+
+		return matchedHandler;
+	}
 }

package/lib/cqrs/event-bus.ts

@@ -69,7 +69,7 @@ export class EventBus {
 	 */
 	publish<T extends IEvent>(event: T): void {
 		const eventType = event.constructor;
-		const handlers = this.handlers.get(eventType) || [];
+		const handlers = this.getHandlers(eventType);
 		handlers.forEach((handler) => {
 			handler.handle(event);
 		});
@@ -89,6 +89,33 @@ export class EventBus {
 			this.listeners.push(callback);
 		});
 	}
+
+	private getHandlers(eventType: any): IEventHandler[] {
+		const exactHandlers = this.handlers.get(eventType);
+		if (exactHandlers) {
+			return exactHandlers;
+		}
+
+		if (typeof eventType !== "function" || !eventType.name) {
+			return [];
+		}
+
+		const matchedHandlers: IEventHandler[] = [];
+		for (const [registeredType, handlers] of this.handlers.entries()) {
+			if (
+				typeof registeredType === "function" &&
+				registeredType.name === eventType.name
+			) {
+				for (const handler of handlers) {
+					if (!matchedHandlers.includes(handler)) {
+						matchedHandlers.push(handler);
+					}
+				}
+			}
+		}
+
+		return matchedHandlers;
+	}
 }
 
 /**

package/lib/cqrs/query-bus.ts

@@ -34,10 +34,33 @@ export class QueryBus {
 	 */
 	async execute<T extends IQuery, R = any>(query: T): Promise<R> {
 		const queryType = query.constructor;
-		const handler = this.handlers.get(queryType);
+		const handler = this.getHandler(queryType);
 		if (!handler) {
 			throw CqrsError.noQueryHandler(queryType.name);
 		}
 		return handler.execute(query);
 	}
+
+	private getHandler(queryType: any): IQueryHandler | undefined {
+		const exactHandler = this.handlers.get(queryType);
+		if (exactHandler) {
+			return exactHandler;
+		}
+
+		if (typeof queryType !== "function" || !queryType.name) {
+			return undefined;
+		}
+
+		let matchedHandler: IQueryHandler | undefined;
+		for (const [registeredType, handler] of this.handlers.entries()) {
+			if (
+				typeof registeredType === "function" &&
+				registeredType.name === queryType.name
+			) {
+				matchedHandler = handler;
+			}
+		}
+
+		return matchedHandler;
+	}
 }

package/lib/utils/map-providers.ts

@@ -14,7 +14,7 @@ export function mapProvidersWithType(
 ): Map<any, { expression?: string; delay?: number; methodName: string }[]> {
 	const result = new Map<
 		any,
-		{ expression?: string; delay?: number; methodName: string }[]
+		{ name?: string; expression?: string; delay?: number; methodName: string }[]
 	>();
 
 	for (const provider of providers) {
@@ -30,6 +30,7 @@ export function mapProvidersWithType(
 					}
 
 					result.get(provider)?.push({
+						name: method.name,
 						expression: method.expression,
 						delay: method.delay,
 						methodName: method.methodName,

package/package.json

@@ -13,7 +13,7 @@
       "types": "./dist/*.d.ts"
     }
   },
-  "version": "0.5.3",
+  "version": "0.5.4",
   "homepage": "https://bunstone.diario.one/",
   "repository": {
     "url": "https://github.com/diariodaregiao/bunstone.git",