@navios/di 0.4.2 → 0.5.1

package/lib/{chunk-3NLYPYBY.mjs → chunk-2M576LCC.mjs}

@@ -1,7 +1,7 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : Symbol.for("Symbol." + name);
+var __knownSymbol = (name, symbol) => (symbol = Symbol[name]) ? symbol : /* @__PURE__ */ Symbol.for("Symbol." + name);
 var __typeError = (msg) => {
   throw TypeError(msg);
 };
@@ -172,10 +172,11 @@ var Registry = class {
 var globalRegistry = new Registry();
 
 // src/symbols/injectable-token.mts
-var InjectableTokenMeta = Symbol.for("InjectableTokenMeta");
+var InjectableTokenMeta = /* @__PURE__ */ Symbol.for("InjectableTokenMeta");
 function Injectable({
   scope = "Singleton" /* Singleton */,
   token,
+  schema,
   registry = globalRegistry
 } = {}) {
   return (target, context) => {
@@ -184,79 +185,73 @@ function Injectable({
         "[ServiceLocator] @Injectable decorator can only be used on classes."
       );
     }
-    let injectableToken = token ?? InjectionToken.create(target);
+    if (schema && token) {
+      throw new Error(
+        "[ServiceLocator] @Injectable decorator cannot have both a token and a schema"
+      );
+    }
+    let injectableToken = token ?? InjectionToken.create(target, schema);
     registry.set(injectableToken, scope, target, "Class" /* Class */);
     target[InjectableTokenMeta] = injectableToken;
     return target;
   };
 }
 
-// src/errors/errors.enum.mts
-var ErrorsEnum = /* @__PURE__ */ ((ErrorsEnum2) => {
-  ErrorsEnum2["InstanceExpired"] = "InstanceExpired";
-  ErrorsEnum2["InstanceNotFound"] = "InstanceNotFound";
-  ErrorsEnum2["InstanceDestroying"] = "InstanceDestroying";
-  ErrorsEnum2["UnknownError"] = "UnknownError";
-  ErrorsEnum2["FactoryNotFound"] = "FactoryNotFound";
-  ErrorsEnum2["FactoryTokenNotResolved"] = "FactoryTokenNotResolved";
-  return ErrorsEnum2;
-})(ErrorsEnum || {});
-
-// src/errors/factory-not-found.mts
-var FactoryNotFound = class extends Error {
-  constructor(name) {
-    super(`Factory ${name} not found`);
-    this.name = name;
-  }
-  code = "FactoryNotFound" /* FactoryNotFound */;
-};
-
-// src/errors/factory-token-not-resolved.mts
-var FactoryTokenNotResolved = class extends Error {
-  code = "FactoryTokenNotResolved" /* FactoryTokenNotResolved */;
-  constructor(name) {
-    super(`Factory token not resolved: ${name.toString()}`);
+// src/errors/di-error.mts
+var DIErrorCode = /* @__PURE__ */ ((DIErrorCode2) => {
+  DIErrorCode2["FactoryNotFound"] = "FactoryNotFound";
+  DIErrorCode2["FactoryTokenNotResolved"] = "FactoryTokenNotResolved";
+  DIErrorCode2["InstanceNotFound"] = "InstanceNotFound";
+  DIErrorCode2["InstanceDestroying"] = "InstanceDestroying";
+  DIErrorCode2["UnknownError"] = "UnknownError";
+  return DIErrorCode2;
+})(DIErrorCode || {});
+var DIError = class _DIError extends Error {
+  code;
+  context;
+  constructor(code, message, context) {
+    super(message);
+    this.name = "DIError";
+    this.code = code;
+    this.context = context;
+  }
+  // Static factory methods for common error types
+  static factoryNotFound(name) {
+    return new _DIError(
+      "FactoryNotFound" /* FactoryNotFound */,
+      `Factory ${name} not found`,
+      { name }
+    );
   }
-};
-
-// src/errors/instance-destroying.mts
-var InstanceDestroying = class extends Error {
-  constructor(name) {
-    super(`Instance ${name} destroying`);
-    this.name = name;
+  static factoryTokenNotResolved(token) {
+    return new _DIError(
+      "FactoryTokenNotResolved" /* FactoryTokenNotResolved */,
+      `Factory token not resolved: ${token?.toString() ?? "unknown"}`,
+      { token }
+    );
   }
-  code = "InstanceDestroying" /* InstanceDestroying */;
-};
-
-// src/errors/instance-expired.mts
-var InstanceExpired = class extends Error {
-  constructor(name) {
-    super(`Instance ${name} expired`);
-    this.name = name;
+  static instanceNotFound(name) {
+    return new _DIError(
+      "InstanceNotFound" /* InstanceNotFound */,
+      `Instance ${name} not found`,
+      { name }
+    );
   }
-  code = "InstanceExpired" /* InstanceExpired */;
-};
-
-// src/errors/instance-not-found.mts
-var InstanceNotFound = class extends Error {
-  constructor(name) {
-    super(`Instance ${name} not found`);
-    this.name = name;
+  static instanceDestroying(name) {
+    return new _DIError(
+      "InstanceDestroying" /* InstanceDestroying */,
+      `Instance ${name} destroying`,
+      { name }
+    );
   }
-  code = "InstanceNotFound" /* InstanceNotFound */;
-};
-
-// src/errors/unknown-error.mts
-var UnknownError = class extends Error {
-  code = "UnknownError" /* UnknownError */;
-  parent;
-  constructor(message) {
+  static unknown(message, context) {
     if (message instanceof Error) {
-      super(message.message);
-      this.parent = message;
-      return;
+      return new _DIError("UnknownError" /* UnknownError */, message.message, {
+        ...context,
+        parent: message
+      });
     }
-    super(message);
+    return new _DIError("UnknownError" /* UnknownError */, message, context);
   }
 };
 
@@ -278,29 +273,58 @@ function getInjectors() {
   }
   let promiseCollector = null;
   let injectState = null;
-  function asyncInject2(token, args) {
+  function getRequest(token, args) {
     if (!injectState) {
       throw new Error(
-        "[Injector] Trying to access inject outside of a injectable context"
+        "[Injector] Trying to make a request outside of a injectable context"
       );
     }
     if (injectState.isFrozen) {
       const idx = injectState.currentIndex++;
-      const request = injectState.requests[idx];
-      if (request.token !== token) {
+      const request2 = injectState.requests[idx];
+      if (request2.token !== token) {
         throw new Error(
-          `[Injector] Wrong token order. Expected ${request.token.toString()} but got ${token.toString()}`
+          `[Injector] Wrong token order. Expected ${request2.token.toString()} but got ${token.toString()}`
         );
       }
-      return request.promise;
-    }
-    const promise = getFactoryContext().inject(token, args);
-    injectState.requests.push({
-      token,
-      promise
+      return request2;
+    }
+    let result = null;
+    let error = null;
+    const promise = getFactoryContext().inject(token, args).then((r) => {
+      result = r;
+      return r;
+    }).catch((e) => {
+      error = e;
     });
+    const request = {
+      token,
+      promise,
+      get result() {
+        return result;
+      },
+      get error() {
+        return error;
+      }
+    };
+    injectState.requests.push(request);
     injectState.currentIndex++;
-    return promise;
+    return request;
+  }
+  function asyncInject2(token, args) {
+    if (!injectState) {
+      throw new Error(
+        "[Injector] Trying to access inject outside of a injectable context"
+      );
+    }
+    const realToken = token[InjectableTokenMeta] ?? token;
+    const request = getRequest(realToken, args);
+    return request.promise.then((result) => {
+      if (request.error) {
+        throw request.error;
+      }
+      return result;
+    });
   }
   function wrapSyncInit2(cb) {
     return (previousState) => {
@@ -330,23 +354,31 @@ function getInjectors() {
   }
   function inject2(token, args) {
     const realToken = token[InjectableTokenMeta] ?? token;
+    if (!injectState) {
+      throw new Error(
+        "[Injector] Trying to access inject outside of a injectable context"
+      );
+    }
     const instance = getFactoryContext().locator.getSyncInstance(
       realToken,
       args
     );
     if (!instance) {
+      const request = getRequest(realToken, args);
+      if (request.error) {
+        throw request.error;
+      } else if (request.result) {
+        return request.result;
+      }
       if (promiseCollector) {
-        const promise = getFactoryContext().inject(realToken, args);
-        promiseCollector(promise);
-      } else {
-        throw new Error(`[Injector] Cannot initiate ${realToken.toString()}`);
+        promiseCollector(request.promise);
       }
       return new Proxy(
         {},
         {
           get() {
             throw new Error(
-              `[Injector] Trying to access ${realToken.toString()} before it's initialized, please use asyncInject() instead of inject() or do not use the value outside of class methods`
+              `[Injector] Trying to access ${realToken.toString()} before it's initialized, please move the code to a onServiceInit method`
             );
           }
         }
@@ -354,9 +386,17 @@ function getInjectors() {
     }
     return instance;
   }
+  function optional2(token, args) {
+    try {
+      return inject2(token, args);
+    } catch {
+      return null;
+    }
+  }
   const injectors = {
     asyncInject: asyncInject2,
     inject: inject2,
+    optional: optional2,
     wrapSyncInit: wrapSyncInit2,
     provideFactoryContext: provideFactoryContext2
   };
@@ -374,73 +414,13 @@ function getInjectableToken(target) {
   return token;
 }
 
-// src/utils/defer.mts
-var Deferred = class {
-  promise;
-  _resolve;
-  _reject;
-  _isResolved = false;
-  _isRejected = false;
-  constructor() {
-    this.promise = new Promise((resolve, reject) => {
-      this._resolve = resolve;
-      this._reject = reject;
-    });
-  }
-  /**
-   * Resolves the deferred promise with the given value.
-   * @param value The value to resolve with
-   * @throws Error if the promise has already been resolved or rejected
-   */
-  resolve(value) {
-    if (this._isResolved || this._isRejected) {
-      throw new Error("Deferred promise has already been resolved or rejected");
-    }
-    this._isResolved = true;
-    this._resolve(value);
-  }
-  /**
-   * Rejects the deferred promise with the given reason.
-   * @param reason The reason for rejection
-   * @throws Error if the promise has already been resolved or rejected
-   */
-  reject(reason) {
-    if (this._isResolved || this._isRejected) {
-      throw new Error("Deferred promise has already been resolved or rejected");
-    }
-    this._isRejected = true;
-    this._reject(reason);
-  }
-  /**
-   * Returns true if the promise has been resolved.
-   */
-  get isResolved() {
-    return this._isResolved;
-  }
-  /**
-   * Returns true if the promise has been rejected.
-   */
-  get isRejected() {
-    return this._isRejected;
-  }
-  /**
-   * Returns true if the promise has been settled (resolved or rejected).
-   */
-  get isSettled() {
-    return this._isResolved || this._isRejected;
-  }
-};
-function createDeferred() {
-  return new Deferred();
-}
-
 // src/service-locator-instance-holder.mts
-var ServiceLocatorInstanceHolderStatus = /* @__PURE__ */ ((ServiceLocatorInstanceHolderStatus3) => {
-  ServiceLocatorInstanceHolderStatus3["Created"] = "created";
-  ServiceLocatorInstanceHolderStatus3["Creating"] = "creating";
-  ServiceLocatorInstanceHolderStatus3["Destroying"] = "destroying";
-  ServiceLocatorInstanceHolderStatus3["Error"] = "error";
-  return ServiceLocatorInstanceHolderStatus3;
+var ServiceLocatorInstanceHolderStatus = /* @__PURE__ */ ((ServiceLocatorInstanceHolderStatus2) => {
+  ServiceLocatorInstanceHolderStatus2["Created"] = "created";
+  ServiceLocatorInstanceHolderStatus2["Creating"] = "creating";
+  ServiceLocatorInstanceHolderStatus2["Destroying"] = "destroying";
+  ServiceLocatorInstanceHolderStatus2["Error"] = "error";
+  return ServiceLocatorInstanceHolderStatus2;
 })(ServiceLocatorInstanceHolderStatus || {});
 
 // src/base-instance-holder-manager.mts
@@ -493,11 +473,10 @@ var BaseInstanceHolderManager = class {
    * @param type The injectable type
    * @param scope The injectable scope
    * @param deps Optional set of dependencies
-   * @param ttl Optional time-to-live in milliseconds (defaults to Infinity)
    * @returns A tuple containing the deferred promise and the holder
    */
-  createCreatingHolder(name, type, scope, deps = /* @__PURE__ */ new Set(), ttl = Infinity) {
-    const deferred = createDeferred();
+  createCreatingHolder(name, type, scope, deps = /* @__PURE__ */ new Set()) {
+    const deferred = Promise.withResolvers();
     const holder = {
       status: "creating" /* Creating */,
       name,
@@ -508,8 +487,7 @@ var BaseInstanceHolderManager = class {
       scope,
       deps,
       destroyListeners: [],
-      createdAt: Date.now(),
-      ttl
+      createdAt: Date.now()
     };
     return [deferred, holder];
   }
@@ -521,10 +499,9 @@ var BaseInstanceHolderManager = class {
    * @param type The injectable type
    * @param scope The injectable scope
    * @param deps Optional set of dependencies
-   * @param ttl Optional time-to-live in milliseconds (defaults to Infinity)
    * @returns The created holder
    */
-  createCreatedHolder(name, instance, type, scope, deps = /* @__PURE__ */ new Set(), ttl = Infinity) {
+  createCreatedHolder(name, instance, type, scope, deps = /* @__PURE__ */ new Set()) {
     const holder = {
       status: "created" /* Created */,
       name,
@@ -535,8 +512,7 @@ var BaseInstanceHolderManager = class {
       scope,
       deps,
       destroyListeners: [],
-      createdAt: Date.now(),
-      ttl
+      createdAt: Date.now()
     };
     return holder;
   }
@@ -564,6 +540,7 @@ var BaseInstanceHolderManager = class {
 var defaultInjectors = getInjectors();
 var asyncInject = defaultInjectors.asyncInject;
 var inject = defaultInjectors.inject;
+var optional = defaultInjectors.optional;
 var wrapSyncInit = defaultInjectors.wrapSyncInit;
 var provideFactoryContext = defaultInjectors.provideFactoryContext;
 
@@ -741,8 +718,7 @@ var DefaultRequestContextHolder = class extends BaseInstanceHolderManager {
         instance,
         "Class" /* Class */,
         "Singleton" /* Singleton */,
-        /* @__PURE__ */ new Set(),
-        Infinity
+        /* @__PURE__ */ new Set()
       );
       this._holders.set(name, createdHolder);
     } else {
@@ -784,7 +760,7 @@ var ServiceLocatorEventBus = class {
     }
     nsEvents.get(event).add(listener);
     return () => {
-      nsEvents.get(event).delete(listener);
+      nsEvents.get(event)?.delete(listener);
       if (nsEvents.get(event)?.size === 0) {
         nsEvents.delete(event);
       }
@@ -826,19 +802,11 @@ var ServiceLocatorManager = class extends BaseInstanceHolderManager {
   get(name) {
     const holder = this._holders.get(name);
     if (holder) {
-      if (holder.ttl !== Infinity) {
-        const now = Date.now();
-        if (now - holder.createdAt > holder.ttl) {
-          this.logger?.log(
-            `[ServiceLocatorManager]#getInstanceHolder() TTL expired for ${holder.name}`
-          );
-          return [new InstanceExpired(holder.name), holder];
-        }
-      } else if (holder.status === "destroying" /* Destroying */) {
+      if (holder.status === "destroying" /* Destroying */) {
         this.logger?.log(
           `[ServiceLocatorManager]#getInstanceHolder() Instance ${holder.name} is destroying`
         );
-        return [new InstanceDestroying(holder.name), holder];
+        return [DIError.instanceDestroying(holder.name), holder];
       } else if (holder.status === "error" /* Error */) {
         this.logger?.log(
           `[ServiceLocatorManager]#getInstanceHolder() Instance ${holder.name} is in error state`
@@ -850,7 +818,7 @@ var ServiceLocatorManager = class extends BaseInstanceHolderManager {
       this.logger?.log(
         `[ServiceLocatorManager]#getInstanceHolder() Instance ${name} not found`
       );
-      return [new InstanceNotFound(name)];
+      return [DIError.instanceNotFound(name)];
     }
   }
   set(name, holder) {
@@ -861,9 +829,7 @@ var ServiceLocatorManager = class extends BaseInstanceHolderManager {
     if (!error) {
       return [void 0, true];
     }
-    if (["InstanceExpired" /* InstanceExpired */, "InstanceDestroying" /* InstanceDestroying */].includes(
-      error.code
-    )) {
+    if (error.code === "InstanceDestroying" /* InstanceDestroying */) {
       return [error];
     }
     return [void 0, !!holder];
@@ -878,55 +844,29 @@ var ServiceLocatorManager = class extends BaseInstanceHolderManager {
    * @param type The injectable type
    * @param scope The injectable scope
    * @param deps Optional set of dependencies
-   * @param ttl Optional time-to-live in milliseconds (defaults to Infinity)
    * @returns The created holder
    */
-  storeCreatedHolder(name, instance, type, scope, deps = /* @__PURE__ */ new Set(), ttl = Infinity) {
-    const holder = this.createCreatedHolder(
-      name,
-      instance,
-      type,
-      scope,
-      deps,
-      ttl
-    );
+  storeCreatedHolder(name, instance, type, scope, deps = /* @__PURE__ */ new Set()) {
+    const holder = this.createCreatedHolder(name, instance, type, scope, deps);
     this._holders.set(name, holder);
     return holder;
   }
 };
 
-// src/service-locator.mts
-var ServiceLocator = class {
-  constructor(registry = globalRegistry, logger = null, injectors = defaultInjectors) {
+// src/instance-resolver.mts
+var InstanceResolver = class {
+  constructor(registry, manager, serviceInstantiator, tokenProcessor, logger = null, serviceLocator) {
     this.registry = registry;
+    this.manager = manager;
+    this.serviceInstantiator = serviceInstantiator;
+    this.tokenProcessor = tokenProcessor;
     this.logger = logger;
-    this.injectors = injectors;
-    this.eventBus = new ServiceLocatorEventBus(logger);
-    this.manager = new ServiceLocatorManager(logger);
-    this.serviceInstantiator = new ServiceInstantiator(injectors);
-  }
-  eventBus;
-  manager;
-  serviceInstantiator;
-  requestContexts = /* @__PURE__ */ new Map();
-  currentRequestContext = null;
-  // ============================================================================
-  // PUBLIC METHODS
-  // ============================================================================
-  getEventBus() {
-    return this.eventBus;
-  }
-  getManager() {
-    return this.manager;
-  }
-  getInstanceIdentifier(token, args) {
-    const [err, { actualToken, validatedArgs }] = this.validateAndResolveTokenArgs(token, args);
-    if (err) {
-      throw err;
-    }
-    return this.generateInstanceName(actualToken, validatedArgs);
+    this.serviceLocator = serviceLocator;
   }
-  async getInstance(token, args, onPrepare) {
+  /**
+   * Resolves an instance for the given token and arguments.
+   */
+  async resolveInstance(token, args, requestContext) {
     const [err, data] = await this.resolveTokenAndPrepareInstanceName(
       token,
       args
@@ -934,33 +874,36 @@ var ServiceLocator = class {
     if (err) {
       return [err];
     }
-    const { instanceName, validatedArgs, actualToken, realToken } = data;
-    onPrepare?.({ instanceName, actualToken, validatedArgs });
+    const {
+      instanceName,
+      validatedArgs,
+      realToken
+    } = data;
     const [error, holder] = await this.retrieveOrCreateInstanceByInstanceName(
       instanceName,
       realToken,
-      validatedArgs
+      validatedArgs,
+      requestContext
     );
     if (error) {
       return [error];
     }
     return [void 0, holder.instance];
   }
-  async getOrThrowInstance(token, args) {
-    const [error, instance] = await this.getInstance(token, args);
-    if (error) {
-      throw error;
-    }
-    return instance;
-  }
-  getSyncInstance(token, args) {
-    const [err, { actualToken, validatedArgs }] = this.validateAndResolveTokenArgs(token, args);
+  /**
+   * Gets a synchronous instance (for sync operations).
+   */
+  getSyncInstance(token, args, currentRequestContext) {
+    const [err, { actualToken, validatedArgs }] = this.tokenProcessor.validateAndResolveTokenArgs(token, args);
     if (err) {
       return null;
     }
-    const instanceName = this.generateInstanceName(actualToken, validatedArgs);
-    if (this.currentRequestContext) {
-      const requestHolder = this.currentRequestContext.get(instanceName);
+    const instanceName = this.tokenProcessor.generateInstanceName(
+      actualToken,
+      validatedArgs
+    );
+    if (currentRequestContext) {
+      const requestHolder = currentRequestContext.get(instanceName);
       if (requestHolder) {
         return requestHolder.instance;
       }
@@ -971,270 +914,96 @@ var ServiceLocator = class {
     }
     return holder.instance;
   }
-  invalidate(service, round = 1) {
-    this.logger?.log(
-      `[ServiceLocator] Starting invalidation process for ${service}`
-    );
-    const toInvalidate = this.manager.filter(
-      (holder) => holder.name === service || holder.deps.has(service)
-    );
-    const promises = [];
-    for (const [key, holder] of toInvalidate.entries()) {
-      promises.push(this.invalidateHolder(key, holder, round));
-    }
-    return Promise.all(promises);
-  }
   /**
-   * Invalidates a single holder based on its current status.
+   * Internal method to resolve token args and create instance name.
+   * Handles factory token resolution and validation.
    */
-  async invalidateHolder(key, holder, round) {
-    switch (holder.status) {
-      case "destroying" /* Destroying */:
-        this.logger?.trace(`[ServiceLocator] ${key} is already being destroyed`);
-        await holder.destroyPromise;
-        break;
-      case "creating" /* Creating */:
-        this.logger?.trace(
-          `[ServiceLocator] ${key} is being created, waiting...`
-        );
-        await holder.creationPromise;
-        if (round > 3) {
-          this.logger?.error(
-            `[ServiceLocator] ${key} creation triggered too many invalidation rounds`
-          );
-          return;
-        }
-        await this.invalidate(key, round + 1);
-        break;
-      default:
-        await this.destroyHolder(key, holder);
-        break;
+  async resolveTokenAndPrepareInstanceName(token, args) {
+    const [err, { actualToken, validatedArgs }] = this.tokenProcessor.validateAndResolveTokenArgs(token, args);
+    if (err instanceof DIError && err.code === "UnknownError" /* UnknownError */) {
+      return [err];
+    } else if (err instanceof DIError && err.code === "FactoryTokenNotResolved" /* FactoryTokenNotResolved */ && actualToken instanceof FactoryInjectionToken) {
+      this.logger?.log(
+        `[InstanceResolver]#resolveTokenAndPrepareInstanceName() Factory token not resolved, resolving it`
+      );
+      await actualToken.resolve(this.createFactoryContext());
+      return this.resolveTokenAndPrepareInstanceName(token);
     }
+    const instanceName = this.tokenProcessor.generateInstanceName(
+      actualToken,
+      validatedArgs
+    );
+    const realToken = actualToken instanceof BoundInjectionToken || actualToken instanceof FactoryInjectionToken ? actualToken.token : actualToken;
+    return [void 0, { instanceName, validatedArgs, actualToken, realToken }];
   }
   /**
-   * Destroys a holder and cleans up its resources.
+   * Gets an instance by its instance name, handling all the logic after instance name creation.
    */
-  async destroyHolder(key, holder) {
-    holder.status = "destroying" /* Destroying */;
-    this.logger?.log(
-      `[ServiceLocator] Invalidating ${key} and notifying listeners`
-    );
-    holder.destroyPromise = Promise.all(
-      holder.destroyListeners.map((listener) => listener())
-    ).then(async () => {
-      this.manager.delete(key);
-      await this.emitInstanceEvent(key, "destroy");
-    });
-    await holder.destroyPromise;
-  }
-  async ready() {
-    const holders = Array.from(this.manager.filter(() => true)).map(
-      ([, holder]) => holder
+  async retrieveOrCreateInstanceByInstanceName(instanceName, realToken, realArgs, requestContext) {
+    const existingHolder = await this.tryGetExistingInstance(
+      instanceName,
+      realToken,
+      requestContext
     );
-    await Promise.all(
-      holders.map((holder) => this.waitForHolderToSettle(holder))
+    if (existingHolder) {
+      return existingHolder;
+    }
+    const result = await this.createNewInstance(
+      instanceName,
+      realToken,
+      realArgs,
+      requestContext
     );
+    if (result[0]) {
+      return [result[0]];
+    }
+    const [, holder] = result;
+    return this.waitForInstanceReady(holder);
   }
   /**
-   * Waits for a holder to settle (either created, destroyed, or error state).
+   * Attempts to retrieve an existing instance, handling request-scoped and singleton instances.
+   * Returns null if no instance exists and a new one should be created.
    */
-  async waitForHolderToSettle(holder) {
-    switch (holder.status) {
-      case "creating" /* Creating */:
-        await holder.creationPromise;
-        break;
-      case "destroying" /* Destroying */:
-        await holder.destroyPromise;
-        break;
+  async tryGetExistingInstance(instanceName, realToken, requestContext) {
+    const requestResult = await this.tryGetRequestScopedInstance(
+      instanceName,
+      realToken,
+      requestContext
+    );
+    if (requestResult) {
+      return requestResult;
     }
+    return this.tryGetSingletonInstance(instanceName);
   }
-  // ============================================================================
-  // REQUEST CONTEXT MANAGEMENT
-  // ============================================================================
   /**
-   * Begins a new request context with the given parameters.
-   * @param requestId Unique identifier for this request
-   * @param metadata Optional metadata for the request
-   * @param priority Priority for resolution (higher = more priority)
-   * @returns The created request context holder
+   * Attempts to get a request-scoped instance if applicable.
    */
-  beginRequest(requestId, metadata, priority = 100) {
-    if (this.requestContexts.has(requestId)) {
-      throw new Error(
-        `[ServiceLocator] Request context ${requestId} already exists`
+  async tryGetRequestScopedInstance(instanceName, realToken, requestContext) {
+    if (!this.registry.has(realToken)) {
+      return null;
+    }
+    const record = this.registry.get(realToken);
+    if (record.scope !== "Request" /* Request */) {
+      return null;
+    }
+    if (!requestContext) {
+      this.logger?.log(
+        `[InstanceResolver] No current request context available for request-scoped service ${instanceName}`
       );
+      return [
+        DIError.unknown(
+          `No current request context available for request-scoped service ${instanceName}`
+        )
+      ];
     }
-    const contextHolder = new DefaultRequestContextHolder(
-      requestId,
-      priority,
-      metadata
-    );
-    this.requestContexts.set(requestId, contextHolder);
-    this.currentRequestContext = contextHolder;
-    this.logger?.log(`[ServiceLocator] Started request context: ${requestId}`);
-    return contextHolder;
+    const requestHolder = requestContext.get(instanceName);
+    if (!requestHolder) {
+      return null;
+    }
+    return this.waitForInstanceReady(requestHolder);
   }
   /**
-   * Ends a request context and cleans up all associated instances.
-   * @param requestId The request ID to end
-   */
-  async endRequest(requestId) {
-    const contextHolder = this.requestContexts.get(requestId);
-    if (!contextHolder) {
-      this.logger?.warn(
-        `[ServiceLocator] Request context ${requestId} not found`
-      );
-      return;
-    }
-    this.logger?.log(`[ServiceLocator] Ending request context: ${requestId}`);
-    const cleanupPromises = [];
-    for (const [, holder] of contextHolder.holders) {
-      if (holder.destroyListeners.length > 0) {
-        cleanupPromises.push(
-          Promise.all(holder.destroyListeners.map((listener) => listener()))
-        );
-      }
-    }
-    await Promise.all(cleanupPromises);
-    contextHolder.clear();
-    this.requestContexts.delete(requestId);
-    if (this.currentRequestContext === contextHolder) {
-      this.currentRequestContext = Array.from(this.requestContexts.values()).at(-1) ?? null;
-    }
-    this.logger?.log(`[ServiceLocator] Request context ${requestId} ended`);
-  }
-  /**
-   * Gets the current request context.
-   * @returns The current request context holder or null
-   */
-  getCurrentRequestContext() {
-    return this.currentRequestContext;
-  }
-  /**
-   * Sets the current request context.
-   * @param requestId The request ID to set as current
-   */
-  setCurrentRequestContext(requestId) {
-    const contextHolder = this.requestContexts.get(requestId);
-    if (!contextHolder) {
-      throw new Error(`[ServiceLocator] Request context ${requestId} not found`);
-    }
-    this.currentRequestContext = contextHolder;
-  }
-  // ============================================================================
-  // PRIVATE METHODS
-  // ============================================================================
-  /**
-   * Validates and resolves token arguments, handling factory token resolution and validation.
-   */
-  validateAndResolveTokenArgs(token, args) {
-    let actualToken = token;
-    if (typeof token === "function") {
-      actualToken = getInjectableToken(token);
-    }
-    let realArgs = args;
-    if (actualToken instanceof BoundInjectionToken) {
-      realArgs = actualToken.value;
-    } else if (actualToken instanceof FactoryInjectionToken) {
-      if (actualToken.resolved) {
-        realArgs = actualToken.value;
-      } else {
-        return [new FactoryTokenNotResolved(token.name), { actualToken }];
-      }
-    }
-    if (!actualToken.schema) {
-      return [void 0, { actualToken, validatedArgs: realArgs }];
-    }
-    const validatedArgs = actualToken.schema?.safeParse(realArgs);
-    if (validatedArgs && !validatedArgs.success) {
-      this.logger?.error(
-        `[ServiceLocator]#validateAndResolveTokenArgs(): Error validating args for ${actualToken.name.toString()}`,
-        validatedArgs.error
-      );
-      return [new UnknownError(validatedArgs.error), { actualToken }];
-    }
-    return [void 0, { actualToken, validatedArgs: validatedArgs?.data }];
-  }
-  /**
-   * Internal method to resolve token args and create instance name.
-   * Handles factory token resolution and validation.
-   */
-  async resolveTokenAndPrepareInstanceName(token, args) {
-    const [err, { actualToken, validatedArgs }] = this.validateAndResolveTokenArgs(token, args);
-    if (err instanceof UnknownError) {
-      return [err];
-    } else if (err instanceof FactoryTokenNotResolved && actualToken instanceof FactoryInjectionToken) {
-      this.logger?.log(
-        `[ServiceLocator]#resolveTokenAndPrepareInstanceName() Factory token not resolved, resolving it`
-      );
-      await actualToken.resolve(this.createFactoryContext());
-      return this.resolveTokenAndPrepareInstanceName(token);
-    }
-    const instanceName = this.generateInstanceName(actualToken, validatedArgs);
-    const realToken = actualToken instanceof BoundInjectionToken || actualToken instanceof FactoryInjectionToken ? actualToken.token : actualToken;
-    return [void 0, { instanceName, validatedArgs, actualToken, realToken }];
-  }
-  /**
-   * Gets an instance by its instance name, handling all the logic after instance name creation.
-   */
-  async retrieveOrCreateInstanceByInstanceName(instanceName, realToken, realArgs) {
-    const existingHolder = await this.tryGetExistingInstance(
-      instanceName,
-      realToken
-    );
-    if (existingHolder) {
-      return existingHolder;
-    }
-    const result = await this.createNewInstance(
-      instanceName,
-      realToken,
-      realArgs
-    );
-    if (result[0]) {
-      return [result[0]];
-    }
-    const [, holder] = result;
-    return this.waitForInstanceReady(holder);
-  }
-  /**
-   * Attempts to retrieve an existing instance, handling request-scoped and singleton instances.
-   * Returns null if no instance exists and a new one should be created.
-   */
-  async tryGetExistingInstance(instanceName, realToken) {
-    const requestResult = await this.tryGetRequestScopedInstance(
-      instanceName,
-      realToken
-    );
-    if (requestResult) {
-      return requestResult;
-    }
-    return this.tryGetSingletonInstance(instanceName);
-  }
-  /**
-   * Attempts to get a request-scoped instance if applicable.
-   */
-  async tryGetRequestScopedInstance(instanceName, realToken) {
-    if (!this.registry.has(realToken)) {
-      return null;
-    }
-    const record = this.registry.get(realToken);
-    if (record.scope !== "Request" /* Request */) {
-      return null;
-    }
-    if (!this.currentRequestContext) {
-      this.logger?.log(
-        `[ServiceLocator] No current request context available for request-scoped service ${instanceName}`
-      );
-      return [new UnknownError("InstanceNotFound" /* InstanceNotFound */)];
-    }
-    const requestHolder = this.currentRequestContext.get(instanceName);
-    if (!requestHolder) {
-      return null;
-    }
-    return this.waitForInstanceReady(requestHolder);
-  }
-  /**
-   * Attempts to get a singleton instance from the manager.
+   * Attempts to get a singleton instance from the manager.
    */
   async tryGetSingletonInstance(instanceName) {
     const [error, holder] = this.manager.get(instanceName);
@@ -1244,16 +1013,10 @@ var ServiceLocator = class {
     switch (error.code) {
       case "InstanceDestroying" /* InstanceDestroying */:
         this.logger?.log(
-          `[ServiceLocator] Instance ${instanceName} is being destroyed, waiting...`
+          `[InstanceResolver] Instance ${instanceName} is being destroyed, waiting...`
         );
         await holder?.destroyPromise;
         return this.tryGetSingletonInstance(instanceName);
-      case "InstanceExpired" /* InstanceExpired */:
-        this.logger?.log(
-          `[ServiceLocator] Instance ${instanceName} expired, invalidating...`
-        );
-        await this.invalidate(instanceName);
-        return this.tryGetSingletonInstance(instanceName);
       case "InstanceNotFound" /* InstanceNotFound */:
         return null;
       // Instance doesn't exist, should create new one
@@ -1270,59 +1033,48 @@ var ServiceLocator = class {
         await holder.creationPromise;
         return this.waitForInstanceReady(holder);
       case "destroying" /* Destroying */:
-        return [new UnknownError("InstanceDestroying" /* InstanceDestroying */)];
+        return [DIError.instanceDestroying(holder.name)];
       case "error" /* Error */:
         return [holder.instance];
       case "created" /* Created */:
         return [void 0, holder];
       default:
-        return [new UnknownError("InstanceNotFound" /* InstanceNotFound */)];
+        return [DIError.instanceNotFound("unknown")];
     }
   }
-  /**
-   * Emits events to listeners for instance lifecycle events.
-   */
-  emitInstanceEvent(name, event = "create") {
-    this.logger?.log(
-      `[ServiceLocator]#emitInstanceEvent() Notifying listeners for ${name} with event ${event}`
-    );
-    return this.eventBus.emit(name, event);
-  }
   /**
    * Creates a new instance for the given token and arguments.
    */
-  async createNewInstance(instanceName, realToken, args) {
+  async createNewInstance(instanceName, realToken, args, requestContext) {
     this.logger?.log(
-      `[ServiceLocator]#createNewInstance() Creating instance for ${instanceName}`
+      `[InstanceResolver]#createNewInstance() Creating instance for ${instanceName}`
     );
     if (this.registry.has(realToken)) {
       return this.instantiateServiceFromRegistry(
         instanceName,
         realToken,
-        args
+        args,
+        requestContext
       );
     } else {
-      return [new FactoryNotFound(realToken.name.toString())];
+      return [DIError.factoryNotFound(realToken.name.toString())];
     }
   }
   /**
    * Instantiates a service from the registry using the service instantiator.
    */
-  instantiateServiceFromRegistry(instanceName, token, args) {
+  instantiateServiceFromRegistry(instanceName, token, args, requestContext) {
     this.logger?.log(
-      `[ServiceLocator]#instantiateServiceFromRegistry(): Creating instance for ${instanceName} from abstract factory`
-    );
-    const ctx = this.createFactoryContext(
-      this.currentRequestContext || void 0
+      `[InstanceResolver]#instantiateServiceFromRegistry(): Creating instance for ${instanceName} from abstract factory`
     );
+    const ctx = this.createFactoryContext();
     let record = this.registry.get(token);
     let { scope, type } = record;
     const [deferred, holder] = this.manager.createCreatingHolder(
       instanceName,
       type,
       scope,
-      ctx.deps,
-      Infinity
+      ctx.deps
     );
     this.serviceInstantiator.instantiateService(ctx, record, args).then(async ([error, instance]) => {
       await this.handleInstantiationResult(
@@ -1332,7 +1084,8 @@ var ServiceLocator = class {
         deferred,
         scope,
         error,
-        instance
+        instance,
+        requestContext
       );
     }).catch(async (error) => {
       await this.handleInstantiationError(
@@ -1343,13 +1096,13 @@ var ServiceLocator = class {
         error
       );
     });
-    this.storeInstanceByScope(scope, instanceName, holder);
+    this.storeInstanceByScope(scope, instanceName, holder, requestContext);
     return [void 0, holder];
   }
   /**
    * Handles the result of service instantiation.
    */
-  async handleInstantiationResult(instanceName, holder, ctx, deferred, scope, error, instance) {
+  async handleInstantiationResult(instanceName, holder, ctx, deferred, scope, error, instance, _requestContext) {
     holder.destroyListeners = ctx.getDestroyListeners();
     holder.creationPromise = null;
     if (error) {
@@ -1379,15 +1132,18 @@ var ServiceLocator = class {
     if (ctx.deps.size > 0) {
       ctx.deps.forEach((dependency) => {
         holder.destroyListeners.push(
-          this.eventBus.on(
-            dependency,
-            "destroy",
-            () => this.invalidate(instanceName)
-          )
+          this.serviceLocator.getEventBus().on(dependency, "destroy", () => {
+            this.logger?.log(
+              `[InstanceResolver] Dependency ${dependency} destroyed, invalidating ${instanceName}`
+            );
+            this.serviceLocator.getServiceInvalidator().invalidate(instanceName);
+          })
         );
       });
     }
-    await this.emitInstanceEvent(instanceName);
+    this.logger?.log(
+      `[InstanceResolver] Instance ${instanceName} created successfully`
+    );
     deferred.resolve([void 0, instance]);
   }
   /**
@@ -1395,133 +1151,754 @@ var ServiceLocator = class {
    */
   async handleInstantiationError(instanceName, holder, deferred, scope, error) {
     this.logger?.error(
-      `[ServiceLocator] Error creating instance for ${instanceName}`,
+      `[InstanceResolver] Error creating instance for ${instanceName}`,
       error
     );
     holder.status = "error" /* Error */;
     holder.instance = error;
     holder.creationPromise = null;
     if (scope === "Singleton" /* Singleton */) {
-      setTimeout(() => this.invalidate(instanceName), 10);
+      this.logger?.log(
+        `[InstanceResolver] Singleton ${instanceName} failed, will be invalidated`
+      );
+      this.serviceLocator.getServiceInvalidator().invalidate(instanceName);
     }
     deferred.reject(error);
   }
   /**
    * Stores an instance holder based on its scope.
    */
-  storeInstanceByScope(scope, instanceName, holder) {
+  storeInstanceByScope(scope, instanceName, holder, requestContext) {
     switch (scope) {
       case "Singleton" /* Singleton */:
         this.logger?.debug(
-          `[ServiceLocator] Setting singleton instance for ${instanceName}`
+          `[InstanceResolver] Setting singleton instance for ${instanceName}`
         );
         this.manager.set(instanceName, holder);
         break;
       case "Request" /* Request */:
-        if (this.currentRequestContext) {
+        if (requestContext) {
           this.logger?.debug(
-            `[ServiceLocator] Setting request-scoped instance for ${instanceName}`
-          );
-          this.currentRequestContext.addInstance(
-            instanceName,
-            holder.instance,
-            holder
+            `[InstanceResolver] Setting request-scoped instance for ${instanceName}`
           );
+          requestContext.addInstance(instanceName, holder.instance, holder);
         }
         break;
     }
   }
-  /**
-   * Tries to get a pre-prepared instance from request contexts.
-   */
-  tryGetPrePreparedInstance(instanceName, contextHolder, deps) {
-    if (contextHolder && contextHolder.priority > 0) {
-      const prePreparedInstance = contextHolder.get(instanceName)?.instance;
-      if (prePreparedInstance !== void 0) {
-        this.logger?.debug(
-          `[ServiceLocator] Using pre-prepared instance ${instanceName} from request context ${contextHolder.requestId}`
-        );
-        deps.add(instanceName);
-        return prePreparedInstance;
-      }
-    }
-    if (this.currentRequestContext && this.currentRequestContext !== contextHolder) {
-      const prePreparedInstance = this.currentRequestContext.get(instanceName)?.instance;
-      if (prePreparedInstance !== void 0) {
-        this.logger?.debug(
-          `[ServiceLocator] Using pre-prepared instance ${instanceName} from current request context ${this.currentRequestContext.requestId}`
-        );
-        deps.add(instanceName);
-        return prePreparedInstance;
-      }
-    }
-    return void 0;
-  }
   /**
    * Creates a factory context for dependency injection during service instantiation.
-   * @param contextHolder Optional request context holder for priority-based resolution
    */
-  createFactoryContext(contextHolder) {
-    const destroyListeners = /* @__PURE__ */ new Set();
-    const deps = /* @__PURE__ */ new Set();
-    const self = this;
-    function addDestroyListener(listener) {
-      destroyListeners.add(listener);
-    }
-    function getDestroyListeners() {
-      return Array.from(destroyListeners);
-    }
-    return {
-      // @ts-expect-error This is correct type
-      async inject(token, args) {
-        const instanceName = self.generateInstanceName(token, args);
-        const prePreparedInstance = self.tryGetPrePreparedInstance(
-          instanceName,
-          contextHolder,
-          deps
-        );
-        if (prePreparedInstance !== void 0) {
-          return prePreparedInstance;
-        }
-        const [error, instance] = await self.getInstance(
-          token,
-          args,
-          ({ instanceName: instanceName2 }) => {
-            deps.add(instanceName2);
-          }
-        );
-        if (error) {
-          throw error;
-        }
-        return instance;
-      },
-      addDestroyListener,
-      getDestroyListeners,
-      locator: self,
-      deps
-    };
+  createFactoryContext() {
+    return this.tokenProcessor.createFactoryContext(this.serviceLocator);
   }
+};
+
+// src/request-context-manager.mts
+var RequestContextManager = class {
+  constructor(logger = null) {
+    this.logger = logger;
+  }
+  requestContexts = /* @__PURE__ */ new Map();
+  currentRequestContext = null;
   /**
-   * Generates a unique instance name based on token and arguments.
+   * Begins a new request context with the given parameters.
+   * @param requestId Unique identifier for this request
+   * @param metadata Optional metadata for the request
+   * @param priority Priority for resolution (higher = more priority)
+   * @returns The created request context holder
    */
-  generateInstanceName(token, args) {
-    if (!args) {
-      return token.toString();
+  beginRequest(requestId, metadata, priority = 100) {
+    if (this.requestContexts.has(requestId)) {
+      throw new Error(
+        `[RequestContextManager] Request context ${requestId} already exists`
+      );
     }
-    const formattedArgs = Object.entries(args).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)).map(([key, value]) => `${key}=${this.formatArgValue(value)}`).join(",");
-    return `${token.toString()}:${formattedArgs.replaceAll(/"/g, "").replaceAll(/:/g, "=")}`;
+    const contextHolder = new DefaultRequestContextHolder(
+      requestId,
+      priority,
+      metadata
+    );
+    this.requestContexts.set(requestId, contextHolder);
+    this.currentRequestContext = contextHolder;
+    this.logger?.log(
+      `[RequestContextManager] Started request context: ${requestId}`
+    );
+    return contextHolder;
   }
   /**
-   * Formats a single argument value for instance name generation.
+   * Ends a request context and cleans up all associated instances.
+   * @param requestId The request ID to end
    */
-  formatArgValue(value) {
-    if (typeof value === "function") {
-      return `fn_${value.name}(${value.length})`;
+  async endRequest(requestId) {
+    const contextHolder = this.requestContexts.get(requestId);
+    if (!contextHolder) {
+      this.logger?.warn(
+        `[RequestContextManager] Request context ${requestId} not found`
+      );
+      return;
     }
-    if (typeof value === "symbol") {
-      return value.toString();
+    this.logger?.log(
+      `[RequestContextManager] Ending request context: ${requestId}`
+    );
+    const cleanupPromises = [];
+    for (const [, holder] of contextHolder.holders) {
+      if (holder.destroyListeners.length > 0) {
+        cleanupPromises.push(
+          Promise.all(holder.destroyListeners.map((listener) => listener()))
+        );
+      }
     }
-    return JSON.stringify(value).slice(0, 40);
+    await Promise.all(cleanupPromises);
+    contextHolder.clear();
+    this.requestContexts.delete(requestId);
+    if (this.currentRequestContext === contextHolder) {
+      this.currentRequestContext = Array.from(this.requestContexts.values()).at(-1) ?? null;
+    }
+    this.logger?.log(
+      `[RequestContextManager] Request context ${requestId} ended`
+    );
+  }
+  /**
+   * Gets the current request context.
+   * @returns The current request context holder or null
+   */
+  getCurrentRequestContext() {
+    return this.currentRequestContext;
+  }
+  /**
+   * Sets the current request context.
+   * @param requestId The request ID to set as current
+   */
+  setCurrentRequestContext(requestId) {
+    const contextHolder = this.requestContexts.get(requestId);
+    if (!contextHolder) {
+      throw new Error(
+        `[RequestContextManager] Request context ${requestId} not found`
+      );
+    }
+    this.currentRequestContext = contextHolder;
+  }
+  /**
+   * Gets all request contexts.
+   * @returns Map of request contexts
+   */
+  getRequestContexts() {
+    return this.requestContexts;
+  }
+  /**
+   * Clears all request contexts.
+   */
+  async clearAllRequestContexts() {
+    const requestIds = Array.from(this.requestContexts.keys());
+    if (requestIds.length === 0) {
+      this.logger?.log("[RequestContextManager] No request contexts to clear");
+      return;
+    }
+    this.logger?.log(
+      `[RequestContextManager] Clearing ${requestIds.length} request contexts: ${requestIds.join(", ")}`
+    );
+    for (const requestId of requestIds) {
+      try {
+        await this.endRequest(requestId);
+      } catch (error) {
+        this.logger?.error(
+          `[RequestContextManager] Error clearing request context ${requestId}:`,
+          error
+        );
+      }
+    }
+  }
+};
+
+// src/service-invalidator.mts
+var ServiceInvalidator = class {
+  constructor(manager, requestContextManager, eventBus, logger = null) {
+    this.manager = manager;
+    this.requestContextManager = requestContextManager;
+    this.eventBus = eventBus;
+    this.logger = logger;
+  }
+  /**
+   * Invalidates a service and all its dependencies.
+   */
+  invalidate(service, round = 1) {
+    this.logger?.log(
+      `[ServiceInvalidator] Starting invalidation process for ${service}`
+    );
+    const [, toInvalidate] = this.manager.get(service);
+    const promises = [];
+    if (toInvalidate) {
+      promises.push(this.invalidateHolder(service, toInvalidate, round));
+    }
+    const requestContexts = this.requestContextManager.getRequestContexts();
+    for (const [requestId, requestContext] of requestContexts.entries()) {
+      const holder = requestContext.get(service);
+      if (holder) {
+        this.logger?.log(
+          `[ServiceInvalidator] Invalidating request-scoped instance ${service} in request ${requestId}`
+        );
+        promises.push(
+          this.invalidateRequestHolder(requestId, service, holder, round)
+        );
+      }
+    }
+    return Promise.all(promises);
+  }
+  /**
+   * Gracefully clears all services in the ServiceLocator using invalidation logic.
+   * This method respects service dependencies and ensures proper cleanup order.
+   * Services that depend on others will be invalidated first, then their dependencies.
+   */
+  async clearAll(options = {}) {
+    const {
+      clearRequestContexts = true,
+      maxRounds = 10,
+      waitForSettlement = true
+    } = options;
+    this.logger?.log(
+      "[ServiceInvalidator] Starting graceful clearing of all services"
+    );
+    if (waitForSettlement) {
+      this.logger?.log(
+        "[ServiceInvalidator] Waiting for all services to settle..."
+      );
+      await this.ready();
+    }
+    const allServiceNames = this.getAllServiceNames();
+    if (allServiceNames.length === 0) {
+      this.logger?.log("[ServiceInvalidator] No singleton services to clear");
+    } else {
+      this.logger?.log(
+        `[ServiceInvalidator] Found ${allServiceNames.length} services to clear: ${allServiceNames.join(", ")}`
+      );
+      await this.clearServicesWithDependencyAwareness(
+        allServiceNames,
+        maxRounds
+      );
+    }
+    if (clearRequestContexts) {
+      await this.requestContextManager.clearAllRequestContexts();
+    }
+    this.logger?.log("[ServiceInvalidator] Graceful clearing completed");
+  }
+  /**
+   * Waits for all services to settle (either created, destroyed, or error state).
+   */
+  async ready() {
+    const holders = Array.from(this.manager.filter(() => true)).map(
+      ([, holder]) => holder
+    );
+    await Promise.all(
+      holders.map((holder) => this.waitForHolderToSettle(holder))
+    );
+  }
+  /**
+   * Invalidates a single holder based on its current status.
+   */
+  async invalidateHolder(key, holder, round) {
+    await this.invalidateHolderByStatus(holder, round, {
+      context: key,
+      isRequestScoped: false,
+      onCreationError: () => this.logger?.error(
+        `[ServiceInvalidator] ${key} creation triggered too many invalidation rounds`
+      ),
+      onRecursiveInvalidate: () => this.invalidate(key, round + 1),
+      onDestroy: () => this.destroyHolder(key, holder)
+    });
+  }
+  /**
+   * Invalidates a request-scoped holder based on its current status.
+   */
+  async invalidateRequestHolder(requestId, instanceName, holder, round) {
+    await this.invalidateHolderByStatus(holder, round, {
+      context: `Request-scoped ${instanceName} in ${requestId}`,
+      isRequestScoped: true,
+      onCreationError: () => this.logger?.error(
+        `[ServiceInvalidator] Request-scoped ${instanceName} in ${requestId} creation triggered too many invalidation rounds`
+      ),
+      onRecursiveInvalidate: () => this.invalidateRequestHolder(
+        requestId,
+        instanceName,
+        holder,
+        round + 1
+      ),
+      onDestroy: () => this.destroyRequestHolder(requestId, instanceName, holder)
+    });
+  }
+  /**
+   * Common invalidation logic for holders based on their status.
+   */
+  async invalidateHolderByStatus(holder, round, options) {
+    switch (holder.status) {
+      case "destroying" /* Destroying */:
+        await holder.destroyPromise;
+        break;
+      case "creating" /* Creating */:
+        await holder.creationPromise;
+        if (round > 3) {
+          options.onCreationError();
+          return;
+        }
+        await options.onRecursiveInvalidate();
+        break;
+      default:
+        await options.onDestroy();
+        break;
+    }
+  }
+  /**
+   * Destroys a holder and cleans up its resources.
+   */
+  async destroyHolder(key, holder) {
+    await this.destroyHolderWithCleanup(holder, {
+      context: key,
+      logMessage: `[ServiceInvalidator] Invalidating ${key} and notifying listeners`,
+      cleanup: () => this.manager.delete(key),
+      eventName: key
+    });
+  }
+  /**
+   * Destroys a request-scoped holder and cleans up its resources.
+   */
+  async destroyRequestHolder(requestId, instanceName, holder) {
+    await this.destroyHolderWithCleanup(holder, {
+      context: `Request-scoped ${instanceName} in ${requestId}`,
+      logMessage: `[ServiceInvalidator] Invalidating request-scoped ${instanceName} in ${requestId} and notifying listeners`,
+      cleanup: () => {
+        const requestContext = this.requestContextManager.getRequestContexts().get(requestId);
+        if (requestContext) {
+          requestContext.delete(instanceName);
+        }
+      },
+      eventName: instanceName
+    });
+  }
+  /**
+   * Common destroy logic for holders with customizable cleanup.
+   */
+  async destroyHolderWithCleanup(holder, options) {
+    holder.status = "destroying" /* Destroying */;
+    this.logger?.log(options.logMessage);
+    holder.destroyPromise = Promise.all(
+      holder.destroyListeners.map((listener) => listener())
+    ).then(async () => {
+      holder.destroyListeners = [];
+      holder.deps.clear();
+      options.cleanup();
+      await this.emitInstanceEvent(options.eventName, "destroy");
+    });
+    await holder.destroyPromise;
+  }
+  /**
+   * Waits for a holder to settle (either created, destroyed, or error state).
+   */
+  async waitForHolderToSettle(holder) {
+    switch (holder.status) {
+      case "creating" /* Creating */:
+        await holder.creationPromise;
+        break;
+      case "destroying" /* Destroying */:
+        await holder.destroyPromise;
+        break;
+    }
+  }
+  /**
+   * Clears services with dependency awareness, ensuring proper cleanup order.
+   * Services with no dependencies are cleared first, then services that depend on them.
+   */
+  async clearServicesWithDependencyAwareness(serviceNames, maxRounds) {
+    const clearedServices = /* @__PURE__ */ new Set();
+    let round = 1;
+    while (clearedServices.size < serviceNames.length && round <= maxRounds) {
+      this.logger?.log(
+        `[ServiceInvalidator] Clearing round ${round}/${maxRounds}, ${clearedServices.size}/${serviceNames.length} services cleared`
+      );
+      const servicesToClearThisRound = this.findServicesReadyForClearing(
+        serviceNames,
+        clearedServices
+      );
+      if (servicesToClearThisRound.length === 0) {
+        const remainingServices = serviceNames.filter(
+          (name) => !clearedServices.has(name)
+        );
+        if (remainingServices.length > 0) {
+          this.logger?.warn(
+            `[ServiceInvalidator] No services ready for clearing, forcing cleanup of remaining: ${remainingServices.join(", ")}`
+          );
+          await this.forceClearServices(remainingServices);
+          remainingServices.forEach((name) => clearedServices.add(name));
+        }
+        break;
+      }
+      const clearPromises = servicesToClearThisRound.map(
+        async (serviceName) => {
+          try {
+            await this.invalidate(serviceName, round);
+            clearedServices.add(serviceName);
+            this.logger?.log(
+              `[ServiceInvalidator] Successfully cleared service: ${serviceName}`
+            );
+          } catch (error) {
+            this.logger?.error(
+              `[ServiceInvalidator] Error clearing service ${serviceName}:`,
+              error
+            );
+            clearedServices.add(serviceName);
+          }
+        }
+      );
+      await Promise.all(clearPromises);
+      round++;
+    }
+    if (clearedServices.size < serviceNames.length) {
+      this.logger?.warn(
+        `[ServiceInvalidator] Clearing completed after ${maxRounds} rounds, but ${serviceNames.length - clearedServices.size} services may not have been properly cleared`
+      );
+    }
+  }
+  /**
+   * Finds services that are ready to be cleared in the current round.
+   * A service is ready if all its dependencies have already been cleared.
+   */
+  findServicesReadyForClearing(allServiceNames, clearedServices) {
+    return allServiceNames.filter((serviceName) => {
+      if (clearedServices.has(serviceName)) {
+        return false;
+      }
+      const [error, holder] = this.manager.get(serviceName);
+      if (error) {
+        return true;
+      }
+      const hasUnclearedDependencies = Array.from(holder.deps).some(
+        (dep) => !clearedServices.has(dep)
+      );
+      return !hasUnclearedDependencies;
+    });
+  }
+  /**
+   * Force clears services that couldn't be cleared through normal dependency resolution.
+   * This handles edge cases like circular dependencies.
+   */
+  async forceClearServices(serviceNames) {
+    const promises = serviceNames.map(async (serviceName) => {
+      try {
+        const [error, holder] = this.manager.get(serviceName);
+        if (!error && holder) {
+          await this.destroyHolder(serviceName, holder);
+        }
+      } catch (error) {
+        this.logger?.error(
+          `[ServiceInvalidator] Error force clearing service ${serviceName}:`,
+          error
+        );
+      }
+    });
+    await Promise.all(promises);
+  }
+  /**
+   * Gets all service names currently managed by the ServiceLocator.
+   */
+  getAllServiceNames() {
+    return this.manager.getAllNames();
+  }
+  /**
+   * Emits events to listeners for instance lifecycle events.
+   */
+  emitInstanceEvent(name, event = "create") {
+    this.logger?.log(
+      `[ServiceInvalidator]#emitInstanceEvent() Notifying listeners for ${name} with event ${event}`
+    );
+    return this.eventBus.emit(name, event);
+  }
+};
+
+// src/token-processor.mts
+var TokenProcessor = class {
+  constructor(logger = null) {
+    this.logger = logger;
+  }
+  /**
+   * Validates and resolves token arguments, handling factory token resolution and validation.
+   */
+  validateAndResolveTokenArgs(token, args) {
+    let actualToken = token;
+    if (typeof token === "function") {
+      actualToken = getInjectableToken(token);
+    }
+    let realArgs = args;
+    if (actualToken instanceof BoundInjectionToken) {
+      realArgs = actualToken.value;
+    } else if (actualToken instanceof FactoryInjectionToken) {
+      if (actualToken.resolved) {
+        realArgs = actualToken.value;
+      } else {
+        return [DIError.factoryTokenNotResolved(token.name), { actualToken }];
+      }
+    }
+    if (!actualToken.schema) {
+      return [void 0, { actualToken, validatedArgs: realArgs }];
+    }
+    const validatedArgs = actualToken.schema?.safeParse(realArgs);
+    if (validatedArgs && !validatedArgs.success) {
+      this.logger?.error(
+        `[TokenProcessor]#validateAndResolveTokenArgs(): Error validating args for ${actualToken.name.toString()}`,
+        validatedArgs.error
+      );
+      return [DIError.unknown(validatedArgs.error), { actualToken }];
+    }
+    return [void 0, { actualToken, validatedArgs: validatedArgs?.data }];
+  }
+  /**
+   * Generates a unique instance name based on token and arguments.
+   */
+  generateInstanceName(token, args) {
+    if (!args) {
+      return token.toString();
+    }
+    const formattedArgs = Object.entries(args).sort(([keyA], [keyB]) => keyA.localeCompare(keyB)).map(([key, value]) => `${key}=${this.formatArgValue(value)}`).join(",");
+    return `${token.toString()}:${formattedArgs.replaceAll(/"/g, "").replaceAll(/:/g, "=")}`;
+  }
+  /**
+   * Formats a single argument value for instance name generation.
+   */
+  formatArgValue(value) {
+    if (typeof value === "function") {
+      return `fn_${value.name}(${value.length})`;
+    }
+    if (typeof value === "symbol") {
+      return value.toString();
+    }
+    return JSON.stringify(value).slice(0, 40);
+  }
+  /**
+   * Creates a factory context for dependency injection during service instantiation.
+   * @param serviceLocator Reference to the service locator for dependency resolution
+   */
+  createFactoryContext(serviceLocator) {
+    const destroyListeners = /* @__PURE__ */ new Set();
+    const deps = /* @__PURE__ */ new Set();
+    function addDestroyListener(listener) {
+      destroyListeners.add(listener);
+    }
+    function getDestroyListeners() {
+      return Array.from(destroyListeners);
+    }
+    return {
+      // @ts-expect-error This is correct type
+      async inject(token, args) {
+        const [error, instance] = await serviceLocator.getInstance(
+          token,
+          args,
+          ({ instanceName }) => {
+            deps.add(instanceName);
+          }
+        );
+        if (error) {
+          throw error;
+        }
+        return instance;
+      },
+      addDestroyListener,
+      getDestroyListeners,
+      locator: serviceLocator,
+      deps
+    };
+  }
+  /**
+   * Tries to get a pre-prepared instance from request contexts.
+   */
+  tryGetPrePreparedInstance(instanceName, contextHolder, deps, currentRequestContext) {
+    if (contextHolder && contextHolder.priority > 0) {
+      const prePreparedInstance = contextHolder.get(instanceName)?.instance;
+      if (prePreparedInstance !== void 0) {
+        this.logger?.debug(
+          `[TokenProcessor] Using pre-prepared instance ${instanceName} from request context ${contextHolder.requestId}`
+        );
+        deps.add(instanceName);
+        return prePreparedInstance;
+      }
+    }
+    if (currentRequestContext && currentRequestContext !== contextHolder) {
+      const prePreparedInstance = currentRequestContext.get(instanceName)?.instance;
+      if (prePreparedInstance !== void 0) {
+        this.logger?.debug(
+          `[TokenProcessor] Using pre-prepared instance ${instanceName} from current request context ${currentRequestContext.requestId}`
+        );
+        deps.add(instanceName);
+        return prePreparedInstance;
+      }
+    }
+    return void 0;
+  }
+};
+
+// src/service-locator.mts
+var ServiceLocator = class {
+  constructor(registry = globalRegistry, logger = null, injectors = defaultInjectors) {
+    this.registry = registry;
+    this.logger = logger;
+    this.injectors = injectors;
+    this.eventBus = new ServiceLocatorEventBus(logger);
+    this.manager = new ServiceLocatorManager(logger);
+    this.serviceInstantiator = new ServiceInstantiator(injectors);
+    this.tokenProcessor = new TokenProcessor(logger);
+    this.requestContextManager = new RequestContextManager(logger);
+    this.serviceInvalidator = new ServiceInvalidator(
+      this.manager,
+      this.requestContextManager,
+      this.eventBus,
+      logger
+    );
+    this.instanceResolver = new InstanceResolver(
+      this.registry,
+      this.manager,
+      this.serviceInstantiator,
+      this.tokenProcessor,
+      logger,
+      this
+    );
+  }
+  eventBus;
+  manager;
+  serviceInstantiator;
+  tokenProcessor;
+  requestContextManager;
+  serviceInvalidator;
+  instanceResolver;
+  // ============================================================================
+  // PUBLIC METHODS
+  // ============================================================================
+  getEventBus() {
+    return this.eventBus;
+  }
+  getManager() {
+    return this.manager;
+  }
+  getRequestContexts() {
+    return this.requestContextManager.getRequestContexts();
+  }
+  getRequestContextManager() {
+    return this.requestContextManager;
+  }
+  getServiceInvalidator() {
+    return this.serviceInvalidator;
+  }
+  getInstanceIdentifier(token, args) {
+    const [err, { actualToken, validatedArgs }] = this.tokenProcessor.validateAndResolveTokenArgs(token, args);
+    if (err) {
+      throw err;
+    }
+    return this.tokenProcessor.generateInstanceName(actualToken, validatedArgs);
+  }
+  async getInstance(token, args, onPrepare) {
+    const [err, data] = await this.instanceResolver.resolveInstance(
+      token,
+      args,
+      this.requestContextManager.getCurrentRequestContext() || void 0
+    );
+    if (err) {
+      return [err];
+    }
+    if (onPrepare) {
+      const instanceName = this.getInstanceIdentifier(token, args);
+      const [tokenErr, { actualToken, validatedArgs }] = this.tokenProcessor.validateAndResolveTokenArgs(token, args);
+      if (!tokenErr) {
+        onPrepare({ instanceName, actualToken, validatedArgs });
+      }
+    }
+    return [void 0, data];
+  }
+  async getOrThrowInstance(token, args) {
+    const [error, instance] = await this.getInstance(token, args);
+    if (error) {
+      throw error;
+    }
+    return instance;
+  }
+  getSyncInstance(token, args) {
+    return this.instanceResolver.getSyncInstance(
+      token,
+      args,
+      this.requestContextManager.getCurrentRequestContext()
+    );
+  }
+  invalidate(service, round = 1) {
+    return this.serviceInvalidator.invalidate(service, round);
+  }
+  /**
+   * Gracefully clears all services in the ServiceLocator using invalidation logic.
+   * This method respects service dependencies and ensures proper cleanup order.
+   * Services that depend on others will be invalidated first, then their dependencies.
+   *
+   * @param options Optional configuration for the clearing process
+   * @returns Promise that resolves when all services have been cleared
+   */
+  async clearAll(options = {}) {
+    return this.serviceInvalidator.clearAll(options);
+  }
+  // ============================================================================
+  // REQUEST CONTEXT MANAGEMENT
+  // ============================================================================
+  /**
+   * Begins a new request context with the given parameters.
+   * @param requestId Unique identifier for this request
+   * @param metadata Optional metadata for the request
+   * @param priority Priority for resolution (higher = more priority)
+   * @returns The created request context holder
+   */
+  beginRequest(requestId, metadata, priority = 100) {
+    return this.requestContextManager.beginRequest(
+      requestId,
+      metadata,
+      priority
+    );
+  }
+  /**
+   * Ends a request context and cleans up all associated instances.
+   * @param requestId The request ID to end
+   */
+  async endRequest(requestId) {
+    return this.requestContextManager.endRequest(requestId);
+  }
+  /**
+   * Gets the current request context.
+   * @returns The current request context holder or null
+   */
+  getCurrentRequestContext() {
+    return this.requestContextManager.getCurrentRequestContext();
+  }
+  /**
+   * Sets the current request context.
+   * @param requestId The request ID to set as current
+   */
+  setCurrentRequestContext(requestId) {
+    return this.requestContextManager.setCurrentRequestContext(requestId);
+  }
+  /**
+   * Waits for all services to settle (either created, destroyed, or error state).
+   */
+  async ready() {
+    return this.serviceInvalidator.ready();
+  }
+  /**
+   * Helper method for TokenProcessor to access pre-prepared instances.
+   * This is needed for the factory context creation.
+   */
+  tryGetPrePreparedInstance(instanceName, contextHolder, deps) {
+    return this.tokenProcessor.tryGetPrePreparedInstance(
+      instanceName,
+      contextHolder,
+      deps,
+      this.requestContextManager.getCurrentRequestContext()
+    );
+  }
+  /**
+   * Helper method for InstanceResolver to generate instance names.
+   * This is needed for the factory context creation.
+   */
+  generateInstanceName(token, args) {
+    return this.tokenProcessor.generateInstanceName(token, args);
   }
 };
 
@@ -1560,14 +1937,53 @@ var _Container = class _Container {
    * Invalidates a service and its dependencies
    */
   async invalidate(service) {
-    const holderMap = this.serviceLocator.getManager().filter((holder2) => holder2.instance === service);
-    if (holderMap.size === 0) {
-      return;
-    }
-    const holder = holderMap.values().next().value;
+    const holder = this.getHolderByInstance(service);
     if (holder) {
       await this.serviceLocator.invalidate(holder.name);
+    } else {
+      const requestHolder = this.getRequestHolderByInstance(service);
+      if (requestHolder) {
+        await this.serviceLocator.invalidate(requestHolder.name);
+      }
+    }
+  }
+  /**
+   * Gets a service holder by instance (reverse lookup)
+   */
+  getHolderByInstance(instance) {
+    const holderMap = Array.from(
+      this.serviceLocator.getManager().filter((holder) => holder.instance === instance).values()
+    );
+    return holderMap.length > 0 ? holderMap[0] : null;
+  }
+  getRequestHolderByInstance(instance) {
+    const requestContexts = this.serviceLocator.getRequestContextManager().getRequestContexts();
+    if (requestContexts) {
+      for (const requestContext of requestContexts.values()) {
+        for (const holder of requestContext.holders.values()) {
+          if (holder.instance === instance) {
+            return holder;
+          }
+        }
+      }
     }
+    return null;
+  }
+  /**
+   * Checks if a service is registered in the container
+   */
+  isRegistered(token) {
+    try {
+      return this.serviceLocator.getInstanceIdentifier(token) !== null;
+    } catch {
+      return false;
+    }
+  }
+  /**
+   * Disposes the container and cleans up all resources
+   */
+  async dispose() {
+    await this.serviceLocator.clearAll();
   }
   /**
    * Waits for all pending operations to complete
@@ -1614,7 +2030,7 @@ var _Container = class _Container {
    * This is useful for testing or resetting the container state.
    */
   clear() {
-    this.serviceLocator.getManager().clear();
+    return this.serviceLocator.clearAll();
   }
 };
 _init = __decoratorStart(null);
@@ -1622,6 +2038,6 @@ _Container = __decorateElement(_init, 0, "Container", _Container_decorators, _Co
 __runInitializers(_init, 1, _Container);
 var Container = _Container;
 
-export { BaseInstanceHolderManager, BoundInjectionToken, Container, DefaultRequestContextHolder, Deferred, ErrorsEnum, FactoryInjectionToken, FactoryNotFound, FactoryTokenNotResolved, Injectable, InjectableScope, InjectableTokenMeta, InjectableType, InjectionToken, InstanceDestroying, InstanceExpired, InstanceNotFound, Registry, ServiceInstantiator, ServiceLocator, ServiceLocatorEventBus, ServiceLocatorInstanceHolderStatus, ServiceLocatorManager, UnknownError, __decorateElement, __decoratorStart, __runInitializers, asyncInject, createDeferred, createRequestContextHolder, defaultInjectors, getInjectableToken, getInjectors, globalRegistry, inject, provideFactoryContext, wrapSyncInit };
-//# sourceMappingURL=chunk-3NLYPYBY.mjs.map
-//# sourceMappingURL=chunk-3NLYPYBY.mjs.map
+export { BaseInstanceHolderManager, BoundInjectionToken, Container, DIError, DIErrorCode, DefaultRequestContextHolder, FactoryInjectionToken, Injectable, InjectableScope, InjectableTokenMeta, InjectableType, InjectionToken, Registry, ServiceInstantiator, ServiceLocator, ServiceLocatorEventBus, ServiceLocatorInstanceHolderStatus, ServiceLocatorManager, __decorateElement, __decoratorStart, __runInitializers, asyncInject, createRequestContextHolder, defaultInjectors, getInjectableToken, getInjectors, globalRegistry, inject, optional, provideFactoryContext, wrapSyncInit };
+//# sourceMappingURL=chunk-2M576LCC.mjs.map
+//# sourceMappingURL=chunk-2M576LCC.mjs.map