@tsed/common 6.75.4 → 6.75.8

package/lib/index.modern.js

@@ -1,4 +1,4 @@
-import { DIConfiguration, ProviderType, ProviderScope, Injectable, Configuration, InjectorService, Inject, Constant, Scope, DIContext, Provider, Module, setLoggerLevel, GlobalProviders, registerProvider, createContainer, Container, getConfiguration, DITest } from '@tsed/di';
+import { DIConfiguration, ProviderType, ProviderScope, Injectable, Inject, InjectorService, Constant, Scope, DIContext, Provider, setLoggerLevel, GlobalProviders, registerProvider, Configuration, createContainer, Container, getConfiguration, DITest } from '@tsed/di';
 export * from '@tsed/di';
 import { ParamTypes, ParamMetadata, PlatformParams, Context, UseParam, mapParamsOptions } from '@tsed/platform-params';
 export * from '@tsed/platform-params';
@@ -8,7 +8,7 @@ export * from '@tsed/platform-response-filter';
 export * from '@tsed/platform-cache';
 import { Middleware, getMiddlewaresForHook } from '@tsed/platform-middlewares';
 export * from '@tsed/platform-middlewares';
-import { renderView, PlatformViews } from '@tsed/platform-views';
+import { PlatformViews } from '@tsed/platform-views';
 export * from '@tsed/platform-views';
 import { importProviders } from '@tsed/components-scan';
 export * from '@tsed/components-scan';
@@ -16,12 +16,11 @@ export * from '@tsed/platform-log-middleware';
 import { $log, colorize } from '@tsed/logger';
 export { $log, Logger } from '@tsed/logger';
 import { __decorate, __metadata, __param } from 'tslib';
-import { Env, AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, classOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isSerializable, isStream, uniq, isBoolean, isNumber, isString, toMap, constructorOf, StoreMerge, Metadata, useDecorators, useMethodDecorators, isClass } from '@tsed/core';
+import { Env, AnyToPromise, AnyToPromiseStatus, nameOf, Store, descriptorOf, classOf, prototypeOf, deepMerge, isFunction, DecoratorTypes, isStream, uniq, isBoolean, isNumber, isString, getValue, toMap, constructorOf, StoreMerge, Metadata, useDecorators, useMethodDecorators, isClass } from '@tsed/core';
 import { PerfLogger } from '@tsed/perf';
 import { Exception, NotAcceptable } from '@tsed/exceptions';
 import { JsonEntityStore, getOperationsStores, JsonEntityComponent, OperationMethods, getProperties, Returns, Consumes, JsonEntityFn, Produces } from '@tsed/schema';
 export { All, Delete, Get, Head, Location, Options, Patch, Post, Put, Redirect } from '@tsed/schema';
-import { serialize, deserialize } from '@tsed/json-mapper';
 import { promisify } from 'util';
 import Http, { ServerResponse, IncomingMessage } from 'http';
 import Https from 'https';
@@ -308,6 +307,27 @@ let PlatformConfiguration = PlatformConfiguration_1 = class PlatformConfiguratio
     this.setRaw("httpsPort", `${settings.address}:${settings.port}`);
   }
 
