@civet/core 0.6.8 → 1.0.0-rc2

package/lib/AbortSignal.js

@@ -20,13 +20,26 @@ var AbortSignal = /*#__PURE__*/function () {
     _classCallCheck(this, AbortSignal);
 
     this.notifier = new _Notifier["default"]();
-    this.locked = false;
-    this.aborted = false;
+    Object.defineProperties(this, {
+      locked: {
+        value: false,
+        enumerable: true,
+        writable: false,
+        configurable: true
+      },
+      aborted: {
+        value: false,
+        enumerable: true,
+        writable: false,
+        configurable: true
+      }
+    });
   }
 
   _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();
@@ -36,14 +49,44 @@ var AbortSignal = /*#__PURE__*/function () {
     key: "abort",
     value: function abort() {
       if (this.locked) return;
-      this.locked = true;
-      this.aborted = true;
+      this.lock();
+      Object.defineProperty(this, 'aborted', {
+        value: true,
+        enumerable: true,
+        writable: false,
+        configurable: false
+      });
       this.notifier.trigger();
     }
   }, {
     key: "lock",
     value: function lock() {
-      this.locked = true;
+      if (this.locked) return;
+      Object.defineProperty(this, 'locked', {
+        value: true,
+        enumerable: true,
+        writable: false,
+        configurable: false
+      });
+    }
+  }, {
+    key: "proxy",
+    value: function proxy() {
+      var s = this;
+      return {
+        get notifier() {
+          return s.notifier;
+        },
+
+        get locked() {
+          return s.locked;
+        },
+
+        get aborted() {
+          return s.locked;
+        }
+
+      };
     }
   }]);
 

package/lib/ConfigProvider.js

@@ -1,7 +1,5 @@
 "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,15 +7,11 @@ exports["default"] = void 0;
 
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 
 var _context = require("./context");
 
-var _DataStore = require("./DataStore");
-
-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, 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 _DataProvider = require("./DataProvider");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -25,20 +19,22 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
  * Provides general configuration to its descendants using React's context API.
  */
 function ConfigProvider(_ref) {
-  var dataStore = _ref.dataStore,
+  var dataProvider = _ref.dataProvider,
       children = _ref.children;
-  var context = (0, _react.useMemo)(function () {
+
+  var context = _react["default"].useMemo(function () {
     return {
-      dataStore: dataStore
+      dataProvider: dataProvider
     };
-  }, [dataStore]);
+  }, [dataProvider]);
+
   return /*#__PURE__*/_react["default"].createElement(_context.ConfigContext.Provider, {
     value: context
   }, children);
 }
 
 ConfigProvider.propTypes = {
-  dataStore: _DataStore.dataStorePropType,
+  dataProvider: _DataProvider.dataProviderPropType,
   children: _propTypes["default"].node
 };
 var _default = ConfigProvider;

package/lib/{DataStore.js → DataProvider.js}

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.dataStorePropType = exports.isDataStore = exports["default"] = void 0;
+exports.dataProviderPropType = exports.isDataProvider = exports["default"] = void 0;
 
 var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
 
+var _objectHash = _interopRequireDefault(require("object-hash"));
+
 var _propTypes = _interopRequireDefault(require("prop-types"));
 
 var _AbortSignal = _interopRequireDefault(require("./AbortSignal"));
@@ -29,25 +31,41 @@ var getMeta = function getMeta(meta) {
   return meta instanceof _Meta["default"] ? meta : new _Meta["default"](meta);
 };
 
