@hrforte/react-pivottable 2.2.2 → 3.0.0

package/dist/Utilities.js

@@ -712,11 +712,9 @@ var AggregatorCell = function () {
   _createClass(AggregatorCell, [{
     key: 'push',
     value: function push(record) {
-      var _this = this;
-
-      Object.keys(this.instances).forEach(function (key) {
-        _this.instances[key].push(record);
-      });
+      for (var key in this.instances) {
+        this.instances[key].push(record);
+      }
     }
   }, {
     key: 'getInstance',
@@ -725,8 +723,13 @@ var AggregatorCell = function () {
       if (targetKey && this.instances[targetKey]) {
         return this.instances[targetKey];
       }
-      var first = this.instances[this.primaryKey] || this.instances[Object.keys(this.instances)[0]];
-      return first || null;
+      if (this.instances[this.primaryKey]) {
+        return this.instances[this.primaryKey];
+      }
+      for (var _key2 in this.instances) {
+        return this.instances[_key2];
+      }
+      return null;
     }
   }]);
 
@@ -787,6 +790,7 @@ var dayNamesEn = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'];
 var zeroPad = function zeroPad(number) {
   return ('0' + number).substr(-2, 2);
 }; // eslint-disable-line no-magic-numbers
+var FLAT_KEY_SEPARATOR = String.fromCharCode(0);
 
 var derivers = {
   bin: function bin(col, binWidth) {
@@ -839,7 +843,7 @@ Data Model class
 
 var PivotData = function () {
   function PivotData() {
-    var _this2 = this;
+    var _this = this;
 
     var inputProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
@@ -850,9 +854,11 @@ var PivotData = function () {
 
     this.aggregations = this.normalizeAggregations();
     this.aggregationKeyLookup = {};
-    this.aggregations.forEach(function (agg) {
-      if (!(agg.aggregatorName in _this2.aggregationKeyLookup)) {
-        _this2.aggregationKeyLookup[agg.aggregatorName] = agg.key;
+    this.aggregationIndexLookup = {};
+    this.aggregations.forEach(function (agg, index) {
+      _this.aggregationIndexLookup[agg.key] = index;
+      if (!(agg.aggregatorName in _this.aggregationKeyLookup)) {
+        _this.aggregationKeyLookup[agg.aggregatorName] = agg.key;
       }
     });
     if (this.aggregations.length === 0) {
@@ -878,8 +884,8 @@ var PivotData = function () {
     }
 
     PivotData.forEachRecord(this.props.data, this.props.derivedAttributes, function (record) {
-      if (_this2.filter(record)) {
-        _this2.processRecord(record);
+      if (_this.filter(record)) {
+        _this.processRecord(record);
       }
     });
   }
@@ -895,21 +901,22 @@ var PivotData = function () {
   _createClass(PivotData, [{
     key: 'hydrateFromPrecomputed',
     value: function hydrateFromPrecomputed(precomputed) {
-      var _this3 = this;
+      var _this2 = this;
 
       // One real aggregator instance per aggregation provides `format()` and
       // `numInputs` for every hydrated stub cell.
       var formatSources = {};
       this.aggregations.forEach(function (agg) {
-        formatSources[agg.key] = _this3.aggregatorFactories[agg.key](_this3, [], []);
+        formatSources[agg.key] = _this2.aggregatorFactories[agg.key](_this2, [], []);
       });
+      this.precomputedFormatSources = formatSources;
 
       var makeCell = function makeCell(serializedCell) {
-        var values = serializedCell && serializedCell.values || {};
+        var values = Array.isArray(serializedCell) ? serializedCell : serializedCell && serializedCell.values || {};
         var instances = {};
-        _this3.aggregations.forEach(function (agg) {
+        _this2.aggregations.forEach(function (agg, index) {
           var source = formatSources[agg.key];
-          var _value = values[agg.key];
+          var _value = Array.isArray(values) ? values[index] : values[agg.key];
           instances[agg.key] = {
             push: function push() {},
             value: function value() {
@@ -923,7 +930,7 @@ var PivotData = function () {
             outlet: source.outlet
           };
         });
-        return new AggregatorCell(instances, _this3.primaryAggregation.key);
+        return new AggregatorCell(instances, _this2.primaryAggregation.key);
       };
 
       var hydrateTotals = function hydrateTotals(source, target) {
@@ -944,8 +951,8 @@ var PivotData = function () {
       hydrateTotals(precomputed.colTotals, this.colTotals);
       this.tree = {};
       Object.keys(precomputed.tree || {}).forEach(function (flatRowKey) {
-        _this3.tree[flatRowKey] = {};
-        hydrateTotals(precomputed.tree[flatRowKey], _this3.tree[flatRowKey]);
+        _this2.tree[flatRowKey] = {};
+        hydrateTotals(precomputed.tree[flatRowKey], _this2.tree[flatRowKey]);
       });
       this.allTotal = makeCell(precomputed.allTotal);
 
@@ -953,6 +960,40 @@ var PivotData = function () {
       // thread when a sorter could not cross the worker boundary (functions).
       this.sorted = !sortersHaveFunctions(this.props.sorters);
     }
+
+    // Virtualized worker results keep cell values in the worker. Convert one
+    // serialized viewport cell into an aggregator only when that cell is about
+    // to render, instead of hydrating every pivot cell on the main thread.
+
+  }, {
+    key: 'getPrecomputedAggregator',
+    value: function getPrecomputedAggregator(serializedCell, aggregationKey) {
+      if (!serializedCell) {
+        return PivotData.emptyAggregator;
+      }
+      var resolvedKey = aggregationKey;
+      if (resolvedKey && !(resolvedKey in this.aggregatorFactories) && this.aggregationKeyLookup[resolvedKey]) {
+        resolvedKey = this.aggregationKeyLookup[resolvedKey];
+      }
+      var source = this.precomputedFormatSources && this.precomputedFormatSources[resolvedKey];
+      if (!source) {
+        return PivotData.emptyAggregator;
+      }
+      var values = Array.isArray(serializedCell) ? serializedCell : serializedCell.values || {};
+      var _value2 = Array.isArray(values) ? values[this.aggregationIndexLookup[resolvedKey]] : values[resolvedKey];
+      return {
+        push: function push() {},
+        value: function value() {
+          return _value2;
+        },
+        format: function format(x) {
+          return source.format(x);
+        },
+
+        numInputs: source.numInputs,
+        outlet: source.outlet
+      };
+    }
   }, {
     key: 'filter',
     value: function filter(record) {
@@ -966,10 +1007,10 @@ var PivotData = function () {
   }, {
     key: 'forEachMatchingRecord',
     value: function forEachMatchingRecord(criteria, callback) {
-      var _this4 = this;
+      var _this3 = this;
 
       return PivotData.forEachRecord(this.props.data, this.props.derivedAttributes, function (record) {
-        if (!_this4.filter(record)) {
+        if (!_this3.filter(record)) {
           return;
         }
         for (var k in criteria) {
@@ -984,7 +1025,7 @@ var PivotData = function () {
   }, {
     key: 'arrSort',
     value: function arrSort(attrs) {
-      var _this5 = this;
+      var _this4 = this;
 
       var a = void 0;
       var sortersArr = function () {
@@ -997,7 +1038,7 @@ var PivotData = function () {
           for (var _iterator2 = Array.from(attrs)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
             a = _step2.value;
 
-            result.push(getSort(_this5.props.sorters, a));
+            result.push(getSort(_this4.props.sorters, a));
           }
         } catch (err) {
           _didIteratorError2 = true;
@@ -1052,12 +1093,12 @@ var PivotData = function () {
   }, {
     key: 'sortKeys',
     value: function sortKeys() {
-      var _this6 = this;
+      var _this5 = this;
 
       if (!this.sorted) {
         this.sorted = true;
         var v = function v(r, c) {
-          return _this6.getAggregator(r, c).value();
+          return _this5.getAggregator(r, c).value();
         };
 
         // Handle per-row sorting
@@ -1065,11 +1106,11 @@ var PivotData = function () {
           var rowSorts = this.props.rowSorts;
           this.rowKeys.sort(function (a, b) {
             // First, check if any sorted attribute has a difference
-            for (var i = 0; i < _this6.props.rows.length; i++) {
-              var attr = _this6.props.rows[i];
+            for (var i = 0; i < _this5.props.rows.length; i++) {
+              var attr = _this5.props.rows[i];
               if (attr && rowSorts[attr]) {
                 var sortDir = rowSorts[attr] === 'ASC' ? 1 : -1;
-                var sorter = getSort(_this6.props.sorters, attr);
+                var sorter = getSort(_this5.props.sorters, attr);
                 var comparison = sorter(a[i] || '', b[i] || '');
                 if (comparison !== 0) {
                   return sortDir * comparison;
@@ -1077,7 +1118,7 @@ var PivotData = function () {
               }
             }
             // If sorted attributes are equal, use default sorting for remaining attributes
-            return _this6.arrSort(_this6.props.rows)(a, b);
+            return _this5.arrSort(_this5.props.rows)(a, b);
           });
         } else {
           // Use global row order
@@ -1102,11 +1143,11 @@ var PivotData = function () {
           var colSorts = this.props.colSorts;
           this.colKeys.sort(function (a, b) {
             // First, check if any sorted attribute has a difference
-            for (var i = 0; i < _this6.props.cols.length; i++) {
-              var attr = _this6.props.cols[i];
+            for (var i = 0; i < _this5.props.cols.length; i++) {
+              var attr = _this5.props.cols[i];
               if (attr && colSorts[attr]) {
                 var sortDir = colSorts[attr] === 'ASC' ? 1 : -1;
-                var sorter = getSort(_this6.props.sorters, attr);
+                var sorter = getSort(_this5.props.sorters, attr);
                 var comparison = sorter(a[i] || '', b[i] || '');
                 if (comparison !== 0) {
                   return sortDir * comparison;
@@ -1114,7 +1155,7 @@ var PivotData = function () {
               }
             }
             // If sorted attributes are equal, use default sorting for remaining attributes
-            return _this6.arrSort(_this6.props.cols)(a, b);
+            return _this5.arrSort(_this5.props.cols)(a, b);
           });
         } else {
           // Use global col order
@@ -1153,58 +1194,16 @@ var PivotData = function () {
       // this code is called in a tight loop
       var colKey = [];
       var rowKey = [];
-      var _iteratorNormalCompletion4 = true;
-      var _didIteratorError4 = false;
-      var _iteratorError4 = undefined;
-
-      try {
-        for (var _iterator4 = Array.from(this.props.cols)[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-          var x = _step4.value;
-
-          colKey.push(x in record ? record[x] : 'null');
-        }
-      } catch (err) {
-        _didIteratorError4 = true;
-        _iteratorError4 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion4 && _iterator4.return) {
-            _iterator4.return();
-          }
-        } finally {
-          if (_didIteratorError4) {
-            throw _iteratorError4;
-          }
-        }
+      for (var index = 0; index < this.props.cols.length; index += 1) {
+        var x = this.props.cols[index];
+        colKey.push(x in record ? record[x] : 'null');
       }
-
-      var _iteratorNormalCompletion5 = true;
-      var _didIteratorError5 = false;
-      var _iteratorError5 = undefined;
-
-      try {
-        for (var _iterator5 = Array.from(this.props.rows)[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-          var _x17 = _step5.value;
-
-          rowKey.push(_x17 in record ? record[_x17] : 'null');
-        }
-      } catch (err) {
-        _didIteratorError5 = true;
-        _iteratorError5 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion5 && _iterator5.return) {
-            _iterator5.return();
-          }
-        } finally {
-          if (_didIteratorError5) {
-            throw _iteratorError5;
-          }
-        }
+      for (var _index = 0; _index < this.props.rows.length; _index += 1) {
+        var _x17 = this.props.rows[_index];
+        rowKey.push(_x17 in record ? record[_x17] : 'null');
       }
-
-      var flatRowKey = rowKey.join(String.fromCharCode(0));
-      var flatColKey = colKey.join(String.fromCharCode(0));
+      var flatRowKey = rowKey.join(FLAT_KEY_SEPARATOR);
+      var flatColKey = colKey.join(FLAT_KEY_SEPARATOR);
 
       this.allTotal.push(record);
 
@@ -1253,8 +1252,8 @@ var PivotData = function () {
     key: 'getAggregatorCell',
     value: function getAggregatorCell(rowKey, colKey) {
       var cell = void 0;
-      var flatRowKey = rowKey.join(String.fromCharCode(0));
-      var flatColKey = colKey.join(String.fromCharCode(0));
+      var flatRowKey = rowKey.join(FLAT_KEY_SEPARATOR);
+      var flatColKey = colKey.join(FLAT_KEY_SEPARATOR);
       if (rowKey.length === 0 && colKey.length === 0) {
         cell = this.allTotal;
       } else if (rowKey.length === 0) {
@@ -1358,25 +1357,25 @@ var PivotData = function () {
   }, {
     key: 'buildAggregatorFactories',
     value: function buildAggregatorFactories() {
-      var _this7 = this;
+      var _this6 = this;
 
       var factories = {};
       this.aggregations.forEach(function (agg) {
-        if (!(agg.aggregatorName in _this7.props.aggregators)) {
+        if (!(agg.aggregatorName in _this6.props.aggregators)) {
           throw new Error('unknown aggregator ' + agg.aggregatorName);
         }
-        factories[agg.key] = _this7.props.aggregators[agg.aggregatorName](agg.vals);
+        factories[agg.key] = _this6.props.aggregators[agg.aggregatorName](agg.vals);
       });
       return factories;
     }
   }, {
     key: 'createAggregatorCell',
     value: function createAggregatorCell(rowKey, colKey) {
-      var _this8 = this;
+      var _this7 = this;
 
       var instances = {};
       this.aggregations.forEach(function (agg) {
-        instances[agg.key] = _this8.aggregatorFactories[agg.key](_this8, rowKey, colKey);
+        instances[agg.key] = _this7.aggregatorFactories[agg.key](_this7, rowKey, colKey);
       });
       return new AggregatorCell(instances, this.primaryAggregation.key);
     }
@@ -1419,97 +1418,23 @@ PivotData.forEachRecord = function (input, derivedAttributes, f) {
   } else if (Array.isArray(input)) {
     if (Array.isArray(input[0])) {
       // array of arrays
-      return function () {
-        var result = [];
-        var _iteratorNormalCompletion6 = true;
-        var _didIteratorError6 = false;
-        var _iteratorError6 = undefined;
-
-        try {
-          for (var _iterator6 = Object.keys(input || {})[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-            var i = _step6.value;
-
-            var compactRecord = input[i];
-            if (i > 0) {
-              record = {};
-              var _iteratorNormalCompletion7 = true;
-              var _didIteratorError7 = false;
-              var _iteratorError7 = undefined;
-
-              try {
-                for (var _iterator7 = Object.keys(input[0] || {})[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-                  var j = _step7.value;
-
-                  var k = input[0][j];
-                  record[k] = compactRecord[j];
-                }
-              } catch (err) {
-                _didIteratorError7 = true;
-                _iteratorError7 = err;
-              } finally {
-                try {
-                  if (!_iteratorNormalCompletion7 && _iterator7.return) {
-                    _iterator7.return();
-                  }
-                } finally {
-                  if (_didIteratorError7) {
-                    throw _iteratorError7;
-                  }
-                }
-              }
-
-              result.push(addRecord(record));
-            }
-          }
-        } catch (err) {
-          _didIteratorError6 = true;
-          _iteratorError6 = err;
-        } finally {
-          try {
-            if (!_iteratorNormalCompletion6 && _iterator6.return) {
-              _iterator6.return();
-            }
-          } finally {
-            if (_didIteratorError6) {
-              throw _iteratorError6;
-            }
-          }
+      var headers = input[0] || [];
+      for (var i = 1; i < input.length; i += 1) {
+        var compactRecord = input[i];
+        record = {};
+        for (var j = 0; j < headers.length; j += 1) {
+          record[headers[j]] = compactRecord[j];
         }
-
-        return result;
-      }();
+        addRecord(record);
+      }
+      return null;
     }
 
     // array of objects
-    return function () {
-      var result1 = [];
-      var _iteratorNormalCompletion8 = true;
-      var _didIteratorError8 = false;
-      var _iteratorError8 = undefined;
-
-      try {
-        for (var _iterator8 = Array.from(input)[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
-          record = _step8.value;
-
-          result1.push(addRecord(record));
-        }
-      } catch (err) {
-        _didIteratorError8 = true;
-        _iteratorError8 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion8 && _iterator8.return) {
-            _iterator8.return();
-          }
-        } finally {
-          if (_didIteratorError8) {
-            throw _iteratorError8;
-          }
-        }
-      }
-
-      return result1;
-    }();
+    for (var _i = 0; _i < input.length; _i += 1) {
+      addRecord(input[_i]);
+    }
+    return null;
   }
   throw new Error('unknown input format');
 };