@tsed/common 6.87.0 → 6.88.1

package/lib/builder/PlatformBuilder.d.ts

@@ -113,5 +113,4 @@ export declare abstract class PlatformBuilder<App = TsED.Application, Router = T
     protected listenServers(): Promise<void>;
     protected logRoutes(): Promise<void>;
     protected loadRoutes(): Promise<void>;
-    protected createInjector(module: Type<any>, providers: IProvider[], settings: any): void;
 }

package/lib/decorators/index.d.ts

@@ -6,6 +6,7 @@ export * from "./method/acceptMime";
 export * from "./method/location";
 export * from "./method/redirect";
 export * from "./method/endpointFn";
+export * from "./method/view";
 export * from "./params/responseData";
 export * from "./params/response";
 export * from "./params/request";

package/lib/decorators/method/view.d.ts

@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+export declare function View(path: string, options?: Object): MethodDecorator;

package/lib/index.d.ts

@@ -6,7 +6,6 @@ export * from "@tsed/platform-exceptions";
 export * from "@tsed/platform-response-filter";
 export * from "@tsed/platform-cache";
 export * from "@tsed/platform-middlewares";
-export * from "@tsed/platform-views";
 export * from "@tsed/components-scan";
 export * from "@tsed/platform-log-middleware";
 export { $log, Logger } from "@tsed/logger";

package/lib/index.js

@@ -6,7 +6,6 @@ var platformExceptions = require('@tsed/platform-exceptions');
 var platformResponseFilter = require('@tsed/platform-response-filter');
 var platformCache = require('@tsed/platform-cache');
 var platformMiddlewares = require('@tsed/platform-middlewares');
-var platformViews = require('@tsed/platform-views');
 var componentsScan = require('@tsed/components-scan');
 var platformLogMiddleware = require('@tsed/platform-log-middleware');
 var tslib = require('tslib');
@@ -14,8 +13,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 +38,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) {
@@ -1489,7 +1488,8 @@ function buildRouter(injector, provider) {
 exports.PlatformRequest = class PlatformRequest {
   constructor({
     request
-  }) {
+  }, $ctx) {
+    this.$ctx = $ctx;
     this.raw = request;
   }
 
@@ -1620,7 +1620,9 @@ exports.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...)
@@ -1640,7 +1642,7 @@ exports.PlatformRequest = class PlatformRequest {
   }
 
 };
-exports.PlatformRequest = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformRequest);
+exports.PlatformRequest = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object, Function])], exports.PlatformRequest);
 
 var PlatformResponse_1;
 
@@ -1654,7 +1656,8 @@ const onFinished = require("on-finished");
 exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   constructor({
     response
-  }) {
+  }, $ctx) {
+    this.$ctx = $ctx;
     this.raw = response;
   }
   /**
@@ -1871,7 +1874,11 @@ exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
 
 
   async render(path, options = {}) {
-    return this.platformViews.render(path, _extends({}, this.locals, options));
+    const {
+      PlatformViews
+    } = await Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require('@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.
@@ -1943,7 +1950,9 @@ exports.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() {
@@ -1951,7 +1960,7 @@ exports.PlatformResponse = PlatformResponse_1 = class PlatformResponse {
   }
 
 };
-exports.PlatformResponse = PlatformResponse_1 = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object])], exports.PlatformResponse);
+exports.PlatformResponse = PlatformResponse_1 = tslib.__decorate([di.Injectable(), di.Scope(di.ProviderScope.INSTANCE), tslib.__metadata("design:paramtypes", [Object, Function])], exports.PlatformResponse);
 
 const _excluded$2 = ["event", "endpoint", "ignoreUrlPatterns", "ResponseKlass", "RequestKlass"];
 class PlatformContext extends di.DIContext {
@@ -1973,8 +1982,8 @@ class PlatformContext extends di.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;
@@ -2215,42 +2224,21 @@ exports.Platform = tslib.__decorate([di.Injectable({
   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
@@ -2259,8 +2247,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) {
@@ -2282,56 +2270,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
@@ -2340,46 +2329,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
@@ -2438,7 +2460,6 @@ function createContext(injector) {
 
   const ResponseKlass = (_injector$getProvider = injector.getProvider(exports.PlatformResponse)) == null ? void 0 : _injector$getProvider.useClass;
   const RequestKlass = (_injector$getProvider2 = injector.getProvider(exports.PlatformRequest)) == null ? void 0 : _injector$getProvider2.useClass;
-  const platformViews$1 = injector.get(platformViews.PlatformViews);
 
   const _ref = injector.settings.logger || {},
         {
@@ -2456,7 +2477,6 @@ function createContext(injector) {
       ResponseKlass,
       RequestKlass
     }));
-    ctx.response.platformViews = platformViews$1;
     ctx.response.onEnd(async () => {
       await ctx.emit("$onResponse", ctx);
       await ctx.destroy();
@@ -2520,19 +2540,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
  */
@@ -2561,7 +2568,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() {
@@ -2840,20 +2853,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...");
-  }
-
 }
 
 /**
@@ -3044,6 +3043,39 @@ function EndpointFn(fn) {
   return schema.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 core.StoreSet("view", {
+    path,
+    options
+  });
+}
+
 /**
  * Return the current response data. Prefer the @@Context@@ decorator to get or set data.
  *
@@ -3226,8 +3258,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);
   }
@@ -3237,7 +3269,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.
@@ -3401,7 +3436,7 @@ class PlatformTest extends di.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: di.DITest.injector,
       logger: di.DITest.injector.logger,
@@ -3409,8 +3444,6 @@ class PlatformTest extends di.DITest {
     }, options, {
       event
     }));
-    ctx.response.platformViews = PlatformTest.get(platformViews.PlatformViews);
-    return ctx;
   }
 
 }
@@ -3518,13 +3551,13 @@ exports.Request = Request;
 exports.Res = Res;
 exports.Response = Response;
 exports.ResponseData = ResponseData;
+exports.View = View;
 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;
@@ -3582,14 +3615,6 @@ Object.keys(platformMiddlewares).forEach(function (k) {
     }
   });
 });
-Object.keys(platformViews).forEach(function (k) {
-  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () {
-      return platformViews[k];
-    }
-  });
-});
 Object.keys(componentsScan).forEach(function (k) {
   if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
     enumerable: true,