@midwayjs/busboy 4.0.0-alpha.1 → 4.0.0-beta.1

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT]((https://github.com/midwayjs/midway/blob/master/LICENSE))

package/dist/interface.d.ts

@@ -36,6 +36,10 @@ export interface UploadOptions extends BusboyConfig {
      * Mime type white list
      */
     mimeTypeWhiteList?: Record<string, string | string[]> | ((ctx: IMidwayContext<any>) => string | string[]);
+    /**
+     * Whether to allow fields duplication, default is `false`, only for `file` and `stream` mode
+     */
+    allowFieldsDuplication?: boolean;
 }
 export interface UploadFileInfo {
     /**

package/dist/middleware.js

@@ -119,7 +119,7 @@ let UploadMiddleware = class UploadMiddleware {
     }
     async processFileOrStream(req, uploadConfig, currentContextWhiteListMap, currentContextMimeTypeWhiteListMap, ctxOrReq) {
         let isStreamResolve = false;
-        const { mode, tmpdir } = uploadConfig;
+        const { mode, tmpdir, allowFieldsDuplication } = uploadConfig;
         const { files = [], fields = [] } = await new Promise((resolveP, reject) => {
             const bb = busboy({
                 headers: req.headers,
@@ -219,10 +219,27 @@ let UploadMiddleware = class UploadMiddleware {
             req.pipe(bb);
         });
         ctxOrReq.files = files;
-        ctxOrReq.fields = fields.reduce((accumulator, current) => {
-            accumulator[current.name] = current.value;
-            return accumulator;
-        }, {});
+        if (allowFieldsDuplication) {
+            // 如果重复，则使用数组
+            ctxOrReq.fields = fields.reduce((accumulator, current) => {
+                if (accumulator[current.name]) {
+                    if (!Array.isArray(accumulator[current.name])) {
+                        accumulator[current.name] = [accumulator[current.name]];
+                    }
+                    accumulator[current.name].push(current.value);
+                }
+                else {
+                    accumulator[current.name] = current.value;
+                }
+                return accumulator;
+            }, {});
+        }
+        else {
+            ctxOrReq.fields = fields.reduce((accumulator, current) => {
+                accumulator[current.name] = current.value;
+                return accumulator;
+            }, {});
+        }
     }
     async processAsyncIterator(req, uploadConfig, currentContextWhiteListMap, currentContextMimeTypeWhiteListMap, ctxOrReq) {
         const bb = busboy({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/busboy",
-  "version": "4.0.0-alpha.1",
+  "version": "4.0.0-beta.1",
   "description": "Midway Component for upload",
   "main": "dist/index.js",
   "typings": "index.d.ts",
@@ -27,14 +27,14 @@
     "file-type": "16.5.4"
   },
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-alpha.1",
-    "@midwayjs/express": "^4.0.0-alpha.1",
-    "@midwayjs/faas": "^4.0.0-alpha.1",
-    "@midwayjs/fc-starter": "^4.0.0-alpha.1",
-    "@midwayjs/koa": "^4.0.0-alpha.1",
-    "@midwayjs/mock": "^4.0.0-alpha.1",
-    "@midwayjs/web": "^4.0.0-alpha.1",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/express": "^4.0.0-beta.1",
+    "@midwayjs/faas": "^4.0.0-beta.1",
+    "@midwayjs/fc-starter": "^4.0.0-beta.1",
+    "@midwayjs/koa": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
+    "@midwayjs/web": "^4.0.0-beta.1",
     "fs-extra": "11.2.0"
   },
-  "gitHead": "14bb4da91805a1cf52f190c0d37a74b395dd6372"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.