dataflux 1.18.10 → 1.19.0

package/dist/BasicObj.js

@@ -54,13 +54,28 @@ function setValues(values, model, SubObj, parent, context) {
       var mmnt = (0, _moment["default"])(value);
       context[key] = mmnt.isValid() ? mmnt : value;
     } else if (model.options.deep && value != null && _typeof(value) === "object" && !Array.isArray(value)) {
-      context[key] = new SubObj(parent, key, value, model);
+      if (context[key] && _typeof(context[key]) === "object") {
+        setValues(value, model, SubObj, parent, context[key]);
+      } else {
+        context[key] = new SubObj(parent, key, value, model);
+      }
     } else if (model.options.deep && value != null && Array.isArray(value) && !value.some(function (str) {
       return ["string", "number"].includes(_typeof(str));
     })) {
-      context[key] = value.map(function (i) {
-        return new SubObj(parent, key, i, model);
+      var out = [];
+      value.forEach(function (item, order) {
+        var _context$key;
+        var old = (_context$key = context[key]) === null || _context$key === void 0 ? void 0 : _context$key.find(function (i) {
+          return i.id === (item === null || item === void 0 ? void 0 : item.id);
+        });
+        if (old && old.id && _typeof(old) === "object") {
+          setValues(item, model, SubObj, parent, old);
+          out.push(old);
+        } else {
+          out.push(new SubObj(parent, key, item, model));
+        }
       });
+      context[key] = out;
     } else {
       context[key] = value;
     }

package/dist/Model.js

@@ -343,7 +343,7 @@ var Model = exports["default"] = /*#__PURE__*/_createClass(function Model(name)
   _classPrivateFieldInitSpec(this, _assignId, function (data, objects) {
     if (Array.isArray(data) && Array.isArray(objects) && objects.length === data.length) {
       for (var i = 0; i < data.length; i++) {
-        (0, _BasicObj.setValues)(data[i], _this, _SubObj["default"], null, objects[i]);
+        (0, _BasicObj.setValues)(data[i], _this, _SubObj["default"], objects[i], objects[i]);
         objects[i].setId(data[i].id);
         delete objects[i].setId;
       }

package/dist/ReactStore.js

@@ -61,22 +61,25 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
     _classCallCheck(this, ReactStore);
     _this = _callSuper(this, ReactStore, [options]);
     _classPrivateMethodInitSpec(_this, _ReactStore_brand);
-    _defineProperty(_this, "didUpdate", function (context, who) {
+    _defineProperty(_this, "syncState", function (object, key, context) {
+      if (object !== null && object !== void 0 && object.getParent) {
+        _this.findOne(object.getParent().getModel().getType(), key, context, function (n) {
+          return object.getParent().getId() === n.getId();
+        });
+      } else {
+        _this.findOne(object.getModel().getType(), key, context, function (n) {
+          return object.getId() === n.getId();
+        });
+      }
+    });
+    _defineProperty(_this, "didUpdate", function (context) {
       var _context$props;
       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) {
         var _i$isDataflux;
         return i === null || i === void 0 || (_i$isDataflux = i.isDataflux) === null || _i$isDataflux === void 0 ? void 0 : _i$isDataflux.call(i);
       });
       objects.forEach(function (object) {
-        if (object !== null && object !== void 0 && object.getParent) {
-          _this.findOne(object.getParent().getModel().getType(), (0, _uuid.v4)(), context, function (n) {
-            return object.getParent().getId() === n.getId();
-          });
-        } else {
-          _this.findOne(object.getModel().getType(), (0, _uuid.v4)(), context, function (n) {
-            return object.getId() === n.getId();
-          });
-        }
+        return _this.syncState(object, (0, _uuid.v4)(), context);
       });
     });
     _classPrivateFieldInitSpec(_this, _addSubscriptionToContext, function (context, subKey) {