@tsed/platform-response-filter 8.1.0 → 8.3.0

package/lib/esm/constants/ANY_CONTENT_TYPE.js

@@ -0,0 +1,2 @@
+export const ANY_CONTENT_TYPE = "*/*";
+//# sourceMappingURL=ANY_CONTENT_TYPE.js.map

package/lib/esm/constants/ANY_CONTENT_TYPE.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ANY_CONTENT_TYPE.js","sourceRoot":"","sources":["../../../src/constants/ANY_CONTENT_TYPE.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,CAAC"}

package/lib/esm/index.js

@@ -1,11 +1,13 @@
 /**
  * @file Automatically generated by @tsed/barrels.
  */
+export * from "./constants/ANY_CONTENT_TYPE.js";
 export * from "./decorators/responseFilter.js";
 export * from "./domain/ResponseFiltersContainer.js";
 export * from "./errors/TemplateRenderError.js";
 export * from "./interfaces/ResponseFilterMethods.js";
+export * from "./services/PlatformContentTypeResolver.js";
+export * from "./services/PlatformContentTypesContainer.js";
 export * from "./services/PlatformResponseFilter.js";
-export * from "./utils/getContentType.js";
 export * from "./utils/renderView.js";
 //# sourceMappingURL=index.js.map

package/lib/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,uCAAuC,CAAC;AACtD,cAAc,sCAAsC,CAAC;AACrD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,cAAc,iCAAiC,CAAC;AAChD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,sCAAsC,CAAC;AACrD,cAAc,iCAAiC,CAAC;AAChD,cAAc,uCAAuC,CAAC;AACtD,cAAc,2CAA2C,CAAC;AAC1D,cAAc,6CAA6C,CAAC;AAC5D,cAAc,sCAAsC,CAAC;AACrD,cAAc,uBAAuB,CAAC"}

package/lib/esm/services/PlatformContentTypeResolver.js

@@ -0,0 +1,39 @@
+import { isObject } from "@tsed/core";
+import { inject, injectable } from "@tsed/di";
+import { ANY_CONTENT_TYPE } from "../constants/ANY_CONTENT_TYPE.js";
+import { PLATFORM_CONTENT_TYPES_CONTAINER } from "./PlatformContentTypesContainer.js";
+/**
+ * @ignore
+ */
+export function getContentType(data, ctx) {
+    const { endpoint, response } = ctx;
+    const { operation } = endpoint;
+    const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
+    if (contentType && contentType !== ANY_CONTENT_TYPE) {
+        if (contentType === "application/json" && isObject(data)) {
+            return "application/json";
+        }
+        return contentType;
+    }
+    if (endpoint.view) {
+        return "text/html";
+    }
+}
+/**
+ * @ignore
+ */
+function resolver(data, ctx) {
+    const contentType = getContentType(data, ctx);
+    if (ctx.request.get("Accept")) {
+        const { contentTypes } = inject(PLATFORM_CONTENT_TYPES_CONTAINER);
+        const bestContentType = ctx.request.accepts([contentType].concat(contentTypes).filter(Boolean));
+        if (bestContentType) {
+            return [].concat(bestContentType).filter((type) => type !== "*/*")[0];
+        }
+    }
+    return contentType;
+}
+export const PLATFORM_CONTENT_TYPE_RESOLVER = injectable(Symbol.for("PLATFORM_CONTENT_TYPE_RESOLVER"))
+    .factory(() => resolver)
+    .token();
+//# sourceMappingURL=PlatformContentTypeResolver.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PlatformContentTypeResolver.js","sourceRoot":"","sources":["../../../src/services/PlatformContentTypeResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AACpC,OAAO,EAAmB,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AAE9D,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAC,gCAAgC,EAAC,MAAM,oCAAoC,CAAC;AAEpF;;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,CAAC;QACpD,IAAI,WAAW,KAAK,kBAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,OAAO,kBAAkB,CAAC;QAC5B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,SAAS,QAAQ,CAAC,IAAS,EAAE,GAAgB;IAC3C,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAE9C,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9B,MAAM,EAAC,YAAY,EAAC,GAAG,MAAM,CAAmC,gCAAgC,CAAC,CAAC;QAElG,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAEhG,IAAI,eAAe,EAAE,CAAC;YACpB,OAAO,EAAE,CAAC,MAAM,CAAC,eAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAMD,MAAM,CAAC,MAAM,8BAA8B,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;KACnG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC;KACvB,KAAK,EAAE,CAAC"}

