@tsed/di 6.75.11 → 6.77.1

package/lib/domain/Provider.d.ts

@@ -28,6 +28,8 @@ export declare class Provider<T = any> implements IProvider<T> {
     get className(): string;
     get name(): string;
     get store(): Store;
+    get path(): string;
+    set path(path: string);
     /**
      * Get the scope of the provider.
      *
@@ -45,8 +47,19 @@ export declare class Provider<T = any> implements IProvider<T> {
     set scope(scope: ProviderScope);
     get configuration(): Partial<TsED.Configuration>;
     set configuration(configuration: Partial<TsED.Configuration>);
+    get children(): TokenProvider[];
     get(key: string): any;
     isAsync(): boolean;
     clone(): Provider;
+    /**
+     *
+     * @returns {boolean}
+     */
+    hasChildren(): boolean;
+    /**
+     *
+     * @returns {boolean}
+     */
+    hasParent(): boolean;
     toString(): string;
 }

package/lib/index.js

@@ -1,5 +1,6 @@
 var core = require('@tsed/core');
 var logger = require('@tsed/logger');
+var schema = require('@tsed/schema');
 var tslib = require('tslib');
 var chalk = require('chalk');
 
@@ -129,6 +130,14 @@ class Provider {
   get store() {
     return this._store;
   }
+
+  get path() {
+    return this.store.get("path", "/");
+  }
+
+  set path(path) {
+    this.store.set("path", path);
+  }
   /**
    * Get the scope of the provider.
    *
@@ -165,6 +174,10 @@ class Provider {
     this.store.set("configuration", configuration);
   }
 
+  get children() {
+    return this.store.get("childrenControllers", []);
+  }
+
   get(key) {
     return this.store.get(key) || this._tokenStore.get(key);
   }
@@ -176,6 +189,24 @@ class Provider {
   clone() {
     return new (core.classOf(this))(this._provide, this);
   }
+  /**
+   *
+   * @returns {boolean}
+   */
+
+
+  hasChildren() {
+    return !!this.children.length;
+  }
+  /**
+   *
+   * @returns {boolean}
+   */
+
+
+  hasParent() {
+    return !!this.store.get("parentController");
+  }
 
   toString() {
     return ["Token", this.name, this.useClass && core.nameOf(this.useClass), this.useFactory && "Factory", this.useValue && "Value", this.useAsyncFactory && "AsyncFactory"].filter(Boolean).join(":");
@@ -1226,7 +1257,7 @@ function UseOpts(options) {
   };
 }
 
-const _excluded = ["children"];
+const _excluded = ["children", "path"];
 
 function mapOptions(options) {
   if (typeof options === "string" || options instanceof RegExp || core.isArrayOrArrayClass(options)) {
@@ -1270,19 +1301,16 @@ function mapOptions(options) {
 function Controller(options) {
   const _mapOptions = mapOptions(options),
         {
-    children = []
+    children = [],
+    path
   } = _mapOptions,
         opts = _objectWithoutPropertiesLoose(_mapOptions, _excluded);
 
-  return target => {
+  return core.useDecorators(target => {
     registerController(_extends({
       provide: target
     }, opts));
-    core.Store.from(target).set("childrenControllers", children);
-    children.forEach(childToken => {
-      core.Store.from(childToken).set("parentController", target);
-    });
-  };
+  }, path && schema.Path(path), schema.Children(...children));
 }
 
 class InjectionError extends Error {
@@ -1771,6 +1799,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
 
     locals = this.loadSync(locals);
+    await locals.emit("$beforeInit");
     await locals.emit("$onInit");
     return locals;
   }
@@ -1786,7 +1815,7 @@ exports.InjectorService = InjectorService_1 = class InjectorService extends Cont
 
     const mergedConfiguration = new Map();
     super.forEach(provider => {
-      if (provider.configuration) {
+      if (provider.configuration && provider.type !== "server:module") {
         Object.entries(provider.configuration).forEach(([key, value]) => {
           value = mergedConfiguration.has(key) ? core.deepMerge(mergedConfiguration.get(key), value) : core.deepClone(value);
           mergedConfiguration.set(key, value);