dataflux 1.7.5 → 1.9.1

package/dist/ObserverStore.js

@@ -111,6 +111,7 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
     _defineProperty(_assertThisInitialized(_this), "multipleSubscribe", function (subscriptions, callback) {
       var dataPayload = {};
+      var subKey = (0, _uuid.v4)();
 
       var areAllDone = function areAllDone() {
         return subscriptions.map(function (_ref) {
@@ -123,7 +124,7 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
         });
       };
 
-      return Promise.all(subscriptions.map(function (sub) {
+      Promise.all(subscriptions.map(function (sub) {
         var _sub = _slicedToArray(sub, 2),
             name = _sub[0],
             _sub$ = _sub[1],
@@ -136,10 +137,10 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
         return _this.subscribe(name, wrappedCallback, filterFunction);
       })).then(function (subKeys) {
-        var subKey = (0, _uuid.v4)();
         _this._multipleSubscribed[subKey] = subKeys;
         return subKey;
       });
+      return subKey;
     });
 
     _defineProperty(_assertThisInitialized(_this), "subscribe", function (type, callback, filterFunction) {
@@ -310,6 +311,18 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       });
     }
   }, {
+    key: "mock",
+    value: function mock(type, objects) {
+      var _this3 = this;
+
+      objects = Array.isArray(objects) ? objects : [objects];
+      return _get(_getPrototypeOf(ObserverStore.prototype), "mock", this).call(this, type, objects).then(function (objects) {
+        _classPrivateMethodGet(_this3, _propagateInsertChange, _propagateInsertChange2).call(_this3, type, objects);
+
+        return objects;
+      });
+    }
+  }, {
     key: "delete",
     value: function _delete(typeOrObjects, filterFunction) {
       return _get(_getPrototypeOf(ObserverStore.prototype), "delete", this).call(this, typeOrObjects, filterFunction).then(_classPrivateFieldGet(this, _propagateChange));
@@ -320,12 +333,12 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 }(_PersistentStore2["default"]);
 
 function _propagateInsertChange2(type, newObjects) {
-  var _this3 = this;
+  var _this4 = this;
 
   return (_classPrivateFieldGet(this, _unsubPromises).length ? Promise.all(_classPrivateFieldGet(this, _unsubPromises)) : Promise.resolve()).then(function () {
-    if (_this3._subscribed[type]) {
+    if (_this4._subscribed[type]) {
       var uniqueSubs = {};
-      var objects = Object.values(_this3._subscribed[type]);
+      var objects = Object.values(_this4._subscribed[type]);
 
       for (var _i2 = 0, _objects = objects; _i2 < _objects.length; _i2++) {
         var object = _objects[_i2];
@@ -356,7 +369,7 @@ function _propagateInsertChange2(type, newObjects) {
 
         if (objectsToSubscribe.length) {
           // Check if the new objects matter
-          return _this3.find(type, filterFunction).then(function (data) {
+          return _this4.find(type, filterFunction).then(function (data) {
             var subKey;
 
             var _iterator6 = _createForOfIteratorHelper(data),
@@ -366,7 +379,7 @@ function _propagateInsertChange2(type, newObjects) {
               for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
                 var d = _step6.value;
 
-                var item = _this3._subscribed[d.getModel().getType()][d.getId()];
+                var item = _this4._subscribed[d.getModel().getType()][d.getId()];
 
                 subKey = item ? item.subKey : null;
                 if (subKey) break;
@@ -377,7 +390,7 @@ function _propagateInsertChange2(type, newObjects) {
               _iterator6.f();
             }
 
-            _classPrivateFieldGet(_this3, _subscribeToObjects).call(_this3, type, objectsToSubscribe, {
+            _classPrivateFieldGet(_this4, _subscribeToObjects).call(_this4, type, objectsToSubscribe, {
               callback: callback,
               filterFunction: filterFunction,
               subKey: subKey

package/dist/PersistentStore.js

@@ -105,32 +105,42 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       var inserted = _ref2.inserted,
           updated = _ref2.updated,
           deleted = _ref2.deleted;
-      var model = _this.models[type].model; // Operations order:
+      var model = _this.models[type].model; // Validate objects
+
+      var correctInserted = inserted.filter(function (object) {
+        return model.isObjectValid(object.object);
+      });
+      var correctUpdated = updated.filter(function (object) {
+        return model.isObjectValid(object.object);
+      });
+      var correctDeleted = deleted.filter(function (object) {
+        return model.isObjectValid(object.object);
+      }); // Operations order:
       // 1) insert
       // 2) update
       // 3) delete
 
-      return model.insertObjects(inserted.map(function (i) {
+      return model.insertObjects(correctInserted.map(function (i) {
         return i.object;
       })).then(function () {
         return _this.applyDiff({
-          inserted: inserted
+          inserted: correctInserted
         }, type);
       }).then(function () {
-        return model.updateObjects(updated.map(function (i) {
+        return model.updateObjects(correctUpdated.map(function (i) {
           return i.object;
         }));
       }).then(function () {
         return _this.applyDiff({
-          updated: updated
+          updated: correctUpdated
         }, type);
       }).then(function () {
-        return model.deleteObjects(deleted.map(function (i) {
+        return model.deleteObjects(correctDeleted.map(function (i) {
           return i.object;
         }));
       }).then(function () {
         return _this.applyDiff({
-          deleted: deleted
+          deleted: correctDeleted
         }, type);
       });
     });
@@ -142,17 +152,29 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "delayedSave", function () {
-      if (_this.options.autoSave) {
-        if (_this._delayedSaveTimer) {
-          clearTimeout(_this._delayedSaveTimer);
-        }
+      return new Promise(function (resolve, reject) {
+        if (_this.options.autoSave) {
+          if (_this._delayedSaveTimer) {
+            _this._delayedSavePromise();
 
-        _this._delayedSaveTimer = setTimeout(_this.save, _this.options.saveDelay);
-      }
+            _this._delayedSavePromise = null;
+            clearTimeout(_this._delayedSaveTimer);
+          }
+
+          _this._delayedSavePromise = resolve;
+          _this._delayedSaveTimer = setTimeout(function () {
+            resolve(_this.save());
+            _this._delayedSavePromise = null;
+          }, _this.options.saveDelay);
+        } else {
+          resolve();
+        }
+      });
     });
 
     _this._busy = false;
     _this._delayedSaveTimer = null;
+    _this._delayedSavePromise = null;
 
     if (typeof _this.options.autoSave === "number") {
       setInterval(function () {
@@ -181,20 +203,25 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       var _this3 = this;
 
       return _get(_getPrototypeOf(PersistentStore.prototype), "insert", this).call(this, type, objects).then(function (data) {
-        _this3.delayedSave();
-
-        return data;
+        return _this3.delayedSave().then(function () {
+          return data;
+        });
       });
     }
+  }, {
+    key: "mock",
+    value: function mock(type, objects) {
+      return _get(_getPrototypeOf(PersistentStore.prototype), "mock", this).call(this, type, objects);
+    }
   }, {
     key: "delete",
     value: function _delete(typeOrObjects, filterFunction) {
       var _this4 = this;
 
       return _get(_getPrototypeOf(PersistentStore.prototype), "delete", this).call(this, typeOrObjects, filterFunction).then(function (data) {
-        _this4.delayedSave();
-
-        return data;
+        return _this4.delayedSave().then(function () {
+          return data;
+        });
       });
     }
   }, {
@@ -218,11 +245,13 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
           } finally {
             _iterator.f();
           }
+
+          return objects;
         } else {
-          _this5.delayedSave();
+          return _this5.delayedSave().then(function () {
+            return objects;
+          });
         }
-
-        return objects;
       });
     }
   }]);