@tsed/di 6.86.1 → 6.87.2

package/lib/domain/Container.d.ts

@@ -1,9 +1,8 @@
 import type { IProvider } from "../interfaces/IProvider";
 import type { ProviderType } from "./ProviderType";
 import type { TokenProvider } from "../interfaces/TokenProvider";
-import { LocalsContainer } from "./LocalsContainer";
 import { Provider } from "./Provider";
-export declare class Container extends LocalsContainer<Provider> {
+export declare class Container extends Map<TokenProvider, Provider> {
     /**
      *
      * @param token
@@ -32,7 +31,7 @@ export declare class Container extends LocalsContainer<Provider> {
      * @returns {T} Returns the element associated with the specified key or undefined if the key can't be found in the Map object.
      * @param token
      */
-    getProvider(token: TokenProvider): Provider | undefined;
+    getProvider<T extends Provider = Provider>(token: TokenProvider): T | undefined;
     /**
      * Get all providers registered in the injector container.
      *

package/lib/domain/Provider.d.ts

@@ -4,6 +4,9 @@ import { ProviderScope } from "./ProviderScope";
 import { ProviderType } from "./ProviderType";
 export declare class Provider<T = any> implements IProvider<T> {
     type: ProviderType | any;
+    /**
+     * @deprecated Use injector.get(provider.token) instead.
+     */
     instance: T;
     deps: TokenProvider[];
     imports: any[];

package/lib/index.js

@@ -286,11 +286,11 @@ class GlobalProviderRegistry extends Map {
     return this;
   }
 
-  onInvoke(provider, locals, deps) {
+  onInvoke(provider, locals, options) {
     const settings = _classPrivateFieldLooseBase(this, _settings)[_settings].get(provider.type);
 
     if (settings != null && settings.onInvoke) {
-      settings.onInvoke(provider, locals, deps);
+      settings.onInvoke(provider, locals, options);
     }
   }
 
@@ -359,76 +359,16 @@ class GlobalProviderRegistry extends Map {
 
 const GlobalProviders = new GlobalProviderRegistry();
 
-class LocalsContainer extends Map {
-  /**
-   * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).
-   * @param eventName The event name to emit at all services.
-   * @param args List of the parameters to give to each services.
-   * @returns {Promise<any[]>} A list of promises.
-   */
-  async emit(eventName, ...args) {
-    for (const handler of this.getListeners(eventName)) {
-      await handler(...args);
-    }
-  }
-  /**
-   * @param eventName
-   * @param value
-   * @param args
-   */
-
-
-  alter(eventName, value, ...args) {
-    for (const handler of this.getListeners(eventName)) {
-      value = handler(value, ...args);
-    }
-
-    return value;
-  }
-  /**
-   * @param eventName
-   * @param value
-   * @param args
-   */
-
-
-  async alterAsync(eventName, value, ...args) {
-    for (const handler of this.getListeners(eventName)) {
-      value = handler(value, ...args);
-    }
-
-    return value;
-  }
-
-  toArray() {
-    return [...this.values()];
-  }
-
-  async destroy() {
-    await this.emit("$onDestroy");
-    this.clear();
-  }
-
-  getListeners(event) {
-    return this.toArray().reduce((listeners, instance) => {
-      if (typeof instance === "object" && instance && event in instance) {
-        return listeners.concat(instance[event].bind(instance));
-      }
-
-      return listeners;
-    }, []);
-  }
-
-}
-
-class Container extends LocalsContainer {
+class Container extends Map {
   /**
    *
    * @param token
    * @param settings
    */
   add(token, settings = {}) {
-    const provider = GlobalProviders.has(token) ? GlobalProviders.get(token).clone() : new Provider(token);
+    var _GlobalProviders$get;
+
+    const provider = ((_GlobalProviders$get = GlobalProviders.get(token)) == null ? void 0 : _GlobalProviders$get.clone()) || new Provider(token);
     Object.assign(provider, settings);
     return super.set(token, provider);
   }
@@ -480,7 +420,13 @@ class Container extends LocalsContainer {
 
 
   getProviders(type) {
-    return Array.from(this).filter(([_, provider]) => type ? provider.type === type : true).map(([_, provider]) => provider);
+    return [...this].reduce((providers, [_, provider]) => {
+      if (provider.type === type || !type) {
+        return [...providers, provider];
+      }
+
+      return providers;
+    }, []);
   }
 
   addProviders(container) {
@@ -503,6 +449,68 @@ exports.InjectablePropertyType = void 0;
   InjectablePropertyType["INTERCEPTOR"] = "interceptor";
 })(exports.InjectablePropertyType || (exports.InjectablePropertyType = {}));
 
+class LocalsContainer extends Map {
+  /**
+   * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).
+   * @param eventName The event name to emit at all services.
+   * @param args List of the parameters to give to each services.
+   * @returns {Promise<any[]>} A list of promises.
+   */
+  async emit(eventName, ...args) {
+    for (const handler of this.getListeners(eventName)) {
+      await handler(...args);
+    }
+  }
+  /**
+   * @param eventName
+   * @param value
+   * @param args
+   */
+
+
+  alter(eventName, value, ...args) {
+    for (const handler of this.getListeners(eventName)) {
+      value = handler(value, ...args);
+    }
+
+    return value;
+  }
+  /**
+   * @param eventName
+   * @param value
+   * @param args
+   */
+
+
+  async alterAsync(eventName, value, ...args) {
+    for (const handler of this.getListeners(eventName)) {
+      value = handler(value, ...args);
+    }
+
+    return value;
+  }
+
+  toArray() {
+    return [...this.values()];
+  }
+
+  async destroy() {
+    await this.emit("$onDestroy");
+    this.clear();
+  }
+
+  getListeners(event) {
+    return this.toArray().reduce((listeners, instance) => {
+      if (typeof instance === "object" && instance && event in instance) {
+        return listeners.concat(instance[event].bind(instance));
+      }
+
+      return listeners;
+    }, []);
+  }
+
+}
+
 class ContextLogger {
   constructor(logger$1, {
     id,
@@ -1647,6 +1655,8 @@ class DIConfiguration {
 
 }
 
+var _cache;
+
 var InjectorService_1;
 /**
  * This service contain all services collected by `@Service` or services declared manually with `InjectorService.factory()` or `InjectorService.service()`.
@@ -1670,14 +1680,19 @@ var InjectorService_1;
  * ```
  */
 
-exports.InjectorService = InjectorService_1 = class InjectorService extends Container {
+exports.InjectorService = InjectorService_1 = (_cache = /*#__PURE__*/_classPrivateFieldLooseKey("cache"), class InjectorService extends Container {
   constructor() {
     super();
+    Object.defineProperty(this, _cache, {
+      writable: true,
+      value: void 0
+    });
     this.settings = new DIConfiguration();
     this.logger = console;
     this.resolvedConfiguration = false;
-    const provider = this.addProvider(InjectorService_1).getProvider(InjectorService_1);
-    provider.instance = this;
+    _classPrivateFieldLooseBase(this, _cache)[_cache] = new LocalsContainer();
+
+    _classPrivateFieldLooseBase(this, _cache)[_cache].set(InjectorService_1, this);
   }
 
   get resolvers() {
@@ -1700,6 +1715,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
    * Clone a provider from GlobalProviders and the given token. forkProvider method build automatically the provider if the instance parameter ins't given.
    * @param token
    * @param settings
+   * @deprecated
    */
 
 
@@ -1710,7 +1726,9 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
     const provider = this.getProvider(token);
     Object.assign(provider, settings);
-    provider.instance = this.invoke(token);
+
+    _classPrivateFieldLooseBase(this, _cache)[_cache].set(token, this.invoke(token));
+
     return provider;
   }
   /**
@@ -1719,7 +1737,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
 
   toArray() {
-    return super.toArray().map(provider => provider.instance);
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].toArray();
   }
   /**
    * Get a service or factory already constructed from his symbol or class.
@@ -1768,7 +1786,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
 
   has(token) {
-    return super.has(core.getClassOrSymbol(token)) && this.get(token) !== undefined;
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].get(token) !== undefined;
   }
   /**
    * Invoke the class and inject all services that required by the class constructor.
@@ -1808,18 +1826,22 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
     if (!provider || options.rebuild) {
       instance = this.resolve(token, locals, options);
-      this.hasProvider(token) && (this.getProvider(token).instance = instance);
+
+      if (this.hasProvider(token)) {
+        _classPrivateFieldLooseBase(this, _cache)[_cache].set(token, instance);
+      }
+
       return instance;
     }
 
     switch (this.scopeOf(provider)) {
       case exports.ProviderScope.SINGLETON:
         if (!this.has(token)) {
-          provider.instance = this.resolve(token, locals, options);
+          _classPrivateFieldLooseBase(this, _cache)[_cache].set(token, this.resolve(token, locals, options));
 
           if (provider.isAsync()) {
-            provider.instance.then(instance => {
-              provider.instance = instance;
+            _classPrivateFieldLooseBase(this, _cache)[_cache].get(token).then(instance => {
+              _classPrivateFieldLooseBase(this, _cache)[_cache].set(token, instance);
             });
           }
         }
@@ -1851,8 +1873,10 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
           await this.invoke(provider.token, locals);
         }
 
-        if (provider.instance) {
-          locals.set(provider.token, provider.instance);
+        const instance = _classPrivateFieldLooseBase(this, _cache)[_cache].get(provider.token);
+
+        if (instance !== undefined) {
+          locals.set(provider.token, instance);
         }
       }
     }
@@ -1866,8 +1890,10 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
         this.invoke(provider.token, locals);
       }
 
-      if (provider.instance !== undefined) {
-        locals.set(provider.token, provider.instance);
+      const instance = _classPrivateFieldLooseBase(this, _cache)[_cache].get(provider.token);
+
+      if (instance !== undefined) {
+        locals.set(provider.token, instance);
       }
     }
 
@@ -2140,6 +2166,41 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
     return instance;
   }
+  /**
+   * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).
+   * @param eventName The event name to emit at all services.
+   * @param args List of the parameters to give to each services.
+   * @returns {Promise<any[]>} A list of promises.
+   */
+
+
+  async emit(eventName, ...args) {
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].emit(eventName, ...args);
+  }
+  /**
+   * @param eventName
+   * @param value
+   * @param args
+   */
+
+
+  alter(eventName, value, ...args) {
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].alter(eventName, value, ...args);
+  }
+  /**
+   * @param eventName
+   * @param value
+   * @param args
+   */
+
+
+  async alterAsync(eventName, value, ...args) {
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].alterAsync(eventName, value, ...args);
+  }
+
+  async destroy() {
+    await _classPrivateFieldLooseBase(this, _cache)[_cache].destroy();
+  }
 
   ensureProvider(token) {
     if (!this.hasProvider(token) && GlobalProviders.has(token)) {
@@ -2150,9 +2211,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
   }
 
   getInstance(token) {
-    var _super$get;
-
-    return (_super$get = super.get(core.getClassOrSymbol(token))) == null ? void 0 : _super$get.instance;
+    return _classPrivateFieldLooseBase(this, _cache)[_cache].get(core.getClassOrSymbol(token));
   }
   /**
    * Invoke a class method and inject service.
@@ -2174,16 +2233,19 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
 
   resolve(target, locals, options = {}) {
+    const resolvedOpts = this.mapInvokeOptions(target, locals, options);
     const {
       token,
       deps,
       construct,
       imports,
       provider
-    } = this.mapInvokeOptions(target, locals, options);
+    } = resolvedOpts;
 
     if (provider) {
-      GlobalProviders.onInvoke(provider, locals, deps);
+      GlobalProviders.onInvoke(provider, locals, _extends({}, resolvedOpts, {
+        injector: this
+      }));
     }
 
     let instance;
@@ -2292,7 +2354,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
     };
   }
 
-};
+});
 exports.InjectorService = InjectorService_1 = tslib.__decorate([Injectable({
   scope: exports.ProviderScope.SINGLETON,
   global: true