dataflux 1.7.3 → 1.9.0

package/dist/Model.js

@@ -7,8 +7,6 @@ exports["default"] = void 0;
 
 var _modelHooksUtils = require("./modelHooksUtils");
 
-var _batchPromises = _interopRequireDefault(require("batch-promises"));
-
 var _axios2 = _interopRequireDefault(require("axios"));
 
 var _BasicObj = require("./BasicObj");
@@ -95,22 +93,29 @@ var _addRelationByFilter = /*#__PURE__*/new WeakMap();
 
 var _removeHiddenFields = /*#__PURE__*/new WeakMap();
 
-var _bulkOperation = /*#__PURE__*/new WeakMap();
-
 var _toArray = /*#__PURE__*/new WeakMap();
 
 var _unWrap = /*#__PURE__*/new WeakMap();
 
 var _insertObjects = /*#__PURE__*/new WeakMap();
 
+var _assignId = /*#__PURE__*/new WeakMap();
+
 var _updateObjects = /*#__PURE__*/new WeakMap();
 
 var _deleteObjects = /*#__PURE__*/new WeakMap();
 
+var _hanldeApiError = /*#__PURE__*/new WeakMap();
+
+var _cleanApiError = /*#__PURE__*/new WeakMap();
+
+var _removeFromStoreSilentlyAfterFailure = /*#__PURE__*/new WeakMap();
+
 var Model = /*#__PURE__*/_createClass(function Model(name) {
   var _this = this,
       _options$deep,
-      _options$parseMoment;
+      _options$parseMoment,
+      _options$validate;
 
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
 
@@ -178,6 +183,31 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     value: void 0
   });
 
+  _defineProperty(this, "validateObjectAttribute", function (object, key) {
+    var validate = _this.options.validate;
+
+    if (validate && validate[key]) {
+      try {
+        validate[key](object);
+        object.setError(false, key);
+      } catch (error) {
+        object.setError(error.message, key);
+      }
+    }
+  });
+
+  _defineProperty(this, "isObjectValid", function (object) {
+    for (var key in object) {
+      if (typeof object[key] !== "function") {
+        if (object.getError(key)) {
+          return false;
+        }
+      }
+    }
+
+    return true;
+  });
+
   _defineProperty(this, "getStore", function () {
     return _classPrivateFieldGet(_this, _store);
   });
@@ -195,7 +225,8 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
       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(_this, _loadFunction).call(_this, obj.toJSON());
+        var res = _classPrivateFieldGet(_this, _loadFunction).call(_this, obj.toJSON()); // toJSON to avoid side effects;
+
 
         if (typeof res === "string") {
           return _classPrivateFieldGet(_this, _axios).call(_this, {
@@ -271,15 +302,15 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   });
 
   _defineProperty(this, "insertObjects", function (objects) {
-    return objects.length ? _classPrivateFieldGet(_this, _bulkOperation).call(_this, objects, _classPrivateFieldGet(_this, _insertObjects)) : Promise.resolve();
+    return objects.length ? _classPrivateFieldGet(_this, _insertObjects).call(_this, objects) : Promise.resolve();
   });
 
   _defineProperty(this, "updateObjects", function (objects) {
-    return objects.length ? _classPrivateFieldGet(_this, _bulkOperation).call(_this, objects, _classPrivateFieldGet(_this, _updateObjects)) : Promise.resolve();
+    return objects.length ? _classPrivateFieldGet(_this, _updateObjects).call(_this, objects) : Promise.resolve();
   });
 
   _defineProperty(this, "deleteObjects", function (objects) {
-    return objects.length ? _classPrivateFieldGet(_this, _bulkOperation).call(_this, objects, _classPrivateFieldGet(_this, _deleteObjects)) : Promise.resolve();
+    return objects.length ? _classPrivateFieldGet(_this, _deleteObjects).call(_this, objects) : Promise.resolve();
   });
 
   _defineProperty(this, "factory", function (params) {
@@ -338,26 +369,11 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     }
   });
 