-var DataStore = /*#__PURE__*/function () {
-  function DataStore() {
-    var _this = this;
-
-    _classCallCheck(this, DataStore);
+var DataProvider = /*#__PURE__*/function () {
+  function DataProvider() {
+    _classCallCheck(this, DataProvider);
 
     _defineProperty(this, "notifier", new _ChannelNotifier["default"]());
 
-    this.resourcePlugins = [];
+    var contextPlugins = [];
+    var uiPlugins = [];
     this.extend({
-      resource: function resource(plugin) {
-        if (!_this.resourcePlugins.includes(plugin)) {
-          _this.resourcePlugins.push(plugin);
-        }
+      context: function context(plugin) {
+        var plugins = contextPlugins;
+        if (plugin != null && !plugins.includes(plugin)) plugins.push(plugin);
+      },
+      ui: function ui(plugin) {
+        var plugins = uiPlugins;
+        if (plugin != null && !plugins.includes(plugin)) plugins.push(plugin);
+      }
+    });
+    Object.defineProperties(this, {
+      contextPlugins: {
+        value: Object.freeze(contextPlugins.slice()),
+        enumerable: true,
+        writable: false,
+        configurable: false
+      },
+      uiPlugins: {
+        value: Object.freeze(uiPlugins.slice()),
+        enumerable: true,
+        writable: false,
+        configurable: false
       }
     });
   }
 
-  _createClass(DataStore, [{
+  _createClass(DataProvider, [{
     key: "extend",
     value: function extend() {}
   }, {
@@ -63,11 +81,11 @@ var DataStore = /*#__PURE__*/function () {
     }
   }, {
     key: "get",
-    value: function get(resource, ids, query, options, meta) {
-      var _this2 = this;
+    value: function get(resource, query, options, meta) {
+      var _this = this;
 
       return new Promise(function (resolve, reject) {
-        return _this2.continuousGet(resource, ids, query, options, meta, function (error, done, result) {
+        return _this.continuousGet(resource, query, options, meta, function (error, done, result) {
           if (error != null) {
             reject(error);
             return;
@@ -79,84 +97,93 @@ var DataStore = /*#__PURE__*/function () {
     }
   }, {
     key: "continuousGet",
-    value: function continuousGet(resource, ids, query, options, meta, callback, abortSignal) {
-      var _this3 = this;
+    value: function continuousGet(resource, query, options, meta, callback, abortSignal) {
+      var _this2 = this;
 
+      var signal = abortSignal == null ? new _AbortSignal["default"]() : abortSignal;
       new Promise(function (resolve) {
-        if (resource == null) throw new Error('No resource name specified');
-        if (ids != null && !Array.isArray(ids)) throw new Error('IDs must be an array');
-        var complete = false;
-        var signal = abortSignal == null ? new _AbortSignal["default"]() : abortSignal; // result transformation
+        if (resource == null) throw new Error('No resource name specified'); // result transformation
 
         var cb = function cb(error, done, result) {
           // prevent updates after completion
-          if (complete) return;
+          if (signal.locked) return;
 
           if (error != null || done) {
-            complete = true;
             signal.lock();
           }
 
           if (error != null) callback(error, true, []);else if (result == null) callback(undefined, done, []);else if (Array.isArray(result)) callback(undefined, done, result);else callback(undefined, done, [result]);
         };
 
-        resolve(Promise.resolve(_this3.handleGet(resource, ids, query, options, getMeta(meta))).then(function (result) {
+        resolve(Promise.resolve(_this2.handleGet(resource, query, options, getMeta(meta))).then(function (result) {
           if (typeof result === 'function') {
-            result(cb, signal);
+            result(cb, signal.proxy());
           } else {
             cb(undefined, true, result);
           }
         }));
       })["catch"](function (e) {
-        callback(e, true, []);
+        if (!signal.locked) callback(e, true, []);
       });
     }
   }, {
     key: "create",
     value: function create(resource, data, options, meta) {
-      var _this4 = this;
+      var _this3 = this;
 
       return new Promise(function (resolve) {
         if (resource == null) throw new Error('No resource name specified');
         if (data == null) throw new Error('No data specified');
-        resolve(Promise.resolve(_this4.handleCreate(resource, data, options, getMeta(meta))));
+        resolve(Promise.resolve(_this3.handleCreate(resource, data, options, getMeta(meta))));
       });
     }
   }, {
     key: "update",
-    value: function update(resource, ids, query, data, options, meta) {
-      var _this5 = this;
+    value: function update(resource, query, data, options, meta) {
+      var _this4 = this;
 
       return new Promise(function (resolve) {
         if (resource == null) throw new Error('No resource name specified');
-        if (ids != null && !Array.isArray(ids)) throw new Error('IDs must be an array');
         if (data == null) throw new Error('No data specified');
-        resolve(Promise.resolve(_this5.handleUpdate(resource, ids, query, data, options, getMeta(meta))));
+        resolve(Promise.resolve(_this4.handleUpdate(resource, query, data, options, getMeta(meta))));
       });
     }
   }, {
     key: "patch",
-    value: function patch(resource, ids, query, data, options, meta) {
-      var _this6 = this;
+    value: function patch(resource, query, data, options, meta) {
+      var _this5 = this;
 
       return new Promise(function (resolve) {
         if (resource == null) throw new Error('No resource name specified');
-        if (ids != null && !Array.isArray(ids)) throw new Error('IDs must be an array');
         if (data == null) throw new Error('No data specified');
-        resolve(Promise.resolve(_this6.handlePatch(resource, ids, query, data, options, getMeta(meta))));
+        resolve(Promise.resolve(_this5.handlePatch(resource, query, data, options, getMeta(meta))));
       });
     }
   }, {
     key: "remove",
-    value: function remove(resource, ids, query, options, meta) {
-      var _this7 = this;
+    value: function remove(resource, query, options, meta) {
+      var _this6 = this;
 
       return new Promise(function (resolve) {
         if (resource == null) throw new Error('No resource name specified');
-        if (ids != null && !Array.isArray(ids)) throw new Error('IDs must be an array');
-        resolve(Promise.resolve(_this7.handleRemove(resource, ids, query, options, getMeta(meta))));
+        resolve(Promise.resolve(_this6.handleRemove(resource, query, options, getMeta(meta))));
       });
     }
+  }, {
+    key: "compareRequests",
+    value: function compareRequests(prev, next) {
+      return (0, _fastDeepEqual["default"])(prev, next);
+    }
+  }, {
+    key: "compareItemVersions",
+    value: function compareItemVersions() {
+      return true;
+    }
+  }, {
+    key: "getItemIdentifier",
+    value: function getItemIdentifier(item) {
+      return (0, _objectHash["default"])(item);
+    }
   }, {
     key: "transition",
     value: function transition(nextData) {
@@ -164,27 +191,57 @@ var DataStore = /*#__PURE__*/function () {
     }
   }, {
     key: "recycleItems",
-    value: function recycleItems(nextData) {
-      return nextData;
-    }
-  }, {
-    key: "compareRequests",
-    value: function compareRequests(prev, next) {
-      return (0, _fastDeepEqual["default"])(prev, next);
+    value: function recycleItems(nextData, prevData) {
+      var _this7 = this;
+
+      var prevMapping = {};
+
+      if (nextData.length > 0) {
+        prevData.forEach(function (item) {
+          var id = _this7.getItemIdentifier(item);
+
+          if (id != null) prevMapping[id] = item;
+        });
+      }
+
+      var result;
+
+      if (prevData.length > 0) {
+        result = nextData.map(function (nextItem) {
+          var id = _this7.getItemIdentifier(nextItem);
+
+          if (id != null && Object.prototype.hasOwnProperty.call(prevMapping, id)) {
+            var prevItem = prevMapping[id];
+            if (_this7.compareItemVersions(nextItem, prevItem)) return prevItem;
+          }
+
+          return nextItem;
+        });
+      } else {
+        result = nextData;
+      }
+
+      if (prevData.length === result.length && result.reduce(function (sum, item, i) {
+        return sum && Object.is(prevData[i], item);
+      }, true)) {
+        return prevData;
+      }
+
+      return result;
     }
   }]);
 
-  return DataStore;
+  return DataProvider;
 }();
 
-var isDataStore = function isDataStore(dataStore) {
-  return dataStore instanceof DataStore;
+var isDataProvider = function isDataProvider(dataProvider) {
+  return dataProvider instanceof DataProvider;
 };
 
-exports.isDataStore = isDataStore;
+exports.isDataProvider = isDataProvider;
 
-var dataStorePropType = _propTypes["default"].instanceOf(DataStore);
+var dataProviderPropType = _propTypes["default"].instanceOf(DataProvider);
 
-exports.dataStorePropType = dataStorePropType;
-var _default = DataStore;
+exports.dataProviderPropType = dataProviderPropType;
+var _default = DataProvider;
 exports["default"] = _default;

package/lib/Meta.js

@@ -72,9 +72,12 @@ var Meta = /*#__PURE__*/function () {
     }
   }, {
     key: "commit",
-    value: function commit(prev) {
+    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) {