@nestjs/platform-express 12.0.2 → 12.0.4

package/Readme.md

@@ -47,6 +47,10 @@ For questions and support please use the official [Discord channel](https://disc
 
 Please make sure to read the [Issue Reporting Checklist](https://github.com/nestjs/nest/blob/master/CONTRIBUTING.md#-submitting-an-issue) before opening an issue. Issues not conforming to the guidelines may be closed immediately.
 
+## Observability
+
+[NestJS Observe](https://observe.nestjs.com) is the official observability platform for Nest applications. Install the `@nestjs/observe` SDK, pass an API key, and requests, background jobs, errors, logs, and distributed traces start streaming to a dashboard - no manual span wiring and no collector to run. Because the SDK hooks into Nest's own request lifecycle, a trace reads like a call graph of your controllers and providers instead of a bare HTTP route. Free for up to 300,000 events a month, and there is a [live demo](https://www.observe-demo.nestjs.com/dashboard) with no signup.
+
 ## Consulting
 
 With official support, you can get expert help straight from the Nest core team. We provide dedicated technical support, migration strategies, advice on best practices (and design decisions), PR reviews, and team augmentation. Read more about [support here](https://enterprise.nestjs.com).

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

@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
 import { Inject, mixin, Optional, } from '@nestjs/common';
 import multer from 'multer';
 import { MULTER_MODULE_OPTIONS } from '../files.constants.js';
-import { transformException } from '../multer/multer.utils.js';
+import { mergeMulterOptions, transformException, } from '../multer/multer.utils.js';
 /**
  * @param localOptions
  *
@@ -12,10 +12,7 @@ export function AnyFilesInterceptor(localOptions) {
     let MixinInterceptor = class MixinInterceptor {
         multer;
         constructor(options = {}) {
-            this.multer = multer({
-                ...options,
-                ...localOptions,
-            });
+            this.multer = multer(mergeMulterOptions(options, localOptions));
         }
         async intercept(context, next) {
             const ctx = context.switchToHttp();

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

@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
 import { Inject, mixin, Optional, } from '@nestjs/common';
 import multer from 'multer';
 import { MULTER_MODULE_OPTIONS } from '../files.constants.js';
-import { transformException } from '../multer/multer.utils.js';
+import { mergeMulterOptions, transformException, } from '../multer/multer.utils.js';
 /**
  * @param uploadFields
  * @param localOptions
@@ -12,10 +12,7 @@ export function FileFieldsInterceptor(uploadFields, localOptions) {
     let MixinInterceptor = class MixinInterceptor {
         multer;
         constructor(options = {}) {
-            this.multer = multer({
-                ...options,
-                ...localOptions,
-            });
+            this.multer = multer(mergeMulterOptions(options, localOptions));
         }
         async intercept(context, next) {
             const ctx = context.switchToHttp();

package/multer/interceptors/file.interceptor.js

@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
 import { Inject, mixin, Optional, } from '@nestjs/common';
 import multer from 'multer';
 import { MULTER_MODULE_OPTIONS } from '../files.constants.js';
-import { transformException } from '../multer/multer.utils.js';
+import { mergeMulterOptions, transformException, } from '../multer/multer.utils.js';
 /**
  * @param fieldName
  * @param localOptions
@@ -13,10 +13,7 @@ export function FileInterceptor(fieldName, localOptions) {
     let MixinInterceptor = class MixinInterceptor {
         multer;
         constructor(options = {}) {
-            this.multer = multer({
-                ...options,
-                ...localOptions,
-            });
+            this.multer = multer(mergeMulterOptions(options, localOptions));
         }
         async intercept(context, next) {
             const ctx = context.switchToHttp();

package/multer/interceptors/files.interceptor.js

@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
 import { Inject, mixin, Optional, } from '@nestjs/common';
 import multer from 'multer';
 import { MULTER_MODULE_OPTIONS } from '../files.constants.js';
-import { transformException } from '../multer/multer.utils.js';
+import { mergeMulterOptions, transformException, } from '../multer/multer.utils.js';
 /**
  *
  * @param fieldName
@@ -15,10 +15,7 @@ export function FilesInterceptor(fieldName, maxCount, localOptions) {
     let MixinInterceptor = class MixinInterceptor {
         multer;
         constructor(options = {}) {
-            this.multer = multer({
-                ...options,
-                ...localOptions,
-            });
+            this.multer = multer(mergeMulterOptions(options, localOptions));
         }
         async intercept(context, next) {
             const ctx = context.switchToHttp();

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

@@ -2,7 +2,7 @@ import { __decorate, __metadata, __param } from "tslib";
 import { Inject, mixin, Optional, } from '@nestjs/common';
 import multer from 'multer';
 import { MULTER_MODULE_OPTIONS } from '../files.constants.js';
-import { transformException } from '../multer/multer.utils.js';
+import { mergeMulterOptions, transformException, } from '../multer/multer.utils.js';
 /**
  *
  * @param localOptions
@@ -12,10 +12,7 @@ export function NoFilesInterceptor(localOptions) {
     let MixinInterceptor = class MixinInterceptor {
         multer;
         constructor(options = {}) {
-            this.multer = multer({
-                ...options,
-                ...localOptions,
-            });
+            this.multer = multer(mergeMulterOptions(options, localOptions));
         }
         async intercept(context, next) {
             const ctx = context.switchToHttp();

package/multer/interfaces/multer-options.interface.d.ts

@@ -1,3 +1,22 @@
+/**
+ * @publicApi
+ */
+export interface MulterLimits {
+    /** Max field name size (Default: 100 bytes) */
+    fieldNameSize?: number;
+    /** Max field value size (Default: 1MB) */
+    fieldSize?: number;
+    /** Max number of non- file fields (Default: Infinity) */
+    fields?: number;
+    /** For multipart forms, the max file size (in bytes)(Default: Infinity) */
+    fileSize?: number;
+    /** For multipart forms, the max number of file fields (Default: Infinity) */
+    files?: number;
+    /** For multipart forms, the max number of parts (fields + files)(Default: Infinity) */
+    parts?: number;
+    /** For multipart forms, the max number of header key=> value pairs to parse Default: 2000(same as node's http). */
+    headerPairs?: number;
+}
 /**
  * @see https://github.com/expressjs/multer
  *
@@ -10,23 +29,10 @@ export interface MulterOptions {
     /**
      * An object specifying the size limits of the following optional properties. This object is passed to busboy
      * directly, and the details of properties can be found on https://github.com/mscdex/busboy#busboy-methods
+     *
+     * Since multer 2.4.0, this can also be a function of the request that returns such an object.
      */
-    limits?: {
-        /** Max field name size (Default: 100 bytes) */
-        fieldNameSize?: number;
-        /** Max field value size (Default: 1MB) */
-        fieldSize?: number;
-        /** Max number of non- file fields (Default: Infinity) */
-        fields?: number;
-        /** For multipart forms, the max file size (in bytes)(Default: Infinity) */
-        fileSize?: number;
-        /** For multipart forms, the max number of file fields (Default: Infinity) */
-        files?: number;
-        /** For multipart forms, the max number of parts (fields + files)(Default: Infinity) */
-        parts?: number;
-        /** For multipart forms, the max number of header key=> value pairs to parse Default: 2000(same as node's http). */
-        headerPairs?: number;
-    };
+    limits?: MulterLimits | ((req: any) => MulterLimits);
     /** Keep the full path of files instead of just the base name (Default: false) */
     preservePath?: boolean;
     /** Default character set for part header values (e.g. filename) (Default: 'latin1') */

package/multer/multer/multer.constants.js

@@ -6,7 +6,7 @@ export const multerExceptions = {
     LIMIT_FIELD_KEY: 'Field name too long',
     LIMIT_FIELD_VALUE: 'Field value too long',
     LIMIT_FIELD_COUNT: 'Too many fields',
-    LIMIT_UNEXPECTED_FILE: 'Unexpected field',
+    LIMIT_UNEXPECTED_FILE: 'Unexpected file field',
     MISSING_FIELD_NAME: 'Field name missing',
     LIMIT_FIELD_NESTING: 'Field name nesting too deep',
 };

package/multer/multer/multer.utils.d.ts

@@ -1,6 +1,21 @@
 import { HttpException } from '@nestjs/common';
+import { MulterModuleOptions } from '../interfaces/index.js';
+import { MulterOptions } from '../interfaces/multer-options.interface.js';
+/**
+ * Merges module-level (global) multer options with interceptor-level (local)
+ * options. `limits` is merged key-by-key rather than replaced outright, so
+ * that a route overriding e.g. `limits.fileSize` doesn't silently drop other
+ * global limits (such as `limits.files`) it never intended to touch.
+ *
+ * `limits` may also be a function of the request (multer >= 2.4.0), which
+ * can't be merged key-by-key. In that case (or when only one side defines
+ * `limits`) the local value wins outright, matching the pre-merge behaviour.
+ */
+export declare function mergeMulterOptions(options?: MulterModuleOptions, localOptions?: MulterOptions): MulterModuleOptions;
 export declare function transformException(error: (Error & {
     field?: string;
+    code?: string;
 }) | undefined): HttpException | (Error & {
     field?: string;
+    code?: string;
 }) | undefined;

package/multer/multer/multer.utils.js

@@ -1,12 +1,35 @@
 import { BadRequestException, HttpException, PayloadTooLargeException, } from '@nestjs/common';
+import { isPlainObject } from '@nestjs/common/internal';
 import { multerExceptions, busboyExceptions } from './multer.constants.js';
+/**
+ * Merges module-level (global) multer options with interceptor-level (local)
+ * options. `limits` is merged key-by-key rather than replaced outright, so
+ * that a route overriding e.g. `limits.fileSize` doesn't silently drop other
+ * global limits (such as `limits.files`) it never intended to touch.
+ *
+ * `limits` may also be a function of the request (multer >= 2.4.0), which
+ * can't be merged key-by-key. In that case (or when only one side defines
+ * `limits`) the local value wins outright, matching the pre-merge behaviour.
+ */
+export function mergeMulterOptions(options = {}, localOptions = {}) {
+    const merged = { ...options, ...localOptions };
+    if (isPlainObject(options.limits) && isPlainObject(localOptions.limits)) {
+        merged.limits = { ...options.limits, ...localOptions.limits };
+    }
+    return merged;
+}
 // Multer may add in a 'field' property to the error
 // https://github.com/expressjs/multer/blob/aa42bea6ac7d0cb8fcb279b15a7278cda805dc63/lib/multer-error.js#L19
 export function transformException(error) {
     if (!error || error instanceof HttpException) {
         return error;
     }
-    switch (error.message) {
+    // Multer identifies its errors by `code`, while the messages may change
+    // between releases (e.g. "Unexpected field" became "Unexpected file field")
+    const exception = isMulterExceptionCode(error.code)
+        ? multerExceptions[error.code]
+        : error.message;
+    switch (exception) {
         case multerExceptions.LIMIT_FILE_SIZE:
             return new PayloadTooLargeException(error.message);
         case multerExceptions.LIMIT_FILE_COUNT:
@@ -30,3 +53,6 @@ export function transformException(error) {
     }
     return error;
 }
+function isMulterExceptionCode(code) {
+    return typeof code === 'string' && Object.hasOwn(multerExceptions, code);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-express",
-  "version": "12.0.2",
+  "version": "12.0.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-express)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -27,17 +27,17 @@
   "dependencies": {
     "cors": "2.8.6",
     "express": "5.2.1",
-    "multer": "2.3.0",
+    "multer": "2.4.0",
     "path-to-regexp": "8.4.2",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@nestjs/common": "12.0.2",
-    "@nestjs/core": "12.0.2"
+    "@nestjs/common": "12.0.4",
+    "@nestjs/core": "12.0.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^12.0.0",
     "@nestjs/core": "^12.0.0"
   },
-  "gitHead": "ee168a569d30e600d301ed38abb14d2171a6f315"
+  "gitHead": "899dbe3a0c1e59d1d0fb7e0c7ad0b2d2aa4ae771"
 }