@tsed/common 6.87.0 → 6.88.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, 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';
@@ -11,19 +11,17 @@ export * from '@tsed/platform-response-filter';
 export * from '@tsed/platform-cache';
 import { Middleware, getMiddlewaresForHook } from '@tsed/platform-middlewares';
 export * from '@tsed/platform-middlewares';
-import { PlatformViews } from '@tsed/platform-views';
-export * from '@tsed/platform-views';
 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) {
@@ -1480,7 +1478,8 @@ function buildRouter(injector, provider) {
 let PlatformRequest = class PlatformRequest {
   constructor({
     request
-  }) {
+  }, $ctx) {
+    this.$ctx = $ctx;
     this.raw = request;
   }
 
@@ -1611,7 +1610,9 @@ let PlatformRequest = class PlatformRequest {
     // @ts-ignore
     delete this.raw; // @ts-ignore
 
-    delete this.response;
+    delete this.response; // @ts-ignore
+
+    delete this.$ctx;
   }
   /**
    * Return the Framework response object (express, koa, etc...)
@@ -1631,7 +1632,7 @@ let PlatformRequest = class PlatformRequest {
   }
 
 };
-PlatformRequest = __decorate([Injectable(), Scope(ProviderScope.INSTANCE), __metadata("design:paramtypes", [Object])], PlatformRequest);
+PlatformRequest = __decorate([Injectable(), Scope(ProviderScope.INSTANCE), __metadata("design:paramtypes", [Object, Function])], PlatformRequest);
 
 var PlatformResponse_1;
 
@@ -1645,7 +1646,8 @@ const onFinished = require("on-finished");
 let PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   constructor({
     response
-  }) {
+  }, $ctx) {
+    this.$ctx = $ctx;
     this.raw = response;
   }
   /**
@@ -1862,7 +1864,11 @@ let PlatformResponse = PlatformResponse_1 = class PlatformResponse {
 
 
   async render(path, options = {}) {
-    return this.platformViews.render(path, _extends({}, this.locals, options));
+    const {
+      PlatformViews
+    } = await import('@tsed/platform-views');
+    const platformViews = await this.$ctx.injector.lazyInvoke(PlatformViews);
+    return platformViews.render(path, _extends({}, this.locals, options));
   }
   /**
    * Send any data to your consumer.
@@ -1934,7 +1940,9 @@ let PlatformResponse = PlatformResponse_1 = class PlatformResponse {
     delete this.raw;
     delete this.data; // @ts-ignore
 
-    delete this.request;
+    delete this.request; // @ts-ignore
+
+    delete this.$ctx;
   }
 
   isHeadersSent() {
@@ -1942,7 +1950,7 @@ let PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   }
 
 };
-PlatformResponse = PlatformResponse_1 = __decorate([Injectable(), Scope(ProviderScope.INSTANCE), __metadata("design:paramtypes", [Object])], PlatformResponse);
+PlatformResponse = PlatformResponse_1 = __decorate([Injectable(), Scope(ProviderScope.INSTANCE), __metadata("design:paramtypes", [Object, Function])], PlatformResponse);
 
 const _excluded$2 = ["event", "endpoint", "ignoreUrlPatterns", "ResponseKlass", "RequestKlass"];
 class PlatformContext extends DIContext {
@@ -1964,8 +1972,8 @@ class PlatformContext extends DIContext {
     this.ignoreUrlPatterns = [];
     endpoint && (this.endpoint = endpoint);
     this.ignoreUrlPatterns = ignoreUrlPatterns.map(pattern => typeof pattern === "string" ? new RegExp(pattern, "gi") : pattern);
-    this.response = new ResponseKlass(event);
-    this.request = new RequestKlass(event);
+    this.response = new ResponseKlass(event, this);
+    this.request = new RequestKlass(event, this);
     this.response.request = this.request;
     this.request.response = this.response;
     this.request.request.$ctx = this;
@@ -2206,42 +2214,21 @@ Platform = __decorate([Injectable({
   imports: [PlatformMiddlewaresChain]
 }), __metadata("design:paramtypes", [InjectorService, PlatformApplication])], Platform);
 
-$log.name = "TSED";
-function createInjector(settings = {}) {
-  const injector = new InjectorService();
-  injector.settings = createSettingsService(injector);
-  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);
-}
-
 /**
- * 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
@@ -2250,8 +2237,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) {
@@ -2273,56 +2260,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
@@ -2331,46 +2319,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
@@ -2429,7 +2450,6 @@ function createContext(injector) {
 
   const ResponseKlass = (_injector$getProvider = injector.getProvider(PlatformResponse)) == null ? void 0 : _injector$getProvider.useClass;
   const RequestKlass = (_injector$getProvider2 = injector.getProvider(PlatformRequest)) == null ? void 0 : _injector$getProvider2.useClass;
-  const platformViews = injector.get(PlatformViews);
 
   const _ref = injector.settings.logger || {},
         {
@@ -2447,7 +2467,6 @@ function createContext(injector) {
       ResponseKlass,
       RequestKlass
     }));
-    ctx.response.platformViews = platformViews;
     ctx.response.onEnd(async () => {
       await ctx.emit("$onResponse", ctx);
       await ctx.destroy();
@@ -2511,19 +2530,6 @@ function getConfiguration(configuration = {}, module = null) {
   return config;
 }
 
-const DEFAULT_PROVIDERS = [{
-  provide: PlatformHandler
-}, {
-  provide: PlatformResponse
-}, {
-  provide: PlatformRequest
-}, {
-  provide: PlatformRouter
-}, {
-  provide: PlatformApplication
-}, {
-  provide: Platform
-}];
 /**
  * @platform
  */
@@ -2552,7 +2558,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() {
@@ -2831,20 +2843,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...");
-  }
-
 }
 
 /**
@@ -3035,6 +3033,39 @@ function EndpointFn(fn) {
   return JsonEntityFn(fn);
 }
 
+/**
+ * Use a view and sends the rendered HTML string to the client. Optional parameter:
+ *
+ * * viewOptions, an object whose properties define local variables for the view.
+ *
+ * The view argument is a string that is the file path of the view file to render.
+ * This can be an absolute path, or a path relative to the views setting.
+ * If the path does not contain a file extension, then the view engine setting determines the file extension.
+ * If the path does contain a file extension, then Express will load the module for the specified template engine (via require())
+ * and render it using the loaded module’s __express function.
+ *
+ * For more information, see [Using template engines with Express](http://expressjs.com/guide/using-template-engines.html).
+ *
+ * > NOTE: The view argument performs file system operations like reading a file from disk and evaluating Node.js modules,
+ * and as so for security reasons should not contain input from the end-user.
+ *
+ * @param path Relative path to the view file.
+ * @param options Additional options
+ * @decorator
+ * @operation
+ * @response
+ * @ignores
+ * @deprecated Use View decorator from @tsed/platform-views instead.
+ */
+// istanbul ignore next
+
+function View(path, options) {
+  return StoreSet("view", {
+    path,
+    options
+  });
+}
+
 /**
  * Return the current response data. Prefer the @@Context@@ decorator to get or set data.
  *
@@ -3217,8 +3248,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);
   }
@@ -3228,7 +3259,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.
@@ -3392,7 +3426,7 @@ class PlatformTest extends DITest {
       request: (options == null ? void 0 : (_options$request = options.request) == null ? void 0 : _options$request.request) || (options == null ? void 0 : (_options$event = options.event) == null ? void 0 : _options$event.request) || PlatformTest.createRequest(),
       response: (options == null ? void 0 : (_options$response = options.response) == null ? void 0 : _options$response.response) || (options == null ? void 0 : (_options$event2 = options.event) == null ? void 0 : _options$event2.response) || PlatformTest.createResponse()
     };
-    const ctx = new PlatformContext(_extends({
+    return new PlatformContext(_extends({
       id: "id",
       injector: DITest.injector,
       logger: DITest.injector.logger,
@@ -3400,8 +3434,6 @@ class PlatformTest extends DITest {
     }, options, {
       event
     }));
-    ctx.response.platformViews = PlatformTest.get(PlatformViews);
-    return ctx;
   }
 
 }
@@ -3412,5 +3444,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, View, bindEndpointMiddleware, buildRouter, createContext, createHttpServer, createHttpsServer, createInjector, createRouter, getRouter, listenHttpServer, listenHttpsServer, listenServer, loadInjector, mapReturnedResponse, printRoutes, useCtxHandler };
 //# sourceMappingURL=index.modern.js.map