package/lib/esm/services/PlatformContentTypesContainer.js

@@ -0,0 +1,23 @@
+import { constant, inject, injectable } from "@tsed/di";
+import { ANY_CONTENT_TYPE } from "../constants/ANY_CONTENT_TYPE.js";
+import { ResponseFiltersContainer } from "../domain/ResponseFiltersContainer.js";
+function factory() {
+    const responseFilters = constant("responseFilters", []);
+    const containers = new Map();
+    ResponseFiltersContainer.forEach((token, type) => {
+        if (responseFilters.includes(token)) {
+            containers.set(type, token);
+        }
+    });
+    return {
+        contentTypes: [...containers.keys()],
+        resolve(bestContentType) {
+            const token = containers.get(bestContentType) || containers.get(ANY_CONTENT_TYPE);
+            if (token) {
+                return inject(token);
+            }
+        }
+    };
+}
+export const PLATFORM_CONTENT_TYPES_CONTAINER = injectable(Symbol.for("PLATFORM_CONTENT_TYPES_CONTAINER")).factory(factory).token();
+//# sourceMappingURL=PlatformContentTypesContainer.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"PlatformContentTypesContainer.js","sourceRoot":"","sources":["../../../src/services/PlatformContentTypesContainer.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAqB,MAAM,UAAU,CAAC;AAE1E,OAAO,EAAC,gBAAgB,EAAC,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAoB,wBAAwB,EAAC,MAAM,uCAAuC,CAAC;AAGlG,SAAS,OAAO;IACd,MAAM,eAAe,GAAG,QAAQ,CAAgC,iBAAiB,EAAE,EAAE,CAAC,CAAC;IACvF,MAAM,UAAU,GAA0C,IAAI,GAAG,EAAE,CAAC;IAEpE,wBAAwB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC/C,IAAI,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,YAAY,EAAE,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,CAAC;QACpC,OAAO,CAAC,eAAuB;YAC7B,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;YAElF,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,MAAM,CAAwB,KAAK,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAGD,MAAM,CAAC,MAAM,gCAAgC,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC"}

package/lib/esm/services/PlatformResponseFilter.js

@@ -1,35 +1,17 @@
 import { isSerializable } from "@tsed/core";
 import { constant, inject, injectable } 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";
