@tsed/common 6.86.0 → 6.87.1

package/lib/index.modern.js

@@ -1,7 +1,7 @@
 import { $log, colorize } from '@tsed/logger';
 export { $log, Logger } from '@tsed/logger';
 import '@tsed/logger-file';
-import { DIConfiguration, Injectable, ProviderScope, Inject, InjectorService, Constant, Scope, DIContext, Provider, ProviderType, GlobalProviders, setLoggerLevel, registerProvider, Configuration, createContainer, colors, DITest } from '@tsed/di';
+import { DIConfiguration, Injectable, ProviderScope, Inject, InjectorService, Constant, Provider, ProviderType, GlobalProviders, Scope, DIContext, setLoggerLevel, registerProvider, Configuration, createContainer, colors, DITest } from '@tsed/di';
 export * from '@tsed/di';
 import { ParamTypes, PlatformParams, Context, UseParam, mapParamsOptions } from '@tsed/platform-params';
 export * from '@tsed/platform-params';
@@ -977,6 +977,7 @@ const PLATFORM_ROUTER_OPTIONS = Symbol.for("PlatformRouterOptions");
 let PlatformRouter = PlatformRouter_1 = class PlatformRouter {
   constructor(platformHandler) {
     this.platformHandler = platformHandler;
+    this.isBuilt = false;
     this.rawRouter = this.raw = PlatformRouter_1.createRawRouter();
   }
   /**
@@ -1283,72 +1284,77 @@ __decorate([__param(0, Context()), __metadata("design:type", Function), __metada
 
 AcceptMimesMiddleware = __decorate([Middleware()], AcceptMimesMiddleware);
 
-/**
- * Create Ts.ED context handler
- * @param fn
- * @ignore
- */
+const ROUTER_OPTIONS = Symbol.for("ROUTER_OPTIONS");
 
-function useCtxHandler(fn) {
-  fn.type = HandlerType.CTX_FN;
-  return fn;
-}
+let AUTO_INC = 0;
+class ControllerProvider extends Provider {
+  constructor(provide, options = {}) {
+    super(provide, options);
+    this.type = ProviderType.CONTROLLER;
+    this.tokenRouter = `${this.name}_ROUTER_${AUTO_INC++}`;
+  }
+  /**
+   *
+   */
 
-/**
- * @ignore
- */
 
-function formatMethod(method) {
-  return (method === OperationMethods.CUSTOM ? "use" : method || "use").toLowerCase();
-}
-/**
- * @ignore
- */
+  get routerOptions() {
+    return this.store.get(ROUTER_OPTIONS) || {};
+  }
+  /**
+   *
+   * @param value
+   */
 
 
-class PlatformControllerBuilder {
-  constructor(provider) {
-    this.provider = provider;
+  set routerOptions(value) {
+    this.store.set(ROUTER_OPTIONS, value);
   }
   /**
-   * @returns {any}
+   *
+   * @returns {any[]}
    */
 
 
-  build(injector) {
-    const {
-      middlewares: {
-        useBefore
-      }
-    } = this.provider; // Controller lifecycle
+  get middlewares() {
+    return Object.assign({
+      use: [],
+      useAfter: [],
+      useBefore: []
+    }, this.store.get("middlewares", {}));
+  }
+  /**
+   *
+   * @param middlewares
+   */
 
-    this.buildMiddlewares(useBefore) // Controller before-middleware
-    .buildEndpoints() // All endpoints and his middlewares
-    .buildChildrenCtrls(injector); // Children controllers
 
-    return this.provider.getRouter();
-  }
+  set middlewares(middlewares) {
+    const mdlwrs = this.middlewares;
 
-  buildEndpoints() {
-    getOperationsRoutes(this.provider.token).forEach(operationRoute => {
-      this.buildEndpoint(operationRoute);
-    });
-    return this;
-  }
+    const concat = (key, a, b) => a[key] = a[key].concat(b[key]);
 
-  buildEndpoint(operationRoute) {
-    let handlers = this.getMiddlewares(operationRoute);
-    const router = this.provider.getRouter();
-    router.addRoute({
-      handlers,
-      token: operationRoute.token,
-      method: formatMethod(operationRoute.method),
-      path: operationRoute.path,
-      isFinal: operationRoute.isFinal
+    Object.keys(middlewares).forEach(key => {
+      concat(key, mdlwrs, middlewares);
     });
+    this.store.set("middlewares", mdlwrs);
   }
 
-  getMiddlewares(operationRoute) {
+}
+
+/**
+ * Create Ts.ED context handler
+ * @param fn
+ * @ignore
+ */
+
+function useCtxHandler(fn) {
+  fn.type = HandlerType.CTX_FN;
+  return fn;
+}
+
+let PlatformMiddlewaresChain = class PlatformMiddlewaresChain {
+  get(provider, operationRoute) {
     const {
       endpoint
     } = operationRoute;
@@ -1362,11 +1368,10 @@ class PlatformControllerBuilder {
         use,
         useAfter
       }
-    } = this.provider;
+    } = provider;
     const hasFiles = [...operationRoute.endpoint.children.values()].find(item => item.paramType === ParamTypes.FILES);
     return [].concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(PlatformAcceptMimesMiddleware).concat(hasFiles && PlatformMulterMiddleware).concat(beforeMiddlewares) // Endpoint before-middlewares
     .concat(use) // Controller use-middlewares
-    // .concat(endpoint.cache && PlatformCacheMiddleware)
     .concat(mldwrs) // Endpoint middlewares
     .concat(endpoint) // Endpoint metadata
     .concat(afterMiddlewares) // Endpoint after-middlewares
@@ -1374,32 +1379,97 @@ class PlatformControllerBuilder {
     .filter(item => !!item);
   }
 
-  buildChildrenCtrls(injector) {
-    const {
-      children
-    } = this.provider;
-    const router = this.provider.getRouter();
+};
+PlatformMiddlewaresChain = __decorate([Injectable()], PlatformMiddlewaresChain);
+
+GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider, {
+  onInvoke(provider, locals, {
+    injector
+  }) {
+    const router = createRouter(injector, provider);
+    locals.set(PlatformRouter, router);
+  }
+
+});
+/**
+ * @ignore
+ */
+
+function formatMethod(method) {
+  return (method === OperationMethods.CUSTOM ? "use" : method || "use").toLowerCase();
+}
+/**
+ * @ignore
+ */
+
+
+function getRouter(injector, provider) {
+  return injector.get(provider.tokenRouter);
+}
+/**
+ * @ignore
+ */
+
+function createRouter(injector, provider) {
+  const token = provider.tokenRouter;
+
+  if (injector.has(token)) {
+    return getRouter(injector, provider);
+  }
+
+  const router = PlatformRouter.create(injector, provider.routerOptions);
+  return injector.add(token, {
+    useValue: router
+  }).invoke(token);
+}
+/**
+ * @ignore
+ * @param injector
+ * @param provider
+ */
+
+function buildRouter(injector, provider) {
+  const {
+    middlewares: {
+      useBefore
+    },
+    children
+  } = provider; // Controller lifecycle
+
+  const router = createRouter(injector, provider);
+
+  if (!router.isBuilt) {
+    router.isBuilt = true;
+    const platformMiddlewaresChain = injector.get(PlatformMiddlewaresChain);
+    useBefore // Controller before-middleware
+    .filter(o => typeof o === "function").forEach(middleware => {
+      router.use(middleware);
+    }); // build all endpoints and his middlewares
+
+    getOperationsRoutes(provider.token).forEach(operationRoute => {
+      const handlers = platformMiddlewaresChain == null ? void 0 : platformMiddlewaresChain.get(provider, operationRoute);
+      router.addRoute({
+        handlers,
+        token: operationRoute.token,
+        method: formatMethod(operationRoute.method),
+        path: operationRoute.path,
+        isFinal: operationRoute.isFinal
+      });
+    }); // build children controllers
+
     children.forEach(child => {
-      const provider = injector.getProvider(child);
+      const childProvider = injector.getProvider(child);
       /* istanbul ignore next */
 
-      if (!provider) {
+      if (!childProvider) {
         throw new Error("Controller component not found in the ControllerRegistry");
       }
 
-      new PlatformControllerBuilder(provider).build(injector);
-      router.use(provider.path, provider.getRouter());
+      router.use(childProvider.path, buildRouter(injector, childProvider));
     });
   }
 
-  buildMiddlewares(middlewares) {
-    const router = this.provider.getRouter();
-    middlewares.filter(o => typeof o === "function").forEach(middleware => {
-      router.use(middleware);
-    });
-    return this;
-  }
-
+  return router;
 }
 
 /**
@@ -1996,71 +2066,6 @@ class PlatformRouteDetails extends JsonOperationRoute {
 
 }
 
-const ROUTER_OPTIONS = Symbol.for("ROUTER_OPTIONS");
-
-class ControllerProvider extends Provider {
-  constructor(provide, options = {}) {
-    super(provide, options);
-    this.type = ProviderType.CONTROLLER;
-  }
-  /**
-   *
-   */
-
-
-  get routerOptions() {
-    return this.store.get(ROUTER_OPTIONS) || {};
-  }
-  /**
-   *
-   * @param value
-   */
-
-
-  set routerOptions(value) {
-    this.store.set(ROUTER_OPTIONS, value);
-  }
-  /**
-   *
-   * @returns {any[]}
-   */
-
-
-  get middlewares() {
-    return Object.assign({
-      use: [],
-      useAfter: [],
-      useBefore: []
-    }, this.store.get("middlewares", {}));
-  }
-  /**
-   *
-   * @param middlewares
-   */
-
-
-  set middlewares(middlewares) {
-    const mdlwrs = this.middlewares;
-
-    const concat = (key, a, b) => a[key] = a[key].concat(b[key]);
-
-    Object.keys(middlewares).forEach(key => {
-      concat(key, mdlwrs, middlewares);
-    });
-    this.store.set("middlewares", mdlwrs);
-  }
-
-  getRouter() {
-    return this.router;
-  }
-
-  setRouter(router) {
-    this.router = router;
-    return this;
-  }
-
-}
-
 /**
  * @deprecated Since 2020-11-11. Use getProperties from @tsed/schema
  */
@@ -2084,13 +2089,6 @@ let PropertyMetadata = class PropertyMetadata extends JsonPropertyStore {
 };
 PropertyMetadata = __decorate([JsonEntityComponent(DecoratorTypes.PROP)], PropertyMetadata);
 
-GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider, {
-  onInvoke(provider, locals) {
-    locals.set(PlatformRouter, provider.getRouter());
-  }
-
-});
-
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
  *
@@ -2137,7 +2135,7 @@ let Platform = class Platform {
       provider
     });
 
-    this.app.use(ctrlPath, ...[].concat(provider.getRouter().callback()));
+    this.app.use(ctrlPath, ...[].concat(getRouter(injector, provider).callback()));
     this._routes = getOperationsRoutes(provider.token, {
       withChildren: true,
       basePath
@@ -2182,7 +2180,7 @@ let Platform = class Platform {
       injector
     } = this;
     injector.getProviders(ProviderType.CONTROLLER).map(provider => {
-      provider.setRouter(PlatformRouter.create(injector, provider.routerOptions));
+      createRouter(injector, provider);
     });
   }
   /**
@@ -2197,33 +2195,28 @@ let Platform = class Platform {
     } = this;
     injector.getProviders(ProviderType.CONTROLLER).map(provider => {
       if (!provider.hasParent()) {
-        return new PlatformControllerBuilder(provider).build(injector);
+        return buildRouter(injector, provider);
       }
     });
   }
 
 };
 Platform = __decorate([Injectable({
-  scope: ProviderScope.SINGLETON
+  scope: ProviderScope.SINGLETON,
+  imports: [PlatformMiddlewaresChain]
 }), __metadata("design:paramtypes", [InjectorService, PlatformApplication])], Platform);
 
 $log.name = "TSED";
 function createInjector(settings = {}) {
   const injector = new InjectorService();
-  injector.settings = createSettingsService(injector);
+  injector.addProvider(PlatformConfiguration);
+  injector.settings = injector.invoke(PlatformConfiguration);
   injector.logger = $log;
   injector.settings.set(settings);
   setLoggerLevel(injector);
   return injector;
 }
 
-function createSettingsService(injector) {
-  const provider = GlobalProviders.get(PlatformConfiguration).clone();
-  provider.instance = injector.invoke(provider.useClass);
-  injector.addProvider(PlatformConfiguration, provider);
-  return provider.instance;
-}
-
 function createPlatformApplication(injector) {
   injector.forkProvider(PlatformApplication);
 }
@@ -3413,5 +3406,5 @@ class PlatformTest extends DITest {
  */
 class PlatformModule {}
 
-export { AcceptMime, AcceptMimesMiddleware, AnyToPromiseWithCtx, ControllerProvider, EndpointFn, EndpointInfo, EndpointMetadata, Err, GlobalAcceptMimesMiddleware, HandlerMetadata, HandlerType, HttpServer, HttpsServer, MulterFileSize, MulterOptions, MultipartFile, Next, PLATFORM_ROUTER_OPTIONS, Platform, PlatformAcceptMimesMiddleware, PlatformApplication, PlatformBuilder, PlatformConfiguration, PlatformContext, PlatformControllerBuilder, PlatformHandler, PlatformModule, PlatformMulterMiddleware, PlatformRequest, PlatformResponse, PlatformRouteDetails, PlatformRouter, PlatformTest, PropertyMetadata, ROUTER_OPTIONS, Req, Request, Res, Response, ResponseData, bindEndpointMiddleware, createContext, createHttpServer, createHttpsServer, createInjector, createPlatformApplication, listenHttpServer, listenHttpsServer, listenServer, loadInjector, mapReturnedResponse, printRoutes, useCtxHandler };
+export { AcceptMime, AcceptMimesMiddleware, AnyToPromiseWithCtx, ControllerProvider, EndpointFn, EndpointInfo, EndpointMetadata, Err, GlobalAcceptMimesMiddleware, HandlerMetadata, HandlerType, HttpServer, HttpsServer, MulterFileSize, MulterOptions, MultipartFile, Next, PLATFORM_ROUTER_OPTIONS, Platform, PlatformAcceptMimesMiddleware, PlatformApplication, PlatformBuilder, PlatformConfiguration, PlatformContext, PlatformHandler, PlatformMiddlewaresChain, PlatformModule, PlatformMulterMiddleware, PlatformRequest, PlatformResponse, PlatformRouteDetails, PlatformRouter, PlatformTest, PropertyMetadata, ROUTER_OPTIONS, Req, Request, Res, Response, ResponseData, bindEndpointMiddleware, buildRouter, createContext, createHttpServer, createHttpsServer, createInjector, createPlatformApplication, createRouter, getRouter, listenHttpServer, listenHttpsServer, listenServer, loadInjector, mapReturnedResponse, printRoutes, useCtxHandler };
 //# sourceMappingURL=index.modern.js.map