superagent 3.8.1 → 4.0.0-beta.5

package/superagent.js

@@ -1,21 +1,26 @@
-(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.superagent = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.superagent = f()}})(function(){var define,module,exports;return (function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+"use strict";
+
 function Agent() {
   this._defaults = [];
 }
 
-["use", "on", "once", "set", "query", "type", "accept", "auth", "withCredentials", "sortQuery", "retry", "ok", "redirects",
- "timeout", "buffer", "serialize", "parse", "ca", "key", "pfx", "cert"].forEach(function(fn) {
+["use", "on", "once", "set", "query", "type", "accept", "auth", "withCredentials", "sortQuery", "retry", "ok", "redirects", "timeout", "buffer", "serialize", "parse", "ca", "key", "pfx", "cert"].forEach(function (fn) {
   /** Default setting for all requests from this agent */
-  Agent.prototype[fn] = function(/*varargs*/) {
-    this._defaults.push({fn:fn, arguments:arguments});
+  Agent.prototype[fn] = function () {
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    this._defaults.push({ fn: fn, args: args });
     return this;
-  }
+  };
 });
 
-Agent.prototype._setDefaults = function(req) {
-    this._defaults.forEach(function(def) {
-      req[def.fn].apply(req, def.arguments);
-    });
+Agent.prototype._setDefaults = function (req) {
+  this._defaults.forEach(function (def) {
+    req[def.fn].apply(req, def.args);
+  });
 };
 
 module.exports = Agent;
@@ -31,8 +36,10 @@ module.exports = Agent;
  * @api private
  */
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 function isObject(obj) {
-  return null !== obj && 'object' === typeof obj;
+  return null !== obj && 'object' === (typeof obj === 'undefined' ? 'undefined' : _typeof(obj));
 }
 
 module.exports = isObject;
@@ -43,6 +50,9 @@ module.exports = isObject;
 /**
  * Module of mixed-in functions shared between node and client code
  */
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var isObject = require('./is-object');
 
 /**
@@ -83,7 +93,7 @@ function mixin(obj) {
  * @api public
  */
 
-RequestBase.prototype.clearTimeout = function _clearTimeout(){
+RequestBase.prototype.clearTimeout = function _clearTimeout() {
   clearTimeout(this._timer);
   clearTimeout(this._responseTimeoutTimer);
   delete this._timer;
@@ -100,7 +110,7 @@ RequestBase.prototype.clearTimeout = function _clearTimeout(){
  * @api public
  */
 
-RequestBase.prototype.parse = function parse(fn){
+RequestBase.prototype.parse = function parse(fn) {
   this._parser = fn;
   return this;
 };
@@ -123,7 +133,7 @@ RequestBase.prototype.parse = function parse(fn){
  * @api public
  */
 
-RequestBase.prototype.responseType = function(val){
+RequestBase.prototype.responseType = function (val) {
   this._responseType = val;
   return this;
 };
@@ -137,7 +147,7 @@ RequestBase.prototype.responseType = function(val){
  * @api public
  */
 
-RequestBase.prototype.serialize = function serialize(fn){
+RequestBase.prototype.serialize = function serialize(fn) {
   this._serializer = fn;
   return this;
 };
@@ -155,15 +165,15 @@ RequestBase.prototype.serialize = function serialize(fn){
  * @api public
  */
 
-RequestBase.prototype.timeout = function timeout(options){
-  if (!options || 'object' !== typeof options) {
+RequestBase.prototype.timeout = function timeout(options) {
+  if (!options || 'object' !== (typeof options === 'undefined' ? 'undefined' : _typeof(options))) {
     this._timeout = options;
     this._responseTimeout = 0;
     return this;
   }
 
-  for(var option in options) {
-    switch(option) {
+  for (var option in options) {
+    switch (option) {
       case 'deadline':
         this._timeout = options.deadline;
         break;
@@ -188,7 +198,7 @@ RequestBase.prototype.timeout = function timeout(options){
  * @api public
  */
 
-RequestBase.prototype.retry = function retry(count, fn){
+RequestBase.prototype.retry = function retry(count, fn) {
   // Default to 1 if no count passed or true
   if (arguments.length === 0 || count === true) count = 1;
   if (count <= 0) count = 0;
@@ -198,12 +208,7 @@ RequestBase.prototype.retry = function retry(count, fn){
   return this;
 };
 
-var ERROR_CODES = [
-  'ECONNRESET',
-  'ETIMEDOUT',
-  'EADDRINFO',
-  'ESOCKETTIMEDOUT'
-];
+var ERROR_CODES = ['ECONNRESET', 'ETIMEDOUT', 'EADDRINFO', 'ESOCKETTIMEDOUT'];
 
 /**
  * Determine if a request should be retried.
@@ -213,7 +218,7 @@ var ERROR_CODES = [
  * @param {Response} [res]
  * @returns {Boolean}
  */
-RequestBase.prototype._shouldRetry = function(err, res) {
+RequestBase.prototype._shouldRetry = function (err, res) {
   if (!this._maxRetries || this._retries++ >= this._maxRetries) {
     return false;
   }
@@ -223,7 +228,7 @@ RequestBase.prototype._shouldRetry = function(err, res) {
       if (override === true) return true;
       if (override === false) return false;
       // undefined falls back to defaults
-    } catch(e) {
+    } catch (e) {
       console.error(e);
     }
   }
@@ -244,7 +249,7 @@ RequestBase.prototype._shouldRetry = function(err, res) {
  * @api private
  */
 
-RequestBase.prototype._retry = function() {
+RequestBase.prototype._retry = function () {
 
   this.clearTimeout();
 
@@ -274,17 +279,17 @@ RequestBase.prototype.then = function then(resolve, reject) {
     if (this._endCalled) {
       console.warn("Warning: superagent request was sent twice, because both .end() and .then() were called. Never call .end() if you use promises");
     }
-    this._fullfilledPromise = new Promise(function(innerResolve, innerReject) {
-      self.end(function(err, res) {
-        if (err) innerReject(err);
-        else innerResolve(res);
+    this._fullfilledPromise = new Promise(function (innerResolve, innerReject) {
+      self.on('error', innerReject);
+      self.end(function (err, res) {
+        if (err) innerReject(err);else innerResolve(res);
       });
     });
   }
   return this._fullfilledPromise.then(resolve, reject);
 };
 
-RequestBase.prototype.catch = function(cb) {
+RequestBase.prototype['catch'] = function (cb) {
   return this.then(undefined, cb);
 };
 
@@ -297,13 +302,13 @@ RequestBase.prototype.use = function use(fn) {
   return this;
 };
 
-RequestBase.prototype.ok = function(cb) {
+RequestBase.prototype.ok = function (cb) {
   if ('function' !== typeof cb) throw Error("Callback required");
   this._okCallback = cb;
   return this;
 };
 
-RequestBase.prototype._isResponseOK = function(res) {
+RequestBase.prototype._isResponseOK = function (res) {
   if (!res) {
     return false;
   }
@@ -324,7 +329,7 @@ RequestBase.prototype._isResponseOK = function(res) {
  * @api public
  */
 
-RequestBase.prototype.get = function(field){
+RequestBase.prototype.get = function (field) {
   return this._header[field.toLowerCase()];
 };
 
@@ -363,7 +368,7 @@ RequestBase.prototype.getHeader = RequestBase.prototype.get;
  * @api public
  */
 
-RequestBase.prototype.set = function(field, val){
+RequestBase.prototype.set = function (field, val) {
   if (isObject(field)) {
     for (var key in field) {
       this.set(key, field[key]);
@@ -387,7 +392,7 @@ RequestBase.prototype.set = function(field, val){
  *
  * @param {String} field
  */
-RequestBase.prototype.unset = function(field){
+RequestBase.prototype.unset = function (field) {
   delete this._header[field.toLowerCase()];
   delete this.header[field];
   return this;
@@ -412,14 +417,14 @@ RequestBase.prototype.unset = function(field){
  * @return {Request} for chaining
  * @api public
  */
-RequestBase.prototype.field = function(name, val) {
+RequestBase.prototype.field = function (name, val) {
   // name should be either a string or an object.
   if (null === name || undefined === name) {
     throw new Error('.field(name, val) name can not be empty');
   }
 
   if (this._data) {
-    console.error(".field() can't be used if .send() is used. Please use only .send() or only .field() & .attach()");
+    throw new Error(".field() can't be used if .send() is used. Please use only .send() or only .field() & .attach()");
   }
 
   if (isObject(name)) {
@@ -453,7 +458,7 @@ RequestBase.prototype.field = function(name, val) {
  * @return {Request}
  * @api public
  */
-RequestBase.prototype.abort = function(){
+RequestBase.prototype.abort = function () {
   if (this._aborted) {
     return this;
   }
@@ -465,7 +470,7 @@ RequestBase.prototype.abort = function(){
   return this;
 };
 
-RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
+RequestBase.prototype._auth = function (user, pass, options, base64Encoder) {
   switch (options.type) {
     case 'basic':
       this.set('Authorization', 'Basic ' + base64Encoder(user + ':' + pass));
@@ -476,7 +481,8 @@ RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
       this.password = pass;
       break;
 
-    case 'bearer': // usage would be .auth(accessToken, { type: 'bearer' })
+    case 'bearer':
+      // usage would be .auth(accessToken, { type: 'bearer' })
       this.set('Authorization', 'Bearer ' + user);
       break;
   }
@@ -494,7 +500,7 @@ RequestBase.prototype._auth = function(user, pass, options, base64Encoder) {
  * @api public
  */
 
-RequestBase.prototype.withCredentials = function(on) {
+RequestBase.prototype.withCredentials = function (on) {
   // This is browser-only functionality. Node side is no-op.
   if (on == undefined) on = true;
   this._withCredentials = on;
@@ -509,7 +515,7 @@ RequestBase.prototype.withCredentials = function(on) {
  * @api public
  */
 
-RequestBase.prototype.redirects = function(n){
+RequestBase.prototype.redirects = function (n) {
   this._maxRedirects = n;
   return this;
 };
@@ -521,7 +527,7 @@ RequestBase.prototype.redirects = function(n){
  * @param {Number} n
  * @return {Request} for chaining
  */
-RequestBase.prototype.maxResponseSize = function(n){
+RequestBase.prototype.maxResponseSize = function (n) {
   if ('number' !== typeof n) {
     throw TypeError("Invalid argument");
   }
@@ -538,12 +544,12 @@ RequestBase.prototype.maxResponseSize = function(n){
  * @api public
  */
 
-RequestBase.prototype.toJSON = function() {
+RequestBase.prototype.toJSON = function () {
   return {
     method: this.method,
     url: this.url,
     data: this._data,
-    headers: this._header,
+    headers: this._header
   };
 };
 
@@ -587,12 +593,12 @@ RequestBase.prototype.toJSON = function() {
  * @api public
  */
 
-RequestBase.prototype.send = function(data){
+RequestBase.prototype.send = function (data) {
   var isObj = isObject(data);
   var type = this._header['content-type'];
 
   if (this._formData) {
-    console.error(".send() can't be used if .attach() or .field() is used. Please use only .send() or only .field() & .attach()");
+    throw new Error(".send() can't be used if .attach() or .field() is used. Please use only .send() or only .field() & .attach()");
   }
 
   if (isObj && !this._data) {
@@ -615,9 +621,7 @@ RequestBase.prototype.send = function(data){
     if (!type) this.type('form');
     type = this._header['content-type'];
     if ('application/x-www-form-urlencoded' == type) {
-      this._data = this._data
-        ? this._data + '&' + data
-        : data;
+      this._data = this._data ? this._data + '&' + data : data;
     } else {
       this._data = (this._data || '') + data;
     }
@@ -662,7 +666,7 @@ RequestBase.prototype.send = function(data){
  * @api public
  */
 
-RequestBase.prototype.sortQuery = function(sort) {
+RequestBase.prototype.sortQuery = function (sort) {
   // _sort default to true but otherwise can be a function or boolean
   this._sort = typeof sort === 'undefined' ? true : sort;
   return this;
@@ -673,7 +677,7 @@ RequestBase.prototype.sortQuery = function(sort) {
  *
  * @api private
  */
-RequestBase.prototype._finalizeQueryString = function(){
+RequestBase.prototype._finalizeQueryString = function () {
   var query = this._query.join('&');
   if (query) {
     this.url += (this.url.indexOf('?') >= 0 ? '&' : '?') + query;
@@ -695,7 +699,9 @@ RequestBase.prototype._finalizeQueryString = function(){
 };
 
 // For backwards compat only
-RequestBase.prototype._appendQueryString = function() {console.trace("Unsupported");}
+RequestBase.prototype._appendQueryString = function () {
+  console.trace("Unsupported");
+};
 
 /**
  * Invoke callback with timeout error.
@@ -703,7 +709,7 @@ RequestBase.prototype._appendQueryString = function() {console.trace("Unsupporte
  * @api private
  */
 
-RequestBase.prototype._timeoutError = function(reason, timeout, errno){
+RequestBase.prototype._timeoutError = function (reason, timeout, errno) {
   if (this._aborted) {
     return;
   }
@@ -716,18 +722,18 @@ RequestBase.prototype._timeoutError = function(reason, timeout, errno){
   this.callback(err);
 };
 
-RequestBase.prototype._setTimeouts = function() {
+RequestBase.prototype._setTimeouts = function () {
   var self = this;
 
   // deadline
   if (this._timeout && !this._timer) {
-    this._timer = setTimeout(function(){
+    this._timer = setTimeout(function () {
       self._timeoutError('Timeout of ', self._timeout, 'ETIME');
     }, this._timeout);
   }
   // response timeout
   if (this._responseTimeout && !this._responseTimeoutTimer) {
-    this._responseTimeoutTimer = setTimeout(function(){
+    this._responseTimeoutTimer = setTimeout(function () {
       self._timeoutError('Response timeout of ', self._responseTimeout, 'ETIMEDOUT');
     }, this._responseTimeout);
   }
@@ -781,7 +787,7 @@ function mixin(obj) {
  * @api public
  */
 
-ResponseBase.prototype.get = function(field) {
+ResponseBase.prototype.get = function (field) {
   return this.header[field.toLowerCase()];
 };
 
@@ -797,28 +803,28 @@ ResponseBase.prototype.get = function(field) {
  * @api private
  */
 
-ResponseBase.prototype._setHeaderProperties = function(header){
-    // TODO: moar!
-    // TODO: make this a util
-
-    // content-type
-    var ct = header['content-type'] || '';
-    this.type = utils.type(ct);
+ResponseBase.prototype._setHeaderProperties = function (header) {
+  // TODO: moar!
+  // TODO: make this a util
 
-    // params
-    var params = utils.params(ct);
-    for (var key in params) this[key] = params[key];
+  // content-type
+  var ct = header['content-type'] || '';
+  this.type = utils.type(ct);
 
-    this.links = {};
+  // params
+  var params = utils.params(ct);
+  for (var key in params) {
+    this[key] = params[key];
+  }this.links = {};
 
-    // links
-    try {
-        if (header.link) {
-            this.links = utils.parseLinks(header.link);
-        }
-    } catch (err) {
-        // ignore
+  // links
+  try {
+    if (header.link) {
+      this.links = utils.parseLinks(header.link);
     }
+  } catch (err) {
+    // ignore
+  }
 };
 
 /**
@@ -842,31 +848,31 @@ ResponseBase.prototype._setHeaderProperties = function(header){
  * @api private
  */
 
-ResponseBase.prototype._setStatusProperties = function(status){
-    var type = status / 100 | 0;
-
-    // status / class
-    this.status = this.statusCode = status;
-    this.statusType = type;
-
-    // basics
-    this.info = 1 == type;
-    this.ok = 2 == type;
-    this.redirect = 3 == type;
-    this.clientError = 4 == type;
-    this.serverError = 5 == type;
-    this.error = (4 == type || 5 == type)
-        ? this.toError()
-        : false;
-
-    // sugar
-    this.accepted = 202 == status;
-    this.noContent = 204 == status;
-    this.badRequest = 400 == status;
-    this.unauthorized = 401 == status;
-    this.notAcceptable = 406 == status;
-    this.forbidden = 403 == status;
-    this.notFound = 404 == status;
+ResponseBase.prototype._setStatusProperties = function (status) {
+  var type = status / 100 | 0;
+
+  // status / class
+  this.status = this.statusCode = status;
+  this.statusType = type;
+
+  // basics
+  this.info = 1 == type;
+  this.ok = 2 == type;
+  this.redirect = 3 == type;
+  this.clientError = 4 == type;
+  this.serverError = 5 == type;
+  this.error = 4 == type || 5 == type ? this.toError() : false;
+
+  // sugar
+  this.created = 201 == status;
+  this.accepted = 202 == status;
+  this.noContent = 204 == status;
+  this.badRequest = 400 == status;
+  this.unauthorized = 401 == status;
+  this.notAcceptable = 406 == status;
+  this.forbidden = 403 == status;
+  this.notFound = 404 == status;
+  this.unprocessableEntity = 422 == status;
 };
 
 },{"./utils":5}],5:[function(require,module,exports){
@@ -880,7 +886,7 @@ ResponseBase.prototype._setStatusProperties = function(status){
  * @api private
  */
 
-exports.type = function(str){
+exports.type = function (str) {
   return str.split(/ *; */).shift();
 };
 
@@ -892,8 +898,8 @@ exports.type = function(str){
  * @api private
  */
 
-exports.params = function(str){
-  return str.split(/ *; */).reduce(function(obj, str){
+exports.params = function (str) {
+  return str.split(/ *; */).reduce(function (obj, str) {
     var parts = str.split(/ *= */);
     var key = parts.shift();
     var val = parts.shift();
@@ -911,8 +917,8 @@ exports.params = function(str){
  * @api private
  */
 
-exports.parseLinks = function(str){
-  return str.split(/ *, */).reduce(function(obj, str){
+exports.parseLinks = function (str) {
+  return str.split(/ *, */).reduce(function (obj, str) {
     var parts = str.split(/ *; */);
     var url = parts[0].slice(1, -1);
     var rel = parts[1].split(/ *= */)[1].slice(1, -1);
@@ -929,7 +935,7 @@ exports.parseLinks = function(str){
  * @api private
  */
 
-exports.cleanHeader = function(header, changesOrigin){
+exports.cleanHeader = function (header, changesOrigin) {
   delete header['content-type'];
   delete header['content-length'];
   delete header['transfer-encoding'];
@@ -1108,18 +1114,25 @@ Emitter.prototype.hasListeners = function(event){
 };
 
 },{}],7:[function(require,module,exports){
+'use strict';
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 /**
  * Root reference for iframes.
  */
 
-var root;
-if (typeof window !== 'undefined') { // Browser window
+var root = void 0;
+if (typeof window !== 'undefined') {
+  // Browser window
   root = window;
-} else if (typeof self !== 'undefined') { // Web Worker
+} else if (typeof self !== 'undefined') {
+  // Web Worker
   root = self;
-} else { // Other environments
+} else {
+  // Other environments
   console.warn("Using browser-only version of superagent in non-browser environment");
-  root = this;
+  root = undefined;
 }
 
 var Emitter = require('component-emitter');
@@ -1132,13 +1145,13 @@ var Agent = require('./agent-base');
  * Noop.
  */
 
-function noop(){};
+function noop() {};
 
 /**
  * Expose `request`.
  */
 
-var request = exports = module.exports = function(method, url) {
+var request = exports = module.exports = function (method, url) {
   // callback
   if ('function' == typeof url) {
     return new exports.Request('GET', method).end(url);
@@ -1150,7 +1163,7 @@ var request = exports = module.exports = function(method, url) {
   }
 
   return new exports.Request(method, url);
-}
+};
 
 exports.Request = Request;
 
@@ -1159,15 +1172,21 @@ exports.Request = Request;
  */
 
 request.getXHR = function () {
-  if (root.XMLHttpRequest
-      && (!root.location || 'file:' != root.location.protocol
-          || !root.ActiveXObject)) {
-    return new XMLHttpRequest;
+  if (root.XMLHttpRequest && (!root.location || 'file:' != root.location.protocol || !root.ActiveXObject)) {
+    return new XMLHttpRequest();
   } else {
-    try { return new ActiveXObject('Microsoft.XMLHTTP'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP.6.0'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP.3.0'); } catch(e) {}
-    try { return new ActiveXObject('Msxml2.XMLHTTP'); } catch(e) {}
+    try {
+      return new ActiveXObject('Microsoft.XMLHTTP');
+    } catch (e) {}
+    try {
+      return new ActiveXObject('Msxml2.XMLHTTP.6.0');
+    } catch (e) {}
+    try {
+      return new ActiveXObject('Msxml2.XMLHTTP.3.0');
+    } catch (e) {}
+    try {
+      return new ActiveXObject('Msxml2.XMLHTTP');
+    } catch (e) {}
   }
   throw Error("Browser-only version of superagent could not find XHR");
 };
@@ -1180,9 +1199,11 @@ request.getXHR = function () {
  * @api private
  */
 
-var trim = ''.trim
-  ? function(s) { return s.trim(); }
-  : function(s) { return s.replace(/(^\s*|\s*$)/g, ''); };
+var trim = ''.trim ? function (s) {
+  return s.trim();
+} : function (s) {
+  return s.replace(/(^\s*|\s*$)/g, '');
+};
 
 /**
  * Serialize the given `obj`.
@@ -1213,16 +1234,15 @@ function serialize(obj) {
 function pushEncodedKeyValuePair(pairs, key, val) {
   if (val != null) {
     if (Array.isArray(val)) {
-      val.forEach(function(v) {
+      val.forEach(function (v) {
         pushEncodedKeyValuePair(pairs, key, v);
       });
     } else if (isObject(val)) {
-      for(var subkey in val) {
+      for (var subkey in val) {
         pushEncodedKeyValuePair(pairs, key + '[' + subkey + ']', val[subkey]);
       }
     } else {
-      pairs.push(encodeURIComponent(key)
-        + '=' + encodeURIComponent(val));
+      pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(val));
     }
   } else if (val === null) {
     pairs.push(encodeURIComponent(key));
@@ -1246,8 +1266,8 @@ request.serializeObject = serialize;
 function parseString(str) {
   var obj = {};
   var pairs = str.split('&');
-  var pair;
-  var pos;
+  var pair = void 0;
+  var pos = void 0;
 
   for (var i = 0, len = pairs.length; i < len; ++i) {
     pair = pairs[i];
@@ -1255,8 +1275,7 @@ function parseString(str) {
     if (pos == -1) {
       obj[decodeURIComponent(pair)] = '';
     } else {
-      obj[decodeURIComponent(pair.slice(0, pos))] =
-        decodeURIComponent(pair.slice(pos + 1));
+      obj[decodeURIComponent(pair.slice(0, pos))] = decodeURIComponent(pair.slice(pos + 1));
     }
   }
 
@@ -1296,7 +1315,7 @@ request.types = {
 
 request.serialize = {
   'application/x-www-form-urlencoded': serialize,
-  'application/json': JSON.stringify,
+  'application/json': JSON.stringify
 };
 
 /**
@@ -1310,7 +1329,7 @@ request.serialize = {
 
 request.parse = {
   'application/x-www-form-urlencoded': parseString,
-  'application/json': JSON.parse,
+  'application/json': JSON.parse
 };
 
 /**
@@ -1325,15 +1344,16 @@ request.parse = {
 function parseHeader(str) {
   var lines = str.split(/\r?\n/);
   var fields = {};
-  var index;
-  var line;
-  var field;
-  var val;
+  var index = void 0;
+  var line = void 0;
+  var field = void 0;
+  var val = void 0;
 
   for (var i = 0, len = lines.length; i < len; ++i) {
     line = lines[i];
     index = line.indexOf(':');
-    if (index === -1) { // could be empty line, just skip it
+    if (index === -1) {
+      // could be empty line, just skip it
       continue;
     }
     field = line.slice(0, index).toLowerCase();
@@ -1353,7 +1373,10 @@ function parseHeader(str) {
  */
 
 function isJSON(mime) {
-  return /[\/+]json\b/.test(mime);
+  // should match /json or +json
+  // but not /json-seq
+  return (/[\/+]json($|[^-\w])/.test(mime)
+  );
 }
 
 /**
@@ -1406,9 +1429,7 @@ function Response(req) {
   this.req = req;
   this.xhr = this.req.xhr;
   // responseText is accessible only if responseType is '' or 'text' and on older browsers
-  this.text = ((this.req.method !='HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text')) || typeof this.xhr.responseType === 'undefined')
-     ? this.xhr.responseText
-     : null;
+  this.text = this.req.method != 'HEAD' && (this.xhr.responseType === '' || this.xhr.responseType === 'text') || typeof this.xhr.responseType === 'undefined' ? this.xhr.responseText : null;
   this.statusText = this.req.xhr.statusText;
   var status = this.xhr.status;
   // handle IE9 bug: http://stackoverflow.com/questions/10046972/msie-returns-status-code-of-1223-for-ajax-request
@@ -1426,9 +1447,7 @@ function Response(req) {
   if (null === this.text && req._responseType) {
     this.body = this.xhr.response;
   } else {
-    this.body = this.req.method != 'HEAD'
-      ? this._parseBody(this.text ? this.text : this.xhr.response)
-      : null;
+    this.body = this.req.method != 'HEAD' ? this._parseBody(this.text ? this.text : this.xhr.response) : null;
   }
 }
 
@@ -1445,7 +1464,7 @@ ResponseBase(Response.prototype);
  * @api private
  */
 
-Response.prototype._parseBody = function(str) {
+Response.prototype._parseBody = function (str) {
   var parse = request.parse[this.type];
   if (this.req._parser) {
     return this.req._parser(this, str);
@@ -1453,9 +1472,7 @@ Response.prototype._parseBody = function(str) {
   if (!parse && isJSON(this.type)) {
     parse = request.parse['application/json'];
   }
-  return parse && str && (str.length || str instanceof Object)
-    ? parse(str)
-    : null;
+  return parse && str && (str.length || str instanceof Object) ? parse(str) : null;
 };
 
 /**
@@ -1465,7 +1482,7 @@ Response.prototype._parseBody = function(str) {
  * @api public
  */
 
-Response.prototype.toError = function(){
+Response.prototype.toError = function () {
   var req = this.req;
   var method = req.method;
   var url = req.url;
@@ -1500,13 +1517,13 @@ function Request(method, url) {
   this.url = url;
   this.header = {}; // preserves header name case
   this._header = {}; // coerces header names to lowercase
-  this.on('end', function(){
+  this.on('end', function () {
     var err = null;
     var res = null;
 
     try {
       res = new Response(self);
-    } catch(e) {
+    } catch (e) {
       err = new Error('Parser is unable to parse the response');
       err.parse = true;
       err.original = e;
@@ -1527,12 +1544,12 @@ function Request(method, url) {
 
     self.emit('response', res);
 
-    var new_err;
+    var new_err = void 0;
     try {
       if (!self._isResponseOK(res)) {
         new_err = new Error(res.statusText || 'Unsuccessful HTTP response');
       }
-    } catch(custom_err) {
+    } catch (custom_err) {
       new_err = custom_err; // ok() callback can throw
     }
 
@@ -1577,7 +1594,7 @@ RequestBase(Request.prototype);
  * @api public
  */
 
-Request.prototype.type = function(type){
+Request.prototype.type = function (type) {
   this.set('Content-Type', request.types[type] || type);
   return this;
 };
@@ -1602,7 +1619,7 @@ Request.prototype.type = function(type){
  * @api public
  */
 
-Request.prototype.accept = function(type){
+Request.prototype.accept = function (type) {
   this.set('Accept', request.types[type] || type);
   return this;
 };
@@ -1617,19 +1634,20 @@ Request.prototype.accept = function(type){
  * @api public
  */
 
-Request.prototype.auth = function(user, pass, options){
+Request.prototype.auth = function (user, pass, options) {
   if (1 === arguments.length) pass = '';
-  if (typeof pass === 'object' && pass !== null) { // pass is optional and can be replaced with options
+  if ((typeof pass === 'undefined' ? 'undefined' : _typeof(pass)) === 'object' && pass !== null) {
+    // pass is optional and can be replaced with options
     options = pass;
     pass = '';
   }
   if (!options) {
     options = {
-      type: 'function' === typeof btoa ? 'basic' : 'auto',
+      type: 'function' === typeof btoa ? 'basic' : 'auto'
     };
   }
 
-  var encoder = function(string) {
+  var encoder = function encoder(string) {
     if ('function' === typeof btoa) {
       return btoa(string);
     }
@@ -1653,7 +1671,7 @@ Request.prototype.auth = function(user, pass, options){
  * @api public
  */
 
-Request.prototype.query = function(val){
+Request.prototype.query = function (val) {
   if ('string' != typeof val) val = serialize(val);
   if (val) this._query.push(val);
   return this;
@@ -1676,7 +1694,7 @@ Request.prototype.query = function(val){
  * @api public
  */
 
-Request.prototype.attach = function(field, file, options){
+Request.prototype.attach = function (field, file, options) {
   if (file) {
     if (this._data) {
       throw Error("superagent can't mix .send() and .attach()");
@@ -1687,7 +1705,7 @@ Request.prototype.attach = function(field, file, options){
   return this;
 };
 
-Request.prototype._getFormData = function(){
+Request.prototype._getFormData = function () {
   if (!this._formData) {
     this._formData = new root.FormData();
   }
@@ -1703,7 +1721,7 @@ Request.prototype._getFormData = function(){
  * @api private
  */
 
-Request.prototype.callback = function(err, res){
+Request.prototype.callback = function (err, res) {
   if (this._shouldRetry(err, res)) {
     return this._retry();
   }
@@ -1725,7 +1743,7 @@ Request.prototype.callback = function(err, res){
  * @api private
  */
 
-Request.prototype.crossDomainError = function(){
+Request.prototype.crossDomainError = function () {
   var err = new Error('Request has been terminated\nPossible causes: the network is offline, Origin is not allowed by Access-Control-Allow-Origin, the page is being unloaded, etc.');
   err.crossDomain = true;
 
@@ -1737,13 +1755,13 @@ Request.prototype.crossDomainError = function(){
 };
 
 // This only warns, because the request is still likely to work
-Request.prototype.buffer = Request.prototype.ca = Request.prototype.agent = function(){
+Request.prototype.buffer = Request.prototype.ca = Request.prototype.agent = function () {
   console.warn("This is not supported in browser version of superagent");
   return this;
 };
 
 // This throws, because it can't send/receive data as expected
-Request.prototype.pipe = Request.prototype.write = function(){
+Request.prototype.pipe = Request.prototype.write = function () {
   throw Error("Streaming is not supported in browser version of superagent");
 };
 
@@ -1757,8 +1775,8 @@ Request.prototype.pipe = Request.prototype.write = function(){
  */
 Request.prototype._isHost = function _isHost(obj) {
   // Native objects stringify to [object File], [object Blob], [object FormData], etc.
-  return obj && 'object' === typeof obj && !Array.isArray(obj) && Object.prototype.toString.call(obj) !== '[object Object]';
-}
+  return obj && 'object' === (typeof obj === 'undefined' ? 'undefined' : _typeof(obj)) && !Array.isArray(obj) && Object.prototype.toString.call(obj) !== '[object Object]';
+};
 
 /**
  * Initiate request, invoking callback `fn(res)`
@@ -1769,7 +1787,7 @@ Request.prototype._isHost = function _isHost(obj) {
  * @api public
  */
 
-Request.prototype.end = function(fn){
+Request.prototype.end = function (fn) {
   if (this._endCalled) {
     console.warn("Warning: .end() was called twice. This is not supported in superagent");
   }
@@ -1781,18 +1799,20 @@ Request.prototype.end = function(fn){
   // querystring
   this._finalizeQueryString();
 
-  return this._end();
+  this._end();
 };
 
-Request.prototype._end = function() {
+Request.prototype._end = function () {
+  if (this._aborted) return this.callback(Error("The request has been aborted even before .end() was called"));
+
   var self = this;
-  var xhr = (this.xhr = request.getXHR());
+  var xhr = this.xhr = request.getXHR();
   var data = this._formData || this._data;
 
   this._setTimeouts();
 
   // state change
-  xhr.onreadystatechange = function(){
+  xhr.onreadystatechange = function () {
     var readyState = xhr.readyState;
     if (readyState >= 2 && self._responseTimeoutTimer) {
       clearTimeout(self._responseTimeoutTimer);
@@ -1803,8 +1823,12 @@ Request.prototype._end = function() {
 
     // In IE9, reads to any property (e.g. status) off of an aborted XHR will
     // result in the error "Could not complete the operation due to error c00c023f"
-    var status;
-    try { status = xhr.status } catch(e) { status = 0; }
+    var status = void 0;
+    try {
+      status = xhr.status;
+    } catch (e) {
+      status = 0;
+    }
 
     if (!status) {
       if (self.timedout || self._aborted) return;
@@ -1814,7 +1838,7 @@ Request.prototype._end = function() {
   };
 
   // progress
-  var handleProgress = function(direction, e) {
+  var handleProgress = function handleProgress(direction, e) {
     if (e.total > 0) {
       e.percent = e.loaded / e.total * 100;
     }
@@ -1827,7 +1851,7 @@ Request.prototype._end = function() {
       if (xhr.upload) {
         xhr.upload.onprogress = handleProgress.bind(null, 'upload');
       }
-    } catch(e) {
+    } catch (e) {
       // Accessing xhr.upload fails in IE from a web worker, so just pretend it doesn't exist.
       // Reported here:
       // https://connect.microsoft.com/IE/feedback/details/837245/xmlhttprequest-upload-throws-invalid-argument-when-used-from-web-worker-context
@@ -1853,19 +1877,18 @@ Request.prototype._end = function() {
   if (!this._formData && 'GET' != this.method && 'HEAD' != this.method && 'string' != typeof data && !this._isHost(data)) {
     // serialize stuff
     var contentType = this._header['content-type'];
-    var serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];
-    if (!serialize && isJSON(contentType)) {
-      serialize = request.serialize['application/json'];
+    var _serialize = this._serializer || request.serialize[contentType ? contentType.split(';')[0] : ''];
+    if (!_serialize && isJSON(contentType)) {
+      _serialize = request.serialize['application/json'];
     }
-    if (serialize) data = serialize(data);
+    if (_serialize) data = _serialize(data);
   }
 
   // set header fields
   for (var field in this.header) {
     if (null == this.header[field]) continue;
 
-    if (this.header.hasOwnProperty(field))
-      xhr.setRequestHeader(field, this.header[field]);
+    if (this.header.hasOwnProperty(field)) xhr.setRequestHeader(field, this.header[field]);
   }
 
   if (this._responseType) {
@@ -1878,15 +1901,14 @@ Request.prototype._end = function() {
   // IE11 xhr.send(undefined) sends 'undefined' string as POST payload (instead of nothing)
   // We need null here if data is undefined
   xhr.send(typeof data !== 'undefined' ? data : null);
-  return this;
 };
 
-request.agent = function() {
+request.agent = function () {
   return new Agent();
 };
 
-["GET", "POST", "OPTIONS", "PATCH", "PUT", "DELETE"].forEach(function(method) {
-  Agent.prototype[method.toLowerCase()] = function(url, fn) {
+["GET", "POST", "OPTIONS", "PATCH", "PUT", "DELETE"].forEach(function (method) {
+  Agent.prototype[method.toLowerCase()] = function (url, fn) {
     var req = new request.Request(method, url);
     this._setDefaults(req);
     if (fn) {
@@ -1908,9 +1930,9 @@ Agent.prototype.del = Agent.prototype['delete'];
  * @api public
  */
 
-request.get = function(url, data, fn) {
+request.get = function (url, data, fn) {
   var req = request('GET', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.query(data);
   if (fn) req.end(fn);
   return req;
@@ -1926,9 +1948,9 @@ request.get = function(url, data, fn) {
  * @api public
  */
 
-request.head = function(url, data, fn) {
+request.head = function (url, data, fn) {
   var req = request('HEAD', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.query(data);
   if (fn) req.end(fn);
   return req;
@@ -1944,9 +1966,9 @@ request.head = function(url, data, fn) {
  * @api public
  */
 
-request.options = function(url, data, fn) {
+request.options = function (url, data, fn) {
   var req = request('OPTIONS', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.send(data);
   if (fn) req.end(fn);
   return req;
@@ -1964,7 +1986,7 @@ request.options = function(url, data, fn) {
 
 function del(url, data, fn) {
   var req = request('DELETE', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.send(data);
   if (fn) req.end(fn);
   return req;
@@ -1983,9 +2005,9 @@ request['delete'] = del;
  * @api public
  */
 
-request.patch = function(url, data, fn) {
+request.patch = function (url, data, fn) {
   var req = request('PATCH', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.send(data);
   if (fn) req.end(fn);
   return req;
@@ -2001,9 +2023,9 @@ request.patch = function(url, data, fn) {
  * @api public
  */
 
-request.post = function(url, data, fn) {
+request.post = function (url, data, fn) {
   var req = request('POST', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.send(data);
   if (fn) req.end(fn);
   return req;
@@ -2019,13 +2041,13 @@ request.post = function(url, data, fn) {
  * @api public
  */
 
-request.put = function(url, data, fn) {
+request.put = function (url, data, fn) {
   var req = request('PUT', url);
-  if ('function' == typeof data) (fn = data), (data = null);
+  if ('function' == typeof data) fn = data, data = null;
   if (data) req.send(data);
   if (fn) req.end(fn);
   return req;
 };
 
 },{"./agent-base":1,"./is-object":2,"./request-base":3,"./response-base":4,"component-emitter":6}]},{},[7])(7)
-});
+});