@nestjs/platform-express 8.0.4 → 8.0.8

package/Readme.md

@@ -67,8 +67,11 @@ 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.so/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td><td>
-<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" valign="middle" /></a></td></tr></table>
+<a href="https://weld.app/" target="_blank"><img src="https://nestjs.com/img/weld-logo.svg" width="150" valign="middle" /></a></td>
+  <td>
+<a href="https://valor-software.com/" target="_blank"><img src="https://docs.nestjs.com/assets/sponsors/valor-software.png" width="170" 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></</tr></table>
 
 #### Silver Sponsors
 
@@ -76,8 +79,9 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 <a href="https://neoteric.eu/" target="_blank"><img src="https://nestjs.com/img/neoteric-cut.png" width="120" valign="middle" /></a> </td><td>
   <a href="http://gojob.com" target="_blank"><img src="http://nestjs.com/img/gojob-logo.png" valign="middle" width="100" /></a> </td><td>
 <a href="http://www.leogistics.com" target="_blank"><img src="https://nestjs.com/img/leogistics-logo.jpeg" width="150" valign="middle" /></td><td>
-<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-wide-logo.png" width="150" valign="middle" /></td><td>
-<a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td></tr></table>
+<a href="http://www.meetdandy.com" target="_blank"><img src="https://nestjs.com/img/dandy-roles-logo.svg" width="150" valign="middle" /></td><td>
+<a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td>
+<td><a href="https://www.tinystacks.com" target="_blank"><img src="https://nestjs.com/img/tinystacks-logo.png" width="55" valign="middle" /></td></tr></table>
 
 #### Sponsors
 
@@ -108,6 +112,7 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
   <td align="center" valign="middle"><a href="https://www.bystored.com/" target="_blank"><img src="https://nestjs.com/img/stored-logo.svg" width="110" valign="middle" /></a></td>
   <td align="center" valign="middle"><a href="https://studyclerk.com/pay-for-research-paper" target="_blank"><img src="https://nestjs.com/img/studyclerk-logo.png" width="125" valign="middle" /></a></td><td align="center" valign="middle"><a href="https://xyndata.com" target="_blank"><img src="https://nestjs.com/img/xyndata-logo.png" width="125" valign="middle" /></a></td></tr><tr>
   <td align="center" valign="middle"><a href="https://www.anonymistic.com/" target="_blank"><img src="https://nestjs.com/img/anonymistic-logo.png" width="125" valign="middle" /></a></td>
+<td align="center" valign="middle"><a href="https://www.naologic.com/" target="_blank"><img src="https://nestjs.com/img/naologic-logo.svg" width="125" valign="middle" /></a></td>
   </tr></table>
 
 ## Backers

package/adapters/express-adapter.d.ts

@@ -1,10 +1,10 @@
 import { RequestMethod } from '@nestjs/common';
+import { VersioningOptions, 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';
 export declare class ExpressAdapter extends AbstractHttpAdapter {
-    private readonly routerMethodFactory;
     constructor(instance?: any);
     reply(response: any, body: any, statusCode?: number): any;
     status(response: any, statusCode: number): any;
@@ -32,5 +32,6 @@ export declare class ExpressAdapter extends AbstractHttpAdapter {
     registerParserMiddleware(): 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;
     private isMiddlewareApplied;
 }

package/adapters/express-adapter.js

@@ -2,9 +2,9 @@
 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");
 const bodyParser = require("body-parser");
 const cors = require("cors");
 const express = require("express");
@@ -13,7 +13,6 @@ const https = require("https");
 class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
     constructor(instance) {
         super(instance || express());
-        this.routerMethodFactory = new router_method_factory_1.RouterMethodFactory();
     }
     reply(response, body, statusCode) {
         if (statusCode) {
@@ -23,7 +22,9 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
             return response.send();
         }
         if (body instanceof common_1.StreamableFile) {
-            response.setHeader('Content-Type', 'application/octet-stream');
+            if (response.getHeader('Content-Type') === undefined) {
+                response.setHeader('Content-Type', 'application/octet-stream');
+            }
             return body.getStream().pipe(response);
         }
         return shared_utils_1.isObject(body) ? response.json(body) : response.send(String(body));
@@ -92,9 +93,7 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
         return this.use(cors(options));
     }
     createMiddlewareFactory(requestMethod) {
-        return this.routerMethodFactory
-            .get(this.instance, requestMethod)
-            .bind(this.instance);
+        return this.instance.use.bind(this.instance);
     }
     initHttpServer(options) {
         const isHttpsEnabled = options && options.httpsOptions;
@@ -120,6 +119,61 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
     getType() {
         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);
+            }
+            // URL Versioning is done via the path, so the filter continues forward
+            if (versioningOptions.type === common_1.VersioningType.URI) {
+                return handler(req, res, next);
+            }
+            // Media Type (Accept Header) Versioning Handler
+            if (versioningOptions.type === common_1.VersioningType.MEDIA_TYPE) {
+                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) {
+                    const headerVersion = acceptHeaderVersionParameter.split(versioningOptions.key)[1];
+                    if (Array.isArray(version)) {
+                        if (version.includes(headerVersion)) {
+                            return handler(req, res, next);
+                        }
+                    }
+                    else if (shared_utils_1.isString(version)) {
+                        if (version === headerVersion) {
+                            return handler(req, res, next);
+                        }
+                    }
+                }
+            }
+            // 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) {
+                    if (Array.isArray(version)) {
+                        if (version.includes(customHeaderVersionParameter)) {
+                            return handler(req, res, next);
+                        }
+                    }
+                    else if (shared_utils_1.isString(version)) {
+                        if (version === customHeaderVersionParameter) {
+                            return handler(req, res, next);
+                        }
+                    }
+                }
+            }
+            if (!next) {
+                throw new common_1.InternalServerErrorException('HTTP adapter does not support filtering on version');
+            }
+            return next();
+        };
+    }
     isMiddlewareApplied(name) {
         const app = this.getInstance();
         return (!!app._router &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "8.0.4",
+  "version": "8.0.8",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -20,12 +20,12 @@
     "body-parser": "1.19.0",
     "cors": "2.8.5",
     "express": "4.17.1",
-    "multer": "1.4.2",
-    "tslib": "2.3.0"
+    "multer": "1.4.3",
+    "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@nestjs/common": "8.0.4",
-    "@nestjs/core": "8.0.4"
+    "@nestjs/common": "8.0.8",
+    "@nestjs/core": "8.0.8"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",