+import { PLATFORM_CONTENT_TYPE_RESOLVER } from "./PlatformContentTypeResolver.js";
+import { PLATFORM_CONTENT_TYPES_CONTAINER } from "./PlatformContentTypesContainer.js";
 /**
  * @platform
  */
 export class PlatformResponseFilter {
     constructor() {
-        this.types = new Map();
-        this.responseFilters = constant("responseFilters", []);
         this.additionalProperties = constant("additionalProperties");
-        ResponseFiltersContainer.forEach((token, type) => {
-            if (this.responseFilters.includes(token)) {
-                this.types.set(type, token);
-            }
-        });
-    }
-    get contentTypes() {
-        return [...this.types.keys()];
-    }
-    getBestContentType(data, ctx) {
-        const contentType = getContentType(data, ctx);
-        if (ctx.request.get("Accept")) {
-            const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));
-            if (bestContentType) {
-                return [].concat(bestContentType).filter((type) => type !== "*/*")[0];
-            }
-        }
-        return contentType;
+        this.container = inject(PLATFORM_CONTENT_TYPES_CONTAINER);
+        this.contentTypeResolver = inject(PLATFORM_CONTENT_TYPE_RESOLVER);
     }
     /**
      * Call filters to transform data
@@ -39,9 +21,9 @@ export class PlatformResponseFilter {
     transform(data, ctx) {
         const { response } = ctx;
         if (ctx.endpoint?.operation) {
-            const bestContentType = this.getBestContentType(data, ctx);
+            const bestContentType = this.contentTypeResolver(data, ctx);
             bestContentType && response.contentType(bestContentType);
-            const resolved = this.resolve(bestContentType);
+            const resolved = this.container.resolve(bestContentType);
             if (resolved) {
                 return resolved.transform(data, ctx);
             }
@@ -73,12 +55,6 @@ export class PlatformResponseFilter {
         }
         return data;
     }
-    resolve(bestContentType) {
-        const token = this.types.get(bestContentType) || this.types.get(ANY_CONTENT_TYPE);
-        if (token) {
-            return inject(token);
-        }
-    }
     getIncludes(ctx) {
         if (ctx.request.query.includes) {
             return [].concat(ctx.request.query.includes).flatMap((include) => include.split(","));

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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"}
+{"version":3,"file":"PlatformResponseFilter.js","sourceRoot":"","sources":["../../../src/services/PlatformResponseFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAC,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAc,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAC,MAAM,UAAU,CAAC;AACnE,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAE5C,OAAO,EAAC,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAC,8BAA8B,EAAC,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAAC,gCAAgC,EAAC,MAAM,oCAAoC,CAAC;AAEpF;;GAEG;AACH,MAAM,OAAO,sBAAsB;IAAnC;QACY,yBAAoB,GAAG,QAAQ,CAAU,sBAAsB,CAAC,CAAC;QACjE,cAAS,GAAG,MAAM,CAAmC,gCAAgC,CAAC,CAAC;QACvF,wBAAmB,GAAG,MAAM,CAAiC,8BAA8B,CAAC,CAAC;IA4DzG,CAAC;IA1DC;;;;OAIG;IACH,SAAS,CAAC,IAAa,EAAE,GAAgB;QACvC,MAAM,EAAC,QAAQ,EAAC,GAAG,GAAG,CAAC;QAEvB,IAAI,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,CAAC;YAC5B,MAAM,eAAe,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YAE5D,eAAe,IAAI,QAAQ,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;YAEzD,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YAEzD,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACvC,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,SAAS,CAAC,IAAa,EAAE,GAAgB;QAC7C,MAAM,EAAC,QAAQ,EAAE,QAAQ,EAAC,GAAG,GAAG,CAAC;QAEjC,IAAI,QAAQ,EAAE,CAAC;YACb,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAClB,IAAI,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACrC,CAAC;iBAAM,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;gBAChC,MAAM,YAAY,GAAG,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,EAAE;oBACpE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC;iBAChC,CAAC,CAAC;gBAEH,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE;oBACrB,QAAQ,EAAE,IAAI;oBACd,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;oBAC/C,GAAG,YAAY;oBACf,QAAQ,EAAE,IAAI;iBACf,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,WAAW,CAAC,GAAgB;QAClC,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAChG,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAED,UAAU,CAAC,sBAAsB,CAAC,CAAC"}

package/lib/types/constants/ANY_CONTENT_TYPE.d.ts

@@ -0,0 +1 @@
+export declare const ANY_CONTENT_TYPE = "*/*";

package/lib/types/index.d.ts

@@ -1,10 +1,12 @@
 /**
  * @file Automatically generated by @tsed/barrels.
  */
+export * from "./constants/ANY_CONTENT_TYPE.js";
 export * from "./decorators/responseFilter.js";
 export * from "./domain/ResponseFiltersContainer.js";
 export * from "./errors/TemplateRenderError.js";
 export * from "./interfaces/ResponseFilterMethods.js";
