@haskou/ddd-kernel 3.0.0 → 4.0.0

package/dist/adapters/index.js

@@ -117,7 +117,6 @@ var DependencyInjection = class _DependencyInjection {
   }
   options;
   static configuredInstance;
-  autowire;
   loader;
   container;
   overrideTokenIds = /* @__PURE__ */ new Map();
@@ -285,14 +284,31 @@ var DependencyInjection = class _DependencyInjection {
       this.applyValueOverride(override);
     }
   }
-  async processAutowire() {
+  trackAutowireAliasIds(autowire) {
+    const internals = autowire;
+    const createServiceId = internals._getLegacyServiceId.bind(autowire);
+    const aliasIds = /* @__PURE__ */ new Set();
+    internals._getLegacyServiceId = async (...args) => {
+      const id = await createServiceId(...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()) {
@@ -305,12 +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.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);
@@ -790,34 +806,20 @@ var IdempotencyConsumerMiddleware = class {
     this.options = options;
   }
   options;
-  async handleClaimedKey(key, next) {
-    const claimed = await this.options.store.claim?.(key);
+  async handle(event, next, context) {
+    const key = this.options.key?.(event, context) ?? context.eventId;
+    const claimed = await this.options.store.claim(key);
     if (!claimed) {
       return;
     }
     try {
       await next();
-      await (this.options.store.commit?.(key) ?? this.options.store.mark(key));
+      await this.options.store.commit(key);
     } catch (error) {
-      await this.options.store.release?.(key);
+      await this.options.store.release(key);
       throw error;
     }
   }
-  async handleLegacyKey(key, next) {
-    if (await this.options.store.has(key)) {
-      return;
-    }
-    await next();
-    await this.options.store.mark(key);
-  }
-  async handle(event, next, context) {
-    const key = this.options.key?.(event, context) ?? context.eventId;
-    if (this.options.store.claim) {
-      await this.handleClaimedKey(key, next);
-    } else {
-      await this.handleLegacyKey(key, next);
-    }
-  }
 };
 
 // src/adapters/pubsub/InMemoryIdempotencyStore.ts
@@ -841,9 +843,6 @@ var InMemoryIdempotencyStore = class {
   has(key) {
     return this.handledKeys.has(key);
   }
-  mark(key) {
-    this.handledKeys.add(key);
-  }
 };
 
 // src/adapters/pubsub/PublisherHookPipeline.ts
@@ -1072,8 +1071,6 @@ var ExpressKernelServer = class {
       options.postControllerMiddlewares
     );
     this.preControllerMiddlewares = this.copy(options.preControllerMiddlewares);
-    this.staticHooks = this.copy(options.staticHooks);
-    this.swaggerHooks = this.copy(options.swaggerHooks);
   }
   options;
   applicationRequire = createRequire(
@@ -1089,8 +1086,6 @@ var ExpressKernelServer = class {
   postControllerMiddlewares;
   preControllerMiddlewares;
   serverInstance;
-  staticHooks;
-  swaggerHooks;
   copy(items) {
     return [...items ?? []];
   }
@@ -1248,8 +1243,6 @@ var ExpressKernelServer = class {
     this.applyMiddlewares(app, this.postControllerMiddlewares);
     await this.runHooks(this.afterControllersHooks, app);
     await this.runPhaseHooks("afterControllers", app);
-    await this.runHooks(this.swaggerHooks, app);
-    await this.runHooks(this.staticHooks, app);
     await this.runPhaseHooks("beforeErrors", app);
     this.applyErrorHandlers(app);
     this.appInstance = app;