@instructure/quiz-core 20.17.3-rc.7 → 20.17.3-rc.8

package/es/common/util/Fetcher.js

@@ -1,4 +1,4 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
@@ -7,35 +7,38 @@ import { decamelizeKeys } from 'humps';
 import queryString from 'query-string';
 import fetch from 'isomorphic-fetch';
 import t from '@instructure/quiz-i18n/es/format-message';
-import jsonify from './jsonify';
-import { httpHeaders, jwtHeader } from './httpHeaders';
-import store from '../../reduxStore';
-import { callbacksCompleteForCall, errorCallFor, startCallFor, successCallFor } from './callHelpers';
-import { addError, addSuccess } from '../actions/alerts';
+import jsonify from "./jsonify.js";
+import { httpHeaders, jwtHeader } from "./httpHeaders.js";
+import store from "../../reduxStore.js";
+import { callbacksCompleteForCall, errorCallFor, startCallFor, successCallFor } from "./callHelpers.js";
+import { addError, addSuccess } from "../actions/alerts.js";
 import { HTTP_STATUS_CODE_UNAUTHORIZED } from '@instructure/quiz-common';
-
 /*
 Note that this error extends the Error prototype in the old way because babel doesn't support extending from built-in
 classes using the ES6 class syntax. Follows pattern from here:
 https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Error#Custom_Error_Types
 */
+
 function FetcherError(response) {
   this.message = response.statusText;
   this.response = response;
 }