+export * from "./services/PlatformContentTypeResolver.js";
+export * from "./services/PlatformContentTypesContainer.js";
 export * from "./services/PlatformResponseFilter.js";
-export * from "./utils/getContentType.js";
 export * from "./utils/renderView.js";

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

@@ -0,0 +1,15 @@
+import { type BaseContext } from "@tsed/di";
+/**
+ * @ignore
+ */
+export declare function getContentType(data: any, ctx: BaseContext): any;
+/**
+ * @ignore
+ */
+declare function resolver(data: any, ctx: BaseContext): any;
+/**
+ * @ignore
+ */
+export type PLATFORM_CONTENT_TYPE_RESOLVER = typeof resolver;
+export declare const PLATFORM_CONTENT_TYPE_RESOLVER: any;
+export {};

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

@@ -0,0 +1,8 @@
+import type { ResponseFilterMethods } from "../interfaces/ResponseFilterMethods.js";
+declare function factory(): {
+    contentTypes: string[];
+    resolve(bestContentType: string): ResponseFilterMethods<unknown> | undefined;
+};
+export type PLATFORM_CONTENT_TYPES_CONTAINER = ReturnType<typeof factory>;
+export declare const PLATFORM_CONTENT_TYPES_CONTAINER: any;
+export {};

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

