@midwayjs/upload 3.16.5 → 3.16.7

package/dist/config/config.default.js

@@ -11,5 +11,6 @@ exports.upload = {
     tmpdir: (0, path_1.join)((0, os_1.tmpdir)(), 'midway-upload-files'),
     cleanTimeout: 5 * 60 * 1000,
     base64: false,
+    allowFieldsDuplication: false,
 };
 //# sourceMappingURL=config.default.js.map

package/dist/interface.d.ts

@@ -39,6 +39,10 @@ export interface UploadOptions {
      * Mime type white list
      */
     mimeTypeWhiteList?: Record<string, string | string[]> | ((ctx: IMidwayContext<any>) => string | string[]);
+    /**
+     * Whether to allow fields duplication, default is `false`
+     */
+    allowFieldsDuplication?: boolean;
 }
 export interface UploadFileInfo<T> {
     filename: string;

package/dist/middleware.js

@@ -116,7 +116,7 @@ let UploadMiddleware = class UploadMiddleware {
         let body;
         if (this.isReadableStream(req, isExpress)) {
             if (mode === 'stream') {
-                const { fields, fileInfo } = await (0, parse_1.parseFromReadableStream)(req, boundary);
+                const { fields, fileInfo } = await (0, parse_1.parseFromReadableStream)(req, boundary, this.uploadConfig);
                 const ext = this.checkAndGetExt(fileInfo.filename, currentContextWhiteListMap);
                 if (!ext) {
                     throw new _1.MultipartInvalidFilenameError(fileInfo.filename);

package/dist/parse.d.ts

@@ -5,7 +5,7 @@ export declare const parseMultipart: (body: any, boundary: string, uploadConfig:
     files: any[];
     fields: {};
 }>;
-export declare const parseFromReadableStream: (readStream: Readable, boundary: any) => Promise<{
+export declare const parseFromReadableStream: (readStream: Readable, boundary: any, uploadConfig: UploadOptions) => Promise<{
     fields: any;
     fileInfo: UploadFileInfo<Readable>;
 }>;

package/dist/parse.js

@@ -3,6 +3,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseHead = exports.bufferSplit = exports.bufferIndexOf = exports.parseFromReadableStream = exports.parseMultipart = void 0;
 const stream_1 = require("stream");
 const headSeparator = Buffer.from('\r\n\r\n');
+function saveFields(fields, key, value, allowFieldsDuplication) {
+    if (allowFieldsDuplication) {
+        if (!fields[key]) {
+            fields[key] = value;
+        }
+        else {
+            if (!Array.isArray(fields[key])) {
+                fields[key] = [fields[key]];
+            }
+            fields[key].push(value);
+        }
+    }
+    else {
+        fields[key] = value;
+    }
+}
 const parseMultipart = async (body, boundary, uploadConfig) => {
     if (typeof body === 'string') {
         if (uploadConfig.base64) {
@@ -23,7 +39,7 @@ const parseMultipart = async (body, boundary, uploadConfig) => {
         }
         if (!head['content-disposition'].filename) {
             if (head['content-disposition'].name) {
-                fields[head['content-disposition'].name] = data.toString();
+                saveFields(fields, head['content-disposition'].name, data.toString(), uploadConfig.allowFieldsDuplication);
             }
             return;
         }
@@ -41,7 +57,7 @@ const parseMultipart = async (body, boundary, uploadConfig) => {
 };
 exports.parseMultipart = parseMultipart;
 const pre = Buffer.from('\r\n');
-const parseFromReadableStream = (readStream, boundary) => {
+const parseFromReadableStream = (readStream, boundary, uploadConfig) => {
     const bufferSeparator = Buffer.from(`\r\n--${boundary}`);
     const fields = {};
     const fileInfo = {
@@ -100,7 +116,7 @@ const parseFromReadableStream = (readStream, boundary) => {
                     }
                     if (!head['content-disposition'].filename) {
                         if (head['content-disposition'].name) {
-                            fields[head['content-disposition'].name] = data.toString();
+                            saveFields(fields, head['content-disposition'].name, data.toString(), uploadConfig.allowFieldsDuplication);
                         }
                         continue;
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/upload",
-  "version": "3.16.5",
+  "version": "3.16.7",
   "description": "Midway Component for upload",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -29,9 +29,9 @@
     "@midwayjs/core": "^3.16.2",
     "@midwayjs/express": "^3.16.5",
     "@midwayjs/faas": "^3.16.5",
-    "@midwayjs/koa": "^3.16.5",
+    "@midwayjs/koa": "^3.16.6",
     "@midwayjs/mock": "^3.16.5",
-    "@midwayjs/web": "^3.16.5"
+    "@midwayjs/web": "^3.16.6"
   },
-  "gitHead": "087b3a52b3ed510e098a731e5dd0d0647ea3b168"
+  "gitHead": "3daa965bdae6938d4228f1996777141983142890"
 }