@haskou/ddd-kernel 2.0.15 → 3.0.1

package/dist/adapters/index.js

@@ -117,7 +117,6 @@ var DependencyInjection = class _DependencyInjection {
   }
   options;
   static configuredInstance;
-  autowire;
   loader;
   container;
   overrideTokenIds = /* @__PURE__ */ new Map();
@@ -158,20 +157,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 path.posix.basename(id) === serviceClassName;
   }
   getReferenceId(value) {
     if (typeof value === "object" && value !== null && "id" in value && typeof value.id === "string") {
@@ -195,7 +182,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];
   }
@@ -205,7 +192,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];
   }
@@ -215,7 +202,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];
   }
@@ -228,9 +215,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))
       )
     ];
   }
@@ -299,14 +284,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()) {
@@ -319,13 +321,12 @@ var DependencyInjection = class _DependencyInjection {
   async compile() {
     if (this.options.containerBuild) {
       await this.ensureFolderExists(this.options.servicesYamlPath);
-      this.autowire = new Autowire(this.container);
-      this.autowire.makeIdLegacy();
-      this.autowire.serviceFile = new ServiceFile(
+      const autowire = new Autowire(this.container);
+      autowire.serviceFile = new ServiceFile(
         this.options.servicesYamlPath,
         false
       );
-      await this.processAutowire();
+      await this.processAutowire(autowire);
     } else {
       this.loader = new YamlFileLoader(this.container);
       await this.loader.load(this.options.servicesYamlPath);