@tsed/di 6.75.11 → 6.77.1

package/lib/index.modern.js

@@ -1,5 +1,6 @@
 import { getClassOrSymbol, Store, isClass, classOf, nameOf, StoreSet, decoratorTypeOf, UnsupportedDecoratorType, DecoratorTypes, Metadata, useDecorators, isArrayOrArrayClass, isString, getConstructorArgNames, proxyDelegation, setValue, getValue, deepMerge, deepClone, ancestorsOf, prototypeOf, isPromise, catchError, isInheritedFrom, isFunction, Env } from '@tsed/core';
 import { levels, Logger, $log } from '@tsed/logger';
+import { Path, Children } from '@tsed/schema';
 import { __decorate, __metadata } from 'tslib';
 import chalk from 'chalk';
 
@@ -125,6 +126,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.
    *
@@ -161,6 +170,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);
   }
@@ -172,6 +185,24 @@ class Provider {
   clone() {
     return new (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 && nameOf(this.useClass), this.useFactory && "Factory", this.useValue && "Value", this.useAsyncFactory && "AsyncFactory"].filter(Boolean).join(":");
@@ -1222,7 +1253,7 @@ function UseOpts(options) {
   };
 }
 
-const _excluded = ["children"];
+const _excluded = ["children", "path"];
 
 function mapOptions(options) {
   if (typeof options === "string" || options instanceof RegExp || isArrayOrArrayClass(options)) {
@@ -1266,19 +1297,16 @@ function mapOptions(options) {
 function Controller(options) {
   const _mapOptions = mapOptions(options),
         {
-    children = []
+    children = [],
+    path
   } = _mapOptions,
         opts = _objectWithoutPropertiesLoose(_mapOptions, _excluded);
 
-  return target => {
+  return useDecorators(target => {
     registerController(_extends({
       provide: target
     }, opts));
-    Store.from(target).set("childrenControllers", children);
-    children.forEach(childToken => {
-      Store.from(childToken).set("parentController", target);
-    });
-  };
+  }, path && Path(path), Children(...children));
 }
 
 class InjectionError extends Error {
@@ -1767,6 +1795,7 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
 
 
     locals = this.loadSync(locals);
+    await locals.emit("$beforeInit");
     await locals.emit("$onInit");
     return locals;
   }
@@ -1782,7 +1811,7 @@ let InjectorService = InjectorService_1 = class InjectorService extends Containe
 
     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) ? deepMerge(mergedConfiguration.get(key), value) : deepClone(value);
           mergedConfiguration.set(key, value);