dataflux 1.9.3 → 1.9.4

package/dist/Model.js

@@ -416,7 +416,9 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     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);
+        if (data) {
+          _classPrivateFieldGet(_this, _assignId).call(_this, data, objects);
+        }
 
         _classPrivateFieldGet(_this, _cleanApiError).call(_this, objects);
 
@@ -432,7 +434,7 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
   _classPrivateFieldInitSpec(this, _assignId, {
     writable: true,
     value: function value(data, objects) {
-      if (data.length === 1) {
+      if (data.length === 1 && objects.length === 1) {
         var newId = data[0].id;
         objects[0].setId(newId);
         delete objects[0].setId;

package/dist/ObserverStore.js

@@ -81,6 +81,8 @@ var _getUniqueSubs = /*#__PURE__*/new WeakMap();
 
 var _propagateChange = /*#__PURE__*/new WeakMap();
 
+var _appendIfNotExistent = /*#__PURE__*/new WeakMap();
+
 var _subscribeToObjects = /*#__PURE__*/new WeakMap();
 
 var _merge = /*#__PURE__*/new WeakMap();
@@ -167,40 +169,41 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "unsubscribe", function (key) {
-      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;
+      _classPrivateFieldSet(_assertThisInitialized(_this), _unsubPromises, (_classPrivateFieldGet(_assertThisInitialized(_this), _queryPromises).length ? Promise.all(_classPrivateFieldGet(_assertThisInitialized(_this), _queryPromises)) : Promise.resolve()).then(function () {
+        if (_this._multipleSubscribed[key]) {
+          var _iterator = _createForOfIteratorHelper(_this._multipleSubscribed[key]),
+              _step;
 
-            try {
-              for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                var sub = _step.value;
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var sub = _step.value;
 
-                _this.unsubscribe(sub);
-              }
-            } catch (err) {
-              _iterator.e(err);
-            } finally {
-              _iterator.f();
+              _this.unsubscribe(sub);
             }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
 
-            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];
-                }
+          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._subscribed[type]["*"] = _this._subscribed[type]["*"].filter(function (i) {
+                return i.subKey !== key;
+              });
+
+              if (_this._subscribed[type][id].length === 0) {
+                delete _this._subscribed[type][id];
               }
             }
           }
-        }));
-      }
+        }
+      }));
     });
 
     _classPrivateFieldInitSpec(_assertThisInitialized(_this), _getUniqueSubs, {
@@ -266,27 +269,45 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       }
     });
 
+    _classPrivateFieldInitSpec(_assertThisInitialized(_this), _appendIfNotExistent, {
+      writable: true,
+      value: function value(arr, item) {
+        if (Object.values(arr).filter(function (_ref4) {
+          var subKey = _ref4.subKey;
+          return item.subKey === subKey;
+        }).length === 0) {
+          arr.push(item);
+        }
+      }
+    });
+
     _classPrivateFieldInitSpec(_assertThisInitialized(_this), _subscribeToObjects, {
       writable: true,
       value: function value(type, objectsToSubscribe, item) {
+        var _this$_subscribed$typ2, _, _this$_subscribed$typ3;
+
         var _iterator4 = _createForOfIteratorHelper(objectsToSubscribe),
             _step4;
 
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-            var _this$_subscribed$typ2, _this$_subscribed$typ3;
+            var _this$_subscribed$typ4, _this$_subscribed$typ5;
 
             var object = _step4.value;
             var id = object.getId();
-            (_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$typ5 = (_this$_subscribed$typ4 = _this._subscribed[type])[id]) !== null && _this$_subscribed$typ5 !== void 0 ? _this$_subscribed$typ5 : _this$_subscribed$typ4[id] = [];
 
-            _this._subscribed[type][id].push(item);
+            _classPrivateFieldGet(_assertThisInitialized(_this), _appendIfNotExistent).call(_assertThisInitialized(_this), _this._subscribed[type][id], item);
           }
         } catch (err) {
           _iterator4.e(err);
         } finally {
           _iterator4.f();
         }
+
+        (_this$_subscribed$typ3 = (_this$_subscribed$typ2 = _this._subscribed[type])[_ = "*"]) !== null && _this$_subscribed$typ3 !== void 0 ? _this$_subscribed$typ3 : _this$_subscribed$typ2[_] = [];
+
+        _classPrivateFieldGet(_assertThisInitialized(_this), _appendIfNotExistent).call(_assertThisInitialized(_this), _this._subscribed[type]["*"], item);
       }
     });
 
@@ -297,11 +318,11 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
           model: type
         });
 
-        return _this.refreshObjectByType(type).then(function (_ref4) {
-          var _ref5 = _slicedToArray(_ref4, 3),
-              inserted = _ref5[0],
-              updated = _ref5[1],
-              deleted = _ref5[2];
+        return _this.refreshObjectByType(type).then(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 3),
+              inserted = _ref6[0],
+              updated = _ref6[1],
+              deleted = _ref6[2];
 
           var item = _this.models[type];
           return Promise.all([_classPrivateMethodGet(_assertThisInitialized(_this), _propagateInsertChange, _propagateInsertChange2).call(_assertThisInitialized(_this), type, inserted), _classPrivateFieldGet(_assertThisInitialized(_this), _propagateChange).call(_assertThisInitialized(_this), updated), _classPrivateFieldGet(_assertThisInitialized(_this), _propagateChange).call(_assertThisInitialized(_this), deleted)]).then(function () {
@@ -412,34 +433,15 @@ function _propagateInsertChange2(type, newObjects) {
       }
 
       var possibleSubs = Object.values(uniqueSubs);
-      (0, _batchPromises["default"])(10, possibleSubs, function (_ref6) {
-        var callback = _ref6.callback,
-            filterFunction = _ref6.filterFunction;
+      (0, _batchPromises["default"])(10, possibleSubs, function (_ref7) {
+        var callback = _ref7.callback,
+            filterFunction = _ref7.filterFunction,
+            subKey = _ref7.subKey;
         var objectsToSubscribe = filterFunction ? newObjects.filter(filterFunction) : newObjects;
 
         if (objectsToSubscribe.length) {
           // Check if the new objects matter
           return _this4.find(type, filterFunction).then(function (data) {
-            var subKey;
-
-            var _iterator6 = _createForOfIteratorHelper(data),
-                _step6;
-
-            try {
-              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-                var d = _step6.value;
-
-                var item = _this4._subscribed[d.getModel().getType()][d.getId()];
-
-                subKey = item ? item.subKey : null;
-                if (subKey) break;
-              }
-            } catch (err) {
-              _iterator6.e(err);
-            } finally {
-              _iterator6.f();
-            }
-
             _classPrivateFieldGet(_this4, _subscribeToObjects).call(_this4, type, objectsToSubscribe, {
               callback: callback,
               filterFunction: filterFunction,