@nestjs/platform-express 8.4.4 → 9.0.0-next.1

package/Readme.md

@@ -72,11 +72,12 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 
 <table style="text-align:center;"><tr><td>
   <a href="https://careers.labster.com/departments/platform" target="_blank"><img src="https://nestjs.com/img/labster-logo.png" width="170" valign="middle" /></a></td><td>
-<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td>
+<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="140" valign="middle" /></a></td>
 <td>
 <a href="https://intrinsic.ventures/" target="_blank"><img src="https://nestjs.com/img/intrinisic-logo.png" width="210" valign="middle" /></a></td>
  <td>
-<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td></</tr></table>
+<a href="https://jetbrains.com/" target="_blank"><img src="https://nestjs.com/img/jetbrains-logo.svg" width="110" valign="middle" /></a></td><td>
+<a href="https://snyk.co/nestjs" target="_blank"><img src="https://nestjs.com/img/snyk-logo-black.png" width="185" valign="middle" /></a></td></</tr></table>
 
 #### Silver Sponsors
 

package/adapters/express-adapter.d.ts

@@ -1,9 +1,10 @@
-import { RequestMethod } from '@nestjs/common';
-import { VersioningOptions, VersionValue } from '@nestjs/common/interfaces';
+import { RequestMethod, VersioningOptions } from '@nestjs/common';
+import { VersionValue } from '@nestjs/common/interfaces';
 import { CorsOptions, CorsOptionsDelegate } from '@nestjs/common/interfaces/external/cors-options.interface';
 import { NestApplicationOptions } from '@nestjs/common/interfaces/nest-application-options.interface';
 import { AbstractHttpAdapter } from '@nestjs/core/adapters/http-adapter';
 import { ServeStaticOptions } from '../interfaces/serve-static-options.interface';
+declare type VersionedRoute = <TRequest extends Record<string, any> = any, TResponse = any>(req: TRequest, res: TResponse, next: () => void) => any;
 export declare class ExpressAdapter extends AbstractHttpAdapter {
     private readonly routerMethodFactory;
     constructor(instance?: any);
@@ -30,9 +31,10 @@ export declare class ExpressAdapter extends AbstractHttpAdapter {
     enableCors(options: CorsOptions | CorsOptionsDelegate<any>): any;
     createMiddlewareFactory(requestMethod: RequestMethod): (path: string, callback: Function) => any;
     initHttpServer(options: NestApplicationOptions): void;
-    registerParserMiddleware(): void;
+    registerParserMiddleware(prefix?: string, rawBody?: boolean): void;
     setLocal(key: string, value: any): this;
     getType(): string;
-    applyVersionFilter(handler: Function, version: VersionValue, versioningOptions: VersioningOptions): <TRequest extends Record<string, any> = any, TResponse = any>(req: TRequest, res: TResponse, next: () => void) => any;
+    applyVersionFilter(handler: Function, version: VersionValue, versioningOptions: VersioningOptions): VersionedRoute;
     private isMiddlewareApplied;
 }
+export {};

package/adapters/express-adapter.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExpressAdapter = void 0;
 const common_1 = require("@nestjs/common");
-const interfaces_1 = require("@nestjs/common/interfaces");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const http_adapter_1 = require("@nestjs/core/adapters/http-adapter");
 const router_method_factory_1 = require("@nestjs/core/helpers/router-method-factory");
@@ -117,9 +116,20 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
         }
         this.httpServer = http.createServer(this.getInstance());
     }
