dataflux 1.24.2 → 1.24.4

package/README.md

@@ -713,7 +713,7 @@ Each object created is enriched with the following methods.
 | isDataflux()                       | This method returns true for all dataflux objects.                                                                                                                                                                                                                                                                                                                  |
 | isMock()                           | This method returns true if the object is a mock and was never inserted in the store.                                                                                                                                                                                                                                                                               |
 | isPersisted()                      | This method returns true if the object has been persisted to the server at least once. This does not mean that the server’s copy is up to date with the client’s copy.                                                                                                                                                                                              |
-
+| hasChanged()                       | This method returns true if the object has changed since the last sync with the server.                                                                                                                                                                                                                                                                             |
 ### Deep Objects
 When a model is declared with the option `deep: true` (default, see [model creation](#models-creation)), all the sub objects will also offer many of the methods above.
 

package/dist/BasicObj.js

@@ -173,6 +173,9 @@ var BasicObj = exports.BasicObj = /*#__PURE__*/function () {
     _defineProperty(this, "update", function () {
       return Promise.resolve();
     });
+    _defineProperty(this, "hasChanged", function () {
+      return _classPrivateFieldGet(_model, _this).getStore().hasChanged(_classPrivateFieldGet(_model, _this).getType(), _this);
+    });
     _classPrivateFieldSet(_model, this, model);
   }
   return _createClass(BasicObj, [{

package/dist/Model.js

@@ -160,23 +160,25 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
   });
   _defineProperty(this, "load", function (obj, callback) {
     if (_classPrivateFieldGet(_loadFunction, _this)) {
-      return _this.getStore().whenSaved(_this.getType())["catch"](function (e) {
-        throw new Error("You cannot perform load() on an unsaved object.");
-      }).then(function () {
-        var res = _classPrivateFieldGet(_loadFunction, _this).call(_this, obj.toJSON()); // toJSON to avoid side effects;
-
-        if (typeof res === "string") {
-          return _classPrivateFieldGet(_axios, _this).call(_this, {
-            method: "get",
-            url: res,
-            responseType: "json"
-          }).then(function (data) {
-            return data.data;
-          }).then(function (data) {
-            return callback ? callback(data) : data;
-          });
+      return Promise.resolve().then(function () {
+        if (!obj.isPersisted() || obj.hasChanged()) {
+          return Promise.reject("You cannot perform load() on an unsaved object.");
         } else {
-          return res;
+          var res = _classPrivateFieldGet(_loadFunction, _this).call(_this, obj.toJSON()); // toJSON to avoid side effects;
+
+          if (typeof res === "string") {
+            return _classPrivateFieldGet(_axios, _this).call(_this, {
+              method: "get",
+              url: res,
+              responseType: "json"
+            }).then(function (data) {
+              return data.data;
+            }).then(function (data) {
+              return callback ? callback(data) : data;
+            });
+          } else {
+            return res;
+          }
         }
       }).then(function (data) {
         (0, _BasicObj.setValues)(data, _this, _SubObj["default"], obj, obj);

package/dist/ObserverStore.js

@@ -35,7 +35,6 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _classPrivateFieldInitSpec(e, t, a) { _checkPrivateRedeclaration(e, t), t.set(e, a); }
 function _checkPrivateRedeclaration(e, t) { if (t.has(e)) throw new TypeError("Cannot initialize the same private elements twice on an object"); }
-function _classPrivateFieldSet(s, a, r) { return s.set(_assertClassBrand(s, a), r), r; }
 function _classPrivateFieldGet(s, a) { return s.get(_assertClassBrand(s, a)); }
 function _assertClassBrand(e, t, n) { if ("function" == typeof e ? e === t : e.has(t)) return arguments.length < 3 ? t : n; throw new TypeError("Private element is not present on this object"); } /*
  * MIT License
@@ -119,7 +118,7 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       return subKey;
     });
     _defineProperty(_this, "unsubscribe", function (key) {
-      _classPrivateFieldSet(_unsubPromises, _this, (_classPrivateFieldGet(_queryPromises, _this).length ? Promise.all(_classPrivateFieldGet(_queryPromises, _this)) : Promise.resolve()).then(function () {
+      var prom = (_classPrivateFieldGet(_queryPromises, _this).length ? Promise.all(_classPrivateFieldGet(_queryPromises, _this)) : Promise.resolve()).then(function () {
         if (_this._multipleSubscribed[key]) {
           var _iterator = _createForOfIteratorHelper(_this._multipleSubscribed[key]),
             _step;
@@ -151,7 +150,11 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
             }
           }
         }
-      }));
+      })["finally"](function () {
+        var idx = _classPrivateFieldGet(_unsubPromises, _this).indexOf(prom);
+        if (idx !== -1) _classPrivateFieldGet(_unsubPromises, _this).splice(idx, 1);
+      });
+      _classPrivateFieldGet(_unsubPromises, _this).push(prom);
     });
     _classPrivateFieldInitSpec(_this, _getUniqueSubs, function (objects, type) {
       var out = {};