@tsed/di 6.69.3 → 6.71.0

package/lib/decorators/injectable.d.ts

@@ -18,4 +18,4 @@ import type { IProvider } from "../interfaces";
  * @returns {Function}
  * @decorator
  */
-export declare function Injectable(options?: Partial<IProvider<any>>): ClassDecorator;
+export declare function Injectable(options?: Partial<IProvider>): ClassDecorator;

package/lib/domain/Container.d.ts

@@ -1,6 +1,6 @@
-import { IProvider } from "../interfaces/IProvider";
-import { ProviderType } from "./ProviderType";
-import { TokenProvider } from "../interfaces/TokenProvider";
+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> {

package/lib/domain/DIContext.d.ts

@@ -1,4 +1,4 @@
-import { Env } from "@tsed/core";
+import type { Env } from "@tsed/core";
 import { InjectorService } from "../services/InjectorService";
 import { ContextLogger, ContextLoggerOptions } from "./ContextLogger";
 import { LocalsContainer } from "./LocalsContainer";
@@ -22,6 +22,7 @@ export interface DIContextOptions extends Omit<ContextLoggerOptions, "dateStart"
     injector?: InjectorService;
 }
 export declare class DIContext extends Map<any, any> implements ContextMethods {
+    #private;
     [x: string]: any;
     /**
      * Request id generated by @@contextMiddleware@@.
@@ -52,19 +53,19 @@ export declare class DIContext extends Map<any, any> implements ContextMethods {
      * Date when request have been handled by the server. @@RequestLogger@@ use this date to log request duration.
      */
     readonly dateStart: Date;
-    /**
-     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
-     */
-    container: LocalsContainer<any>;
     /**
      * Logger attached to the context request.
      */
     logger: ContextLogger;
+    constructor({ id, injector, logger, ignoreLog, ...options }: DIContextOptions);
+    /**
+     * The request container used by the Ts.ED DI. It contain all services annotated with `@Scope(ProviderScope.REQUEST)`
+     */
+    get container(): LocalsContainer;
     /**
      *
      */
-    injector: InjectorService;
-    constructor({ id, injector, logger, ignoreLog, ...options }: DIContextOptions);
+    get injector(): InjectorService;
     get env(): any;
     destroy(): Promise<void>;
     emit(eventName: string, ...args: any[]): Promise<void>;

package/lib/domain/LocalsContainer.d.ts

@@ -1,4 +1,4 @@
-import { TokenProvider } from "../interfaces/TokenProvider";
+import type { TokenProvider } from "../interfaces/TokenProvider";
 export declare class LocalsContainer<V = any> extends Map<TokenProvider, V> {
     /**
      * Emit an event to all service. See service [lifecycle hooks](/docs/services.md#lifecycle-hooks).

package/lib/domain/Provider.d.ts

@@ -3,21 +3,17 @@ import { IProvider, TokenProvider } from "../interfaces";
 import { ProviderScope } from "./ProviderScope";
 import { ProviderType } from "./ProviderType";
 export declare class Provider<T = any> implements IProvider<T> {
+    #private;
     type: ProviderType | any;
-    injectable: boolean;
     instance: T;
     deps: TokenProvider[];
     imports: any[];
     useFactory: Function;
     useAsyncFactory: Function;
     useValue: any;
-    protected _provide: TokenProvider;
-    protected _useClass: Type<T>;
-    protected _instance: T;
-    private _store;
-    private _tokenStore;
+    _useClass: Type<T>;
     [key: string]: any;
-    constructor(token: TokenProvider);
+    constructor(token: TokenProvider, options?: Partial<Provider>);
     get token(): any;
     get provide(): TokenProvider;
     set provide(value: TokenProvider);
@@ -49,6 +45,6 @@ export declare class Provider<T = any> implements IProvider<T> {
     set configuration(configuration: Partial<TsED.Configuration>);
     get(key: string): any;
     isAsync(): boolean;
-    clone(): Provider<any>;
+    clone(): Provider;
     toString(): string;
 }

package/lib/index.d.ts

@@ -11,9 +11,6 @@ export * from "./services/DITest";
 export * from "./errors/InjectionError";
 export * from "./errors/UndefinedTokenError";
 export * from "./utils/createContainer";
-export * from "./utils/importFiles";
-export * from "./utils/importComponents";
 export * from "./utils/getConfiguration";
 export * from "./utils/getConfiguration";
-export * from "./utils/importProviders";
 export * from "./utils/setLoggerLevel";

package/lib/index.js

@@ -1,34 +1,11 @@
 var core = require('@tsed/core');
-var tslib = require('tslib');
 var logger = require('@tsed/logger');
+var tslib = require('tslib');
 var chalk = require('chalk');
-var globby = require('globby');
-var path = require('path');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-function _interopNamespace(e) {
-  if (e && e.__esModule) return e;
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () {
-            return e[k];
-          }
-        });
-      }
-    });
-  }
-  n['default'] = e;
-  return n;
-}
-
 var chalk__default = /*#__PURE__*/_interopDefaultLegacy(chalk);
-var globby__default = /*#__PURE__*/_interopDefaultLegacy(globby);
 
 const INJECTABLE_PROP = "DI:INJECTABLE_PROP";
 const DI_PARAMS = "DI:PARAMS";
@@ -102,26 +79,44 @@ exports.ProviderType = void 0;
   ProviderType["MIDDLEWARE"] = "middleware";
 })(exports.ProviderType || (exports.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 = exports.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 = core.isClass(value) ? core.classOf(value) : value;
-      this._tokenStore = this._store = core.Store.from(value);
+      _classPrivateFieldLooseBase(this, _provide)[_provide] = core.getClassOrSymbol(value);
+      _classPrivateFieldLooseBase(this, _tokenStore)[_tokenStore] = _classPrivateFieldLooseBase(this, _store)[_store] = core.Store.from(value);
     }
   }
 