+
 FetcherError.prototype = Object.create(Error.prototype);
 FetcherError.prototype.constructor = FetcherError;
 export var Fetcher = /*#__PURE__*/function () {
   function Fetcher() {
     var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {},
-      callType = _ref.callType,
-      headers = _ref.headers,
-      successMessage = _ref.successMessage,
-      onError = _ref.onError,
-      cloneResponseForError = _ref.cloneResponseForError,
-      asyncResponseHandler = _ref.asyncResponseHandler,
-      injectMissingUserToken = _ref.injectMissingUserToken;
+        callType = _ref.callType,
+        headers = _ref.headers,
+        successMessage = _ref.successMessage,
+        onError = _ref.onError,
+        cloneResponseForError = _ref.cloneResponseForError,
+        asyncResponseHandler = _ref.asyncResponseHandler,
+        injectMissingUserToken = _ref.injectMissingUserToken;
+
     _classCallCheck(this, Fetcher);
+
     // A Response body can only be read once, and is read in the onError handler
     // When cloneResponseForError is true, the response is cloned so that the
     // body can be consumed again from the error thrown by Fetcher
@@ -47,7 +50,8 @@ export var Fetcher = /*#__PURE__*/function () {
     this.onError = onError;
     this.asyncResponseHandler = asyncResponseHandler || jsonify;
   }
-  return _createClass(Fetcher, [{
+
+  _createClass(Fetcher, [{
     key: "markCallbacksComplete",
     value: function markCallbacksComplete() {
       if (this.callType) {
@@ -60,9 +64,11 @@ export var Fetcher = /*#__PURE__*/function () {
       if (Fetcher.usingFakes) {
         return Fetcher.fakeFetch;
       }
+
       if (window.fetch) {
         return window.fetch;
       }
+
       console.warn('Relying on isomorphic-fetch is deprecated and will be removed in a future release. Please use a fetch polyfill instead (i.e. whatwg-fetch).');
       return fetch;
     }
@@ -91,9 +97,11 @@ export var Fetcher = /*#__PURE__*/function () {
       if (!this.headers) {
         return httpHeaders(this.getState().getIn(['config', 'userToken']));
       }
+
       if (!this.injectMissingUserToken) {
         return this.headers;
       }
+
       var userToken = this.getState().getIn(['config', 'userToken']);
       return _objectSpread(_objectSpread({}, jwtHeader(userToken)), this.headers);
     }
@@ -103,61 +111,76 @@ export var Fetcher = /*#__PURE__*/function () {
       if (this.successMessage) {
         this.dispatch(addSuccess(this.successMessage));
       }
+
       if (this.callType) {
         this.dispatch(successCallFor(this.callType));
       }
+
       return Promise.resolve(response);
     }
   }, {
     key: "handleError",
     value: function handleError(error, friendlyMessage) {
       var errorToReturn = this.cloneResponseForError ? new FetcherError(error.response.clone()) : error;
+
       if (this.onError) {
         // Custom error handler
         var errorAction = this.onError(error);
+
         if (errorAction) {
           this.dispatch(errorAction);
         }
       } else if (friendlyMessage) {
         this.dispatch(addError(friendlyMessage));
       }
+
       if (this.callType) {
         this.dispatch(errorCallFor(this.callType));
       }
+
       return Promise.reject(errorToReturn);
     }
   }, {
     key: "handleResponse",
     value: function () {
-      var _handleResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+      var _handleResponse = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(response) {
         var isSuccessful, friendlyMessage;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              isSuccessful = response && response.status >= 200 && response.status < 300;
-              if (!isSuccessful) {
-                _context.next = 3;
-                break;
-              }
-              return _context.abrupt("return", this.handleSuccess(response));
-            case 3:
-              if (response.status === HTTP_STATUS_CODE_UNAUTHORIZED) {
-                friendlyMessage = t('Sorry, the request was unauthorized.');
-              } else {
-                friendlyMessage = t('Sorry, there was a {status} Error.', {
-                  status: response.status
-                });
-              }
-              return _context.abrupt("return", this.handleError(new FetcherError(response), friendlyMessage));
-            case 5:
-            case "end":
-              return _context.stop();
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                isSuccessful = response && response.status >= 200 && response.status < 300;
+
+                if (!isSuccessful) {
+                  _context.next = 3;
+                  break;
+                }
+
+                return _context.abrupt("return", this.handleSuccess(response));
+
+              case 3:
+                if (response.status === HTTP_STATUS_CODE_UNAUTHORIZED) {
+                  friendlyMessage = t('Sorry, the request was unauthorized.');
+                } else {
+                  friendlyMessage = t('Sorry, there was a {status} Error.', {
+                    status: response.status
+                  });
+                }
+
+                return _context.abrupt("return", this.handleError(new FetcherError(response), friendlyMessage));
+
+              case 5:
+              case "end":
+                return _context.stop();
+            }
           }
         }, _callee, this);
       }));
+
       function handleResponse(_x) {
         return _handleResponse.apply(this, arguments);
       }
+
       return handleResponse;
     }()
   }, {
@@ -172,196 +195,240 @@ export var Fetcher = /*#__PURE__*/function () {
   }, {
     key: "get",
     value: function () {
-      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(url) {
+      var _get = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
         var _this = this;
+
         var additionalParams,
-          params,
-          _args2 = arguments;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              additionalParams = _args2.length > 1 && _args2[1] !== void 0 ? _args2[1] : {};
-              params = {
-                method: 'GET',
-                headers: this.callHeaders()
-              };
-              return _context2.abrupt("return", this.fetch(this.appendQueryParams(url, additionalParams), params).then(function (response) {
-                return _this.asyncResponseHandler(response, Object.assign(params, additionalParams));
-              }));
-            case 3:
-            case "end":
-              return _context2.stop();
+            params,
+            _args2 = arguments;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                additionalParams = _args2.length > 1 && _args2[1] !== void 0 ? _args2[1] : {};
+                params = {
+                  method: 'GET',
+                  headers: this.callHeaders()
+                };
+                return _context2.abrupt("return", this.fetch(this.appendQueryParams(url, additionalParams), params).then(function (response) {
+                  return _this.asyncResponseHandler(response, Object.assign(params, additionalParams));
+                }));
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
           }
         }, _callee2, this);
       }));
+
       function get(_x2) {
         return _get.apply(this, arguments);
       }
+
       return get;
     }()
   }, {
     key: "post",
     value: function () {
-      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url) {
+      var _post = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(url) {
         var _this2 = this;
+
         var additionalParams,
-          params,
-          _args3 = arguments;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              additionalParams = _args3.length > 1 && _args3[1] !== void 0 ? _args3[1] : {};
-              params = Object.assign({
-                method: 'POST',
-                headers: this.callHeaders()
-              }, additionalParams);
-              return _context3.abrupt("return", this.fetch(url, params).then(function (response) {
-                return _this2.asyncResponseHandler(response, params);
-              }));
-            case 3:
-            case "end":
-              return _context3.stop();
+            params,
+            _args3 = arguments;
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                additionalParams = _args3.length > 1 && _args3[1] !== void 0 ? _args3[1] : {};
+                params = Object.assign({
+                  method: 'POST',
+                  headers: this.callHeaders()
+                }, additionalParams);
+                return _context3.abrupt("return", this.fetch(url, params).then(function (response) {
+                  return _this2.asyncResponseHandler(response, params);
+                }));
+
+              case 3:
+              case "end":
+                return _context3.stop();
+            }
           }
         }, _callee3, this);
       }));
