@tsed/common 6.75.6 → 6.75.10

package/lib/config/services/PlatformConfiguration.d.ts

@@ -77,4 +77,9 @@ export declare class PlatformConfiguration extends DIConfiguration {
         address: string;
         port: number;
     }): void;
+    getBestHost(): {
+        address: string;
+        port: number;
+        protocol: string;
+    } | undefined;
 }

package/lib/decorators/params/endpointInfo.d.ts

@@ -1,5 +1,4 @@
 import { EndpointMetadata } from "../../domain/EndpointMetadata";
-export declare type EndpointInfo = EndpointMetadata;
 /**
  * Get the current endpoint metadata.
  * @decorator
@@ -8,3 +7,7 @@ export declare type EndpointInfo = EndpointMetadata;
  * @deprecated Use `@Context() $ctx: Context` then `$ctx.endpoint` instead.
  */
 export declare function EndpointInfo(): Function;
+/**
+ * @deprecated
+ */
+export declare type EndpointInfo = EndpointMetadata;

package/lib/index.js

@@ -13,7 +13,6 @@ var core = require('@tsed/core');
 var perf = require('@tsed/perf');
 var exceptions = require('@tsed/exceptions');
 var schema = require('@tsed/schema');
-var jsonMapper = require('@tsed/json-mapper');
 var util = require('util');
 var Http = require('http');
 var Https = require('https');
@@ -325,6 +324,27 @@ exports.PlatformConfiguration = PlatformConfiguration_1 = class PlatformConfigur
     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);
+    }
+  }
+
 };
 exports.PlatformConfiguration = PlatformConfiguration_1 = tslib.__decorate([di.Injectable({
   scope: di.ProviderScope.SINGLETON,
@@ -744,57 +764,6 @@ function setResponseHeaders(ctx) {
   }
 }
 
-var _converterSettings;
-/**
- * @deprecated Since 2021-10-03. Use serialize/deserialize functions from @tsed/json-mapper instead
- */
-
-exports.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 jsonMapper.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 jsonMapper.deserialize(obj, _extends({
-      useAlias: true,
-      additionalProperties: _classPrivateFieldLooseBase(this, _converterSettings)[_converterSettings].additionalProperties === "accept"
-    }, options));
-  }
-
-});
-exports.ConverterService = tslib.__decorate([di.Injectable(), tslib.__param(1, di.Configuration()), tslib.__metadata("design:paramtypes", [di.InjectorService, Object])], exports.ConverterService);
-
 /**
  * Platform Handler abstraction layer. Wrap original class method to a pure platform handler (Express, Koa, etc...).
  * @platform
@@ -845,23 +814,13 @@ exports.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 (core.isSerializable(data)) {
-          data = this.injector.get(exports.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);
     }
   }
 
@@ -1028,17 +987,6 @@ exports.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 platformViews.renderView(data, ctx);
-  }
   /**
    * create Raw handler
    * @param metadata
@@ -1510,8 +1458,8 @@ class PlatformControllerBuilder {
 
     let handlers = [];
     const hasFiles = [...endpoint.children.values()].find(item => item.paramType === platformParams.ParamTypes.FILES);
-    handlers = handlers.concat(useCtxHandler(bindEndpointMiddleware(endpoint))).concat(exports.PlatformAcceptMimesMiddleware).concat(hasFiles && exports.PlatformMulterMiddleware).concat(use) // Controller use-middlewares
-    .concat(beforeMiddlewares) // Endpoint before-middlewares
+    handlers = handlers.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
@@ -2459,16 +2407,6 @@ exports.Platform = tslib.__decorate([di.Injectable({
   scope: di.ProviderScope.SINGLETON
 }), tslib.__metadata("design:paramtypes", [di.InjectorService, exports.PlatformApplication])], exports.Platform);
 
-/**
- * @ignore
- * @deprecated Will be removed in v7
- */
-
-exports.PlatformModule = class PlatformModule {};
-exports.PlatformModule = tslib.__decorate([di.Module({
-  imports: [di.InjectorService, exports.ConverterService, exports.Platform]
-})], exports.PlatformModule);
-
 logger.$log.name = "TSED";
 function createInjector(settings = {}) {
   const injector = new di.InjectorService();
@@ -2641,7 +2579,7 @@ async function listenHttpsServer(injector) {
 
 async function loadInjector(injector, container = di.createContainer()) {
   injector.bootstrap(container);
-  return injector.load(container, exports.PlatformModule);
+  return injector.load(container);
 }
 
 function printRoutes(routes) {
@@ -2722,10 +2660,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: core.getValue(opts, "hook", "$afterRoutesInit")
+  });
 }
 
 function getStaticsOptions(statics) {
@@ -2897,7 +2836,7 @@ class PlatformBuilder {
     await this.callHook("$beforeInit");
     this.log("Build providers");
     const container = di.createContainer(core.constructorOf(this.rootModule));
-    await injector.load(container, exports.PlatformModule);
+    await injector.load(container);
     this.log("Settings and injector loaded");
     await this.callHook("$afterInit");
   }
@@ -3457,7 +3396,7 @@ class PlatformTest extends di.DITest {
   static async create(options = {}) {
     di.DITest.injector = PlatformTest.createInjector(options);
     const container = di.createContainer();
-    await di.DITest.injector.load(container, exports.PlatformModule);
+    await di.DITest.injector.load(container);
   }
   /**
    * Create a new injector with the right default services
@@ -3649,6 +3588,12 @@ di.GlobalProviders.createRegistry(di.ProviderType.CONTROLLER, ControllerProvider
 
 });
 
+/**
+ * @ignore
+ * @deprecated Will be removed in v7
+ */
+class PlatformModule {}
+
 Object.defineProperty(exports, '$log', {
   enumerable: true,
   get: function () {
@@ -3738,6 +3683,7 @@ 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;
 exports.ROUTER_OPTIONS = ROUTER_OPTIONS;