@nestjs/platform-express 8.3.1 → 8.4.2

package/Readme.md

@@ -54,7 +54,7 @@ With official support, you can get expert help straight from Nest core team. We
 
 ## Support
 
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
+Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support from the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
 
 #### Principal Sponsors
 <table style="text-align:center;"><tr>

package/adapters/express-adapter.js

@@ -20,20 +20,26 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
         if (statusCode) {
             response.status(statusCode);
         }
-        if (shared_utils_1.isNil(body)) {
+        if ((0, shared_utils_1.isNil)(body)) {
             return response.send();
         }
         if (body instanceof common_1.StreamableFile) {
             const streamHeaders = body.getHeaders();
-            if (response.getHeader('Content-Type') === undefined) {
+            if (response.getHeader('Content-Type') === undefined &&
+                streamHeaders.type !== undefined) {
                 response.setHeader('Content-Type', streamHeaders.type);
             }
-            if (response.getHeader('Content-Disposition') === undefined) {
+            if (response.getHeader('Content-Disposition') === undefined &&
+                streamHeaders.disposition !== undefined) {
                 response.setHeader('Content-Disposition', streamHeaders.disposition);
             }
+            if (response.getHeader('Content-Length') === undefined &&
+                streamHeaders.length !== undefined) {
+                response.setHeader('Content-Length', streamHeaders.length);
+            }
             return body.getStream().pipe(response);
         }
-        return shared_utils_1.isObject(body) ? response.json(body) : response.send(String(body));
+        return (0, shared_utils_1.isObject)(body) ? response.json(body) : response.send(String(body));
     }
     status(response, statusCode) {
         return response.status(statusCode);
@@ -113,8 +119,8 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
     }
     registerParserMiddleware() {
         const parserMiddleware = {
-            jsonParser: body_parser_1.json(),
-            urlencodedParser: body_parser_1.urlencoded({ extended: true }),
+            jsonParser: (0, body_parser_1.json)(),
+            urlencodedParser: (0, body_parser_1.urlencoded)({ extended: true }),
         };
         Object.keys(parserMiddleware)
             .filter(parser => !this.isMiddlewareApplied(parser))
@@ -137,6 +143,34 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
             if (versioningOptions.type === common_1.VersioningType.URI) {
                 return handler(req, res, next);
             }
+            // Custom Extractor Versioning Handler
+            if (versioningOptions.type === common_1.VersioningType.CUSTOM) {
+                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) &&
+                        version.includes(extractedVersion)) {
+                        return handler(req, res, next);
+                    }
+                }
+                else if ((0, shared_utils_1.isString)(version)) {
+                    // Known bug here - if there are multiple versions supported across separate
+                    // handlers/controllers, we can't select the highest matching handler.
+                    // Since this code is evaluated per-handler, then we can't see if the highest
+                    // specified version exists in a different handler.
+                    if (Array.isArray(extractedVersion) &&
+                        extractedVersion.includes(version)) {
+                        return handler(req, res, next);
+                    }
+                    else 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) {
                 const MEDIA_TYPE_HEADER = 'Accept';
@@ -152,7 +186,7 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
                             return handler(req, res, next);
                         }
                     }
-                    else if (shared_utils_1.isString(version)) {
+                    else if ((0, shared_utils_1.isString)(version)) {
                         if (version === headerVersion) {
                             return handler(req, res, next);
                         }
@@ -169,7 +203,7 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
                             return handler(req, res, next);
                         }
                     }