-    registerParserMiddleware() {
+    registerParserMiddleware(prefix, rawBody) {
+        let bodyParserJsonOptions;
+        if (rawBody === true) {
+            bodyParserJsonOptions = {
+                verify: (req, _res, buffer) => {
+                    if (Buffer.isBuffer(buffer)) {
+                        req.rawBody = buffer;
+                    }
+                    return true;
+                },
+            };
+        }
         const parserMiddleware = {
-            jsonParser: (0, body_parser_1.json)(),
+            jsonParser: (0, body_parser_1.json)(bodyParserJsonOptions),
             urlencodedParser: (0, body_parser_1.urlencoded)({ extended: true }),
         };
         Object.keys(parserMiddleware)
@@ -134,24 +144,28 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
         return 'express';
     }
     applyVersionFilter(handler, version, versioningOptions) {
-        return (req, res, next) => {
-            var _a, _b, _c, _d;
-            if (version === interfaces_1.VERSION_NEUTRAL) {
-                return handler(req, res, next);
+        const callNextHandler = (req, res, next) => {
+            if (!next) {
+                throw new common_1.InternalServerErrorException('HTTP adapter does not support filtering on version');
             }
+            return next();
+        };
+        if (version === common_1.VERSION_NEUTRAL ||
             // URL Versioning is done via the path, so the filter continues forward
-            if (versioningOptions.type === common_1.VersioningType.URI) {
-                return handler(req, res, next);
-            }
-            // Custom Extractor Versioning Handler
-            if (versioningOptions.type === common_1.VersioningType.CUSTOM) {
+            versioningOptions.type === common_1.VersioningType.URI) {
+            const handlerForNoVersioning = (req, res, next) => handler(req, res, next);
+            return handlerForNoVersioning;
+        }
+        // Custom Extractor Versioning Handler
+        if (versioningOptions.type === common_1.VersioningType.CUSTOM) {
+            const handlerForCustomVersioning = (req, res, next) => {
                 const extractedVersion = versioningOptions.extractor(req);
                 if (Array.isArray(version)) {
                     if (Array.isArray(extractedVersion) &&
                         version.filter(v => extractedVersion.includes(v)).length) {
                         return handler(req, res, next);
                     }
-                    else if ((0, shared_utils_1.isString)(extractedVersion) &&
+                    if ((0, shared_utils_1.isString)(extractedVersion) &&
                         version.includes(extractedVersion)) {
                         return handler(req, res, next);
                     }
@@ -165,21 +179,33 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
                         extractedVersion.includes(version)) {
                         return handler(req, res, next);
                     }
-                    else if ((0, shared_utils_1.isString)(extractedVersion) &&
-                        version === extractedVersion) {
+                    if ((0, shared_utils_1.isString)(extractedVersion) && version === extractedVersion) {
                         return handler(req, res, next);
                     }
                 }
-            }
-            // Media Type (Accept Header) Versioning Handler
-            if (versioningOptions.type === common_1.VersioningType.MEDIA_TYPE) {
+                return callNextHandler(req, res, next);
+            };
+            return handlerForCustomVersioning;
+        }
+        // Media Type (Accept Header) Versioning Handler
+        if (versioningOptions.type === common_1.VersioningType.MEDIA_TYPE) {
+            const handlerForMediaTypeVersioning = (req, res, next) => {
+                var _a, _b;
                 const MEDIA_TYPE_HEADER = 'Accept';
                 const acceptHeaderValue = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a[MEDIA_TYPE_HEADER]) ||
                     ((_b = req.headers) === null || _b === void 0 ? void 0 : _b[MEDIA_TYPE_HEADER.toLowerCase()]);
                 const acceptHeaderVersionParameter = acceptHeaderValue
                     ? acceptHeaderValue.split(';')[1]
-                    : '';
-                if (acceptHeaderVersionParameter) {
+                    : undefined;
+                // No version was supplied
+                if ((0, shared_utils_1.isUndefined)(acceptHeaderVersionParameter)) {
+                    if (Array.isArray(version)) {
+                        if (version.includes(common_1.VERSION_NEUTRAL)) {
+                            return handler(req, res, next);
+                        }
+                    }
+                }
+                else {
                     const headerVersion = acceptHeaderVersionParameter.split(versioningOptions.key)[1];
                     if (Array.isArray(version)) {
                         if (version.includes(headerVersion)) {
@@ -192,12 +218,25 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
                         }
                     }
                 }
-            }
-            // Header Versioning Handler
-            else if (versioningOptions.type === common_1.VersioningType.HEADER) {
-                const customHeaderVersionParameter = ((_c = req.headers) === null || _c === void 0 ? void 0 : _c[versioningOptions.header]) ||
-                    ((_d = req.headers) === null || _d === void 0 ? void 0 : _d[versioningOptions.header.toLowerCase()]);
-                if (customHeaderVersionParameter) {
+                return callNextHandler(req, res, next);
+            };
+            return handlerForMediaTypeVersioning;
+        }
+        // Header Versioning Handler
+        if (versioningOptions.type === common_1.VersioningType.HEADER) {
+            const handlerForHeaderVersioning = (req, res, next) => {
+                var _a, _b;
+                const customHeaderVersionParameter = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a[versioningOptions.header]) ||
+                    ((_b = req.headers) === null || _b === void 0 ? void 0 : _b[versioningOptions.header.toLowerCase()]);
+                // No version was supplied
+                if ((0, shared_utils_1.isUndefined)(customHeaderVersionParameter)) {
+                    if (Array.isArray(version)) {
+                        if (version.includes(common_1.VERSION_NEUTRAL)) {
+                            return handler(req, res, next);
+                        }
+                    }
+                }
+                else {
                     if (Array.isArray(version)) {
                         if (version.includes(customHeaderVersionParameter)) {
                             return handler(req, res, next);
@@ -209,12 +248,10 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
                         }
                     }
                 }
-            }
-            if (!next) {
-                throw new common_1.InternalServerErrorException('HTTP adapter does not support filtering on version');
-            }
-            return next();
-        };
+                return callNextHandler(req, res, next);
+            };
+            return handlerForHeaderVersioning;
+        }
     }
     isMiddlewareApplied(name) {
         const app = this.getInstance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "8.4.4",
+  "version": "9.0.0-next.1",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -19,13 +19,13 @@
   "dependencies": {
     "body-parser": "1.20.0",
     "cors": "2.8.5",
-    "express": "4.17.3",
+    "express": "4.18.1",
     "multer": "1.4.4",
-    "tslib": "2.3.1"
+    "tslib": "2.4.0"
   },
   "devDependencies": {
-    "@nestjs/common": "8.4.4",
-    "@nestjs/core": "8.4.4"
+    "@nestjs/common": "^9.0.0-next.1",
+    "@nestjs/core": "^9.0.0-next.1"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",