@haskou/ddd-kernel 2.0.1 → 2.0.3

package/dist/adapters/index.js

@@ -66,6 +66,32 @@ var ConsoleKernelLogger = class {
 import dotenv from "dotenv";
 import path2 from "path";
 
+// src/infrastructure/dependency-injection/AutowireWarningFilter.ts
+var AutowireWarningFilter = class {
+  constructor(logger) {
+    this.logger = logger;
+  }
+  logger;
+  isIgnorableAutowireWarning(message) {
+    return message.startsWith(
+      "Autowire: file has export default declaration but no runtime default export:"
+    ) || message.startsWith("Autowire: failed to create definition for undefined:");
+  }
+  warn(message, ...optionalParams) {
+    if (typeof message === "string" && this.isIgnorableAutowireWarning(message)) {
+      this.logger.debug?.(`Ignored ${message}`, ...optionalParams);
+      return;
+    }
+    this.logger.warn(message, ...optionalParams);
+  }
+  info(message, ...optionalParams) {
+    this.logger.info?.(message, ...optionalParams);
+  }
+  debug(message, ...optionalParams) {
+    this.logger.debug?.(message, ...optionalParams);
+  }
+};
+
 // src/infrastructure/dependency-injection/DependencyInjection.ts
 import fs from "fs-extra";
 import {
@@ -123,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;
@@ -270,6 +299,15 @@ var DependencyInjection = class _DependencyInjection {
       this.applyValueOverride(override);
     }
   }
+  async processAutowire() {
+    const previousLogger = this.container.logger;
+    this.container.logger = new AutowireWarningFilter(previousLogger);
+    try {
+      await this.autowire?.process();
+    } finally {
+      this.container.logger = previousLogger;
+    }
+  }
   registerParentAliases() {
     for (const [id, definition] of this.definitions.entries()) {
       if (definition._abstract === true || !definition._parent) {
@@ -286,7 +324,7 @@ var DependencyInjection = class _DependencyInjection {
         this.options.servicesYamlPath,
         false
       );
-      await this.autowire.process();
+      await this.processAutowire();
     } else {
       this.loader = new YamlFileLoader(this.container);
       await this.loader.load(this.options.servicesYamlPath);
@@ -314,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
@@ -395,6 +436,13 @@ var Kernel = class _Kernel {
       );
     }
   }
+  static assertRequiredEnvironmentVariableIsNotBlank(name, value, schema) {
+    if (schema[name]?.required === true && value.trim() === "") {
+      throw new KernelEnvironmentValidationError(
+        `Blank required environment variable "${name}".`
+      );
+    }
+  }
   static assertEnvironmentVariableChoice(name, value, schema) {
     const choices = schema[name]?.choices;
     if (choices && !choices.includes(value)) {
@@ -417,21 +465,16 @@ var Kernel = class _Kernel {
       return false;
     }
     throw new KernelEnvironmentValidationError(
-      `Environment variable "${name}" must be a boolean.`
+      `Environment variable "${name}" has invalid boolean value "${value}".`
     );
   }
   static parseNumberEnvironmentVariable(name, value) {
-    if (value.trim() === "") {
-      throw new KernelEnvironmentValidationError(
-        `Environment variable "${name}" must be a number.`
-      );
-    }
     const parsedValue = Number(value);
     if (Number.isFinite(parsedValue)) {
       return parsedValue;
     }
     throw new KernelEnvironmentValidationError(
-      `Environment variable "${name}" must be a number.`
+      `Environment variable "${name}" has invalid number value "${value}".`
     );
   }
   static parseEnvironmentVariable(name, value, schema) {
@@ -449,17 +492,42 @@ var Kernel = class _Kernel {
     _Kernel.assertEnvironmentVariableChoice(name, value, schema);
     return value;
   }
+  static getEnvironmentVariableValue(name, definition, schema) {
+    const value = process.env[name];
+    _Kernel.assertRequiredEnvironmentVariable(name, value, schema);
+    if (value !== void 0) {
+      _Kernel.assertRequiredEnvironmentVariableIsNotBlank(name, value, schema);
+    }
+    if (value !== void 0 && value.trim() !== "") {
+      return value;
+    }
+    return definition.defaultValue?.toString();
+  }
+  static shouldUnsetBlankOptionalEnvironmentVariable(name, value, valueOrDefault, schema) {
+    return value !== void 0 && value.trim() === "" && valueOrDefault === void 0 && schema[name]?.required !== true;
+  }
   static validateEnvironmentVariables(schema) {
     const environmentVariables = {};
     for (const [name, definition] of Object.entries(schema)) {
-      const value = process.env[name] ?? definition.defaultValue?.toString();
-      _Kernel.assertRequiredEnvironmentVariable(name, value, schema);
-      if (value !== void 0) {
+      const value = process.env[name];
+      const valueOrDefault = _Kernel.getEnvironmentVariableValue(
+        name,
+        definition,
+        schema
+      );
+      if (valueOrDefault !== void 0) {
         environmentVariables[name] = _Kernel.parseEnvironmentVariable(
           name,
-          value,
+          valueOrDefault,
           schema
         );
+      } else if (_Kernel.shouldUnsetBlankOptionalEnvironmentVariable(
+        name,
+        value,
+        valueOrDefault,
+        schema
+      )) {
+        environmentVariables[name] = void 0;
       }
     }
     return {
@@ -963,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";
@@ -1001,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
       }
     );
   }
@@ -1028,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)
       });
@@ -1140,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,
@@ -1331,6 +1444,7 @@ export {
   ConsumerMiddlewarePipeline,
   CorrelationConsumerMiddleware,
   DefaultPublisherHookErrorPolicy,
+  ExpressControllerResolver,
   ExpressKernelServer,
   HttpErrorHandler,
   IdempotencyConsumerMiddleware,