@civet/core 1.2.0 → 1.2.2

package/lib/useResource.js

@@ -1,50 +1,33 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-
 var _react = _interopRequireDefault(require("react"));
-
 var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
-
-var _context2 = require("./context");
-
+var _context3 = require("./context");
 var _Meta = _interopRequireDefault(require("./Meta"));
-
 var _uniqueIdentifier = _interopRequireDefault(require("./uniqueIdentifier"));
-
 var _excluded = ["dataProvider", "name", "query", "empty", "options", "persistent"];
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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) { _defineProperty(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; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 /**
  * Makes data from an DataProvider available.
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
@@ -52,40 +35,33 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
  */
 function useResource(_ref) {
   var dataProviderProp = _ref.dataProvider,
-      nextName = _ref.name,
-      nextQuery = _ref.query,
-      nextEmpty = _ref.empty,
-      nextOptions = _ref.options,
-      nextPersistent = _ref.persistent,
-      rest = _objectWithoutProperties(_ref, _excluded);
-
-  var configContext = (0, _context2.useConfigContext)();
+    nextName = _ref.name,
+    nextQuery = _ref.query,
+    nextEmpty = _ref.empty,
+    nextOptions = _ref.options,
+    nextPersistent = _ref.persistent,
+    rest = _objectWithoutProperties(_ref, _excluded);
+  var configContext = (0, _context3.useConfigContext)();
   var currentDataProvider = dataProviderProp || configContext.dataProvider;
-
   var _React$useState = _react["default"].useState(currentDataProvider),
-      _React$useState2 = _slicedToArray(_React$useState, 1),
-      dataProvider = _React$useState2[0];
-
+    _React$useState2 = _slicedToArray(_React$useState, 1),
+    dataProvider = _React$useState2[0];
   if (dataProvider == null) {
     throw new Error('Unmet requirement: The DataProvider for the useResource hook is missing - Check your ConfigContext provider and the dataProvider property');
   }
-
   if (dataProvider !== currentDataProvider) {
     throw new Error('Constant violation: The DataProvider provided to the useResource hook must not be replaced - Check your ConfigContext provider and the dataProvider property');
   }
-
   var _React$useState3 = _react["default"].useState(function () {
-    return dataProvider.createInstance();
-  }),
-      _React$useState4 = _slicedToArray(_React$useState3, 1),
-      instance = _React$useState4[0];
-
+      return dataProvider.createInstance();
+    }),
+    _React$useState4 = _slicedToArray(_React$useState3, 1),
+    instance = _React$useState4[0];
   _react["default"].useEffect(function () {
     return function () {
       dataProvider.releaseInstance(instance);
     };
   }, []);
-
   var nextRequestDetails = _react["default"].useMemo(function () {
     return {
       name: nextName,
@@ -94,54 +70,49 @@ function useResource(_ref) {
       options: nextOptions
     };
   }, [nextName, nextQuery, nextEmpty, nextOptions]);
-
   var _React$useState5 = _react["default"].useState(function () {
-    var request = (0, _uniqueIdentifier["default"])();
-    var revision = (0, _uniqueIdentifier["default"])();
-    return {
-      requestDetails: nextRequestDetails,
-      request: request,
-      revision: revision,
-      isLoading: !nextRequestDetails.empty,
-      value: {
-        name: nextRequestDetails.name,
-        query: nextRequestDetails.query,
-        options: nextRequestDetails.options,
+      var request = (0, _uniqueIdentifier["default"])();
+      var revision = (0, _uniqueIdentifier["default"])();
+      return {
+        requestDetails: nextRequestDetails,
         request: request,
         revision: revision,
-        data: [],
-        meta: {},
-        error: undefined,
-        isEmpty: !!nextRequestDetails.empty,
-        isIncomplete: !nextRequestDetails.empty,
-        isInitial: !nextRequestDetails.empty
-      },
-      persistent: nextPersistent
-    };
-  }),
-      _React$useState6 = _slicedToArray(_React$useState5, 2),
-      state = _React$useState6[0],
-      setState = _React$useState6[1];
-
+        isLoading: !nextRequestDetails.empty,
+        value: {
+          name: nextRequestDetails.name,
+          query: nextRequestDetails.query,
+          options: nextRequestDetails.options,
+          request: request,
+          revision: revision,
+          data: [],
+          meta: {},
+          error: undefined,
+          isEmpty: !!nextRequestDetails.empty,
+          isIncomplete: !nextRequestDetails.empty,
+          isInitial: !nextRequestDetails.empty
+        },
+        persistent: nextPersistent
+      };
+    }),
+    _React$useState6 = _slicedToArray(_React$useState5, 2),
+    state = _React$useState6[0],
+    setState = _React$useState6[1];
   var requestDetails = state.requestDetails,
