@jbrowse/core 1.6.7 → 1.7.0

package/data_adapters/BaseAdapter.js

@@ -215,7 +215,7 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
                   if (!hasData) {
                     observer.complete();
                   } else {
-                    _this.getFeatures(region, opts).pipe((0, _operators.takeUntil)((0, _util.observeAbortSignal)(opts.signal))).subscribe(observer);
+                    _this.getFeatures(region, opts).subscribe(observer);
                   }
 
                 case 5:
@@ -253,47 +253,9 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
       var _this2 = this;
 
       var opts = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-      var obs = _rxjs.merge.apply(void 0, (0, _toConsumableArray2.default)(regions.map(function (region) {
-        return (0, _rxjs2.ObservableCreate)( /*#__PURE__*/function () {
-          var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(observer) {
-            var hasData;
-            return _regenerator.default.wrap(function _callee4$(_context4) {
-              while (1) {
-                switch (_context4.prev = _context4.next) {
-                  case 0:
-                    _context4.next = 2;
-                    return _this2.hasDataForRefName(region.refName, opts);
-
-                  case 2:
-                    hasData = _context4.sent;
-                    (0, _util.checkAbortSignal)(opts.signal);
-
-                    if (!hasData) {
-                      observer.complete();
-                    } else {
-                      _this2.getFeatures(region, opts).subscribe(observer);
-                    }
-
-                  case 5:
-                  case "end":
-                    return _context4.stop();
-                }
-              }
-            }, _callee4);
-          }));
-
-          return function (_x4) {
-            return _ref2.apply(this, arguments);
-          };
-        }());
+      return _rxjs.merge.apply(void 0, (0, _toConsumableArray2.default)(regions.map(function (region) {
+        return _this2.getFeaturesInRegion(region, opts);
       })));
-
-      if (opts.signal) {
-        return obs.pipe((0, _operators.takeUntil)((0, _util.observeAbortSignal)(opts.signal)));
-      }
-
-      return obs;
     }
     /**
      * Check if the store has data for the given reference name.
@@ -304,31 +266,31 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
   }, {
     key: "hasDataForRefName",
     value: function () {
-      var _hasDataForRefName = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(refName) {
+      var _hasDataForRefName = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(refName) {
         var opts,
             refNames,
-            _args5 = arguments;
-        return _regenerator.default.wrap(function _callee5$(_context5) {
+            _args4 = arguments;
+        return _regenerator.default.wrap(function _callee4$(_context4) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context4.prev = _context4.next) {
               case 0:
-                opts = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : {};
-                _context5.next = 3;
+                opts = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {};
+                _context4.next = 3;
                 return this.getRefNames(opts);
 
               case 3:
-                refNames = _context5.sent;
-                return _context5.abrupt("return", refNames.includes(refName));
+                refNames = _context4.sent;
+                return _context4.abrupt("return", refNames.includes(refName));
 
               case 5:
               case "end":
-                return _context5.stop();
+                return _context4.stop();
             }
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
 
-      function hasDataForRefName(_x5) {
+      function hasDataForRefName(_x4) {
         return _hasDataForRefName.apply(this, arguments);
       }
 
@@ -337,24 +299,24 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
   }, {
     key: "getRegionStats",
     value: function () {
-      var _getRegionStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(region, opts) {
+      var _getRegionStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(region, opts) {
         var feats;
-        return _regenerator.default.wrap(function _callee6$(_context6) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context6.prev = _context6.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
                 feats = this.getFeatures(region, opts);
-                return _context6.abrupt("return", (0, _stats.scoresToStats)(region, feats));
+                return _context5.abrupt("return", (0, _stats.scoresToStats)(region, feats));
 
               case 2:
               case "end":
-                return _context6.stop();
+                return _context5.stop();
             }
           }
-        }, _callee6, this);
+        }, _callee5, this);
       }));
 
-      function getRegionStats(_x6, _x7) {
+      function getRegionStats(_x5, _x6) {
         return _getRegionStats.apply(this, arguments);
       }
 
@@ -363,7 +325,7 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
   }, {
     key: "getMultiRegionStats",
     value: function () {
-      var _getMultiRegionStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
+      var _getMultiRegionStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6() {
         var _this3 = this;
 
         var regions,
@@ -375,29 +337,29 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
             scoreSumSquares,
             featureCount,
             basesCovered,
-            _args7 = arguments;
-        return _regenerator.default.wrap(function _callee7$(_context7) {
+            _args6 = arguments;
+        return _regenerator.default.wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context7.prev = _context7.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                regions = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : [];
-                opts = _args7.length > 1 ? _args7[1] : undefined;
+                regions = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : [];
+                opts = _args6.length > 1 ? _args6[1] : undefined;
 
                 if (regions.length) {
-                  _context7.next = 4;
+                  _context6.next = 4;
                   break;
                 }
 
-                return _context7.abrupt("return", (0, _stats.blankStats)());
+                return _context6.abrupt("return", (0, _stats.blankStats)());
 
               case 4:
-                _context7.next = 6;
+                _context6.next = 6;
                 return Promise.all(regions.map(function (region) {
                   return _this3.getRegionStats(region, opts);
                 }));
 
               case 6:
-                feats = _context7.sent;
+                feats = _context6.sent;
                 scoreMax = feats.map(function (a) {
                   return a.scoreMax;
                 }).reduce(function (a, b) {
@@ -420,7 +382,7 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
                 basesCovered = feats.reduce(function (a, b) {
                   return a + b.basesCovered;
                 }, 0);
-                return _context7.abrupt("return", (0, _stats.rectifyStats)({
+                return _context6.abrupt("return", (0, _stats.rectifyStats)({
                   scoreMin: scoreMin,
                   scoreMax: scoreMax,
                   featureCount: featureCount,
@@ -431,10 +393,10 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
 
               case 14:
               case "end":
-                return _context7.stop();
+                return _context6.stop();
             }
           }
-        }, _callee7);
+        }, _callee6);
       }));
 
       function getMultiRegionStats() {
@@ -446,16 +408,16 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
   }, {
     key: "estimateRegionsStats",
     value: function () {
-      var _estimateRegionsStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(regions, opts) {
+      var _estimateRegionsStats = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(regions, opts) {
         var _this4 = this;
 
         var region, lastTime, statsFromInterval, maybeRecordStats;
-        return _regenerator.default.wrap(function _callee10$(_context10) {
+        return _regenerator.default.wrap(function _callee9$(_context9) {
           while (1) {
-            switch (_context10.prev = _context10.next) {
+            switch (_context9.prev = _context9.next) {
               case 0:
                 if (regions.length) {
-                  _context10.next = 2;
+                  _context9.next = 2;
                   break;
                 }
 
@@ -466,11 +428,11 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
                 lastTime = +Date.now();
 
                 statsFromInterval = /*#__PURE__*/function () {
-                  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(length, expansionTime) {
+                  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(length, expansionTime) {
                     var start, end, sampleCenter, query, features;
-                    return _regenerator.default.wrap(function _callee8$(_context8) {
+                    return _regenerator.default.wrap(function _callee7$(_context7) {
                       while (1) {
-                        switch (_context8.prev = _context8.next) {
+                        switch (_context7.prev = _context7.next) {
                           case 0:
                             start = region.start, end = region.end;
                             sampleCenter = start * 0.75 + end * 0.25;
@@ -478,85 +440,85 @@ var BaseFeatureDataAdapter = /*#__PURE__*/function (_BaseAdapter) {
                               start: Math.max(0, Math.round(sampleCenter - length / 2)),
                               end: Math.min(Math.round(sampleCenter + length / 2), end)
                             });
-                            _context8.next = 5;
+                            _context7.next = 5;
                             return _this4.getFeatures(query, opts).pipe((0, _operators.toArray)()).toPromise();
 
                           case 5:
-                            features = _context8.sent;
-                            return _context8.abrupt("return", maybeRecordStats(length, {
+                            features = _context7.sent;
+                            return _context7.abrupt("return", maybeRecordStats(length, {
                               featureDensity: features.length / length
                             }, features.length, expansionTime));
 
                           case 7:
                           case "end":
-                            return _context8.stop();
+                            return _context7.stop();
                         }
                       }
-                    }, _callee8);
+                    }, _callee7);
                   }));
 
-                  return function statsFromInterval(_x10, _x11) {
-                    return _ref3.apply(this, arguments);
+                  return function statsFromInterval(_x9, _x10) {
+                    return _ref2.apply(this, arguments);
                   };
                 }();
 
                 maybeRecordStats = /*#__PURE__*/function () {
-                  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(interval, stats, statsSampleFeatures, expansionTime) {
+                  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(interval, stats, statsSampleFeatures, expansionTime) {
                     var refLen, currTime;
-                    return _regenerator.default.wrap(function _callee9$(_context9) {
+                    return _regenerator.default.wrap(function _callee8$(_context8) {
                       while (1) {
-                        switch (_context9.prev = _context9.next) {
+                        switch (_context8.prev = _context8.next) {
                           case 0:
                             refLen = region.end - region.start;
 
                             if (!(statsSampleFeatures >= 70 || interval * 2 > refLen)) {
-                              _context9.next = 5;
+                              _context8.next = 5;
                               break;
                             }
 
-                            return _context9.abrupt("return", stats);
+                            return _context8.abrupt("return", stats);
 
                           case 5:
                             if (!(expansionTime <= 5000)) {
-                              _context9.next = 12;
+                              _context8.next = 12;
                               break;
                             }
 
                             currTime = +Date.now();
                             expansionTime += currTime - lastTime;
                             lastTime = currTime;
-                            return _context9.abrupt("return", statsFromInterval(interval * 2, expansionTime));
+                            return _context8.abrupt("return", statsFromInterval(interval * 2, expansionTime));
 
                           case 12:
                             console.warn("Stats estimation reached timeout, or didn't get enough features");
-                            return _context9.abrupt("return", {
+                            return _context8.abrupt("return", {
                               featureDensity: Infinity
                             });
 
                           case 14:
                           case "end":
-                            return _context9.stop();
+                            return _context8.stop();
                         }
                       }
-                    }, _callee9);
+                    }, _callee8);
                   }));
 
-                  return function maybeRecordStats(_x12, _x13, _x14, _x15) {
-                    return _ref4.apply(this, arguments);
+                  return function maybeRecordStats(_x11, _x12, _x13, _x14) {
+                    return _ref3.apply(this, arguments);
                   };
                 }();
 
-                return _context10.abrupt("return", statsFromInterval(1000, 0));
+                return _context9.abrupt("return", statsFromInterval(1000, 0));
 
               case 7:
               case "end":
-                return _context10.stop();
+                return _context9.stop();
             }
           }
-        }, _callee10);
+        }, _callee9);
       }));
 
