@tsed/di 8.0.0-rc.5 → 8.0.0

package/lib/esm/common/registries/ProviderRegistry.js

@@ -1,12 +1,16 @@
 import { ControllerProvider } from "../domain/ControllerProvider.js";
 import { ProviderType } from "../domain/ProviderType.js";
+import { injectable } from "../fn/injectable.js";
 import { GlobalProviders } from "./GlobalProviders.js";
 GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider);
 /**
  * Register a provider configuration.
- * @param {ProviderOpts<any>} provider
+ * @deprecated Since v8. Use injectable() function instead.
  */
-export function registerProvider(provider) {
-    return GlobalProviders.merge(provider.provide, provider);
+export function registerProvider({ token, provide, ...opts }) {
+    return injectable(token || provide, {
+        ...opts,
+        token: token || provide
+    }).inspect();
 }
 //# sourceMappingURL=ProviderRegistry.js.map

package/lib/esm/common/registries/ProviderRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProviderRegistry.js","sourceRoot":"","sources":["../../../../src/common/registries/ProviderRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AAEvD,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,eAAe,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAE5E;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAa,QAA2E;IACtH,OAAO,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;AAC3D,CAAC"}
+{"version":3,"file":"ProviderRegistry.js","sourceRoot":"","sources":["../../../../src/common/registries/ProviderRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,kBAAkB,EAAC,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAC,YAAY,EAAC,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAG/C,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,eAAe,CAAC,cAAc,CAAC,YAAY,CAAC,UAAU,EAAE,kBAAkB,CAAC,CAAC;AAe5E;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAa,EAAC,KAAK,EAAE,OAAO,EAAE,GAAG,IAAI,EAAa;IAChF,OAAO,UAAU,CAAC,KAAK,IAAI,OAAO,EAAE;QAClC,GAAG,IAAI;QACP,KAAK,EAAE,KAAK,IAAI,OAAO;KACY,CAAC,CAAC,OAAO,EAAE,CAAC;AACnD,CAAC"}

package/lib/esm/common/services/DIConfiguration.js

@@ -1,11 +1,10 @@
 import { getValue, setValue } from "@tsed/core";
+export const CONFIGURATION = Symbol.for("CONFIGURATION");
 export class DIConfiguration {
     constructor(initialProps = {}) {
         this.default = new Map();
         this.map = new Map();
         Object.entries({
-            scopes: {},
-            resolvers: [],
             imports: [],
             routes: [],
             logger: {},
@@ -32,18 +31,6 @@ export class DIConfiguration {
     set env(value) {
         this.map.set("env", value);
     }
-    get scopes() {
-        return this.map.get("scopes");
-    }
-    set scopes(value) {
-        this.map.set("scopes", value);
-    }
-    get resolvers() {
-        return this.getRaw("resolvers");
-    }
-    set resolvers(resolvers) {
-        this.map.set("resolvers", resolvers);
-    }
     get imports() {
         return this.get("imports");
     }

package/lib/esm/common/services/DIConfiguration.js.map

@@ -1 +1 @@
-{"version":3,"file":"DIConfiguration.js","sourceRoot":"","sources":["../../../../src/common/services/DIConfiguration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DIConfiguration.js","sourceRoot":"","sources":["../../../../src/common/services/DIConfiguration.ts"],"names":[],"mappings":"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"}

package/lib/esm/common/services/DILogger.js

@@ -1,11 +1,5 @@
-import { registerProvider } from "../registries/ProviderRegistry.js";
-import { InjectorService } from "./InjectorService.js";
+import { injectable } from "../fn/injectable.js";
+import { injector } from "../fn/injector.js";
 export const LOGGER = Symbol.for("LOGGER");
-registerProvider({
-    provide: LOGGER,
-    deps: [InjectorService],
-    useFactory(injector) {
-        return injector.logger;
-    }
-});
+injectable(LOGGER).factory(() => injector().logger);
 //# sourceMappingURL=DILogger.js.map

package/lib/esm/common/services/DILogger.js.map

@@ -1 +1 @@
-{"version":3,"file":"DILogger.js","sourceRoot":"","sources":["../../../../src/common/services/DILogger.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,gBAAgB,EAAC,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAC,eAAe,EAAC,MAAM,sBAAsB,CAAC;AAErD,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAG3C,gBAAgB,CAAC;IACf,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,CAAC,eAAe,CAAC;IACvB,UAAU,CAAC,QAAyB;QAClC,OAAO,QAAQ,CAAC,MAAM,CAAC;IACzB,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"DILogger.js","sourceRoot":"","sources":["../../../../src/common/services/DILogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;AAG3C,MAAM,CAAC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAG3C,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,CAAC"}

package/lib/esm/common/services/InjectorService.js

@@ -1,9 +1,6 @@
-var InjectorService_1;
-import { __decorate, __metadata } from "tslib";
-import { classOf, deepClone, deepMerge, Hooks, isArray, isClass, isFunction, isInheritedFrom, isObject, isPromise, nameOf, Store } from "@tsed/core";
+import { classOf, deepClone, deepMerge, isArray, isClass, isFunction, isInheritedFrom, isObject, isPromise, nameOf } from "@tsed/core";
+import { $alter, $asyncAlter, $asyncEmit, $emit, $off, $on } from "@tsed/hooks";
 import { DI_INVOKE_OPTIONS, DI_USE_PARAM_OPTIONS } from "../constants/constants.js";
-import { Configuration } from "../decorators/configuration.js";
-import { Injectable } from "../decorators/injectable.js";
 import { Container } from "../domain/Container.js";
 import { LocalsContainer } from "../domain/LocalsContainer.js";
 import { Provider } from "../domain/Provider.js";
@@ -12,8 +9,8 @@ import { InjectionError } from "../errors/InjectionError.js";
 import { GlobalProviders } from "../registries/GlobalProviders.js";
 import { createContainer } from "../utils/createContainer.js";
 import { getConstructorDependencies } from "../utils/getConstructorDependencies.js";
-import { resolveControllers } from "../utils/resolveControllers.js";
 import { DIConfiguration } from "./DIConfiguration.js";
+const EXCLUDED_CONFIGURATION_KEYS = ["mount", "imports"];
 /**
  * This service contain all services collected by `@Service` or services declared manually with `InjectorService.factory()` or `InjectorService.service()`.
  *
@@ -28,36 +25,32 @@ import { DIConfiguration } from "./DIConfiguration.js";
  * import MyService3 from "./services/service3.js";
  *
  * // When all services are imported, you can load InjectorService.
- * const injector = new InjectorService()
  *
- * await injector.load();
+ * await injector().load();
  *
- * const myService1 = injector.get<MyService1>(MyServcice1);
+ * const myService1 = injector.get<MyService1>(MyService1);
  * ```
  */
-let InjectorService = InjectorService_1 = class InjectorService extends Container {
+export class InjectorService extends Container {
     #cache;
+    #loaded;
     constructor() {
         super();
-        this.settings = new DIConfiguration();
         this.logger = console;
-        this.hooks = new Hooks();
         this.resolvedConfiguration = false;
         this.#cache = new LocalsContainer();
-        this.#cache.set(InjectorService_1, this);
+        this.#loaded = false;
+        this.#cache.set(InjectorService, this);
+        this.#cache.set(DIConfiguration, new DIConfiguration());
     }
-    get resolvers() {
-        return this.settings.resolvers;
+    get settings() {
+        return this.#cache.get(DIConfiguration);
     }
-    get scopes() {
-        return this.settings.scopes || {};
+    set settings(settings) {
+        this.#cache.set(DIConfiguration, settings);
     }
-    /**
-     * Retrieve default scope for a given provider.
-     * @param provider
-     */
-    scopeOf(provider) {
-        return provider.scope || this.scopes[String(provider.type)] || ProviderScope.SINGLETON;
+    isLoaded() {
+        return this.#loaded;
     }
     /**
      * Return a list of instance build by the injector.
@@ -84,26 +77,18 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
      * @param token The class or symbol registered in InjectorService.
      * @param options
      */
-    get(token, options = {}) {
-        const instance = this.getInstance(token);
-        if (instance !== undefined) {
-            return instance;
-        }
-        if (!this.hasProvider(token)) {
-            for (const resolver of this.resolvers) {
-                const result = resolver.get(token, options);
-                if (result !== undefined) {
-                    return result;
-                }
-            }
+    get(token, options) {
+        if (!this.has(token)) {
+            return this.resolve(token, options);
         }
+        return this.#cache.get(token);
     }
     /**
      * Return all instance of the same provider type
      */
-    getMany(type, locals, options) {
+    getMany(type, options) {
         return this.getProviders(type).map((provider) => {
-            return this.invoke(provider.token, locals, options);
+            return this.resolve(provider.token, options);
         });
     }
     /**
@@ -120,7 +105,9 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         return this;
     }
     /**
-     * Invoke the class and inject all services that required by the class constructor.
+     * Resolve the token depending on his provider configuration.
+     *
+     * If the token isn't cached, the injector will invoke the provider and cache the result.
      *
      * #### Example
      *
@@ -136,75 +123,79 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
      * ```
      *
      * @param token The injectable class to invoke. Class parameters are injected according constructor signature.
-     * @param locals  Optional object. If preset then any argument Class are read from this object first, before the `InjectorService` is consulted.
-     * @param options
+     * @param options {InvokeOptions} Optional options to invoke the class.
      * @returns {Type} The class constructed.
      */
-    invoke(token, locals, options = {}) {
-        let instance = locals ? locals.get(token) : undefined;
+    resolve(token, options = {}) {
+        let instance = options.locals ? options.locals.get(token) : undefined;
         if (instance !== undefined) {
             return instance;
         }
-        if (token === Configuration) {
-            return this.settings;
+        if (token === DI_USE_PARAM_OPTIONS) {
+            return options.useOpts;
         }
-        instance = !options.rebuild ? this.getInstance(token) : undefined;
+        instance = !options.rebuild ? this.#cache.get(token) : undefined;
         if (instance != undefined) {
             return instance;
         }
-        if (token === DI_USE_PARAM_OPTIONS) {
-            return options.useOpts;
-        }
         const provider = this.ensureProvider(token);
-        const set = (instance) => {
-            this.#cache.set(token, instance);
-            provider?.alias && this.alias(token, provider.alias);
-        };
+        // maybe not necessary
         if (!provider || options.rebuild) {
-            instance = this.resolve(token, locals, options);
-            if (this.hasProvider(token)) {
-                set(instance);
+            instance = this.invokeToken(token, options);
+            if (provider) {
+                return this.setToCache(provider, instance);
             }
             return instance;
         }
-        instance = this.resolve(token, locals, options);
-        switch (this.scopeOf(provider)) {
+        instance = this.invokeToken(token, options);
+        switch (provider.scope) {
             case ProviderScope.SINGLETON:
-                if (provider.hooks && !options.rebuild) {
-                    this.registerHooks(provider, instance);
+                if (!options.rebuild) {
+                    this.registerHooks(provider, options);
                 }
-                if (!provider.isAsync() || !isPromise(instance)) {
-                    set(instance);
-                    // locals?.delete(DI_USE_PARAM_OPTIONS);
-                    return instance;
-                }
-                // store promise to lock token in cache
-                set(instance);
-                instance = instance.then((instance) => {
-                    set(instance);
-                    return instance;
-                });
-                // locals?.delete(DI_USE_PARAM_OPTIONS);
-                return instance;
+                return this.setToCache(provider, instance);
             case ProviderScope.REQUEST:
-                if (locals) {
-                    locals.set(token, instance);
-                    if (provider.hooks && provider.hooks.$onDestroy) {
-                        locals.hooks.on("$onDestroy", (...args) => provider.hooks.$onDestroy(instance, ...args));
-                    }
+                if (options.locals) {
+                    options.locals.set(provider.token, instance);
+                    this.registerHooks(provider, options);
                 }
-                // locals?.delete(DI_USE_PARAM_OPTIONS);
                 return instance;
         }
         return instance;
     }
+    /**
+     * Resolve the token depending on his provider configuration.
+     *
+     * If the token isn't cached, the injector will invoke the provider and cache the result.
+     *
+     * #### Example
+     *
+     * ```typescript
+     * import {InjectorService} from "@tsed/di";
+     * import MyService from "./services.js";
+     *
+     * class OtherService {
+     *     constructor(injectorService: InjectorService) {
+     *          const myService = injectorService.invoke<MyService>(MyService);
+     *      }
+     *  }
+     * ```
+     *
+     * @param token The injectable class to invoke. Class parameters are injected according constructor signature.
+     * @param options {InvokeOptions} Optional options to invoke the class.
+     * @returns {Type} The class constructed.
+     * @alias InjectorService.resolve
+     */
+    invoke(token, options = {}) {
+        return this.resolve(token, options);
+    }
     /**
      * Build only providers which are asynchronous.
      */
     async loadAsync() {
         for (const [, provider] of this) {
             if (!this.has(provider.token) && provider.isAsync()) {
-                await this.invoke(provider.token);
+                await this.resolve(provider.token);
             }
         }
     }
@@ -213,55 +204,32 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
      */
     loadSync() {
         for (const [, provider] of this) {
-            if (!this.has(provider.token) && this.scopeOf(provider) === ProviderScope.SINGLETON) {
-                this.invoke(provider.token);
+            // TODO try to lazy provider instead initiate all providers (&& provider.hasRegisteredHooks())
+            if (!this.has(provider.token) && provider.scope === ProviderScope.SINGLETON) {
+                this.resolve(provider.token);
             }
         }
     }
-    /**
-     * Boostrap injector from container and resolve configuration.
-     *
-     * @param container
-     */
-    bootstrap(container = createContainer()) {
-        // Clone all providers in the container
-        this.addProviders(container);
-        // Resolve all configuration
-        this.resolveConfiguration();
-        // allow mocking or changing provider instance before loading injector
-        this.resolveImportsProviders();
-        return this;
-    }
-    /**
-     * Load injector from a given module
-     * @param rootModule
-     */
-    loadModule(rootModule) {
-        this.settings.routes = this.settings.routes.concat(resolveControllers(this.settings));
-        const container = createContainer();
-        container.delete(rootModule);
-        container.addProvider(rootModule, {
-            type: "server:module",
-            scope: ProviderScope.SINGLETON
-        });
-        return this.load(container);
-    }
     /**
      * Build all providers from given container (or GlobalProviders) and emit `$onInit` event.
      *
      * @param container
      */
     async load(container = createContainer()) {
+        // avoid provider registration in the GlobalContainer during the loading phase
+        // using injectable() or providerBuilder()
+        this.#loaded = true;
+        await $asyncEmit("$beforeInit");
         this.bootstrap(container);
         // build async and sync provider
         await this.loadAsync();
         // load sync provider
         this.loadSync();
-        await this.emit("$beforeInit");
-        await this.emit("$onInit");
+        await $asyncEmit("$onInit");
     }
     /**
-     * Load all configurations registered on providers
+     * Load all configurations registered on providers via @Configuration decorator.
+     * It inspects for each provider some fields like imports, mount, etc. to resolve the configuration.
      */
     resolveConfiguration() {
         if (this.resolvedConfiguration) {
@@ -271,15 +239,12 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         super.forEach((provider) => {
             if (provider.configuration && provider.type !== "server:module") {
                 Object.entries(provider.configuration).forEach(([key, value]) => {
-                    if (!["resolvers", "mount", "imports"].includes(key)) {
+                    if (!EXCLUDED_CONFIGURATION_KEYS.includes(key)) {
                         value = mergedConfiguration.has(key) ? deepMerge(mergedConfiguration.get(key), value) : deepClone(value);
                         mergedConfiguration.set(key, value);
                     }
                 });
             }
-            if (provider.resolvers) {
-                this.settings.resolvers = this.settings.resolvers.concat(provider.resolvers);
-            }
         });
         mergedConfiguration.forEach((value, key) => {
             this.settings.set(key, deepMerge(value, this.settings.get(key)));
@@ -291,33 +256,53 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
      * @param eventName The event name to emit at all services.
      * @param args List of the parameters to give to each service.
      * @returns A list of promises.
+     * @deprecated use $asyncEmit instead
      */
     emit(eventName, ...args) {
-        return this.hooks.asyncEmit(eventName, args);
+        return $asyncEmit(eventName, args);
     }
     /**
      * Alter value attached to an event.
      * @param eventName
      * @param value
      * @param args
+     * @deprecated use $alter instead
      */
     alter(eventName, value, ...args) {
-        return this.hooks.alter(eventName, value, args);
+        return $alter(eventName, value, args);
     }
     /**
      * Alter value attached to an event asynchronously.
      * @param eventName
      * @param value
      * @param args
+     * @deprecated use $asyncAlter instead
      */
     alterAsync(eventName, value, ...args) {
-        return this.hooks.asyncAlter(eventName, value, args);
+        return $asyncAlter(eventName, value, args);
     }
     /**
      * Destroy the injector and all services.
      */
     async destroy() {
-        await this.emit("$onDestroy");
+        await $asyncEmit("$onDestroy");
+        this.#cache.forEach((_, token) => {
+            $off(token);
+        });
+    }
+    /**
+     * Bootstrap injector from container, resolve configuration and providers.
+     *
+     * @param container
+     */
+    bootstrap(container = createContainer()) {
+        // Clone all providers in the container
+        this.addProviders(container);
+        // Resolve all configuration
+        this.resolveConfiguration();
+        // allow mocking or changing provider instance before loading injector
+        this.resolveImportsProviders();
+        return this;
     }
     ensureProvider(token, force = false) {
         if (!this.hasProvider(token) && (GlobalProviders.has(token) || force)) {
@@ -325,9 +310,6 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         }
         return this.getProvider(token);
     }
-    getInstance(token) {
-        return this.#cache.get(token);
-    }
     /**
      * Invoke a class method and inject service.
      *
@@ -341,29 +323,32 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
      * #### Example
      *
      * @param target
-     * @param locals
      * @param options
      * @private
      */
-    resolve(target, locals = new LocalsContainer(), options = {}) {
-        const resolvedOpts = this.mapInvokeOptions(target, locals, options);
+    invokeToken(target, options = {}) {
+        const resolvedOpts = this.mapInvokeOptions(target, options);
         if (!resolvedOpts) {
             return undefined;
         }
         const { token, deps, construct, imports, provider } = resolvedOpts;
-        if (provider) {
-            GlobalProviders.onInvoke(provider, locals, { ...resolvedOpts, injector: this });
-        }
+        $emit("$beforeInvoke", token, [resolvedOpts]);
+        $emit(`$beforeInvoke:${String(provider.type)}`, [resolvedOpts]);
         let instance;
         let currentDependency = false;
         try {
             const invokeDependency = (parent) => (token, index) => {
                 currentDependency = { token, index, deps };
                 if (isArray(token)) {
-                    return this.getMany(token[0], locals, options);
+                    return this.getMany(token[0], options);
                 }
-                const useOpts = provider?.store?.get(`${DI_USE_PARAM_OPTIONS}:${index}`) || options.useOpts;
-                return isInheritedFrom(token, Provider, 1) ? provider : this.invoke(token, locals, { parent, useOpts });
+                return isInheritedFrom(token, Provider, 1)
+                    ? provider
+                    : this.resolve(token, {
+                        parent,
+                        locals: options.locals,
+                        useOpts: provider?.getArgOpts(index) || options.useOpts
+                    });
             };
             // Invoke manually imported providers
             imports.forEach(invokeDependency());
@@ -380,14 +365,15 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         }
         if (instance && isClass(classOf(instance))) {
             Reflect.defineProperty(instance, DI_INVOKE_OPTIONS, {
-                get: () => ({ rebuild: options.rebuild, locals })
+                get: () => ({ rebuild: options.rebuild, locals: options.locals })
             });
         }
+        $emit("$afterInvoke", token, [instance, resolvedOpts]);
         return instance;
     }
     resolveImportsProviders() {
         this.settings.imports = this.settings.imports
-            ?.filter((meta) => isObject(meta) && "token" in meta && meta.token !== InjectorService_1)
+            ?.filter((meta) => isObject(meta) && "token" in meta && meta.token !== InjectorService)
             .map((meta) => {
             if (isObject(meta) && "token" in meta) {
                 const { token, ...props } = meta;
@@ -421,13 +407,13 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
     /**
      * Create options to invoke a provider or class.
      * @param token
-     * @param locals
      * @param options
      */
-    mapInvokeOptions(token, locals, options) {
+    mapInvokeOptions(token, options) {
+        const locals = options.locals || new LocalsContainer();
+        options.locals = locals;
         let imports = options.imports;
         let deps = options.deps;
-        let scope = options.scope;
         let construct;
         if (!token || token === Object) {
             throw new Error("Given token is undefined. Could mean a circular dependency problem. Try to use @Inject(() => Token) to solve it.");
@@ -435,17 +421,10 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         let provider;
         if (!this.hasProvider(token)) {
             provider = new Provider(token);
-            this.resolvers.forEach((resolver) => {
-                const result = resolver.get(token, locals.get(DI_USE_PARAM_OPTIONS));
-                if (result !== undefined) {
-                    provider.useFactory = () => result;
-                }
-            });
         }
         else {
             provider = this.getProvider(token);
         }
-        scope = scope || this.scopeOf(provider);
         deps = deps || provider.deps;
         imports = imports || provider.imports;
         if (provider.useValue !== undefined) {
@@ -470,27 +449,48 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
         }
         return {
             token,
-            scope: scope || Store.from(token).get("scope") || ProviderScope.SINGLETON,
             deps: deps || [],
             imports: imports || [],
             construct,
-            provider
+            provider,
+            locals
         };
     }
-    registerHooks(provider, instance) {
+    registerHooks(provider, options) {
         if (provider.hooks) {
+            if (provider.scope === ProviderScope.REQUEST) {
+                if (options.locals && provider.hooks?.$onDestroy) {
+                    const { locals } = options;
+                    options.locals.hooks.on("$onDestroy", (...args) => {
+                        return provider.hooks?.$onDestroy?.(locals.get(provider.token), ...args);
+                    });
+                }
+                return;
+            }
             Object.entries(provider.hooks).forEach(([event, cb]) => {
-                const callback = (...args) => cb(this.get(provider.token) || instance, ...args);
-                this.hooks.on(event, callback);
+                const callback = (...args) => {
+                    return cb(this.#cache.get(provider.token), ...args);
+                };
+                $on(event, provider.token, callback);
             });
         }
     }
-};
-InjectorService = InjectorService_1 = __decorate([
-    Injectable({
-        scope: ProviderScope.SINGLETON
-    }),
-    __metadata("design:paramtypes", [])
-], InjectorService);
-export { InjectorService };
+    setToCache(provider, instance) {
+        const set = (instance) => {
+            this.#cache.set(provider.token, instance);
+            provider?.alias && this.alias(provider.token, provider.alias);
+        };
+        if ("isAsync" in provider && !provider.isAsync() && !isPromise(instance)) {
+            set(instance);
+            return instance;
+        }
+        // store promise to lock token in cache
+        set(instance);
+        instance = instance.then((instance) => {
+            set(instance);
+            return instance;
+        });
+        return instance;
+    }
+}
 //# sourceMappingURL=InjectorService.js.map