@tsed/common 6.86.1 → 6.87.2

package/lib/index.js

@@ -14,8 +14,8 @@ var core = require('@tsed/core');
 var exceptions = require('@tsed/exceptions');
 var schema = require('@tsed/schema');
 var util = require('util');
-var Http = require('http');
 var Https = require('https');
+var Http = require('http');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -39,8 +39,8 @@ function _interopNamespace(e) {
   return n;
 }
 
-var Http__default = /*#__PURE__*/_interopDefaultLegacy(Http);
 var Https__default = /*#__PURE__*/_interopDefaultLegacy(Https);
+var Http__default = /*#__PURE__*/_interopDefaultLegacy(Http);
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -986,6 +986,7 @@ const PLATFORM_ROUTER_OPTIONS = Symbol.for("PlatformRouterOptions");
 exports.PlatformRouter = PlatformRouter_1 = class PlatformRouter {
   constructor(platformHandler) {
     this.platformHandler = platformHandler;
+    this.isBuilt = false;
     this.rawRouter = this.raw = PlatformRouter_1.createRawRouter();
   }
   /**
@@ -1292,72 +1293,77 @@ tslib.__decorate([tslib.__param(0, platformParams.Context()), tslib.__metadata("
 
 exports.AcceptMimesMiddleware = tslib.__decorate([platformMiddlewares.Middleware()], exports.AcceptMimesMiddleware);
 
-/**
- * Create Ts.ED context handler
- * @param fn
- * @ignore
- */
+const ROUTER_OPTIONS = Symbol.for("ROUTER_OPTIONS");
 
-function useCtxHandler(fn) {
-  fn.type = exports.HandlerType.CTX_FN;
-  return fn;
-}
+let AUTO_INC = 0;
+class ControllerProvider extends di.Provider {
+  constructor(provide, options = {}) {
+    super(provide, options);
+    this.type = di.ProviderType.CONTROLLER;
+    this.tokenRouter = `${this.name}_ROUTER_${AUTO_INC++}`;
+  }
+  /**
+   *
+   */
 
-/**
- * @ignore
- */
 
-function formatMethod(method) {
-  return (method === schema.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() {
-    schema.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 = exports.HandlerType.CTX_FN;
+  return fn;
+}
+
+exports.PlatformMiddlewaresChain = class PlatformMiddlewaresChain {
+  get(provider, operationRoute) {
     const {
       endpoint
     } = operationRoute;
@@ -1371,11 +1377,10 @@ class PlatformControllerBuilder {
         use,
         useAfter
       }
-    } = this.provider;
+    } = provider;
     const hasFiles = [...operationRoute.endpoint.children.values()].find(item => item.paramType === platformParams.ParamTypes.FILES);
     return [].concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(exports.PlatformAcceptMimesMiddleware).concat(hasFiles && exports.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
@@ -1383,32 +1388,97 @@ class PlatformControllerBuilder {
     .filter(item => !!item);
   }
 
-  buildChildrenCtrls(injector) {
-    const {
-      children
-    } = this.provider;
-    const router = this.provider.getRouter();
+};
+exports.PlatformMiddlewaresChain = tslib.__decorate([di.Injectable()], exports.PlatformMiddlewaresChain);
+
+di.GlobalProviders.createRegistry(di.ProviderType.CONTROLLER, ControllerProvider, {
+  onInvoke(provider, locals, {
+    injector
+  }) {
+    const router = createRouter(injector, provider);
+    locals.set(exports.PlatformRouter, router);
+  }
+
+});
+/**
+ * @ignore
+ */
+
+function formatMethod(method) {
+  return (method === schema.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 = exports.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(exports.PlatformMiddlewaresChain);
+    useBefore // Controller before-middleware
+    .filter(o => typeof o === "function").forEach(middleware => {
+      router.use(middleware);
+    }); // build all endpoints and his middlewares
+
+    schema.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;
 }
 
 /**
@@ -2005,71 +2075,6 @@ class PlatformRouteDetails extends schema.JsonOperationRoute {
 
 }
 
-const ROUTER_OPTIONS = Symbol.for("ROUTER_OPTIONS");
-
-class ControllerProvider extends di.Provider {
-  constructor(provide, options = {}) {
-    super(provide, options);
-    this.type = di.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
  */
@@ -2093,13 +2098,6 @@ exports.PropertyMetadata = class PropertyMetadata extends schema.JsonPropertySto
 };
 exports.PropertyMetadata = tslib.__decorate([schema.JsonEntityComponent(core.DecoratorTypes.PROP)], exports.PropertyMetadata);
 
-di.GlobalProviders.createRegistry(di.ProviderType.CONTROLLER, ControllerProvider, {
-  onInvoke(provider, locals) {
-    locals.set(exports.PlatformRouter, provider.getRouter());
-  }
-
-});
-
 /**
  * `Platform` is used to provide all routes collected by annotation `@Controller`.
  *
@@ -2146,7 +2144,7 @@ exports.Platform = class Platform {
       provider
     });
 
-    this.app.use(ctrlPath, ...[].concat(provider.getRouter().callback()));
+    this.app.use(ctrlPath, ...[].concat(getRouter(injector, provider).callback()));
     this._routes = schema.getOperationsRoutes(provider.token, {
       withChildren: true,
       basePath
@@ -2191,7 +2189,7 @@ exports.Platform = class Platform {
       injector
     } = this;
     injector.getProviders(di.ProviderType.CONTROLLER).map(provider => {
-      provider.setRouter(exports.PlatformRouter.create(injector, provider.routerOptions));
+      createRouter(injector, provider);
     });
   }
   /**
@@ -2206,52 +2204,32 @@ exports.Platform = class Platform {
     } = this;
     injector.getProviders(di.ProviderType.CONTROLLER).map(provider => {
       if (!provider.hasParent()) {
-        return new PlatformControllerBuilder(provider).build(injector);
+        return buildRouter(injector, provider);
       }
     });
   }
 
 };
 exports.Platform = tslib.__decorate([di.Injectable({
-  scope: di.ProviderScope.SINGLETON
+  scope: di.ProviderScope.SINGLETON,
+  imports: [exports.PlatformMiddlewaresChain]
 }), tslib.__metadata("design:paramtypes", [di.InjectorService, exports.PlatformApplication])], exports.Platform);
 
-logger.$log.name = "TSED";
-function createInjector(settings = {}) {
-  const injector = new di.InjectorService();
-  injector.settings = createSettingsService(injector);
-  injector.logger = logger.$log;
-  injector.settings.set(settings);
-  di.setLoggerLevel(injector);
-  return injector;
-}
-
-function createSettingsService(injector) {
-  const provider = di.GlobalProviders.get(exports.PlatformConfiguration).clone();
-  provider.instance = injector.invoke(provider.useClass);
-  injector.addProvider(exports.PlatformConfiguration, provider);
-  return provider.instance;
-}
-
-function createPlatformApplication(injector) {
-  injector.forkProvider(exports.PlatformApplication);
-}
-
 /**
- * Inject the Http.Server instance.
+ * Inject the Https.Server instance.
  *
  * ### Example
  *
  * ```typescript
- * import {HttpServer, Service} from "@tsed/common";
+ * import {HttpsServer, Service} from "@tsed/common";
  *
  * @Service()
  * export default class OtherService {
- *    constructor(@HttpServer httpServer: HttpServer) {}
+ *    constructor(@HttpsServer httpServer: HttpServer) {}
  * }
  * ```
  *
- * > Note: TypeScript transform and store `HttpServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
+ * > Note: TypeScript transform and store `HttpsServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
  *
  * @param {Type<any>} target
  * @param {string} targetKey
@@ -2260,8 +2238,8 @@ function createPlatformApplication(injector) {
  * @decorator
  */
 
-function HttpServer(target, targetKey, descriptor) {
-  return di.Inject(HttpServer)(target, targetKey, descriptor);
+function HttpsServer(target, targetKey, descriptor) {
+  return di.Inject(HttpsServer)(target, targetKey, descriptor);
 }
 
 function listenServer(http, settings) {
@@ -2283,56 +2261,57 @@ function listenServer(http, settings) {
   return promise;
 }
 
-function createHttpServer(injector) {
-  injector.forkProvider(HttpServer);
+function createHttpsServer(injector) {
+  injector.invoke(HttpsServer);
 }
 di.registerProvider({
-  provide: HttpServer,
-  deps: [exports.PlatformApplication],
+  provide: HttpsServer,
+  deps: [exports.PlatformApplication, di.Configuration],
   scope: di.ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication) {
-    return Http__default['default'].createServer(platformApplication.callback());
+  useFactory(platformApplication, settings) {
+    const options = settings.httpsOptions;
+    return Https__default['default'].createServer(options, platformApplication.callback());
   }
 
 });
-async function listenHttpServer(injector) {
+async function listenHttpsServer(injector) {
   const {
     settings
   } = injector;
-  const server = injector.get(HttpServer);
+  const server = injector.get(HttpsServer);
 
-  if (settings.httpPort !== false && server) {
+  if (settings.httpsPort !== false && server) {
     const {
       address,
       port
-    } = settings.getHttpPort();
-    injector.logger.debug(`Start server on http://${address}:${port}`);
+    } = settings.getHttpsPort();
+    injector.logger.debug(`Start server on https://${address}:${port}`);
     const options = await listenServer(server, {
       address,
       port
     });
-    settings.setHttpPort(options);
-    injector.logger.info(`Listen server on http://${options.address}:${options.port}`);
+    settings.setHttpsPort(options);
+    injector.logger.info(`Listen server on https://${options.address}:${options.port}`);
   }
 }
 
 /**
- * Inject the Https.Server instance.
+ * Inject the Http.Server instance.
  *
  * ### Example
  *
  * ```typescript
- * import {HttpsServer, Service} from "@tsed/common";
+ * import {HttpServer, Service} from "@tsed/common";
  *
  * @Service()
  * export default class OtherService {
- *    constructor(@HttpsServer httpServer: HttpServer) {}
+ *    constructor(@HttpServer httpServer: HttpServer) {}
  * }
  * ```
  *
- * > Note: TypeScript transform and store `HttpsServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
+ * > Note: TypeScript transform and store `HttpServer` as `Function` type in the metadata. So to inject a factory, you must use the `@Inject(type)` decorator.
  *
  * @param {Type<any>} target
  * @param {string} targetKey
@@ -2341,46 +2320,79 @@ async function listenHttpServer(injector) {
  * @decorator
  */
 
-function HttpsServer(target, targetKey, descriptor) {
-  return di.Inject(HttpsServer)(target, targetKey, descriptor);
+function HttpServer(target, targetKey, descriptor) {
+  return di.Inject(HttpServer)(target, targetKey, descriptor);
 }
 
-function createHttpsServer(injector) {
-  injector.forkProvider(HttpsServer);
+function createHttpServer(injector) {
+  injector.invoke(HttpServer);
 }
 di.registerProvider({
-  provide: HttpsServer,
-  deps: [exports.PlatformApplication, di.Configuration],
+  provide: HttpServer,
+  deps: [exports.PlatformApplication],
   scope: di.ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication, settings) {
-    const options = settings.httpsOptions;
-    return Https__default['default'].createServer(options, platformApplication.callback());
+  useFactory(platformApplication) {
+    return Http__default['default'].createServer(platformApplication.callback());
   }
 
 });
-async function listenHttpsServer(injector) {
+async function listenHttpServer(injector) {
   const {
     settings
   } = injector;
-  const server = injector.get(HttpsServer);
+  const server = injector.get(HttpServer);
 
-  if (settings.httpsPort !== false && server) {
+  if (settings.httpPort !== false && server) {
     const {
       address,
       port
-    } = settings.getHttpsPort();
-    injector.logger.debug(`Start server on https://${address}:${port}`);
+    } = settings.getHttpPort();
+    injector.logger.debug(`Start server on http://${address}:${port}`);
     const options = await listenServer(server, {
       address,
       port
     });
-    settings.setHttpsPort(options);
-    injector.logger.info(`Listen server on https://${options.address}:${options.port}`);
+    settings.setHttpPort(options);
+    injector.logger.info(`Listen server on http://${options.address}:${options.port}`);
   }
 }
 
+logger.$log.name = "TSED";
+const DEFAULT_PROVIDERS = [{
+  provide: exports.PlatformHandler
+}, {
+  provide: exports.PlatformResponse
+}, {
+  provide: exports.PlatformRequest
+}, {
+  provide: exports.PlatformRouter
+}, {
+  provide: exports.PlatformApplication
+}, {
+  provide: exports.Platform
+}];
+function createInjector({
+  providers = [],
+  settings = {}
+}) {
+  const injector = new di.InjectorService();
+  injector.addProvider(exports.PlatformConfiguration);
+  injector.settings = injector.invoke(exports.PlatformConfiguration);
+  injector.logger = logger.$log;
+  injector.settings.set(settings);
+  di.setLoggerLevel(injector);
+  providers = [...DEFAULT_PROVIDERS, ...providers];
+  core.toMap(providers, "provide").forEach((provider, token) => {
+    injector.addProvider(token, provider);
+  });
+  injector.invoke(exports.PlatformApplication);
+  createHttpsServer(injector);
+  createHttpServer(injector);
+  return injector;
+}
+
 /**
  * @ignore
  * @deprecated User injector.load(container, module) instead
@@ -2521,19 +2533,6 @@ function getConfiguration(configuration = {}, module = null) {
   return config;
 }
 
-const DEFAULT_PROVIDERS = [{
-  provide: exports.PlatformHandler
-}, {
-  provide: exports.PlatformResponse
-}, {
-  provide: exports.PlatformRequest
-}, {
-  provide: exports.PlatformRouter
-}, {
-  provide: exports.PlatformApplication
-}, {
-  provide: exports.Platform
-}];
 /**
  * @platform
  */
@@ -2562,7 +2561,13 @@ class PlatformBuilder {
     this.current = new Date();
     this.name = name;
     _classPrivateFieldLooseBase(this, _rootModule)[_rootModule] = module;
-    this.createInjector(module, providers, settings);
+    const configuration = getConfiguration(settings, module);
+    configuration.PLATFORM_NAME = name;
+    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector({
+      settings: configuration,
+      providers
+    });
+    this.log("Injector created...");
   }
 
   get injector() {
@@ -2841,20 +2846,6 @@ class PlatformBuilder {
     await this.callHook("$afterRoutesInit");
   }
 
-  createInjector(module, providers, settings) {
-    const configuration = getConfiguration(settings, module);
-    configuration.PLATFORM_NAME = this.name;
-    _classPrivateFieldLooseBase(this, _injector)[_injector] = createInjector(configuration);
-    providers = [...DEFAULT_PROVIDERS, ...providers];
-    core.toMap(providers, "provide").forEach((provider, token) => {
-      this.injector.addProvider(token, provider);
-    });
-    createPlatformApplication(this.injector);
-    createHttpsServer(this.injector);
-    createHttpServer(this.injector);
-    this.log("Injector created...");
-  }
-
 }
 
 /**
@@ -3227,8 +3218,8 @@ function mapReturnedResponse(_ref) {
  */
 
 class PlatformTest extends di.DITest {
-  static async create(options = {}) {
-    di.DITest.injector = PlatformTest.createInjector(getConfiguration(options, null));
+  static async create(settings = {}) {
+    di.DITest.injector = PlatformTest.createInjector(getConfiguration(settings));
     const container = di.createContainer();
     await di.DITest.injector.load(container);
   }
@@ -3238,7 +3229,10 @@ class PlatformTest extends di.DITest {
 
 
   static createInjector(settings = {}) {
-    return createInjector(di.DITest.configure(settings));
+    return createInjector({
+      providers: [],
+      settings: di.DITest.configure(settings)
+    });
   }
   /**
    * Load the server silently without listening port and configure it on test profile.
@@ -3510,7 +3504,6 @@ exports.Next = Next;
 exports.PLATFORM_ROUTER_OPTIONS = PLATFORM_ROUTER_OPTIONS;
 exports.PlatformBuilder = PlatformBuilder;
 exports.PlatformContext = PlatformContext;
-exports.PlatformControllerBuilder = PlatformControllerBuilder;
 exports.PlatformModule = PlatformModule;
 exports.PlatformRouteDetails = PlatformRouteDetails;
 exports.PlatformTest = PlatformTest;
@@ -3521,11 +3514,13 @@ exports.Res = Res;
 exports.Response = Response;
 exports.ResponseData = ResponseData;
 exports.bindEndpointMiddleware = bindEndpointMiddleware;
+exports.buildRouter = buildRouter;
 exports.createContext = createContext;
 exports.createHttpServer = createHttpServer;
 exports.createHttpsServer = createHttpsServer;
 exports.createInjector = createInjector;
-exports.createPlatformApplication = createPlatformApplication;
+exports.createRouter = createRouter;
+exports.getRouter = getRouter;
 exports.listenHttpServer = listenHttpServer;
 exports.listenHttpsServer = listenHttpsServer;
 exports.listenServer = listenServer;