dataflux 1.2.2 → 1.3.0

package/dist/Store.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 
-var _StoreObject = _interopRequireDefault(require("./StoreObject"));
+var _Obj = _interopRequireDefault(require("./Obj"));
 
 var _PubSub = _interopRequireDefault(require("./PubSub"));
 
@@ -17,21 +17,29 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 
 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 _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 _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); } }
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
+function _classPrivateFieldInitSpec(obj, privateMap, value) { _checkPrivateRedeclaration(obj, privateMap); privateMap.set(obj, value); }
+
 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 _classPrivateFieldGet(receiver, privateMap) { var descriptor = _classExtractFieldDescriptor(receiver, privateMap, "get"); return _classApplyDescriptorGet(receiver, descriptor); }
+
+function _classExtractFieldDescriptor(receiver, privateMap, action) { if (!privateMap.has(receiver)) { throw new TypeError("attempted to " + action + " private field on non-instance"); } return privateMap.get(receiver); }
+
+function _classApplyDescriptorGet(receiver, descriptor) { if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+
 function _classPrivateMethodGet(receiver, privateSet, fn) { if (!privateSet.has(receiver)) { throw new TypeError("attempted to get private field on non-instance"); } return fn; }
 
-var _deleteByObject = /*#__PURE__*/new WeakSet();
+var _error = /*#__PURE__*/new WeakSet();
+
+var _deleteByObject = /*#__PURE__*/new WeakMap();
 
 var _deleteByFilter = /*#__PURE__*/new WeakSet();
 
@@ -43,6 +51,8 @@ var _loadObjects = /*#__PURE__*/new WeakSet();
 
 var Store = /*#__PURE__*/function () {
   function Store() {
+    var _this = this;
+
     var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
     _classCallCheck(this, Store);
@@ -55,10 +65,23 @@ var Store = /*#__PURE__*/function () {
 
     _classPrivateMethodInitSpec(this, _deleteByFilter);
 
-    _classPrivateMethodInitSpec(this, _deleteByObject);
+    _classPrivateMethodInitSpec(this, _error);
+
+    _classPrivateFieldInitSpec(this, _deleteByObject, {
+      writable: true,
+      value: function value(object) {
+        var id = object.getId();
+
+        var filterFunction = function filterFunction(item) {
+          return id === item.getId();
+        };
+
+        return _classPrivateMethodGet(_this, _deleteByFilter, _deleteByFilter2).call(_this, object.getModel().getType(), filterFunction);
+      }
+    });
 
     this.options = {
-      autoSave: options.autoSave !== undefined ? options.autoSave : 5000,
+      autoSave: options.autoSave !== undefined ? options.autoSave : true,
       saveDelay: options.saveDelay || 1000,
       lazyLoad: options.lazyLoad || false
     };
@@ -83,65 +106,75 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "addModel",
     value: function addModel(model) {
-      var _this = this;
+      var _this2 = this;
 
       return new Promise(function (resolve, reject) {
-        _this.validateModel(model);
+        _this2.validateModel(model);
 
         var type = model.getType();
 
-        if (!_this.models[type]) {
-          _this.models[type] = {
+        if (!_this2.models[type]) {
+          _this2.models[type] = {
             model: model,
             storedObjects: {}
           };
-          model.setStore(_this);
+          model.setStore(_this2);
 
-          if (!_this.options.lazyLoad) {
-            resolve(_classPrivateMethodGet(_this, _loadObjects, _loadObjects2).call(_this, type));
+          if (!_this2.options.lazyLoad) {
+            resolve(_classPrivateMethodGet(_this2, _loadObjects, _loadObjects2).call(_this2, type));
           } else {
             resolve();
           }
         } else {
-          reject("The model already exists");
+          var error = "The model already exists";
+
+          _this2.pubSub.publish("error", error);
+
+          reject(error);
         }
       });
     }
   }, {
     key: "update",
     value: function update(objects) {
-      return Promise.resolve(); // Nothing to do at this level
+      return Promise.resolve(objects); // Nothing to do at this level
     }
   }, {
     key: "delete",
     value: function _delete(typeOrObjects, filterFunction) {
       if (typeof typeOrObjects === "string" && typeof filterFunction === "function") {
-        return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, typeOrObjects, filterFunction);
-      } else if (_typeof(typeOrObjects) === "object" && typeOrObjects.length) {
-        return Promise.all(typeOrObjects.map(_classPrivateMethodGet(this, _deleteByObject, _deleteByObject2)));
+        var type = typeOrObjects;
+        return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, type, filterFunction);
+      } else if (Array.isArray(typeOrObjects) && typeOrObjects.length && !filterFunction) {
+        var objects = typeOrObjects;
+        return Promise.all(objects.map(_classPrivateFieldGet(this, _deleteByObject))).then(function (data) {
+          return data.flat();
+        });
       } else {
-        return Promise.reject("Invalid delete request. You have to provide a list of objects or a type and a filter function");
+        var error = "Invalid delete request. You have to provide a list of objects or a type and a filter function";
+        this.pubSub.publish("error", error);
+        return Promise.reject(error);
       }
     }
   }, {
     key: "insert",
     value: function insert(type, objects) {
-      var _this2 = this;
+      var _this3 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         return objects.map(function (object) {
-          return _classPrivateMethodGet(_this2, _insertObject, _insertObject2).call(_this2, type, object, true);
+          return _classPrivateMethodGet(_this3, _insertObject, _insertObject2).call(_this3, type, object, true);
         });
       });
     }
   }, {
     key: "get",
     value: function get(type, id) {
-      var _this3 = this;
+      var _this4 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
         try {
-          return _this3.models[type].storedObjects[id].object;
+          return _this4.models[type].storedObjects[id].object;
         } catch (error) {
           return Promise.reject("Object not found");
         }
@@ -150,17 +183,17 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "find",
     value: function find(type, filterFunction) {
-      var _this4 = this;
+      var _this5 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-        var all = Object.values(_this4.models[type].storedObjects).filter(function (i) {
+        var all = Object.values(_this5.models[type].storedObjects).filter(function (i) {
           return i.status !== "deleted";
         }).map(function (i) {
           return i.object;
         });
         return filterFunction ? all.filter(filterFunction) : all;
       })["catch"](function (error) {
-        _this4.pubSub.publish("error", error);
+        _this5.pubSub.publish("error", error);
 
         return Promise.reject(error);
       });
@@ -168,7 +201,7 @@ var Store = /*#__PURE__*/function () {
   }, {
     key: "applyDiff",
     value: function applyDiff(_ref, type) {
-      var _this5 = this;
+      var _this6 = this;
 
       var _ref$inserted = _ref.inserted,
           inserted = _ref$inserted === void 0 ? [] : _ref$inserted,
@@ -185,7 +218,7 @@ var Store = /*#__PURE__*/function () {
             for (_iterator.s(); !(_step = _iterator.n()).done;) {
               var object = _step.value;
 
-              var item = _this5.models[type || object.object.getModel().getType()].storedObjects[object.id];
+              var item = _this6.models[type || object.object.getModel().getType()].storedObjects[object.id];
 
               item.fingerprint = object.object.getFingerprint();
               item.status = "old";
@@ -202,7 +235,7 @@ var Store = /*#__PURE__*/function () {
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var _object = _step2.value;
-              delete _this5.models[type || _object.object.getModel().getType()].storedObjects[_object.id];
+              delete _this6.models[type || _object.object.getModel().getType()].storedObjects[_object.id];
             }
           } catch (err) {
             _iterator2.e(err);
@@ -216,13 +249,19 @@ var Store = /*#__PURE__*/function () {
         }
       });
     }
+  }, {
+    key: "hasChanged",
+    value: function hasChanged(type, object) {
+      var obj = this.models[type].storedObjects[object.getId()];
+      return obj.fingerprint !== obj.object.getFingerprint();
+    }
   }, {
     key: "getDiff",
     value: function getDiff(type) {
-      var _this6 = this;
+      var _this7 = this;
 
       return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-        var objects = Object.values(_this6.models[type].storedObjects);
+        var objects = Object.values(_this7.models[type].storedObjects);
         var inserted = [];
         var updated = [];
         var deleted = [];
@@ -234,7 +273,7 @@ var Store = /*#__PURE__*/function () {
             inserted.push(object);
           } else if (object.status === "deleted") {
             deleted.push(object);
-          } else if (object.fingerprint !== object.object.getFingerprint()) {
+          } else if (_this7.hasChanged(type, object.object)) {
             updated.push(object);
           }
         }
@@ -253,17 +292,17 @@ var Store = /*#__PURE__*/function () {
 
 exports["default"] = Store;
 
-function _deleteByObject2(object) {
-  return _classPrivateMethodGet(this, _deleteByFilter, _deleteByFilter2).call(this, object.getType(), function (item) {
-    return object.getId() === item.getId();
-  });
+function _error2(error) {
+  error = error.message || error;
+  this.pubSub.publish("error", error);
+  return Promise.reject(error);
 }
 
 function _deleteByFilter2(type, filterFunction) {
-  var _this7 = this;
+  var _this8 = this;
 
   return _classPrivateMethodGet(this, _getPromise, _getPromise2).call(this, type).then(function () {
-    var deleted = Object.values(_this7.models[type].storedObjects).filter(function (i) {
+    var deleted = Object.values(_this8.models[type].storedObjects).filter(function (i) {
       return filterFunction(i.object);
     });
 
@@ -281,12 +320,14 @@ function _deleteByFilter2(type, filterFunction) {
       _iterator3.f();
     }
 
-    return true;
+    return deleted.map(function (i) {
+      return i.object;
+    });
   });
 }
 
 function _getPromise2(type) {
-  var _this8 = this;
+  var _this9 = this;
 
   if (!this.models[type]) {
     return Promise.reject("The model doesn't exist");
@@ -294,7 +335,7 @@ function _getPromise2(type) {
     return Promise.reject("The model is not loaded");
   } else if (!this.models[type].promise && this.options.lazyLoad) {
     return _classPrivateMethodGet(this, _loadObjects, _loadObjects2).call(this, type).then(function () {
-      return _this8.models[type].promise;
+      return _this9.models[type].promise;
     });
   } else {
     return this.models[type].promise;
@@ -304,7 +345,7 @@ function _getPromise2(type) {
 function _insertObject2(type, item) {
   var markAsNew = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
   var model = this.models[type].model;
-  var wrapper = new _StoreObject["default"](item, model);
+  var wrapper = new _Obj["default"](item, model);
   var id = wrapper.getId();
 
   if (this.models[type].storedObjects[id]) {
@@ -321,7 +362,7 @@ function _insertObject2(type, item) {
 }
 
 function _loadObjects2(type) {
-  var _this9 = this;
+  var _this10 = this;
 
   var item = this.models[type];
   this.pubSub.publish("loading", {
@@ -336,7 +377,7 @@ function _loadObjects2(type) {
       for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
         var _item = _step4.value;
 
-        _classPrivateMethodGet(_this9, _insertObject, _insertObject2).call(_this9, type, _item, false);
+        _classPrivateMethodGet(_this10, _insertObject, _insertObject2).call(_this10, type, _item, false);
       }
     } catch (err) {
       _iterator4.e(err);
@@ -344,7 +385,7 @@ function _loadObjects2(type) {
       _iterator4.f();
     }
 
-    _this9.pubSub.publish("loading", {
+    _this10.pubSub.publish("loading", {
       status: "end",
       model: type
     });

package/dist/fingerprint.js

@@ -5,6 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = fingerprint;
 
+var _moment = _interopRequireDefault(require("moment"));
+
+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); }
@@ -18,7 +22,15 @@ var CRC32 = require('crc-32');
 var _getFingerprint = function _getFingerprint(object) {
   switch (_typeof(object)) {
     case "object":
-      return "o:".concat(object !== null ? getObjectFingerprint(object) : "null");
+      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";
+      }
 
     case "boolean":
       return "b:".concat(object ? "t" : "f");

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "dataflux",
-  "version": "1.2.2",
+  "version": "1.3.0",
   "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",
   "scripts": {
     "babel": "node_modules/.bin/babel",
-    "test": "./node_modules/.bin/mocha tests --require @babel/register",
+    "test": "./node_modules/.bin/mocha tests/*.test.js --require @babel/register --exit",
     "compile": "rm -rf dist/ && ./node_modules/.bin/babel src -d dist",
     "release": "dotenv release-it"
   },
@@ -86,14 +86,18 @@
     "@babel/plugin-transform-runtime": "^7.16.10",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
+    "chai": "^4.3.4",
+    "chai-subset": "^1.6.0",
     "dotenv-cli": "^4.1.1",
-    "release-it": "^14.12.3"
+    "mocha": "^9.2.0",
+    "release-it": "^14.12.4"
   },
   "dependencies": {
     "axios": "^0.25.0",
     "batch-promises": "^0.0.3",
     "brembo": "^2.0.6",
     "crc-32": "^1.2.0",
+    "moment": "^2.29.1",
     "uuid": "^8.3.2"
   },
   "resolutions": {}