fsevents 1.0.15 → 1.0.17

package/node_modules/form-data/lib/form_data.js

@@ -6,7 +6,7 @@ var https = require('https');
 var parseUrl = require('url').parse;
 var fs = require('fs');
 var mime = require('mime-types');
-var async = require('async');
+var asynckit = require('asynckit');
 var populate = require('./populate.js');
 
 // Public API
@@ -24,12 +24,12 @@ util.inherits(FormData, CombinedStream);
  */
 function FormData() {
   if (!(this instanceof FormData)) {
-    throw new TypeError('Failed to construct FormData: Please use the _new_ operator, this object constructor cannot be called as a function.');
+    return new FormData();
   }
 
   this._overheadLength = 0;
   this._valueLength = 0;
-  this._lengthRetrievers = [];
+  this._valuesToMeasure = [];
 
   CombinedStream.call(this);
 }
@@ -101,60 +101,62 @@ FormData.prototype._trackLength = function(header, value, options) {
 
   // no need to bother with the length
   if (!options.knownLength) {
-    this._lengthRetrievers.push(function(next) {
-
-      if (value.hasOwnProperty('fd')) {
-
-        // take read range into a account
-        // `end` = Infinity –> read file till the end
-        //
-        // TODO: Looks like there is bug in Node fs.createReadStream
-        // it doesn't respect `end` options without `start` options
-        // Fix it when node fixes it.
-        // https://github.com/joyent/node/issues/7819
-        if (value.end != undefined && value.end != Infinity && value.start != undefined) {
-
-          // when end specified
-          // no need to calculate range
-          // inclusive, starts with 0
-          next(null, value.end + 1 - (value.start ? value.start : 0));
-
-        // not that fast snoopy
-        } else {
-          // still need to fetch file size from fs
-          fs.stat(value.path, function(err, stat) {
-
-            var fileSize;
-
-            if (err) {
-              next(err);
-              return;
-            }
-
-            // update final size based on the range options
-            fileSize = stat.size - (value.start ? value.start : 0);
-            next(null, fileSize);
-          });
+    this._valuesToMeasure.push(value);
+  }
+};
+
+FormData.prototype._lengthRetriever = function(value, callback) {
+
+  if (value.hasOwnProperty('fd')) {
+
+    // take read range into a account
+    // `end` = Infinity –> read file till the end
+    //
+    // TODO: Looks like there is bug in Node fs.createReadStream
+    // it doesn't respect `end` options without `start` options
+    // Fix it when node fixes it.
+    // https://github.com/joyent/node/issues/7819
+    if (value.end != undefined && value.end != Infinity && value.start != undefined) {
+
+      // when end specified
+      // no need to calculate range
+      // inclusive, starts with 0
+      callback(null, value.end + 1 - (value.start ? value.start : 0));
+
+    // not that fast snoopy
+    } else {
+      // still need to fetch file size from fs
+      fs.stat(value.path, function(err, stat) {
+
+        var fileSize;
+
+        if (err) {
+          callback(err);
+          return;
         }
 
-      // or http response
-      } else if (value.hasOwnProperty('httpVersion')) {
-        next(null, +value.headers['content-length']);
-
-      // or request stream http://github.com/mikeal/request
-      } else if (value.hasOwnProperty('httpModule')) {
-        // wait till response come back
-        value.on('response', function(response) {
-          value.pause();
-          next(null, +response.headers['content-length']);
-        });
-        value.resume();
-
-      // something else
-      } else {
-        next('Unknown stream');
-      }
+        // update final size based on the range options
+        fileSize = stat.size - (value.start ? value.start : 0);
+        callback(null, fileSize);
+      });
+    }
+
+  // or http response
+  } else if (value.hasOwnProperty('httpVersion')) {
+    callback(null, +value.headers['content-length']);
+
+  // or request stream http://github.com/mikeal/request
+  } else if (value.hasOwnProperty('httpModule')) {
+    // wait till response come back
+    value.on('response', function(response) {
+      value.pause();
+      callback(null, +response.headers['content-length']);
     });
+    value.resume();
+
+  // something else
+  } else {
+    callback('Unknown stream');
   }
 };
 
@@ -162,7 +164,7 @@ FormData.prototype._multiPartHeader = function(field, value, options) {
   // custom header specified (as string)?
   // it becomes responsible for boundary
   // (e.g. to handle extra CRLFs on .NET servers)
-  if (options.header) {
+  if (typeof options.header == 'string') {
     return options.header;
   }
 
@@ -177,9 +179,28 @@ FormData.prototype._multiPartHeader = function(field, value, options) {
     'Content-Type': [].concat(contentType || [])
   };
 
+  // allow custom headers.
+  if (typeof options.header == 'object') {
+    populate(headers, options.header);
+  }
+
+  var header;
   for (var prop in headers) {
-    if (headers[prop].length) {
-      contents += prop + ': ' + headers[prop].join('; ') + FormData.LINE_BREAK;
+    header = headers[prop];
+
+    // skip nullish headers.
+    if (header == null) {
+      continue;
+    }
+
+    // convert all headers to arrays.
+    if (!Array.isArray(header)) {
+      header = [header];
+    }
+
+    // add non-empty headers.
+    if (header.length) {
+      contents += prop + ': ' + header.join('; ') + FormData.LINE_BREAK;
     }
   }
 
@@ -192,7 +213,8 @@ FormData.prototype._getContentDisposition = function(value, options) {
 
   // custom filename takes precedence
   // fs- and request- streams have path property
-  var filename = options.filename || value.path;
+  // formidable and the browser add a name property.
+  var filename = options.filename || value.name || value.path;
 
   // or try http response
   if (!filename && value.readable && value.hasOwnProperty('httpVersion')) {
@@ -211,6 +233,11 @@ FormData.prototype._getContentType = function(value, options) {
   // use custom content-type above all
   var contentType = options.contentType;
 
+  // or try `name` from formidable, browser
+  if (!contentType && value.name) {
+    contentType = mime.lookup(value.name);
+  }
+
   // or try `path` from fs-, request- streams
   if (!contentType && value.path) {
     contentType = mime.lookup(value.path);
@@ -266,17 +293,6 @@ FormData.prototype.getHeaders = function(userHeaders) {
   return formHeaders;
 };
 
-FormData.prototype.getCustomHeaders = function(contentType) {
-  contentType = contentType ? contentType : 'multipart/form-data';
-
-  var formHeaders = {
-    'content-type': contentType + '; boundary=' + this.getBoundary(),
-    'content-length': this.getLengthSync()
-  };
-
-  return formHeaders;
-};
-
 FormData.prototype.getBoundary = function() {
   if (!this._boundary) {
     this._generateBoundary();
@@ -309,7 +325,7 @@ FormData.prototype.getLengthSync = function() {
   }
 
   // https://github.com/form-data/form-data/issues/40
-  if (this._lengthRetrievers.length) {
+  if (!this.hasKnownLength()) {
     // Some async length retrievers are present
     // therefore synchronous length calculation is false.
     // Please use getLength(callback) to get proper length
@@ -319,6 +335,19 @@ FormData.prototype.getLengthSync = function() {
   return knownLength;
 };
 
+// Public API to check if length of added values is known
+// https://github.com/form-data/form-data/issues/196
+// https://github.com/form-data/form-data/issues/262
+FormData.prototype.hasKnownLength = function() {
+  var hasKnownLength = true;
+
+  if (this._valuesToMeasure.length) {
+    hasKnownLength = false;
+  }
+
+  return hasKnownLength;
+};
+
 FormData.prototype.getLength = function(cb) {
   var knownLength = this._overheadLength + this._valueLength;
 
@@ -326,12 +355,12 @@ FormData.prototype.getLength = function(cb) {
     knownLength += this._lastBoundary().length;
   }
 
-  if (!this._lengthRetrievers.length) {
+  if (!this._valuesToMeasure.length) {
     process.nextTick(cb.bind(this, null, knownLength));
     return;
   }
 
-  async.parallel(this._lengthRetrievers, function(err, values) {
+  asynckit.parallel(this._valuesToMeasure, this._lengthRetriever, function(err, values) {
     if (err) {
       cb(err);
       return;

package/node_modules/form-data/lib/populate.js

@@ -1,9 +1,10 @@
 // populates missing values
 module.exports = function(dst, src) {
-  for (var prop in src) {
-    if (src.hasOwnProperty(prop) && !dst[prop]) {
-      dst[prop] = src[prop];
-    }
-  }
+
+  Object.keys(src).forEach(function(prop)
+  {
+    dst[prop] = dst[prop] || src[prop];
+  });
+
   return dst;
 };

package/node_modules/form-data/package.json

@@ -1,45 +1,53 @@
 {
   "_args": [
     [
-      "form-data@~1.0.0-rc4",
+      {
+        "raw": "form-data@~2.1.1",
+        "scope": null,
+        "escapedName": "form-data",
+        "name": "form-data",
+        "rawSpec": "~2.1.1",
+        "spec": ">=2.1.1 <2.2.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/request"
     ]
   ],
-  "_from": "form-data@>=1.0.0-rc4 <1.1.0",
-  "_id": "form-data@1.0.0-rc4",
+  "_from": "form-data@>=2.1.1 <2.2.0",
+  "_id": "form-data@2.1.2",
   "_inCache": true,
-  "_installable": true,
   "_location": "/form-data",
-  "_nodeVersion": "0.12.11",
+  "_nodeVersion": "6.4.0",
   "_npmOperationalInternal": {
     "host": "packages-12-west.internal.npmjs.com",
-    "tmp": "tmp/form-data-1.0.0-rc4.tgz_1458059747097_0.14101114077493548"
+    "tmp": "tmp/form-data-2.1.2.tgz_1478577739404_0.6574864208232611"
   },
   "_npmUser": {
-    "email": "iam@alexindigo.com",
-    "name": "alexindigo"
+    "name": "alexindigo",
+    "email": "iam@alexindigo.com"
   },
-  "_npmVersion": "2.14.9",
+  "_npmVersion": "3.10.3",
   "_phantomChildren": {},
   "_requested": {
-    "name": "form-data",
-    "raw": "form-data@~1.0.0-rc4",
-    "rawSpec": "~1.0.0-rc4",
+    "raw": "form-data@~2.1.1",
     "scope": null,
-    "spec": ">=1.0.0-rc4 <1.1.0",
+    "escapedName": "form-data",
+    "name": "form-data",
+    "rawSpec": "~2.1.1",
+    "spec": ">=2.1.1 <2.2.0",
     "type": "range"
   },
   "_requiredBy": [
     "/request"
   ],
-  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz",
-  "_shasum": "05ac6bc22227b43e4461f488161554699d4f8b5e",
+  "_resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz",
+  "_shasum": "89c3534008b97eada4cbb157d58f6f5df025eae4",
   "_shrinkwrap": null,
-  "_spec": "form-data@~1.0.0-rc4",
+  "_spec": "form-data@~2.1.1",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/request",
   "author": {
-    "email": "felix@debuggable.com",
     "name": "Felix Geisendörfer",
+    "email": "felix@debuggable.com",
     "url": "http://debuggable.com/"
   },
   "browser": "./lib/browser",
@@ -47,68 +55,67 @@
     "url": "https://github.com/form-data/form-data/issues"
   },
   "dependencies": {
-    "async": "^1.5.2",
+    "asynckit": "^0.4.0",
     "combined-stream": "^1.0.5",
-    "mime-types": "^2.1.10"
+    "mime-types": "^2.1.12"
   },
   "description": "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.",
   "devDependencies": {
-    "codacy-coverage": "^1.1.3",
-    "coveralls": "^2.11.8",
-    "cross-spawn": "^2.1.5",
-    "eslint": "^2.4.0",
+    "browserify": "^13.1.1",
+    "browserify-istanbul": "^2.0.0",
+    "coveralls": "^2.11.14",
+    "cross-spawn": "^4.0.2",
+    "eslint": "^3.9.1",
     "fake": "^0.2.2",
     "far": "^0.0.7",
     "formidable": "^1.0.17",
-    "istanbul": "^0.4.2",
-    "pre-commit": "^1.1.2",
-    "request": "^2.69.0",
-    "rimraf": "^2.5.2"
+    "in-publish": "^2.0.0",
+    "is-node-modern": "^1.0.0",
+    "istanbul": "^0.4.5",
+    "obake": "^0.1.2",
+    "phantomjs-prebuilt": "^2.1.13",
+    "pkgfiles": "^2.3.0",
+    "pre-commit": "^1.1.3",
+    "request": "2.76.0",
+    "rimraf": "^2.5.4",
+    "tape": "^4.6.2"
   },
   "directories": {},
   "dist": {
-    "shasum": "05ac6bc22227b43e4461f488161554699d4f8b5e",
-    "tarball": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz"
+    "shasum": "89c3534008b97eada4cbb157d58f6f5df025eae4",
+    "tarball": "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"
   },
   "engines": {
-    "node": ">= 0.10"
+    "node": ">= 0.12"
   },
-  "gitHead": "f73996e0508ee2d4b2b376276adfac1de4188ac2",
+  "gitHead": "03444d21961a7a44cdc2eae11ee3630f6969023d",
   "homepage": "https://github.com/form-data/form-data#readme",
   "license": "MIT",
   "main": "./lib/form_data",
   "maintainers": [
-    {
-      "name": "felixge",
-      "email": "felix@debuggable.com"
-    },
-    {
-      "name": "idralyuk",
-      "email": "igor@buran.us"
-    },
     {
       "name": "alexindigo",
       "email": "iam@alexindigo.com"
     },
     {
-      "name": "mikeal",
-      "email": "mikeal.rogers@gmail.com"
+      "name": "dylanpiercey",
+      "email": "pierceydylan@gmail.com"
     },
     {
-      "name": "celer",
-      "email": "dtyree77@gmail.com"
+      "name": "felixge",
+      "email": "felix@debuggable.com"
     },
     {
-      "name": "dylanpiercey",
-      "email": "pierceydylan@gmail.com"
+      "name": "mikeal",
+      "email": "mikeal.rogers@gmail.com"
     }
   ],
   "name": "form-data",
   "optionalDependencies": {},
   "pre-commit": [
-    "check",
     "lint",
-    "test"
+    "ci-test",
+    "check"
   ],
   "readme": "ERROR: No README data found!",
   "repository": {
@@ -116,14 +123,23 @@
     "url": "git://github.com/form-data/form-data.git"
   },
   "scripts": {
+    "browser": "browserify -t browserify-istanbul test/run-browser.js | obake --coverage",
     "check": "istanbul check-coverage coverage/coverage*.json",
-    "coverage": "codacy-coverage < ./coverage/lcov.info; true",
+    "ci-lint": "is-node-modern 6 && npm run lint || is-node-not-modern 6",
+    "ci-test": "npm run test && npm run browser && npm run report",
     "debug": "verbose=1 ./test/run.js",
-    "lint": "eslint lib/*.js test/*.js test/**/*.js",
-    "posttest": "istanbul report",
+    "files": "pkgfiles --sort=name",
+    "get-version": "node -e \"console.log(require('./package.json').version)\"",
+    "lint": "eslint lib/*.js test/*.js test/integration/*.js",
+    "postpublish": "npm run restore-readme",
+    "posttest": "istanbul report lcov text",
     "predebug": "rimraf coverage test/tmp",
+    "prepublish": "in-publish && npm run update-readme || not-in-publish",
     "pretest": "rimraf coverage test/tmp",
-    "test": "istanbul cover --report none test/run.js"
+    "report": "istanbul report lcov text",
+    "restore-readme": "mv README.md.bak README.md",
+    "test": "istanbul cover test/run.js",
+    "update-readme": "sed -i.bak 's/\\/master\\.svg/\\/v'$(npm --silent run get-version)'.svg/g' README.md"
   },
-  "version": "1.0.0-rc4"
+  "version": "2.1.2"
 }

package/node_modules/fs.realpath/package.json

@@ -1,14 +1,21 @@
 {
   "_args": [
     [
-      "fs.realpath@^1.0.0",
+      {
+        "raw": "fs.realpath@^1.0.0",
+        "scope": null,
+        "escapedName": "fs.realpath",
+        "name": "fs.realpath",
+        "rawSpec": "^1.0.0",
+        "spec": ">=1.0.0 <2.0.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/glob"
     ]
   ],
   "_from": "fs.realpath@>=1.0.0 <2.0.0",
   "_id": "fs.realpath@1.0.0",
   "_inCache": true,
-  "_installable": true,
   "_location": "/fs.realpath",
   "_nodeVersion": "4.4.4",
   "_npmOperationalInternal": {
@@ -16,16 +23,17 @@
     "tmp": "tmp/fs.realpath-1.0.0.tgz_1466015941059_0.3332864767871797"
   },
   "_npmUser": {
-    "email": "i@izs.me",
-    "name": "isaacs"
+    "name": "isaacs",
+    "email": "i@izs.me"
   },
   "_npmVersion": "3.9.1",
   "_phantomChildren": {},
   "_requested": {
-    "name": "fs.realpath",
     "raw": "fs.realpath@^1.0.0",
-    "rawSpec": "^1.0.0",
     "scope": null,
+    "escapedName": "fs.realpath",
+    "name": "fs.realpath",
+    "rawSpec": "^1.0.0",
     "spec": ">=1.0.0 <2.0.0",
     "type": "range"
   },
@@ -38,8 +46,8 @@
   "_spec": "fs.realpath@^1.0.0",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/glob",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bugs": {
@@ -54,15 +62,15 @@
     "tarball": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   },
   "files": [
-    "index.js",
-    "old.js"
+    "old.js",
+    "index.js"
   ],
   "gitHead": "03e7c884431fe185dfebbc9b771aeca339c1807a",
   "homepage": "https://github.com/isaacs/fs.realpath#readme",
   "keywords": [
+    "realpath",
     "fs",
-    "polyfill",
-    "realpath"
+    "polyfill"
   ],
   "license": "ISC",
   "main": "index.js",

package/node_modules/fstream/package.json

@@ -1,14 +1,21 @@
 {
   "_args": [
     [
-      "fstream@^1.0.2",
+      {
+        "raw": "fstream@^1.0.2",
+        "scope": null,
+        "escapedName": "fstream",
+        "name": "fstream",
+        "rawSpec": "^1.0.2",
+        "spec": ">=1.0.2 <2.0.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/tar"
     ]
   ],
   "_from": "fstream@>=1.0.2 <2.0.0",
   "_id": "fstream@1.0.10",
   "_inCache": true,
-  "_installable": true,
   "_location": "/fstream",
   "_nodeVersion": "4.4.5",
   "_npmOperationalInternal": {
@@ -16,16 +23,17 @@
     "tmp": "tmp/fstream-1.0.10.tgz_1466189553883_0.3062701092567295"
   },
   "_npmUser": {
-    "email": "ogd@aoaioxxysz.net",
-    "name": "othiym23"
+    "name": "othiym23",
+    "email": "ogd@aoaioxxysz.net"
   },
   "_npmVersion": "3.10.0",
   "_phantomChildren": {},
   "_requested": {
-    "name": "fstream",
     "raw": "fstream@^1.0.2",
-    "rawSpec": "^1.0.2",
     "scope": null,
+    "escapedName": "fstream",
+    "name": "fstream",
+    "rawSpec": "^1.0.2",
     "spec": ">=1.0.2 <2.0.0",
     "type": "range"
   },
@@ -40,8 +48,8 @@
   "_spec": "fstream@^1.0.2",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/tar",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bugs": {

package/node_modules/fstream-ignore/package.json

@@ -1,14 +1,21 @@
 {
   "_args": [
     [
-      "fstream-ignore@~1.0.5",
+      {
+        "raw": "fstream-ignore@~1.0.5",
+        "scope": null,
+        "escapedName": "fstream-ignore",
+        "name": "fstream-ignore",
+        "rawSpec": "~1.0.5",
+        "spec": ">=1.0.5 <1.1.0",
+        "type": "range"
+      },
       "/Users/eshanker/Code/fsevents/node_modules/tar-pack"
     ]
   ],
   "_from": "fstream-ignore@>=1.0.5 <1.1.0",
   "_id": "fstream-ignore@1.0.5",
   "_inCache": true,
-  "_installable": true,
   "_location": "/fstream-ignore",
   "_nodeVersion": "5.10.1",
   "_npmOperationalInternal": {
@@ -16,16 +23,17 @@
     "tmp": "tmp/fstream-ignore-1.0.5.tgz_1463518095640_0.10221575922332704"
   },
   "_npmUser": {
-    "email": "kat@sykosomatic.org",
-    "name": "zkat"
+    "name": "zkat",
+    "email": "kat@sykosomatic.org"
   },
   "_npmVersion": "3.9.1",
   "_phantomChildren": {},
   "_requested": {
-    "name": "fstream-ignore",
     "raw": "fstream-ignore@~1.0.5",
-    "rawSpec": "~1.0.5",
     "scope": null,
+    "escapedName": "fstream-ignore",
+    "name": "fstream-ignore",
+    "rawSpec": "~1.0.5",
     "spec": ">=1.0.5 <1.1.0",
     "type": "range"
   },
@@ -38,8 +46,8 @@
   "_spec": "fstream-ignore@~1.0.5",
   "_where": "/Users/eshanker/Code/fsevents/node_modules/tar-pack",
   "author": {
-    "email": "i@izs.me",
     "name": "Isaac Z. Schlueter",
+    "email": "i@izs.me",
     "url": "http://blog.izs.me/"
   },
   "bugs": {