multer - npm Package Compare versions

Comparing version 1.0.2 to 1.0.3

lib/make-middleware.js

@@ -8,2 +8,3 @@ var is = require('type-is')
 var makeError = require('./make-error')
+var FileAppender = require('./file-appender')
 var removeUploadedFiles = require('./remove-uploaded-files')
@@ -22,12 +23,6 @@
 
-    switch (fileStrategy) {
-      case 'VALUE': break
-      case 'ARRAY': req.files = []; break
-      case 'OBJECT': req.files = Object.create(null); break
-      default: throw new Error('Unknown file strategy: ' + fileStrategy)
-    }
-
     req.body = Object.create(null)
 
     var busboy = new Busboy({ headers: req.headers, limits: limits })
+    var appender = new FileAppender(fileStrategy, req)
     var isDone = false
@@ -99,6 +94,15 @@ var readFinished = false
 
+      var placeholder = appender.insertPlaceholder(file)
+
       fileFilter(req, file, function (err, includeFile) {
-        if (err) return abortWithError(err)
-        if (!includeFile) return fileStream.resume()
+        if (err) {
+          appender.removePlaceholder(placeholder)
+          return abortWithError(err)
+        }
 
+        if (!includeFile) {
+          appender.removePlaceholder(placeholder)
+          return fileStream.resume()
+        }
+
         var aborting = false
@@ -125,2 +129,3 @@ pendingWrites.increment()
           if (aborting) {
+            appender.removePlaceholder(placeholder)
             uploadedFiles.push(extend(file, info))
@@ -131,2 +136,3 @@ return pendingWrites.decrement()
           if (err) {
+            appender.removePlaceholder(placeholder)
             pendingWrites.decrement()
@@ -138,14 +144,3 @@ return abortWithError(err)
 
-          switch (fileStrategy) {
-            case 'VALUE': req.file = fileInfo; break
-            case 'ARRAY': req.files.push(fileInfo); break
-            case 'OBJECT':
-              if (req.files[fieldname]) {
-                req.files[fieldname].push(fileInfo)
-              } else {
-                req.files[fieldname] = [fileInfo]
-              }
-              break
-          }
-
+          appender.replacePlaceholder(placeholder, fileInfo)
           uploadedFiles.push(fileInfo)
@@ -152,0 +147,0 @@ pendingWrites.decrement()

package.json

 {
   "name": "multer",
   "description": "Middleware for handling `multipart/form-data`.",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "contributors": [
@@ -26,2 +26,3 @@ "Hage Yaapa <[e-mail]> (http://www.hacksparrow.com)",
     "mkdirp": "^0.5.1",
+    "object-assign": "^3.0.0",
     "type-is": "^1.6.4",
@@ -28,0 +29,0 @@ "xtend": "^4.0.0"

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

23344

increased by6.73%

Number of package files

12

increased by9.09%

Lines of code

375

increased by15.03%

Worsened metrics

Dependency count

7

increased by16.67%

Dependency changes

• + Addedobject-assign@^3.0.0

• + Addedobject-assign@3.0.0(transitive)