@civet/core 1.2.4 → 1.2.6

package/lib/AbortSignal.js

@@ -7,81 +7,71 @@ exports["default"] = void 0;
 var _Notifier = _interopRequireDefault(require("./Notifier"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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); }
-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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+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); }
-var AbortSignal = /*#__PURE__*/function () {
-  function AbortSignal() {
-    _classCallCheck(this, AbortSignal);
-    this.notifier = new _Notifier["default"]();
-    Object.defineProperties(this, {
-      locked: {
-        value: false,
-        enumerable: true,
-        writable: false,
-        configurable: true
+var AbortSignal = /*#__PURE__*/_createClass(function AbortSignal() {
+  var _this = this;
+  _classCallCheck(this, AbortSignal);
+  _defineProperty(this, "listen", function (cb) {
+    if (_this.locked) return function () {};
+    var alreadySubscribed = _this.notifier.isSubscribed(cb);
+    var unsubscribe = _this.notifier.subscribe(cb);
+    if (_this.aborted && !alreadySubscribed) cb();
+    return unsubscribe;
+  });
+  _defineProperty(this, "abort", function () {
+    if (_this.locked) return;
+    _this.lock();
+    Object.defineProperty(_this, 'aborted', {
+      value: true,
+      enumerable: true,
+      writable: false,
+      configurable: false
+    });
+    _this.notifier.trigger();
+  });
+  _defineProperty(this, "lock", function () {
+    if (_this.locked) return;
+    Object.defineProperty(_this, 'locked', {
+      value: true,
+      enumerable: true,
+      writable: false,
+      configurable: false
+    });
+  });
+  _defineProperty(this, "proxy", function () {
+    var s = _this;
+    return {
+      listen: function listen(cb) {
+        return s.listen(cb);
+      },
+      get locked() {
+        return s.locked;
       },
-      aborted: {
-        value: false,
-        enumerable: true,
-        writable: false,
-        configurable: true
+      get aborted() {
+        return s.locked;
       }
-    });
-  }
-  _createClass(AbortSignal, [{
-    key: "listen",
-    value: function listen(cb) {
-      if (this.locked) return function () {};
-      var alreadySubscribed = this.notifier.isSubscribed(cb);
-      var unsubscribe = this.notifier.subscribe(cb);
-      if (this.aborted && !alreadySubscribed) cb();
-      return unsubscribe;
-    }
-  }, {
-    key: "abort",
-    value: function abort() {
-      if (this.locked) return;
-      this.lock();
-      Object.defineProperty(this, 'aborted', {
-        value: true,
-        enumerable: true,
-        writable: false,
-        configurable: false
-      });
-      this.notifier.trigger();
-    }
-  }, {
-    key: "lock",
-    value: function lock() {
-      if (this.locked) return;
-      Object.defineProperty(this, 'locked', {
-        value: true,
-        enumerable: true,
-        writable: false,
-        configurable: false
-      });
+    };
+  });
+  this.notifier = new _Notifier["default"]();
+  Object.defineProperties(this, {
+    locked: {
+      value: false,
+      enumerable: true,
+      writable: false,
+      configurable: true
+    },
+    aborted: {
+      value: false,
+      enumerable: true,
+      writable: false,
+      configurable: true
     }
-  }, {
-    key: "proxy",
-    value: function proxy() {
-      var s = this;
-      return {
-        listen: function listen(cb) {
-          return s.listen(cb);
-        },
-        get locked() {
-          return s.locked;
-        },
-        get aborted() {
-          return s.locked;
-        }
-      };
-    }
-  }]);
-  return AbortSignal;
-}();
+  });
+});
 var _default = AbortSignal;
 exports["default"] = _default;

package/lib/ChannelNotifier.js

@@ -7,51 +7,42 @@ exports["default"] = void 0;
 var _Notifier = _interopRequireDefault(require("./Notifier"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 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); }
-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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 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); }
-var ChannelNotifier = /*#__PURE__*/function () {
-  function ChannelNotifier() {
-    _classCallCheck(this, ChannelNotifier);
-    _defineProperty(this, "channels", {});
-  }
-  _createClass(ChannelNotifier, [{
-    key: "subscribe",
-    value: function subscribe(channel, handler) {
-      if (channel == null || !"".concat(channel)) {
-        throw new Error('Channel is required');
-      }
-      if (this.channels[channel] == null) this.channels[channel] = new _Notifier["default"]();
-      return this.channels[channel].subscribe(handler);
+var ChannelNotifier = /*#__PURE__*/_createClass(function ChannelNotifier() {
+  var _this = this;
+  _classCallCheck(this, ChannelNotifier);
+  _defineProperty(this, "channels", {});
+  _defineProperty(this, "subscribe", function (channel, handler) {
+    if (channel == null || !"".concat(channel)) {
+      throw new Error('Channel is required');
     }
-  }, {
-    key: "isSubscribed",
-    value: function isSubscribed(channel, handler) {
-      if (channel == null || !"".concat(channel)) {
-        throw new Error('Channel is required');
-      }
-      return this.channels[channel] != null && this.channels[channel].isSubscribed(handler);
+    if (_this.channels[channel] == null) _this.channels[channel] = new _Notifier["default"]();
+    return _this.channels[channel].subscribe(handler);
+  });
+  _defineProperty(this, "isSubscribed", function (channel, handler) {
+    if (channel == null || !"".concat(channel)) {
+      throw new Error('Channel is required');
     }
-  }, {
-    key: "trigger",
-    value: function trigger(channel) {
-      for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-        args[_key - 1] = arguments[_key];
-      }
-      if (channel == null) {
-        Object.values(this.channels).forEach(function (notifier) {
-          return notifier.trigger.apply(notifier, args);
-        });
-      } else if (this.channels[channel] != null) {
-        var _this$channels$channe;
-        (_this$channels$channe = this.channels[channel]).trigger.apply(_this$channels$channe, args);
-      }
+    return _this.channels[channel] != null && _this.channels[channel].isSubscribed(handler);
+  });
+  _defineProperty(this, "trigger", function (channel) {
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
     }
-  }]);
-  return ChannelNotifier;
-}();
+    if (channel == null) {
+      Object.values(_this.channels).forEach(function (notifier) {
+        return notifier.trigger.apply(notifier, args);
+      });
+    } else if (_this.channels[channel] != null) {
+      var _this$channels$channe;
+      (_this$channels$channe = _this.channels[channel]).trigger.apply(_this$channels$channe, args);
+    }
+  });
+});
 var _default = ChannelNotifier;
 exports["default"] = _default;

package/lib/Meta.js

@@ -7,80 +7,58 @@ exports["default"] = void 0;
 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); }
 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 _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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+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); }
