@civet/core 1.0.0-rc5 → 1.0.0-rc8

package/lib/useResource.js

@@ -99,7 +99,7 @@ function useResource(_ref) {
         data: [],
         meta: {},
         error: undefined,
-        isEmpty: empty,
+        isEmpty: !!empty,
         isIncomplete: !empty,
         isInitial: !empty
       },
@@ -144,7 +144,7 @@ function useResource(_ref) {
           data: [],
           meta: {},
           error: undefined,
-          isEmpty: empty,
+          isEmpty: !!empty,
           isIncomplete: !empty,
           isInitial: !empty
         },
@@ -227,14 +227,14 @@ function useResource(_ref) {
           error: undefined,
           isEmpty: false,
           isIncomplete: !done,
-          isInitial: prevState.isInitial && !done
+          isInitial: !!prevState.isInitial && !done
         };
-        return {
+        return _objectSpread(_objectSpread({}, prevState), {}, {
           isLoading: !done,
           value: _objectSpread(_objectSpread({}, context), {}, {
             data: dataProvider.recycleItems(dataProvider.transition(data, prevData, context, prevContext), prevData, context, prevContext)
           })
-        };
+        });
       });
     };
 
@@ -244,16 +244,27 @@ function useResource(_ref) {
     };
   }, [request, revision]);
 
-  var isStale = request !== value.request;
+  var isStale = revision !== value.revision;
+
+  var next = _react["default"].useMemo(function () {
+    return isStale ? {
+      request: request,
+      revision: revision
+    } : {
+      request: value.request,
+      revision: value.revision
+    };
+  }, [isStale, request, revision, value.request, value.revision]);
 
   var context = _react["default"].useMemo(function () {
     return _objectSpread(_objectSpread({}, value), {}, {
       dataProvider: dataProvider,
       isLoading: isLoading,
       isStale: isStale,
+      next: next,
       notify: notify
     });
-  }, [value, dataProvider, isLoading, isStale, notify]);
+  }, [value, dataProvider, isLoading, isStale, next, notify]);
 
   return dataProvider.contextPlugins.reduce(function (result, fn) {
     return fn(result, rest);

package/package.json

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

package/src/useResource.js

@@ -51,7 +51,7 @@ function useResource({
         data: [],
         meta: {},
         error: undefined,
-        isEmpty: empty,
+        isEmpty: !!empty,
         isIncomplete: !empty,
         isInitial: !empty,
       },
@@ -100,7 +100,7 @@ function useResource({
               data: [],
               meta: {},
               error: undefined,
-              isEmpty: empty,
+              isEmpty: !!empty,
               isIncomplete: !empty,
               isInitial: !empty,
             },
@@ -166,10 +166,11 @@ function useResource({
           error: undefined,
           isEmpty: false,
           isIncomplete: !done,
-          isInitial: prevState.isInitial && !done,
+          isInitial: !!prevState.isInitial && !done,
         };
 
         return {
+          ...prevState,
           isLoading: !done,
           value: {
             ...context,
@@ -191,10 +192,14 @@ function useResource({
     };
   }, [request, revision]);
 
-  const isStale = request !== value.request;
+  const isStale = revision !== value.revision;
+  const next = React.useMemo(
+    () => (isStale ? { request, revision } : { request: value.request, revision: value.revision }),
+    [isStale, request, revision, value.request, value.revision],
+  );
   const context = React.useMemo(
-    () => ({ ...value, dataProvider, isLoading, isStale, notify }),
-    [value, dataProvider, isLoading, isStale, notify],
+    () => ({ ...value, dataProvider, isLoading, isStale, next, notify }),
+    [value, dataProvider, isLoading, isStale, next, notify],
   );
 
   return dataProvider.contextPlugins.reduce((result, fn) => fn(result, rest), context);