@haskou/ddd-kernel 2.0.2 → 2.0.4

package/dist/adapters/index.d.ts

@@ -2,26 +2,26 @@ export { InMemoryRepository } from './db/in-memory/index.js';
 export { MongoDocumentMapper, MongoRepository } from './db/mongo/index.js';
 export { ConsoleKernelLogger } from './kernel/console/index.js';
 export { Consumer, ConsumerMiddlewarePipeline, CorrelationConsumerMiddleware, CorrelationConsumerMiddlewareOptions, DefaultPublisherHookErrorPolicy, IdempotencyConsumerMiddleware, IdempotencyConsumerMiddlewareOptions, InMemoryIdempotencyStore, PublisherHookPipeline, RetryConsumerMiddleware, RetryConsumerMiddlewareOptions } from './pubsub/index.js';
-export { A as AmqpMessage, a as AmqpMessageBusAdapterOptions, C as ConsumerContext, D as DomainEventHandler, I as InvalidDomainEventError, N as NoFailedMessagesError } from '../NoFailedMessagesError-z-6ffelK.js';
+export { A as AmqpMessage, a as AmqpMessageBusAdapterOptions, C as ConsumerContext, D as DomainEventHandler, I as InvalidDomainEventError, N as NoFailedMessagesError } from '../NoFailedMessagesError-C6wMAOvs.js';
 export { InMemoryEventBus, InMemoryPubSub } from './pubsub/in-memory/index.js';
-export { ErrorExplanation, ErrorResponseHandler, ExpressAppHook, ExpressController, ExpressHookPhase, ExpressKernelServer, ExpressKernelServerOptions, ExpressPhaseHook, FormattedValidationError, HttpApp, HttpErrorHandler, HttpErrorHandlerOptions, HttpErrorLike, HttpErrorResponse, HttpServer, PayloadTooLargeError, RoutePrefix, ValidationError } from './ui/express/index.js';
+export { ErrorExplanation, ErrorResponseHandler, ExpressAppHook, ExpressController, ExpressControllerResolver, ExpressHookPhase, ExpressKernelServer, ExpressKernelServerOptions, ExpressPhaseHook, FormattedValidationError, HttpApp, HttpErrorHandler, HttpErrorHandlerOptions, HttpErrorLike, HttpErrorResponse, HttpServer, PayloadTooLargeError, RoutePrefix, ValidationError } from './ui/express/index.js';
 export { Route } from './ui/routes/index.js';
 import '../Repository-D9CuAyCV.js';
 import 'mongodb';
 import '../KernelLogger-BESOFrpW.js';
 import '../DomainEvent-mXWEtr_J.js';
 import '../DomainEventConsumer-D1P4oXoj.js';
-import '../ShutdownHook-dvsrwsQi.js';
+import '../ShutdownHook-C3Zb9-5R.js';
 import 'dotenv';
-import '../ServiceClass-DXDAxvao.js';
-import '../ServiceResolver-D2Jz-l_Z.js';
+import '../ServiceClass-IInu6j5L.js';
+import '../ServiceResolver-CQGmbk-X.js';
 import '../infrastructure/lifecycle/index.js';
-import '../Scheduler-BW-U5Ccg.js';
+import '../Scheduler-JFwOYxSp.js';
 import '../KernelRoute-B7mVPrEx.js';
-import '../Subscription-vtF0lEHP.js';
-import '../HandlerContext-DUUExVo3.js';
-import '../PublisherHookErrorPolicy-DSsCNE6O.js';
-import '../RetryPredicate-CuL59f8-.js';
+import '../Subscription-BdLdP_5-.js';
+import '../HandlerContext-BT0RLBRT.js';
+import '../PublisherHookErrorPolicy-Bfh_QLs7.js';
+import '../RetryPredicate-B5jR8Nhs.js';
 import '../Log-36L3Z84a.js';
 import 'amqplib';
 import 'express';

package/dist/adapters/index.js

@@ -149,6 +149,9 @@ var DependencyInjection = class _DependencyInjection {
     const tokenName = this.getServiceClassName(token) ?? String(token);
     return `ddd-kernel.override.${prefix}.${tokenName}`;
   }
