dataflux 1.5.3 → 1.6.1

package/CNAME

@@ -0,0 +1 @@
+dataflux.js.org

package/README.md

@@ -456,20 +456,21 @@ author1.getRelation("book", (book) => book.price < 20)
 
 The store has the following method.
 
-| Method                                                 | Description                                                                                                                                                                                                                                                                                                                                                                                                        |
-|--------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| on(event, callback)                                    | Method to subscribe to the events emitted by the store. See [events](#store-events) below.                                                                                                                                                                                                                                                                                                                         |
-| addModel(model)                                        | Introduce a new model to the store. If lazyLoad = false (default), the model is populated with the objects coming from the API.                                                                                                                                                                                                                                                                                    |
-| get(type, id)                                          | It allows to retrieve an object based on its type and store's ID (see `getId()` in [objects methods](#objects-methods). The type is the name of the model.                                                                                                                                                                                                                                                         |
-| find(type, filterFunction)                             | The promise-oriented method to access objects given a type and a filter function. If the filter function is missing, all the objects are returned. See [example 1](#example-1).                                                                                                                                                                                                                                    |
-| delete(objects)                                        | It deletes an array of objects. See [example 1](#example-3).                                                                                                                                                                                                                                                                                                                                                       |
-| delete(type, filterFunction)                           | It deleted objects given an array and a filter function. See [example 1](#example-3).                                                                                                                                                                                                                                                                                                                              |
-| insert(type, object)                                   | It creates a new object of a given type and inserts it in the store.                                                                                                                                                                                                                                                                                                                                               |
-| subscribe(type, callback, filterFunction)              | The callback-oriented method to access objects given a type and a filter function. It returns the key of the subscription, needed to unsubscribe. If the filter function is missing, all the objects are returned. **DataFlux remembers your query and calls the callback every time any change is affecting the result of your query.** See [example 5](#example-5---observability).                              |
-| multipleSubscribe(subscriptions, callback)             | A method to subscribe to multiple models. The first parameter is an array of models' names and filterFunctions, the second parameter is the callback to be called when the cumulative dataset is ready. E.g., `multipleSubscribe([["book", filterFunction1], ["author", filterFunction2]], callback)`. It returns the key of the subscription. See [example 5](#example-5---observability).                        |
-| unsubscribe(key)                                       | Method to terminate a subscription given a subscription key. See [example 5](#example-5---observability).                                                                                                                                                                                                                                                                                                          |
-| findOne(type, stateAttribute, context, filterFunction) | This method automatically injects and updates the React state with the requested data. If multiple objects satisfy the query, only the first is selected. The `stateAttribute` is the name of the attribute that will be added/updated in the state, the `context` is the React.Component. It automatically unsubscribe when the React.Component will unmount. See [example 6](#example-6---observability--react). |
-| findAll(type, stateAttribute, context, filterFunction) | This method automatically injects and updates the React state with the requested data. The `stateAttribute` is the name of the attribute that will be added/updated in the state, the `context` is the React.Component. It automatically unsubscribe when the React.Component will unmount. If the filter function is missing, all the objects are returned. See [example 6](#example-6---observability--react).   |
+| Method                                                 | Description                                                                                                                                                                                                                                                                                                                                                                                                                                         |
+|--------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| on(event, callback)                                    | Method to subscribe to the events emitted by the store. See [events](#store-events) below.                                                                                                                                                                                                                                                                                                                                                          |
+| addModel(model)                                        | Introduce a new model to the store. If lazyLoad = false (default), the model is populated with the objects coming from the API.                                                                                                                                                                                                                                                                                                                     |
+| get(type, id)                                          | It allows to retrieve an object based on its type and store's ID (see `getId()` in [objects methods](#objects-methods). The type is the name of the model.                                                                                                                                                                                                                                                                                          |
+| find(type, filterFunction)                             | The promise-oriented method to access objects given a type and a filter function. If the filter function is missing, all the objects are returned. See [example 1](#example-1).                                                                                                                                                                                                                                                                     |
+| delete(objects)                                        | It deletes an array of objects. See [example 1](#example-3).                                                                                                                                                                                                                                                                                                                                                                                        |
+| delete(type, filterFunction)                           | It deleted objects given an array and a filter function. See [example 1](#example-3).                                                                                                                                                                                                                                                                                                                                                               |
+| insert(type, object)                                   | It creates a new object of a given type and inserts it in the store.                                                                                                                                                                                                                                                                                                                                                                                |
+| subscribe(type, callback, filterFunction)              | The callback-oriented method to access objects given a type and a filter function. It returns the key of the subscription, needed to unsubscribe. If the filter function is missing, all the objects are returned. **DataFlux remembers your query and calls the callback every time any change is affecting the result of your query.** See [example 5](#example-5---observability).                                                               |
+| multipleSubscribe(subscriptions, callback)             | A method to subscribe to multiple models. The first parameter is an array of models' names and filterFunctions, the second parameter is the callback to be called when the cumulative dataset is ready. E.g., `multipleSubscribe([["book", filterFunction1], ["author", filterFunction2]], callback)`. It returns the key of the subscription. See [example 5](#example-5---observability).                                                         |
+| unsubscribe(key)                                       | Method to terminate a subscription given a subscription key. See [example 5](#example-5---observability).                                                                                                                                                                                                                                                                                                                                           |
+| findOne(type, stateAttribute, context, filterFunction) | This method automatically injects and updates the React state with the requested data. If multiple objects satisfy the query, only the first is selected. The `stateAttribute` is the name of the attribute that will be added/updated in the state, the `context` is the React.Component. It automatically unsubscribe when the React.Component will unmount. See [example 6](#example-6---observability--react).                                  |
+| findAll(type, stateAttribute, context, filterFunction) | This method automatically injects and updates the React state with the requested data. The `stateAttribute` is the name of the attribute that will be added/updated in the state, the `context` is the React.Component. It automatically unsubscribe when the React.Component will unmount. If the filter function is missing, all the objects are returned. See [example 6](#example-6---observability--react).                                    |
+| preload(type)                                          | This method allows to preLoad all objects of a given model. If you initialize the store with `lazyLoad:true`, the objects of a model are retrieved from the API at the first query performed on that model (e.g., at the first `.find()`). However, sometimes you may want to speed up the first query by pre loading the objects of a specific model while keeping `lazyLoad:true` on the store; in such a case you can use `store.preload(type)`. |
 
 ## Store events
 The store emits the following events:

package/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

package/dist/BasicObj.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.dateRegex = exports.BasicObj = void 0;
+exports.setValues = setValues;
 
 var _moment = _interopRequireDefault(require("moment/moment"));
 
@@ -33,9 +34,30 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 var dateRegex = new RegExp("^[0-9][0-9][0-9][0-9]-[0-9].*T[0-9].*Z$");
 exports.dateRegex = dateRegex;
 
+function setValues(values, model, SubObj, parent, context) {
+  Object.keys(values).forEach(function (key) {
+    var value = values[key];
+
+    if (model.options.parseMoment && value != null && dateRegex.test(value)) {
+      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);
+    } else if (model.options.deep && value != null && Array.isArray(value)) {
+      context[key] = value.map(function (i) {
+        return new SubObj(parent, key, i, model);
+      });
+    } else {
+      context[key] = value;
+    }
+  });
+}
+
 var _setHidden = /*#__PURE__*/new WeakMap();
 
 var _id = /*#__PURE__*/new WeakMap();
@@ -100,14 +122,16 @@ var BasicObj = /*#__PURE__*/_createClass(function BasicObj(values, model) {
     for (var _i = 0, _attrs = attrs; _i < _attrs.length; _i++) {
       var a = _attrs[_i];
 
-      if (_this[a] instanceof _moment["default"]) {
+      if (_this[a] == null) {
+        out[a] = _this[a];
+      } else if (_this[a] instanceof _moment["default"]) {
         out[a] = _this[a].toISOString();
       } else if (_this[a] instanceof Date) {
         out[a] = (0, _moment["default"])(_this[a]).toISOString();
-      } else if (_this[a].toJSON) {
+      } else if (_typeof(_this[a]) === "object" && _this[a].toJSON) {
         out[a] = _this[a].toJSON();
       } else if (Array.isArray(_this[a]) && _this[a].every(function (i) {
-        return i.toJSON;
+        return _typeof(i) === "object" && i.toJSON;
       })) {
         out[a] = _this[a].map(function (i) {
           return i.toJSON();

package/dist/Model.js

@@ -11,6 +11,10 @@ var _batchPromises = _interopRequireDefault(require("batch-promises"));
 
 var _axios2 = _interopRequireDefault(require("axios"));
 
+var _BasicObj = require("./BasicObj");
+
+var _SubObj = _interopRequireDefault(require("./SubObj"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
@@ -23,6 +27,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -194,7 +202,7 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _defineProperty(this, "load", function (obj) {
     if (_classPrivateFieldGet(_this, _loadFunction)) {
-      return _this.getStore().whenSaved(_this.getType())["catch"](function () {
+      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());
@@ -211,7 +219,8 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
           return res;
         }
       }).then(function (data) {
-        return applyData(obj, data);
+        (0, _BasicObj.setValues)(data, _this, _SubObj["default"], null, obj);
+        return data;
       })["catch"](function (error) {
         return _classPrivateMethodGet(_this, _error, _error2).call(_this, error);
       });
@@ -245,7 +254,7 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
     var filterRelation = _classPrivateFieldGet(_this, _includes)[includedType];
 
     if (filterRelation) {
-      return parentObject.load()["catch"](function () {}).then(function () {
+      return (parentObject.getModel().options.load ? parentObject.load()["catch"](function () {}) : Promise.resolve()).then(function () {
         return _this.getStore().find(includedType, function (item) {
           return filterRelation(parentObject, item);
         }).then(function (data) {
@@ -376,20 +385,20 @@ var Model = /*#__PURE__*/_createClass(function Model(name) {
 
   _classPrivateFieldSet(this, _type, name);
 
-  this.options = {
+  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
-  };
+  });
 
   _classPrivateFieldSet(this, _store, null);
 
   _classPrivateFieldSet(this, _includes, {});
 
-  _classPrivateFieldSet(this, _axios, options.axios || _axios2["default"]);
+  _classPrivateFieldSet(this, _axios, this.options.axios || _axios2["default"]);
 
-  _classPrivateFieldSet(this, _hiddenFields, options.hiddenFields || []);
+  _classPrivateFieldSet(this, _hiddenFields, this.options.hiddenFields || []);
 
-  _classPrivateFieldSet(this, _loadFunction, options.load || null);
+  _classPrivateFieldSet(this, _loadFunction, this.options.load || null);
 
   if (!name || !options) {
     throw new Error("A Model requires at least a name and a hook");

package/dist/Obj.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,18 +9,12 @@ exports["default"] = void 0;
 
 var _fingerprint = _interopRequireDefault(require("./fingerprint"));
 
-var _uuid = require("uuid");
-
 var _BasicObj2 = require("./BasicObj");
 
-var _moment = _interopRequireDefault(require("moment/moment"));
-
 var _SubObj = _interopRequireDefault(require("./SubObj"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -110,22 +106,7 @@ var Obj = /*#__PURE__*/function (_BasicObj) {
       return _this.getModel().getStore().update([_assertThisInitialized(_this)]);
     });
 
-    Object.keys(values).forEach(function (key) {
-      var value = values[key];
-
-      if (_model.options.parseMoment && _BasicObj2.dateRegex.test(value)) {
-        var mmnt = (0, _moment["default"])(value);
-        _this[key] = mmnt.isValid() ? mmnt : value;
-      } else if (_model.options.deep && _typeof(value) === "object" && !Array.isArray(value)) {
-        _this[key] = new _SubObj["default"](_assertThisInitialized(_this), key, value, _model);
-      } else if (_model.options.deep && Array.isArray(value)) {
-        _this[key] = value.map(function (i) {
-          return new _SubObj["default"](_assertThisInitialized(_this), key, i, _model);
-        });
-      } else {
-        _this[key] = value;
-      }
-    });
+    (0, _BasicObj2.setValues)(values, _model, _SubObj["default"], _assertThisInitialized(_this), _assertThisInitialized(_this));
 
     _this.getModel = function () {
       return _model;

package/dist/PersistentStore.js

@@ -11,6 +11,12 @@ var _Store2 = _interopRequireDefault(require("./Store"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -196,12 +202,27 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
     value: function update(objects, skipSave) {
       var _this5 = this;
 
-      return _get(_getPrototypeOf(PersistentStore.prototype), "update", this).call(this, objects).then(function (data) {
-        if (!skipSave) {
+      return _get(_getPrototypeOf(PersistentStore.prototype), "update", this).call(this, objects).then(function (objects) {
+        if (skipSave) {
+          var _iterator = _createForOfIteratorHelper(objects),
+              _step;
+
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var object = _step.value;
+              var type = object.getModel().getType();
+              _this5.models[type].storedObjects[object.getId()].fingerprint = object.getFingerprint();
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        } else {
           _this5.delayedSave();
         }
 
-        return data;
+        return objects;
       });
     }
   }]);

package/dist/ReactStore.js

@@ -9,14 +9,18 @@ exports["default"] = void 0;
 
 var _ObserverStore2 = _interopRequireDefault(require("./ObserverStore"));
 
-var _this = void 0;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -41,43 +45,19 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 function _classPrivateMethodInitSpec(obj, privateSet) { _checkPrivateRedeclaration(obj, privateSet); privateSet.add(obj); }
 
-function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
-
-function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
-
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, 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 normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
 
-var addSubscriptionToContext = function addSubscriptionToContext(context, subKey) {
-  // I know...
-  context.___obs_subkeys = context.___obs_subkeys || [];
+function _checkPrivateRedeclaration(obj, privateCollection) { if (privateCollection.has(obj)) { throw new TypeError("Cannot initialize the same private elements twice on an object"); } }
 
-  context.___obs_subkeys.push(subKey);
+function _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
 
-  context.___obs_unsubscribe = function () {
-    var _iterator = _createForOfIteratorHelper(context.___obs_subkeys || []),
-        _step;
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
 
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var key = _step.value;
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
-        _this.unsubscribe(key);
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-  };
+function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
-  context.componentWillUnmount = function () {
-    context.___obs_unsubscribe();
-  };
-};
+var _addSubscriptionToContext = /*#__PURE__*/new WeakMap();
 
 var _fixState = /*#__PURE__*/new WeakSet();
 
@@ -87,22 +67,57 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
   var _super = _createSuper(ReactStore);
 
   function ReactStore(options) {
-    var _this2;
+    var _this;
 
     _classCallCheck(this, ReactStore);
 
-    _this2 = _super.call(this, options);
+    _this = _super.call(this, options);
+
+    _classPrivateMethodInitSpec(_assertThisInitialized(_this), _fixState);
+
+    _classPrivateFieldInitSpec(_assertThisInitialized(_this), _addSubscriptionToContext, {
+      writable: true,
+      value: function value(context, subKey) {
+        // I know...
+        context.___obs_subkeys = context.___obs_subkeys || [];
+
+        context.___obs_subkeys.push(subKey);
+
+        context.___obs_unsubscribe_context = _assertThisInitialized(_this);
 
-    _classPrivateMethodInitSpec(_assertThisInitialized(_this2), _fixState);
+        context.___obs_unsubscribe = function () {
+          var _iterator = _createForOfIteratorHelper(context.___obs_subkeys || []),
+              _step;
 
-    _defineProperty(_assertThisInitialized(_this2), "handleChange", function (object, name) {
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              var key = _step.value;
+
+              context.___obs_unsubscribe_context.unsubscribe(key);
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+        };
+
+        context.componentWillUnmount = function () {
+          context.___obs_unsubscribe();
+        };
+      }
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "handleChange", function (object, name) {
       return function (event, rawValue) {
+        var _ref;
+
         var value = event ? event.target.type === "checkbox" ? event.target.checked : event.target.value : "";
-        object.set(name, value || rawValue || "");
+        object.set(name, (_ref = value !== null && value !== void 0 ? value : rawValue) !== null && _ref !== void 0 ? _ref : "");
       };
     });
 
-    return _this2;
+    return _this;
   }
 
   _createClass(ReactStore, [{
@@ -113,7 +128,8 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
       var subKey = this.subscribe(type, function (data) {
         context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data || [])));
       }, filterFunction);
-      addSubscriptionToContext(context, subKey);
+
+      _classPrivateFieldGet(this, _addSubscriptionToContext).call(this, context, subKey);
     }
   }, {
     key: "findOne",
@@ -123,7 +139,8 @@ var ReactStore = /*#__PURE__*/function (_ObserverStore) {
       var subKey = this.subscribe(type, function (data) {
         context.setState(_objectSpread(_objectSpread({}, context.state), {}, _defineProperty({}, stateAttribute, data && data.length ? data[0] : null)));
       }, filterFunction);
-      addSubscriptionToContext(context, subKey);
+
+      _classPrivateFieldGet(this, _addSubscriptionToContext).call(this, context, subKey);
     }
   }]);
 

package/dist/Store.js

@@ -255,6 +255,11 @@ var Store = /*#__PURE__*/function () {
       var obj = this.models[type].storedObjects[object.getId()];
       return obj.fingerprint !== obj.object.getFingerprint();
     }
+  }, {
+    key: "preload",
+    value: function preload(type) {
+      return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type);
+    }
   }, {
     key: "getDiff",
     value: function getDiff(type) {

package/dist/SubObj.js

@@ -1,5 +1,7 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,12 +9,6 @@ exports["default"] = void 0;
 
 var _BasicObj2 = require("./BasicObj");
 
-var _moment = _interopRequireDefault(require("moment/moment"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -110,22 +106,7 @@ var SubObj = /*#__PURE__*/function (_BasicObj) {
 
     _classPrivateFieldSet(_assertThisInitialized(_this), _parentField, field);
 
-    Object.keys(values).forEach(function (key) {
-      var value = values[key];
-
-      if (model.options.parseMoment && _BasicObj2.dateRegex.test(value)) {
-        var mmnt = (0, _moment["default"])(value);
-        _this[key] = mmnt.isValid() ? mmnt : value;
-      } else if (model.options.deep && _typeof(value) === "object" && !Array.isArray(value)) {
-        _this[key] = new SubObj(_classPrivateFieldGet(_assertThisInitialized(_this), _parent), key, value, model);
-      } else if (model.options.deep && Array.isArray(value)) {
-        _this[key] = value.map(function (i) {
-          return new SubObj(_classPrivateFieldGet(_assertThisInitialized(_this), _parent), key, i, model);
-        });
-      } else {
-        _this[key] = value;
-      }
-    });
+    (0, _BasicObj2.setValues)(values, model, SubObj, _classPrivateFieldGet(_assertThisInitialized(_this), _parent), _assertThisInitialized(_this));
     return _this;
   }
 

package/dist/fingerprint.js

@@ -22,14 +22,14 @@ var CRC32 = require('crc-32');
 var _getFingerprint = function _getFingerprint(object) {
   switch (_typeof(object)) {
     case "object":
-      if (object._isAMomentObject) {
+      if (object == null) {
+        return "o:null";
+      } else if (object._isAMomentObject) {
         return "m:".concat(object.toISOString());
       } else if (object instanceof Date) {
         return "m:".concat((0, _moment["default"])(object).toISOString());
-      } else if (object !== null) {
-        return "o:".concat(getObjectFingerprint(object));
       } else {
-        return "o:null";
+        return "o:".concat(getObjectFingerprint(object));
       }
 
     case "boolean":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataflux",
-  "version": "1.5.3",
+  "version": "1.6.1",
   "description": "DataFlux, automatically interfaces with your REST APIs to create a 2-way-synced local data store. Transparently manages data propagation in the React state.",
   "main": "dist/index.js",
   "bin": "dist/index.js",
@@ -77,16 +77,16 @@
     }
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.8",
-    "@babel/core": "^7.16.12",
+    "@babel/cli": "^7.17.0",
+    "@babel/core": "^7.17.0",
     "@babel/node": "^7.16.8",
     "@babel/plugin-proposal-class-properties": "^7.16.7",
     "@babel/plugin-proposal-object-rest-spread": "^7.16.7",
     "@babel/plugin-transform-async-to-generator": "^7.16.8",
-    "@babel/plugin-transform-runtime": "^7.16.10",
+    "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
-    "chai": "^4.3.4",
+    "chai": "^4.3.6",
     "chai-subset": "^1.6.0",
     "dotenv-cli": "^4.1.1",
     "mocha": "^9.2.0",
@@ -96,7 +96,7 @@
     "axios": "^0.25.0",
     "batch-promises": "^0.0.3",
     "brembo": "^2.0.6",
-    "crc-32": "^1.2.0",
+    "crc-32": "^1.2.1",
     "moment": "^2.29.1",
     "uuid": "^8.3.2"
   },