@@ -1,17 +1,14 @@
-import { Type } from "@tsed/core";
-import { BaseContext, TokenProvider } from "@tsed/di";
-import { ResponseFilterKey } from "../domain/ResponseFiltersContainer.js";
-import { ResponseFilterMethods } from "../interfaces/ResponseFilterMethods.js";
+import { BaseContext } from "@tsed/di";
 /**
  * @platform
  */
 export declare class PlatformResponseFilter {
-    protected types: Map<ResponseFilterKey, TokenProvider>;
-    protected responseFilters: Type<ResponseFilterMethods<unknown>>[];
     protected additionalProperties: boolean | undefined;
-    constructor();
-    get contentTypes(): ResponseFilterKey[];
-    getBestContentType(data: any, ctx: BaseContext): any;
+    protected container: {
+        contentTypes: string[];
+        resolve(bestContentType: string): import("../index.js").ResponseFilterMethods<unknown> | undefined;
+    };
+    protected contentTypeResolver: (data: any, ctx: BaseContext) => any;
     /**
      * Call filters to transform data
      * @param data
@@ -24,6 +21,5 @@ export declare class PlatformResponseFilter {
      * @param ctx
      */
     serialize(data: unknown, ctx: BaseContext): Promise<unknown>;
-    private resolve;
     private getIncludes;
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/platform-response-filter",
   "description": "Platform response filter module for Ts.ED Framework",
   "type": "module",
-  "version": "8.1.0",
+  "version": "8.3.0",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -26,23 +26,23 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.1.0",
-    "@tsed/core": "8.1.0",
-    "@tsed/di": "8.1.0",
-    "@tsed/exceptions": "8.1.0",
-    "@tsed/json-mapper": "8.1.0",
-    "@tsed/schema": "8.1.0",
-    "@tsed/typescript": "8.1.0",
+    "@tsed/barrels": "8.3.0",
+    "@tsed/core": "8.3.0",
+    "@tsed/di": "8.3.0",
+    "@tsed/exceptions": "8.3.0",
+    "@tsed/json-mapper": "8.3.0",
+    "@tsed/schema": "8.3.0",
+    "@tsed/typescript": "8.3.0",
     "eslint": "9.12.0",
     "typescript": "5.4.5",
     "vitest": "2.1.2"
   },
   "peerDependencies": {
-    "@tsed/core": "8.1.0",
-    "@tsed/di": "8.1.0",
-    "@tsed/exceptions": "8.1.0",
-    "@tsed/json-mapper": "8.1.0",
-    "@tsed/schema": "8.1.0"
+    "@tsed/core": "8.3.0",
+    "@tsed/di": "8.3.0",
+    "@tsed/exceptions": "8.3.0",
+    "@tsed/json-mapper": "8.3.0",
+    "@tsed/schema": "8.3.0"
   },
   "peerDependenciesMeta": {
     "@tsed/core": {

package/readme.md

@@ -1,5 +1,5 @@
 <p style="text-align: center" align="center">
- <a href="https://tsed.io" target="_blank"><img src="https://tsed.io/tsed-og.png" width="200" alt="Ts.ED logo"/></a>
+ <a href="https://tsed.io" target="_blank"><img src="https://tsed.devtsed-og.png" width="200" alt="Ts.ED logo"/></a>
 </p>
 
 <div align="center">

package/src/constants/ANY_CONTENT_TYPE.ts

@@ -0,0 +1 @@
+export const ANY_CONTENT_TYPE = "*/*";

package/src/index.ts

@@ -1,10 +1,12 @@
 /**
  * @file Automatically generated by @tsed/barrels.
  */
+export * from "./constants/ANY_CONTENT_TYPE.js";
 export * from "./decorators/responseFilter.js";
 export * from "./domain/ResponseFiltersContainer.js";
 export * from "./errors/TemplateRenderError.js";
 export * from "./interfaces/ResponseFilterMethods.js";
+export * from "./services/PlatformContentTypeResolver.js";
+export * from "./services/PlatformContentTypesContainer.js";
 export * from "./services/PlatformResponseFilter.js";
-export * from "./utils/getContentType.js";
 export * from "./utils/renderView.js";

package/src/{utils/getContentType.spec.ts → services/PlatformContentTypeResolver.spec.ts}

@@ -1,94 +1,102 @@
 import {PlatformTest} from "@tsed/platform-http/testing";
 import {EndpointMetadata, Get, Returns, View} from "@tsed/schema";
 
-import {getContentType} from "./getContentType.js";
+import {PLATFORM_CONTENT_TYPE_RESOLVER} from "./PlatformContentTypeResolver.js";
+import {PLATFORM_CONTENT_TYPES_CONTAINER} from "./PlatformContentTypesContainer.js";
+
+async function getTestFixture(contentTypes = ["application/json", "text/html"]) {
+  const contentTypeResolver = await PlatformTest.invoke<PLATFORM_CONTENT_TYPE_RESOLVER>(PLATFORM_CONTENT_TYPE_RESOLVER, [
+    {
+      token: PLATFORM_CONTENT_TYPES_CONTAINER,
+      use: {
+        contentTypes
+      }
+    }
+  ]);
+
+  const data = {
+    test: "test"
+  };
+
+  const ctx = PlatformTest.createRequestContext();
+  return {
+    data,
+    ctx,
+    contentTypeResolver
+  };
+}
 
-describe("getContentType", () => {
+describe("PlatformContentTypeResolver", () => {
   beforeEach(() => PlatformTest.create());
   afterEach(() => PlatformTest.reset());
 
-  it("should return the content type (undefined)", () => {
+  it("should return the content type (undefined)", async () => {
     class TestController {
       @Get("/")
       get() {}
     }
 
-    const ctx = PlatformTest.createRequestContext();
+    const {contentTypeResolver, ctx, data} = await getTestFixture();
+
     ctx.endpoint = EndpointMetadata.get(TestController, "get");
 
-    const result = getContentType(
-      {
-        test: "test"
-      },
-      ctx
-    );
+    const result = await contentTypeResolver(data, ctx);
 
     expect(result).toEqual(undefined);
   });
-  it("should return the content type (object - application/json)", () => {
+  it("should return the content type (object - application/json)", async () => {
     class TestController {
       @Get("/")
       @(Returns(200).ContentType("application/json"))
       get() {}
     }
 
-    const ctx = PlatformTest.createRequestContext();
+    const {contentTypeResolver, ctx, data} = await getTestFixture();
+
     ctx.endpoint = EndpointMetadata.get(TestController, "get");
     ctx.response.getRes().statusCode = 200;
+
     vi.spyOn(ctx.response, "getContentType").mockReturnValue("application/json");
 
-    const result = getContentType(
-      {
-        test: "test"
-      },
-      ctx
-    );
+    const result = contentTypeResolver(data, ctx);
 
     expect(result).toEqual("application/json");
   });
-  it("should return the content type (string - application/json)", () => {
+  it("should return the content type (string - application/json)", async () => {
     class TestController {
       @Get("/")
       @(Returns(200).ContentType("application/json"))
       get() {}
     }
 
-    const ctx = PlatformTest.createRequestContext();
+    const {contentTypeResolver, ctx, data} = await getTestFixture();
+
     ctx.endpoint = EndpointMetadata.get(TestController, "get");
     ctx.response.getRes().statusCode = 200;
     vi.spyOn(ctx.response, "getContentType").mockReturnValue("application/json");
 
-    const result = getContentType(
-      {
-        test: "test"
-      },
-      ctx
-    );
+    const result = contentTypeResolver(data, ctx);
 
     expect(result).toEqual("application/json");
   });
-  it("should return the content type (string - text/html)", () => {
+  it("should return the content type (string - text/html)", async () => {
     class TestController {
       @Get("/")
       @(Returns(200).ContentType("text/html"))
       get() {}
     }
 
-    const ctx = PlatformTest.createRequestContext();
+    const {contentTypeResolver, ctx, data} = await getTestFixture();
+
     ctx.endpoint = EndpointMetadata.get(TestController, "get");
     ctx.response.getRes().statusCode = 200;
     vi.spyOn(ctx.response, "getContentType").mockReturnValue("text/html");
 
-    const result = getContentType(
-      {
-        test: "test"
-      },
-      ctx
-    );
+    const result = contentTypeResolver(data, ctx);
 
     expect(result).toEqual("text/html");
   });
-  it("should return the content type (string - view)", () => {
+  it("should return the content type (string - view)", async () => {
     class TestController {
       @Get("/")
       @Returns(200)
@@ -96,17 +104,13 @@ describe("getContentType", () => {
       get() {}
     }
 
-    const ctx = PlatformTest.createRequestContext();
+    const {contentTypeResolver, ctx, data} = await getTestFixture();
+
     ctx.endpoint = EndpointMetadata.get(TestController, "get");
     ctx.response.getRes().statusCode = 200;
     ctx.view = "true";
 
-    const result = getContentType(
-      {
-        test: "test"
-      },
-      ctx
-    );
+    const result = contentTypeResolver(data, ctx);
 
     expect(result).toEqual("text/html");
   });

package/src/services/PlatformContentTypeResolver.ts

@@ -0,0 +1,54 @@
+import {isObject} from "@tsed/core";
+import {type BaseContext, inject, injectable} from "@tsed/di";
+
+import {ANY_CONTENT_TYPE} from "../constants/ANY_CONTENT_TYPE.js";
+import {PLATFORM_CONTENT_TYPES_CONTAINER} from "./PlatformContentTypesContainer.js";
+
+/**
+ * @ignore
+ */
+export function getContentType(data: any, ctx: BaseContext) {
+  const {endpoint, response} = ctx;
+  const {operation} = endpoint;
+
+  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
+
+  if (contentType && contentType !== ANY_CONTENT_TYPE) {
+    if (contentType === "application/json" && isObject(data)) {
+      return "application/json";
+    }
+
+    return contentType;
+  }
+
+  if (endpoint.view) {
+    return "text/html";
+  }
+}
+
+/**
+ * @ignore
+ */
+function resolver(data: any, ctx: BaseContext) {
+  const contentType = getContentType(data, ctx);
+
+  if (ctx.request.get("Accept")) {
+    const {contentTypes} = inject<PLATFORM_CONTENT_TYPES_CONTAINER>(PLATFORM_CONTENT_TYPES_CONTAINER);
+
+    const bestContentType = ctx.request.accepts([contentType].concat(contentTypes).filter(Boolean));
+
+    if (bestContentType) {
+      return [].concat(bestContentType as any).filter((type) => type !== "*/*")[0];
+    }
+  }
+
+  return contentType;
+}
+
+/**
+ * @ignore
+ */
+export type PLATFORM_CONTENT_TYPE_RESOLVER = typeof resolver;
+export const PLATFORM_CONTENT_TYPE_RESOLVER = injectable(Symbol.for("PLATFORM_CONTENT_TYPE_RESOLVER"))
+  .factory(() => resolver)
+  .token();

package/src/services/PlatformContentTypesContainer.ts

@@ -0,0 +1,31 @@
+import type {Type} from "@tsed/core";
+import {constant, inject, injectable, type TokenProvider} from "@tsed/di";
+
+import {ANY_CONTENT_TYPE} from "../constants/ANY_CONTENT_TYPE.js";
+import {ResponseFilterKey, ResponseFiltersContainer} from "../domain/ResponseFiltersContainer.js";
+import type {ResponseFilterMethods} from "../interfaces/ResponseFilterMethods.js";
+
+function factory() {
+  const responseFilters = constant<Type<ResponseFilterMethods>[]>("responseFilters", []);
+  const containers: Map<ResponseFilterKey, TokenProvider> = new Map();
+
+  ResponseFiltersContainer.forEach((token, type) => {
+    if (responseFilters.includes(token)) {
+      containers.set(type, token);
+    }
+  });
+
+  return {
+    contentTypes: [...containers.keys()],
+    resolve(bestContentType: string) {
+      const token = containers.get(bestContentType) || containers.get(ANY_CONTENT_TYPE);
+
+      if (token) {
+        return inject<ResponseFilterMethods>(token);
+      }
+    }
+  };
+}
+
+export type PLATFORM_CONTENT_TYPES_CONTAINER = ReturnType<typeof factory>;
+export const PLATFORM_CONTENT_TYPES_CONTAINER = injectable(Symbol.for("PLATFORM_CONTENT_TYPES_CONTAINER")).factory(factory).token();

package/src/services/PlatformResponseFilter.ts

@@ -1,45 +1,18 @@
-import {isSerializable, Type} from "@tsed/core";
-import {BaseContext, constant, inject, injectable, TokenProvider} from "@tsed/di";
+import {isSerializable} from "@tsed/core";
+import {BaseContext, constant, inject, injectable} from "@tsed/di";
 import {serialize} from "@tsed/json-mapper";
 
-import {ResponseFilterKey, ResponseFiltersContainer} from "../domain/ResponseFiltersContainer.js";
-import {ResponseFilterMethods} from "../interfaces/ResponseFilterMethods.js";
-import {ANY_CONTENT_TYPE, getContentType} from "../utils/getContentType.js";
 import {renderView} from "../utils/renderView.js";
+import {PLATFORM_CONTENT_TYPE_RESOLVER} from "./PlatformContentTypeResolver.js";
+import {PLATFORM_CONTENT_TYPES_CONTAINER} from "./PlatformContentTypesContainer.js";
 
 /**
  * @platform
  */
 export class PlatformResponseFilter {
-  protected types: Map<ResponseFilterKey, TokenProvider> = new Map();
-  protected responseFilters = constant<Type<ResponseFilterMethods>[]>("responseFilters", []);
   protected additionalProperties = constant<boolean>("additionalProperties");
-
-  constructor() {
-    ResponseFiltersContainer.forEach((token, type) => {
-      if (this.responseFilters.includes(token)) {
-        this.types.set(type, token);
-      }
-    });
-  }
-
-  get contentTypes(): ResponseFilterKey[] {
-    return [...this.types.keys()];
-  }
-
-  getBestContentType(data: any, ctx: BaseContext) {
-    const contentType = getContentType(data, ctx);
-
-    if (ctx.request.get("Accept")) {
-      const bestContentType = ctx.request.accepts([contentType].concat(this.contentTypes).filter(Boolean));
-
-      if (bestContentType) {
-        return [].concat(bestContentType as any).filter((type) => type !== "*/*")[0];
-      }
-    }
-
-    return contentType;
-  }
+  protected container = inject<PLATFORM_CONTENT_TYPES_CONTAINER>(PLATFORM_CONTENT_TYPES_CONTAINER);
+  protected contentTypeResolver = inject<PLATFORM_CONTENT_TYPE_RESOLVER>(PLATFORM_CONTENT_TYPE_RESOLVER);
 
   /**
    * Call filters to transform data
@@ -50,11 +23,11 @@ export class PlatformResponseFilter {
     const {response} = ctx;
 
     if (ctx.endpoint?.operation) {
-      const bestContentType = this.getBestContentType(data, ctx);
+      const bestContentType = this.contentTypeResolver(data, ctx);
 
       bestContentType && response.contentType(bestContentType);
 
-      const resolved = this.resolve(bestContentType);
+      const resolved = this.container.resolve(bestContentType);
 
       if (resolved) {
         return resolved.transform(data, ctx);
@@ -92,14 +65,6 @@ export class PlatformResponseFilter {
     return data;
   }
 
-  private resolve(bestContentType: string) {
-    const token = this.types.get(bestContentType) || this.types.get(ANY_CONTENT_TYPE);
-
-    if (token) {
-      return inject<ResponseFilterMethods>(token);
-    }
-  }
-
   private getIncludes(ctx: BaseContext) {
     if (ctx.request.query.includes) {
       return [].concat(ctx.request.query.includes).flatMap((include: string) => include.split(","));

package/lib/esm/utils/getContentType.js

@@ -1,20 +0,0 @@
-import { isObject } from "@tsed/core";
-export const ANY_CONTENT_TYPE = "*/*";
-/**
- * @ignore
- */
-export function getContentType(data, ctx) {
-    const { endpoint, response } = ctx;
-    const { operation } = endpoint;
-    const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
-    if (contentType && contentType !== ANY_CONTENT_TYPE) {
-        if (contentType === "application/json" && isObject(data)) {
-            return "application/json";
-        }
-        return contentType;
-    }
-    if (endpoint.view) {
-        return "text/html";
-    }
-}
-//# sourceMappingURL=getContentType.js.map

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

@@ -1 +0,0 @@
-{"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,CAAC;QACpD,IAAI,WAAW,KAAK,kBAAkB,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YACzD,OAAO,kBAAkB,CAAC;QAC5B,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC;QAClB,OAAO,WAAW,CAAC;IACrB,CAAC;AACH,CAAC"}

package/lib/types/utils/getContentType.d.ts

@@ -1,6 +0,0 @@
-import type { BaseContext } from "@tsed/di";
-export declare const ANY_CONTENT_TYPE = "*/*";
-/**
- * @ignore
- */
-export declare function getContentType(data: any, ctx: BaseContext): any;

package/src/utils/getContentType.ts

@@ -1,26 +0,0 @@
-import {isObject} from "@tsed/core";
-import type {BaseContext} from "@tsed/di";
-
-export const ANY_CONTENT_TYPE = "*/*";
-
-/**
- * @ignore
- */
-export function getContentType(data: any, ctx: BaseContext) {
-  const {endpoint, response} = ctx;
-  const {operation} = endpoint;
-
-  const contentType = response.getContentType() || operation.getContentTypeOf(response.statusCode) || "";
-
-  if (contentType && contentType !== ANY_CONTENT_TYPE) {
-    if (contentType === "application/json" && isObject(data)) {
-      return "application/json";
-    }
-
-    return contentType;
-  }
-
-  if (endpoint.view) {
-    return "text/html";
-  }
-}