@tsed/di 6.69.3 → 6.71.0

package/lib/index.modern.js

@@ -1,9 +1,7 @@
-import { isClass, classOf, Store, nameOf, getEnumerableKeys, Enumerable, NotEnumerable, Type, getClassOrSymbol, StoreSet, decoratorTypeOf, UnsupportedDecoratorType, DecoratorTypes, Metadata, useDecorators, isString, getConstructorArgNames, proxyDelegation, setValue, getValue, deepMerge, deepClone, ancestorsOf, prototypeOf, isPromise, isInheritedFrom, isFunction, Env, normalizePath, isArray } from '@tsed/core';
-import { __decorate, __metadata } from 'tslib';
+import { getClassOrSymbol, Store, isClass, classOf, nameOf, StoreSet, decoratorTypeOf, UnsupportedDecoratorType, DecoratorTypes, Metadata, useDecorators, isString, getConstructorArgNames, proxyDelegation, setValue, getValue, deepMerge, deepClone, ancestorsOf, prototypeOf, isPromise, isInheritedFrom, isFunction, Env } from '@tsed/core';
 import { levels, Logger, $log } from '@tsed/logger';
+import { __decorate, __metadata } from 'tslib';
 import chalk from 'chalk';
-import globby from 'globby';
-import { resolve } from 'path';
 
 const INJECTABLE_PROP = "DI:INJECTABLE_PROP";
 const DI_PARAMS = "DI:PARAMS";
@@ -77,26 +75,44 @@ var ProviderType;
   ProviderType["MIDDLEWARE"] = "middleware";
 })(ProviderType || (ProviderType = {}));
 