-var Meta = /*#__PURE__*/function () {
-  function Meta(base, instance) {
-    _classCallCheck(this, Meta);
-    this.data = base == null ? {} : base;
-    this.instance = instance;
-  }
-  _createClass(Meta, [{
-    key: "clear",
-    value: function clear() {
-      var _this = this;
-      Object.keys(this.data).forEach(function (key) {
-        delete _this.data[key];
-      });
-    }
-  }, {
-    key: "delete",
-    value: function _delete(key) {
-      var value = this.data[key];
-      delete this.data[key];
-      return value;
-    }
-  }, {
-    key: "entries",
-    value: function entries() {
-      return Object.entries(this.data);
-    }
-  }, {
-    key: "get",
-    value: function get(key) {
-      return this.data[key];
+var Meta = /*#__PURE__*/_createClass(function Meta(base, instance) {
+  var _this = this;
+  _classCallCheck(this, Meta);
+  _defineProperty(this, "clear", function () {
+    Object.keys(_this.data).forEach(function (key) {
+      delete _this.data[key];
+    });
+  });
+  _defineProperty(this, "delete", function (key) {
+    var value = _this.data[key];
+    delete _this.data[key];
+    return value;
+  });
+  _defineProperty(this, "entries", function () {
+    return Object.entries(_this.data);
+  });
+  _defineProperty(this, "get", function (key) {
+    return _this.data[key];
+  });
+  _defineProperty(this, "has", function (key) {
+    return Object.prototype.hasOwnProperty.call(_this.data, key);
+  });
+  _defineProperty(this, "keys", function () {
+    return Object.keys(_this.data);
+  });
+  _defineProperty(this, "set", function (key, value) {
+    _this.data[key] = value;
+  });
+  _defineProperty(this, "values", function () {
+    return Object.values(_this.data);
+  });
+  _defineProperty(this, "commit", function (prev, ignore) {
+    var next = _objectSpread({}, _this.data);
+    (ignore || []).forEach(function (item) {
+      delete next[item];
+    });
+    var keys = Object.keys(next);
+    if (prev != null && Object.keys(prev).length === keys.length && keys.reduce(function (sum, key) {
+      return sum && Object.is(next[key], prev[key]);
+    }, true)) {
+      return prev;
     }
-  }, {
-    key: "has",
-    value: function has(key) {
-      return Object.prototype.hasOwnProperty.call(this.data, key);
-    }
-  }, {
-    key: "keys",
-    value: function keys() {
-      return Object.keys(this.data);
-    }
-  }, {
-    key: "set",
-    value: function set(key, value) {
-      this.data[key] = value;
-    }
-  }, {
-    key: "values",
-    value: function values() {
-      return Object.values(this.data);
-    }
-  }, {
-    key: "commit",
-    value: function commit(prev, ignore) {
-      var next = _objectSpread({}, this.data);
-      (ignore || []).forEach(function (item) {
-        delete next[item];
-      });
-      var keys = Object.keys(next);
-      if (prev != null && Object.keys(prev).length === keys.length && keys.reduce(function (sum, key) {
-        return sum && Object.is(next[key], prev[key]);
-      }, true)) {
-        return prev;
-      }
-      return next;
-    }
-  }]);
-  return Meta;
-}();
+    return next;
+  });
+  this.data = base == null ? {} : base;
+  this.instance = instance;
+});
 var _default = Meta;
 exports["default"] = _default;

package/lib/Notifier.js

@@ -5,48 +5,34 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 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); }
-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, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 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); }
-var Notifier = /*#__PURE__*/function () {
-  function Notifier() {
-    _classCallCheck(this, Notifier);
-    _defineProperty(this, "subscriptions", []);
-  }
-  _createClass(Notifier, [{
-    key: "subscribe",
-    value: function subscribe(handler) {
-      var _this = this;
-      if (typeof handler !== 'function') throw new Error('Handler must be a function');
-      if (!this.isSubscribed(handler)) {
-        this.subscriptions.push(handler);
-      }
-      return function () {
-        _this.subscriptions = _this.subscriptions.filter(function (item) {
-          return item !== handler;
-        });
-      };
-    }
-  }, {
-    key: "isSubscribed",
-    value: function isSubscribed(handler) {
-      return this.subscriptions.includes(handler);
+var Notifier = /*#__PURE__*/_createClass(function Notifier() {
+  var _this = this;
+  _classCallCheck(this, Notifier);
+  _defineProperty(this, "listeners", new Set());
+  _defineProperty(this, "subscribe", function (handler) {
+    if (typeof handler !== 'function') throw new Error('Handler must be a function');
+    _this.listeners.add(handler);
+    return function () {
+      _this.listeners["delete"](handler);
+    };
+  });
+  _defineProperty(this, "isSubscribed", function (handler) {
+    return _this.listeners.has(handler);
+  });
+  _defineProperty(this, "trigger", function () {
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
     }
-  }, {
-    key: "trigger",
-    value: function trigger() {
-      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-        args[_key] = arguments[_key];
-      }
-      this.subscriptions.forEach(function (handler) {
-        return handler.apply(void 0, args);
-      });
-    }
-  }]);
-  return Notifier;
-}();
+    _this.listeners.forEach(function (handler) {
+      return handler.apply(void 0, args);
+    });
+  });
+});
 var _default = Notifier;
 exports["default"] = _default;