-  _classPrivateFieldInitSpec(this, _bulkOperation, {
-    writable: true,
-    value: function value(objects, action) {
-      if (_classPrivateFieldGet(_this, _singleItemQuery)) {
-        return (0, _batchPromises["default"])(_classPrivateFieldGet(_this, _batchSize), objects.map(function (i) {
-          return _classPrivateFieldGet(_this, _removeHiddenFields).call(_this, i.toJSON());
-        }), action);
-      } else {
-        return action(objects.map(function (i) {
-          return _classPrivateFieldGet(_this, _removeHiddenFields).call(_this, i.toJSON());
-        }));
-      }
-    }
-  });
-
   _classPrivateFieldInitSpec(this, _toArray, {
     writable: true,
     value: function value(data) {
       if (Array.isArray(data)) {
-        if (data.every(function (str) {
+        if (data.length && data.every(function (str) {
           return ["string", "number"].includes(_typeof(str));
         })) {
           return [{
@@ -380,7 +396,11 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _classPrivateFieldInitSpec(this, _unWrap, {
     writable: true,
-    value: function value(data) {
+    value: function value(objects) {
+      var data = Object.values(objects).map(function (object) {
+        return _classPrivateFieldGet(_this, _removeHiddenFields).call(_this, object.toJSON());
+      });
+
       if (data.value != null && Object.keys(data).length === 1) {
         return data.value;
       } else if (Array.isArray(data) && data.length === 1 && data[0].value != null && Object.keys(data[0]).length === 1) {
@@ -393,22 +413,109 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _classPrivateFieldInitSpec(this, _insertObjects, {
     writable: true,
-    value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("insert", _classPrivateFieldGet(_this, _insertHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+    value: function value(objects) {
+      var operation = "insert";
+      return (0, _modelHooksUtils.executeHook)(operation, _classPrivateFieldGet(_this, _insertHook), _classPrivateFieldGet(_this, _unWrap).call(_this, objects), _classPrivateFieldGet(_this, _axios)).then(function (data) {
+        if (data) _classPrivateFieldGet(_this, _assignId).call(_this, data, objects);
+
+        _classPrivateFieldGet(_this, _cleanApiError).call(_this, objects);
+
+        return data;
+      }).then(_classPrivateFieldGet(_this, _toArray))["catch"](function (error) {
+        _classPrivateFieldGet(_this, _removeFromStoreSilentlyAfterFailure).call(_this, objects);
+
+        return _classPrivateFieldGet(_this, _hanldeApiError).call(_this, error, objects, operation);
+      });
+    }
+  });
+
+  _classPrivateFieldInitSpec(this, _assignId, {
+    writable: true,
+    value: function value(data, objects) {
+      if (data.length === 1) {
+        var newId = data[0].id;
+        objects[0].setId(newId);
+        delete objects[0].setId;
+      }
     }
   });
 
   _classPrivateFieldInitSpec(this, _updateObjects, {
     writable: true,
-    value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("update", _classPrivateFieldGet(_this, _updateHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+    value: function value(objects) {
+      var operation = "update";
+      return (0, _modelHooksUtils.executeHook)(operation, _classPrivateFieldGet(_this, _updateHook), _classPrivateFieldGet(_this, _unWrap).call(_this, objects), _classPrivateFieldGet(_this, _axios)).then(function (data) {
+        _classPrivateFieldGet(_this, _cleanApiError).call(_this, objects);
+
+        return data;
+      }).then(_classPrivateFieldGet(_this, _toArray))["catch"](function (error) {
+        return _classPrivateFieldGet(_this, _hanldeApiError).call(_this, error, objects, operation);
+      });
     }
   });
 
   _classPrivateFieldInitSpec(this, _deleteObjects, {
     writable: true,
-    value: function value(data) {
-      return (0, _modelHooksUtils.executeHook)("delete", _classPrivateFieldGet(_this, _deleteHook), _classPrivateFieldGet(_this, _unWrap).call(_this, data), _classPrivateFieldGet(_this, _axios)).then(_classPrivateFieldGet(_this, _toArray));
+    value: function value(objects) {
+      var operation = "delete";
+      return (0, _modelHooksUtils.executeHook)(operation, _classPrivateFieldGet(_this, _deleteHook), _classPrivateFieldGet(_this, _unWrap).call(_this, objects), _classPrivateFieldGet(_this, _axios)).then(function (data) {
+        _classPrivateFieldGet(_this, _cleanApiError).call(_this, objects);
+
+        return data;
+      }).then(_classPrivateFieldGet(_this, _toArray))["catch"](function (error) {
+        return _classPrivateFieldGet(_this, _hanldeApiError).call(_this, error, objects, operation);
+      });
+    }
+  });
+
+  _classPrivateFieldInitSpec(this, _hanldeApiError, {
+    writable: true,
+    value: function value(error, objects, operation) {
+      var _error$response$data, _error3, _error3$response, _ref, _error$message, _error4, _error5;
+
+      error = (_error$response$data = (_error3 = error) === null || _error3 === void 0 ? void 0 : (_error3$response = _error3.response) === null || _error3$response === void 0 ? void 0 : _error3$response.data) !== null && _error$response$data !== void 0 ? _error$response$data : error;
+      var targets = objects.map(function (object) {
+        return object.getId();
+      }); // Set errors
+
+      var strError = (_ref = (_error$message = (_error4 = error) === null || _error4 === void 0 ? void 0 : _error4.message) !== null && _error$message !== void 0 ? _error$message : (_error5 = error) === null || _error5 === void 0 ? void 0 : _error5.error) !== null && _ref !== void 0 ? _ref : error;
+      Object.values(objects).map(function (object) {
+        return object.setError(strError);
+      });
+      return Promise.reject(_objectSpread(_objectSpread({}, error), {}, {
+        targets: targets,
+        operation: operation
+      }));
+    }
+  });
+
+  _classPrivateFieldInitSpec(this, _cleanApiError, {
+    writable: true,
+    value: function value(objects) {
+      Object.values(objects).map(function (object) {
+        return object.setError(false);
+      });
+    }
+  });
+
+  _classPrivateFieldInitSpec(this, _removeFromStoreSilentlyAfterFailure, {
+    writable: true,
+    value: function value(objects) {
+      var _iterator2 = _createForOfIteratorHelper(objects.map(function (object) {
+        return object.getId();
+      })),
+          _step2;
+
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var target = _step2.value;
+          delete _this.getStore().models[_this.getType()].storedObjects[target];
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
     }
   });
 
@@ -417,7 +524,8 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   this.options = _objectSpread(_objectSpread({}, options), {}, {
     deep: (_options$deep = options.deep) !== null && _options$deep !== void 0 ? _options$deep : true,
     parseMoment: (_options$parseMoment = options.parseMoment) !== null && _options$parseMoment !== void 0 ? _options$parseMoment : false,
-    lazyLoad: options.lazyLoad
+    lazyLoad: options.lazyLoad,
+    validate: (_options$validate = options.validate) !== null && _options$validate !== void 0 ? _options$validate : {}
   });
 
   _classPrivateFieldSet(this, _store, null);
@@ -438,12 +546,12 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     throw new Error("The load option must be a function");
   }
 
-  var _ref = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
-      _ref2 = _slicedToArray(_ref, 4),
-      retrieveHook = _ref2[0],
-      insertHook = _ref2[1],
-      updateHook = _ref2[2],
-      deleteHook = _ref2[3];
+  var _ref2 = _typeof(options) === "object" ? (0, _modelHooksUtils.getHooksFromOptions)(options) : (0, _modelHooksUtils.getHooksFromUrl)(options),
+      _ref3 = _slicedToArray(_ref2, 4),
+      retrieveHook = _ref3[0],
+      insertHook = _ref3[1],
+      updateHook = _ref3[2],
+      deleteHook = _ref3[3];
 
   _classPrivateFieldSet(this, _retrieveHook, retrieveHook);
 

package/dist/ObserverStore.js

@@ -55,20 +55,28 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 
 function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
+function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "set"); _classApplyDescriptorSet(receiver, descriptor, value); return value; }
+
+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; } }
+
 function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 
 function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
+var _queryPromises = /*#__PURE__*/new WeakMap();
+
+var _unsubPromises = /*#__PURE__*/new WeakMap();
+
 var _getUniqueSubs = /*#__PURE__*/new WeakMap();
 
 var _propagateChange = /*#__PURE__*/new WeakMap();
@@ -91,8 +99,19 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _propagateInsertChange);
 
+    _classPrivateFieldInitSpec(_assertThisInitialized(_this), _queryPromises, {
+      writable: true,
+      value: []
+    });
+
+    _classPrivateFieldInitSpec(_assertThisInitialized(_this), _unsubPromises, {
+      writable: true,
+      value: []
+    });
+
     _defineProperty(_assertThisInitialized(_this), "multipleSubscribe", function (subscriptions, callback) {
       var dataPayload = {};
+      var subKey = (0, _uuid.v4)();
 
       var areAllDone = function areAllDone() {
         return subscriptions.map(function (_ref) {
@@ -105,7 +124,7 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
         });
       };
 
-      return Promise.all(subscriptions.map(function (sub) {
+      Promise.all(subscriptions.map(function (sub) {
         var _sub = _slicedToArray(sub, 2),
             name = _sub[0],
             _sub$ = _sub[1],
@@ -118,62 +137,67 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
         return _this.subscribe(name, wrappedCallback, filterFunction);
       })).then(function (subKeys) {
-        var subKey = (0, _uuid.v4)();
         _this._multipleSubscribed[subKey] = subKeys;
         return subKey;
       });
+      return subKey;
     });
 
     _defineProperty(_assertThisInitialized(_this), "subscribe", function (type, callback, filterFunction) {
-      var subKey = (0, _uuid.v4)();
+      var _this$_subscribed, _this$_subscribed$typ;
 
-      if (!_this._subscribed[type]) {
-        _this._subscribed[type] = {};
-      }
+      var subKey = (0, _uuid.v4)();
+      (_this$_subscribed$typ = (_this$_subscribed = _this._subscribed)[type]) !== null && _this$_subscribed$typ !== void 0 ? _this$_subscribed$typ : _this$_subscribed[type] = {};
 
-      _this.find(type, filterFunction).then(function (data) {
+      var prom = _this.find(type, filterFunction).then(function (data) {
         _classPrivateFieldGet(_assertThisInitialized(_this), _subscribeToObjects).call(_assertThisInitialized(_this), type, data, {
           callback: callback,
           filterFunction: filterFunction,
           subKey: subKey
         });
 
-        return callback(data);
+        callback(data);
       });
 
+      _classPrivateFieldGet(_assertThisInitialized(_this), _queryPromises).push(prom);
+
       return subKey;
     });
 
     _defineProperty(_assertThisInitialized(_this), "unsubscribe", function (key) {
-      if (_this._multipleSubscribed[key]) {
-        var _iterator = _createForOfIteratorHelper(_this._multipleSubscribed[key]),
-            _step;
-
-        try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var sub = _step.value;
+      if (_classPrivateFieldGet(_assertThisInitialized(_this), _queryPromises).length) {
+        _classPrivateFieldSet(_assertThisInitialized(_this), _unsubPromises, Promise.all(_classPrivateFieldGet(_assertThisInitialized(_this), _queryPromises)).then(function () {
+          if (_this._multipleSubscribed[key]) {
+            var _iterator = _createForOfIteratorHelper(_this._multipleSubscribed[key]),
+                _step;
 
-            _this.unsubscribe(sub);
-          }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
-        }
+            try {
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                var sub = _step.value;
 
-        delete _this._multipleSubscribed[key];
-      } else {
-        for (var type in _this._subscribed) {
-          for (var id in _this._subscribed[type]) {
-            _this._subscribed[type][id] = _this._subscribed[type][id].filter(function (i) {
-              return i.subKey !== key;
-            });
+                _this.unsubscribe(sub);
+              }
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
+            }
 
-            if (_this._subscribed[type][id].length === 0) {
-              delete _this._subscribed[type][id];
+            delete _this._multipleSubscribed[key];
+          } else {
+            for (var type in _this._subscribed) {
+              for (var id in _this._subscribed[type]) {
+                _this._subscribed[type][id] = _this._subscribed[type][id].filter(function (i) {
+                  return i.subKey !== key;
+                });
+
+                if (_this._subscribed[type][id].length === 0) {
+                  delete _this._subscribed[type][id];
+                }
+              }
             }
           }
-        }
+        }));
       }
     });
 
@@ -197,8 +221,10 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
             try {
               for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var _sub$subKey, _out$_sub$subKey;
+
                 var sub = _step3.value;
-                out[sub.subKey] = out[sub.subKey] || sub;
+                (_out$_sub$subKey = out[_sub$subKey = sub.subKey]) !== null && _out$_sub$subKey !== void 0 ? _out$_sub$subKey : out[_sub$subKey] = sub;
               }
             } catch (err) {
               _iterator3.e(err);
@@ -220,20 +246,21 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       writable: true,
       value: function value() {
         var objects = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+        return (_classPrivateFieldGet(_assertThisInitialized(_this), _unsubPromises).length ? Promise.all(_classPrivateFieldGet(_assertThisInitialized(_this), _unsubPromises)) : Promise.resolve()).then(function () {
+          if (objects.length) {
+            var type = objects[0].getModel().getType();
 
-        if (objects.length) {
-          var type = objects[0].getModel().getType();
-
-          var uniqueSubs = _classPrivateFieldGet(_assertThisInitialized(_this), _getUniqueSubs).call(_assertThisInitialized(_this), objects, type);
+            var uniqueSubs = _classPrivateFieldGet(_assertThisInitialized(_this), _getUniqueSubs).call(_assertThisInitialized(_this), objects, type);
 
-          (0, _batchPromises["default"])(10, uniqueSubs, function (_ref3) {
-            var callback = _ref3.callback,
-                filterFunction = _ref3.filterFunction;
-            return _this.find(type, filterFunction).then(callback);
-          });
-        }
+            (0, _batchPromises["default"])(10, uniqueSubs, function (_ref3) {
+              var callback = _ref3.callback,
+                  filterFunction = _ref3.filterFunction;
+              return _this.find(type, filterFunction).then(callback);
+            });
+          }
 
-        return objects;
+          return objects;
+        });
       }
     });
 
@@ -245,12 +272,11 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var _this$_subscribed$typ2, _this$_subscribed$typ3;
+
             var object = _step4.value;
             var id = object.getId();
-
-            if (!_this._subscribed[type][id]) {
-              _this._subscribed[type][id] = [];
-            }
+            (_this$_subscribed$typ3 = (_this$_subscribed$typ2 = _this._subscribed[type])[id]) !== null && _this$_subscribed$typ3 !== void 0 ? _this$_subscribed$typ3 : _this$_subscribed$typ2[id] = [];
 
             _this._subscribed[type][id].push(item);
           }
@@ -285,6 +311,18 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       });
     }
   }, {
+    key: "mock",
+    value: function mock(type, objects) {
+      var _this3 = this;
+
+      objects = Array.isArray(objects) ? objects : [objects];
+      return _get(_getPrototypeOf(ObserverStore.prototype), "mock", this).call(this, type, objects).then(function (objects) {
+        _classPrivateMethodGet(_this3, _propagateInsertChange, _propagateInsertChange2).call(_this3, type, objects);
+
+        return objects;
+      });
+    }
+  }, {
     key: "delete",
     value: function _delete(typeOrObjects, filterFunction) {
       return _get(_getPrototypeOf(ObserverStore.prototype), "delete", this).call(this, typeOrObjects, filterFunction).then(_classPrivateFieldGet(this, _propagateChange));
@@ -295,73 +333,75 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 }(_PersistentStore2["default"]);
 
 function _propagateInsertChange2(type, newObjects) {
-  var _this3 = this;
+  var _this4 = this;
 
-  if (this._subscribed[type]) {
-    var uniqueSubs = {};
-    var objects = Object.values(this._subscribed[type]);
+  return (_classPrivateFieldGet(this, _unsubPromises).length ? Promise.all(_classPrivateFieldGet(this, _unsubPromises)) : Promise.resolve()).then(function () {
+    if (_this4._subscribed[type]) {
+      var uniqueSubs = {};
+      var objects = Object.values(_this4._subscribed[type]);
 
-    for (var _i2 = 0, _objects = objects; _i2 < _objects.length; _i2++) {
-      var object = _objects[_i2];
+      for (var _i2 = 0, _objects = objects; _i2 < _objects.length; _i2++) {
+        var object = _objects[_i2];
 
-      var _iterator5 = _createForOfIteratorHelper(object),
-          _step5;
+        var _iterator5 = _createForOfIteratorHelper(object),
+            _step5;
 
-      try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var sub = _step5.value;
+        try {
+          for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+            var sub = _step5.value;
 
-          if (!uniqueSubs[sub.subKey]) {
-            uniqueSubs[sub.subKey] = sub;
+            if (!uniqueSubs[sub.subKey]) {
+              uniqueSubs[sub.subKey] = sub;
+            }
           }
+        } catch (err) {
+          _iterator5.e(err);
+        } finally {
+          _iterator5.f();
         }
-      } catch (err) {
-        _iterator5.e(err);
-      } finally {
-        _iterator5.f();
       }
-    }
 
-    var possibleSubs = Object.values(uniqueSubs);
-    (0, _batchPromises["default"])(10, possibleSubs, function (_ref4) {
-      var callback = _ref4.callback,
-          filterFunction = _ref4.filterFunction;
-      var objectsToSubscribe = filterFunction ? newObjects.filter(filterFunction) : newObjects;
+      var possibleSubs = Object.values(uniqueSubs);
+      (0, _batchPromises["default"])(10, possibleSubs, function (_ref4) {
+        var callback = _ref4.callback,
+            filterFunction = _ref4.filterFunction;
+        var objectsToSubscribe = filterFunction ? newObjects.filter(filterFunction) : newObjects;
 
-      if (objectsToSubscribe.length) {
-        // Check if the new objects matter
-        return _this3.find(type, filterFunction).then(function (data) {
-          var subKey;
+        if (objectsToSubscribe.length) {
+          // Check if the new objects matter
+          return _this4.find(type, filterFunction).then(function (data) {
+            var subKey;
 
-          var _iterator6 = _createForOfIteratorHelper(data),
-              _step6;
+            var _iterator6 = _createForOfIteratorHelper(data),
+                _step6;
 
-          try {
-            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-              var d = _step6.value;
+            try {
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                var d = _step6.value;
 
-              var item = _this3._subscribed[d.getModel().getType()][d.getId()];
+                var item = _this4._subscribed[d.getModel().getType()][d.getId()];
 
-              subKey = item ? item.subKey : null;
-              if (subKey) break;
+                subKey = item ? item.subKey : null;
+                if (subKey) break;
+              }
+            } catch (err) {
+              _iterator6.e(err);
+            } finally {
+              _iterator6.f();
             }
-          } catch (err) {
-            _iterator6.e(err);
-          } finally {
-            _iterator6.f();
-          }
 
-          _classPrivateFieldGet(_this3, _subscribeToObjects).call(_this3, type, objectsToSubscribe, {
-            callback: callback,
-            filterFunction: filterFunction,
-            subKey: subKey
-          });
+            _classPrivateFieldGet(_this4, _subscribeToObjects).call(_this4, type, objectsToSubscribe, {
+              callback: callback,
+              filterFunction: filterFunction,
+              subKey: subKey
+            });
 
-          return data;
-        }).then(callback);
-      }
-    });
-  }
+            return data;
+          }).then(callback);
+        }
+      });
+    }
+  });
 }
 
 var _default = ObserverStore;