dataflux 1.2.3 → 1.4.0

package/dist/{StoreObject.js → Obj.js}

@@ -9,6 +9,8 @@ var _fingerprint = _interopRequireDefault(require("./fingerprint"));
 
 var _uuid = require("uuid");
 
+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); } }
@@ -33,8 +35,12 @@ function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!priva
 
 function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
 
+var dateRegex = new RegExp("^[0-9][0-9][0-9][0-9]-[0-9].*T[0-9].*Z$");
+
 var _loaded = /*#__PURE__*/new WeakMap();
 
+var _setHidden = /*#__PURE__*/new WeakMap();
+
 var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
   var _this = this;
 
@@ -45,6 +51,11 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
     value: false
   });
 
+  _classPrivateFieldInitSpec(this, _setHidden, {
+    writable: true,
+    value: {}
+  });
+
   _defineProperty(this, "load", function () {
     if (_classPrivateFieldGet(_this, _loaded)) {
       return Promise.resolve(_this);
@@ -54,7 +65,7 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
       return model.load(_this).then(function () {
         _classPrivateFieldSet(_this, _loaded, true);
 
-        return model.getStore().update([_this]); // Propagate update
+        return model.getStore().update([_this], true); // Propagate update
       }).then(function () {
         return _this;
       }); // return always this
@@ -66,21 +77,25 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
   });
 
   _defineProperty(this, "get", function (attribute) {
-    return _this[attribute];
+    return _classPrivateFieldGet(_this, _setHidden)[attribute] || _this[attribute];
   });
 
   _defineProperty(this, "getRelation", function (type, filterFunction) {
     return _this.getModel().getRelation(_this, type, filterFunction);
   });
 
-  _defineProperty(this, "set", function (attribute, value) {
-    if (attribute === "id") {
-      throw new Error("You cannot change the ID");
-    }
+  _defineProperty(this, "set", function (attribute, value, hidden) {
+    if (hidden) {
+      _classPrivateFieldGet(_this, _setHidden)[attribute] = value;
+    } else {
+      if (attribute === "id") {
+        throw new Error("You cannot change the ID");
+      }
 
-    _this[attribute] = value;
+      _this[attribute] = value;
+    }
 
-    _this.getModel().getStore().update([_this]);
+    return _this.getModel().getStore().update([_this]);
   });
 
   _defineProperty(this, "save", function () {
@@ -98,7 +113,11 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
     for (var _i = 0, _attrs = attrs; _i < _attrs.length; _i++) {
       var a = _attrs[_i];
 
-      if (typeof _this[a] !== "function") {
+      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 (typeof _this[a] !== "function") {
         out[a] = _this[a];
       }
     }
@@ -114,9 +133,17 @@ var Obj = /*#__PURE__*/_createClass(function Obj(values, _model) {
     return _model;
   };
 
-  Object.keys(values).forEach(function (key) {
-    _this[key] = values[key];
-  });
+  var frEach = _model.options.parseMoment ? function (key) {
+    if (dateRegex.test(values[key])) {
+      var mmnt = (0, _moment["default"])(values[key]);
+      _this[key] = mmnt.isValid() ? mmnt : values[key];
+    } else {
+      _this[key] = values[key];
+    }
+  } : function (key) {
+    return _this[key] = values[key];
+  };
+  Object.keys(values).forEach(frEach);
   var id;
 
   if (this.id && (typeof this.id === "string" || typeof this.id === "number")) {

package/dist/ObserverStore.js

@@ -17,8 +17,16 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
 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"); } }
@@ -83,6 +91,22 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
     _classPrivateMethodInitSpec(_assertThisInitialized(_this), _propagateInsertChange);
 
+    _defineProperty(_assertThisInitialized(_this), "multipleSubscribe", function (subscriptions, callback) {
+      return Promise.all(subscriptions.map(function (sub, index) {
+        var attrs = Array.from(Array(index + 1)).map(function () {
+          return null;
+        });
+        return _this.subscribe(sub[0], sub[1], function (data) {
+          attrs[index] = data;
+          return callback.apply(void 0, _toConsumableArray(attrs));
+        });
+      })).then(function (subKeys) {
+        var subKey = (0, _uuid.v4)();
+        _this._multipleSubscribed[subKey] = subKeys;
+        return subKey;
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "subscribe", function (type, callback, filterFunction) {
       var subKey = (0, _uuid.v4)();
 
@@ -104,14 +128,33 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
     });
 
     _defineProperty(_assertThisInitialized(_this), "unsubscribe", function (key) {
-      for (var type in _this._subscribed) {
-        for (var id in _this._subscribed[type]) {
-          _this._subscribed[type][id] = _this._subscribed[type][id].filter(function (i) {
-            return i.subKey !== key;
-          });
+      if (_this._multipleSubscribed[key]) {
+        var _iterator = _createForOfIteratorHelper(_this._multipleSubscribed[key]),
+            _step;
+
+        try {
+          for (_iterator.s(); !(_step = _iterator.n()).done;) {
+            var sub = _step.value;
 
-          if (_this._subscribed[type][id].length === 0) {
-            delete _this._subscribed[type][id];
+            _this.unsubscribe(sub);
+          }
+        } catch (err) {
+          _iterator.e(err);
+        } finally {
+          _iterator.f();
+        }
+
+        delete _this._multipleSubscribed[key];
+      } else {
+        for (var type in _this._subscribed) {
+          for (var id in _this._subscribed[type]) {
+            _this._subscribed[type][id] = _this._subscribed[type][id].filter(function (i) {
+              return i.subKey !== key;
+            });
+
+            if (_this._subscribed[type][id].length === 0) {
+              delete _this._subscribed[type][id];
+            }
           }
         }
       }
@@ -122,34 +165,34 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
       value: function value(objects, type) {
         var out = {};
 
-        var _iterator = _createForOfIteratorHelper(objects),
-            _step;
+        var _iterator2 = _createForOfIteratorHelper(objects),
+            _step2;
 
         try {
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            var object = _step.value;
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var object = _step2.value;
             var objectId = object.getId();
             var typeChannel = _this._subscribed[type] || {};
             var subscribedToObject = typeChannel[objectId] || [];
 
-            var _iterator2 = _createForOfIteratorHelper(subscribedToObject),
-                _step2;
+            var _iterator3 = _createForOfIteratorHelper(subscribedToObject),
+                _step3;
 
             try {
-              for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                var sub = _step2.value;
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                var sub = _step3.value;
                 out[sub.subKey] = out[sub.subKey] || sub;
               }
             } catch (err) {
-              _iterator2.e(err);
+              _iterator3.e(err);
             } finally {
-              _iterator2.f();
+              _iterator3.f();
             }
           }
         } catch (err) {
-          _iterator.e(err);
+          _iterator2.e(err);
         } finally {
-          _iterator.f();
+          _iterator2.f();
         }
 
         return Object.values(out);
@@ -180,12 +223,12 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
     _classPrivateFieldInitSpec(_assertThisInitialized(_this), _subscribeToObjects, {
       writable: true,
       value: function value(type, objectsToSubscribe, item) {
-        var _iterator3 = _createForOfIteratorHelper(objectsToSubscribe),
-            _step3;
+        var _iterator4 = _createForOfIteratorHelper(objectsToSubscribe),
+            _step4;
 
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var object = _step3.value;
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var object = _step4.value;
             var id = object.getId();
 
             if (!_this._subscribed[type][id]) {
@@ -195,21 +238,22 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
             _this._subscribed[type][id].push(item);
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator3.f();
+          _iterator4.f();
         }
       }
     });
 
     _this._subscribed = {};
+    _this._multipleSubscribed = {};
     return _this;
   }
 
   _createClass(ObserverStore, [{
     key: "update",
-    value: function update(objects) {
-      return _get(_getPrototypeOf(ObserverStore.prototype), "update", this).call(this, objects).then(_classPrivateFieldGet(this, _propagateChange));
+    value: function update(objects, skipSave) {
+      return _get(_getPrototypeOf(ObserverStore.prototype), "update", this).call(this, objects, skipSave).then(_classPrivateFieldGet(this, _propagateChange));
     }
   }, {
     key: "insert",
@@ -243,21 +287,21 @@ function _propagateInsertChange2(type, newObjects) {
     for (var _i = 0, _objects = objects; _i < _objects.length; _i++) {
       var object = _objects[_i];
 
-      var _iterator4 = _createForOfIteratorHelper(object),
-          _step4;
+      var _iterator5 = _createForOfIteratorHelper(object),
+          _step5;
 
       try {
-        for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-          var sub = _step4.value;
+        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+          var sub = _step5.value;
 
           if (!uniqueSubs[sub.subKey]) {
             uniqueSubs[sub.subKey] = sub;
           }
         }
       } catch (err) {
-        _iterator4.e(err);
+        _iterator5.e(err);
       } finally {
-        _iterator4.f();
+        _iterator5.f();
       }
     }
 
@@ -272,12 +316,12 @@ function _propagateInsertChange2(type, newObjects) {
         return _this3.find(type, filterFunction).then(function (data) {
           var subKey;
 
-          var _iterator5 = _createForOfIteratorHelper(data),
-              _step5;
+          var _iterator6 = _createForOfIteratorHelper(data),
+              _step6;
 
           try {
-            for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-              var d = _step5.value;
+            for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+              var d = _step6.value;
 
               var item = _this3._subscribed[d.getModel().getType()][d.getId()];
 
@@ -285,9 +329,9 @@ function _propagateInsertChange2(type, newObjects) {
               if (subKey) break;
             }
           } catch (err) {
-            _iterator5.e(err);
+            _iterator6.e(err);
           } finally {
-            _iterator5.f();
+            _iterator6.f();
           }
 
           _classPrivateFieldGet(_this3, _subscribeToObjects).call(_this3, type, objectsToSubscribe, {

package/dist/PersistentStore.js

@@ -49,11 +49,35 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
 
     _this = _super.call(this, options);
 
+    _defineProperty(_assertThisInitialized(_this), "whenSaved", function (type) {
+      return _this.getDiff(type).then(function (_ref) {
+        var inserted = _ref.inserted,
+            updated = _ref.updated,
+            deleted = _ref.deleted;
+
+        if (inserted.length === 0 && updated.length === 0 && deleted.length === 0) {
+          return true;
+        } else if (_this.options.autoSave) {
+          return _this._saveDiff(type, {
+            inserted: inserted,
+            updated: updated,
+            deleted: deleted
+          });
+        } else {
+          return Promise.reject("Save must be invoked manually");
+        }
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "save", function () {
       _this._busy = true;
 
       _this.pubSub.publish("save", "start");
 
+      if (_this._delayedSaveTimer) {
+        clearTimeout(_this._delayedSaveTimer);
+      }
+
       return Promise.all(Object.keys(_this.models).map(_this._saveByType)).then(function (data) {
         _this._busy = false;
 
@@ -71,33 +95,43 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       });
     });
 
+    _defineProperty(_assertThisInitialized(_this), "_saveDiff", function (type, _ref2) {
+      var inserted = _ref2.inserted,
+          updated = _ref2.updated,
+          deleted = _ref2.deleted;
+      var model = _this.models[type].model; // Operations order:
+      // 1) insert
+      // 2) update
+      // 3) delete
+
+      return model.insertObjects(inserted.map(function (i) {
+        return i.object;
+      })).then(function () {
+        return _this.applyDiff({
+          inserted: inserted
+        }, type);
+      }).then(function () {
+        return model.updateObjects(updated.map(function (i) {
+          return i.object;
+        }));
+      }).then(function () {
+        return _this.applyDiff({
+          updated: updated
+        }, type);
+      }).then(function () {
+        return model.deleteObjects(deleted.map(function (i) {
+          return i.object;
+        }));
+      }).then(function () {
+        return _this.applyDiff({
+          deleted: deleted
+        }, type);
+      });
+    });
+
     _defineProperty(_assertThisInitialized(_this), "_saveByType", function (type) {
-      return _this.getDiff(type).then(function (_ref) {
-        var inserted = _ref.inserted,
-            updated = _ref.updated,
-            deleted = _ref.deleted;
-        var model = _this.models[type].model; // Operations order:
-        // 1) insert
-        // 2) update
-        // 3) delete
-
-        return model.insertObjects(inserted).then(function () {
-          return _this.applyDiff({
-            inserted: inserted
-          }, type);
-        }).then(function () {
-          return model.updateObjects(updated);
-        }).then(function () {
-          return _this.applyDiff({
-            updated: updated
-          }, type);
-        }).then(function () {
-          return model.deleteObjects(deleted);
-        }).then(function () {
-          return _this.applyDiff({
-            deleted: deleted
-          }, type);
-        });
+      return _this.getDiff(type).then(function (diff) {
+        return _this._saveDiff(type, diff);
       });
     });
 
@@ -131,8 +165,7 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
       var _this2 = this;
 
       this._busy = true;
-
-      _get(_getPrototypeOf(PersistentStore.prototype), "addModel", this).call(this, model).then(function () {
+      return _get(_getPrototypeOf(PersistentStore.prototype), "addModel", this).call(this, model).then(function () {
         _this2._busy = false;
       });
     }
@@ -160,11 +193,13 @@ var PersistentStore = /*#__PURE__*/function (_Store) {
     }
   }, {
     key: "update",
-    value: function update(objects) {
+    value: function update(objects, skipSave) {
       var _this5 = this;
 
       return _get(_getPrototypeOf(PersistentStore.prototype), "update", this).call(this, objects).then(function (data) {
-        _this5.delayedSave();
+        if (!skipSave) {
+          _this5.delayedSave();
+        }
 
         return data;
       });