dataflux 1.9.0 → 1.9.3

package/dist/ObserverStore.js

@@ -83,6 +83,8 @@ var _propagateChange = /*#__PURE__*/new WeakMap();
 
 var _subscribeToObjects = /*#__PURE__*/new WeakMap();
 
+var _merge = /*#__PURE__*/new WeakMap();
+
 var _propagateInsertChange = /*#__PURE__*/new WeakSet();
 
 var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
@@ -288,8 +290,56 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       }
     });
 
+    _defineProperty(_assertThisInitialized(_this), "refresh", function (type) {
+      var refreshByType = function refreshByType(type) {
+        _this.pubSub.publish("refresh", {
+          status: "start",
+          model: type
+        });
+
+        return _this.refreshObjectByType(type).then(function (_ref4) {
+          var _ref5 = _slicedToArray(_ref4, 3),
+              inserted = _ref5[0],
+              updated = _ref5[1],
+              deleted = _ref5[2];
+
+          var item = _this.models[type];
+          return Promise.all([_classPrivateMethodGet(_assertThisInitialized(_this), _propagateInsertChange, _propagateInsertChange2).call(_assertThisInitialized(_this), type, inserted), _classPrivateFieldGet(_assertThisInitialized(_this), _propagateChange).call(_assertThisInitialized(_this), updated), _classPrivateFieldGet(_assertThisInitialized(_this), _propagateChange).call(_assertThisInitialized(_this), deleted)]).then(function () {
+            _this.pubSub.publish("refresh", {
+              status: "end",
+              model: type
+            });
+
+            return item.promise;
+          });
+        });
+      };
+
+      if (type) {
+        return refreshByType(type);
+      } else {
+        return Promise.all(Object.keys(_this.models).map(refreshByType));
+      }
+    });
+
+    _classPrivateFieldInitSpec(_assertThisInitialized(_this), _merge, {
+      writable: true,
+      value: function value(originalObject, newObject) {
+        for (var key in newObject) {
+          originalObject[key] = newObject[key];
+        }
+
+        originalObject.update();
+      }
+    });
+
     _this._subscribed = {};
     _this._multipleSubscribed = {};
+
+    if (options.autoRefresh && typeof options.autoRefresh === "number") {
+      setInterval(_this.refresh, options.autoRefresh);
+    }
+
     return _this;
   }
 
@@ -362,9 +412,9 @@ function _propagateInsertChange2(type, newObjects) {
       }
 
       var possibleSubs = Object.values(uniqueSubs);
-      (0, _batchPromises["default"])(10, possibleSubs, function (_ref4) {
-        var callback = _ref4.callback,
-            filterFunction = _ref4.filterFunction;
+      (0, _batchPromises["default"])(10, possibleSubs, function (_ref6) {
+        var callback = _ref6.callback,
+            filterFunction = _ref6.filterFunction;
         var objectsToSubscribe = filterFunction ? newObjects.filter(filterFunction) : newObjects;
 
         if (objectsToSubscribe.length) {

package/dist/PersistentStore.js

@@ -152,17 +152,33 @@ 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) {
+            if (_this._delayedSavePromise) {
+              _this._delayedSavePromise();
 
-        _this._delayedSaveTimer = setTimeout(_this.save, _this.options.saveDelay);
-      }
+              _this._delayedSavePromise = null;
+            }
+
+            clearTimeout(_this._delayedSaveTimer);
+            _this._delayedSaveTimer = null;
+          }
+
+          _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 () {
@@ -191,9 +207,9 @@ 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;
+        });
       });
     }
   }, {
@@ -207,9 +223,9 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       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;
+        });
       });
     }
   }, {
@@ -233,11 +249,13 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
           } finally {
             _iterator.f();
           }
+
+          return objects;
         } else {
-          _this5.delayedSave();
+          return _this5.delayedSave().then(function () {
+            return objects;
+          });
         }
-
-        return objects;
       });
     }
   }]);

package/dist/Store.js

