@civet/core 0.6.6 → 0.6.9

package/lib/ConfigProvider.js

@@ -7,19 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
+var _react = _interopRequireWildcard(require("react"));
+
 var _context = require("./context");
 
 var _DataStore = require("./DataStore");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /**
  * Provides general configuration to its descendants using React's context API.

package/lib/DefaultDataStore.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,28 +13,26 @@ var _DataStore = _interopRequireDefault(require("./DataStore"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function _createSuper(Derived) { return function () { var Super = _getPrototypeOf(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 var DefaultDataStore = /*#__PURE__*/function (_BaseDataStore) {
   _inherits(DefaultDataStore, _BaseDataStore);
 

package/lib/Meta.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-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 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; }
 

package/lib/Resource.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,53 +13,59 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _uuid = require("uuid");
-
 var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
 
-var _context = require("./context");
+var _context2 = require("./context");
 
 var _DataStore = require("./DataStore");
 
 var _Meta = _interopRequireDefault(require("./Meta"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+var _uniqueIdentifier = _interopRequireDefault(require("./uniqueIdentifier"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+var _excluded = ["data"],
+    _excluded2 = ["data"],
+    _excluded3 = ["children"];
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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; }
 
-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 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 _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
+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 _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function _createSuper(Derived) { return function () { var Super = _getPrototypeOf(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 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; }
 
@@ -114,52 +122,6 @@ var Resource = /*#__PURE__*/function (_Component) {
 
   var _super = _createSuper(Resource);
 
-  _createClass(Resource, null, [{
-    key: "getDerivedStateFromProps",
-    value: function getDerivedStateFromProps(nextProps, prevState) {
-      var empty = nextProps.empty,
-          ds = nextProps.dataStore,
-          persistent = nextProps.persistent;
-
-      var _ = getComparator(nextProps);
-
-      if (prevState.ds !== ds || !compareRequests(ds, prevState._, _)) {
-        var request = (0, _uuid.v1)();
-        var revision = (0, _uuid.v1)();
-        var isEmpty = ds == null || empty;
-        var nextState = {
-          _: _,
-          ds: ds,
-          request: request,
-          revision: revision,
-          isLoading: !isEmpty,
-          persistent: persistent
-        };
-        var isPersistent;
-
-        if (prevState.value.meta.persistent === 'very' || persistent === 'very' && prevState.persistent === 'very') {
-          isPersistent = 'very';
-        } else if (prevState.value.meta.persistent || persistent && prevState.persistent) {
-          isPersistent = true;
-        }
-
-        if (prevState.ds == null || prevState.ds !== ds || isEmpty || !isPersistent || isPersistent !== 'very' && prevState._.name !== _.name) {
-          nextState.value = getEmptyValue(nextProps, request, revision, isEmpty);
-        }
-
-        return nextState;
-      }
-
-      if (prevState.persistent !== persistent) {
-        return {
-          persistent: persistent
-        };
-      }
-
-      return null;
-    }
-  }]);
-
   function Resource(props) {
     var _this;
 
@@ -167,37 +129,47 @@ var Resource = /*#__PURE__*/function (_Component) {
 
     _this = _super.call(this, props);
 
-    _defineProperty(_assertThisInitialized(_this), "notify", function () {
-      var _this$props = _this.props,
-          empty = _this$props.empty,
-          dataStore = _this$props.dataStore;
-      var request = _this.state.request;
-      if (dataStore == null || empty) return;
-
-      _this.setState(function (currentState) {
-        if (request !== currentState.request) return null;
-        return {
-          isLoading: true,
-          revision: (0, _uuid.v1)()
-        };
-      });
-    });
+    _defineProperty(_assertThisInitialized(_this), "notify", /*#__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) {
+                _this.setState(function (currentState) {
+                  if (currentState.ds == null || currentState.empty) return null;
+                  var nextRevision = (0, _uniqueIdentifier["default"])(currentState.revision);
+                  resolve({
+                    request: currentState.request,
+                    revision: nextRevision
+                  });
+                  return {
+                    isLoading: true,
+                    revision: nextRevision
+                  };
+                });
+              }));
+
+            case 1:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    })));
 
-    var _empty = props.empty,
+    var empty = props.empty,
         ds = props.dataStore,
         persistent = props.persistent;
-
-    var _request = (0, _uuid.v1)();
-
-    var revision = (0, _uuid.v1)();
-    var isEmpty = ds == null || _empty;
+    var request = (0, _uniqueIdentifier["default"])();
+    var revision = (0, _uniqueIdentifier["default"])();
+    var isEmpty = ds == null || empty;
     _this.state = {
       _: getComparator(props),
       ds: ds,
-      request: _request,
+      request: request,
       revision: revision,
       isLoading: !isEmpty,
-      value: getEmptyValue(props, _request, revision, isEmpty),
+      value: getEmptyValue(props, request, revision, isEmpty),
       persistent: persistent
     };
     return _this;
@@ -206,10 +178,10 @@ var Resource = /*#__PURE__*/function (_Component) {
   _createClass(Resource, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this$props2 = this.props,
-          name = _this$props2.name,
-          empty = _this$props2.empty,
-          dataStore = _this$props2.dataStore;
+      var _this$props = this.props,
+          name = _this$props.name,
+          empty = _this$props.empty,
+          dataStore = _this$props.dataStore;
       var _this$state = this.state,
           request = _this$state.request,
           revision = _this$state.revision;
@@ -220,10 +192,10 @@ var Resource = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      var _this$props3 = this.props,
-          name = _this$props3.name,
-          empty = _this$props3.empty,
-          dataStore = _this$props3.dataStore;
+      var _this$props2 = this.props,
+          name = _this$props2.name,
+          empty = _this$props2.empty,
+          dataStore = _this$props2.dataStore;
       var _this$state2 = this.state,
           request = _this$state2.request,
           revision = _this$state2.revision;
@@ -282,7 +254,7 @@ var Resource = /*#__PURE__*/function (_Component) {
           if (error != null) {
             return {
               isLoading: false,
-              value: _objectSpread({}, currentState.value, {
+              value: _objectSpread(_objectSpread({}, currentState.value), {}, {
                 error: error,
                 isIncomplete: false
               })
@@ -291,13 +263,13 @@ var Resource = /*#__PURE__*/function (_Component) {
 
           var _currentState$value = currentState.value,
               prevData = _currentState$value.data,
-              prevContext = _objectWithoutProperties(_currentState$value, ["data"]);
+              prevContext = _objectWithoutProperties(_currentState$value, _excluded);
 
           var _getEmptyValue = getEmptyValue(props, request, revision, false),
               emptyData = _getEmptyValue.data,
-              emptyValue = _objectWithoutProperties(_getEmptyValue, ["data"]);
+              emptyValue = _objectWithoutProperties(_getEmptyValue, _excluded2);
 
-          var context = _objectSpread({}, emptyValue, {
+          var context = _objectSpread(_objectSpread({}, emptyValue), {}, {
             meta: meta.commit(prevContext.meta),
             isIncomplete: !done,
             isInitial: currentState.isInitial && !done
@@ -305,7 +277,7 @@ var Resource = /*#__PURE__*/function (_Component) {
 
           return {
             isLoading: !done,
-            value: _objectSpread({}, context, {
+            value: _objectSpread(_objectSpread({}, context), {}, {
               data: dataStore.recycleItems(dataStore.transition(data, prevData, context, prevContext), prevData, context, prevContext)
             })
           };
@@ -317,9 +289,9 @@ var Resource = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props4 = this.props,
-          children = _this$props4.children,
-          rest = _objectWithoutProperties(_this$props4, ["children"]);
+      var _this$props3 = this.props,
+          children = _this$props3.children,
+          rest = _objectWithoutProperties(_this$props3, _excluded3);
 
       var _this$state3 = this.state,
           request = _this$state3.request,
@@ -327,7 +299,7 @@ var Resource = /*#__PURE__*/function (_Component) {
           value = _this$state3.value;
       if (value.dataStore == null) return null;
 
-      var contextValue = _objectSpread({}, value, {
+      var contextValue = _objectSpread(_objectSpread({}, value), {}, {
         isLoading: isLoading,
         isStale: request !== value.request,
         notify: this.notify
@@ -336,7 +308,7 @@ var Resource = /*#__PURE__*/function (_Component) {
       var plugins = Array.isArray(value.dataStore.resourcePlugins) ? value.dataStore.resourcePlugins : [];
 
       var renderProvider = function renderProvider(context) {
-        return /*#__PURE__*/_react["default"].createElement(_context.ResourceContext.Provider, {
+        return /*#__PURE__*/_react["default"].createElement(_context2.ResourceContext.Provider, {
           value: context
         }, children);
       };
@@ -354,6 +326,50 @@ var Resource = /*#__PURE__*/function (_Component) {
         };
       }, renderProvider)(contextValue);
     }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(nextProps, prevState) {
+      var empty = nextProps.empty,
+          ds = nextProps.dataStore,
+          persistent = nextProps.persistent;
+
+      var _ = getComparator(nextProps);
+
+      if (prevState.ds !== ds || !compareRequests(ds, prevState._, _)) {
+        var request = (0, _uniqueIdentifier["default"])(prevState.request);
+        var revision = (0, _uniqueIdentifier["default"])(prevState.revision);
+        var isEmpty = ds == null || empty;
+        var nextState = {
+          _: _,
+          ds: ds,
+          request: request,
+          revision: revision,
+          isLoading: !isEmpty,
+          persistent: persistent
+        };
+        var isPersistent;
+
+        if (prevState.value.meta.persistent === 'very' || persistent === 'very' && prevState.persistent === 'very') {
+          isPersistent = 'very';
+        } else if (prevState.value.meta.persistent || persistent && prevState.persistent) {
+          isPersistent = true;
+        }
+
+        if (prevState.ds == null || prevState.ds !== ds || isEmpty || !isPersistent || isPersistent !== 'very' && prevState._.name !== _.name) {
+          nextState.value = getEmptyValue(nextProps, request, revision, isEmpty);
+        }
+
+        return nextState;
+      }
+
+      if (prevState.persistent !== persistent) {
+        return {
+          persistent: persistent
+        };
+      }
+
+      return null;
+    }
   }]);
 
   return Resource;
@@ -400,8 +416,8 @@ Resource.propTypes = {
 
 var withContext = function withContext(ChildComponent) {
   var WithContext = function WithContext(props) {
-    return /*#__PURE__*/_react["default"].createElement(_context.ConfigContext.Consumer, null, function (_ref3) {
-      var dataStore = _ref3.dataStore;
+    return /*#__PURE__*/_react["default"].createElement(_context2.ConfigContext.Consumer, null, function (_ref4) {
+      var dataStore = _ref4.dataStore;
       return /*#__PURE__*/_react["default"].createElement(ChildComponent, _extends({
         dataStore: dataStore
       }, props));

package/lib/context.js

@@ -9,13 +9,13 @@ exports.useResourceContext = exports.ResourceContext = exports.useConfigContext
 
 var _react = _interopRequireWildcard(require("react"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 var noop = function noop() {};
 
-var ConfigContext = _react["default"].createContext({});
+var ConfigContext = /*#__PURE__*/_react["default"].createContext({});
 
 exports.ConfigContext = ConfigContext;
 ConfigContext.displayName = 'ConfigContext';
@@ -26,7 +26,7 @@ var useConfigContext = function useConfigContext() {
 
 exports.useConfigContext = useConfigContext;
 
-var ResourceContext = _react["default"].createContext({
+var ResourceContext = /*#__PURE__*/_react["default"].createContext({
   data: [],
   notify: noop
 });

package/lib/createPlugin.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,24 +11,22 @@ var _DataStore = _interopRequireDefault(require("./DataStore"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-function _createSuper(Derived) { return function () { var Super = _getPrototypeOf(Derived), result; if (_isNativeReflectConstruct()) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
 function createPlugin(plugin) {
   if (typeof plugin !== 'function') throw new Error('No valid plugin definition specified');
   return function (dataStoreClass) {

package/lib/index.js

@@ -17,105 +17,105 @@ Object.defineProperty(exports, "useResourceContext", {
     return _context.useResourceContext;
   }
 });
-Object.defineProperty(exports, "ConfigProvider", {
+Object.defineProperty(exports, "AbortSignal", {
   enumerable: true,
   get: function get() {
-    return _ConfigProvider["default"];
+    return _AbortSignal["default"];
   }
 });
-Object.defineProperty(exports, "Resource", {
+Object.defineProperty(exports, "ChannelNotifier", {
   enumerable: true,
   get: function get() {
-    return _Resource["default"];
+    return _ChannelNotifier["default"];
   }
 });
-Object.defineProperty(exports, "BaseDataStore", {
+Object.defineProperty(exports, "compose", {
   enumerable: true,
   get: function get() {
-    return _DataStore["default"];
+    return _compose["default"];
   }
 });
-Object.defineProperty(exports, "isDataStore", {
+Object.defineProperty(exports, "ConfigProvider", {
   enumerable: true,
   get: function get() {
-    return _DataStore.isDataStore;
+    return _ConfigProvider["default"];
   }
 });
-Object.defineProperty(exports, "dataStorePropType", {
+Object.defineProperty(exports, "createPlugin", {
   enumerable: true,
   get: function get() {
-    return _DataStore.dataStorePropType;
+    return _createPlugin["default"];
   }
 });
-Object.defineProperty(exports, "DataStore", {
+Object.defineProperty(exports, "dataStorePropType", {
   enumerable: true,
   get: function get() {
-    return _DefaultDataStore["default"];
+    return _DataStore.dataStorePropType;
   }
 });
-Object.defineProperty(exports, "createPlugin", {
+Object.defineProperty(exports, "BaseDataStore", {
   enumerable: true,
   get: function get() {
-    return _createPlugin["default"];
+    return _DataStore["default"];
   }
 });
-Object.defineProperty(exports, "compose", {
+Object.defineProperty(exports, "isDataStore", {
   enumerable: true,
   get: function get() {
-    return _compose["default"];
+    return _DataStore.isDataStore;
   }
 });
-Object.defineProperty(exports, "Notifier", {
+Object.defineProperty(exports, "DataStore", {
   enumerable: true,
   get: function get() {
-    return _Notifier["default"];
+    return _DefaultDataStore["default"];
   }
 });
-Object.defineProperty(exports, "ChannelNotifier", {
+Object.defineProperty(exports, "Meta", {
   enumerable: true,
   get: function get() {
-    return _ChannelNotifier["default"];
+    return _Meta["default"];
   }
 });
-Object.defineProperty(exports, "AbortSignal", {
+Object.defineProperty(exports, "Notifier", {
   enumerable: true,
   get: function get() {
-    return _AbortSignal["default"];
+    return _Notifier["default"];
   }
 });
-Object.defineProperty(exports, "Meta", {
+Object.defineProperty(exports, "Resource", {
   enumerable: true,
   get: function get() {
-    return _Meta["default"];
+    return _Resource["default"];
   }
 });
 exports.ResourceConsumer = exports.ResourceProvider = exports.ConfigConsumer = void 0;
 
 var _context = require("./context");
 
-var _ConfigProvider = _interopRequireDefault(require("./ConfigProvider"));
+var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
 
-var _Resource = _interopRequireDefault(require("./Resource"));
+var _ChannelNotifier = _interopRequireDefault(require("./ChannelNotifier"));
 
-var _DataStore = _interopRequireWildcard(require("./DataStore"));
+var _compose = _interopRequireDefault(require("./compose"));
 
-var _DefaultDataStore = _interopRequireDefault(require("./DefaultDataStore"));
+var _ConfigProvider = _interopRequireDefault(require("./ConfigProvider"));
 
 var _createPlugin = _interopRequireDefault(require("./createPlugin"));
 
-var _compose = _interopRequireDefault(require("./compose"));
+var _DataStore = _interopRequireWildcard(require("./DataStore"));
 
-var _Notifier = _interopRequireDefault(require("./Notifier"));
+var _DefaultDataStore = _interopRequireDefault(require("./DefaultDataStore"));
 
-var _ChannelNotifier = _interopRequireDefault(require("./ChannelNotifier"));
+var _Meta = _interopRequireDefault(require("./Meta"));
 
-var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
+var _Notifier = _interopRequireDefault(require("./Notifier"));
 
-var _Meta = _interopRequireDefault(require("./Meta"));
+var _Resource = _interopRequireDefault(require("./Resource"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 

package/lib/uniqueIdentifier.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _uuid = require("uuid");
+
+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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+/**
+ * Returns incrementing unique string identifiers.
+ * Uniqueness is guaranteed for <Number.MAX_SAFE_INTEGER> iterations.
+ * The values can be compared alphanumerically, as long as they do not exceed the previously specified iterations.
+ *
+ * @param {string?} previous Previous identifier
+ */
+function uniqueIdentifier(previous) {
+  var prefix;
+  var value;
+  var scope;
+
+  if (typeof previous !== 'string') {
+    prefix = '~';
+    value = 0;
+    scope = (0, _uuid.v1)();
+  } else {
+    var prevValue;
+
+    var _previous$split = previous.split('$');
+
+    var _previous$split2 = _slicedToArray(_previous$split, 3);
+
+    prefix = _previous$split2[0];
+    prevValue = _previous$split2[1];
+    scope = _previous$split2[2];
+    value = ((parseInt(prevValue, 36) || 0) + 1) % Number.MAX_SAFE_INTEGER;
+    if (value === 0) prefix += '~';
+  }
+
+  return "".concat(prefix, "$").concat(value.toString(36).padStart(11, '0'), "$").concat(scope);
+}
+
+var _default = uniqueIdentifier;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@civet/core",
-  "version": "0.6.6",
+  "version": "0.6.9",
   "description": "Civet",
   "main": "./lib/index.js",
   "scripts": {
@@ -34,35 +34,36 @@
   },
   "homepage": "https://civet.js.org/",
   "devDependencies": {
-    "@babel/cli": "7.8.4",
-    "@babel/core": "7.9.0",
-    "@babel/plugin-proposal-class-properties": "7.8.3",
-    "@babel/preset-env": "7.9.0",
-    "@babel/preset-react": "7.9.4",
-    "babel-eslint": "10.1.0",
-    "cross-env": "7.0.2",
-    "cross-var": "1.1.0",
-    "eslint": "6.8.0",
-    "eslint-config-airbnb": "18.1.0",
-    "eslint-config-airbnb-base": "14.1.0",
-    "eslint-config-prettier": "6.10.1",
-    "eslint-plugin-import": "2.20.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-prettier": "3.1.2",
-    "eslint-plugin-react": "7.19.0",
-    "prettier": "2.0.2",
+    "@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-eslint": "^10.1.0",
+    "cross-env": "^7.0.3",
+    "cross-var": "^1.1.0",
+    "eslint": "7.2",
+    "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.3.2",
     "react": "*",
     "react-dom": "*",
-    "rimraf": "3.0.2"
+    "rimraf": "^3.0.2"
   },
   "peerDependencies": {
     "react": ">= 16.8",
     "react-dom": ">= 16.8"
   },
   "dependencies": {
-    "fast-deep-equal": "3.1.3",
-    "object-hash": "2.0.3",
-    "prop-types": "15.7.2",
-    "uuid": "8.3.0"
+    "fast-deep-equal": "^3.1.3",
+    "object-hash": "^2.2.0",
+    "prop-types": "^15.7.2",
+    "uuid": "^8.3.2"
   }
 }

package/src/ConfigProvider.js

@@ -1,5 +1,5 @@
-import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
+import React, { useMemo } from 'react';
 
 import { ConfigContext } from './context';
 import { dataStorePropType } from './DataStore';

package/src/Resource.js

@@ -1,11 +1,12 @@
 import deepEquals from 'fast-deep-equal';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { v1 as uuid } from 'uuid';
+
 import AbortSignal from './AbortSignal';
 import { ConfigContext, ResourceContext } from './context';
 import { dataStorePropType } from './DataStore';
 import Meta from './Meta';
+import uniqueIdentifier from './uniqueIdentifier';
 
 function getComparator({ name, ids, query, empty, options }) {
   return {
@@ -49,8 +50,8 @@ class Resource extends Component {
     const { empty, dataStore: ds, persistent } = nextProps;
     const _ = getComparator(nextProps);
     if (prevState.ds !== ds || !compareRequests(ds, prevState._, _)) {
-      const request = uuid();
-      const revision = uuid();
+      const request = uniqueIdentifier(prevState.request);
+      const revision = uniqueIdentifier(prevState.revision);
       const isEmpty = ds == null || empty;
       const nextState = {
         _,
@@ -89,8 +90,8 @@ class Resource extends Component {
   constructor(props) {
     super(props);
     const { empty, dataStore: ds, persistent } = props;
-    const request = uuid();
-    const revision = uuid();
+    const request = uniqueIdentifier();
+    const revision = uniqueIdentifier();
     const isEmpty = ds == null || empty;
     this.state = {
       _: getComparator(props),
@@ -135,18 +136,18 @@ class Resource extends Component {
     if (this.abortSignal) this.abortSignal.abort();
   }
 
-  notify = () => {
-    const { empty, dataStore } = this.props;
-    const { request } = this.state;
-    if (dataStore == null || empty) return;
-    this.setState((currentState) => {
-      if (request !== currentState.request) return null;
-      return {
-        isLoading: true,
-        revision: uuid(),
-      };
+  notify = async () =>
+    new Promise((resolve) => {
+      this.setState((currentState) => {
+        if (currentState.ds == null || currentState.empty) return null;
+        const nextRevision = uniqueIdentifier(currentState.revision);
+        resolve({ request: currentState.request, revision: nextRevision });
+        return {
+          isLoading: true,
+          revision: nextRevision,
+        };
+      });
     });
-  };
 
   fetch(request, revision) {
     const { ...props } = this.props;

package/src/index.js

@@ -1,16 +1,15 @@
-import { ConfigContext, useConfigContext, ResourceContext, useResourceContext } from './context';
+import { ConfigContext, ResourceContext, useConfigContext, useResourceContext } from './context';
 
 export const { Consumer: ConfigConsumer } = ConfigContext;
 export const { Provider: ResourceProvider, Consumer: ResourceConsumer } = ResourceContext;
-export { useConfigContext, useResourceContext };
-
+export { default as AbortSignal } from './AbortSignal';
+export { default as ChannelNotifier } from './ChannelNotifier';
+export { default as compose } from './compose';
 export { default as ConfigProvider } from './ConfigProvider';
-export { default as Resource } from './Resource';
-export { default as BaseDataStore, isDataStore, dataStorePropType } from './DataStore';
-export { default as DataStore } from './DefaultDataStore';
 export { default as createPlugin } from './createPlugin';
-export { default as compose } from './compose';
-export { default as Notifier } from './Notifier';
-export { default as ChannelNotifier } from './ChannelNotifier';
-export { default as AbortSignal } from './AbortSignal';
+export { dataStorePropType, default as BaseDataStore, isDataStore } from './DataStore';
+export { default as DataStore } from './DefaultDataStore';
 export { default as Meta } from './Meta';
+export { default as Notifier } from './Notifier';
+export { default as Resource } from './Resource';
+export { useConfigContext, useResourceContext };

package/src/uniqueIdentifier.js

@@ -0,0 +1,27 @@
+import { v1 as uuid } from 'uuid';
+
+/**
+ * Returns incrementing unique string identifiers.
+ * Uniqueness is guaranteed for <Number.MAX_SAFE_INTEGER> iterations.
+ * The values can be compared alphanumerically, as long as they do not exceed the previously specified iterations.
+ *
+ * @param {string?} previous Previous identifier
+ */
+function uniqueIdentifier(previous) {
+  let prefix;
+  let value;
+  let scope;
+  if (typeof previous !== 'string') {
+    prefix = '~';
+    value = 0;
+    scope = uuid();
+  } else {
+    let prevValue;
+    [prefix, prevValue, scope] = previous.split('$');
+    value = ((parseInt(prevValue, 36) || 0) + 1) % Number.MAX_SAFE_INTEGER;
+    if (value === 0) prefix += '~';
+  }
+  return `${prefix}$${value.toString(36).padStart(11, '0')}$${scope}`;
+}
+
+export default uniqueIdentifier;