dataflux 1.18.8 → 1.18.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/Model.js CHANGED
@@ -352,6 +352,11 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
352
352
  _classPrivateFieldInitSpec(this, _updateObjects, function (objects) {
353
353
  var operation = "update";
354
354
  return (0, _modelHooksUtils.executeHook)(operation, _classPrivateFieldGet(_updateHook, _this), _classPrivateFieldGet(_unWrap, _this).call(_this, objects), _classPrivateFieldGet(_axios, _this)).then(function (data) {
355
+ if (Array.isArray(data) && Array.isArray(objects) && objects.length === data.length) {
356
+ for (var i = 0; i < data.length; i++) {
357
+ (0, _BasicObj.setValues)(data[i], _this, _SubObj["default"], objects[i], objects[i]);
358
+ }
359
+ }
355
360
  _classPrivateFieldGet(_cleanApiError, _this).call(_this, objects);
356
361
  return data;
357
362
  }).then(_classPrivateFieldGet(_toArray, _this))["catch"](function (error) {
@@ -66,7 +66,6 @@ var _getUniqueSubs = /*#__PURE__*/new WeakMap();
66
66
  var _propagateChange = /*#__PURE__*/new WeakMap();
67
67
  var _appendIfNotExistent = /*#__PURE__*/new WeakMap();
68
68
  var _subscribeToObjects = /*#__PURE__*/new WeakMap();
69
- var _merge = /*#__PURE__*/new WeakMap();
70
69
  var _ObserverStore_brand = /*#__PURE__*/new WeakSet();
71
70
  var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
72
71
  function ObserverStore(options) {
@@ -193,7 +192,7 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
193
192
  var type = objects === null || objects === void 0 || (_objects$ = objects[0]) === null || _objects$ === void 0 || (_objects$ = _objects$.getModel()) === null || _objects$ === void 0 ? void 0 : _objects$.getType();
194
193
  if (type) {
195
194
  var uniqueSubs = _classPrivateFieldGet(_getUniqueSubs, _this).call(_this, objects, type);
196
- (0, _batchPromises["default"])(10, uniqueSubs, function (_ref3) {
195
+ return (0, _batchPromises["default"])(10, uniqueSubs, function (_ref3) {
197
196
  var callback = _ref3.callback,
198
197
  filterFunction = _ref3.filterFunction;
199
198
  return _this.find(type, filterFunction).then(callback);
@@ -266,12 +265,6 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
266
265
  return Promise.all(Object.keys(_this.models).map(refreshByType));
267
266
  }
268
267
  });
269
- _classPrivateFieldInitSpec(_this, _merge, function (originalObject, newObject) {
270
- for (var key in newObject) {
271
- originalObject[key] = newObject[key];
272
- }
273
- originalObject.update();
274
- });
275
268
  _this._subscribed = {};
276
269
  _this._multipleSubscribed = {};
277
270
  if (options.autoRefresh && typeof options.autoRefresh === "number") {
@@ -283,28 +276,36 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
283
276
  return _createClass(ObserverStore, [{
284
277
  key: "update",
285
278
  value: function update(objects, skipSave) {
286
- if (!skipSave) {
287
- _classPrivateFieldGet(_propagateChange, this).call(this, objects);
279
+ var _objects$filter,
280
+ _this2 = this;
281
+ if (objects !== null && objects !== void 0 && (_objects$filter = objects.filter(function (i) {
282
+ return !!i;
283
+ })) !== null && _objects$filter !== void 0 && _objects$filter.length) {
284
+ if (!skipSave) {
285
+ _classPrivateFieldGet(_propagateChange, this).call(this, objects);
286
+ }
287
+ return _superPropGet(ObserverStore, "update", this, 3)([objects, skipSave]).then(function (data) {
288
+ return _classPrivateFieldGet(_propagateChange, _this2).call(_this2, data);
289
+ });
288
290
  }
289
- return _superPropGet(ObserverStore, "update", this, 3)([objects, skipSave]).then(_classPrivateFieldGet(_propagateChange, this));
290
291
  }
291
292
  }, {
292
293
  key: "insert",
293
294
  value: function insert(type, objects) {
294
- var _this2 = this;
295
+ var _this3 = this;
295
296
  objects = Array.isArray(objects) ? objects : [objects];
296
297
  return _superPropGet(ObserverStore, "insert", this, 3)([type, objects]).then(function (objects) {
297
- _assertClassBrand(_ObserverStore_brand, _this2, _propagateInsertChange).call(_this2, type, objects);
298
+ _assertClassBrand(_ObserverStore_brand, _this3, _propagateInsertChange).call(_this3, type, objects);
298
299
  return objects;
299
300
  });
300
301
  }
301
302
  }, {
302
303
  key: "mock",
303
304
  value: function mock(type, objects) {
304
- var _this3 = this;
305
+ var _this4 = this;
305
306
  objects = Array.isArray(objects) ? objects : [objects];
306
307
  return _superPropGet(ObserverStore, "mock", this, 3)([type, objects]).then(function (objects) {
307
- _assertClassBrand(_ObserverStore_brand, _this3, _propagateInsertChange).call(_this3, type, objects);
308
+ _assertClassBrand(_ObserverStore_brand, _this4, _propagateInsertChange).call(_this4, type, objects);
308
309
  return objects;
309
310
  });
310
311
  }
@@ -316,11 +317,11 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
316
317
  }]);
317
318
  }(_PersistentStore2["default"]);
318
319
  function _propagateInsertChange(type, newObjects) {
319
- var _this4 = this;
320
+ var _this5 = this;
320
321
  return (_classPrivateFieldGet(_unsubPromises, this).length ? Promise.all(_classPrivateFieldGet(_unsubPromises, this)) : Promise.resolve()).then(function () {
321
- if (_this4._subscribed[type]) {
322
+ if (_this5._subscribed[type]) {
322
323
  var uniqueSubs = {};
323
- var objects = Object.values(_this4._subscribed[type]);
324
+ var objects = Object.values(_this5._subscribed[type]);
324
325
  for (var _i = 0, _objects = objects; _i < _objects.length; _i++) {
325
326
  var object = _objects[_i];
326
327
  var _iterator5 = _createForOfIteratorHelper(object),
@@ -339,7 +340,7 @@ function _propagateInsertChange(type, newObjects) {
339
340
  }
340
341
  }
341
342
  var possibleSubs = Object.values(uniqueSubs);
342
- (0, _batchPromises["default"])(10, possibleSubs, function (_ref7) {
343
+ return (0, _batchPromises["default"])(10, possibleSubs, function (_ref7) {
343
344
  var callback = _ref7.callback,
344
345
  filterFunction = _ref7.filterFunction,
345
346
  subKey = _ref7.subKey;
@@ -347,8 +348,8 @@ function _propagateInsertChange(type, newObjects) {
347
348
  if (objectsToSubscribe.length) {
348
349
  // Check if the new objects matter
349
350
 
350
- return _this4.find(type, filterFunction).then(function (data) {
351
- _classPrivateFieldGet(_subscribeToObjects, _this4).call(_this4, type, objectsToSubscribe, {
351
+ return _this5.find(type, filterFunction).then(function (data) {
352
+ _classPrivateFieldGet(_subscribeToObjects, _this5).call(_this5, type, objectsToSubscribe, {
352
353
  callback: callback,
353
354
  filterFunction: filterFunction,
354
355
  subKey: subKey
@@ -60,12 +60,6 @@ var PersistentStore = exports["default"] = /*#__PURE__*/function (_Store) {
60
60
  deleted = _ref.deleted;
61
61
  if (inserted.length === 0 && updated.length === 0 && deleted.length === 0) {
62
62
  return true;
63
- } else if (_this.options.autoSave) {
64
- return _this._saveDiff(type, {
65
- inserted: inserted,
66
- updated: updated,
67
- deleted: deleted
68
- });
69
63
  } else {
70
64
  return Promise.reject("Save must be invoked manually");
71
65
  }
@@ -61,7 +61,7 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
61
61
  _classCallCheck(this, ReactStore);
62
62
  _this = _callSuper(this, ReactStore, [options]);
63
63
  _classPrivateMethodInitSpec(_this, _ReactStore_brand);
64
- _defineProperty(_this, "didUpdate", function (context) {
64
+ _defineProperty(_this, "didUpdate", function (context, who) {
65
65
  var _context$props;
66
66
  var objects = Object.values((_context$props = context === null || context === void 0 ? void 0 : context.props) !== null && _context$props !== void 0 ? _context$props : {}).filter(function (i) {
67
67
  var _i$isDataflux;