dataflux 1.17.6 → 1.17.8

package/dist/Obj.js

@@ -85,7 +85,7 @@ var Obj = exports["default"] = /*#__PURE__*/function (_BasicObj) {
       }
     });
     _defineProperty(_this, "getFingerprint", function () {
-      return (0, _objectFingerprint["default"])(_this.toJSON());
+      return (0, _objectFingerprint["default"])(_this.toJSON()).toString();
     });
     _defineProperty(_this, "getRelation", function (type, filterFunction) {
       return _this.getModel().getRelation(_this, type, filterFunction);

package/dist/PersistentStore.js

@@ -72,14 +72,19 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
       });
     });
     _defineProperty(_this, "save", function () {
+      return _this._save(true);
+    });
+    _defineProperty(_this, "_save", function () {
+      var force = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       _this._busy = true;
       _this.pubSub.publish("save", "start");
       if (_this._delayedSaveTimer) {
         clearTimeout(_this._delayedSaveTimer);
       }
       return Promise.all(Object.keys(_this.models).filter(function (m) {
-        return _this.models[m].model.options.autoSave !== false;
-      }).map(function (i) {
+        return _this.models[m].model.options.autoSave !== false || force;
+      }) // explicit false check (null = true)
+      .map(function (i) {
         return _this._saveByType(i, true);
       })).then(function (data) {
         _this._busy = false;
@@ -155,7 +160,7 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
           }
           _this._delayedSavePromise = resolve;
           _this._delayedSaveTimer = setTimeout(function () {
-            resolve(_this.save());
+            resolve(_this._save(false));
             _this._delayedSavePromise = null;
           }, _this.options.saveDelay);
         } else {

package/dist/Store.js

@@ -80,19 +80,30 @@ var Store = exports["default"] = /*#__PURE__*/function () {
       }
     });
     _defineProperty(this, "_getDiffSync", function (type) {
-      var objects = Object.values(_this.models[type].storedObjects);
+      var objects = Object.values(_this.models[type].storedObjects).filter(function (i) {
+        var _i$object;
+        return !((_i$object = i.object) !== null && _i$object !== void 0 && _i$object.isMock());
+      });
       var inserted = [];
       var updated = [];
       var deleted = [];
-      for (var _i = 0, _objects = objects; _i < _objects.length; _i++) {
-        var object = _objects[_i];
-        if (object.status === "new") {
-          inserted.push(object);
-        } else if (object.status === "deleted") {
-          deleted.push(object);
-        } else if (object.status === "old" && _this.hasChanged(type, object.object)) {
-          updated.push(object);
-        } // Nothing for mock objects
+      var _iterator = _createForOfIteratorHelper(objects),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var object = _step.value;
+          if (object.status === "new") {
+            inserted.push(object);
+          } else if (object.status === "deleted") {
+            deleted.push(object);
+          } else if (object.status === "old" && _this.hasChanged(type, object.object)) {
+            updated.push(object);
+          } // Nothing for mock objects
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
       return {
         inserted: inserted,
@@ -118,19 +129,22 @@ var Store = exports["default"] = /*#__PURE__*/function () {
             return list;
           });
         }).then(function (objects) {
-          var _iterator = _createForOfIteratorHelper(objects),
-            _step;
+          var _iterator2 = _createForOfIteratorHelper(objects),
+            _step2;
           try {
-            for (_iterator.s(); !(_step = _iterator.n()).done;) {
-              var object = _step.value;
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var object = _step2.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];
               if (currentObject) {
                 currentObject.deleted = false;
+                if (currentObject.status === "deleted") {
+                  currentObject.status = "old";
+                }
                 var newFingerprint = wrapper.getFingerprint();
                 var oldFingerprint = currentObject.fingerprint;
-                if (oldFingerprint !== newFingerprint) {
+                if (oldFingerprint !== newFingerprint || force) {
                   // Nothing to do otherwise
                   if (force) {
                     _classPrivateFieldGet(_wipe, _this).call(_this, currentObject.object);
@@ -139,7 +153,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
                     updated.push(currentObject.object);
                   } else if (_this.hasChanged(type, currentObject.object)) {// Was the object edited locally?
 
-                    // Nothing for now
+                    // Nothing
                   } else {
                     // Update with the new object
                     _classPrivateFieldGet(_merge, _this).call(_this, currentObject.object, wrapper.toJSON());
@@ -154,9 +168,9 @@ var Store = exports["default"] = /*#__PURE__*/function () {
               }
             }
           } catch (err) {
-            _iterator.e(err);
+            _iterator2.e(err);
           } finally {
-            _iterator.f();
+            _iterator2.f();
           }
           for (var id in item === null || item === void 0 ? void 0 : item.storedObjects) {
             var obj = item.storedObjects[id];
@@ -348,11 +362,11 @@ var Store = exports["default"] = /*#__PURE__*/function () {
         deleted = _ref$deleted === void 0 ? [] : _ref$deleted;
       return new Promise(function (resolve, reject) {
         try {
-          var _iterator2 = _createForOfIteratorHelper(inserted.concat(updated)),
-            _step2;
+          var _iterator3 = _createForOfIteratorHelper(inserted.concat(updated)),
+            _step3;
           try {
-            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-              var object = _step2.value;
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var object = _step3.value;
               type = type || object.object.getModel().getType();
               var newId = object.object.getId();
               var oldId = object.id;
@@ -365,21 +379,21 @@ var Store = exports["default"] = /*#__PURE__*/function () {
               item.status = "old";
             }
           } catch (err) {
-            _iterator2.e(err);
+            _iterator3.e(err);
           } finally {
-            _iterator2.f();
+            _iterator3.f();
           }
-          var _iterator3 = _createForOfIteratorHelper(deleted),
-            _step3;
+          var _iterator4 = _createForOfIteratorHelper(deleted),
+            _step4;
           try {
-            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-              var _object = _step3.value;
+            for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+              var _object = _step4.value;
               delete _this7.models[type || _object.object.getModel().getType()].storedObjects[_object.id];
             }
           } catch (err) {
-            _iterator3.e(err);
+            _iterator4.e(err);
           } finally {
-            _iterator3.f();
+            _iterator4.f();
           }
           resolve();
         } catch (error) {
@@ -432,17 +446,17 @@ var Store = exports["default"] = /*#__PURE__*/function () {
         model: type
       });
       item.promise = item.model.factory(params).then(function (items) {
-        var _iterator4 = _createForOfIteratorHelper(items),
-          _step4;
+        var _iterator5 = _createForOfIteratorHelper(items),
+          _step5;
         try {
-          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _item = _step4.value;
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var _item = _step5.value;
             _classPrivateFieldGet(_insertObject, _this10).call(_this10, type, _item, "old");
           }
         } catch (err) {
-          _iterator4.e(err);
+          _iterator5.e(err);
         } finally {
-          _iterator4.f();
+          _iterator5.f();
         }
         _this10.pubSub.publish("loading", {
           status: "end",
@@ -475,7 +489,11 @@ var Store = exports["default"] = /*#__PURE__*/function () {
     value: function getCollection(type) {
       var _this12 = this;
       return this._getPromise(type).then(function () {
-        return Object.values(_this12.models[type].storedObjects).map(function (i) {
+        return Object.values(_this12.models[type].storedObjects).filter(function (i) {
+          return i.status !== "deleted";
+        }).filter(function (i) {
+          return i.status !== "mock";
+        }).map(function (i) {
           return i.object;
         }).sort(function (a, b) {
           return a.getId().localeCompare(b.getId());
@@ -497,17 +515,17 @@ function _deleteByFilter(type, filterFunction) {
     var deleted = Object.values(_this13.models[type].storedObjects).filter(function (i) {
       return filterFunction(i.object);
     });
-    var _iterator5 = _createForOfIteratorHelper(deleted),
-      _step5;
+    var _iterator6 = _createForOfIteratorHelper(deleted),
+      _step6;
     try {
-      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-        var object = _step5.value;
+      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+        var object = _step6.value;
         object.status = "deleted";
       }
     } catch (err) {
-      _iterator5.e(err);
+      _iterator6.e(err);
     } finally {
-      _iterator5.f();
+      _iterator6.f();
     }
     return deleted.map(function (i) {
       return i.object;
@@ -522,17 +540,17 @@ function _loadObjects(type) {
     model: type
   });
   item.promise = item.model.retrieveAll().then(function (items) {
-    var _iterator6 = _createForOfIteratorHelper(items),
-      _step6;
+    var _iterator7 = _createForOfIteratorHelper(items),
+      _step7;
     try {
-      for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-        var _item2 = _step6.value;
+      for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+        var _item2 = _step7.value;
         _classPrivateFieldGet(_insertObject, _this14).call(_this14, type, _item2, "old");
       }
     } catch (err) {
-      _iterator6.e(err);
+      _iterator7.e(err);
     } finally {
-      _iterator6.f();
+      _iterator7.f();
     }
     _this14.pubSub.publish("loading", {
       status: "end",