feat(di): Add Module and Configuration decorators

Author: Romakita

packages/di/src/class/Container.ts

@@ -68,7 +68,7 @@ export class Container extends LocalsContainer<Provider<any>> {
 
   public addProviders(container: Map<TokenProvider, Provider<any>>) {
     container.forEach(provider => {
-      if (!this.hasProvider(provider.provide)) {
+      if (!this.hasProvider(provider.provide) && !provider.root) {
         this.setProvider(provider.provide, provider.clone());
       }
     });

packages/di/src/class/Provider.ts

@@ -1,71 +1,49 @@
-import {deepClone, Enumerable, getClass, getKeys, isClass, nameOf, NotEnumerable, Store, Type} from "@tsed/core";
+import {classOf, Enumerable, getKeys, isClass, nameOf, NotEnumerable, Store, Type} from "@tsed/core";
 import {IDIConfigurationOptions, ProviderScope} from "../interfaces";
 import {IProvider} from "../interfaces/IProvider";
 import {ProviderType} from "../interfaces/ProviderType";
 import {TokenProvider} from "../interfaces/TokenProvider";
 
 export class Provider<T> implements IProvider<T> {
-  /**
-   *
-   */
+  @Enumerable()
+  public root: boolean = false;
+
   @Enumerable()
   public type: ProviderType | any = ProviderType.PROVIDER;
-  /**
-   *
-   */
+
   @Enumerable()
   public injectable: boolean = true;
-  /**
-   *
-   */
+
   @Enumerable()
   public instance: T;
-  /**
-   *
-   */
+
   @Enumerable()
   public deps: any[];
-  /**
-   *
-   */
+
+  @Enumerable()
+  public imports: any[];
+
   @Enumerable()
   public useFactory: Function;
 
   @Enumerable()
   public useAsyncFactory: Function;
-  /**
-   *
-   */
+
   @Enumerable()
   public useValue: any;
-  /**
-   *
-   */
+
   @NotEnumerable()
   protected _provide: TokenProvider;
-  /**
-   *
-   */
+
   @NotEnumerable()
   protected _useClass: Type<T>;
-  /**
-   *
-   */
+
   @NotEnumerable()
   protected _instance: T;
-  /**
-   *
-   */
-  @NotEnumerable()
-  protected _scope: ProviderScope;
-  /**
-   *
-   */
+
   @NotEnumerable()
   private _store: Store;
 
-  private _configuration: Partial<IDIConfigurationOptions>;
-
   [key: string]: any;
 
   constructor(token: TokenProvider) {
@@ -77,26 +55,17 @@ export class Provider<T> implements IProvider<T> {
     return this._provide;
   }
 
-  /**
-   *
-   * @returns {any}
-   */
   get provide(): TokenProvider {
     return this._provide;
   }
 
-  /**
-   *
-   * @param value
-   */
   set provide(value: TokenProvider) {
-    this._provide = isClass(value) ? getClass(value) : value;
+    if (value) {
+      this._provide = isClass(value) ? classOf(value) : value;
+      this._store = Store.from(value);
+    }
   }
 
-  /**
-   *
-   * @returns {Type<T>}
-   */
   get useClass(): Type<T> {
     return this._useClass;
   }
@@ -108,30 +77,19 @@ export class Provider<T> implements IProvider<T> {
   @Enumerable()
   set useClass(value: Type<T>) {
     if (isClass(value)) {
-      this._useClass = getClass(value);
+      this._useClass = classOf(value);
       this._store = Store.from(value);
     }
   }
 
-  /**
-   *
-   * @returns {string}
-   */
   get className() {
     return this.name;
   }
 
-  /**
-   *
-   */
   get name() {
     return nameOf(this.provide);
   }
 
-  /**
-   *
-   * @returns {Store}
-   */
   public get store(): Store {
     return this._store;
   }
@@ -150,7 +108,7 @@ export class Provider<T> implements IProvider<T> {
       return ProviderScope.SINGLETON;
     }
 
-    return this._store ? this.store.get("scope") : this._scope;
+    return this.store.get("scope");
   }
 
   /**
@@ -159,29 +117,29 @@ export class Provider<T> implements IProvider<T> {
    */
   @Enumerable()
   set scope(scope: ProviderScope) {
-    this._store ? this.store.set("scope", scope) : this._scope;
+    this.store.set("scope", scope);
   }
 
   get configuration(): Partial<IDIConfigurationOptions> {
-    return this._configuration && deepClone(this._configuration);
+    return this.store.get("configuration");
   }
 
+  @Enumerable()
   set configuration(configuration: Partial<IDIConfigurationOptions>) {
-    this._configuration = configuration;
+    this.store.set("configuration", configuration);
   }
 
   isAsync(): boolean {
     return !!this.useAsyncFactory;
   }
 
-  /**
-   *
-   */
   clone(): Provider<any> {
-    const provider = new (getClass(this))(this.token);
+    const provider = new (classOf(this))(this.token);
 
     getKeys(this).forEach(key => {
-      provider[key] = this[key];
+      if (this[key] !== undefined) {
+        provider[key] = this[key];
+      }
     });
 
     return provider;

packages/di/src/decorators/configuration.ts

@@ -1,22 +1,15 @@
-import {DecoratorParameters, getDecoratorType} from "@tsed/core";
-import {DIConfiguration, Inject} from "@tsed/di";
+import {DecoratorParameters, getDecoratorType, StoreSet} from "@tsed/core";
+import {Inject} from "../decorators/inject";
 import {IDIConfigurationOptions} from "../interfaces/IDIConfigurationOptions";
-import {ProviderScope} from "../interfaces/ProviderScope";
-import {ProviderType} from "../interfaces/ProviderType";
-import {Injectable} from "./injectable";
+import {DIConfiguration} from "../services/DIConfiguration";
 
 export type Configuration = IDIConfigurationOptions & DIConfiguration;
 
 export function Configuration(configuration: Partial<IDIConfigurationOptions> = {}): Function {
   return (...args: DecoratorParameters) => {
     switch (getDecoratorType(args, true)) {
       case "class":
-        Injectable({
-          type: ProviderType.PROVIDER,
-          scope: ProviderScope.SINGLETON,
-          configuration,
-          injectable: false
-        })(args[0]);
+        StoreSet("configuration", configuration)(args[0]);
 
         break;
       case "parameter.constructor":

packages/di/src/decorators/module.ts

@@ -0,0 +1,33 @@
+import {applyDecorators} from "@tsed/core";
+import {Injectable, ProviderType} from "@tsed/di";
+import {IDIConfigurationOptions} from "../interfaces/IDIConfigurationOptions";
+import {ProviderScope} from "../interfaces/ProviderScope";
+import {TokenProvider} from "../interfaces/TokenProvider";
+import {Configuration} from "./configuration";
+
+export interface IModuleOptions extends IDIConfigurationOptions {
+  /**
+   * Define dependencies to build the provider
+   */
+  imports?: TokenProvider[];
+  /**
+   *
+   */
+  scope?: ProviderScope;
+
+  [key: string]: any;
+}
+
+export function Module({imports, deps, root, scope, ...configuration}: Partial<IModuleOptions> = {}) {
+  return applyDecorators(
+    Configuration(configuration),
+    Injectable({
+      type: ProviderType.PROVIDER,
+      scope: ProviderScope.SINGLETON,
+      imports,
+      deps,
+      injectable: false,
+      root
+    })
+  );
+}

packages/di/src/index.ts

@@ -14,6 +14,7 @@ export * from "./decorators/value";
 export * from "./decorators/intercept";
 export * from "./decorators/interceptor";
 export * from "./decorators/configuration";
+export * from "./decorators/module";
 export * from "./registries/ProviderRegistry";
 export * from "./registries/GlobalProviders";
 export * from "./services/InjectorService";

packages/di/src/interfaces/IInvokeOptions.ts

@@ -3,6 +3,7 @@ import {TokenProvider} from "./TokenProvider";
 
 export interface IInvokeOptions<T> {
   deps: any[];
+  imports: any[];
   parent?: TokenProvider;
   scope: ProviderScope;
   useScope: boolean;

packages/di/src/interfaces/IProvider.ts

@@ -2,7 +2,6 @@ import {Type} from "@tsed/core";
 import {ProviderScope} from "./ProviderScope";
 import {ProviderType} from "./ProviderType";
 import {TokenProvider} from "./TokenProvider";
-
 /**
  *
  */