dataflux 1.2.0 → 1.2.4

package/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,17 @@
+---
+name: Bug report
+about: Create a bug report
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Provide an example**
+Provide an example in terms of prefixes and BGP messages. Possibly provide a snippet of config.yml and prefixes.yml.
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.

package/.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Describe what you would like to achieve**
+A clear and concise description of what you want to happen.
+
+**Describe why the current solution (if any) is not satisfactory**
+A clear and concise description.
+
+**Provide an example**
+Provide an example in terms of prefixes and BGP messages. Possibly provide a snippet of config.yml and prefixes.yml.

package/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: npm
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    target-branch: dev

package/.github/stale.yml

@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 90
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 1
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+  - no-stale
+
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+
+markComment: false
+
+# Comment to post when marking an issue as stale. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed as stale.
+  This mechanism helps to prioritize feature requests which received more support from the community.
+  If you want to open again this issue you have to provide a Pull Request.

package/.github/workflows/main.yml

@@ -0,0 +1,83 @@
+name: Main
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Javascript/Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '14'
+
+    - name: Check out code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: '0'
+
+    - name: Cache multiple paths
+      uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Build
+      run: |
+        npm install
+        npm run compile
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: logs
+        path: ~/.npm/_logs/*
+        retention-days: 14
+
+  test:
+    name: Test
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Javascript/Node
+      uses: actions/setup-node@v2
+      with:
+        node-version: '14'
+
+    - name: Check out code
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: '0'
+
+    - name: Cache multiple paths
+      uses: actions/cache@v2
+      with:
+        path: ~/.npm
+        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
+    - name: Install
+      run: |
+        npm install
+
+    - name: Tests
+      run: |
+        npm run test
+
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      if: ${{ always() }}
+      with:
+        name: logs
+        path: ~/.npm/_logs/*
+        retention-days: 14

package/README.md

@@ -205,7 +205,7 @@ The store can be configured with the following options:
 
 | Option    | Description                                                                                                                                                                                                                                                                                                                                                                              | Default |
 |-----------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------|
-| autoSave  | It can be `true`, `false`, or an amount of milliseconds (integer). If `false`, you will have to perform `store.save()` manually. If `true`, the store will automatically perform `save()` when objects change. If an amount of milliseconds is provided, the objects are saved periodically AND when a change is detected. See [Editing objects](#editing-objects) for more information. | 3000    |
+| autoSave  | It can be `true`, `false`, or an amount of milliseconds (integer). If `false`, you will have to perform `store.save()` manually. If `true`, the store will automatically perform `save()` when objects change. If an amount of milliseconds is provided, the objects are saved periodically AND when a change is detected. See [Editing objects](#editing-objects) for more information. | true    |
 | saveDelay | An amount of milliseconds used to defer synching operations with the server. It triggers `store.save()` milliseconds after the last change on the store's objects is detedect. This allows to bundle together multiple changes operated by an interacting user. See [Editing objects](#editing-objects) for more information.                                                            | 1000    |
 | lazyLoad  | A boolean. If set to `false`, the store is pre-populated with all the models' objects. If set to `true`, models' objects are loaded only on first usage (e.g., 'find', 'subscribe', 'getRelation'). LazyLoad operates per model, only the objects of the used models are loaded.                                                                                                         | false   |
 

package/dist/Model.js

@@ -33,12 +33,16 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
+function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
+
 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; }
 
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
+
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
@@ -49,6 +53,18 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 
+var applyData = function applyData(obj, data) {
+  for (var att in data) {
+    if (att !== "id" || obj.id === undefined || att === "id" && obj.id === data.id) {
+      obj[att] = data[att];
+    } else {
+      return Promise.reject("The loading function cannot change the id of the object.");
+    }
+  }
+
+  return Promise.resolve(obj);
+};
+
 var _type = /*#__PURE__*/new WeakMap();
 
 var _store = /*#__PURE__*/new WeakMap();
