@jbrowse/core 2.0.1 → 2.1.0

package/pluggableElementTypes/models/InternetAccountModel.js

@@ -1,127 +1,91 @@
 "use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.InternetAccount = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _mobxStateTree = require("mobx-state-tree");
-
-var _configuration = require("../../configuration");
-
-var _io = require("../../util/io");
-
-var _mst = require("../../util/types/mst");
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-var inWebWorker = typeof sessionStorage === 'undefined';
-
-var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
-  id: _mst.ElementId,
-  type: _mobxStateTree.types.string
-}).views(function (self) {
-  return {
+const mobx_state_tree_1 = require("mobx-state-tree");
+const configuration_1 = require("../../configuration");
+const io_1 = require("../../util/io");
+const mst_1 = require("../../util/types/mst");
+const inWebWorker = typeof sessionStorage === 'undefined';
+exports.InternetAccount = mobx_state_tree_1.types
+    .model('InternetAccount', {
+    id: mst_1.ElementId,
+    type: mobx_state_tree_1.types.string,
+})
+    .views(self => ({
     get name() {
-      return (0, _configuration.getConf)(self, 'name');
+        return (0, configuration_1.getConf)(self, 'name');
     },
-
     get description() {
-      return (0, _configuration.getConf)(self, 'description');
+        return (0, configuration_1.getConf)(self, 'description');
     },
-
     get internetAccountId() {
-      return (0, _configuration.getConf)(self, 'internetAccountId');
+        return (0, configuration_1.getConf)(self, 'internetAccountId');
     },
-
     get authHeader() {
-      return (0, _configuration.getConf)(self, 'authHeader');
+        return (0, configuration_1.getConf)(self, 'authHeader');
     },
-
     get tokenType() {
-      return (0, _configuration.getConf)(self, 'tokenType');
+        return (0, configuration_1.getConf)(self, 'tokenType');
     },
-
     get domains() {
-      return (0, _configuration.getConf)(self, 'domains');
+        return (0, configuration_1.getConf)(self, 'domains');
     },
-
     /**
      * Can use this to customize what is displayed in fileSelector's toggle box
      */
     get toggleContents() {
-      return null;
+        return null;
     },
-
     /**
      * Can use this to customize what the fileSelector. It takes a prop called
      * `setLocation` that should be used to set a UriLocation
      */
     get SelectorComponent() {
-      return undefined;
+        return undefined;
     },
-
     /**
      * Can use this to add a label to the UrlChooser. Has no effect if a custom
      * SelectorComponent is supplied
      */
     get selectorLabel() {
-      return undefined;
-    }
-
-  };
-}).views(function (self) {
-  return {
+        return undefined;
+    },
+}))
+    .views(self => ({
     /**
      * Determine whether this internetAccount provides credentials for a URL
      * @param location  - UriLocation of resource
      * @returns true or false
      */
-    handlesLocation: function handlesLocation(location) {
-      return self.domains.some(function (domain) {
-        return location === null || location === void 0 ? void 0 : location.uri.includes(domain);
-      });
+    handlesLocation(location) {
+        return self.domains.some((domain) => location === null || location === void 0 ? void 0 : location.uri.includes(domain));
     },
-
     /**
      * The key used to store this internetAccount's token in sessionStorage
      */
     get tokenKey() {
-      return "".concat(self.internetAccountId, "-token");
-    }
-
-  };
-}).actions(function (self) {
-  return {
+        return `${self.internetAccountId}-token`;
+    },
+}))
+    .actions(self => ({
     /**
      * Must be implemented by a model extending or composing this one. Pass the
      * user's token to `resolve`.
      * @param resolve - Pass the token to this function
      * @param reject - If there is an error getting the token, call this function
      */
-    getTokenFromUser: function getTokenFromUser(resolve, reject) {
-      throw new Error('getTokenFromUser must be implemented by extending model');
+    getTokenFromUser(resolve, reject) {
+        throw new Error('getTokenFromUser must be implemented by extending model');
     },
-    storeToken: function storeToken(token) {
-      sessionStorage.setItem(self.tokenKey, token);
+    storeToken(token) {
+        sessionStorage.setItem(self.tokenKey, token);
     },
-    removeToken: function removeToken() {
-      sessionStorage.removeItem(self.tokenKey);
+    removeToken() {
+        sessionStorage.removeItem(self.tokenKey);
     },
-    retrieveToken: function retrieveToken() {
-      return sessionStorage.getItem(self.tokenKey);
+    retrieveToken() {
+        return sessionStorage.getItem(self.tokenKey);
     },
-
     /**
      * This can be used by an internetAccount to validate a token works before
      * it is used. This is run when preAuthorizationInformation is requested, so
@@ -134,170 +98,85 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @param location - UriLocation of the resource
      * @returns - Valid auth token
      */
-    validateToken: function validateToken(token, location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                return _context.abrupt("return", token);
-
-              case 1:
-              case "end":
-                return _context.stop();
+    async validateToken(token, location) {
+        return token;
+    },
+}))
+    .actions(self => {
+    let tokenPromise = undefined;
+    return {
+        /**
+         * Try to get the token from the location pre-auth, from local storage,
+         * or from a previously cached promise. If token is not available, uses
+         * `getTokenFromUser`.
+         * @param location - UriLocation of the resource
+         * @returns A promise for the token
+         */
+        async getToken(location) {
+            var _a, _b;
+            if (tokenPromise) {
+                return tokenPromise;
             }
-          }
-        }, _callee);
-      }))();
-    }
-  };
-}).actions(function (self) {
-  var tokenPromise = undefined;
-  return {
-    /**
-     * Try to get the token from the location pre-auth, from local storage,
-     * or from a previously cached promise. If token is not available, uses
-     * `getTokenFromUser`.
-     * @param location - UriLocation of the resource
-     * @returns A promise for the token
-     */
-    getToken: function getToken(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _location$internetAcc, _location$internetAcc2;
-
-        var token;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                if (!tokenPromise) {
-                  _context2.next = 2;
-                  break;
-                }
-
-                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) {
-                  _context2.next = 6;
-                  break;
-                }
-
+            let token = (_b = (_a = location === null || location === void 0 ? void 0 : location.internetAccountPreAuthorization) === null || _a === void 0 ? void 0 : _a.authInfo) === null || _b === void 0 ? void 0 : _b.token;
+            if (token) {
                 tokenPromise = Promise.resolve(token);
-                return _context2.abrupt("return", tokenPromise);
-
-              case 6:
-                if (!inWebWorker) {
-                  _context2.next = 8;
-                  break;
-                }
-
+                return tokenPromise;
+            }
+            if (inWebWorker) {
                 throw new Error('Did not get internet account pre-authorization info in worker');
-
-              case 8:
-                token = self.retrieveToken();
-
-                if (!token) {
-                  _context2.next = 12;
-                  break;
-                }
-
+            }
+            token = self.retrieveToken();
+            if (token) {
                 tokenPromise = Promise.resolve(token);
-                return _context2.abrupt("return", tokenPromise);
-
-              case 12:
-                tokenPromise = new Promise(function (r, x) {
-                  function resolve(token) {
+                return tokenPromise;
+            }
+            tokenPromise = new Promise((r, x) => {
+                function resolve(token) {
                     self.storeToken(token);
                     r(token);
-                  }
-
-                  function reject(error) {
+                }
+                function reject(error) {
                     self.removeToken();
                     x(error);
-                  }
-
-                  self.getTokenFromUser(resolve, reject);
-                });
-                return _context2.abrupt("return", tokenPromise);
-
-              case 14:
-              case "end":
-                return _context2.stop();
-            }
-          }
-        }, _callee2);
-      }))();
-    }
-  };
-}).actions(function (self) {
-  return {
-    addAuthHeaderToInit: function addAuthHeaderToInit() {
-      var init = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var token = arguments.length > 1 ? arguments[1] : undefined;
-      var tokenInfoString = self.tokenType ? "".concat(self.tokenType, " ").concat(token) : token;
-      var newHeaders = new Headers(init.headers || {});
-      newHeaders.append(self.authHeader, tokenInfoString);
-      return _objectSpread(_objectSpread({}, init), {}, {
-        headers: newHeaders
-      });
+                }
+                self.getTokenFromUser(resolve, reject);
+            });
+            return tokenPromise;
+        },
+    };
+})
+    .actions(self => ({
+    addAuthHeaderToInit(init = {}, token) {
+        const tokenInfoString = self.tokenType
+            ? `${self.tokenType} ${token}`
+            : token;
+        const newHeaders = new Headers(init.headers || {});
+        newHeaders.append(self.authHeader, tokenInfoString);
+        return { ...init, headers: newHeaders };
     },
-
     /**
      * Gets the token and returns it along with the information needed to
      * create a new internetAccount.
      * @param location - UriLocation of the resource
      * @returns
      */
-    getPreAuthorizationInformation: function getPreAuthorizationInformation(location) {
-      return (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-        var authToken, validatedToken;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) {
-            switch (_context3.prev = _context3.next) {
-              case 0:
-                _context3.next = 2;
-                return self.getToken(location);
-
-              case 2:
-                authToken = _context3.sent;
-                _context3.prev = 3;
-                _context3.next = 6;
-                return self.validateToken(authToken, location);
-
-              case 6:
-                validatedToken = _context3.sent;
-                _context3.next = 13;
-                break;
-
-              case 9:
-                _context3.prev = 9;
-                _context3.t0 = _context3["catch"](3);
-                self.removeToken();
-                throw _context3.t0;
-
-              case 13:
-                return _context3.abrupt("return", {
-                  internetAccountType: self.type,
-                  authInfo: {
-                    token: validatedToken,
-                    configuration: (0, _configuration.getConf)(self)
-                  }
-                });
-
-              case 14:
-              case "end":
-                return _context3.stop();
-            }
-          }
-        }, _callee3, null, [[3, 9]]);
-      }))();
-    }
-  };
-}).actions(function (self) {
-  return {
+    async getPreAuthorizationInformation(location) {
+        const authToken = await self.getToken(location);
+        let validatedToken;
+        try {
+            validatedToken = await self.validateToken(authToken, location);
+        }
+        catch (error) {
+            self.removeToken();
+            throw error;
+        }
+        return {
+            internetAccountType: self.type,
+            authInfo: { token: validatedToken, configuration: (0, configuration_1.getConf)(self) },
+        };
+    },
+}))
+    .actions(self => ({
     /**
      * Get a fetch method that will add any needed authentication headers to
      * the request before sending it. If location is provided, it will be
@@ -305,49 +184,23 @@ var InternetAccount = _mobxStateTree.types.model('InternetAccount', {
      * @param location - UriLocation of the resource
      * @returns A function that can be used to fetch
      */
-    getFetcher: function getFetcher(location) {
-      return /*#__PURE__*/function () {
-        var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(input, init) {
-          var authToken, newInit;
-          return _regenerator.default.wrap(function _callee4$(_context4) {
-            while (1) {
-              switch (_context4.prev = _context4.next) {
-                case 0:
-                  _context4.next = 2;
-                  return self.getToken(location);
-
-                case 2:
-                  authToken = _context4.sent;
-                  newInit = self.addAuthHeaderToInit(init, authToken);
-                  return _context4.abrupt("return", fetch(input, newInit));
-
-                case 5:
-                case "end":
-                  return _context4.stop();
-              }
-            }
-          }, _callee4);
-        }));
-
-        return function (_x, _x2) {
-          return _ref.apply(this, arguments);
+    getFetcher(location) {
+        return async (input, init) => {
+            const authToken = await self.getToken(location);
+            const newInit = self.addAuthHeaderToInit(init, authToken);
+            return fetch(input, newInit);
         };
-      }();
-    }
-  };
-}).actions(function (self) {
-  return {
+    },
+}))
+    .actions(self => ({
     /**
      * Gets a filehandle that uses a fetch that adds auth headers
      * @param location - UriLocation of the resource
      * @returns A filehandle
      */
-    openLocation: function openLocation(location) {
-      return new _io.RemoteFileWithRangeCache(location.uri, {
-        fetch: self.getFetcher(location)
-      });
-    }
-  };
-});
-
-exports.InternetAccount = InternetAccount;
+    openLocation(location) {
+        return new io_1.RemoteFileWithRangeCache(location.uri, {
+            fetch: self.getFetcher(location),
+        });
+    },
+}));

