@civet/core 1.1.0 → 1.2.1

package/lib/DataProvider.js

@@ -68,6 +68,14 @@ var DataProvider = /*#__PURE__*/function () {
   _createClass(DataProvider, [{
     key: "extend",
     value: function extend() {}
+  }, {
+    key: "createInstance",
+    value: function createInstance() {
+      return null;
+    }
+  }, {
+    key: "releaseInstance",
+    value: function releaseInstance() {}
   }, {
     key: "subscribe",
     value: function subscribe(resource, handler) {

package/lib/Meta.js

@@ -18,10 +18,11 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 var Meta = /*#__PURE__*/function () {
-  function Meta(base) {
+  function Meta(base, instance) {
     _classCallCheck(this, Meta);
 
     this.data = base == null ? {} : base;
+    this.instance = instance;
   }
 
   _createClass(Meta, [{

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,12 +59,12 @@ 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 dataProvider = _react["default"].useMemo(function () {
-    return currentDataProvider;
-  }, []);
+  var _React$useState = _react["default"].useState(currentDataProvider),
+      _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');
@@ -74,6 +74,18 @@ function useResource(_ref) {
     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];
+
+  _react["default"].useEffect(function () {
+    return function () {
+      dataProvider.releaseInstance(instance);
+    };
+  }, []);
+
   var nextRequestDetails = _react["default"].useMemo(function () {
     return {
       name: nextName,
@@ -83,7 +95,7 @@ function useResource(_ref) {
     };
   }, [nextName, nextQuery, nextEmpty, nextOptions]);
 
-  var _React$useState = _react["default"].useState(function () {
+  var _React$useState5 = _react["default"].useState(function () {
     var request = (0, _uniqueIdentifier["default"])();
     var revision = (0, _uniqueIdentifier["default"])();
     return {
@@ -107,9 +119,9 @@ function useResource(_ref) {
       persistent: nextPersistent
     };
   }),
-      _React$useState2 = _slicedToArray(_React$useState, 2),
-      state = _React$useState2[0],
-      setState = _React$useState2[1];
+      _React$useState6 = _slicedToArray(_React$useState5, 2),
+      state = _React$useState6[0],
+      setState = _React$useState6[1];
 
   var requestDetails = state.requestDetails,
       request = state.request,
@@ -198,41 +210,55 @@ function useResource(_ref) {
   _react["default"].useEffect(function () {
     if (requestDetails.empty) return undefined;
     var abortSignal = new _AbortSignal["default"]();
-    var meta = new _Meta["default"](_objectSpread({}, value.meta));
+    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.1.0",
+  "version": "1.2.1",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {

package/src/DataProvider.js

@@ -42,6 +42,12 @@ class DataProvider {
 
   extend() {}
 
+  createInstance() {
+    return null;
+  }
+
+  releaseInstance() {}
+
   subscribe(resource, handler) {
     if (resource == null) throw new Error('No resource name specified');
     return this.notifier.subscribe(resource, handler);

package/src/Meta.js

@@ -1,6 +1,7 @@
 class Meta {
-  constructor(base) {
+  constructor(base, instance) {
     this.data = base == null ? {} : base;
+    this.instance = instance;
   }
 
   clear() {

package/src/useResource.js

@@ -21,7 +21,7 @@ function useResource({
 }) {
   const configContext = useConfigContext();
   const currentDataProvider = dataProviderProp || configContext.dataProvider;
-  const dataProvider = React.useMemo(() => currentDataProvider, []);
+  const [dataProvider] = React.useState(currentDataProvider);
   if (dataProvider == null) {
     throw new Error(
       'Unmet requirement: The DataProvider for the useResource hook is missing - Check your ConfigContext provider and the dataProvider property',
@@ -33,6 +33,14 @@ function useResource({
     );
   }
 
+  const [instance] = React.useState(() => dataProvider.createInstance());
+  React.useEffect(
+    () => () => {
+      dataProvider.releaseInstance(instance);
+    },
+    [],
+  );
+
   const nextRequestDetails = React.useMemo(
     () => ({ name: nextName, query: nextQuery, empty: nextEmpty, options: nextOptions }),
     [nextName, nextQuery, nextEmpty, nextOptions],
@@ -137,45 +145,61 @@ function useResource({
 
     const abortSignal = new AbortSignal();
 
-    const meta = new Meta({ ...value.meta });
+    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,
-        };
       });
     };