+
       function post(_x3) {
         return _post.apply(this, arguments);
       }
+
       return post;
     }()
   }, {
     key: "patch",
     value: function () {
-      var _patch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(url) {
+      var _patch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(url) {
         var _this3 = this;
+
         var additionalParams,
-          params,
-          _args4 = arguments;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              additionalParams = _args4.length > 1 && _args4[1] !== void 0 ? _args4[1] : {};
-              params = Object.assign({
-                method: 'PATCH',
-                headers: this.callHeaders()
-              }, additionalParams);
-              return _context4.abrupt("return", this.fetch(url, params).then(function (response) {
-                return _this3.asyncResponseHandler(response, params);
-              }));
-            case 3:
-            case "end":
-              return _context4.stop();
+            params,
+            _args4 = arguments;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                additionalParams = _args4.length > 1 && _args4[1] !== void 0 ? _args4[1] : {};
+                params = Object.assign({
+                  method: 'PATCH',
+                  headers: this.callHeaders()
+                }, additionalParams);
+                return _context4.abrupt("return", this.fetch(url, params).then(function (response) {
+                  return _this3.asyncResponseHandler(response, params);
+                }));
+
+              case 3:
+              case "end":
+                return _context4.stop();
+            }
           }
         }, _callee4, this);
       }));
+
       function patch(_x4) {
         return _patch.apply(this, arguments);
       }
+
       return patch;
     }()
   }, {
     key: "put",
     value: function () {
-      var _put = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(url) {
+      var _put = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(url) {
         var _this4 = this;
+
         var additionalParams,
-          params,
-          _args5 = arguments;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              additionalParams = _args5.length > 1 && _args5[1] !== void 0 ? _args5[1] : {};
-              params = Object.assign({
-                method: 'PUT',
-                headers: this.callHeaders()
-              }, additionalParams);
-              return _context5.abrupt("return", this.fetch(url, params).then(function (response) {
-                return _this4.asyncResponseHandler(response, params);
-              }));
-            case 3:
-            case "end":
-              return _context5.stop();
+            params,
+            _args5 = arguments;
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) {
+            switch (_context5.prev = _context5.next) {
+              case 0:
+                additionalParams = _args5.length > 1 && _args5[1] !== void 0 ? _args5[1] : {};
+                params = Object.assign({
+                  method: 'PUT',
+                  headers: this.callHeaders()
+                }, additionalParams);
+                return _context5.abrupt("return", this.fetch(url, params).then(function (response) {
+                  return _this4.asyncResponseHandler(response, params);
+                }));
+
+              case 3:
+              case "end":
+                return _context5.stop();
+            }
           }
         }, _callee5, this);
       }));
+
       function put(_x5) {
         return _put.apply(this, arguments);
       }
+
       return put;
     }()
   }, {
     key: "delete",
     value: function () {
-      var _delete2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(url) {
+      var _delete2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(url) {
         var additionalParams,
-          params,
-          _args6 = arguments;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              additionalParams = _args6.length > 1 && _args6[1] !== void 0 ? _args6[1] : {};
-              params = Object.assign({
-                method: 'DELETE',
-                headers: this.callHeaders()
-              }, additionalParams);
-              return _context6.abrupt("return", this.fetch(url, params));
-            case 3:
-            case "end":
-              return _context6.stop();
+            params,
+            _args6 = arguments;
+        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+          while (1) {
+            switch (_context6.prev = _context6.next) {
+              case 0:
+                additionalParams = _args6.length > 1 && _args6[1] !== void 0 ? _args6[1] : {};
+                params = Object.assign({
+                  method: 'DELETE',
+                  headers: this.callHeaders()
+                }, additionalParams);
+                return _context6.abrupt("return", this.fetch(url, params));
+
+              case 3:
+              case "end":
+                return _context6.stop();
+            }
           }
         }, _callee6, this);
       }));
+
       function _delete(_x6) {
         return _delete2.apply(this, arguments);
       }
