dataflux 1.10.5 → 1.11.0

package/README.md

@@ -568,6 +568,8 @@ The store has the following method.
 | save()                                                 | Persist the changes. Edited local objects will be sent to the REST APIs (insert/update/delete). See also [editing objects](#editing-objects).                                                                                                                                                                                                                                                                                                       |
 | save()                                                 | Persist the changes (`local -> remote`). Edited local objects will be sent to the REST APIs (insert/update/delete). See also [editing objects](#editing-objects).                                                                                                                                                                                                                                                                                   |
 | refresh()                                              | This method syncs all the objects in the store with the remote version offered by the REST APIs (`remote -> local`). Remote changes are applied locally, including adding/removing objects. Objects edited locally but not yet persisted are preserved locally (tip: you can also create a store with the `autoRefresh` option).                                                                                                                    |
+| findSync(type, filterFunction)                         | This method returns the objects in a synchronous way (no Promise). However, *it works only if you already performed an async operation (e.g., like refresh, load, find, subscribe) or if you set lazyLoad to false and the store had enough time to load.*                                                                                                                                                                                          |
+
 ### Insert vs. Mock
 
 If you do:

package/dist/Model.js

@@ -118,7 +118,7 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     if (validate && validate[key]) {
       try {
         var call = validate[key](object, _classPrivateFieldGet(_this, _store));
-        if (call.then) {
+        if (call !== null && call !== void 0 && call.then) {
           call.then(function () {
             return object.setError(false, key);
           })["catch"](function (error) {

package/dist/Store.js

@@ -27,7 +27,6 @@ var _merge = /*#__PURE__*/new WeakMap();
 var _error = /*#__PURE__*/new WeakSet();
 var _deleteByObject = /*#__PURE__*/new WeakMap();
 var _deleteByFilter = /*#__PURE__*/new WeakSet();
-var _getPromise = /*#__PURE__*/new WeakSet();
 var _insertObject = /*#__PURE__*/new WeakMap();
 var _loadObjects = /*#__PURE__*/new WeakSet();
 var Store = /*#__PURE__*/function () {
@@ -38,14 +37,21 @@ var Store = /*#__PURE__*/function () {
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, Store);
     _classPrivateMethodInitSpec(this, _loadObjects);
-    _classPrivateMethodInitSpec(this, _getPromise);
     _classPrivateMethodInitSpec(this, _deleteByFilter);
     _classPrivateMethodInitSpec(this, _error);
     _defineProperty(this, "getModels", function () {
       return Object.keys(_this.models);
     });
+    _defineProperty(this, "findSync", function (type, filterFunction) {
+      var all = Object.values(_this.models[type].storedObjects).filter(function (i) {
+        return i.status !== "deleted";
+      }).map(function (i) {
+        return i.object;
+      });
+      return filterFunction ? all.filter(filterFunction) : all;
+    });
     _defineProperty(this, "refreshObjectByType", function (type) {
-      return _classPrivateMethodGet(_this, _getPromise, _getPromise2).call(_this, type).then(function () {
+      return _this._getPromise(type).then(function () {
         var item = _this.models[type];
         var inserted = [];
         var deleted = [];
@@ -232,7 +238,7 @@ var Store = /*#__PURE__*/function () {
     key: "insert",
     value: function insert(type, objects) {
       var _this3 = this;
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
+      return this._getPromise(type).then(function () {
         return objects.map(function (object) {
           return _classPrivateFieldGet(_this3, _insertObject).call(_this3, type, object, "new");
         });
@@ -242,7 +248,7 @@ var Store = /*#__PURE__*/function () {
     key: "mock",
     value: function mock(type, objects) {
       var _this4 = this;
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
+      return this._getPromise(type).then(function () {
         return objects.map(function (object) {
           return _classPrivateFieldGet(_this4, _insertObject).call(_this4, type, object, "mock");
         });
@@ -252,7 +258,7 @@ var Store = /*#__PURE__*/function () {
     key: "get",
     value: function get(type, id) {
       var _this5 = this;
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
+      return this._getPromise(type).then(function () {
         try {
           return _this5.models[type].storedObjects[id].object;
         } catch (error) {
@@ -264,13 +270,8 @@ var Store = /*#__PURE__*/function () {
     key: "find",
     value: function find(type, filterFunction) {
       var _this6 = this;
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-        var all = Object.values(_this6.models[type].storedObjects).filter(function (i) {
-          return i.status !== "deleted";
-        }).map(function (i) {
-          return i.object;
-        });
-        return filterFunction ? all.filter(filterFunction) : all;
+      return this._getPromise(type).then(function () {
+        return _this6.findSync(type, filterFunction);
       })["catch"](function (error) {
         _this6.pubSub.publish("error", error);
         return Promise.reject(error);
@@ -336,13 +337,13 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "preload",
     value: function preload(type) {
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type);
+      return this._getPromise(type);
     }
   }, {
     key: "getDiff",
     value: function getDiff(type) {
       var _this8 = this;
-      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
+      return this._getPromise(type).then(function () {
         var objects = Object.values(_this8.models[type].storedObjects);
         var inserted = [];
         var updated = [];
@@ -394,6 +395,22 @@ var Store = /*#__PURE__*/function () {
       });
       return item.promise;
     }
+  }, {
+    key: "_getPromise",
+    value: function _getPromise(type) {
+      var _this10 = this;
+      if (!this.models[type]) {
+        return Promise.reject("The model doesn't exist");
+      } else if (!this.models[type].promise && !this.options.lazyLoad) {
+        return Promise.reject("The model is not loaded");
+      } else if (!this.models[type].promise && this.options.lazyLoad) {
+        return _classPrivateMethodGet(this, _loadObjects, _loadObjects2).call(this, type).then(function () {
+          return _this10.models[type].promise;
+        });
+      } else {
+        return this.models[type].promise;
+      }
+    }
   }]);
   return Store;
 }();
@@ -404,9 +421,9 @@ function _error2(error) {
   return Promise.reject(error);
 }
 function _deleteByFilter2(type, filterFunction) {
-  var _this10 = this;
-  return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-    var deleted = Object.values(_this10.models[type].storedObjects).filter(function (i) {
+  var _this11 = this;
+  return this._getPromise(type).then(function () {
+    var deleted = Object.values(_this11.models[type].storedObjects).filter(function (i) {
       return filterFunction(i.object);
     });
     var _iterator5 = _createForOfIteratorHelper(deleted),
@@ -426,20 +443,6 @@ function _deleteByFilter2(type, filterFunction) {
     });
   });
 }
-function _getPromise2(type) {
-  var _this11 = this;
-  if (!this.models[type]) {
-    return Promise.reject("The model doesn't exist");
-  } else if (!this.models[type].promise && !this.options.lazyLoad) {
-    return Promise.reject("The model is not loaded");
-  } else if (!this.models[type].promise && this.options.lazyLoad) {
-    return _classPrivateMethodGet(this, _loadObjects, _loadObjects2).call(this, type).then(function () {
-      return _this11.models[type].promise;
-    });
-  } else {
-    return this.models[type].promise;
-  }
-}
 function _loadObjects2(type) {
   var _this12 = this;
   var item = this.models[type];