dataflux 1.17.5 → 1.17.7

package/dist/Obj.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _fingerprint = _interopRequireDefault(require("./fingerprint"));
+var _objectFingerprint = _interopRequireDefault(require("object-fingerprint"));
 var _BasicObj2 = require("./BasicObj");
 var _SubObj = _interopRequireDefault(require("./SubObj"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -85,7 +85,7 @@ var Obj = exports["default"] = /*#__PURE__*/function (_BasicObj) {
       }
     });
     _defineProperty(_this, "getFingerprint", function () {
-      return (0, _fingerprint["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

@@ -128,9 +128,12 @@ var Store = exports["default"] = /*#__PURE__*/function () {
               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 +142,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());
@@ -475,7 +478,9 @@ 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";
+        }).map(function (i) {
           return i.object;
         }).sort(function (a, b) {
           return a.getId().localeCompare(b.getId());