+  getBestHost() {
+    const {
+      httpsPort,
+      httpPort
+    } = this;
+
+    if (httpsPort) {
+      const host = this.getHttpsPort();
+      return _extends({
+        protocol: "https"
+      }, host);
+    }
+
+    if (httpPort) {
+      const host = this.getHttpPort();
+      return _extends({
+        protocol: "http"
+      }, host);
+    }
+  }
+
 };
 PlatformConfiguration = PlatformConfiguration_1 = __decorate([Injectable({
   scope: ProviderScope.SINGLETON,
@@ -727,57 +747,6 @@ function setResponseHeaders(ctx) {
   }
 }
 
-var _converterSettings;
-/**
- * @deprecated Since 2021-10-03. Use serialize/deserialize functions from @tsed/json-mapper instead
- */
-
-let ConverterService = (_converterSettings = /*#__PURE__*/_classPrivateFieldLooseKey("converterSettings"), class ConverterService {
-  constructor(injectorService, configuration) {
-    Object.defineProperty(this, _converterSettings, {
-      writable: true,
-      value: void 0
-    });
-    this.injectorService = injectorService;
-    _classPrivateFieldLooseBase(this, _converterSettings)[_converterSettings] = configuration.get("converter") || {};
-  }
-
-  /**
-   * Convert instance to plainObject.
-   *
-   * @param obj
-   * @param options
-   */
-  serialize(obj, options = {}) {
-    return serialize(obj, _extends({
-      useAlias: true,
-      additionalProperties: _classPrivateFieldLooseBase(this, _converterSettings)[_converterSettings].additionalProperties === "accept"
-    }, options));
-  }
-  /**
-   * Convert a plainObject to targetType.
-   *
-   * ### Options
-   *
-   * - `ignoreCallback`: callback called for each object which will be deserialized. The callback can return a boolean to avoid the default converter behavior.
-   * - `checkRequiredValue`: Disable the required check condition.
-   *
-   * @param obj Object source that will be deserialized
-   * @param options Mapping options
-   * @returns {any}
-   */
-
-
-  deserialize(obj, options = {}) {
-    return deserialize(obj, _extends({
-      useAlias: true,
-      additionalProperties: _classPrivateFieldLooseBase(this, _converterSettings)[_converterSettings].additionalProperties === "accept"
-    }, options));
-  }
-
-});
-ConverterService = __decorate([Injectable(), __param(1, Configuration()), __metadata("design:paramtypes", [InjectorService, Object])], ConverterService);
-
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
@@ -830,23 +799,13 @@ let PlatformHandler = class PlatformHandler {
 
   async flush(data, ctx) {
     const {
-      response,
-      endpoint
+      response
     } = ctx;
 
     if (!response.isDone()) {
-      // FIXME should be move to responseFilter module
-      if (endpoint) {
-        if (endpoint.view) {
-          data = await this.render(data, ctx);
-        } else if (isSerializable(data)) {
-          data = this.injector.get(ConverterService).serialize(data, _extends({}, endpoint.getResponseOptions(response.statusCode), {
-            endpoint: true
-          }));
-        }
-      }
-
-      response.body(this.responseFilter.transform(data, ctx));
+      data = await this.responseFilter.serialize(data, ctx);
+      data = await this.responseFilter.transform(data, ctx);
+      response.body(data);
     }
   }
 
@@ -1017,17 +976,6 @@ let PlatformHandler = class PlatformHandler {
   callReturnedMiddleware(middleware, ctx, next) {
     return middleware(ctx.getRequest(), ctx.getResponse(), next);
   }
-  /**
-   * Render the view if the endpoint has a configured view.
-   * @param data
-   * @param ctx
-   * @protected
-   */
-
-
-  async render(data, ctx) {
-    return renderView(data, ctx);
-  }
   /**
    * create Raw handler
    * @param metadata
@@ -1501,8 +1449,8 @@ class PlatformControllerBuilder {
 
     let handlers = [];
     const hasFiles = [...endpoint.children.values()].find(item => item.paramType === ParamTypes.FILES);
-    handlers = handlers.concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(PlatformAcceptMimesMiddleware).concat(hasFiles && PlatformMulterMiddleware).concat(use) // Controller use-middlewares
-    .concat(beforeMiddlewares) // Endpoint before-middlewares
+    handlers = handlers.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
@@ -2450,16 +2398,6 @@ Platform = __decorate([Injectable({
   scope: ProviderScope.SINGLETON
 }), __metadata("design:paramtypes", [InjectorService, PlatformApplication])], Platform);
 
-/**
- * @ignore
- * @deprecated Will be removed in v7
- */
-
-let PlatformModule = class PlatformModule {};
-PlatformModule = __decorate([Module({
-  imports: [InjectorService, ConverterService, Platform]
-})], PlatformModule);
-
 $log.name = "TSED";
 function createInjector(settings = {}) {
   const injector = new InjectorService();
@@ -2632,7 +2570,7 @@ async function listenHttpsServer(injector) {
 
 async function loadInjector(injector, container = createContainer()) {
   injector.bootstrap(container);
-  return injector.load(container, PlatformModule);
+  return injector.load(container);
 }
 
 function printRoutes(routes) {
@@ -2713,10 +2651,11 @@ function createContext(injector) {
 
 function mapOptions$1(options) {
   const opts = typeof options === "string" ? {
-    root: options,
-    hook: "$afterRoutesInit"
+    root: options
   } : options;
-  return opts;
+  return _extends({}, opts, {
+    hook: getValue(opts, "hook", "$afterRoutesInit")
+  });
 }
 
 function getStaticsOptions(statics) {
@@ -2888,7 +2827,7 @@ class PlatformBuilder {
     await this.callHook("$beforeInit");
     this.log("Build providers");
     const container = createContainer(constructorOf(this.rootModule));
-    await injector.load(container, PlatformModule);
+    await injector.load(container);
     this.log("Settings and injector loaded");
     await this.callHook("$afterInit");
   }
@@ -3448,7 +3387,7 @@ class PlatformTest extends DITest {
   static async create(options = {}) {
     DITest.injector = PlatformTest.createInjector(options);
     const container = createContainer();
-    await DITest.injector.load(container, PlatformModule);
+    await DITest.injector.load(container);
   }
   /**
    * Create a new injector with the right default services
@@ -3640,5 +3579,11 @@ GlobalProviders.createRegistry(ProviderType.CONTROLLER, ControllerProvider, {
 
 });
 
-export { AcceptMime, AcceptMimesMiddleware, AnyToPromiseWithCtx, ControllerProvider, ConverterService, 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 };
+/**
+ * @ignore
+ * @deprecated Will be removed in v7
+ */
+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 };
 //# sourceMappingURL=index.modern.js.map