@tsed/platform-response-filter 7.0.0-beta.8 → 7.0.0-rc.2

package/coverage.json

@@ -0,0 +1,6 @@
+{
+  "statements": 100,
+  "branches": 100,
+  "functions": 100,
+  "lines": 100
+}

package/jest.config.js

@@ -0,0 +1,9 @@
+// For a detailed explanation regarding each configuration property, visit:
+// https://jestjs.io/docs/en/configuration.html
+
+module.exports = {
+  ...require("@tsed/jest-config")(__dirname, "platform-response-filter"),
+  coverageThreshold: {
+    global: require("./coverage.json")
+  }
+};

package/lib/cjs/errors/TemplateRenderError.js

@@ -7,9 +7,9 @@ const exceptions_1 = require("@tsed/exceptions");
  * @private
  */
 class TemplateRenderError extends exceptions_1.InternalServerError {
+    name = "TEMPLATE_RENDER_ERROR";
     constructor(target, method, err) {
         super(TemplateRenderError.buildMessage(target, method, err));
-        this.name = "TEMPLATE_RENDER_ERROR";
     }
     /**
      *

package/lib/cjs/errors/TemplateRenderError.js.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateRenderError.js","sourceRoot":"","sources":["../../../src/errors/TemplateRenderError.ts"],"names":[],"mappings":";;;AAAA,qCAAwC;AACxC,iDAAqD;AAErD;;GAEG;AACH,MAAa,mBAAoB,SAAQ,gCAAmB;IAG1D,YAAY,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACzE,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAH/D,SAAI,GAAG,uBAAuB,CAAC;IAI/B,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACjF,OAAO,6BAA6B,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACnF,CAAC;CACF;AAdD,kDAcC","sourcesContent":["import {nameOf, Type} from \"@tsed/core\";\nimport {InternalServerError} from \"@tsed/exceptions\";\n\n/**\n * @private\n */\nexport class TemplateRenderError extends InternalServerError {\n  name = \"TEMPLATE_RENDER_ERROR\";\n\n  constructor(target: Type<any> | string, method: string | symbol, err: Error) {\n    super(TemplateRenderError.buildMessage(target, method, err));\n  }\n\n  /**\n   *\n   * @returns {string}\n   */\n  static buildMessage(target: Type<any> | string, method: string | symbol, err: Error) {\n    return `Template rendering error: ${nameOf(target)}.${String(method)}()\\n` + err;\n  }\n}\n"]}
+{"version":3,"file":"TemplateRenderError.js","sourceRoot":"","sources":["../../../src/errors/TemplateRenderError.ts"],"names":[],"mappings":";;;AAAA,qCAAwC;AACxC,iDAAqD;AAErD;;GAEG;AACH,MAAa,mBAAoB,SAAQ,gCAAmB;IAC1D,IAAI,GAAG,uBAAuB,CAAC;IAE/B,YAAY,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACzE,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACjF,OAAO,6BAA6B,IAAA,aAAM,EAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACnF,CAAC;CACF;AAdD,kDAcC","sourcesContent":["import {nameOf, Type} from \"@tsed/core\";\nimport {InternalServerError} from \"@tsed/exceptions\";\n\n/**\n * @private\n */\nexport class TemplateRenderError extends InternalServerError {\n  name = \"TEMPLATE_RENDER_ERROR\";\n\n  constructor(target: Type<any> | string, method: string | symbol, err: Error) {\n    super(TemplateRenderError.buildMessage(target, method, err));\n  }\n\n  /**\n   *\n   * @returns {string}\n   */\n  static buildMessage(target: Type<any> | string, method: string | symbol, err: Error) {\n    return `Template rendering error: ${nameOf(target)}.${String(method)}()\\n` + err;\n  }\n}\n"]}

package/lib/cjs/services/PlatformResponseFilter.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PlatformResponseFilter = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@tsed/core");
-const json_mapper_1 = require("@tsed/json-mapper");
 const di_1 = require("@tsed/di");
+const json_mapper_1 = require("@tsed/json-mapper");
 const ResponseFiltersContainer_1 = require("../domain/ResponseFiltersContainer");
 const getContentType_1 = require("../utils/getContentType");
 const renderView_1 = require("../utils/renderView");
