@nestjs/platform-express 12.1.1 → 12.1.2

package/adapters/express-adapter.js

@@ -5,9 +5,16 @@ import * as http from 'http';
 import * as https from 'https';
 import { pathToRegexp } from 'path-to-regexp';
 import { getBodyParserOptions } from './utils/get-body-parser-options.util.js';
+import { getMediaTypeVersion } from './utils/get-media-type-version.util.js';
 import { addLeadingSlash, isFunction, isNil, isObject, isString, isUndefined, stripEndSlash, } from '@nestjs/common/internal';
 import { AbstractHttpAdapter } from '@nestjs/core';
 import { RouterMethodFactory, LegacyRouteConverter, } from '@nestjs/core/internal';
+// Covers "application/json" and the "+json" structured syntax suffix (RFC 6839),
+// e.g. "application/problem+json", with or without parameters.
+function isJsonContentType(contentType) {
+    const mediaType = contentType.split(';')[0].trim().toLowerCase();
+    return (mediaType.startsWith('application/json') || mediaType.endsWith('+json'));
+}
 /**
  * @publicApi
  */
@@ -60,7 +67,7 @@ export class ExpressAdapter extends AbstractHttpAdapter {
         }
         const responseContentType = response.getHeader('Content-Type');
         if (typeof responseContentType === 'string' &&
-            !responseContentType.startsWith('application/json') &&
+            !isJsonContentType(responseContentType) &&
             body?.statusCode >= HttpStatus.BAD_REQUEST) {
             this.logger.warn("Content-Type doesn't match Reply body, you might need a custom ExceptionFilter for non-JSON responses");
             response.setHeader('Content-Type', 'application/json');
@@ -308,11 +315,9 @@ export class ExpressAdapter extends AbstractHttpAdapter {
                 const MEDIA_TYPE_HEADER = 'Accept';
                 const acceptHeaderValue = req.headers?.[MEDIA_TYPE_HEADER] ||
                     req.headers?.[MEDIA_TYPE_HEADER.toLowerCase()];
-                const acceptHeaderVersionParameter = acceptHeaderValue
-                    ? acceptHeaderValue.split(';')[1]
-                    : undefined;
+                const headerVersion = getMediaTypeVersion(acceptHeaderValue, versioningOptions.key);
                 // No version was supplied
-                if (isUndefined(acceptHeaderVersionParameter)) {
+                if (isUndefined(headerVersion)) {
                     if (Array.isArray(version)) {
                         if (version.includes(VERSION_NEUTRAL)) {
                             return handler(req, res, next);
@@ -320,7 +325,6 @@ export class ExpressAdapter extends AbstractHttpAdapter {
                     }
                 }
                 else {
-                    const headerVersion = acceptHeaderVersionParameter.split(versioningOptions.key)[1];
                     if (Array.isArray(version)) {
                         if (version.includes(headerVersion)) {
                             return handler(req, res, next);

package/adapters/utils/get-media-type-version.util.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Returns the version carried by an `Accept` header for media type versioning,
+ * e.g. `2` for `application/json;v=2` with the `v=` key.
+ *
+ * The version parameter may follow other parameters and may belong to any
+ * media range of a list (`text/html, application/json;v=2`); the first match
+ * wins. Returns `undefined` when no parameter starts with the key.
+ *
+ * Duplicated in each platform package so that a platform package never
+ * depends on a newer `@nestjs/core` than the one installed.
+ */
+export declare function getMediaTypeVersion(acceptHeader: string | string[] | undefined, key: string): string | undefined;

package/adapters/utils/get-media-type-version.util.js

@@ -0,0 +1,26 @@
+/**
+ * Returns the version carried by an `Accept` header for media type versioning,
+ * e.g. `2` for `application/json;v=2` with the `v=` key.
+ *
+ * The version parameter may follow other parameters and may belong to any
+ * media range of a list (`text/html, application/json;v=2`); the first match
+ * wins. Returns `undefined` when no parameter starts with the key.
+ *
+ * Duplicated in each platform package so that a platform package never
+ * depends on a newer `@nestjs/core` than the one installed.
+ */
+export function getMediaTypeVersion(acceptHeader, key) {
+    const mediaRanges = []
+        .concat(acceptHeader ?? [])
+        .flatMap(value => value.split(','));
+    for (const mediaRange of mediaRanges) {
+        const [, ...parameters] = mediaRange.split(';');
+        for (const parameter of parameters) {
+            const trimmedParameter = parameter.trim();
+            if (trimmedParameter.startsWith(key)) {
+                return trimmedParameter.slice(key.length);
+            }
+        }
+    }
+    return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "12.1.1",
+  "version": "12.1.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -32,12 +32,12 @@
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@nestjs/common": "12.1.1",
-    "@nestjs/core": "12.1.1"
+    "@nestjs/common": "12.1.2",
+    "@nestjs/core": "12.1.2"
   },
   "peerDependencies": {
     "@nestjs/common": "^12.0.0",
     "@nestjs/core": "^12.0.0"
   },
-  "gitHead": "9feedffde8ef8c86f0cd521153740575dc579d88"
+  "gitHead": "8ab60aa1b2927fbe0e23135ffc65d610c623236a"
 }