+
       return _delete;
     }()
   }, {
     key: "fetch",
     value: function () {
-      var _fetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(url, params) {
+      var _fetch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, params) {
         var fetchLib, response;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              fetchLib = this.getFetchLib();
-              if (this.callType) {
-                this.dispatch(startCallFor(this.callType));
-              }
-              _context7.prev = 2;
-              if (!/^https?:\/\//.test(url)) {
-                _context7.next = 9;
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) {
+            switch (_context7.prev = _context7.next) {
+              case 0:
+                fetchLib = this.getFetchLib();
+
+                if (this.callType) {
+                  this.dispatch(startCallFor(this.callType));
+                }
+
+                _context7.prev = 2;
+
+                if (!/^https?:\/\//.test(url)) {
+                  _context7.next = 9;
+                  break;
+                }
+
+                _context7.next = 6;
+                return fetchLib(url, params);
+
+              case 6:
+                response = _context7.sent;
+                _context7.next = 12;
+                break;
+
+              case 9:
+                _context7.next = 11;
+                return fetchLib(this.endpoint() + url, params);
+
+              case 11:
+                response = _context7.sent;
+
+              case 12:
+                _context7.next = 17;
                 break;
-              }
-              _context7.next = 6;
-              return fetchLib(url, params);
-            case 6:
-              response = _context7.sent;
-              _context7.next = 12;
-              break;
-            case 9:
-              _context7.next = 11;
-              return fetchLib(this.endpoint() + url, params);
-            case 11:
-              response = _context7.sent;
-            case 12:
-              _context7.next = 17;
-              break;
-            case 14:
-              _context7.prev = 14;
-              _context7.t0 = _context7["catch"](2);
-              return _context7.abrupt("return", this.handleError(_context7.t0, _context7.t0.message));
-            case 17:
-              return _context7.abrupt("return", this.handleResponse(response));
-            case 18:
-            case "end":
-              return _context7.stop();
+
+              case 14:
+                _context7.prev = 14;
+                _context7.t0 = _context7["catch"](2);
+                return _context7.abrupt("return", this.handleError(_context7.t0, _context7.t0.message));
+
+              case 17:
+                return _context7.abrupt("return", this.handleResponse(response));
+
+              case 18:
+              case "end":
+                return _context7.stop();
+            }
           }
         }, _callee7, this, [[2, 14]]);
       }));
+
       function fetch(_x7, _x8) {
         return _fetch.apply(this, arguments);
       }
+
       return fetch;
     }()
   }], [{
@@ -370,5 +437,7 @@ export var Fetcher = /*#__PURE__*/function () {
       Fetcher.usingFakes = useFake;
     }
   }]);
+
+  return Fetcher;
 }();
 export default Fetcher;

package/es/common/util/MultiWeakMap.js

@@ -1,59 +1,79 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
+
 // Class that acts like a WeakMap, except the key consists of an
 // array of multiple objects, instead of being just a single object.
 // Intended to allow caching of methods which take more than one argument.
 var MultiWeakMap = /*#__PURE__*/function () {
   function MultiWeakMap(numKeys) {
     _classCallCheck(this, MultiWeakMap);
+
     if (typeof numKeys !== 'number') {
       throw new Error('MultiWeakMap numKeys must be a number');
     }
+
     if (numKeys <= 0) {
       throw new Error('MultiWeakMap numKeys must be positive');
     }
+
     this._root = new WeakMap();
     this._numKeys = numKeys;
   }
-  return _createClass(MultiWeakMap, [{
+
+  _createClass(MultiWeakMap, [{
     key: "has",
     value: function has(keys) {
       var cursor = this._root;
+
       for (var idx = 0; idx < this._numKeys; idx++) {
         var key = keys[idx];
+
         if (!cursor.has(key)) {
           return false;
         }
+
         cursor = cursor.get(key);
       }
+
       return true;
     }
   }, {
     key: "get",
     value: function get(keys) {
       var cursor = this._root;
+
       for (var idx = 0; idx < this._numKeys; idx++) {
         var key = keys[idx];
+
         if (!cursor.has(key)) {
           return void 0;
         }
+
         cursor = cursor.get(key);
       }
+
       return cursor;
     }
   }, {
     key: "set",
     value: function set(keys, value) {
       var cursor = this._root;
+
       for (var idx = 0; idx < this._numKeys - 1; idx++) {
         var key = keys[idx];
+
         if (!cursor.has(key)) {
           cursor.set(key, new WeakMap());
         }
+
         cursor = cursor.get(key);
       }
+
       cursor.set(keys[this._numKeys - 1], value);
     }
   }]);
+
+  return MultiWeakMap;
 }();
+
 export { MultiWeakMap as default };