+var _provide = /*#__PURE__*/_classPrivateFieldLooseKey("provide");
+
+var _store = /*#__PURE__*/_classPrivateFieldLooseKey("store");
+
+var _tokenStore = /*#__PURE__*/_classPrivateFieldLooseKey("tokenStore");
+
 class Provider {
-  constructor(token) {
+  constructor(token, options = {}) {
+    Object.defineProperty(this, _provide, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _store, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _tokenStore, {
+      writable: true,
+      value: void 0
+    });
     this.type = ProviderType.PROVIDER;
-    this.injectable = true;
     this.provide = token;
     this.useClass = token;
+    Object.assign(this, options);
   }
 
   get token() {
-    return this._provide;
+    return _classPrivateFieldLooseBase(this, _provide)[_provide];
   }
 
   get provide() {
-    return this._provide;
+    return _classPrivateFieldLooseBase(this, _provide)[_provide];
   }
 
   set provide(value) {
     if (value) {
-      this._provide = isClass(value) ? classOf(value) : value;
-      this._tokenStore = this._store = Store.from(value);
+      _classPrivateFieldLooseBase(this, _provide)[_provide] = getClassOrSymbol(value);
+      _classPrivateFieldLooseBase(this, _tokenStore)[_tokenStore] = _classPrivateFieldLooseBase(this, _store)[_store] = Store.from(value);
     }
   }
 
@@ -112,7 +128,7 @@ class Provider {
   set useClass(value) {
     if (isClass(value)) {
       this._useClass = classOf(value);
-      this._store = Store.from(value);
+      _classPrivateFieldLooseBase(this, _store)[_store] = Store.from(value);
     }
   }
 
@@ -125,7 +141,7 @@ class Provider {
   }
 
   get store() {
-    return this._store;
+    return _classPrivateFieldLooseBase(this, _store)[_store];
   }
   /**
    * Get the scope of the provider.
@@ -164,7 +180,7 @@ class Provider {
   }
 
   get(key) {
-    return this.store.get(key) || this._tokenStore.get(key);
+    return this.store.get(key) || _classPrivateFieldLooseBase(this, _tokenStore)[_tokenStore].get(key);
   }
 
   isAsync() {
@@ -172,13 +188,7 @@ class Provider {
   }
 
   clone() {
-    const provider = new (classOf(this))(this.token);
-    getEnumerableKeys(this).forEach(key => {
-      if (this[key] !== undefined) {
-        provider[key] = this[key];
-      }
-    });
-    return provider;
+    return new (classOf(this))(_classPrivateFieldLooseBase(this, _provide)[_provide], this);
   }
 
   toString() {
@@ -187,38 +197,6 @@ class Provider {
 
 }
 
-__decorate([Enumerable(), __metadata("design:type", Object)], Provider.prototype, "type", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Boolean)], Provider.prototype, "injectable", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Object)], Provider.prototype, "instance", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Array)], Provider.prototype, "deps", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Array)], Provider.prototype, "imports", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Function)], Provider.prototype, "useFactory", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Function)], Provider.prototype, "useAsyncFactory", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Object)], Provider.prototype, "useValue", void 0);
-
-__decorate([NotEnumerable(), __metadata("design:type", Object)], Provider.prototype, "_provide", void 0);
-
-__decorate([NotEnumerable(), __metadata("design:type", Type)], Provider.prototype, "_useClass", void 0);
-
-__decorate([NotEnumerable(), __metadata("design:type", Object)], Provider.prototype, "_instance", void 0);
-
-__decorate([NotEnumerable(), __metadata("design:type", Store)], Provider.prototype, "_store", void 0);
-
-__decorate([NotEnumerable(), __metadata("design:type", Store)], Provider.prototype, "_tokenStore", void 0);
-
-__decorate([Enumerable(), __metadata("design:type", Type), __metadata("design:paramtypes", [Type])], Provider.prototype, "useClass", null);
-
-__decorate([Enumerable(), __metadata("design:type", String), __metadata("design:paramtypes", [String])], Provider.prototype, "scope", null);
-
-__decorate([Enumerable(), __metadata("design:type", Object), __metadata("design:paramtypes", [Object])], Provider.prototype, "configuration", null);
-
 var _settings = /*#__PURE__*/_classPrivateFieldLooseKey("settings");
 
 class GlobalProviderRegistry extends Map {
@@ -285,9 +263,7 @@ class GlobalProviderRegistry extends Map {
     return super.delete(getClassOrSymbol(key));
   }
 
-  createRegistry(type, model, options = {
-    injectable: true
-  }) {
+  createRegistry(type, model, options = {}) {
     const defaultOptions = this.getRegistrySettings(type);
     options = Object.assign(defaultOptions, _extends({}, options, {
       model
@@ -298,6 +274,14 @@ class GlobalProviderRegistry extends Map {
     return this;
   }
 
+  onInvoke(provider, locals, deps) {
+    const settings = _classPrivateFieldLooseBase(this, _settings)[_settings].get(provider.type);
+
+    if (settings != null && settings.onInvoke) {
+      settings.onInvoke(provider, locals, deps);
+    }
+  }
+
   getRegistrySettings(target) {
     let type = "provider";
 
@@ -312,13 +296,13 @@ class GlobalProviderRegistry extends Map {
     }
 
     return _classPrivateFieldLooseBase(this, _settings)[_settings].get(type) || {
-      model: Provider,
-      injectable: true
+      model: Provider
     };
   }
 
   createRegisterFn(type) {
     return (provider, instance) => {
+      // istanbul ignore next
       if (!provider.provide) {
         provider = {
           provide: provider
@@ -333,15 +317,6 @@ class GlobalProviderRegistry extends Map {
       this.merge(provider.provide, provider);
     };
   }
-  /**
-   * @deprecated
-   */
-  // istanbul ignore next
-
-
-  getRegistry(target) {
-    return this;
-  }
   /**
    *
    * @param key
@@ -671,6 +646,11 @@ class ContextLogger {
 }
 
 const _excluded$1 = ["id", "injector", "logger", "ignoreLog"];
+
+var _container = /*#__PURE__*/_classPrivateFieldLooseKey("container");
+
+var _injector = /*#__PURE__*/_classPrivateFieldLooseKey("injector");
+
 class DIContext extends Map {
   constructor(_ref) {
     let {
@@ -686,14 +666,18 @@ class DIContext extends Map {
      * Date when request have been handled by the server. @@RequestLogger@@ use this date to log request duration.
      */
 
+    Object.defineProperty(this, _container, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _injector, {
+      writable: true,
+      value: void 0
+    });
     this.dateStart = new Date();
-    /**
-     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
-     */
-
-    this.container = new LocalsContainer();
+    _classPrivateFieldLooseBase(this, _container)[_container] = new LocalsContainer();
     this.id = id;
-    injector && (this.injector = injector);
+    injector && (_classPrivateFieldLooseBase(this, _injector)[_injector] = injector);
     this.logger = new ContextLogger(logger, _extends({}, options, {
       dateStart: this.dateStart,
       id,
@@ -701,6 +685,21 @@ class DIContext extends Map {
     }));
   }
 
+  /**
+   * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
+   */
+  get container() {
+    return _classPrivateFieldLooseBase(this, _container)[_container];
+  }
+  /**
+   *
+   */
+
+
+  get injector() {
+    return _classPrivateFieldLooseBase(this, _injector)[_injector];
+  }
+
   get env() {
     return this.injector.settings.env;
   }
@@ -709,11 +708,7 @@ class DIContext extends Map {
     await this.container.destroy();
     this.logger.destroy(); // @ts-ignore
 
-    delete this.container; // @ts-ignore
-
-    delete this.logger; // @ts-ignore
-
-    delete this.injector;
+    delete this.logger;
   }
 
   async emit(eventName, ...args) {
@@ -739,9 +734,7 @@ function Scope(scope = ProviderScope.REQUEST) {
  *
  */
 
-GlobalProviders.createRegistry(ProviderType.CONTROLLER, Provider, {
-  injectable: false
-});
+GlobalProviders.createRegistry(ProviderType.CONTROLLER, Provider);
 /**
  * Register a provider configuration.
  * @param {IProvider<any>} provider
@@ -856,37 +849,6 @@ const registerValue = (provider, value) => {
   });
   GlobalProviders.merge(provider.provide, provider);
 };
-/**
- * Add a new service in the `ProviderRegistry`. This service will be built when `InjectorService` will be loaded.
- *
- * #### Example
- *
- * ```typescript
- * import {registerService, InjectorService} from "@tsed/di";
- *
- * export default class MyFooService {
- *     constructor(){}
- *     getFoo() {
- *         return "test";
- *     }
- * }
- *
- * registerService({provide: MyFooService});
- * // or
- * registerService(MyFooService);
- *
- * const injector = new InjectorService();
- * injector.load();
- *
- * const myFooService = injector.get<MyFooService>(MyFooService);
- * myFooService.getFoo(); // test
- * ```
- *
- * @param provider Provider configuration.
- * @deprecated Since 2021-05-15. Use registerProvider instead.
- */
-
-const registerService = GlobalProviders.createRegisterFn(ProviderType.SERVICE);
 /**
  * Add a new controller in the `ProviderRegistry`. This controller will be built when `InjectorService` will be loaded.
  *
@@ -2075,17 +2037,7 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
     } = this.mapInvokeOptions(target, locals, options);
 
     if (provider) {
-      if (!provider.injectable && options.parent) {
-        throw new InjectionError(token, `${nameOf(token)} ${provider.type} is not injectable to another provider`);
-      }
-
-      const {
-        onInvoke
-      } = GlobalProviders.getRegistrySettings(target);
-
-      if (onInvoke) {
-        onInvoke(provider, locals, deps);
-      }
+      GlobalProviders.onInvoke(provider, locals, deps);
     }
 
     let instance;
@@ -2328,103 +2280,6 @@ class DITest {
 }
 DITest._injector = null;
 
-function isTsEnv() {
-  return require && require.extensions && require.extensions[".ts"] || process.env["TS_TEST"] || process.env.JEST_WORKER_ID !== undefined || process.env.NODE_ENV === "test";
-}
-
-function mapExcludes(excludes) {
-  return excludes.map(s => `!${s.replace(/!/gi, "")}`);
-}
-
-function mapExtensions(file) {
-  if (!isTsEnv()) {
-    file = file.replace(/\.ts$/i, ".js").replace(/{\.ts,\.js}$/i, ".js");
-  }
-
-  return file;
-}
-
-function cleanGlobPatterns(files, excludes) {
-  return [].concat(files).map(s => resolve(s)).concat(mapExcludes(excludes)).map(mapExtensions).map(s => normalizePath(s));
-}
-
-async function importFiles(patterns, exclude) {
-  const files = await globby(cleanGlobPatterns(patterns, exclude));
-  const symbols = [];
-
-  for (const file of files) {
-    if (!file.endsWith(".d.ts")) {
-      // prevent .d.ts import if the global pattern isn't correctly configured
-      try {
-        const exports = await import(file);
-        Object.keys(exports).forEach(key => symbols.push(exports[key]));
-      } catch (er) {
-        // istanbul ignore next
-        console.error(er); // istanbul ignore next
-
-        process.exit(1);
-      }
-    }
-  }
-
-  return symbols;
-}
-
-async function resolveSymbols(item, excludes) {
-  if (isClass(item)) {
-    return [item];
-  }
-  /* istanbul ignore else */
-
-
-  if (!process.env.WEBPACK) {
-    return importFiles(item, excludes);
-  }
-  /* istanbul ignore next */
-
-
-  return [];
-}
-
-function mapConfiguration(config) {
-  if (isArray(config)) {
-    return config.map(value => {
-      return {
-        values: [].concat(value)
-      };
-    });
-  }
-
-  return Object.keys(config).reduce((list, key) => {
-    list.push({
-      endpoint: key,
-      values: [].concat(config[key])
-    });
-    return list;
-  }, []);
-}
-async function importComponents(config, excludes) {
-  if (!config) {
-    return [];
-  }
-
-  config = mapConfiguration(config);
-  const promises = [];
-
-  for (const option of config) {
-    promises.push(...option.values.map(async value => {
-      const symbols = await resolveSymbols(value, excludes);
-      return symbols.filter(isClass).map(symbol => ({
-        token: symbol,
-        route: option.endpoint
-      }));
-    }));
-  }
-
-  const result = await Promise.all(promises);
-  return result.flat();
-}
-
 function getConfiguration(module, configuration = {}) {
   const store = Store.from(module).get("configuration") || {};
 
@@ -2441,34 +2296,5 @@ function getConfiguration(module, configuration = {}) {
   return config;
 }
 
-async function recursiveImports(providers, settings, properties) {
-  const {
-    exclude = []
-  } = settings;
-  const promises = providers.map(({
-    token
-  }) => GlobalProviders.get(token)).filter(provider => (provider == null ? void 0 : provider.type) === ProviderType.MODULE && provider.configuration).map(provider => importProviders(_extends({
-    exclude
-  }, provider.configuration), properties));
-  return (await Promise.all(promises)).flat();
-}
-/**
- * Import providers from given patterns.
- *
- * @param settings
- * @param properties
- */
-
-
-async function importProviders(settings, properties = ["imports"]) {
-  const {
-    exclude = []
-  } = settings;
-  const promises = properties.map(key => importComponents(settings[key], exclude));
-  const providers = (await Promise.all(promises)).flat();
-  const children = await recursiveImports(providers, settings, properties);
-  return [...children, ...providers];
-}
-
-export { Configuration, Constant, Container, ContextLogger, DIConfiguration, DIContext, DITest, DI_PARAMS, DI_PARAM_OPTIONS, GlobalProviderRegistry, GlobalProviders, INJECTABLE_PROP, Inject, Injectable, InjectablePropertyType, InjectionError, InjectorService, Intercept, Interceptor, LocalsContainer, Module, Opts, OverrideProvider, Provider, ProviderScope, ProviderType, Scope, Service, UndefinedTokenError, UseOpts, Value, createContainer, getConfiguration, importComponents, importFiles, importProviders, mapConfiguration, registerController, registerFactory, registerProvider, registerService, registerValue, setLoggerLevel };
+export { Configuration, Constant, Container, ContextLogger, DIConfiguration, DIContext, DITest, DI_PARAMS, DI_PARAM_OPTIONS, GlobalProviderRegistry, GlobalProviders, INJECTABLE_PROP, Inject, Injectable, InjectablePropertyType, InjectionError, InjectorService, Intercept, Interceptor, LocalsContainer, Module, Opts, OverrideProvider, Provider, ProviderScope, ProviderType, Scope, Service, UndefinedTokenError, UseOpts, Value, createContainer, getConfiguration, registerController, registerFactory, registerProvider, registerValue, setLoggerLevel };
 //# sourceMappingURL=index.modern.js.map