@@ -71,6 +87,8 @@ var _axios = /*#__PURE__*/new WeakMap();
 
 var _loadFunction = /*#__PURE__*/new WeakMap();
 
+var _error = /*#__PURE__*/new WeakSet();
+
 var _addRelationByField = /*#__PURE__*/new WeakMap();
 
 var _addRelationByFilter = /*#__PURE__*/new WeakMap();
@@ -92,6 +110,8 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _classCallCheck(this, Model);
 
+  _classPrivateMethodInitSpec(this, _error);
+
   _classPrivateFieldInitSpec(this, _type, {
     writable: true,
     value: void 0
@@ -160,35 +180,31 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   });
 
   _defineProperty(this, "load", function (obj) {
-    return new Promise(function (resolve, reject) {
-      var applyData = function applyData(data) {
-        for (var att in data) {
-          if (att !== "id" || obj.id === undefined || att === "id" && obj.id === data.id) {
-            obj[att] = data[att];
-          } else {
-            return Promise.reject("The loading function cannot change the id of the object.");
-          }
-        }
-      };
-
-      if (_classPrivateFieldGet(_this, _loadFunction)) {
-        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJson());
+    if (_classPrivateFieldGet(_this, _loadFunction)) {
+      return _this.getStore().whenSaved(_this.getType())["catch"](function () {
+        throw new Error("You cannot perform load() on an unsaved object.");
+      }).then(function () {
+        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON());
 
         if (typeof res === "string") {
-          _classPrivateFieldGet(_this, _axios).call(_this, {
+          return _classPrivateFieldGet(_this, _axios).call(_this, {
             method: "get",
             url: res,
             responseType: "json"
           }).then(function (data) {
-            return applyData(data.data);
-          }).then(resolve);
+            return data.data;
+          });
         } else {
-          res.then(applyData).then(resolve);
+          return res;
         }
-      } else {
-        reject("You must define a loading function in the model to enable load().");
-      }
-    });
+      }).then(function (data) {
+        return applyData(obj, data);
+      })["catch"](function (error) {
+        return _classPrivateMethodGet(_this, _error, _error2).call(_this, error);
+      });
+    } else {
+      return _classPrivateMethodGet(_this, _error, _error2).call(_this, "You must define a loading function in the model to enable load().");
+    }
   });
 
   _defineProperty(this, "addRelation", function (model, param2, param3) {
@@ -216,17 +232,15 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     var filterRelation = _classPrivateFieldGet(_this, _includes)[includedType];
 
     if (filterRelation) {
-      return _this.getStore().find(includedType, function (item) {
-        return filterRelation(parentObject, item);
-      }).then(function (data) {
-        if (filterFunction) {
-          return data.filter(filterFunction);
-        }
-
-        return data;
+      return parentObject.load()["catch"](function () {}).then(function () {
+        return _this.getStore().find(includedType, function (item) {
+          return filterRelation(parentObject, item);
+        }).then(function (data) {
+          return filterFunction ? data.filter(filterFunction) : data;
+        });
       });
     } else {
-      return Promise.reject("The relation doesn't exist");
+      return _classPrivateMethodGet(_this, _error, _error2).call(_this, "The relation doesn't exist");
     }
   });
 
@@ -235,7 +249,15 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   });
 
   _defineProperty(this, "retrieveAll", function () {
-    return (0, _modelHooksUtils.executeHook)("retrieve", _classPrivateFieldGet(_this, _retrieveHook), null, _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+    return (0, _modelHooksUtils.executeHook)("retrieve", _classPrivateFieldGet(_this, _retrieveHook), null, _classPrivateFieldGet(_this, _axios)).then(function (data) {
+      if (Array.isArray(data)) {
+        return data;
+      } else {
+        _classPrivateFieldSet(_this, _singleItemQuery, true);
+
+        return [data];
+      }
+    });
   });
 
   _defineProperty(this, "insertObjects", function (objects) {
@@ -275,9 +297,13 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     writable: true,
     value: function value(objects, action) {
       if (_classPrivateFieldGet(_this, _singleItemQuery)) {
-        return (0, _batchPromises["default"])(_classPrivateFieldGet(_this, _batchSize), objects, action);
+        return (0, _batchPromises["default"])(_classPrivateFieldGet(_this, _batchSize), objects.map(function (i) {
+          return i.toJSON();
+        }), action);
       } else {
-        return action(objects);
+        return action(objects.map(function (i) {
+          return i.toJSON();
+        }));
       }
     }
   });
@@ -288,8 +314,6 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
       if (Array.isArray(data)) {
         return data;
       } else {
-        _classPrivateFieldSet(_this, _singleItemQuery, true);
-
         return [data];
       }
     }
