dataflux 1.19.4 → 1.19.6

package/dist/Model.js

@@ -95,7 +95,7 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
     _options$pre,
     _ref9,
     _options$hiddenFields,
-    _ref10,
+    _ref0,
     _options$post;
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var defaults = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
@@ -156,7 +156,7 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
       throw new Error("This model was already assigned to a store.");
     }
   });
-  _defineProperty(this, "load", function (obj) {
+  _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.");
@@ -170,6 +170,8 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
             responseType: "json"
           }).then(function (data) {
             return data.data;
+          }).then(function (data) {
+            return callback ? callback(data) : data;
           });
         } else {
           return res;
@@ -420,7 +422,7 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
     autoRefresh: (_ref7 = (_options$autoRefresh = options.autoRefresh) !== null && _options$autoRefresh !== void 0 ? _options$autoRefresh : defaults.autoRefresh) !== null && _ref7 !== void 0 ? _ref7 : false,
     pre: (_ref8 = (_options$pre = options.pre) !== null && _options$pre !== void 0 ? _options$pre : defaults.pre) !== null && _ref8 !== void 0 ? _ref8 : null,
     hiddenFields: (_ref9 = (_options$hiddenFields = options.hiddenFields) !== null && _options$hiddenFields !== void 0 ? _options$hiddenFields : defaults.hiddenFields) !== null && _ref9 !== void 0 ? _ref9 : [],
-    post: (_ref10 = (_options$post = options.post) !== null && _options$post !== void 0 ? _options$post : defaults.post) !== null && _ref10 !== void 0 ? _ref10 : null
+    post: (_ref0 = (_options$post = options.post) !== null && _options$post !== void 0 ? _options$post : defaults.post) !== null && _ref0 !== void 0 ? _ref0 : null
   });
   _classPrivateFieldSet(_store, this, null);
   _classPrivateFieldSet(_includes, this, {});
@@ -433,12 +435,12 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
   if (_classPrivateFieldGet(_loadFunction, this) && typeof _classPrivateFieldGet(_loadFunction, this) !== "function") {
     throw new Error("The load option must be a function");
   }
-  var _ref11 = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
-    _ref12 = _slicedToArray(_ref11, 4),
-    retrieveHook = _ref12[0],
-    insertHook = _ref12[1],
-    updateHook = _ref12[2],
-    deleteHook = _ref12[3];
+  var _ref1 = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
+    _ref10 = _slicedToArray(_ref1, 4),
+    retrieveHook = _ref10[0],
+    insertHook = _ref10[1],
+    updateHook = _ref10[2],
+    deleteHook = _ref10[3];
   _classPrivateFieldSet(_retrieveHook, this, retrieveHook);
   _classPrivateFieldSet(_updateHook, this, updateHook);
   _classPrivateFieldSet(_insertHook, this, insertHook);

package/dist/Obj.js

@@ -79,13 +79,13 @@ var Obj = exports["default"] = /*#__PURE__*/function (_BasicObj) {
         _classPrivateFieldSet(_loaded, _this, false);
       }
     });
-    _defineProperty(_this, "load", function () {
+    _defineProperty(_this, "load", function (callback) {
       if (_this.isMock()) {
         return Promise.reject("You cannot perform load on a mock object. Use factory instead.");
       } else {
         if (!_classPrivateFieldGet(_loaded, _this)) {
           var model = _this.getModel();
-          _classPrivateFieldSet(_loaded, _this, model.load(_this).then(function () {
+          _classPrivateFieldSet(_loaded, _this, model.load(_this, callback).then(function () {
             return model.getStore().update([_this], true);
           }) // Propagate update
           .then(function () {

package/dist/Store.js

@@ -446,7 +446,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "factory",
     value: function factory(type, params) {
-      var _this10 = this;
+      var _this0 = this;
       var item = this.models[type];
       this.pubSub.publish("loading", {
         status: "start",
@@ -458,14 +458,14 @@ var Store = exports["default"] = /*#__PURE__*/function () {
         try {
           for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
             var _item = _step5.value;
-            _classPrivateFieldGet(_insertObject, _this10).call(_this10, type, _item, "old");
+            _classPrivateFieldGet(_insertObject, _this0).call(_this0, type, _item, "old");
           }
         } catch (err) {
           _iterator5.e(err);
         } finally {
           _iterator5.f();
         }
-        _this10.pubSub.publish("loading", {
+        _this0.pubSub.publish("loading", {
           status: "end",
           model: type
         });
@@ -477,7 +477,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "_getPromise",
     value: function _getPromise(type) {
-      var _this11 = this;
+      var _this1 = this;
       var ifLoaded = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
       if (!this.models[type]) {
         return Promise.reject("The model doesn't exist");
@@ -485,7 +485,7 @@ var Store = exports["default"] = /*#__PURE__*/function () {
         return Promise.reject("The model is not loaded");
       } else if (!this.models[type].promise && this.options.lazyLoad && !ifLoaded) {
         return _assertClassBrand(_Store_brand, this, _loadObjects).call(this, type).then(function () {
-          return _this11.models[type].promise;
+          return _this1.models[type].promise;
         });
       } else if (!this.models[type].promise && this.options.lazyLoad && ifLoaded) {
         return Promise.resolve();
@@ -496,9 +496,9 @@ var Store = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getCollection",
     value: function getCollection(type) {
-      var _this12 = this;
+      var _this10 = this;
       return this._getPromise(type).then(function () {
-        return Object.values(_this12.models[type].storedObjects).filter(function (i) {
+        return Object.values(_this10.models[type].storedObjects).filter(function (i) {
           return i.status !== "deleted";
         }).filter(function (i) {
           return i.status !== "mock";
@@ -519,9 +519,9 @@ function _error(error) {
   return Promise.reject(error);
 }
 function _deleteByFilter(type, filterFunction) {
-  var _this13 = this;
+  var _this11 = this;
   return this._getPromise(type).then(function () {
-    var deleted = Object.values(_this13.models[type].storedObjects).filter(function (i) {
+    var deleted = Object.values(_this11.models[type].storedObjects).filter(function (i) {
       return filterFunction(i.object);
     });
     var _iterator6 = _createForOfIteratorHelper(deleted),
@@ -542,7 +542,7 @@ function _deleteByFilter(type, filterFunction) {
   });
 }
 function _loadObjects(type) {
-  var _this14 = this;
+  var _this12 = this;
   var item = this.models[type];
   this.pubSub.publish("loading", {
     status: "start",
@@ -554,14 +554,14 @@ function _loadObjects(type) {
     try {
       for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
         var _item2 = _step7.value;
-        _classPrivateFieldGet(_insertObject, _this14).call(_this14, type, _item2, "old");
+        _classPrivateFieldGet(_insertObject, _this12).call(_this12, type, _item2, "old");
       }
     } catch (err) {
       _iterator7.e(err);
     } finally {
       _iterator7.f();
     }
-    _this14.pubSub.publish("loading", {
+    _this12.pubSub.publish("loading", {
       status: "end",
       model: type
     });