@@ -12,9 +12,10 @@ const renderView_1 = require("../utils/renderView");
  * @platform
  */
 let PlatformResponseFilter = class PlatformResponseFilter {
-    constructor() {
-        this.types = new Map();
-    }
+    types = new Map();
+    injector;
+    responseFilters;
+    additionalProperties;
     get contentTypes() {
         return [...this.types.keys()];
     }
@@ -42,13 +43,15 @@ let PlatformResponseFilter = class PlatformResponseFilter {
      */
     async transform(data, ctx) {
         const { response } = ctx;
-        const bestContentType = this.getBestContentType(data, ctx);
-        bestContentType && response.contentType(bestContentType);
-        if (this.types.has(bestContentType)) {
-            return this.types.get(bestContentType).transform(data, ctx);
-        }
-        if (this.types.has(getContentType_1.ANY_CONTENT_TYPE)) {
-            return this.types.get(getContentType_1.ANY_CONTENT_TYPE).transform(data, ctx);
+        if (ctx.endpoint?.operation) {
+            const bestContentType = this.getBestContentType(data, ctx);
+            bestContentType && response.contentType(bestContentType);
+            if (this.types.has(bestContentType)) {
+                return this.types.get(bestContentType).transform(data, ctx);
+            }
+            if (this.types.has(getContentType_1.ANY_CONTENT_TYPE)) {
+                return this.types.get(getContentType_1.ANY_CONTENT_TYPE).transform(data, ctx);
+            }
         }
         return data;
     }
@@ -64,16 +67,25 @@ let PlatformResponseFilter = class PlatformResponseFilter {
                 data = await (0, renderView_1.renderView)(data, ctx);
             }
             else if ((0, core_1.isSerializable)(data)) {
+                const responseOpts = endpoint.getResponseOptions(response.statusCode, {
+                    includes: this.getIncludes(ctx)
+                });
                 data = (0, json_mapper_1.serialize)(data, {
                     useAlias: true,
                     additionalProperties: this.additionalProperties,
-                    ...endpoint.getResponseOptions(response.statusCode),
+                    ...responseOpts,
                     endpoint: true
                 });
             }
         }
         return data;
     }
+    getIncludes(ctx) {
+        if (ctx.request.query.includes) {
+            return [].concat(ctx.request.query.includes).flatMap((include) => include.split(","));
+        }
+        return undefined;
+    }
 };
 tslib_1.__decorate([
     (0, di_1.Inject)(),

package/lib/cjs/services/PlatformResponseFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformResponseFilter.js","sourceRoot":"","sources":["../../../src/services/PlatformResponseFilter.ts"],"names":[],"mappings":"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","sourcesContent":["import {isSerializable, Type} from \"@tsed/core\";\nimport {serialize} from \"@tsed/json-mapper\";\nimport {BaseContext, Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {ResponseFilterKey, ResponseFiltersContainer} from \"../domain/ResponseFiltersContainer\";\nimport {ResponseFilterMethods} from \"../interfaces/ResponseFilterMethods\";\nimport {ANY_CONTENT_TYPE, getContentType} from \"../utils/getContentType\";\nimport {renderView} from \"../utils/renderView\";\n\n/**\n * @platform\n */\n@Injectable()\nexport class PlatformResponseFilter {\n  protected types: Map<ResponseFilterKey, ResponseFilterMethods> = new Map();\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"responseFilters\", [])\n  protected responseFilters: Type<ResponseFilterMethods>[];\n\n  @Constant(\"additionalProperties\")\n  protected additionalProperties: boolean;\n\n  get contentTypes(): ResponseFilterKey[] {\n    return [...this.types.keys()];\n  }\n\n  $onInit() {\n    ResponseFiltersContainer.forEach((token, type) => {\n      if (this.responseFilters.includes(token)) {\n        this.types.set(type, this.injector.get(token)!);\n      }\n    });\n  }\n\n  getBestContentType(data: any, ctx: BaseContext) {\n    const contentType = getContentType(data, ctx);\n\n    if (ctx.request.get(\"Accept\")) {\n      const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));\n\n      if (bestContentType) {\n        return [].concat(bestContentType as any).filter((type) => type !== \"*/*\")[0];\n      }\n    }\n\n    return contentType;\n  }\n\n  /**\n   * Call filters to transform data\n   * @param data\n   * @param ctx\n   */\n  async transform(data: unknown, ctx: BaseContext) {\n    const {response} = ctx;\n    const bestContentType = this.getBestContentType(data, ctx);\n\n    bestContentType && response.contentType(bestContentType);\n\n    if (this.types.has(bestContentType)) {\n      return this.types.get(bestContentType)!.transform(data, ctx);\n    }\n\n    if (this.types.has(ANY_CONTENT_TYPE)) {\n      return this.types.get(ANY_CONTENT_TYPE)!.transform(data, ctx);\n    }\n\n    return data;\n  }\n\n  /**\n   * Serialize data before calling filters\n   * @param data\n   * @param ctx\n   */\n  async serialize(data: unknown, ctx: BaseContext) {\n    const {response, endpoint} = ctx;\n\n    if (endpoint) {\n      if (endpoint.view) {\n        data = await renderView(data, ctx);\n      } else if (isSerializable(data)) {\n        data = serialize(data, {\n          useAlias: true,\n          additionalProperties: this.additionalProperties,\n          ...endpoint.getResponseOptions(response.statusCode),\n          endpoint: true\n        });\n      }\n    }\n\n    return data;\n  }\n}\n"]}
+{"version":3,"file":"PlatformResponseFilter.js","sourceRoot":"","sources":["../../../src/services/PlatformResponseFilter.ts"],"names":[],"mappings":"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","sourcesContent":["import {isSerializable, Type} from \"@tsed/core\";\nimport {BaseContext, Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {serialize} from \"@tsed/json-mapper\";\nimport {ResponseFilterKey, ResponseFiltersContainer} from \"../domain/ResponseFiltersContainer\";\nimport {ResponseFilterMethods} from \"../interfaces/ResponseFilterMethods\";\nimport {ANY_CONTENT_TYPE, getContentType} from \"../utils/getContentType\";\nimport {renderView} from \"../utils/renderView\";\n\n/**\n * @platform\n */\n@Injectable()\nexport class PlatformResponseFilter {\n  protected types: Map<ResponseFilterKey, ResponseFilterMethods> = new Map();\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"responseFilters\", [])\n  protected responseFilters: Type<ResponseFilterMethods>[];\n\n  @Constant(\"additionalProperties\")\n  protected additionalProperties: boolean;\n\n  get contentTypes(): ResponseFilterKey[] {\n    return [...this.types.keys()];\n  }\n\n  $onInit() {\n    ResponseFiltersContainer.forEach((token, type) => {\n      if (this.responseFilters.includes(token)) {\n        this.types.set(type, this.injector.get(token)!);\n      }\n    });\n  }\n\n  getBestContentType(data: any, ctx: BaseContext) {\n    const contentType = getContentType(data, ctx);\n\n    if (ctx.request.get(\"Accept\")) {\n      const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));\n\n      if (bestContentType) {\n        return [].concat(bestContentType as any).filter((type) => type !== \"*/*\")[0];\n      }\n    }\n\n    return contentType;\n  }\n\n  /**\n   * Call filters to transform data\n   * @param data\n   * @param ctx\n   */\n  async transform(data: unknown, ctx: BaseContext) {\n    const {response} = ctx;\n\n    if (ctx.endpoint?.operation) {\n      const bestContentType = this.getBestContentType(data, ctx);\n\n      bestContentType && response.contentType(bestContentType);\n\n      if (this.types.has(bestContentType)) {\n        return this.types.get(bestContentType)!.transform(data, ctx);\n      }\n\n      if (this.types.has(ANY_CONTENT_TYPE)) {\n        return this.types.get(ANY_CONTENT_TYPE)!.transform(data, ctx);\n      }\n    }\n\n    return data;\n  }\n\n  /**\n   * Serialize data before calling filters\n   * @param data\n   * @param ctx\n   */\n  async serialize(data: unknown, ctx: BaseContext) {\n    const {response, endpoint} = ctx;\n\n    if (endpoint) {\n      if (endpoint.view) {\n        data = await renderView(data, ctx);\n      } else if (isSerializable(data)) {\n        const responseOpts = endpoint.getResponseOptions(response.statusCode, {\n          includes: this.getIncludes(ctx)\n        });\n\n        data = serialize(data, {\n          useAlias: true,\n          additionalProperties: this.additionalProperties,\n          ...responseOpts,\n          endpoint: true\n        });\n      }\n    }\n\n    return data;\n  }\n\n  private getIncludes(ctx: BaseContext) {\n    if (ctx.request.query.includes) {\n      return [].concat(ctx.request.query.includes).flatMap((include: string) => include.split(\",\"));\n    }\n\n    return undefined;\n  }\n}\n"]}