@@ -356,4 +380,10 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
 });
 
-exports["default"] = Model;
+exports["default"] = Model;
+
+function _error2(error) {
+  error = error.message || error;
+  this.getStore().pubSub.publish("error", error);
+  return Promise.reject(error);
+}

package/dist/{StoreObject.js → Obj.js}

@@ -35,7 +35,7 @@ function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) {
 
 var _loaded = /*#__PURE__*/new WeakMap();
 
-var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
+var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
   var _this = this;
 
   _classCallCheck(this, Obj);
@@ -49,16 +49,20 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
     if (_classPrivateFieldGet(_this, _loaded)) {
       return Promise.resolve(_this);
     } else {
-      return _this.getModel().load(_this).then(function () {
+      var model = _this.getModel();
+
+      return model.load(_this).then(function () {
         _classPrivateFieldSet(_this, _loaded, true);
 
+        return model.getStore().update([_this], true); // Propagate update
+      }).then(function () {
         return _this;
-      });
+      }); // return always this
     }
   });
 
   _defineProperty(this, "getFingerprint", function () {
-    return (0, _fingerprint["default"])(_this.toJson());
+    return (0, _fingerprint["default"])(_this.toJSON());
   });
 
   _defineProperty(this, "get", function (attribute) {
@@ -75,8 +79,7 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
     }
 
     _this[attribute] = value;
-
-    _this.getModel().getStore().update([_this]);
+    return _this.getModel().getStore().update([_this]);
   });
 
   _defineProperty(this, "save", function () {
@@ -87,7 +90,7 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
     return _this.getModel().getStore()["delete"]([_this]);
   });
 