-      function estimateRegionsStats(_x8, _x9) {
+      function estimateRegionsStats(_x7, _x8) {
         return _estimateRegionsStats.apply(this, arguments);
       }
 
@@ -581,21 +543,21 @@ var BaseSequenceAdapter = /*#__PURE__*/function (_BaseFeatureDataAdapt) {
   (0, _createClass2.default)(BaseSequenceAdapter, [{
     key: "estimateRegionsStats",
     value: function () {
-      var _estimateRegionsStats2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
-        return _regenerator.default.wrap(function _callee11$(_context11) {
+      var _estimateRegionsStats2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10() {
+        return _regenerator.default.wrap(function _callee10$(_context10) {
           while (1) {
-            switch (_context11.prev = _context11.next) {
+            switch (_context10.prev = _context10.next) {
               case 0:
-                return _context11.abrupt("return", {
+                return _context10.abrupt("return", {
                   featureDensity: 0
                 });
 
               case 1:
               case "end":
-                return _context11.stop();
+                return _context10.stop();
             }
           }
-        }, _callee11);
+        }, _callee10);
       }));
 
       function estimateRegionsStats() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/core",
-  "version": "1.6.7",
+  "version": "1.7.0",
   "description": "JBrowse 2 core libraries used by plugins",
   "keywords": [
     "jbrowse",
@@ -22,14 +22,12 @@
   "scripts": {
     "test": "cd ../..; jest packages/core",
     "coverage": "yarn test --coverage",
-    "lint": "tsc --noEmit && eslint --ext .js,.ts,.jsx,.tsx .",
     "clean": "rimraf dist",
     "prebuild": "yarn clean",
     "prepack": "yarn build",
     "build": "babel . --root-mode upward --out-dir dist --extensions '.ts,.js,.tsx,.jsx' && cp package.json README.md ../../LICENSE dist/ && tsc"
   },
   "dependencies": {
-    "@babel/runtime": "^7.16.3",
     "@material-ui/icons": "^4.0.1",
     "abortable-promise-cache": "^1.5.0",
     "base64-js": "^1.3.0",
@@ -44,18 +42,17 @@
     "fast-deep-equal": "^3.1.3",
     "file-uri-to-path": "^1.0.0",
     "generic-filehandle": "^2.2.2",
-    "http-range-fetcher": "^1.2.2",
+    "http-range-fetcher": "^1.4.0",
     "is-object": "^1.0.1",
     "jexl": "^2.3.0",
     "json-stable-stringify": "^1.0.1",
-    "librpc-web-mod": "^1.1.4",
+    "librpc-web-mod": "^1.1.5",
     "load-script2": "^2.0.5",
     "object.fromentries": "^2.0.0",
     "rbush": "^3.0.1",
     "react-error-boundary": "^3.0.0",
     "react-intersection-observer": "^8.32.5",
-    "react-sizeme": "^3.0.2",
-    "sanitize-filename": "^1.6.3",
+    "react-use-measure": "^2.1.1",
     "shortid": "^2.2.13",
     "svg-path-generator": "^1.1.0",
     "tenacious-fetch": "^2.1.0",
@@ -77,5 +74,5 @@
     "access": "public",
     "directory": "dist"
   },
-  "gitHead": "02012ec299c36647f755316571775d36b0fee5ec"
+  "gitHead": "cc13844074d11881d211342a6a7eea113561b70b"
 }

package/pluggableElementTypes/WidgetType.d.ts

@@ -1,5 +1,4 @@
-import React from 'react';
-import { ComponentType, LazyExoticComponent } from 'react';
+import React, { ComponentType, LazyExoticComponent } from 'react';
 import { IAnyModelType, IAnyStateTreeNode } from 'mobx-state-tree';
 import PluggableElementBase from './PluggableElementBase';
 import { AnyConfigurationSchemaType } from '../configuration/configurationSchema';

package/pluggableElementTypes/models/BaseViewModel.js

@@ -37,6 +37,6 @@ var BaseViewModel = _mobxStateTree.types.model('BaseView', {
   };
 });
 
-var _default = BaseViewModel; // eslint-disable-next-line @typescript-eslint/no-empty-interface,@typescript-eslint/interface-name-prefix
+var _default = BaseViewModel; // eslint-disable-next-line @typescript-eslint/no-empty-interface
 
 exports.default = _default;

package/pluggableElementTypes/models/InternetAccountModel.js

@@ -162,35 +162,35 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @returns A promise for the token
      */
     getToken: function getToken(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
         var _location$internetAcc, _location$internetAcc2;
 
         var token;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
+        return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
-            switch (_context3.prev = _context3.next) {
+            switch (_context2.prev = _context2.next) {
               case 0:
                 if (!tokenPromise) {
-                  _context3.next = 2;
+                  _context2.next = 2;
                   break;
                 }
 
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 2:
                 token = location === null || location === void 0 ? void 0 : (_location$internetAcc = location.internetAccountPreAuthorization) === null || _location$internetAcc === void 0 ? void 0 : (_location$internetAcc2 = _location$internetAcc.authInfo) === null || _location$internetAcc2 === void 0 ? void 0 : _location$internetAcc2.token;
 
                 if (!token) {
-                  _context3.next = 6;
+                  _context2.next = 6;
                   break;
                 }
 
                 tokenPromise = Promise.resolve(token);
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 6:
                 if (!inWebWorker) {
-                  _context3.next = 8;
+                  _context2.next = 8;
                   break;
                 }
 
@@ -200,53 +200,35 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
                 token = self.retrieveToken();
 
                 if (!token) {
-                  _context3.next = 12;
+                  _context2.next = 12;
                   break;
                 }
 
                 tokenPromise = Promise.resolve(token);
-                return _context3.abrupt("return", tokenPromise);
+                return _context2.abrupt("return", tokenPromise);
 
               case 12:
-                tokenPromise = new Promise( /*#__PURE__*/function () {
-                  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(r, x) {
-                    var resolve, reject;
-                    return _regenerator.default.wrap(function _callee2$(_context2) {
-                      while (1) {
-                        switch (_context2.prev = _context2.next) {
-                          case 0:
-                            reject = function _reject(error) {
-                              self.removeToken();
-                              x(error);
-                            };
-
-                            resolve = function _resolve(token) {
-                              self.storeToken(token);
-                              r(token);
-                            };
-
-                            self.getTokenFromUser(resolve, reject);
-
-                          case 3:
-                          case "end":
-                            return _context2.stop();
-                        }
-                      }
-                    }, _callee2);
-                  }));
-
-                  return function (_x, _x2) {
-                    return _ref.apply(this, arguments);
-                  };
-                }());
-                return _context3.abrupt("return", tokenPromise);
+                tokenPromise = new Promise(function (r, x) {
+                  function resolve(token) {
+                    self.storeToken(token);
+                    r(token);
+                  }
+
+                  function reject(error) {
+                    self.removeToken();
+                    x(error);
+                  }
+
+                  self.getTokenFromUser(resolve, reject);
+                });
+                return _context2.abrupt("return", tokenPromise);
 
               case 14:
               case "end":
-                return _context3.stop();
+                return _context2.stop();
             }
           }
-        }, _callee3);
+        }, _callee2);
       }))();
     }
   };
