Merge branch 'master' into patch-1

sebdeckers · web-flow · commit 5f49bf5cb257 · 2017-06-12T09:19:38.000+08:00
diff --git a/Readme.md b/Readme.md
@@ -132,7 +132,8 @@ someModule.stream(function(err, stdout, stderr) {
   var form = new FormData();
 
   form.append('file', stdout, {
-    filename: 'unicycle.jpg',
+    filename: 'unicycle.jpg', // ... or:
+    filepath: 'photos/toys/unicycle.jpg',
     contentType: 'image/jpeg',
     knownLength: 19806
   });
@@ -144,6 +145,8 @@ someModule.stream(function(err, stdout, stderr) {
 });
 ```
 
+The `filepath` property overrides `filename` and may contain a relative path. This is typically used when uploading [multiple files from a directory](https://wicg.github.io/entries-api/#dom-htmlinputelement-webkitdirectory).
+
 For edge cases, like POST request to URL with query string or to pass HTTP auth credentials, object can be passed to `form.submit()` as first parameter:
 
 ``` javascript
diff --git a/lib/form_data.js b/lib/form_data.js
@@ -209,20 +209,25 @@ FormData.prototype._multiPartHeader = function(field, value, options) {
 
 FormData.prototype._getContentDisposition = function(value, options) {
 
-  var contentDisposition;
-
-  // custom filename takes precedence
-  // fs- and request- streams have path property
-  // formidable and the browser add a name property.
-  var filename = options.filename || value.name || value.path;
+  var filename
+    , contentDisposition
+    ;
 
-  // or try http response
-  if (!filename && value.readable && value.hasOwnProperty('httpVersion')) {
-    filename = value.client._httpMessage.path;
+  if (typeof options.filepath === 'string') {
+    // custom filepath for relative paths
+    filename = path.normalize(options.filepath).replace(/\\/g, '/');
+  } else if (options.filename || value.name || value.path) {
+    // custom filename take precedence
+    // formidable and the browser add a name property
+    // fs- and request- streams have path property
+    filename = path.basename(options.filename || value.name || value.path);
+  } else if (value.readable && value.hasOwnProperty('httpVersion')) {
+    // or try http response
+    filename = path.basename(value.client._httpMessage.path);
   }
 
   if (filename) {
-    contentDisposition = 'filename="' + path.basename(filename) + '"';
+    contentDisposition = 'filename="' + filename + '"';
   }
 
   return contentDisposition;
@@ -248,9 +253,9 @@ FormData.prototype._getContentType = function(value, options) {
     contentType = value.headers['content-type'];
   }
 
-  // or guess it from the filename
-  if (!contentType && options.filename) {
-    contentType = mime.lookup(options.filename);
+  // or guess it from the filepath or filename
+  if (!contentType && (options.filepath || options.filename)) {
+    contentType = mime.lookup(options.filepath || options.filename);
   }
 
   // fallback to the default content type if `value` is not simple value
@@ -438,3 +443,7 @@ FormData.prototype._error = function(err) {
     this.emit('error', err);
   }
 };
+
+FormData.prototype.toString = function () {
+  return '[object FormData]';
+};
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "author": "Felix Geisendörfer <felix@debuggable.com> (http://debuggable.com/)",
   "name": "form-data",
   "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
-  "version": "2.1.2",
+  "version": "2.2.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/form-data/form-data.git"
diff --git a/test/integration/test-custom-filename.js b/test/integration/test-custom-filename.js
@@ -8,12 +8,14 @@ var assert       = common.assert;
 var mime         = require('mime-types');
 var http         = require('http');
 var fs           = require('fs');
+var path         = require('path');
 
 var FormData     = require(common.dir.lib + '/form_data');
 var IncomingForm = require('formidable').IncomingForm;
 
-var knownFile = common.dir.fixture + '/unicycle.jpg';
-var unknownFile = common.dir.fixture + '/unknown_file_type';
+var knownFile = path.join(common.dir.fixture, 'unicycle.jpg');
+var unknownFile = path.join(common.dir.fixture, 'unknown_file_type');
+var relativeFile = path.relative(path.join(knownFile, '..', '..'), knownFile);
 
 var options = {
   filename: 'test.png',
@@ -35,6 +37,10 @@ var server = http.createServer(function(req, res) {
     assert.strictEqual(files['custom_filename'].name, options.filename, 'Expects custom filename');
     assert.strictEqual(files['custom_filename'].type, mime.lookup(knownFile), 'Expects original content-type');
 
+    assert('custom_filepath' in files);
+    assert.strictEqual(files['custom_filepath'].name, relativeFile.replace(/\\/g, '/'), 'Expects custom filepath');
+    assert.strictEqual(files['custom_filepath'].type, mime.lookup(knownFile), 'Expects original content-type');
+
     assert('unknown_with_filename' in files);
     assert.strictEqual(files['unknown_with_filename'].name, options.filename, 'Expects custom filename');
     assert.strictEqual(files['unknown_with_filename'].type, mime.lookup(options.filename), 'Expects filename-derived content-type');
@@ -67,6 +73,8 @@ server.listen(common.port, function() {
   form.append('unknown_with_filename', fs.createReadStream(unknownFile), options.filename);
   // Filename only with unknown file
   form.append('unknown_with_filename_as_object', fs.createReadStream(unknownFile), {filename: options.filename});
+  // Filename with relative path
+  form.append('custom_filepath', fs.createReadStream(knownFile), {filepath: relativeFile});
   // No options or implicit file type from extension on name property.
   var customNameStream = fs.createReadStream(unknownFile);
   customNameStream.name = options.filename;
diff --git a/test/integration/test-to-string.js b/test/integration/test-to-string.js
@@ -0,0 +1,5 @@
+var common   = require('../common');
+var assert   = common.assert;
+var FormData = require(common.dir.lib + '/form_data');
+
+assert(new FormData().toString() === '[object FormData]');