-  _defineProperty(this, "toJson", function () {
+  _defineProperty(this, "toJSON", function () {
     var attrs = Object.keys(_this);
     var out = {};
 
@@ -103,11 +106,11 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
   });
 
   _defineProperty(this, "toString", function () {
-    return JSON.stringify(_this.toJson());
+    return JSON.stringify(_this.toJSON());
   });
 
   this.getModel = function () {
-    return model;
+    return _model;
   };
 
   Object.keys(values).forEach(function (key) {

package/dist/ObserverStore.js

@@ -208,8 +208,8 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
   _createClass(ObserverStore, [{
     key: "update",
-    value: function update(objects) {
-      return _get(_getPrototypeOf(ObserverStore.prototype), "update", this).call(this, objects).then(_classPrivateFieldGet(this, _propagateChange));
+    value: function update(objects, skipSave) {
+      return _get(_getPrototypeOf(ObserverStore.prototype), "update", this).call(this, objects, skipSave).then(_classPrivateFieldGet(this, _propagateChange));
     }
   }, {
     key: "insert",

package/dist/PersistentStore.js

@@ -49,11 +49,35 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
 
     _this = _super.call(this, options);
 
+    _defineProperty(_assertThisInitialized(_this), "whenSaved", function (type) {
+      return _this.getDiff(type).then(function (_ref) {
+        var inserted = _ref.inserted,
+            updated = _ref.updated,
+            deleted = _ref.deleted;
+
+        if (inserted.length === 0 && updated.length === 0 && deleted.length === 0) {
+          return true;
+        } else if (_this.options.autoSave) {
+          return _this._saveDiff(type, {
+            inserted: inserted,
+            updated: updated,
+            deleted: deleted
+          });
+        } else {
+          return Promise.reject("Save must be invoked manually");
+        }
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "save", function () {
       _this._busy = true;
 
       _this.pubSub.publish("save", "start");
 
+      if (_this._delayedSaveTimer) {
+        clearTimeout(_this._delayedSaveTimer);
+      }
+
       return Promise.all(Object.keys(_this.models).map(_this._saveByType)).then(function (data) {
         _this._busy = false;
 
@@ -71,33 +95,43 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "_saveDiff", function (type, _ref2) {
+      var inserted = _ref2.inserted,
+          updated = _ref2.updated,
+          deleted = _ref2.deleted;
+      var model = _this.models[type].model; // Operations order:
+      // 1) insert
+      // 2) update
+      // 3) delete
+
+      return model.insertObjects(inserted.map(function (i) {
+        return i.object;
+      })).then(function () {
+        return _this.applyDiff({
+          inserted: inserted
+        }, type);
+      }).then(function () {
+        return model.updateObjects(updated.map(function (i) {
+          return i.object;
+        }));
+      }).then(function () {
+        return _this.applyDiff({
+          updated: updated
+        }, type);
+      }).then(function () {
+        return model.deleteObjects(deleted.map(function (i) {
+          return i.object;
+        }));
+      }).then(function () {
+        return _this.applyDiff({
+          deleted: deleted
+        }, type);
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "_saveByType", function (type) {
-      return _this.getDiff(type).then(function (_ref) {
-        var inserted = _ref.inserted,
-            updated = _ref.updated,
-            deleted = _ref.deleted;
-        var model = _this.models[type].model; // Operations order:
-        // 1) insert
-        // 2) update
-        // 3) delete
-
-        return model.insertObjects(inserted).then(function () {
-          return _this.applyDiff({
-            inserted: inserted
-          }, type);
-        }).then(function () {
-          return model.updateObjects(updated);
-        }).then(function () {
-          return _this.applyDiff({
-            updated: updated
-          }, type);
-        }).then(function () {
-          return model.deleteObjects(deleted);
-        }).then(function () {
-          return _this.applyDiff({
-            deleted: deleted
-          }, type);
-        });
+      return _this.getDiff(type).then(function (diff) {
+        return _this._saveDiff(type, diff);
       });
     });
 
@@ -131,8 +165,7 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       var _this2 = this;
 
       this._busy = true;
-
-      _get(_getPrototypeOf(PersistentStore.prototype), "addModel", this).call(this, model).then(function () {
+      return _get(_getPrototypeOf(PersistentStore.prototype), "addModel", this).call(this, model).then(function () {
         _this2._busy = false;
       });
     }
@@ -160,11 +193,13 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
     }
   }, {
     key: "update",
-    value: function update(objects) {
+    value: function update(objects, skipSave) {
       var _this5 = this;
 
       return _get(_getPrototypeOf(PersistentStore.prototype), "update", this).call(this, objects).then(function (data) {
-        _this5.delayedSave();
+        if (!skipSave) {
+          _this5.delayedSave();
+        }
 
         return data;
       });

package/dist/ReactStore.js

@@ -108,7 +108,7 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
   _createClass(ReactStore, [{
     key: "findAll",
     value: function findAll(type, stateAttribute, context, filterFunction) {
-      _classPrivateMethodGet(this, _fixState, _fixState2).call(this, stateAttribute, context);
+      _classPrivateMethodGet(this, _fixState, _fixState2).call(this, stateAttribute, context, false);
 
       var subKey = this.subscribe(type, function (data) {
         context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data || [])));
@@ -118,7 +118,7 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
   }, {
     key: "findOne",
     value: function findOne(type, stateAttribute, context, filterFunction) {
-      _classPrivateMethodGet(this, _fixState, _fixState2).call(this, stateAttribute, context);
+      _classPrivateMethodGet(this, _fixState, _fixState2).call(this, stateAttribute, context, true);
 
       var subKey = this.subscribe(type, function (data) {
         context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data && data.length ? data[0] : null)));
@@ -132,8 +132,8 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
 
 exports["default"] = ReactStore;
 
-function _fixState2(stateAttribute, context) {
+function _fixState2(stateAttribute, context, one) {
   if (!context[stateAttribute]) {
-    context[stateAttribute] = []; // side effect on state
+    context[stateAttribute] = one ? null : []; // side effect on state
   }
 }

package/dist/Store.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _StoreObject = _interopRequireDefault(require("./StoreObject"));
+var _Obj = _interopRequireDefault(require("./Obj"));
 
 var _PubSub = _interopRequireDefault(require("./PubSub"));
 
@@ -17,21 +17,29 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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 _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, 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 _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
-var _deleteByObject = /*#__PURE__*/new WeakSet();
+var _error = /*#__PURE__*/new WeakSet();
+
+var _deleteByObject = /*#__PURE__*/new WeakMap();
 
 var _deleteByFilter = /*#__PURE__*/new WeakSet();
 
@@ -43,6 +51,8 @@ var _loadObjects = /*#__PURE__*/new WeakSet();
 
 var Store = /*#__PURE__*/function () {
   function Store() {
+    var _this = this;
+
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     _classCallCheck(this, Store);
@@ -55,10 +65,23 @@ var Store = /*#__PURE__*/function () {
 
     _classPrivateMethodInitSpec(this, _deleteByFilter);
 
-    _classPrivateMethodInitSpec(this, _deleteByObject);
+    _classPrivateMethodInitSpec(this, _error);
+
+    _classPrivateFieldInitSpec(this, _deleteByObject, {
+      writable: true,
+      value: function value(object) {
+        var id = object.getId();
+
+        var filterFunction = function filterFunction(item) {
+          return id === item.getId();
+        };
+
+        return _classPrivateMethodGet(_this, _deleteByFilter, _deleteByFilter2).call(_this, object.getModel().getType(), filterFunction);
+      }
+    });
 
     this.options = {
-      autoSave: options.autoSave !== undefined ? options.autoSave : 5000,
+      autoSave: options.autoSave !== undefined ? options.autoSave : true,
       saveDelay: options.saveDelay || 1000,
       lazyLoad: options.lazyLoad || false
     };
@@ -83,65 +106,75 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "addModel",
     value: function addModel(model) {
-      var _this = this;
+      var _this2 = this;
 
       return new Promise(function (resolve, reject) {
-        _this.validateModel(model);
+        _this2.validateModel(model);
 
         var type = model.getType();
 
-        if (!_this.models[type]) {
-          _this.models[type] = {
+        if (!_this2.models[type]) {
+          _this2.models[type] = {
             model: model,
             storedObjects: {}
           };
-          model.setStore(_this);
+          model.setStore(_this2);
 
-          if (!_this.options.lazyLoad) {
-            resolve(_classPrivateMethodGet(_this, _loadObjects, _loadObjects2).call(_this, type));
+          if (!_this2.options.lazyLoad) {
+            resolve(_classPrivateMethodGet(_this2, _loadObjects, _loadObjects2).call(_this2, type));
           } else {
             resolve();
           }
         } else {
-          reject("The model already exists");
+          var error = "The model already exists";
+
+          _this2.pubSub.publish("error", error);
+
+          reject(error);
         }
       });
     }
   }, {
     key: "update",
     value: function update(objects) {
-      return Promise.resolve(); // Nothing to do at this level
+      return Promise.resolve(objects); // Nothing to do at this level
     }
   }, {
     key: "delete",
     value: function _delete(typeOrObjects, filterFunction) {
       if (typeof typeOrObjects === "string" && typeof filterFunction === "function") {
-        return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, typeOrObjects, filterFunction);
-      } else if (_typeof(typeOrObjects) === "object" && typeOrObjects.length) {
-        return Promise.all(typeOrObjects.map(_classPrivateMethodGet(this, _deleteByObject, _deleteByObject2)));
+        var type = typeOrObjects;
+        return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, type, filterFunction);
+      } else if (Array.isArray(typeOrObjects) && typeOrObjects.length && !filterFunction) {
+        var objects = typeOrObjects;
+        return Promise.all(objects.map(_classPrivateFieldGet(this, _deleteByObject))).then(function (data) {
+          return data.flat();
+        });
       } else {
-        return Promise.reject("Invalid delete request. You have to provide a list of objects or a type and a filter function");
+        var error = "Invalid delete request. You have to provide a list of objects or a type and a filter function";
+        this.pubSub.publish("error", error);
+        return Promise.reject(error);
       }
     }
   }, {
     key: "insert",
     value: function insert(type, objects) {
-      var _this2 = this;
+      var _this3 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         return objects.map(function (object) {
-          return _classPrivateMethodGet(_this2, _insertObject, _insertObject2).call(_this2, type, object, true);
+          return _classPrivateMethodGet(_this3, _insertObject, _insertObject2).call(_this3, type, object, true);
         });
       });
     }
   }, {
     key: "get",
     value: function get(type, id) {
-      var _this3 = this;
+      var _this4 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         try {
-          return _this3.models[type].storedObjects[id].object;
+          return _this4.models[type].storedObjects[id].object;
         } catch (error) {
           return Promise.reject("Object not found");
         }
@@ -150,17 +183,17 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "find",
     value: function find(type, filterFunction) {
-      var _this4 = this;
+      var _this5 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-        var all = Object.values(_this4.models[type].storedObjects).filter(function (i) {
+        var all = Object.values(_this5.models[type].storedObjects).filter(function (i) {
           return i.status !== "deleted";
         }).map(function (i) {
           return i.object;
         });
         return filterFunction ? all.filter(filterFunction) : all;
       })["catch"](function (error) {
-        _this4.pubSub.publish("error", error);
+        _this5.pubSub.publish("error", error);
 
         return Promise.reject(error);
       });
@@ -168,7 +201,7 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "applyDiff",
     value: function applyDiff(_ref, type) {
-      var _this5 = this;
+      var _this6 = this;
 
       var _ref$inserted = _ref.inserted,
           inserted = _ref$inserted === void 0 ? [] : _ref$inserted,
@@ -185,7 +218,7 @@ var Store = /*#__PURE__*/function () {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var object = _step.value;
 
-              var item = _this5.models[type || object.object.getModel().getType()].storedObjects[object.id];
+              var item = _this6.models[type || object.object.getModel().getType()].storedObjects[object.id];
 
               item.fingerprint = object.object.getFingerprint();
               item.status = "old";
@@ -202,7 +235,7 @@ var Store = /*#__PURE__*/function () {
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var _object = _step2.value;
-              delete _this5.models[type || _object.object.getModel().getType()].storedObjects[_object.id];
+              delete _this6.models[type || _object.object.getModel().getType()].storedObjects[_object.id];
             }
           } catch (err) {
             _iterator2.e(err);
@@ -216,13 +249,19 @@ var Store = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "hasChanged",
+    value: function hasChanged(type, object) {
+      var obj = this.models[type].storedObjects[object.getId()];
+      return obj.fingerprint !== obj.object.getFingerprint();
+    }
   }, {
     key: "getDiff",
     value: function getDiff(type) {
-      var _this6 = this;
+      var _this7 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-        var objects = Object.values(_this6.models[type].storedObjects);
+        var objects = Object.values(_this7.models[type].storedObjects);
         var inserted = [];
         var updated = [];
         var deleted = [];
@@ -234,7 +273,7 @@ var Store = /*#__PURE__*/function () {
             inserted.push(object);
           } else if (object.status === "deleted") {
             deleted.push(object);
-          } else if (object.fingerprint !== object.object.getFingerprint()) {
+          } else if (_this7.hasChanged(type, object.object)) {
             updated.push(object);
           }
         }
@@ -253,17 +292,17 @@ var Store = /*#__PURE__*/function () {
 
 exports["default"] = Store;
 
-function _deleteByObject2(object) {
-  return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, object.getType(), function (item) {
-    return object.getId() === item.getId();
-  });
+function _error2(error) {
+  error = error.message || error;
+  this.pubSub.publish("error", error);
+  return Promise.reject(error);
 }
 
 function _deleteByFilter2(type, filterFunction) {
-  var _this7 = this;
+  var _this8 = this;
 
   return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-    var deleted = Object.values(_this7.models[type].storedObjects).filter(function (i) {
+    var deleted = Object.values(_this8.models[type].storedObjects).filter(function (i) {
       return filterFunction(i.object);
     });
 
@@ -281,12 +320,14 @@ function _deleteByFilter2(type, filterFunction) {
       _iterator3.f();
     }
 
-    return true;
+    return deleted.map(function (i) {
+      return i.object;
+    });
   });
 }
 
 function _getPromise2(type) {
-  var _this8 = this;
+  var _this9 = this;
 
   if (!this.models[type]) {
     return Promise.reject("The model doesn't exist");
@@ -294,7 +335,7 @@ function _getPromise2(type) {
     return Promise.reject("The model is not loaded");
   } else if (!this.models[type].promise && this.options.lazyLoad) {
     return _classPrivateMethodGet(this, _loadObjects, _loadObjects2).call(this, type).then(function () {
-      return _this8.models[type].promise;
+      return _this9.models[type].promise;
     });
   } else {
     return this.models[type].promise;
@@ -304,7 +345,7 @@ function _getPromise2(type) {
 function _insertObject2(type, item) {
   var markAsNew = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var model = this.models[type].model;
-  var wrapper = new _StoreObject["default"](item, model);
+  var wrapper = new _Obj["default"](item, model);
   var id = wrapper.getId();
 
   if (this.models[type].storedObjects[id]) {
@@ -321,7 +362,7 @@ function _insertObject2(type, item) {
 }
 
 function _loadObjects2(type) {
-  var _this9 = this;
+  var _this10 = this;
 
   var item = this.models[type];
   this.pubSub.publish("loading", {
@@ -336,7 +377,7 @@ function _loadObjects2(type) {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var _item = _step4.value;
 
-        _classPrivateMethodGet(_this9, _insertObject, _insertObject2).call(_this9, type, _item, false);
+        _classPrivateMethodGet(_this10, _insertObject, _insertObject2).call(_this10, type, _item, false);
       }
     } catch (err) {
       _iterator4.e(err);
@@ -344,7 +385,7 @@ function _loadObjects2(type) {
       _iterator4.f();
     }
 
-    _this9.pubSub.publish("loading", {
+    _this10.pubSub.publish("loading", {
       status: "end",
       model: type
     });

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "dataflux",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "DataFlux, automatically interfaces with your REST APIs to create a 2-way-synced local data store. Transparently manages data propagation in the React state.",
   "main": "dist/index.js",
   "bin": "dist/index.js",
   "scripts": {
     "babel": "node_modules/.bin/babel",
-    "test": "./node_modules/.bin/mocha tests --require @babel/register",
+    "test": "./node_modules/.bin/mocha tests/*.test.js --require @babel/register --exit",
     "compile": "rm -rf dist/ && ./node_modules/.bin/babel src -d dist",
     "release": "dotenv release-it"
   },
@@ -86,7 +86,10 @@
     "@babel/plugin-transform-runtime": "^7.16.10",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
+    "chai": "^4.3.4",
+    "chai-subset": "^1.6.0",
     "dotenv-cli": "^4.1.1",
+    "mocha": "^9.1.4",
     "release-it": "^14.12.3"
   },
   "dependencies": {