dataflux 1.18.10 → 1.19.1

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

@@ -8,11 +8,11 @@ exports["default"] = void 0;
 var _ObserverStore2 = _interopRequireDefault(require("./ObserverStore"));
 var _uuid = require("uuid");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
 function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
 function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
@@ -61,22 +61,37 @@ 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) {
+      var _context$___obs_sync_;
+      (_context$___obs_sync_ = context.___obs_sync_state) !== null && _context$___obs_sync_ !== void 0 ? _context$___obs_sync_ : context.___obs_sync_state = {};
+      if (context.___obs_sync_state && context.___obs_sync_state[key]) {
+        _this.unsubscribe(context.___obs_sync_state[key]);
+        delete context.___obs_sync_state[key];
+      }
+      if (object) {
+        if (object !== null && object !== void 0 && object.getParent) {
+          var parent = object.getParent();
+          context.___obs_sync_state[key] = _this.findOne(parent.getModel().getType(), key, context, function (n) {
+            return parent.getId() === n.getId() || parent.id === n.id;
+          });
+        } else {
+          context.___obs_sync_state[key] = _this.findOne(object.getModel().getType(), key, context, function (n) {
+            return object.getId() === n.getId() || object.id === n.id;
+          });
+        }
+        return context.___obs_sync_state[key];
+      } else {
+        context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, key, null)));
+      }
+    });
+    _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) {
@@ -123,6 +138,7 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
         }
       }, filterFunction);
       _classPrivateFieldGet(_addSubscriptionToContext, this).call(this, context, subKey);
+      return subKey;
     }
   }, {
     key: "findOne",
@@ -134,6 +150,7 @@ var ReactStore = exports["default"] = /*#__PURE__*/function (_ObserverStore) {
         }
       }, filterFunction);
       _classPrivateFieldGet(_addSubscriptionToContext, this).call(this, context, subKey);
+      return subKey;
     }
   }]);
 }(_ObserverStore2["default"]);