dataflux 1.24.1 → 1.24.3

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/Obj.js

@@ -72,7 +72,7 @@ var Obj = exports["default"] = /*#__PURE__*/function (_BasicObj) {
               return i !== null && i !== void 0 && i.getId ? i : new _SubObj["default"](_this, "property", i, _this.getModel());
             }
           });
-        } else if (_typeof(value) === "object") {
+        } else if (_typeof(value) === "object" && value !== null) {
           var _value;
           value = (_value = value) !== null && _value !== void 0 && _value.getId ? value : new _SubObj["default"](_this, "property", value, _this.getModel());
         }