@haskou/ddd-kernel 2.0.15 → 3.0.1

package/dist/{RetryPredicate-CLVmhikX.d.cts → RetryPredicate-BKlKFvI4.d.cts}

@@ -1,4 +1,4 @@
-import { C as ConsumerExecutionContext } from './ShutdownHook-DC2sOpcz.cjs';
+import { C as ConsumerExecutionContext } from './ShutdownHook-CCtg4Ypg.cjs';
 
 interface IdempotencyStore {
     claim?(key: string): Promise<boolean> | boolean;

package/dist/{RetryPredicate-Cs5bLFe9.d.ts → RetryPredicate-DG6jcGCX.d.ts}

@@ -1,4 +1,4 @@
-import { C as ConsumerExecutionContext } from './ShutdownHook-D8r9l6N5.js';
+import { C as ConsumerExecutionContext } from './ShutdownHook-BCQgEMUI.js';
 
 interface IdempotencyStore {
     claim?(key: string): Promise<boolean> | boolean;

package/dist/{ServiceClass-IInu6j5L.d.ts → ServiceClass-C-ZCUQWE.d.ts}

@@ -31,7 +31,6 @@ interface DependencyInjectionOptions {
 declare class DependencyInjection implements ServiceResolver {
     private readonly options;
     private static configuredInstance;
-    private autowire;
     private loader;
     private readonly container;
     private readonly overrideTokenIds;
@@ -45,9 +44,7 @@ declare class DependencyInjection implements ServiceResolver {
     private getOverrideId;
     private hasDirectService;
     private ensureSyntheticService;
-    private parentMatchesService;
-    private serviceIdMatchesService;
-    private serviceIdReferencesService;
+    private idNamesService;
     private getReferenceId;
     private getDefinitionArgumentReferences;
     private findConcreteChildServiceId;
@@ -60,6 +57,7 @@ declare class DependencyInjection implements ServiceResolver {
     private applyFactoryOverride;
     private applyValueOverride;
     private applyOverrides;
+    private trackAutowireAliasIds;
     private processAutowire;
     private registerParentAliases;
     compile(): Promise<void>;

package/dist/{ServiceClass-D_0gCcMr.d.cts → ServiceClass-U0Vk46dN.d.cts}

@@ -31,7 +31,6 @@ interface DependencyInjectionOptions {
 declare class DependencyInjection implements ServiceResolver {
     private readonly options;
     private static configuredInstance;
-    private autowire;
     private loader;
     private readonly container;
     private readonly overrideTokenIds;
@@ -45,9 +44,7 @@ declare class DependencyInjection implements ServiceResolver {
     private getOverrideId;
     private hasDirectService;
     private ensureSyntheticService;
-    private parentMatchesService;
-    private serviceIdMatchesService;
-    private serviceIdReferencesService;
+    private idNamesService;
     private getReferenceId;
     private getDefinitionArgumentReferences;
     private findConcreteChildServiceId;
@@ -60,6 +57,7 @@ declare class DependencyInjection implements ServiceResolver {
     private applyFactoryOverride;
     private applyValueOverride;
     private applyOverrides;
+    private trackAutowireAliasIds;
     private processAutowire;
     private registerParentAliases;
     compile(): Promise<void>;

package/dist/{ShutdownHook-D8r9l6N5.d.ts → ShutdownHook-BCQgEMUI.d.ts}

@@ -1,6 +1,6 @@
 import { D as DomainEvent } from './DomainEvent-C2OvBSCS.js';
 import { DotenvConfigOutput } from 'dotenv';
-import { b as DependencyOverride, D as DependencyInjection, S as ServiceClass } from './ServiceClass-IInu6j5L.js';
+import { b as DependencyOverride, D as DependencyInjection, S as ServiceClass } from './ServiceClass-C-ZCUQWE.js';
 import { Initializer, Runtime } from './infrastructure/lifecycle/index.js';
 import { a as Scheduler } from './Scheduler-Cm24s3-v.js';
 import { K as KernelLogger } from './KernelLogger-BESOFrpW.js';

package/dist/{ShutdownHook-DC2sOpcz.d.cts → ShutdownHook-CCtg4Ypg.d.cts}

@@ -1,6 +1,6 @@
 import { D as DomainEvent } from './DomainEvent-C2OvBSCS.cjs';
 import { DotenvConfigOutput } from 'dotenv';
-import { b as DependencyOverride, D as DependencyInjection, S as ServiceClass } from './ServiceClass-D_0gCcMr.cjs';
+import { b as DependencyOverride, D as DependencyInjection, S as ServiceClass } from './ServiceClass-U0Vk46dN.cjs';
 import { Initializer, Runtime } from './infrastructure/lifecycle/index.cjs';
 import { a as Scheduler } from './Scheduler-Cm24s3-v.cjs';
 import { K as KernelLogger } from './KernelLogger-BESOFrpW.cjs';

package/dist/adapters/index.cjs

@@ -167,7 +167,6 @@ var DependencyInjection = class _DependencyInjection {
   }
   options;
   static configuredInstance;
-  autowire;
   loader;
   container;
   overrideTokenIds = /* @__PURE__ */ new Map();
@@ -208,20 +207,8 @@ var DependencyInjection = class _DependencyInjection {
     definition.synthetic = true;
     this.container.set(id, value);
   }
-  parentMatchesService(parentId, serviceClassName) {
-    if (!parentId) {
-      return false;
-    }
-    const parentName = Buffer.from(parentId, "base64").toString("utf8");
-    return parentName.endsWith(`__${serviceClassName}__${serviceClassName}`);
-  }
-  serviceIdMatchesService(serviceId, serviceClassName) {
-    const serviceName = Buffer.from(serviceId, "base64").toString("utf8");
-    return serviceName.endsWith(`__${serviceClassName}__${serviceClassName}`);
-  }
-  serviceIdReferencesService(serviceId, serviceClassName) {
-    const serviceName = Buffer.from(serviceId, "base64").toString("utf8");
-    return serviceName.endsWith(`__${serviceClassName}`);
+  idNamesService(id, serviceClassName) {
+    return import_node_path.default.posix.basename(id) === serviceClassName;
   }
   getReferenceId(value) {
     if (typeof value === "object" && value !== null && "id" in value && typeof value.id === "string") {
@@ -245,7 +232,7 @@ var DependencyInjection = class _DependencyInjection {
       return void 0;
     }
     const matches = [...this.definitions.entries()].filter(([, definition]) => definition._abstract !== true).filter(
-      ([, definition]) => this.parentMatchesService(definition._parent, serviceClassName)
+      ([, definition]) => definition._parent && this.idNamesService(definition._parent, serviceClassName)
     ).map(([id]) => id);
     return matches[matches.length - 1];
   }
@@ -255,7 +242,7 @@ var DependencyInjection = class _DependencyInjection {
       return void 0;
     }
     const matches = [...this.definitions.keys()].filter(
-      (id) => this.serviceIdMatchesService(id, serviceClassName)
+      (id) => this.idNamesService(id, serviceClassName)
     );
     return matches[matches.length - 1];
   }
@@ -265,7 +252,7 @@ var DependencyInjection = class _DependencyInjection {
       return void 0;
     }
     const matches = [...this.aliases.keys()].filter(
-      (id) => this.serviceIdMatchesService(id, serviceClassName)
+      (id) => this.idNamesService(id, serviceClassName)
     );
     return matches[matches.length - 1];
   }
@@ -278,9 +265,7 @@ var DependencyInjection = class _DependencyInjection {
       ...new Set(
         [...this.definitions.values()].flatMap(
           (definition) => this.getDefinitionArgumentReferences(definition)
-        ).filter(
-          (id) => this.serviceIdReferencesService(id, serviceClassName)
-        )
+        ).filter((id) => this.idNamesService(id, serviceClassName))
       )
     ];
   }
@@ -349,14 +334,31 @@ var DependencyInjection = class _DependencyInjection {
       this.applyValueOverride(override);
     }
   }
-  async processAutowire() {
+  trackAutowireAliasIds(autowire) {
+    const internals = autowire;
+    const createLegacyServiceId = internals._getLegacyServiceId.bind(autowire);
+    const aliasIds = /* @__PURE__ */ new Set();
+    internals._getLegacyServiceId = async (...args) => {
+      const id = await createLegacyServiceId(...args);
+      if (!this.container.hasAlias(id) && !this.container.hasDefinition(id)) {
+        aliasIds.add(id);
+      }
+      return id;
+    };
+    return aliasIds;
+  }
+  async processAutowire(autowire) {
     const previousLogger = this.container.logger;
+    const autowireAliasIds = this.trackAutowireAliasIds(autowire);
     this.container.logger = new AutowireWarningFilter(previousLogger);
     try {
-      await this.autowire?.process();
+      await autowire.process();
     } finally {
       this.container.logger = previousLogger;
     }
+    for (const id of autowireAliasIds) {
+      this.aliases.delete(id);
+    }
   }
   registerParentAliases() {
     for (const [id, definition] of this.definitions.entries()) {
@@ -369,13 +371,12 @@ var DependencyInjection = class _DependencyInjection {
   async compile() {
     if (this.options.containerBuild) {
       await this.ensureFolderExists(this.options.servicesYamlPath);
-      this.autowire = new import_node_dependency_injection.Autowire(this.container);
-      this.autowire.makeIdLegacy();
-      this.autowire.serviceFile = new import_node_dependency_injection.ServiceFile(
+      const autowire = new import_node_dependency_injection.Autowire(this.container);
+      autowire.serviceFile = new import_node_dependency_injection.ServiceFile(
         this.options.servicesYamlPath,
         false
       );
-      await this.processAutowire();
+      await this.processAutowire(autowire);
     } else {
       this.loader = new import_node_dependency_injection.YamlFileLoader(this.container);
       await this.loader.load(this.options.servicesYamlPath);