package/lib/Resource.js

@@ -14,6 +14,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function _extends() { _extends = Object.assign ? Object.assign.bind() : 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 _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; }
+var propTypes = {
+  /** DataProvider to be used for requests */
+  dataProvider: _DataProvider.dataProviderPropType,
+  /** Resource name */
+  name: _propTypes["default"].string.isRequired,
+  /** Query */
+  query: _propTypes["default"].any,
+  /** Whether to prevent fetching data */
+  empty: _propTypes["default"].bool,
+  /** DataProvider options for requests */
+  options: _propTypes["default"].object,
+  /** Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very" */
+  persistent: _propTypes["default"].oneOfType([_propTypes["default"].bool, _propTypes["default"].oneOf(['very'])]),
+  children: _propTypes["default"].node
+};
+
 /**
  * Makes data from an DataProvider available to its descendants using React's context API.
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
@@ -52,32 +68,6 @@ function Resource(_ref) {
     }, children);
   })(context);
 }
-Resource.propTypes = {
-  /**
-   * DataProvider to be used for requests
-   */
-  dataProvider: _DataProvider.dataProviderPropType,
-  /**
-   * Resource name
-   */
-  name: _propTypes["default"].string.isRequired,
-  /**
-   * Query
-   */
-  query: _propTypes["default"].any,
-  /**
-   * Whether to prevent fetching data
-   */
-  empty: _propTypes["default"].bool,
-  /**
-   * DataProvider options for requests
-   */
-  options: _propTypes["default"].object,
-  /**
-   * Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very"
-   */
-  persistent: _propTypes["default"].oneOfType([_propTypes["default"].bool, _propTypes["default"].oneOf(['very'])]),
-  children: _propTypes["default"].node
-};
+Resource.propTypes = propTypes;
 var _default = Resource;
 exports["default"] = _default;