package/pluggableElementTypes/models/baseConnectionConfig.js

@@ -1,26 +1,15 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _configuration = require("../../configuration");
-
-var _default = (0, _configuration.ConfigurationSchema)('BaseConnection', {
-  name: {
-    type: 'string',
-    defaultValue: 'nameOfConnection',
-    description: 'a unique name for this connection'
-  },
-  assemblyNames: {
-    type: 'stringArray',
-    defaultValue: [],
-    description: 'optional list of names of assemblies in this connection'
-  }
-}, {
-  explicitlyTyped: true,
-  explicitIdentifier: 'connectionId'
-});
-
-exports.default = _default;
+Object.defineProperty(exports, "__esModule", { value: true });
+const configuration_1 = require("../../configuration");
+exports.default = (0, configuration_1.ConfigurationSchema)('BaseConnection', {
+    name: {
+        type: 'string',
+        defaultValue: 'nameOfConnection',
+        description: 'a unique name for this connection',
+    },
+    assemblyNames: {
+        type: 'stringArray',
+        defaultValue: [],
+        description: 'optional list of names of assemblies in this connection',
+    },
+}, { explicitlyTyped: true, explicitIdentifier: 'connectionId' });

package/pluggableElementTypes/models/baseInternetAccountConfig.js

@@ -1,40 +1,31 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseInternetAccountConfig = void 0;
-
-var _configuration = require("../../configuration");
-
-var BaseInternetAccountConfig = (0, _configuration.ConfigurationSchema)('InternetAccount', {
-  name: {
-    description: 'descriptive name of the internet account',
-    type: 'string',
-    defaultValue: ''
-  },
-  description: {
-    description: 'a description of the internet account',
-    type: 'string',
-    defaultValue: ''
-  },
-  authHeader: {
-    description: 'request header for credentials',
-    type: 'string',
-    defaultValue: 'Authorization'
-  },
-  tokenType: {
-    description: 'a custom name for a token to include in the header',
-    type: 'string',
-    defaultValue: ''
-  },
-  domains: {
-    description: 'array of valid domains the url can contain to use this account',
-    type: 'stringArray',
-    defaultValue: []
-  }
-}, {
-  explicitIdentifier: 'internetAccountId',
-  explicitlyTyped: true
-});
-exports.BaseInternetAccountConfig = BaseInternetAccountConfig;
+const configuration_1 = require("../../configuration");
+exports.BaseInternetAccountConfig = (0, configuration_1.ConfigurationSchema)('InternetAccount', {
+    name: {
+        description: 'descriptive name of the internet account',
+        type: 'string',
+        defaultValue: '',
+    },
+    description: {
+        description: 'a description of the internet account',
+        type: 'string',
+        defaultValue: '',
+    },
+    authHeader: {
+        description: 'request header for credentials',
+        type: 'string',
+        defaultValue: 'Authorization',
+    },
+    tokenType: {
+        description: 'a custom name for a token to include in the header',
+        type: 'string',
+        defaultValue: '',
+    },
+    domains: {
+        description: 'array of valid domains the url can contain to use this account',
+        type: 'stringArray',
+        defaultValue: [],
+    },
+}, { explicitIdentifier: 'internetAccountId', explicitlyTyped: true });