-      request = state.request,
-      revision = state.revision,
-      isLoading = state.isLoading,
-      value = state.value,
-      persistent = state.persistent;
-
+    request = state.request,
+    revision = state.revision,
+    isLoading = state.isLoading,
+    value = state.value,
+    persistent = state.persistent;
   if (requestDetails !== nextRequestDetails && !dataProvider.compareRequests(nextRequestDetails, requestDetails)) {
     setState(function (prevState) {
       var nextRequest = (0, _uniqueIdentifier["default"])(prevState.request);
       var nextRevision = (0, _uniqueIdentifier["default"])(prevState.revision);
       var isPersistent = false;
-
       if (prevState.persistent === 'very' && nextPersistent === 'very') {
         isPersistent = 'very';
       } else if (prevState.persistent && nextPersistent) {
         isPersistent = true;
       }
-
       var shouldValuePersist = !nextRequestDetails.empty && dataProvider.shouldPersist(nextRequestDetails, prevState.requestDetails, isPersistent, prevState.value);
       return {
         requestDetails: nextRequestDetails,
@@ -171,91 +142,93 @@ function useResource(_ref) {
       });
     });
   }
-
-  var notify = _react["default"].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            return _context.abrupt("return", new Promise(function (resolve) {
-              setState(function (currentState) {
-                if (currentState.empty) return currentState;
-                var nextRevision = (0, _uniqueIdentifier["default"])(currentState.revision);
-                resolve({
-                  request: currentState.request,
-                  revision: nextRevision
-                });
-                return _objectSpread(_objectSpread({}, currentState), {}, {
-                  isLoading: true,
-                  revision: nextRevision
-                });
+  var notify = _react["default"].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          return _context.abrupt("return", new Promise(function (resolve) {
+            setState(function (currentState) {
+              if (currentState.empty) return currentState;
+              var nextRevision = (0, _uniqueIdentifier["default"])(currentState.revision);
+              resolve({
+                request: currentState.request,
+                revision: nextRevision
               });
-            }));
-
-          case 1:
-          case "end":
-            return _context.stop();
-        }
+              return _objectSpread(_objectSpread({}, currentState), {}, {
+                isLoading: true,
+                revision: nextRevision
+              });
+            });
+          }));
+        case 1:
+        case "end":
+          return _context.stop();
       }
     }, _callee);
-  })), []); // DataProvider events
-
+  })), []);
 
+  // DataProvider events
   _react["default"].useEffect(function () {
     if (requestDetails.empty) return undefined;
     var unsubscribe = dataProvider.subscribe(requestDetails.name, notify);
     return unsubscribe;
   }, [requestDetails.empty, dataProvider, requestDetails.name, notify]);