package/lib/cjs/utils/getContentType.js

@@ -11,16 +11,12 @@ function getContentType(data, ctx) {
     const { operation } = endpoint;
     const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
     if (contentType && contentType !== exports.ANY_CONTENT_TYPE) {
-        if (contentType === "application/json") {
-            if ((0, core_1.isObject)(data)) {
-                return contentType;
-            }
-        }
-        else {
-            return contentType;
+        if (contentType === "application/json" && (0, core_1.isObject)(data)) {
+            return "application/json";
         }
+        return contentType;
     }
-    if (typeof data === "string" && endpoint.view) {
+    if (endpoint.view) {
         return "text/html";
     }
 }

package/lib/cjs/utils/getContentType.js.map

@@ -1 +1 @@
-{"version":3,"file":"getContentType.js","sourceRoot":"","sources":["../../../src/utils/getContentType.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAEvB,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACtC;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAS,EAAE,GAAgB;IACxD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,IAAI,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAEvG,IAAI,WAAW,IAAI,WAAW,KAAK,wBAAgB,EAAE;QACnD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE;gBAClB,OAAO,WAAW,CAAC;aACpB;SACF;aAAM;YACL,OAAO,WAAW,CAAC;SACpB;KACF;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;QAC7C,OAAO,WAAW,CAAC;KACpB;AACH,CAAC;AAnBD,wCAmBC","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport type {BaseContext} from \"@tsed/di\";\nexport const ANY_CONTENT_TYPE = \"*/*\";\n/**\n * @ignore\n */\nexport function getContentType(data: any, ctx: BaseContext) {\n  const {endpoint, response} = ctx;\n  const {operation} = endpoint;\n\n  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || \"\";\n\n  if (contentType && contentType !== ANY_CONTENT_TYPE) {\n    if (contentType === \"application/json\") {\n      if (isObject(data)) {\n        return contentType;\n      }\n    } else {\n      return contentType;\n    }\n  }\n\n  if (typeof data === \"string\" && endpoint.view) {\n    return \"text/html\";\n  }\n}\n"]}
+{"version":3,"file":"getContentType.js","sourceRoot":"","sources":["../../../src/utils/getContentType.ts"],"names":[],"mappings":";;;AAAA,qCAAoC;AAGvB,QAAA,gBAAgB,GAAG,KAAK,CAAC;AAEtC;;GAEG;AACH,SAAgB,cAAc,CAAC,IAAS,EAAE,GAAgB;IACxD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,IAAI,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAEvG,IAAI,WAAW,IAAI,WAAW,KAAK,wBAAgB,EAAE;QACnD,IAAI,WAAW,KAAK,kBAAkB,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,EAAE;YACxD,OAAO,kBAAkB,CAAC;SAC3B;QAED,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE;QACjB,OAAO,WAAW,CAAC;KACpB;AACH,CAAC;AAjBD,wCAiBC","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport type {BaseContext} from \"@tsed/di\";\n\nexport const ANY_CONTENT_TYPE = \"*/*\";\n\n/**\n * @ignore\n */\nexport function getContentType(data: any, ctx: BaseContext) {\n  const {endpoint, response} = ctx;\n  const {operation} = endpoint;\n\n  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || \"\";\n\n  if (contentType && contentType !== ANY_CONTENT_TYPE) {\n    if (contentType === \"application/json\" && isObject(data)) {\n      return \"application/json\";\n    }\n\n    return contentType;\n  }\n\n  if (endpoint.view) {\n    return \"text/html\";\n  }\n}\n"]}

package/lib/esm/errors/TemplateRenderError.js

@@ -4,9 +4,9 @@ import { InternalServerError } from "@tsed/exceptions";
  * @private
  */
 export class TemplateRenderError extends InternalServerError {
+    name = "TEMPLATE_RENDER_ERROR";
     constructor(target, method, err) {
         super(TemplateRenderError.buildMessage(target, method, err));
-        this.name = "TEMPLATE_RENDER_ERROR";
     }
     /**
      *

package/lib/esm/errors/TemplateRenderError.js.map

@@ -1 +1 @@
-{"version":3,"file":"TemplateRenderError.js","sourceRoot":"","sources":["../../../src/errors/TemplateRenderError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAO,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAErD;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAG1D,YAAY,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACzE,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;QAH/D,SAAI,GAAG,uBAAuB,CAAC;IAI/B,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACjF,OAAO,6BAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACnF,CAAC;CACF","sourcesContent":["import {nameOf, Type} from \"@tsed/core\";\nimport {InternalServerError} from \"@tsed/exceptions\";\n\n/**\n * @private\n */\nexport class TemplateRenderError extends InternalServerError {\n  name = \"TEMPLATE_RENDER_ERROR\";\n\n  constructor(target: Type<any> | string, method: string | symbol, err: Error) {\n    super(TemplateRenderError.buildMessage(target, method, err));\n  }\n\n  /**\n   *\n   * @returns {string}\n   */\n  static buildMessage(target: Type<any> | string, method: string | symbol, err: Error) {\n    return `Template rendering error: ${nameOf(target)}.${String(method)}()\\n` + err;\n  }\n}\n"]}
+{"version":3,"file":"TemplateRenderError.js","sourceRoot":"","sources":["../../../src/errors/TemplateRenderError.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAO,MAAM,YAAY,CAAC;AACxC,OAAO,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AAErD;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IAC1D,IAAI,GAAG,uBAAuB,CAAC;IAE/B,YAAY,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACzE,KAAK,CAAC,mBAAmB,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,YAAY,CAAC,MAA0B,EAAE,MAAuB,EAAE,GAAU;QACjF,OAAO,6BAA6B,MAAM,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;IACnF,CAAC;CACF","sourcesContent":["import {nameOf, Type} from \"@tsed/core\";\nimport {InternalServerError} from \"@tsed/exceptions\";\n\n/**\n * @private\n */\nexport class TemplateRenderError extends InternalServerError {\n  name = \"TEMPLATE_RENDER_ERROR\";\n\n  constructor(target: Type<any> | string, method: string | symbol, err: Error) {\n    super(TemplateRenderError.buildMessage(target, method, err));\n  }\n\n  /**\n   *\n   * @returns {string}\n   */\n  static buildMessage(target: Type<any> | string, method: string | symbol, err: Error) {\n    return `Template rendering error: ${nameOf(target)}.${String(method)}()\\n` + err;\n  }\n}\n"]}

package/lib/esm/services/PlatformResponseFilter.js

@@ -1,7 +1,7 @@
 import { __decorate, __metadata } from "tslib";
 import { isSerializable } from "@tsed/core";
-import { serialize } from "@tsed/json-mapper";
 import { Constant, Inject, Injectable, InjectorService } from "@tsed/di";
+import { serialize } from "@tsed/json-mapper";
 import { ResponseFiltersContainer } from "../domain/ResponseFiltersContainer.js";
 import { ANY_CONTENT_TYPE, getContentType } from "../utils/getContentType.js";
 import { renderView } from "../utils/renderView.js";
@@ -9,9 +9,10 @@ import { renderView } from "../utils/renderView.js";
  * @platform
  */
 let PlatformResponseFilter = class PlatformResponseFilter {
-    constructor() {
-        this.types = new Map();
-    }
+    types = new Map();
+    injector;
+    responseFilters;
+    additionalProperties;
     get contentTypes() {
         return [...this.types.keys()];
     }
@@ -39,13 +40,15 @@ let PlatformResponseFilter = class PlatformResponseFilter {
      */
     async transform(data, ctx) {
         const { response } = ctx;
-        const bestContentType = this.getBestContentType(data, ctx);
-        bestContentType && response.contentType(bestContentType);
-        if (this.types.has(bestContentType)) {
-            return this.types.get(bestContentType).transform(data, ctx);
-        }
-        if (this.types.has(ANY_CONTENT_TYPE)) {
-            return this.types.get(ANY_CONTENT_TYPE).transform(data, ctx);
+        if (ctx.endpoint?.operation) {
+            const bestContentType = this.getBestContentType(data, ctx);
+            bestContentType && response.contentType(bestContentType);
+            if (this.types.has(bestContentType)) {
+                return this.types.get(bestContentType).transform(data, ctx);
+            }
+            if (this.types.has(ANY_CONTENT_TYPE)) {
+                return this.types.get(ANY_CONTENT_TYPE).transform(data, ctx);
+            }
         }
         return data;
     }
@@ -61,16 +64,25 @@ let PlatformResponseFilter = class PlatformResponseFilter {
                 data = await renderView(data, ctx);
             }
             else if (isSerializable(data)) {
+                const responseOpts = endpoint.getResponseOptions(response.statusCode, {
+                    includes: this.getIncludes(ctx)
+                });
                 data = serialize(data, {
                     useAlias: true,
                     additionalProperties: this.additionalProperties,
-                    ...endpoint.getResponseOptions(response.statusCode),
+                    ...responseOpts,
                     endpoint: true
                 });
             }
         }
         return data;
     }
+    getIncludes(ctx) {
+        if (ctx.request.query.includes) {
+            return [].concat(ctx.request.query.includes).flatMap((include) => include.split(","));
+        }
+        return undefined;
+    }
 };
 __decorate([
     Inject(),

package/lib/esm/services/PlatformResponseFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"PlatformResponseFilter.js","sourceRoot":"","sources":["../../../src/services/PlatformResponseFilter.ts"],"names":[],"mappings":"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","sourcesContent":["import {isSerializable, Type} from \"@tsed/core\";\nimport {serialize} from \"@tsed/json-mapper\";\nimport {BaseContext, Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {ResponseFilterKey, ResponseFiltersContainer} from \"../domain/ResponseFiltersContainer\";\nimport {ResponseFilterMethods} from \"../interfaces/ResponseFilterMethods\";\nimport {ANY_CONTENT_TYPE, getContentType} from \"../utils/getContentType\";\nimport {renderView} from \"../utils/renderView\";\n\n/**\n * @platform\n */\n@Injectable()\nexport class PlatformResponseFilter {\n  protected types: Map<ResponseFilterKey, ResponseFilterMethods> = new Map();\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"responseFilters\", [])\n  protected responseFilters: Type<ResponseFilterMethods>[];\n\n  @Constant(\"additionalProperties\")\n  protected additionalProperties: boolean;\n\n  get contentTypes(): ResponseFilterKey[] {\n    return [...this.types.keys()];\n  }\n\n  $onInit() {\n    ResponseFiltersContainer.forEach((token, type) => {\n      if (this.responseFilters.includes(token)) {\n        this.types.set(type, this.injector.get(token)!);\n      }\n    });\n  }\n\n  getBestContentType(data: any, ctx: BaseContext) {\n    const contentType = getContentType(data, ctx);\n\n    if (ctx.request.get(\"Accept\")) {\n      const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));\n\n      if (bestContentType) {\n        return [].concat(bestContentType as any).filter((type) => type !== \"*/*\")[0];\n      }\n    }\n\n    return contentType;\n  }\n\n  /**\n   * Call filters to transform data\n   * @param data\n   * @param ctx\n   */\n  async transform(data: unknown, ctx: BaseContext) {\n    const {response} = ctx;\n    const bestContentType = this.getBestContentType(data, ctx);\n\n    bestContentType && response.contentType(bestContentType);\n\n    if (this.types.has(bestContentType)) {\n      return this.types.get(bestContentType)!.transform(data, ctx);\n    }\n\n    if (this.types.has(ANY_CONTENT_TYPE)) {\n      return this.types.get(ANY_CONTENT_TYPE)!.transform(data, ctx);\n    }\n\n    return data;\n  }\n\n  /**\n   * Serialize data before calling filters\n   * @param data\n   * @param ctx\n   */\n  async serialize(data: unknown, ctx: BaseContext) {\n    const {response, endpoint} = ctx;\n\n    if (endpoint) {\n      if (endpoint.view) {\n        data = await renderView(data, ctx);\n      } else if (isSerializable(data)) {\n        data = serialize(data, {\n          useAlias: true,\n          additionalProperties: this.additionalProperties,\n          ...endpoint.getResponseOptions(response.statusCode),\n          endpoint: true\n        });\n      }\n    }\n\n    return data;\n  }\n}\n"]}
+{"version":3,"file":"PlatformResponseFilter.js","sourceRoot":"","sources":["../../../src/services/PlatformResponseFilter.ts"],"names":[],"mappings":"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","sourcesContent":["import {isSerializable, Type} from \"@tsed/core\";\nimport {BaseContext, Constant, Inject, Injectable, InjectorService} from \"@tsed/di\";\nimport {serialize} from \"@tsed/json-mapper\";\nimport {ResponseFilterKey, ResponseFiltersContainer} from \"../domain/ResponseFiltersContainer\";\nimport {ResponseFilterMethods} from \"../interfaces/ResponseFilterMethods\";\nimport {ANY_CONTENT_TYPE, getContentType} from \"../utils/getContentType\";\nimport {renderView} from \"../utils/renderView\";\n\n/**\n * @platform\n */\n@Injectable()\nexport class PlatformResponseFilter {\n  protected types: Map<ResponseFilterKey, ResponseFilterMethods> = new Map();\n\n  @Inject()\n  protected injector: InjectorService;\n\n  @Constant(\"responseFilters\", [])\n  protected responseFilters: Type<ResponseFilterMethods>[];\n\n  @Constant(\"additionalProperties\")\n  protected additionalProperties: boolean;\n\n  get contentTypes(): ResponseFilterKey[] {\n    return [...this.types.keys()];\n  }\n\n  $onInit() {\n    ResponseFiltersContainer.forEach((token, type) => {\n      if (this.responseFilters.includes(token)) {\n        this.types.set(type, this.injector.get(token)!);\n      }\n    });\n  }\n\n  getBestContentType(data: any, ctx: BaseContext) {\n    const contentType = getContentType(data, ctx);\n\n    if (ctx.request.get(\"Accept\")) {\n      const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));\n\n      if (bestContentType) {\n        return [].concat(bestContentType as any).filter((type) => type !== \"*/*\")[0];\n      }\n    }\n\n    return contentType;\n  }\n\n  /**\n   * Call filters to transform data\n   * @param data\n   * @param ctx\n   */\n  async transform(data: unknown, ctx: BaseContext) {\n    const {response} = ctx;\n\n    if (ctx.endpoint?.operation) {\n      const bestContentType = this.getBestContentType(data, ctx);\n\n      bestContentType && response.contentType(bestContentType);\n\n      if (this.types.has(bestContentType)) {\n        return this.types.get(bestContentType)!.transform(data, ctx);\n      }\n\n      if (this.types.has(ANY_CONTENT_TYPE)) {\n        return this.types.get(ANY_CONTENT_TYPE)!.transform(data, ctx);\n      }\n    }\n\n    return data;\n  }\n\n  /**\n   * Serialize data before calling filters\n   * @param data\n   * @param ctx\n   */\n  async serialize(data: unknown, ctx: BaseContext) {\n    const {response, endpoint} = ctx;\n\n    if (endpoint) {\n      if (endpoint.view) {\n        data = await renderView(data, ctx);\n      } else if (isSerializable(data)) {\n        const responseOpts = endpoint.getResponseOptions(response.statusCode, {\n          includes: this.getIncludes(ctx)\n        });\n\n        data = serialize(data, {\n          useAlias: true,\n          additionalProperties: this.additionalProperties,\n          ...responseOpts,\n          endpoint: true\n        });\n      }\n    }\n\n    return data;\n  }\n\n  private getIncludes(ctx: BaseContext) {\n    if (ctx.request.query.includes) {\n      return [].concat(ctx.request.query.includes).flatMap((include: string) => include.split(\",\"));\n    }\n\n    return undefined;\n  }\n}\n"]}

package/lib/esm/utils/getContentType.js

@@ -8,16 +8,12 @@ export function getContentType(data, ctx) {
     const { operation } = endpoint;
     const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
     if (contentType && contentType !== ANY_CONTENT_TYPE) {
-        if (contentType === "application/json") {
-            if (isObject(data)) {
-                return contentType;
-            }
-        }
-        else {
-            return contentType;
+        if (contentType === "application/json" && isObject(data)) {
+            return "application/json";
         }
+        return contentType;
     }
-    if (typeof data === "string" && endpoint.view) {
+    if (endpoint.view) {
         return "text/html";
     }
 }

package/lib/esm/utils/getContentType.js.map

@@ -1 +1 @@
-{"version":3,"file":"getContentType.js","sourceRoot":"","sources":["../../../src/utils/getContentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AACtC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,IAAS,EAAE,GAAgB;IACxD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,IAAI,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAEvG,IAAI,WAAW,IAAI,WAAW,KAAK,gBAAgB,EAAE;QACnD,IAAI,WAAW,KAAK,kBAAkB,EAAE;YACtC,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAClB,OAAO,WAAW,CAAC;aACpB;SACF;aAAM;YACL,OAAO,WAAW,CAAC;SACpB;KACF;IAED,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE;QAC7C,OAAO,WAAW,CAAC;KACpB;AACH,CAAC","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport type {BaseContext} from \"@tsed/di\";\nexport const ANY_CONTENT_TYPE = \"*/*\";\n/**\n * @ignore\n */\nexport function getContentType(data: any, ctx: BaseContext) {\n  const {endpoint, response} = ctx;\n  const {operation} = endpoint;\n\n  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || \"\";\n\n  if (contentType && contentType !== ANY_CONTENT_TYPE) {\n    if (contentType === \"application/json\") {\n      if (isObject(data)) {\n        return contentType;\n      }\n    } else {\n      return contentType;\n    }\n  }\n\n  if (typeof data === \"string\" && endpoint.view) {\n    return \"text/html\";\n  }\n}\n"]}
+{"version":3,"file":"getContentType.js","sourceRoot":"","sources":["../../../src/utils/getContentType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAGpC,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAEtC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,IAAS,EAAE,GAAgB;IACxD,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;IACjC,MAAM,EAAC,SAAS,EAAC,GAAG,QAAQ,CAAC;IAE7B,MAAM,WAAW,GAAG,QAAQ,CAAC,cAAc,EAAE,IAAI,SAAS,CAAC,gBAAgB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAEvG,IAAI,WAAW,IAAI,WAAW,KAAK,gBAAgB,EAAE;QACnD,IAAI,WAAW,KAAK,kBAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;YACxD,OAAO,kBAAkB,CAAC;SAC3B;QAED,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE;QACjB,OAAO,WAAW,CAAC;KACpB;AACH,CAAC","sourcesContent":["import {isObject} from \"@tsed/core\";\nimport type {BaseContext} from \"@tsed/di\";\n\nexport const ANY_CONTENT_TYPE = \"*/*\";\n\n/**\n * @ignore\n */\nexport function getContentType(data: any, ctx: BaseContext) {\n  const {endpoint, response} = ctx;\n  const {operation} = endpoint;\n\n  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || \"\";\n\n  if (contentType && contentType !== ANY_CONTENT_TYPE) {\n    if (contentType === \"application/json\" && isObject(data)) {\n      return \"application/json\";\n    }\n\n    return contentType;\n  }\n\n  if (endpoint.view) {\n    return \"text/html\";\n  }\n}\n"]}

package/lib/types/services/PlatformResponseFilter.d.ts

@@ -25,4 +25,5 @@ export declare class PlatformResponseFilter {
      * @param ctx
      */
     serialize(data: unknown, ctx: BaseContext): Promise<unknown>;
+    private getIncludes;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/platform-response-filter",
-  "version": "7.0.0-beta.8",
+  "version": "7.0.0-rc.2",
   "description": "Platform response filter module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -17,24 +17,25 @@
     "build": "yarn barrels && yarn run build:esm && yarn run build:cjs",
     "build:cjs": "tsc --build tsconfig.compile.json",
     "build:esm": "tsc --build tsconfig.compile.esm.json",
-    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\""
+    "barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
+    "test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
   },
   "dependencies": {
-    "tslib": "2.3.1"
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@tsed/core": "7.0.0-beta.8",
-    "@tsed/di": "7.0.0-beta.8",
-    "@tsed/exceptions": "7.0.0-beta.8",
-    "@tsed/json-mapper": "7.0.0-beta.8",
-    "@tsed/schema": "7.0.0-beta.8"
+    "@tsed/core": "7.0.0-rc.2",
+    "@tsed/di": "7.0.0-rc.2",
+    "@tsed/exceptions": "7.0.0-rc.2",
+    "@tsed/json-mapper": "7.0.0-rc.2",
+    "@tsed/schema": "7.0.0-rc.2"
   },
   "peerDependencies": {
-    "@tsed/core": "^7.0.0-beta.8",
-    "@tsed/di": "^7.0.0-beta.8",
-    "@tsed/exceptions": "^7.0.0-beta.8",
-    "@tsed/json-mapper": "^7.0.0-beta.8",
-    "@tsed/schema": "^7.0.0-beta.8"
+    "@tsed/core": "^7.0.0-rc.2",
+    "@tsed/di": "^7.0.0-rc.2",
+    "@tsed/exceptions": "^7.0.0-rc.2",
+    "@tsed/json-mapper": "^7.0.0-rc.2",
+    "@tsed/schema": "^7.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {
@@ -57,7 +58,10 @@
   "bugs": {
     "url": "https://github.com/tsedio/tsed/issues"
   },
-  "homepage": "https://github.com/tsedio/tsed/tree/beta/packages/platform/platform-response-filter",
+  "homepage": "https://github.com/tsedio/tsed/tree/rc/packages/platform/platform-response-filter",
   "author": "Romain Lenzotti",
-  "license": "MIT"
+  "license": "MIT",
+  "publishConfig": {
+    "tag": "rc"
+  }
 }

package/readme.md

@@ -11,7 +11,8 @@
 [![npm version](https://badge.fury.io/js/%40tsed%2Fcommon.svg)](https://badge.fury.io/js/%40tsed%2Fcommon)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
-[![backers](https://opencollective.com/tsed/tiers/badge.svg)](https://opencollective.com/tsed)
+[![github](https://img.shields.io/static/v1?label=Github%20sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/romakita)
+[![opencollective](https://img.shields.io/static/v1?label=OpenCollective%20sponsor&message=%E2%9D%A4&logo=OpenCollective&color=%23fe8e86)](https://opencollective.com/tsed)
 
 </div>
 
@@ -36,12 +37,13 @@ Transform data returned by a method to a formatted response based on the stored
 # Installation
 
 ```bash
-npm install --save @tsed/di @tsed/platform-views @tsed/schema @tsed/json-schema @tsed/platform-response-filter 
+npm install --save @tsed/di @tsed/platform-views @tsed/schema @tsed/json-schema @tsed/platform-response-filter
 ```
 
 ## Usage
 
 Define a class that return data:
+
 ```typescript
 import {Injectable} from "@tsed/di";
 import {Returns} from "@tsed/schema";
@@ -51,13 +53,13 @@ import {MyModel} from "../models/MyModel";
 class MyService {
   @Returns(200, MyModel)
   async getData() {
-    return new MyModel({ id: "id", test: "test" })
+    return new MyModel({id: "id", test: "test"});
   }
 
   @Returns(200, MyModel)
   @View("myview.ejs")
   async getDataView() {
-    return new MyModel({ id: "id", test: "test" })
+    return new MyModel({id: "id", test: "test"});
   }
 }
 ```
@@ -80,7 +82,7 @@ Then call the service in you module:
 ```typescript
 import {Module, DIContext} from "@tsed/di";
 import {ResponseFilter} from "@tsed/platform-response-filter";
-import "./filters/WrapperResponseFilter"
+import "./filters/WrapperResponseFilter";
 
 @Module()
 class MyModule {
@@ -95,36 +97,36 @@ class MyModule {
       id: uuid.v4(),
       injector: this.injector,
       logger: this.injector.logger
-    })
+    });
 
     // must implement these methods
     context.request = {
       accepts(...args: any[]) {
-        return req.accepts(...args)
+        return req.accepts(...args);
       },
       get(key: string) {
-        return req.get(key)
+        return req.get(key);
       }
-    }
+    };
     context.response = {
       contentType(contentType: string) {
-        res.contentType(contentType)
+        res.contentType(contentType);
       }
-    }
+    };
 
     const service = this.injector.get<MyService>(MyService);
-    let data = await service.getData()
+    let data = await service.getData();
 
     // serialize data (map Model to Plain object)
     data = await this.responseFilter.serialize(data, context);
 
     // call filter based on the right content type
-    data = await this.responseFilter.transform(data, context)
+    data = await this.responseFilter.transform(data, context);
 
     if (isObject(data)) {
-      res.json(data)
+      res.json(data);
     } else {
-      res.send(data)
+      res.send(data);
     }
   }
 }
@@ -165,7 +167,7 @@ website. [[Become a sponsor](https://opencollective.com/tsed#sponsor)]
 
 The MIT License (MIT)
 
-Copyright (c) 2016 - 2018 Romain Lenzotti
+Copyright (c) 2016 - 2022 Romain Lenzotti
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
 documentation files (the "Software"), to deal in the Software without restriction, including without limitation the