package/lib/useResource.js

@@ -7,8 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
-var _context3 = require("./context");
 var _Meta = _interopRequireDefault(require("./Meta"));
+var _context3 = require("./context");
 var _uniqueIdentifier = _interopRequireDefault(require("./uniqueIdentifier"));
 var _excluded = ["dataProvider", "name", "query", "empty", "options", "persistent"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -52,14 +52,15 @@ function useResource(_ref) {
   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];
+  var _React$useState3 = _react["default"].useState(),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    instance = _React$useState4[0],
+    setInstance = _React$useState4[1];
   _react["default"].useEffect(function () {
+    var i = dataProvider.createInstance();
+    setInstance(i);
     return function () {
-      dataProvider.releaseInstance(instance);
+      dataProvider.releaseInstance(i);
     };
   }, []);
   var nextRequestDetails = _react["default"].useMemo(function () {
@@ -148,7 +149,6 @@ function useResource(_ref) {
         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,
@@ -174,7 +174,7 @@ function useResource(_ref) {
     return unsubscribe;
   }, [requestDetails.empty, dataProvider, requestDetails.name, notify]);
   _react["default"].useEffect(function () {
-    if (requestDetails.empty) return undefined;
+    if (requestDetails.empty || instance == null) return undefined;
     var abortSignal = new _AbortSignal["default"]();
     var meta = new _Meta["default"](_objectSpread({}, value.meta), instance);
     var promise = Promise.resolve(state);
@@ -227,7 +227,7 @@ function useResource(_ref) {
     return function () {
       abortSignal.abort();
     };
-  }, [request, revision]);
+  }, [instance, request, revision]);
   var isStale = revision !== value.revision;
   var next = _react["default"].useMemo(function () {
     return isStale ? {

package/package.json

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

package/src/AbortSignal.js

@@ -19,15 +19,15 @@ class AbortSignal {
     });
   }
 
-  listen(cb) {
+  listen = (cb) => {
     if (this.locked) return () => {};
     const alreadySubscribed = this.notifier.isSubscribed(cb);
     const unsubscribe = this.notifier.subscribe(cb);
     if (this.aborted && !alreadySubscribed) cb();
     return unsubscribe;
-  }
+  };
 
-  abort() {
+  abort = () => {
     if (this.locked) return;
     this.lock();
     Object.defineProperty(this, 'aborted', {
@@ -37,9 +37,9 @@ class AbortSignal {
       configurable: false,
     });
     this.notifier.trigger();
-  }
+  };
 
-  lock() {
+  lock = () => {
     if (this.locked) return;
     Object.defineProperty(this, 'locked', {
       value: true,
@@ -47,9 +47,9 @@ class AbortSignal {
       writable: false,
       configurable: false,
     });
-  }
+  };
 
-  proxy() {
+  proxy = () => {
     const s = this;
     return {
       listen(cb) {
@@ -62,7 +62,7 @@ class AbortSignal {
         return s.locked;
       },
     };
-  }
+  };
 }
 
 export default AbortSignal;

package/src/ChannelNotifier.js

@@ -3,28 +3,28 @@ import Notifier from './Notifier';
 class ChannelNotifier {
   channels = {};
 
-  subscribe(channel, handler) {
+  subscribe = (channel, handler) => {
     if (channel == null || !`${channel}`) {
       throw new Error('Channel is required');
     }
     if (this.channels[channel] == null) this.channels[channel] = new Notifier();
     return this.channels[channel].subscribe(handler);
-  }
+  };
 
-  isSubscribed(channel, handler) {
+  isSubscribed = (channel, handler) => {
     if (channel == null || !`${channel}`) {
       throw new Error('Channel is required');
     }
     return this.channels[channel] != null && this.channels[channel].isSubscribed(handler);
-  }
+  };
 
-  trigger(channel, ...args) {
+  trigger = (channel, ...args) => {
     if (channel == null) {
       Object.values(this.channels).forEach((notifier) => notifier.trigger(...args));
     } else if (this.channels[channel] != null) {
       this.channels[channel].trigger(...args);
     }
-  }
+  };
 }
 
 export default ChannelNotifier;

package/src/Meta.js

@@ -4,43 +4,33 @@ class Meta {
     this.instance = instance;
   }
 
-  clear() {
+  clear = () => {
     Object.keys(this.data).forEach((key) => {
       delete this.data[key];
     });
-  }
+  };
 
-  delete(key) {
+  delete = (key) => {
     const value = this.data[key];
     delete this.data[key];
     return value;
-  }
+  };
 
-  entries() {
-    return Object.entries(this.data);
-  }
+  entries = () => Object.entries(this.data);
 
-  get(key) {
-    return this.data[key];
-  }
+  get = (key) => this.data[key];
 
-  has(key) {
-    return Object.prototype.hasOwnProperty.call(this.data, key);
-  }
+  has = (key) => Object.prototype.hasOwnProperty.call(this.data, key);
 
-  keys() {
-    return Object.keys(this.data);
-  }
+  keys = () => Object.keys(this.data);
 
-  set(key, value) {
+  set = (key, value) => {
     this.data[key] = value;
-  }
+  };
 
-  values() {
-    return Object.values(this.data);
-  }
+  values = () => Object.values(this.data);
 
-  commit(prev, ignore) {
+  commit = (prev, ignore) => {
     const next = { ...this.data };
     (ignore || []).forEach((item) => {
       delete next[item];
@@ -54,7 +44,7 @@ class Meta {
       return prev;
     }
     return next;
-  }
+  };
 }
 
 export default Meta;

package/src/Notifier.js

@@ -1,23 +1,19 @@
 class Notifier {
-  subscriptions = [];
+  listeners = new Set();
 
-  subscribe(handler) {
+  subscribe = (handler) => {
     if (typeof handler !== 'function') throw new Error('Handler must be a function');
-    if (!this.isSubscribed(handler)) {
-      this.subscriptions.push(handler);
-    }
+    this.listeners.add(handler);
     return () => {
-      this.subscriptions = this.subscriptions.filter((item) => item !== handler);
+      this.listeners.delete(handler);
     };
-  }
+  };
 
-  isSubscribed(handler) {
-    return this.subscriptions.includes(handler);
-  }
+  isSubscribed = (handler) => this.listeners.has(handler);
 
-  trigger(...args) {
-    this.subscriptions.forEach((handler) => handler(...args));
-  }
+  trigger = (...args) => {
+    this.listeners.forEach((handler) => handler(...args));
+  };
 }
 
 export default Notifier;

package/src/Resource.js

@@ -5,6 +5,22 @@ import { ResourceContext } from './context';
 import { dataProviderPropType } from './DataProvider';
 import useResource from './useResource';
 
+const propTypes = {
+  /** DataProvider to be used for requests */
+  dataProvider: dataProviderPropType,
+  /** Resource name */
+  name: PropTypes.string.isRequired,
+  /** Query */
+  query: PropTypes.any,
+  /** Whether to prevent fetching data */
+  empty: PropTypes.bool,
+  /** DataProvider options for requests */
+  options: PropTypes.object,
+  /** Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very" */
+  persistent: PropTypes.oneOfType([PropTypes.bool, PropTypes.oneOf(['very'])]),
+  children: PropTypes.node,
+};
+
 /**
  * Makes data from an DataProvider available to its descendants using React's context API.
  * If not explicitly specified, necessary configuration is taken from the nearest <ConfigProvider>.
@@ -25,32 +41,6 @@ function Resource({ dataProvider, name, query, empty, options, persistent, child
   )(context);
 }
 
-Resource.propTypes = {
-  /**
-   * DataProvider to be used for requests
-   */
-  dataProvider: dataProviderPropType,
-  /**
-   * Resource name
-   */
-  name: PropTypes.string.isRequired,
-  /**
-   * Query
-   */
-  query: PropTypes.any,
-  /**
-   * Whether to prevent fetching data
-   */
-  empty: PropTypes.bool,
-  /**
-   * DataProvider options for requests
-   */
-  options: PropTypes.object,
-  /**
-   * Whether stale data should be retained during the next request - this only applies if neither dataProvider nor name have changed, unless set to "very"
-   */
-  persistent: PropTypes.oneOfType([PropTypes.bool, PropTypes.oneOf(['very'])]),
-  children: PropTypes.node,
-};
+Resource.propTypes = propTypes;
 
 export default Resource;

package/src/useResource.js

@@ -1,8 +1,8 @@
 import React from 'react';
 
 import AbortSignal from './AbortSignal';
-import { useConfigContext } from './context';
 import Meta from './Meta';
+import { useConfigContext } from './context';
 import uniqueIdentifier from './uniqueIdentifier';
 
 /**
@@ -33,13 +33,14 @@ function useResource({
     );
   }
 
-  const [instance] = React.useState(() => dataProvider.createInstance());
-  React.useEffect(
-    () => () => {
-      dataProvider.releaseInstance(instance);
-    },
-    [],
-  );
+  const [instance, setInstance] = React.useState();
+  React.useEffect(() => {
+    const i = dataProvider.createInstance();
+    setInstance(i);
+    return () => {
+      dataProvider.releaseInstance(i);
+    };
+  }, []);
 
   const nextRequestDetails = React.useMemo(
     () => ({ name: nextName, query: nextQuery, empty: nextEmpty, options: nextOptions }),
@@ -123,7 +124,6 @@ function useResource({
     async () =>
       new Promise((resolve) => {
         setState((currentState) => {
-          if (currentState.empty) return currentState;
           const nextRevision = uniqueIdentifier(currentState.revision);
           resolve({ request: currentState.request, revision: nextRevision });
           return { ...currentState, isLoading: true, revision: nextRevision };
@@ -141,7 +141,7 @@ function useResource({
   }, [requestDetails.empty, dataProvider, requestDetails.name, notify]);
 
   React.useEffect(() => {
-    if (requestDetails.empty) return undefined;
+    if (requestDetails.empty || instance == null) return undefined;
 
     const abortSignal = new AbortSignal();
 
@@ -215,7 +215,7 @@ function useResource({
     return () => {
       abortSignal.abort();
     };
-  }, [request, revision]);
+  }, [instance, request, revision]);
 
   const isStale = revision !== value.revision;
   const next = React.useMemo(