dataflux 1.2.2 → 1.2.3

package/dist/Model.js

@@ -49,6 +49,18 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorSet(receiver, descriptor, value) { if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } }
 
+var applyData = function applyData(obj, data) {
+  for (var att in data) {
+    if (att !== "id" || obj.id === undefined || att === "id" && obj.id === data.id) {
+      obj[att] = data[att];
+    } else {
+      return Promise.reject("The loading function cannot change the id of the object.");
+    }
+  }
+
+  return Promise.resolve(obj);
+};
+
 var _type = /*#__PURE__*/new WeakMap();
 
 var _store = /*#__PURE__*/new WeakMap();
@@ -160,35 +172,25 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   });
 
   _defineProperty(this, "load", function (obj) {
-    return new Promise(function (resolve, reject) {
-      var applyData = function applyData(data) {
-        for (var att in data) {
-          if (att !== "id" || obj.id === undefined || att === "id" && obj.id === data.id) {
-            obj[att] = data[att];
-          } else {
-            return Promise.reject("The loading function cannot change the id of the object.");
-          }
-        }
-      };
-
-      if (_classPrivateFieldGet(_this, _loadFunction)) {
-        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON());
-
-        if (typeof res === "string") {
-          _classPrivateFieldGet(_this, _axios).call(_this, {
-            method: "get",
-            url: res,
-            responseType: "json"
-          }).then(function (data) {
-            return applyData(data.data);
-          }).then(resolve);
-        } else {
-          res.then(applyData).then(resolve);
-        }
+    if (_classPrivateFieldGet(_this, _loadFunction)) {
+      var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON());
+
+      if (typeof res === "string") {
+        return _classPrivateFieldGet(_this, _axios).call(_this, {
+          method: "get",
+          url: res,
+          responseType: "json"
+        }).then(function (data) {
+          return applyData(obj, data.data);
+        });
       } else {
-        reject("You must define a loading function in the model to enable load().");
+        return res.then(function (data) {
+          return applyData(obj, data);
+        });
       }
-    });
+    } else {
+      return Promise.reject("You must define a loading function in the model to enable load().");
+    }
   });
 
   _defineProperty(this, "addRelation", function (model, param2, param3) {

package/dist/StoreObject.js

@@ -35,7 +35,7 @@ function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) {
 
 var _loaded = /*#__PURE__*/new WeakMap();
 
-var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
+var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
   var _this = this;
 
   _classCallCheck(this, Obj);
@@ -49,11 +49,15 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
     if (_classPrivateFieldGet(_this, _loaded)) {
       return Promise.resolve(_this);
     } else {
-      return _this.getModel().load(_this).then(function () {
+      var model = _this.getModel();
+
+      return model.load(_this).then(function () {
         _classPrivateFieldSet(_this, _loaded, true);
 
+        return model.getStore().update([_this]); // Propagate update
+      }).then(function () {
         return _this;
-      });
+      }); // return always this
     }
   });
 
@@ -107,7 +111,7 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, model) {
   });
 
   this.getModel = function () {
-    return model;
+    return _model;
   };
 
   Object.keys(values).forEach(function (key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataflux",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "DataFlux, automatically interfaces with your REST APIs to create a 2-way-synced local data store. Transparently manages data propagation in the React state.",
   "main": "dist/index.js",
   "bin": "dist/index.js",