-
   _react["default"].useEffect(function () {
     if (requestDetails.empty) return undefined;
     var abortSignal = new _AbortSignal["default"]();
     var meta = new _Meta["default"](_objectSpread({}, value.meta), instance);
-
+    var promise = Promise.resolve(state);
     var callback = function callback(error, done, data) {
-      setState(function (prevState) {
-        if (request !== prevState.request || revision !== prevState.revision) return prevState;
-
-        if (error != null) {
-          return _objectSpread(_objectSpread({}, prevState), {}, {
-            isLoading: false,
-            value: _objectSpread(_objectSpread({}, prevState.value), {}, {
-              error: error,
-              isIncomplete: false
-            })
+      promise = promise.then(function (prevState) {
+        try {
+          var nextState;
+          if (error != null) {
+            nextState = _objectSpread(_objectSpread({}, prevState), {}, {
+              isLoading: false,
+              value: _objectSpread(_objectSpread({}, prevState.value), {}, {
+                error: error,
+                isIncomplete: false
+              })
+            });
+          } else {
+            var _context2 = {
+              name: requestDetails.name,
+              query: requestDetails.query,
+              options: requestDetails.options,
+              request: request,
+              revision: revision,
+              data: data,
+              meta: meta.commit(prevState.value.meta),
+              error: undefined,
+              isEmpty: false,
+              isIncomplete: !done,
+              isInitial: !!prevState.isInitial && !done
+            };
+            _context2.data = dataProvider.transition(_context2, prevState.value);
+            _context2.data = dataProvider.recycleItems(_context2, prevState.value);
+            nextState = _objectSpread(_objectSpread({}, prevState), {}, {
+              isLoading: !done,
+              value: _context2
+            });
+          }
+          setState(function (otherState) {
+            if (request !== otherState.request || revision !== otherState.revision) {
+              return otherState;
+            }
+            return nextState;
           });
+          return nextState;
+        } catch (_unused) {
+          return prevState;
         }
-
-        var context = {
-          name: requestDetails.name,
-          query: requestDetails.query,
-          options: requestDetails.options,
-          request: request,
-          revision: revision,
-          data: data,
-          meta: meta.commit(prevState.value.meta),
-          error: undefined,
-          isEmpty: false,
-          isIncomplete: !done,
-          isInitial: !!prevState.isInitial && !done
-        };
-        context.data = dataProvider.transition(context, prevState.value);
-        context.data = dataProvider.recycleItems(context, prevState.value);
-        return _objectSpread(_objectSpread({}, prevState), {}, {
-          isLoading: !done,
-          value: context
-        });
       });
     };
-
     dataProvider.continuousGet(requestDetails.name, requestDetails.query, requestDetails.options, meta, callback, abortSignal);
     return function () {
       abortSignal.abort();
     };
   }, [request, revision]);
-
   var isStale = revision !== value.revision;
-
   var next = _react["default"].useMemo(function () {
     return isStale ? {
       request: request,
@@ -265,7 +238,6 @@ function useResource(_ref) {
       revision: value.revision
     };
   }, [isStale, request, revision, value.request, value.revision]);
-
   var context = _react["default"].useMemo(function () {
     return _objectSpread(_objectSpread({}, value), {}, {
       dataProvider: dataProvider,
@@ -275,11 +247,9 @@ function useResource(_ref) {
       notify: notify
     });
   }, [value, dataProvider, isLoading, isStale, next, notify]);
-
   return dataProvider.contextPlugins.reduce(function (result, fn) {
     return fn(result, rest);
   }, context);
 }
-
 var _default = useResource;
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/core",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {
@@ -10,7 +10,7 @@
     "lint": "eslint src",
     "prepare": "npm run lint && npm run build",
     "preversion": "git diff HEAD --name-only --exit-code || (echo -\\> unclean working directory && exit 1)",
-    "postversion": "cross-var git commit -am$npm_package_version",
+    "postversion": "cross-env git commit -am$npm_package_version",
     "prettify": "prettier --write src/**"
   },
   "files": [
@@ -34,26 +34,25 @@
   },
   "homepage": "https://civet.js.org/",
   "devDependencies": {
-    "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-proposal-class-properties": "^7.14.5",
-    "@babel/preset-env": "^7.15.0",
-    "@babel/preset-react": "^7.14.5",
+    "@babel/cli": "^7.20.7",
+    "@babel/core": "^7.20.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
     "babel-eslint": "^10.1.0",
     "cross-env": "^7.0.3",
-    "cross-var": "^1.1.0",
-    "eslint": "7.2",
+    "eslint": "^7.32.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-airbnb-base": "^14.2.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-jsx-a11y": "^6.4.1",
-    "eslint-plugin-prettier": "^3.4.1",
-    "eslint-plugin-react": "^7.21.5",
-    "eslint-plugin-react-hooks": "^4.2.0",
-    "prettier": "^2.6.2",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
+    "eslint-config-prettier": "^8.5.0",
+    "eslint-plugin-import": "^2.24.1",
+    "eslint-plugin-jsx-a11y": "^6.6.1",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.31.11",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "prettier": "^2.8.1",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
     "rimraf": "^3.0.2"
   },
   "peerDependencies": {
@@ -64,6 +63,6 @@
     "fast-deep-equal": "^3.1.3",
     "object-hash": "^3.0.0",
     "prop-types": "^15.8.1",
-    "uuid": "^8.3.2"
+    "uuid": "^9.0.0"
   }
 }

package/src/useResource.js

@@ -147,43 +147,59 @@ function useResource({
 
     const meta = new Meta({ ...value.meta }, instance);
 
+    let promise = Promise.resolve(state);
+
     const callback = (error, done, data) => {
-      setState((prevState) => {
-        if (request !== prevState.request || revision !== prevState.revision) return prevState;
-
-        if (error != null) {
-          return {
-            ...prevState,
-            isLoading: false,
-            value: {
-              ...prevState.value,
-              error,
-              isIncomplete: false,
-            },
-          };
+      promise = promise.then((prevState) => {
+        try {
+          let nextState;
+
+          if (error != null) {
+            nextState = {
+              ...prevState,
+              isLoading: false,
+              value: {
+                ...prevState.value,
+                error,
+                isIncomplete: false,
+              },
+            };
+          } else {
+            const context = {
+              name: requestDetails.name,
+              query: requestDetails.query,
+              options: requestDetails.options,
+              request,
+              revision,
+              data,
+              meta: meta.commit(prevState.value.meta),
+              error: undefined,
+              isEmpty: false,
+              isIncomplete: !done,
+              isInitial: !!prevState.isInitial && !done,
+            };
+            context.data = dataProvider.transition(context, prevState.value);
+            context.data = dataProvider.recycleItems(context, prevState.value);
+
+            nextState = {
+              ...prevState,
+              isLoading: !done,
+              value: context,
+            };
+          }
+
+          setState((otherState) => {
+            if (request !== otherState.request || revision !== otherState.revision) {
+              return otherState;
+            }
+
+            return nextState;
+          });
+
+          return nextState;
+        } catch {
+          return prevState;
         }
-
-        const context = {
-          name: requestDetails.name,
-          query: requestDetails.query,
-          options: requestDetails.options,
-          request,
-          revision,
-          data,
-          meta: meta.commit(prevState.value.meta),
-          error: undefined,
-          isEmpty: false,
-          isIncomplete: !done,
-          isInitial: !!prevState.isInitial && !done,
-        };
-        context.data = dataProvider.transition(context, prevState.value);
-        context.data = dataProvider.recycleItems(context, prevState.value);
-
-        return {
-          ...prevState,
-          isLoading: !done,
-          value: context,
-        };
       });
     };