@deephaven/iris-grid 1.22.1 → 1.22.2-alpha-pivot-builder.0

package/dist/IrisGridUtils.js

@@ -4,6 +4,12 @@ function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i
 function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+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(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
+function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
@@ -48,29 +54,21 @@ class IrisGridUtils {
    * @returns An object that can be stringified and imported with {{@link hydrateGridState}}
    */
   static dehydrateGridState(model, gridState) {
-    var {
-      isStuckToBottom,
-      isStuckToRight,
-      movedColumns,
-      movedRows
-    } = gridState;
-    var {
-      columns
-    } = model;
+    var isStuckToBottom = gridState.isStuckToBottom,
+      isStuckToRight = gridState.isStuckToRight,
+      movedColumns = gridState.movedColumns,
+      movedRows = gridState.movedRows;
+    var columns = model.columns;
     return {
       isStuckToBottom,
       isStuckToRight,
       movedColumns: [...movedColumns].filter(_ref => {
-        var {
-          to,
-          from
-        } = _ref;
+        var to = _ref.to,
+          from = _ref.from;
         return isValidIndex(to, columns) && (typeof from === 'number' && isValidIndex(from, columns) || Array.isArray(from) && isValidIndex(from[0], columns) && isValidIndex(from[1], columns));
       }).map(_ref2 => {
-        var {
-          to,
-          from
-        } = _ref2;
+        var to = _ref2.to,
+          from = _ref2.from;
         return {
           to: columns[to].name,
           from: Array.isArray(from) ? [columns[from[0]].name, columns[from[1]].name] : columns[from].name
@@ -88,40 +86,30 @@ class IrisGridUtils {
    */
   static hydrateGridState(model, gridState) {
     var customColumns = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
-    var {
-      isStuckToBottom,
-      isStuckToRight,
-      movedColumns,
-      movedRows
-    } = gridState;
-    var {
-      columns
-    } = model;
+    var isStuckToBottom = gridState.isStuckToBottom,
+      isStuckToRight = gridState.isStuckToRight,
+      movedColumns = gridState.movedColumns,
+      movedRows = gridState.movedRows;
+    var columns = model.columns;
     var customColumnNames = IrisGridUtils.parseCustomColumnNames(customColumns);
     var columnNames = columns.map(_ref3 => {
-      var {
-        name
-      } = _ref3;
+      var name = _ref3.name;
       return name;
     }).concat(customColumnNames);
     return {
       isStuckToBottom,
       isStuckToRight,
       movedColumns: [...movedColumns].map(_ref4 => {
-        var {
-          to,
-          from
-        } = _ref4;
+        var to = _ref4.to,
+          from = _ref4.from;
         var getIndex = x => typeof x === 'string' ? columnNames.findIndex(name => name === x) : x;
         return {
           to: getIndex(to),
           from: Array.isArray(from) ? [getIndex(from[0]), getIndex(from[1])] : getIndex(from)
         };
       }).filter(_ref5 => {
-        var {
-          to,
-          from
-        } = _ref5;
+        var to = _ref5.to,
+          from = _ref5.from;
         return isValidIndex(to, columnNames) && (typeof from === 'number' && isValidIndex(from, columnNames) || Array.isArray(from) && isValidIndex(from[0], columnNames) && isValidIndex(from[1], columnNames));
       }),
       movedRows: [...movedRows]
@@ -135,11 +123,9 @@ class IrisGridUtils {
    * @returns The dehydrated IrisGridPanel state
    */
   static dehydrateIrisGridPanelState(model, irisGridPanelState) {
-    var {
-      isSelectingPartition,
-      partitions,
-      advancedSettings
-    } = irisGridPanelState;
+    var isSelectingPartition = irisGridPanelState.isSelectingPartition,
+      partitions = irisGridPanelState.partitions,
+      advancedSettings = irisGridPanelState.advancedSettings;
 
     // Return value will be serialized, should not contain undefined
     return {
@@ -156,10 +142,8 @@ class IrisGridUtils {
    * @returns The state to apply to the IrisGridPanel
    */
   static hydrateIrisGridPanelState(model, irisGridPanelState) {
-    var {
-      isSelectingPartition,
-      advancedSettings
-    } = irisGridPanelState;
+    var isSelectingPartition = irisGridPanelState.isSelectingPartition,
+      advancedSettings = irisGridPanelState.advancedSettings;
     var partitions = [];
     if (isPanelStateV2(irisGridPanelState)) {
       partitions = irisGridPanelState.partitions;
@@ -180,10 +164,10 @@ class IrisGridUtils {
    */
   static dehydrateQuickFilters(quickFilters) {
     return [...quickFilters].map(_ref6 => {
-      var [columnIndex, quickFilter] = _ref6;
-      var {
-        text
-      } = quickFilter;
+      var _ref7 = _slicedToArray(_ref6, 2),
+        columnIndex = _ref7[0],
+        quickFilter = _ref7[1];
+      var text = quickFilter.text;
       return [columnIndex, {
         text
       }];
@@ -200,11 +184,9 @@ class IrisGridUtils {
    */
   static dehydrateSort(sorts) {
     return sorts.map(sort => {
-      var {
-        column,
-        isAbs,
-        direction
-      } = sort;
+      var column = sort.column,
+        isAbs = sort.isAbs,
+        direction = sort.direction;
       return {
         column: column.name,
         isAbs,
@@ -220,16 +202,12 @@ class IrisGridUtils {
    */
   static extractTableSettings(panelState) {
     var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var {
-      irisGridPanelState,
-      irisGridState
-    } = panelState;
+    var irisGridPanelState = panelState.irisGridPanelState,
+      irisGridState = panelState.irisGridState;
     var partitions = isPanelStateV2(irisGridPanelState) ? irisGridPanelState.partitions : [irisGridPanelState.partition];
-    var {
-      advancedFilters,
-      quickFilters,
-      sorts
-    } = irisGridState;
+    var advancedFilters = irisGridState.advancedFilters,
+      quickFilters = irisGridState.quickFilters,
+      sorts = irisGridState.sorts;
     return {
       advancedFilters,
       inputFilters,
@@ -240,16 +218,12 @@ class IrisGridUtils {
   }
   static getInputFiltersForColumns(columns) {
     var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    return inputFilters.filter(_ref7 => {
-      var {
-        name,
-        type
-      } = _ref7;
-      return columns.find(_ref8 => {
-        var {
-          name: columnName,
-          type: columnType
-        } = _ref8;
+    return inputFilters.filter(_ref8 => {
+      var name = _ref8.name,
+        type = _ref8.type;
+      return columns.find(_ref9 => {
+        var columnName = _ref9.name,
+          columnType = _ref9.type;
         return columnName === name && columnType === type;
       });
     });
@@ -273,11 +247,13 @@ class IrisGridUtils {
    * @returns Array of hidden column indexes
    */
   static getHiddenColumns(userColumnWidths) {
-    return [...userColumnWidths.entries()].filter(_ref9 => {
-      var [, value] = _ref9;
+    return [...userColumnWidths.entries()].filter(_ref0 => {
+      var _ref1 = _slicedToArray(_ref0, 2),
+        value = _ref1[1];
       return value === 0;
-    }).map(_ref0 => {
-      var [key] = _ref0;
+    }).map(_ref10 => {
+      var _ref11 = _slicedToArray(_ref10, 1),
+        key = _ref11[0];
       return key;
     });
   }
@@ -293,10 +269,8 @@ class IrisGridUtils {
     return sorts.filter(sort => !columnNames.includes(sort.column.name));
   }
   static removeFiltersInColumns(columns, filters, removedColumnNames) {
-    var columnNames = columns.map(_ref1 => {
-      var {
-        name
-      } = _ref1;
+    var columnNames = columns.map(_ref12 => {
+      var name = _ref12.name;
       return name;
     });
     var newFilter = new Map(filters);
@@ -304,10 +278,8 @@ class IrisGridUtils {
     return newFilter;
   }
   static removeColumnFromMovedColumns(columns, movedColumns, removedColumnNames) {
-    var columnNames = columns.map(_ref10 => {
-      var {
-        name
-      } = _ref10;
+    var columnNames = columns.map(_ref13 => {
+      var name = _ref13.name;
       return name;
     });
     var newMoves = [...movedColumns];
@@ -318,7 +290,10 @@ class IrisGridUtils {
       for (var j = 0; j < newMoves.length; j += 1) {
         var move = newMoves[j];
         var newMove = _objectSpread({}, move);
-        var [fromStart, fromEnd] = Array.isArray(move.from) ? move.from : [move.from, move.from];
+        var _ref14 = Array.isArray(move.from) ? move.from : [move.from, move.from],
+          _ref15 = _slicedToArray(_ref14, 2),
+          fromStart = _ref15[0],
+          fromEnd = _ref15[1];
         if (removedColumnIndex <= move.to) {
           newMove.to -= 1;
         }
@@ -395,10 +370,8 @@ class IrisGridUtils {
   static getColumnsToFetch(tableColumns, viewportColumns, alwaysFetchColumnNames) {
     var columnsToFetch = [...viewportColumns];
     alwaysFetchColumnNames.forEach(columnName => {
-      var column = tableColumns.find(_ref11 => {
-        var {
-          name
-        } = _ref11;
+      var column = tableColumns.find(_ref16 => {
+        var name = _ref16.name;
         return name === columnName;
       });
       if (column != null && !viewportColumns.includes(column)) {
@@ -503,10 +476,8 @@ class IrisGridUtils {
    * @returns A matrix of the values of the data
    */
   static snapshotDataToMatrix(data) {
-    var {
-      columns,
-      rows
-    } = data;
+    var columns = data.columns,
+      rows = data.rows;
     var result = [];
     for (var r = 0; r < rows.length; r += 1) {
       var row = rows[r];
@@ -533,27 +504,26 @@ class IrisGridUtils {
     if (((_config$columns$lengt = config === null || config === void 0 || (_config$columns = config.columns) === null || _config$columns === void 0 ? void 0 : _config$columns.length) !== null && _config$columns$lengt !== void 0 ? _config$columns$lengt : 0) === 0) {
       return null;
     }
-    var {
-      columns: groupingColumns = [],
-      showConstituents: includeConstituents = true,
-      showNonAggregatedColumns = true,
-      includeDescriptions = true
-    } = config !== null && config !== void 0 ? config : {};
-    var {
-      aggregations = []
-    } = aggregationSettings !== null && aggregationSettings !== void 0 ? aggregationSettings : {};
-    var filteredAggregations = aggregations.filter(_ref12 => {
-      var {
-        operation
-      } = _ref12;
+    var _ref17 = config !== null && config !== void 0 ? config : {},
+      _ref17$columns = _ref17.columns,
+      groupingColumns = _ref17$columns === void 0 ? [] : _ref17$columns,
+      _ref17$showConstituen = _ref17.showConstituents,
+      includeConstituents = _ref17$showConstituen === void 0 ? true : _ref17$showConstituen,
+      _ref17$showNonAggrega = _ref17.showNonAggregatedColumns,
+      showNonAggregatedColumns = _ref17$showNonAggrega === void 0 ? true : _ref17$showNonAggrega,
+      _ref17$includeDescrip = _ref17.includeDescriptions,
+      includeDescriptions = _ref17$includeDescrip === void 0 ? true : _ref17$includeDescrip;
+    var _ref18 = aggregationSettings !== null && aggregationSettings !== void 0 ? aggregationSettings : {},
+      _ref18$aggregations = _ref18.aggregations,
+      aggregations = _ref18$aggregations === void 0 ? [] : _ref18$aggregations;
+    var filteredAggregations = aggregations.filter(_ref19 => {
+      var operation = _ref19.operation;
       return !AggregationUtils.isRollupProhibited(operation);
     });
-    var aggregationColumns = filteredAggregations.map(_ref13 => {
-      var {
-        operation,
-        selected,
-        invert
-      } = _ref13;
+    var aggregationColumns = filteredAggregations.map(_ref20 => {
+      var operation = _ref20.operation,
+        selected = _ref20.selected,
+        invert = _ref20.invert;
       return AggregationUtils.isRollupOperation(operation) ? [] : AggregationUtils.getOperationColumnNames(originalColumns, operation, selected, invert);
     });
     var aggregationMap = {};
@@ -581,6 +551,61 @@ class IrisGridUtils {
     };
   }
 
+  /**
+   * Build a per-column aggregation operation map for use in a
+   * `UITotalsTableConfig`. Rollup-only operations are skipped.
+   */
+  static getOperationMap(columns, aggregations) {
+    var operationMap = {};
+    aggregations.filter(a => !AggregationUtils.isRollupOperation(a.operation)).forEach(_ref21 => {
+      var operation = _ref21.operation,
+        selected = _ref21.selected,
+        invert = _ref21.invert;
+      AggregationUtils.getOperationColumnNames(columns, operation, selected, invert).forEach(name => {
+        var _operationMap$name;
+        var newOperations = [...((_operationMap$name = operationMap[name]) !== null && _operationMap$name !== void 0 ? _operationMap$name : []), operation];
+        operationMap[name] = Object.freeze(newOperations);
+      });
+    });
+    return operationMap;
+  }
+
+  /**
+   * Ordered list of (non-rollup) operations used by a totals table.
+   */
+  static getOperationOrder(aggregations) {
+    return aggregations.map(a => a.operation).filter(o => !AggregationUtils.isRollupOperation(o));
+  }
+
+  /**
+   * Hydrate model totals config for a standalone aggregations view
+   * (no rollup). Returns `null` when there are no active aggregations
+   * or when a rollup is active (in which case aggregations are folded
+   * into the rollup config instead — see `getModelRollupConfig`).
+   *
+   * @param  columns Model columns
+   * @param  rollupConfig Current rollup config (or undefined). When set
+   *                     with at least one grouping column, this returns
+   *                     `null` so totals don't double-up with the rollup.
+   * @param  aggregationSettings Aggregation settings
+   */
+  static getModelTotalsConfig(columns, rollupConfig, aggregationSettings) {
+    var _rollupConfig$columns, _rollupConfig$columns2;
+    if (((_rollupConfig$columns = rollupConfig === null || rollupConfig === void 0 || (_rollupConfig$columns2 = rollupConfig.columns) === null || _rollupConfig$columns2 === void 0 ? void 0 : _rollupConfig$columns2.length) !== null && _rollupConfig$columns !== void 0 ? _rollupConfig$columns : 0) > 0) {
+      return null;
+    }
+    var aggregations = aggregationSettings.aggregations.filter(agg => agg.selected.length > 0 || agg.invert);
+    if (aggregations.length === 0) {
+      return null;
+    }
+    return {
+      operationMap: IrisGridUtils.getOperationMap(columns, aggregations),
+      operationOrder: IrisGridUtils.getOperationOrder(aggregations),
+      showOnTop: aggregationSettings.showOnTop,
+      defaultOperation: AggregationOperation.SKIP
+    };
+  }
+
   /**
    * @param  pendingDataMap Map of pending data
    * @returns A map with the errors in the pending data
@@ -590,9 +615,7 @@ class IrisGridUtils {
       if (!IrisGridUtils.isValidIndex(rowIndex)) {
         throw new Error("Invalid rowIndex ".concat(rowIndex));
       }
-      var {
-        data
-      } = row;
+      var data = row.data;
       data.forEach((value, columnIndex) => {
         if (!IrisGridUtils.isValidIndex(columnIndex)) {
           throw new Error("Invalid columnIndex ".concat(columnIndex));
@@ -622,17 +645,13 @@ class IrisGridUtils {
    */
   static getColumnByName(columns, columnName) {
     // Columns can contain ColumnBy sources with negative indexes
-    var column = Object.values(columns).find(_ref14 => {
-      var {
-        name
-      } = _ref14;
+    var column = Object.values(columns).find(_ref22 => {
+      var name = _ref22.name;
       return name === columnName;
     });
     if (column == null) {
-      log.error('Unable to retrieve column by name', columnName, columns.map(_ref15 => {
-        var {
-          name
-        } = _ref15;
+      log.error('Unable to retrieve column by name', columnName, columns.map(_ref23 => {
+        var name = _ref23.name;
         return name;
       }));
     }
@@ -646,11 +665,9 @@ class IrisGridUtils {
    * @returns Updated filter configs with column names changed to indexes
    */
   static changeFilterColumnNamesToIndexes(columns, filters) {
-    return filters.map(_ref16 => {
-      var {
-        name,
-        filter
-      } = _ref16;
+    return filters.map(_ref24 => {
+      var name = _ref24.name,
+        filter = _ref24.filter;
       var index = columns.findIndex(column => column.name === name);
       return index < 0 ? null : [index, filter];
     }).filter(filterConfig => filterConfig != null);
@@ -674,11 +691,10 @@ class IrisGridUtils {
     });
     var combinedText = '';
     for (var i = 0; i < filterList.length; i += 1) {
-      var {
-        text,
-        value,
-        operator
-      } = filterList[i];
+      var _filterList$i = filterList[i],
+        text = _filterList$i.text,
+        value = _filterList$i.value,
+        operator = _filterList$i.operator;
       if (value !== undefined) {
         var symbol = '';
         if (operator !== undefined) {
@@ -721,10 +737,8 @@ class IrisGridUtils {
     var groupMap = new Map();
 
     // Remove any empty groups before parsing
-    var groups = groupsParam === null || groupsParam === void 0 ? void 0 : groupsParam.filter(_ref17 => {
-      var {
-        children
-      } = _ref17;
+    var groups = groupsParam === null || groupsParam === void 0 ? void 0 : groupsParam.filter(_ref25 => {
+      var children = _ref25.children;
       return children != null && children.length > 0;
     });
     if (groups.length === 0) {
@@ -739,9 +753,7 @@ class IrisGridUtils {
     var seenChildren = new Set();
     var addGroup = group => {
       var _group$children;
-      var {
-        name
-      } = group;
+      var name = group.name;
       assertNotNull(name, 'Column header group has no name');
       var columnIndex = model.getColumnIndexByName(name);
       // Groups cannot have names matching columns to avoid parent-child collision
@@ -792,9 +804,7 @@ class IrisGridUtils {
     };
     var groupNames = new Set();
     groups.forEach(group => {
-      var {
-        name
-      } = group;
+      var name = group.name;
       if (groupNames.has(name)) {
         throw new Error("Duplicate column group name: ".concat(name));
       }
@@ -850,39 +860,42 @@ class IrisGridUtils {
    * @param irisGridState The current state of the IrisGrid
    */
   dehydrateIrisGridState(model, irisGridState) {
-    var {
-      aggregationSettings = {
+    var _irisGridState$aggreg = irisGridState.aggregationSettings,
+      aggregationSettings = _irisGridState$aggreg === void 0 ? {
         aggregations: EMPTY_ARRAY,
         showOnTop: false
-      },
-      advancedFilters,
-      customColumnFormatMap,
-      columnAlignmentMap = EMPTY_MAP,
-      isFilterBarShown,
-      metricCalculator,
-      metrics: {
-        userColumnWidths = new Map(),
-        userRowHeights = new Map()
-      } = {},
-      quickFilters,
-      customColumns,
-      conditionalFormats = EMPTY_ARRAY,
-      reverse,
-      rollupConfig,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns = EMPTY_ARRAY,
-      selectedSearchColumns,
-      sorts,
-      invertSearchColumns,
-      pendingDataMap = EMPTY_MAP,
-      frozenColumns,
-      columnHeaderGroups,
-      partitionConfig
-    } = irisGridState;
-    var {
-      columns
-    } = model;
+      } : _irisGridState$aggreg,
+      advancedFilters = irisGridState.advancedFilters,
+      customColumnFormatMap = irisGridState.customColumnFormatMap,
+      _irisGridState$column = irisGridState.columnAlignmentMap,
+      columnAlignmentMap = _irisGridState$column === void 0 ? EMPTY_MAP : _irisGridState$column,
+      isFilterBarShown = irisGridState.isFilterBarShown,
+      metricCalculator = irisGridState.metricCalculator,
+      _irisGridState$metric = irisGridState.metrics,
+      _irisGridState$metric2 = _irisGridState$metric === void 0 ? {} : _irisGridState$metric,
+      _irisGridState$metric3 = _irisGridState$metric2.userColumnWidths,
+      userColumnWidths = _irisGridState$metric3 === void 0 ? new Map() : _irisGridState$metric3,
+      _irisGridState$metric4 = _irisGridState$metric2.userRowHeights,
+      userRowHeights = _irisGridState$metric4 === void 0 ? new Map() : _irisGridState$metric4,
+      quickFilters = irisGridState.quickFilters,
+      customColumns = irisGridState.customColumns,
+      _irisGridState$condit = irisGridState.conditionalFormats,
+      conditionalFormats = _irisGridState$condit === void 0 ? EMPTY_ARRAY : _irisGridState$condit,
+      reverse = irisGridState.reverse,
+      rollupConfig = irisGridState.rollupConfig,
+      showSearchBar = irisGridState.showSearchBar,
+      searchValue = irisGridState.searchValue,
+      _irisGridState$select = irisGridState.selectDistinctColumns,
+      selectDistinctColumns = _irisGridState$select === void 0 ? EMPTY_ARRAY : _irisGridState$select,
+      selectedSearchColumns = irisGridState.selectedSearchColumns,
+      sorts = irisGridState.sorts,
+      invertSearchColumns = irisGridState.invertSearchColumns,
+      _irisGridState$pendin = irisGridState.pendingDataMap,
+      pendingDataMap = _irisGridState$pendin === void 0 ? EMPTY_MAP : _irisGridState$pendin,
+      frozenColumns = irisGridState.frozenColumns,
+      columnHeaderGroups = irisGridState.columnHeaderGroups,
+      partitionConfig = irisGridState.partitionConfig;
+    var columns = model.columns;
     var partitionColumns = isPartitionedGridModelProvider(model) ? model.partitionColumns : [];
 
     // Prefer the by-name map from the metric calculator: it preserves entries
@@ -890,11 +903,14 @@ class IrisGridUtils {
     // active), so reload-then-save round-trips don't drop them.
     // Fall back to projecting the by-index map from `metrics` against the
     // current model for callers that didn't pass a metric calculator.
-    var dehydratedUserColumnWidths = metricCalculator != null ? [...metricCalculator.getUserColumnWidthsByName()] : [...userColumnWidths].filter(_ref18 => {
-      var [columnIndex] = _ref18;
+    var dehydratedUserColumnWidths = metricCalculator != null ? [...metricCalculator.getUserColumnWidthsByName()] : [...userColumnWidths].filter(_ref26 => {
+      var _ref27 = _slicedToArray(_ref26, 1),
+        columnIndex = _ref27[0];
       return columnIndex != null && columnIndex >= 0 && columnIndex < columns.length;
-    }).map(_ref19 => {
-      var [columnIndex, width] = _ref19;
+    }).map(_ref28 => {
+      var _ref29 = _slicedToArray(_ref28, 2),
+        columnIndex = _ref29[0],
+        width = _ref29[1];
       return [columns[columnIndex].name, width];
     });
 
@@ -938,39 +954,40 @@ class IrisGridUtils {
    * @param irisGridState The saved IrisGrid state
    */
   hydrateIrisGridState(model, irisGridState) {
-    var _ref23, _model$layoutHints;
-    var {
-      advancedFilters,
-      aggregationSettings = {
+    var _ref36, _model$layoutHints;
+    var advancedFilters = irisGridState.advancedFilters,
+      _irisGridState$aggreg2 = irisGridState.aggregationSettings,
+      aggregationSettings = _irisGridState$aggreg2 === void 0 ? {
         aggregations: [],
         showOnTop: false
-      },
-      customColumnFormatMap,
-      columnAlignmentMap = [],
-      isFilterBarShown,
-      quickFilters,
-      sorts,
-      customColumns,
-      conditionalFormats,
-      userColumnWidths,
-      userRowHeights,
-      reverseType,
-      reverse,
-      rollupConfig = undefined,
-      showSearchBar,
-      searchValue,
-      selectDistinctColumns,
-      selectedSearchColumns,
-      invertSearchColumns = true,
-      pendingDataMap = [],
-      frozenColumns,
-      columnHeaderGroups,
-      partitionConfig
-    } = irisGridState;
-    var {
-      columns,
-      formatter
-    } = model;
+      } : _irisGridState$aggreg2,
+      customColumnFormatMap = irisGridState.customColumnFormatMap,
+      _irisGridState$column2 = irisGridState.columnAlignmentMap,
+      columnAlignmentMap = _irisGridState$column2 === void 0 ? [] : _irisGridState$column2,
+      isFilterBarShown = irisGridState.isFilterBarShown,
+      quickFilters = irisGridState.quickFilters,
+      sorts = irisGridState.sorts,
+      customColumns = irisGridState.customColumns,
+      conditionalFormats = irisGridState.conditionalFormats,
+      userColumnWidths = irisGridState.userColumnWidths,
+      userRowHeights = irisGridState.userRowHeights,
+      reverseType = irisGridState.reverseType,
+      reverse = irisGridState.reverse,
+      _irisGridState$rollup = irisGridState.rollupConfig,
+      rollupConfig = _irisGridState$rollup === void 0 ? undefined : _irisGridState$rollup,
+      showSearchBar = irisGridState.showSearchBar,
+      searchValue = irisGridState.searchValue,
+      selectDistinctColumns = irisGridState.selectDistinctColumns,
+      selectedSearchColumns = irisGridState.selectedSearchColumns,
+      _irisGridState$invert = irisGridState.invertSearchColumns,
+      invertSearchColumns = _irisGridState$invert === void 0 ? true : _irisGridState$invert,
+      _irisGridState$pendin2 = irisGridState.pendingDataMap,
+      pendingDataMap = _irisGridState$pendin2 === void 0 ? [] : _irisGridState$pendin2,
+      frozenColumns = irisGridState.frozenColumns,
+      columnHeaderGroups = irisGridState.columnHeaderGroups,
+      partitionConfig = irisGridState.partitionConfig;
+    var columns = model.columns,
+      formatter = model.formatter;
     var partitionColumns = isPartitionedGridModelProvider(model) ? model.partitionColumns : [];
 
     // Build a name-keyed map preserving every persisted entry, including
@@ -978,9 +995,11 @@ class IrisGridUtils {
     // by-index map from that for back-compat with consumers that read
     // widths immediately after hydrate.
     var userColumnWidthsByName = new Map();
-    userColumnWidths.forEach(_ref20 => {
+    userColumnWidths.forEach(_ref30 => {
       var _columns;
-      var [column, width] = _ref20;
+      var _ref31 = _slicedToArray(_ref30, 2),
+        column = _ref31[0],
+        width = _ref31[1];
       var name = typeof column === 'string' || column instanceof String ? column : (_columns = columns[column]) === null || _columns === void 0 ? void 0 : _columns.name;
       if (name != null) {
         userColumnWidthsByName.set(name, width);
@@ -995,11 +1014,14 @@ class IrisGridUtils {
       quickFilters: this.hydrateQuickFilters(columns, quickFilters, formatter.timeZone),
       sorts: this.hydrateSort(columns, sorts, true),
       userColumnWidthsByName,
-      userColumnWidths: new Map([...userColumnWidthsByName].map(_ref21 => {
-        var [name, width] = _ref21;
+      userColumnWidths: new Map([...userColumnWidthsByName].map(_ref32 => {
+        var _ref33 = _slicedToArray(_ref32, 2),
+          name = _ref33[0],
+          width = _ref33[1];
         return [columns.findIndex(c => c.name === name), width];
-      }).filter(_ref22 => {
-        var [column] = _ref22;
+      }).filter(_ref34 => {
+        var _ref35 = _slicedToArray(_ref34, 1),
+          column = _ref35[0];
         return column != null && column >= 0 && column < columns.length;
       })),
       customColumns,
@@ -1014,7 +1036,7 @@ class IrisGridUtils {
       invertSearchColumns,
       pendingDataMap: this.hydratePendingDataMap(columns, pendingDataMap),
       frozenColumns,
-      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, (_ref23 = columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.columnGroups) !== null && _ref23 !== void 0 ? _ref23 : []).groups,
+      columnHeaderGroups: IrisGridUtils.parseColumnHeaderGroups(model, (_ref36 = columnHeaderGroups !== null && columnHeaderGroups !== void 0 ? columnHeaderGroups : (_model$layoutHints = model.layoutHints) === null || _model$layoutHints === void 0 ? void 0 : _model$layoutHints.columnGroups) !== null && _ref36 !== void 0 ? _ref36 : []).groups,
       partitionConfig: this.hydratePartitionConfig(partitionColumns, partitionConfig)
     };
   }
@@ -1027,11 +1049,11 @@ class IrisGridUtils {
    * @returns The quick filters to apply to the columns
    */
   hydrateQuickFilters(columns, savedQuickFilters, timeZone) {
-    var importedFilters = savedQuickFilters.map(_ref24 => {
-      var [columnIndex, quickFilter] = _ref24;
-      var {
-        text
-      } = quickFilter;
+    var importedFilters = savedQuickFilters.map(_ref37 => {
+      var _ref38 = _slicedToArray(_ref37, 2),
+        columnIndex = _ref38[0],
+        quickFilter = _ref38[1];
+      var text = quickFilter.text;
       var filter = null;
       try {
         var column = IrisGridUtils.getColumn(columns, columnIndex);
@@ -1056,8 +1078,10 @@ class IrisGridUtils {
    * @returns The dehydrated advanced filters
    */
   dehydrateAdvancedFilters(columns, advancedFilters) {
-    return [...advancedFilters].map(_ref25 => {
-      var [columnIndex, advancedFilter] = _ref25;
+    return [...advancedFilters].map(_ref39 => {
+      var _ref40 = _slicedToArray(_ref39, 2),
+        columnIndex = _ref40[0],
+        advancedFilter = _ref40[1];
       var column = IrisGridUtils.getColumn(columns, columnIndex);
       assertNotNull(column);
       var options = this.dehydrateAdvancedFilterOptions(column, advancedFilter.options);
@@ -1075,8 +1099,10 @@ class IrisGridUtils {
    * @returns The advanced filters to apply to the columns
    */
   hydrateAdvancedFilters(columns, savedAdvancedFilters, timeZone) {
-    var importedFilters = savedAdvancedFilters.map(_ref26 => {
-      var [columnIndex, advancedFilter] = _ref26;
+    var importedFilters = savedAdvancedFilters.map(_ref41 => {
+      var _ref42 = _slicedToArray(_ref41, 2),
+        columnIndex = _ref42[0],
+        advancedFilter = _ref42[1];
       var column = IrisGridUtils.getColumn(columns, columnIndex);
       assertNotNull(column);
       var options = this.hydrateAdvancedFilterOptions(column, advancedFilter.options);
@@ -1097,34 +1123,33 @@ class IrisGridUtils {
     return new Map(importedFilters);
   }
   dehydrateAdvancedFilterOptions(column, options) {
-    var {
-        selectedValues
-      } = options,
+    var selectedValues = options.selectedValues,
       otherOptions = _objectWithoutProperties(options, _excluded);
     return _objectSpread({
       selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => this.dehydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
     }, otherOptions);
   }
   hydrateAdvancedFilterOptions(column, options) {
-    var {
-        selectedValues
-      } = options,
+    var selectedValues = options.selectedValues,
       otherOptions = _objectWithoutProperties(options, _excluded2);
     return _objectSpread({
       selectedValues: selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.map(value => this.hydrateValue(value, column === null || column === void 0 ? void 0 : column.type))
     }, otherOptions);
   }
   dehydratePendingDataMap(columns, pendingDataMap) {
-    return [...pendingDataMap].map(_ref27 => {
-      var [rowIndex, {
-        data
-      }] = _ref27;
+    return [...pendingDataMap].map(_ref43 => {
+      var _ref44 = _slicedToArray(_ref43, 2),
+        rowIndex = _ref44[0],
+        data = _ref44[1].data;
       return [rowIndex, {
-        data: [...data].filter(_ref28 => {
-          var [c] = _ref28;
+        data: [...data].filter(_ref45 => {
+          var _ref46 = _slicedToArray(_ref45, 1),
+            c = _ref46[0];
           return typeof c === 'number';
-        }).map(_ref29 => {
-          var [c, cellData] = _ref29;
+        }).map(_ref47 => {
+          var _ref48 = _slicedToArray(_ref47, 2),
+            c = _ref48[0],
+            cellData = _ref48[1];
           return [columns[c].name, this.dehydrateValue(cellData.value, columns[c].type)];
         })
       }];
@@ -1134,23 +1159,23 @@ class IrisGridUtils {
     var columnMap = new Map();
     var getColumnIndex = columnName => {
       if (!columnMap.has(columnName)) {
-        columnMap.set(columnName, columns.findIndex(_ref30 => {
-          var {
-            name
-          } = _ref30;
+        columnMap.set(columnName, columns.findIndex(_ref49 => {
+          var name = _ref49.name;
           return name === columnName;
         }));
       }
       return columnMap.get(columnName);
     };
-    return new Map(pendingDataMap.map(_ref31 => {
-      var [rowIndex, {
-        data
-      }] = _ref31;
+    return new Map(pendingDataMap.map(_ref50 => {
+      var _ref51 = _slicedToArray(_ref50, 2),
+        rowIndex = _ref51[0],
+        data = _ref51[1].data;
       return [rowIndex, {
-        data: new Map(data.map(_ref32 => {
+        data: new Map(data.map(_ref52 => {
           var _getColumnIndex;
-          var [columnName, value] = _ref32;
+          var _ref53 = _slicedToArray(_ref52, 2),
+            columnName = _ref53[0],
+            value = _ref53[1];
           var index = getColumnIndex(columnName);
           assertNotNull(index);
           return [(_getColumnIndex = getColumnIndex(columnName)) !== null && _getColumnIndex !== void 0 ? _getColumnIndex : null, {
@@ -1225,15 +1250,11 @@ class IrisGridUtils {
    */
   hydrateSort(columns, sorts) {
     var dropReverse = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-    var {
-      dh
-    } = this;
+    var dh = this.dh;
     return sorts.map(sort => {
-      var {
-        column: columnIndexOrName,
-        isAbs,
-        direction
-      } = sort;
+      var columnIndexOrName = sort.column,
+        isAbs = sort.isAbs,
+        direction = sort.direction;
       if (direction === TableUtils.sortDirection.reverse) {
         return dh.Table.reverse();
       }
@@ -1257,17 +1278,11 @@ class IrisGridUtils {
     .filter(item => item != null && (item.direction !== TableUtils.sortDirection.reverse || !dropReverse));
   }
   hydrateDhSort(columns, sorts) {
-    var {
-      dh
-    } = this;
+    var dh = this.dh;
     return sorts.map(sortDescriptor => {
-      var {
-        column: {
-          name
-        },
-        isAbs,
-        direction
-      } = sortDescriptor;
+      var name = sortDescriptor.column.name,
+        isAbs = sortDescriptor.isAbs,
+        direction = sortDescriptor.direction;
       if (direction === TableUtils.sortDirection.reverse) {
         return dh.Table.reverse();
       }
@@ -1297,9 +1312,7 @@ class IrisGridUtils {
    * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
    */
   applyTableSettings(table, tableSettings, timeZone) {
-    var {
-      columns
-    } = table;
+    var columns = table.columns;
     var quickFilters = [];
     if (tableSettings.quickFilters) {
       quickFilters = IrisGridUtils.getFiltersFromFilterMap(this.hydrateQuickFilters(columns, tableSettings.quickFilters, timeZone));
@@ -1314,10 +1327,8 @@ class IrisGridUtils {
       sorts = this.hydrateDhSort(columns, this.hydrateSort(columns, tableSettings.sorts));
     }
     var filters = [...quickFilters, ...advancedFilters];
-    var {
-      partitions,
-      partitionColumns: partitionColumnNames
-    } = tableSettings;
+    var partitions = tableSettings.partitions,
+      partitionColumnNames = tableSettings.partitionColumns;
     if (partitions && partitions.length && partitionColumnNames && partitionColumnNames !== null && partitionColumnNames !== void 0 && partitionColumnNames.length) {
       var partitionColumns = partitionColumnNames.map(partitionColumnName => IrisGridUtils.getColumnByName(columns, partitionColumnName));
       for (var i = 0; i < partitionColumns.length; i += 1) {
@@ -1335,17 +1346,13 @@ class IrisGridUtils {
   getFiltersFromInputFilters(columns) {
     var inputFilters = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
     var timeZone = arguments.length > 2 ? arguments[2] : undefined;
-    return inputFilters.map(_ref33 => {
-      var {
-        name,
-        type,
-        value
-      } = _ref33;
-      var column = columns.find(_ref34 => {
-        var {
-          name: columnName,
-          type: columnType
-        } = _ref34;
+    return inputFilters.map(_ref54 => {
+      var name = _ref54.name,
+        type = _ref54.type,
+        value = _ref54.value;
+      var column = columns.find(_ref55 => {
+        var columnName = _ref55.name,
+          columnType = _ref55.type;
         return columnName === name && columnType === type;
       });
       if (column) {
@@ -1368,18 +1375,14 @@ class IrisGridUtils {
    * @returns The rangeset for the provided ranges
    */
   rangeSetFromRanges(ranges) {
-    var {
-      dh
-    } = this;
+    var dh = this.dh;
     var rangeSets = ranges.slice().sort((a, b) => {
       assertNotNull(a.startRow);
       assertNotNull(b.startRow);
       return a.startRow - b.startRow;
     }).map(range => {
-      var {
-        startRow,
-        endRow
-      } = range;
+      var startRow = range.startRow,
+        endRow = range.endRow;
       assertNotNull(startRow);
       assertNotNull(endRow);
       return dh.RangeSet.ofRange(startRow, endRow);