dataflux 1.4.2 → 1.4.3

package/README.md

@@ -178,7 +178,8 @@ const subscriptions = [
     ["author"], // No filter function, all objects returned
 ];
 
-const callback = ([books, authors]) => {
+const callback = (data) => {
+    const {book, author} = data;
     // Objects are ready
 };
 

package/dist/ObserverStore.js

@@ -15,19 +15,19 @@ var _PersistentStore2 = _interopRequireDefault(require("./PersistentStore"));
 
 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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-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 _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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 _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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -92,13 +92,28 @@ 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;
+      var dataPayload = {};
+
+      var areAllDone = function areAllDone() {
+        return subscriptions.map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 1),
+              name = _ref2[0];
+
+          return name;
+        }).every(function (name) {
+          return dataPayload[name] !== undefined;
         });
-        return _this.subscribe(sub[0], sub[1], function (data) {
-          attrs[index] = data;
-          return callback.apply(void 0, _toConsumableArray(attrs));
+      };
+
+      return Promise.all(subscriptions.map(function (sub, index) {
+        var _sub = _slicedToArray(sub, 2),
+            name = _sub[0],
+            _sub$ = _sub[1],
+            filterFunction = _sub$ === void 0 ? null : _sub$;
+
+        return _this.subscribe(name, filterFunction, function (data) {
+          dataPayload[name] = data;
+          return areAllDone() && callback(dataPayload);
         });
       })).then(function (subKeys) {
         var subKey = (0, _uuid.v4)();
@@ -209,9 +224,9 @@ var ObserverStore = /*#__PURE__*/function (_PersistentStore) {
 
           var uniqueSubs = _classPrivateFieldGet(_assertThisInitialized(_this), _getUniqueSubs).call(_assertThisInitialized(_this), objects, type);
 
-          (0, _batchPromises["default"])(10, uniqueSubs, function (_ref) {
-            var callback = _ref.callback,
-                filterFunction = _ref.filterFunction;
+          (0, _batchPromises["default"])(10, uniqueSubs, function (_ref3) {
+            var callback = _ref3.callback,
+                filterFunction = _ref3.filterFunction;
             return _this.find(type, filterFunction).then(callback);
           });
         }
@@ -284,8 +299,8 @@ function _propagateInsertChange2(type, newObjects) {
     var uniqueSubs = {};
     var objects = Object.values(this._subscribed[type]);
 
-    for (var _i = 0, _objects = objects; _i < _objects.length; _i++) {
-      var object = _objects[_i];
+    for (var _i2 = 0, _objects = objects; _i2 < _objects.length; _i2++) {
+      var object = _objects[_i2];
 
       var _iterator5 = _createForOfIteratorHelper(object),
           _step5;
@@ -306,9 +321,9 @@ function _propagateInsertChange2(type, newObjects) {
     }
 
     var possibleSubs = Object.values(uniqueSubs);
-    (0, _batchPromises["default"])(10, possibleSubs, function (_ref2) {
-      var callback = _ref2.callback,
-          filterFunction = _ref2.filterFunction;
+    (0, _batchPromises["default"])(10, possibleSubs, function (_ref4) {
+      var callback = _ref4.callback,
+          filterFunction = _ref4.filterFunction;
       var objectsToSubscribe = filterFunction ? newObjects.filter(filterFunction) : newObjects;
 
       if (objectsToSubscribe.length) {

package/package.json

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