+  hasDirectService(serviceName) {
+    return typeof serviceName === "string" && (this.definitions.has(serviceName) || this.aliases.has(serviceName));
+  }
   ensureSyntheticService(id, value) {
     const definition = this.container.register(id);
     definition.public = true;
@@ -349,6 +352,9 @@ var DependencyInjection = class _DependencyInjection {
     }
     return this.container.get(serviceName);
   }
+  hasService(serviceName) {
+    return this.overrideTokenIds.has(serviceName) || this.findAliasServiceId(serviceName) !== void 0 || this.findConcreteChildServiceId(serviceName) !== void 0 || this.findRegisteredServiceId(serviceName) !== void 0 || this.hasDirectService(serviceName);
+  }
 };
 
 // src/kernel/KernelEnvironmentValidationError.ts
@@ -1025,6 +1031,45 @@ var InMemoryPubSub = class {
   }
 };
 
+// src/adapters/ui/express/ExpressControllerResolver.ts
+var ExpressControllerResolver = class {
+  constructor(kernel, controllers) {
+    this.kernel = kernel;
+    this.controllers = new Set(controllers);
+  }
+  kernel;
+  controllerInstances = /* @__PURE__ */ new Map();
+  controllers;
+  createControllerInstance(ClassDefinition) {
+    const Controller = ClassDefinition;
+    return new Controller();
+  }
+  getCachedController(ClassDefinition) {
+    const cached = this.controllerInstances.get(ClassDefinition);
+    if (cached) {
+      return cached;
+    }
+    const instance = this.createControllerInstance(ClassDefinition);
+    this.controllerInstances.set(ClassDefinition, instance);
+    return instance;
+  }
+  isKnownController(ClassDefinition) {
+    return this.controllers.has(ClassDefinition);
+  }
+  canResolveService(ClassDefinition) {
+    return this.kernel.di.hasService?.(ClassDefinition) === true;
+  }
+  get(ClassDefinition) {
+    if (!this.canResolveService(ClassDefinition)) {
+      if (this.isKnownController(ClassDefinition)) {
+        return this.getCachedController(ClassDefinition);
+      }
+      return void 0;
+    }
+    return this.kernel.di.getService(ClassDefinition);
+  }
+};
+
 // src/adapters/ui/express/ExpressKernelServer.ts
 import { createRequire } from "module";
 import path3 from "path";
@@ -1063,16 +1108,19 @@ var ExpressKernelServer = class {
   copy(items) {
     return [...items ?? []];
   }
-  configureControllerContainer() {
+  configureControllerContainer(controllers) {
     const { useContainer } = this.getRoutingControllers();
+    const resolver = new ExpressControllerResolver(
+      this.options.kernel,
+      controllers
+    );
     useContainer(
       {
-        /* c8 ignore next */
-        get: (ClassDefinition) => this.options.kernel.di.getService(ClassDefinition)
+        get: (ClassDefinition) => resolver.get(ClassDefinition)
       },
       {
         fallback: true,
-        fallbackOnErrors: true
+        fallbackOnErrors: false
       }
     );
   }
@@ -1090,8 +1138,11 @@ var ExpressKernelServer = class {
   }
   defaultErrorHandler() {
     return (error, request, response, next) => {
-      void next;
       void request;
+      if (response.headersSent) {
+        next(error);
+        return;
+      }
       response.status(500).json({
         error: error instanceof Error ? error.message : String(error)
       });
@@ -1202,7 +1253,7 @@ var ExpressKernelServer = class {
     this.applyMiddlewares(app, this.preControllerMiddlewares);
     await this.runHooks(this.beforeControllersHooks, app);
     await this.runPhaseHooks("beforeControllers", app);
-    this.configureControllerContainer();
+    this.configureControllerContainer(controllers);
     useExpressServer(app, {
       ...this.options.routingControllersOptions,
       controllers,
@@ -1393,6 +1444,7 @@ export {
   ConsumerMiddlewarePipeline,
   CorrelationConsumerMiddleware,
   DefaultPublisherHookErrorPolicy,
+  ExpressControllerResolver,
   ExpressKernelServer,
   HttpErrorHandler,
   IdempotencyConsumerMiddleware,