dataflux 1.6.0 → 1.6.1

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/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/SubObj.js

@@ -9,10 +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 _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; }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataflux",
-  "version": "1.6.0",
+  "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",