@@ -137,7 +132,7 @@ class Provider {
   set useClass(value) {
     if (core.isClass(value)) {
       this._useClass = core.classOf(value);
-      this._store = core.Store.from(value);
+      _classPrivateFieldLooseBase(this, _store)[_store] = core.Store.from(value);
     }
   }
 
@@ -150,7 +145,7 @@ class Provider {
   }
 
   get store() {
-    return this._store;
+    return _classPrivateFieldLooseBase(this, _store)[_store];
   }
   /**
    * Get the scope of the provider.
@@ -189,7 +184,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() {
@@ -197,13 +192,7 @@ class Provider {
   }
 
   clone() {
-    const provider = new (core.classOf(this))(this.token);
-    core.getEnumerableKeys(this).forEach(key => {
-      if (this[key] !== undefined) {
-        provider[key] = this[key];
-      }
-    });
-    return provider;
+    return new (core.classOf(this))(_classPrivateFieldLooseBase(this, _provide)[_provide], this);
   }
 
   toString() {
@@ -212,38 +201,6 @@ class Provider {
 
 }
 
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Object)], Provider.prototype, "type", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Boolean)], Provider.prototype, "injectable", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Object)], Provider.prototype, "instance", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Array)], Provider.prototype, "deps", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Array)], Provider.prototype, "imports", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Function)], Provider.prototype, "useFactory", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Function)], Provider.prototype, "useAsyncFactory", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Object)], Provider.prototype, "useValue", void 0);
-
-tslib.__decorate([core.NotEnumerable(), tslib.__metadata("design:type", Object)], Provider.prototype, "_provide", void 0);
-
-tslib.__decorate([core.NotEnumerable(), tslib.__metadata("design:type", core.Type)], Provider.prototype, "_useClass", void 0);
-
-tslib.__decorate([core.NotEnumerable(), tslib.__metadata("design:type", Object)], Provider.prototype, "_instance", void 0);
-
-tslib.__decorate([core.NotEnumerable(), tslib.__metadata("design:type", core.Store)], Provider.prototype, "_store", void 0);
-
-tslib.__decorate([core.NotEnumerable(), tslib.__metadata("design:type", core.Store)], Provider.prototype, "_tokenStore", void 0);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", core.Type), tslib.__metadata("design:paramtypes", [core.Type])], Provider.prototype, "useClass", null);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", String), tslib.__metadata("design:paramtypes", [String])], Provider.prototype, "scope", null);
-
-tslib.__decorate([core.Enumerable(), tslib.__metadata("design:type", Object), tslib.__metadata("design:paramtypes", [Object])], Provider.prototype, "configuration", null);
-
 var _settings = /*#__PURE__*/_classPrivateFieldLooseKey("settings");
 
 class GlobalProviderRegistry extends Map {
@@ -310,9 +267,7 @@ class GlobalProviderRegistry extends Map {
     return super.delete(core.getClassOrSymbol(key));
   }
 
-  createRegistry(type, model, options = {
-    injectable: true
-  }) {
+  createRegistry(type, model, options = {}) {
     const defaultOptions = this.getRegistrySettings(type);
     options = Object.assign(defaultOptions, _extends({}, options, {
       model
@@ -323,6 +278,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";
 
@@ -337,13 +300,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
@@ -358,15 +321,6 @@ class GlobalProviderRegistry extends Map {
       this.merge(provider.provide, provider);
     };
   }
-  /**
-   * @deprecated
-   */
-  // istanbul ignore next
-
-
-  getRegistry(target) {
-    return this;
-  }
   /**
    *
    * @param key
@@ -696,6 +650,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 {
@@ -711,14 +670,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,
@@ -726,6 +689,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;
   }
@@ -734,11 +712,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) {
@@ -764,9 +738,7 @@ function Scope(scope = exports.ProviderScope.REQUEST) {
  *
  */
 
-GlobalProviders.createRegistry(exports.ProviderType.CONTROLLER, Provider, {
-  injectable: false
-});
+GlobalProviders.createRegistry(exports.ProviderType.CONTROLLER, Provider);
 /**
  * Register a provider configuration.
  * @param {IProvider<any>} provider
@@ -881,37 +853,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(exports.ProviderType.SERVICE);
 /**
  * Add a new controller in the `ProviderRegistry`. This controller will be built when `InjectorService` will be loaded.
  *
@@ -2100,17 +2041,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
     } = this.mapInvokeOptions(target, locals, options);
 
     if (provider) {
-      if (!provider.injectable && options.parent) {
-        throw new InjectionError(token, `${core.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;
@@ -2353,103 +2284,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 => path.resolve(s)).concat(mapExcludes(excludes)).map(mapExtensions).map(s => core.normalizePath(s));
-}
-
-async function importFiles(patterns, exclude) {
-  const files = await globby__default['default'](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 Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(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 (core.isClass(item)) {
-    return [item];
-  }
-  /* istanbul ignore else */
-
-
-  if (!process.env.WEBPACK) {
-    return importFiles(item, excludes);
-  }
-  /* istanbul ignore next */
-
-
-  return [];
-}
-
-function mapConfiguration(config) {
-  if (core.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(core.isClass).map(symbol => ({
-        token: symbol,
-        route: option.endpoint
-      }));
-    }));
-  }
-
-  const result = await Promise.all(promises);
-  return result.flat();
-}
-
 function getConfiguration(module, configuration = {}) {
   const store = core.Store.from(module).get("configuration") || {};
 
@@ -2466,35 +2300,6 @@ 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) === exports.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];
-}
-
 exports.Configuration = Configuration;
 exports.Constant = Constant;
 exports.Container = Container;
@@ -2524,14 +2329,9 @@ exports.UseOpts = UseOpts;
 exports.Value = Value;
 exports.createContainer = createContainer;
 exports.getConfiguration = getConfiguration;
-exports.importComponents = importComponents;
-exports.importFiles = importFiles;
-exports.importProviders = importProviders;
-exports.mapConfiguration = mapConfiguration;
 exports.registerController = registerController;
 exports.registerFactory = registerFactory;
 exports.registerProvider = registerProvider;
-exports.registerService = registerService;
 exports.registerValue = registerValue;
 exports.setLoggerLevel = setLoggerLevel;
 //# sourceMappingURL=index.js.map