@civet/core 1.2.0 → 1.2.1

package/lib/useResource.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 
 var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
 
-var _context2 = require("./context");
+var _context3 = require("./context");
 
 var _Meta = _interopRequireDefault(require("./Meta"));
 
@@ -59,7 +59,7 @@ function useResource(_ref) {
       nextPersistent = _ref.persistent,
       rest = _objectWithoutProperties(_ref, _excluded);
 
-  var configContext = (0, _context2.useConfigContext)();
+  var configContext = (0, _context3.useConfigContext)();
   var currentDataProvider = dataProviderProp || configContext.dataProvider;
 
   var _React$useState = _react["default"].useState(currentDataProvider),
@@ -211,40 +211,54 @@ function useResource(_ref) {
     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
-        });
       });
     };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/core",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {

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,
-        };
       });
     };