@@ -270,34 +252,34 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @returns
      */
     getPreAuthorizationInformation: function getPreAuthorizationInformation(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var authToken, validatedToken;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
-                _context4.next = 2;
+                _context3.next = 2;
                 return self.getToken(location);
 
               case 2:
-                authToken = _context4.sent;
-                _context4.prev = 3;
-                _context4.next = 6;
+                authToken = _context3.sent;
+                _context3.prev = 3;
+                _context3.next = 6;
                 return self.validateToken(authToken, location);
 
               case 6:
-                validatedToken = _context4.sent;
-                _context4.next = 13;
+                validatedToken = _context3.sent;
+                _context3.next = 13;
                 break;
 
               case 9:
-                _context4.prev = 9;
-                _context4.t0 = _context4["catch"](3);
+                _context3.prev = 9;
+                _context3.t0 = _context3["catch"](3);
                 self.removeToken();
-                throw _context4.t0;
+                throw _context3.t0;
 
               case 13:
-                return _context4.abrupt("return", {
+                return _context3.abrupt("return", {
                   internetAccountType: self.type,
                   authInfo: {
                     token: validatedToken,
@@ -307,10 +289,10 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
 
               case 14:
               case "end":
-                return _context4.stop();
+                return _context3.stop();
             }
           }
-        }, _callee4, null, [[3, 9]]);
+        }, _callee3, null, [[3, 9]]);
       }))();
     }
   };
@@ -325,30 +307,30 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      */
     getFetcher: function getFetcher(location) {
       return /*#__PURE__*/function () {
-        var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(input, init) {
+        var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(input, init) {
           var authToken, newInit;
-          return _regenerator.default.wrap(function _callee5$(_context5) {
+          return _regenerator.default.wrap(function _callee4$(_context4) {
             while (1) {
-              switch (_context5.prev = _context5.next) {
+              switch (_context4.prev = _context4.next) {
                 case 0:
-                  _context5.next = 2;
+                  _context4.next = 2;
                   return self.getToken(location);
 
                 case 2:
-                  authToken = _context5.sent;
+                  authToken = _context4.sent;
                   newInit = self.addAuthHeaderToInit(init, authToken);
-                  return _context5.abrupt("return", fetch(input, newInit));
+                  return _context4.abrupt("return", fetch(input, newInit));
 
                 case 5:
                 case "end":
-                  return _context5.stop();
+                  return _context4.stop();
               }
             }
-          }, _callee5);
+          }, _callee4);
         }));
 
-        return function (_x3, _x4) {
-          return _ref2.apply(this, arguments);
+        return function (_x, _x2) {
+          return _ref.apply(this, arguments);
         };
       }();
     }