@@ -43,8 +43,6 @@ function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(
 
 var objectStatuses = ["new", "old", "mock", "deleted"];
 
-var _refreshObjectByType = /*#__PURE__*/new WeakMap();
-
 var _merge = /*#__PURE__*/new WeakMap();
 
 var _error = /*#__PURE__*/new WeakSet();
@@ -55,7 +53,7 @@ var _deleteByFilter = /*#__PURE__*/new WeakSet();
 
 var _getPromise = /*#__PURE__*/new WeakSet();
 
-var _insertObject = /*#__PURE__*/new WeakSet();
+var _insertObject = /*#__PURE__*/new WeakMap();
 
 var _loadObjects = /*#__PURE__*/new WeakSet();
 
@@ -71,8 +69,6 @@ var Store = /*#__PURE__*/function () {
 
     _classPrivateMethodInitSpec(this, _loadObjects);
 
-    _classPrivateMethodInitSpec(this, _insertObject);
-
     _classPrivateMethodInitSpec(this, _getPromise);
 
     _classPrivateMethodInitSpec(this, _deleteByFilter);
@@ -83,80 +79,80 @@ var Store = /*#__PURE__*/function () {
       return Object.keys(_this.models);
     });
 
-    _defineProperty(this, "refresh", function (type) {
-      if (type) {
-        return _classPrivateFieldGet(_this, _refreshObjectByType).call(_this, type);
-      } else {
-        return Promise.all(Object.keys(_this.models).map(_classPrivateFieldGet(_this, _refreshObjectByType)));
-      }
-    });
+    _defineProperty(this, "refreshObjectByType", function (type) {
+      return _classPrivateMethodGet(_this, _getPromise, _getPromise2).call(_this, type).then(function () {
+        var item = _this.models[type];
+        var inserted = [];
+        var deleted = [];
+        var updated = [];
+        item.promise = item.model.retrieveAll()["catch"](function () {
+          var objects = Object.values(_this.models[type].storedObjects);
+          var list = [];
+          return (0, _batchPromises["default"])(4, objects, function (object) {
+            return item.model.factory(object.object).then(function (items) {
+              list = list.concat(items);
+            });
+          }).then(function () {
+            return list;
+          });
+        }).then(function (objects) {
+          var _iterator = _createForOfIteratorHelper(objects),
+              _step;
 
-    _classPrivateFieldInitSpec(this, _refreshObjectByType, {
-      writable: true,
-      value: function value(type) {
-        return _classPrivateMethodGet(_this, _getPromise, _getPromise2).call(_this, type).then(function () {
-          var item = _this.models[type];
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var object = _step.value;
+              var wrapper = new _Obj["default"](object, item.model);
 
-          _this.pubSub.publish("refresh", {
-            status: "start",
-            model: type
-          });
+              var _id = wrapper.getId();
 
-          item.promise = item.model.retrieveAll()["catch"](function () {
-            var objects = Object.values(_this.models[type].storedObjects);
-            var list = [];
-            return (0, _batchPromises["default"])(4, objects, function (object) {
-              return item.model.factory(object.object).then(function (items) {
-                list = list.concat(items);
-              });
-            }).then(function () {
-              return list;
-            });
-          }).then(function (objects) {
-            var _iterator = _createForOfIteratorHelper(objects),
-                _step;
-
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                var object = _step.value;
-                var wrapper = new _Obj["default"](object, item.model);
-                var id = wrapper.getId();
-                var currentObject = item === null || item === void 0 ? void 0 : item.storedObjects[id]; // console.log("currentObject", item);
-
-                if (currentObject) {
-                  var newFingerprint = wrapper.getFingerprint();
-                  var oldFingerprint = currentObject.fingerprint;
-
-                  if (oldFingerprint !== newFingerprint) {
-                    // Nothing to do otherwise
-                    if (_this.hasChanged(type, currentObject.object)) {// Was the object edited locally?
-                      // Nothing for now
-                    } else {
-                      // Update with the new object
-                      // console.log("merge", wrapper);
-                      _classPrivateFieldGet(_this, _merge).call(_this, _this.models[type].storedObjects[id].object, wrapper.toJSON());
-
-                      _this.models[type].storedObjects[id].fingerprint = newFingerprint;
-                    }
+              var currentObject = item === null || item === void 0 ? void 0 : item.storedObjects[_id];
+
+              if (currentObject) {
+                currentObject.deleted = false;
+                var newFingerprint = wrapper.getFingerprint();
+                var oldFingerprint = currentObject.fingerprint;
+
+                if (oldFingerprint !== newFingerprint) {
+                  // Nothing to do otherwise
+                  if (_this.hasChanged(type, currentObject.object)) {// Was the object edited locally?
+                    // Nothing for now
+                  } else {
+                    // Update with the new object
+                    _classPrivateFieldGet(_this, _merge).call(_this, currentObject.object, wrapper.toJSON());
+
+                    currentObject.fingerprint = newFingerprint;
+                    updated.push(currentObject.object);
                   }
-                } else {
-                  _classPrivateMethodGet(_this, _insertObject, _insertObject2).call(_this, type, object, "old");
                 }
+              } else {
+                var newObject = _classPrivateFieldGet(_this, _insertObject).call(_this, type, object, "old");
+
+                item.storedObjects[newObject.getId()].deleted = false;
+                inserted.push(newObject);
               }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
             }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
 
-            _this.pubSub.publish("refresh", {
-              status: "end",
-              model: type
-            });
-          });
-          return item.promise;
+          for (var id in item === null || item === void 0 ? void 0 : item.storedObjects) {
+            var obj = item.storedObjects[id];
+
+            if (obj.deleted === undefined) {
+              deleted.push(obj.object);
+              delete item.storedObjects[id];
+            } else {
+              delete obj.deleted;
+            }
+          }
+
+          return [inserted, updated, deleted];
         });
-      }
+        return item.promise;
+      });
     });
 
     _classPrivateFieldInitSpec(this, _merge, {
@@ -164,9 +160,8 @@ var Store = /*#__PURE__*/function () {
       value: function value(originalObject, newObject) {
         for (var key in newObject) {
           originalObject[key] = newObject[key];
-        }
+        } // originalObject.update();
 
-        originalObject.update();
       }
     });
 
@@ -183,6 +178,41 @@ var Store = /*#__PURE__*/function () {
       }
     });
 
+    _classPrivateFieldInitSpec(this, _insertObject, {
+      writable: true,
+      value: function value(type, item, status) {
+        var model = _this.models[type].model;
+        var wrapper = new _Obj["default"](item, model);
+        var id = wrapper.getId();
+
+        if (_this.models[type].storedObjects[id]) {
+          throw new Error("The IDs provided for the model ".concat(type, " are not unique"));
+        }
+
+        if (!objectStatuses.includes(status)) {
+          throw new Error("The provided status is not valid");
+        }
+
+        if (status === "mock") {
+          wrapper.insert = function () {
+            _this.models[type].storedObjects[id].status = "new";
+
+            _this.update([wrapper]);
+
+            delete wrapper.insert;
+          };
+        }
+
+        _this.models[type].storedObjects[id] = {
+          id: id,
+          fingerprint: wrapper.getFingerprint(),
+          object: wrapper,
+          status: status
+        };
+        return wrapper;
+      }
+    });
+
     this.options = {
       autoSave: (_options$autoSave = options.autoSave) !== null && _options$autoSave !== void 0 ? _options$autoSave : true,
       saveDelay: options.saveDelay || 1000,
@@ -191,10 +221,6 @@ var Store = /*#__PURE__*/function () {
     };
     this.models = {};
     this.pubSub = new _PubSub["default"]();
-
-    if (this.options.autoRefresh && typeof this.options.autoRefresh === "number") {
-      setInterval(this.refresh, this.options.autoRefresh);
-    }
   }
 
   _createClass(Store, [{
@@ -274,7 +300,7 @@ var Store = /*#__PURE__*/function () {
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         return objects.map(function (object) {
-          return _classPrivateMethodGet(_this3, _insertObject, _insertObject2).call(_this3, type, object, "new");
+          return _classPrivateFieldGet(_this3, _insertObject).call(_this3, type, object, "new");
         });
       });
     }
@@ -285,7 +311,7 @@ var Store = /*#__PURE__*/function () {
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         return objects.map(function (object) {
-          return _classPrivateMethodGet(_this4, _insertObject, _insertObject2).call(_this4, type, object, "mock");
+          return _classPrivateFieldGet(_this4, _insertObject).call(_this4, type, object, "mock");
         });
       });
     }
@@ -438,7 +464,7 @@ var Store = /*#__PURE__*/function () {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var _item = _step4.value;
 
-            _classPrivateMethodGet(_this9, _insertObject, _insertObject2).call(_this9, type, _item, "old");
+            _classPrivateFieldGet(_this9, _insertObject).call(_this9, type, _item, "old");
           }
         } catch (err) {
           _iterator4.e(err);
@@ -510,42 +536,8 @@ function _getPromise2(type) {
   }
 }
 
-function _insertObject2(type, item, status) {
-  var _this12 = this;
-
-  var model = this.models[type].model;
-  var wrapper = new _Obj["default"](item, model);
-  var id = wrapper.getId();
-
-  if (this.models[type].storedObjects[id]) {
-    throw new Error("The IDs provided for the model ".concat(type, " are not unique"));
-  }
-
-  if (!objectStatuses.includes(status)) {
-    throw new Error("The provided status is not valid");
-  }
-
-  if (status === "mock") {
-    wrapper.insert = function () {
-      _this12.models[type].storedObjects[id].status = "new";
-
-      _this12.update([wrapper]);
-
-      delete wrapper.insert;
-    };
-  }
-
-  this.models[type].storedObjects[id] = {
-    id: id,
-    fingerprint: wrapper.getFingerprint(),
-    object: wrapper,
-    status: status
-  };
-  return wrapper;
-}
-
 function _loadObjects2(type) {
-  var _this13 = this;
+  var _this12 = this;
 
   var item = this.models[type];
   this.pubSub.publish("loading", {
@@ -560,7 +552,7 @@ function _loadObjects2(type) {
       for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
         var _item2 = _step6.value;
 
-        _classPrivateMethodGet(_this13, _insertObject, _insertObject2).call(_this13, type, _item2, "old");
+        _classPrivateFieldGet(_this12, _insertObject).call(_this12, type, _item2, "old");
       }
     } catch (err) {
       _iterator6.e(err);
@@ -568,7 +560,7 @@ function _loadObjects2(type) {
       _iterator6.f();
     }
 
-    _this13.pubSub.publish("loading", {
+    _this12.pubSub.publish("loading", {
       status: "end",
       model: type
     });