@tsed/common 6.87.1 → 6.87.2

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, Provider, ProviderType, GlobalProviders, Scope, DIContext, setLoggerLevel, registerProvider, Configuration, createContainer, colors, DITest } from '@tsed/di';
+import { DIConfiguration, Injectable, ProviderScope, Inject, InjectorService, Constant, Provider, ProviderType, GlobalProviders, Scope, DIContext, registerProvider, Configuration, setLoggerLevel, 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';
@@ -17,13 +17,13 @@ import { importProviders } from '@tsed/components-scan';
 export * from '@tsed/components-scan';
 export * from '@tsed/platform-log-middleware';
 import { __decorate, __metadata, __param } from 'tslib';
-import { AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, Env, toMap, StoreMerge, Metadata, useDecorators, useMethodDecorators, StoreSet, isClass } from '@tsed/core';
+import { AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, toMap, getValue, Env, StoreMerge, Metadata, useDecorators, useMethodDecorators, StoreSet, isClass } from '@tsed/core';
 import { Exception, NotAcceptable } from '@tsed/exceptions';
 import { JsonParameterStore, JsonMethodStore, JsonEntityStore, JsonEntityComponent, getOperationsRoutes, OperationMethods, JsonOperationRoute, JsonPropertyStore, getProperties, concatPath, Returns, Consumes, Produces, JsonEntityFn } from '@tsed/schema';
 export { All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect } from '@tsed/schema';
 import { promisify } from 'util';
-import Http, { ServerResponse, IncomingMessage } from 'http';
 import Https from 'https';
+import Http, { ServerResponse, IncomingMessage } from 'http';
 
 function _extends() {
   _extends = Object.assign || function (target) {
@@ -2206,36 +2206,21 @@ Platform = __decorate([Injectable({
   imports: [PlatformMiddlewaresChain]
 }), __metadata("design:paramtypes", [InjectorService, PlatformApplication])], Platform);
 
-$log.name = "TSED";
-function createInjector(settings = {}) {
-  const injector = new InjectorService();
-  injector.addProvider(PlatformConfiguration);
-  injector.settings = injector.invoke(PlatformConfiguration);
-  injector.logger = $log;
-  injector.settings.set(settings);
-  setLoggerLevel(injector);
-  return injector;
-}
-
-function createPlatformApplication(injector) {
-  injector.forkProvider(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
@@ -2244,8 +2229,8 @@ function createPlatformApplication(injector) {
  * @decorator
  */
 
-function HttpServer(target, targetKey, descriptor) {
-  return Inject(HttpServer)(target, targetKey, descriptor);
+function HttpsServer(target, targetKey, descriptor) {
+  return Inject(HttpsServer)(target, targetKey, descriptor);
 }
 
 function listenServer(http, settings) {
@@ -2267,56 +2252,57 @@ function listenServer(http, settings) {
   return promise;
 }
 
-function createHttpServer(injector) {
-  injector.forkProvider(HttpServer);
+function createHttpsServer(injector) {
+  injector.invoke(HttpsServer);
 }
 registerProvider({
-  provide: HttpServer,
-  deps: [PlatformApplication],
+  provide: HttpsServer,
+  deps: [PlatformApplication, Configuration],
   scope: ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication) {
-    return Http.createServer(platformApplication.callback());
+  useFactory(platformApplication, settings) {
+    const options = settings.httpsOptions;
+    return Https.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
@@ -2325,46 +2311,79 @@ async function listenHttpServer(injector) {
  * @decorator
  */
 
-function HttpsServer(target, targetKey, descriptor) {
-  return Inject(HttpsServer)(target, targetKey, descriptor);
+function HttpServer(target, targetKey, descriptor) {
+  return Inject(HttpServer)(target, targetKey, descriptor);
 }
 
-function createHttpsServer(injector) {
-  injector.forkProvider(HttpsServer);
+function createHttpServer(injector) {
+  injector.invoke(HttpServer);
 }
 registerProvider({
-  provide: HttpsServer,
-  deps: [PlatformApplication, Configuration],
+  provide: HttpServer,
+  deps: [PlatformApplication],
   scope: ProviderScope.SINGLETON,
   global: true,
 
-  useFactory(platformApplication, settings) {
-    const options = settings.httpsOptions;
-    return Https.createServer(options, platformApplication.callback());
+  useFactory(platformApplication) {
+    return Http.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}`);
   }
 }
 
+$log.name = "TSED";
+const DEFAULT_PROVIDERS = [{
+  provide: PlatformHandler
+}, {
+  provide: PlatformResponse
+}, {
+  provide: PlatformRequest
+}, {
+  provide: PlatformRouter
+}, {
+  provide: PlatformApplication
+}, {
+  provide: Platform
+}];
+function createInjector({
+  providers = [],
+  settings = {}
+}) {
+  const injector = new InjectorService();
+  injector.addProvider(PlatformConfiguration);
+  injector.settings = injector.invoke(PlatformConfiguration);
+  injector.logger = $log;
+  injector.settings.set(settings);
+  setLoggerLevel(injector);
+  providers = [...DEFAULT_PROVIDERS, ...providers];
+  toMap(providers, "provide").forEach((provider, token) => {
+    injector.addProvider(token, provider);
+  });
+  injector.invoke(PlatformApplication);
+  createHttpsServer(injector);
+  createHttpServer(injector);
+  return injector;
+}
+
 /**
  * @ignore
  * @deprecated User injector.load(container, module) instead
@@ -2505,19 +2524,6 @@ function getConfiguration(configuration = {}, module = null) {
   return config;
 }
 
-const DEFAULT_PROVIDERS = [{
-  provide: PlatformHandler
-}, {
-  provide: PlatformResponse
-}, {
-  provide: PlatformRequest
-}, {
-  provide: PlatformRouter
-}, {
-  provide: PlatformApplication
-}, {
-  provide: Platform
-}];
 /**
  * @platform
  */
@@ -2546,7 +2552,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() {
@@ -2825,20 +2837,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];
-    toMap(providers, "provide").forEach((provider, token) => {
-      this.injector.addProvider(token, provider);
-    });
-    createPlatformApplication(this.injector);
-    createHttpsServer(this.injector);
-    createHttpServer(this.injector);
-    this.log("Injector created...");
-  }
-
 }
 
 /**
@@ -3211,8 +3209,8 @@ function mapReturnedResponse(_ref) {
  */
 
 class PlatformTest extends DITest {
-  static async create(options = {}) {
-    DITest.injector = PlatformTest.createInjector(getConfiguration(options, null));
+  static async create(settings = {}) {
+    DITest.injector = PlatformTest.createInjector(getConfiguration(settings));
     const container = createContainer();
     await DITest.injector.load(container);
   }
@@ -3222,7 +3220,10 @@ class PlatformTest extends DITest {
 
 
   static createInjector(settings = {}) {
-    return createInjector(DITest.configure(settings));
+    return createInjector({
+      providers: [],
+      settings: DITest.configure(settings)
+    });
   }
   /**
    * Load the server silently without listening port and configure it on test profile.
@@ -3406,5 +3407,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, 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 };
+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, createRouter, getRouter, listenHttpServer, listenHttpsServer, listenServer, loadInjector, mapReturnedResponse, printRoutes, useCtxHandler };
 //# sourceMappingURL=index.modern.js.map