-                    else if (shared_utils_1.isString(version)) {
+                    else if ((0, shared_utils_1.isString)(version)) {
                         if (version === customHeaderVersionParameter) {
                             return handler(req, res, next);
                         }
@@ -186,7 +220,7 @@ class ExpressAdapter extends http_adapter_1.AbstractHttpAdapter {
         const app = this.getInstance();
         return (!!app._router &&
             !!app._router.stack &&
-            shared_utils_1.isFunction(app._router.stack.filter) &&
+            (0, shared_utils_1.isFunction)(app._router.stack.filter) &&
             app._router.stack.some((layer) => layer && layer.handle && layer.handle.name === name));
     }
 }

package/multer/interceptors/any-files.interceptor.js

@@ -15,7 +15,7 @@ function AnyFilesInterceptor(localOptions) {
             const ctx = context.switchToHttp();
             await new Promise((resolve, reject) => this.multer.any()(ctx.getRequest(), ctx.getResponse(), (err) => {
                 if (err) {
-                    const error = multer_utils_1.transformException(err);
+                    const error = (0, multer_utils_1.transformException)(err);
                     return reject(error);
                 }
                 resolve();
@@ -24,11 +24,11 @@ function AnyFilesInterceptor(localOptions) {
         }
     };
     MixinInterceptor = tslib_1.__decorate([
-        tslib_1.__param(0, common_1.Optional()),
-        tslib_1.__param(0, common_1.Inject(files_constants_1.MULTER_MODULE_OPTIONS)),
+        tslib_1.__param(0, (0, common_1.Optional)()),
+        tslib_1.__param(0, (0, common_1.Inject)(files_constants_1.MULTER_MODULE_OPTIONS)),
         tslib_1.__metadata("design:paramtypes", [Object])
     ], MixinInterceptor);
-    const Interceptor = common_1.mixin(MixinInterceptor);
+    const Interceptor = (0, common_1.mixin)(MixinInterceptor);
     return Interceptor;
 }
 exports.AnyFilesInterceptor = AnyFilesInterceptor;

package/multer/interceptors/file-fields.interceptor.js

@@ -15,7 +15,7 @@ function FileFieldsInterceptor(uploadFields, localOptions) {
             const ctx = context.switchToHttp();
             await new Promise((resolve, reject) => this.multer.fields(uploadFields)(ctx.getRequest(), ctx.getResponse(), (err) => {
                 if (err) {
-                    const error = multer_utils_1.transformException(err);
+                    const error = (0, multer_utils_1.transformException)(err);
                     return reject(error);
                 }
                 resolve();
@@ -24,11 +24,11 @@ function FileFieldsInterceptor(uploadFields, localOptions) {
         }
     };
     MixinInterceptor = tslib_1.__decorate([
-        tslib_1.__param(0, common_1.Optional()),
-        tslib_1.__param(0, common_1.Inject(files_constants_1.MULTER_MODULE_OPTIONS)),
+        tslib_1.__param(0, (0, common_1.Optional)()),
+        tslib_1.__param(0, (0, common_1.Inject)(files_constants_1.MULTER_MODULE_OPTIONS)),
         tslib_1.__metadata("design:paramtypes", [Object])
     ], MixinInterceptor);
-    const Interceptor = common_1.mixin(MixinInterceptor);
+    const Interceptor = (0, common_1.mixin)(MixinInterceptor);
     return Interceptor;
 }
 exports.FileFieldsInterceptor = FileFieldsInterceptor;

package/multer/interceptors/file.interceptor.js

@@ -15,7 +15,7 @@ function FileInterceptor(fieldName, localOptions) {
             const ctx = context.switchToHttp();
             await new Promise((resolve, reject) => this.multer.single(fieldName)(ctx.getRequest(), ctx.getResponse(), (err) => {
                 if (err) {
-                    const error = multer_utils_1.transformException(err);
+                    const error = (0, multer_utils_1.transformException)(err);
                     return reject(error);
                 }
                 resolve();
@@ -24,11 +24,11 @@ function FileInterceptor(fieldName, localOptions) {
         }
     };
     MixinInterceptor = tslib_1.__decorate([
-        tslib_1.__param(0, common_1.Optional()),
-        tslib_1.__param(0, common_1.Inject(files_constants_1.MULTER_MODULE_OPTIONS)),
+        tslib_1.__param(0, (0, common_1.Optional)()),
+        tslib_1.__param(0, (0, common_1.Inject)(files_constants_1.MULTER_MODULE_OPTIONS)),
         tslib_1.__metadata("design:paramtypes", [Object])
     ], MixinInterceptor);
-    const Interceptor = common_1.mixin(MixinInterceptor);
+    const Interceptor = (0, common_1.mixin)(MixinInterceptor);
     return Interceptor;
 }
 exports.FileInterceptor = FileInterceptor;

package/multer/interceptors/files.interceptor.js

@@ -15,7 +15,7 @@ function FilesInterceptor(fieldName, maxCount, localOptions) {
             const ctx = context.switchToHttp();
             await new Promise((resolve, reject) => this.multer.array(fieldName, maxCount)(ctx.getRequest(), ctx.getResponse(), (err) => {
                 if (err) {
-                    const error = multer_utils_1.transformException(err);
+                    const error = (0, multer_utils_1.transformException)(err);
                     return reject(error);
                 }
                 resolve();
@@ -24,11 +24,11 @@ function FilesInterceptor(fieldName, maxCount, localOptions) {
         }
     };
     MixinInterceptor = tslib_1.__decorate([
-        tslib_1.__param(0, common_1.Optional()),
-        tslib_1.__param(0, common_1.Inject(files_constants_1.MULTER_MODULE_OPTIONS)),
+        tslib_1.__param(0, (0, common_1.Optional)()),
+        tslib_1.__param(0, (0, common_1.Inject)(files_constants_1.MULTER_MODULE_OPTIONS)),
         tslib_1.__metadata("design:paramtypes", [Object])
     ], MixinInterceptor);
-    const Interceptor = common_1.mixin(MixinInterceptor);
+    const Interceptor = (0, common_1.mixin)(MixinInterceptor);
     return Interceptor;
 }
 exports.FilesInterceptor = FilesInterceptor;

package/multer/multer.module.js

@@ -15,7 +15,7 @@ let MulterModule = MulterModule_1 = class MulterModule {
                 { provide: files_constants_1.MULTER_MODULE_OPTIONS, useValue: options },
                 {
                     provide: multer_constants_1.MULTER_MODULE_ID,
-                    useValue: random_string_generator_util_1.randomStringGenerator(),
+                    useValue: (0, random_string_generator_util_1.randomStringGenerator)(),
                 },
             ],
             exports: [files_constants_1.MULTER_MODULE_OPTIONS],
@@ -29,7 +29,7 @@ let MulterModule = MulterModule_1 = class MulterModule {
                 ...this.createAsyncProviders(options),
                 {
                     provide: multer_constants_1.MULTER_MODULE_ID,
-                    useValue: random_string_generator_util_1.randomStringGenerator(),
+                    useValue: (0, random_string_generator_util_1.randomStringGenerator)(),
                 },
             ],
             exports: [files_constants_1.MULTER_MODULE_OPTIONS],
@@ -63,6 +63,6 @@ let MulterModule = MulterModule_1 = class MulterModule {
     }
 };
 MulterModule = MulterModule_1 = tslib_1.__decorate([
-    common_1.Module({})
+    (0, common_1.Module)({})
 ], MulterModule);
 exports.MulterModule = MulterModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "8.3.1",
+  "version": "8.4.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -17,15 +17,15 @@
     "access": "public"
   },
   "dependencies": {
-    "body-parser": "1.19.1",
+    "body-parser": "1.19.2",
     "cors": "2.8.5",
-    "express": "4.17.2",
+    "express": "4.17.3",
     "multer": "1.4.4",
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@nestjs/common": "8.3.1",
-    "@nestjs/core": "8.3.1"
+    "@nestjs/common": "8.4.2",
+    "@nestjs/core": "8.4.2"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

package/CHANGELOG.md

@@ -1,12 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-<a name="8.2.0"></a>
-# [8.2.0](https://github.com/nestjs/nest/compare/v8.1.2...v8.2.0) (2021-11-08)
-
-
-### Features
-
-* **common:** add the ability to set some extra metadata about returned files ([5100573](https://github.com/nestjs/nest/commit/5100573))