@deephaven/jsapi-utils 0.38.0 → 0.38.1-beta.11

package/dist/TableUtils.js

@@ -1,9 +1,10 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { Type as FilterType, Operator as FilterOperator } from '@deephaven/filters';
 import Log from '@deephaven/log';
-import dh from '@deephaven/jsapi-shim';
 import { PromiseUtils, TextUtils, TimeoutError } from '@deephaven/utils';
 import DateUtils from "./DateUtils.js";
 var log = Log.module('TableUtils');
@@ -11,6 +12,19 @@ var log = Log.module('TableUtils');
 export class TableUtils {
   // Regex looking for a negative or positive integer or decimal number
 
+  /**
+   * Executes a callback on a given table and returns a Promise that will resolve
+   * the next time a particular event type fires on the table.
+   * @param exec Callback function to execute.
+   * @param table Table that gets passed to the `exec` function and that is
+   * subscribed to for a given `eventType`.
+   * @param eventType The event type to listen for.
+   * @param timeout If the event doesn't fire within the timeout, the returned
+   * Promise will be rejected.
+   * @returns a Promise to the original table that resolves on next `eventType`
+   * event
+   */
+
   static getSortIndex(sort, columnName) {
     for (var i = 0; i < sort.length; i += 1) {
       var _s$column;
@@ -301,6 +315,207 @@ export class TableUtils {
     return TableUtils.getNormalizedType(type1) === TableUtils.getNormalizedType(type2);
   }
 
+  /**
+   * Adds quotes to a value if they're not already added
+   * @param value Value to add quotes around
+   */
+  static quoteValue(value) {
+    if (value.length >= 2 && (value.charAt(0) === '"' && value.charAt(value.length - 1) === '"' || value.charAt(0) === "'" && value.charAt(value.length - 1) === "'")) {
+      return value;
+    }
+    return "\"".concat(value, "\"");
+  }
+  static isRangeOperation(operation) {
+    switch (operation) {
+      case '<':
+      case '<=':
+      case '=<':
+      case '>':
+      case '>=':
+      case '=>':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  /**
+   * @param filter The column filter to apply the range operation to
+   * @param operation The range operation to run
+   * @param value The value to use for the operation
+   * @returns The condition with the specified operation
+   */
+  static makeRangeFilterWithOperation(filter, operation, value) {
+    switch (operation) {
+      case '=':
+        return filter.eq(value);
+      case '<':
+        return filter.lessThan(value);
+      case '<=':
+      case '=<':
+        return filter.lessThanOrEqualTo(value);
+      case '>':
+        return filter.greaterThan(value);
+      case '>=':
+      case '=>':
+        return filter.greaterThanOrEqualTo(value);
+      case '!=':
+      case '!':
+        return filter.notEq(value);
+      default:
+        return null;
+    }
+  }
+
+  /**
+   * Wraps a table promise in a cancelable promise that will close the table if the promise is cancelled.
+   * Use in a component that loads a table, and call cancel when unmounting.
+   * @param table The table promise to wrap
+   */
+  static makeCancelableTablePromise(table) {
+    return PromiseUtils.makeCancelable(table, resolved => {
+      resolved.close();
+    });
+  }
+
+  /**
+   * Make a cancelable promise for a one-shot table event with a timeout.
+   * @param table Table to listen for events on
+   * @param eventName Event to listen for
+   * @param timeout Event timeout in milliseconds, defaults to 0
+   * @param matcher Optional function to determine if the promise can be resolved or stays pending
+   * @returns Resolves with the event data
+   */
+  static makeCancelableTableEventPromise(table, eventName) {
+    var timeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var matcher = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+    var eventCleanup;
+    var timeoutId;
+    var isPending = true;
+    var wrappedPromise = new Promise((resolve, reject) => {
+      timeoutId = setTimeout(() => {
+        eventCleanup();
+        isPending = false;
+        reject(new TimeoutError("Event \"".concat(eventName, "\" timed out.")));
+      }, timeout);
+      eventCleanup = table.addEventListener(eventName, event => {
+        if (matcher != null && !matcher(event)) {
+          log.debug2('Event triggered, but matcher returned false.');
+          return;
+        }
+        log.debug2('Event triggered, resolving.');
+        eventCleanup();
+        clearTimeout(timeoutId);
+        isPending = false;
+        resolve(event);
+      });
+    });
+    wrappedPromise.cancel = () => {
+      if (isPending) {
+        log.debug2('Pending promise cleanup.');
+        eventCleanup();
+        clearTimeout(timeoutId);
+        isPending = false;
+        return;
+      }
+      log.debug2('Ignoring non-pending promise cancel.');
+    };
+    return wrappedPromise;
+  }
+  static removeCommas(value) {
+    return value.replace(/[\s|,]/g, '');
+  }
+  static makeBooleanValue(text) {
+    var allowEmpty = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (text === '' && allowEmpty) {
+      return null;
+    }
+    switch (text === null || text === void 0 ? void 0 : text.toLowerCase()) {
+      case 'null':
+        return null;
+      case '0':
+      case 'f':
+      case 'fa':
+      case 'fal':
+      case 'fals':
+      case 'false':
+      case 'n':
+      case 'no':
+        return false;
+      case '1':
+      case 't':
+      case 'tr':
+      case 'tru':
+      case 'true':
+      case 'y':
+      case 'ye':
+      case 'yes':
+        return true;
+      default:
+        throw new Error("Invalid boolean '".concat(text, "'"));
+    }
+  }
+  static makeNumberValue(text) {
+    if (text === 'null' || text === '') {
+      return null;
+    }
+    var cleanText = text.toLowerCase().trim();
+    if (cleanText === '∞' || cleanText === 'infinity' || cleanText === 'inf') {
+      return Number.POSITIVE_INFINITY;
+    }
+    if (cleanText === '-∞' || cleanText === '-infinity' || cleanText === '-inf') {
+      return Number.NEGATIVE_INFINITY;
+    }
+    var numberText = TableUtils.removeCommas(cleanText);
+    if (TableUtils.NUMBER_REGEX.test(numberText)) {
+      return parseFloat(numberText);
+    }
+    throw new Error("Invalid number '".concat(text, "'"));
+  }
+  static getFilterOperatorString(operation) {
+    switch (operation) {
+      case FilterType.eq:
+        return '=';
+      case FilterType.notEq:
+        return '!=';
+      case FilterType.greaterThan:
+        return '>';
+      case FilterType.greaterThanOrEqualTo:
+        return '>=';
+      case FilterType.lessThan:
+        return '<';
+      case FilterType.lessThanOrEqualTo:
+        return '<=';
+      case FilterType.contains:
+        return '~';
+      case FilterType.notContains:
+        return '!~';
+      default:
+        throw new Error("Unexpected filter type ".concat(operation));
+    }
+  }
+  static isTreeTable(table) {
+    return table != null && table.expand !== undefined && table.collapse !== undefined;
+  }
+
+  /**
+   * Copies the provided array, sorts by column name case insensitive, and returns the sorted array.
+   * @param columns The columns to sort
+   * @param isAscending Whether to sort ascending
+   */
+  static sortColumns(columns) {
+    var isAscending = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+    return [...columns].sort((a, b) => {
+      var aName = a.name.toUpperCase();
+      var bName = b.name.toUpperCase();
+      return TextUtils.sort(aName, bName, isAscending);
+    });
+  }
+  constructor(dh) {
+    _defineProperty(this, "dh", void 0);
+    this.dh = dh;
+  }
+
   /**
    * Create filter with the provided column and text. Handles multiple filters joined with && or ||
    * @param column The column to set the filter on
@@ -308,7 +523,7 @@ export class TableUtils {
    * @param timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
    * @returns Returns the created filter, null if text could not be parsed
    */
-  static makeQuickFilter(column, text, timeZone) {
+  makeQuickFilter(column, text, timeZone) {
     var orComponents = text.split('||');
     var orFilter = null;
     for (var i = 0; i < orComponents.length; i += 1) {
@@ -318,7 +533,7 @@ export class TableUtils {
       for (var j = 0; j < andComponents.length; j += 1) {
         var andComponent = andComponents[j].trim();
         if (andComponent.length > 0) {
-          var filter = TableUtils.makeQuickFilterFromComponent(column, andComponent, timeZone);
+          var filter = this.makeQuickFilterFromComponent(column, andComponent, timeZone);
           if (filter) {
             if (andFilter) {
               andFilter = andFilter.and(filter);
@@ -346,7 +561,7 @@ export class TableUtils {
    * @param timeZone The time zone to make this filter in if it is a date type. E.g. America/New_York
    * @returns Returns the created filter, null if text could not be parsed
    */
-  static makeQuickFilterFromComponent(column, text, timeZone) {
+  makeQuickFilterFromComponent(column, text, timeZone) {
     var {
       type
     } = column;
@@ -364,8 +579,11 @@ export class TableUtils {
     }
     return this.makeQuickTextFilter(column, text);
   }
-  static makeQuickNumberFilter(column, text) {
+  makeQuickNumberFilter(column, text) {
     var columnFilter = column.filter();
+    var {
+      dh
+    } = this;
     var filter = null;
     var regex = /\s*(>=|<=|=>|=<|>|<|!=|=|!)?(\s*-\s*)?(\s*\d*(?:,\d{3})*(?:\.\d*)?\s*)?(null|nan|infinity|inf|\u221E)?(.*)/i;
     var result = regex.exec(text);
@@ -435,7 +653,10 @@ export class TableUtils {
     filter = column.filter();
     return TableUtils.makeRangeFilterWithOperation(filter, operation, value);
   }
-  static makeQuickTextFilter(column, text) {
+  makeQuickTextFilter(column, text) {
+    var {
+      dh
+    } = this;
     var cleanText = "".concat(text).trim();
     var regex = /^(!~|!=|~|=|!)?(.*)/;
     var result = regex.exec(cleanText);
@@ -509,7 +730,9 @@ export class TableUtils {
     }
     return null;
   }
-  static makeQuickBooleanFilter(column, text) {
+
+  // eslint-disable-next-line class-methods-use-this
+  makeQuickBooleanFilter(column, text) {
     var regex = /^(!=|=|!)?(.*)/;
     var result = regex.exec("".concat(text).trim());
     if (result === null) {
@@ -540,7 +763,7 @@ export class TableUtils {
    * @param text The date string text to parse.
    * @param timeZone The time zone to make this filter in if it is a date type. E.g. America/New_York
    */
-  static makeQuickDateFilter(column, text, timeZone) {
+  makeQuickDateFilter(column, text, timeZone) {
     var cleanText = text.trim();
     var regex = /\s*(>=|<=|=>|=<|>|<|!=|!|=)?(.*)/;
     var result = regex.exec(cleanText);
@@ -576,7 +799,7 @@ export class TableUtils {
         filterOperation = FilterType.eq;
         break;
     }
-    return TableUtils.makeQuickDateFilterWithOperation(column, dateText, filterOperation, timeZone);
+    return this.makeQuickDateFilterWithOperation(column, dateText, filterOperation, timeZone);
   }
 
   /**
@@ -586,8 +809,11 @@ export class TableUtils {
    * @param operation The filter operation to use.
    * @param timeZone The time zone to make this filter with. E.g. America/New_York
    */
-  static makeQuickDateFilterWithOperation(column, text, operation, timeZone) {
-    var [startDate, endDate] = DateUtils.parseDateRange(text, timeZone);
+  makeQuickDateFilterWithOperation(column, text, operation, timeZone) {
+    var {
+      dh
+    } = this;
+    var [startDate, endDate] = DateUtils.parseDateRange(dh, text, timeZone);
     var startValue = startDate != null ? dh.FilterValue.ofNumber(startDate) : null;
     var endValue = endDate != null ? dh.FilterValue.ofNumber(endDate) : null;
     var filter = column.filter();
@@ -637,31 +863,10 @@ export class TableUtils {
         throw new Error("Invalid operator: ".concat(operation));
     }
   }
-
-  /**
-   * Adds quotes to a value if they're not already added
-   * @param value Value to add quotes around
-   */
-  static quoteValue(value) {
-    if (value.length >= 2 && (value.charAt(0) === '"' && value.charAt(value.length - 1) === '"' || value.charAt(0) === "'" && value.charAt(value.length - 1) === "'")) {
-      return value;
-    }
-    return "\"".concat(value, "\"");
-  }
-  static isRangeOperation(operation) {
-    switch (operation) {
-      case '<':
-      case '<=':
-      case '=<':
-      case '>':
-      case '>=':
-      case '=>':
-        return true;
-      default:
-        return false;
-    }
-  }
-  static makeQuickCharFilter(column, text) {
+  makeQuickCharFilter(column, text) {
+    var {
+      dh
+    } = this;
     var cleanText = "".concat(text).trim();
     var regex = /^(>=|<=|=>|=<|>|<|!=|=|!)?(null|"."|'.'|.)?(.*)/;
     var result = regex.exec(cleanText);
@@ -699,91 +904,7 @@ export class TableUtils {
     var filterValue = dh.FilterValue.ofString(TableUtils.isRangeOperation(operation) ? TableUtils.quoteValue(value) : value);
     return TableUtils.makeRangeFilterWithOperation(filter, operation, filterValue);
   }
-
-  /**
-   * @param filter The column filter to apply the range operation to
-   * @param operation The range operation to run
-   * @param value The value to use for the operation
-   * @returns The condition with the specified operation
-   */
-  static makeRangeFilterWithOperation(filter, operation, value) {
-    switch (operation) {
-      case '=':
-        return filter.eq(value);
-      case '<':
-        return filter.lessThan(value);
-      case '<=':
-      case '=<':
-        return filter.lessThanOrEqualTo(value);
-      case '>':
-        return filter.greaterThan(value);
-      case '>=':
-      case '=>':
-        return filter.greaterThanOrEqualTo(value);
-      case '!=':
-      case '!':
-        return filter.notEq(value);
-      default:
-        return null;
-    }
-  }
-
-  /**
-   * Wraps a table promise in a cancelable promise that will close the table if the promise is cancelled.
-   * Use in a component that loads a table, and call cancel when unmounting.
-   * @param table The table promise to wrap
-   */
-  static makeCancelableTablePromise(table) {
-    return PromiseUtils.makeCancelable(table, resolved => {
-      resolved.close();
-    });
-  }
-
-  /**
-   * Make a cancelable promise for a one-shot table event with a timeout.
-   * @param table Table to listen for events on
-   * @param eventName Event to listen for
-   * @param timeout Event timeout in milliseconds, defaults to 0
-   * @param matcher Optional function to determine if the promise can be resolved or stays pending
-   * @returns Resolves with the event data
-   */
-  static makeCancelableTableEventPromise(table, eventName) {
-    var timeout = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    var matcher = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-    var eventCleanup;
-    var timeoutId;
-    var isPending = true;
-    var wrappedPromise = new Promise((resolve, reject) => {
-      timeoutId = setTimeout(() => {
-        eventCleanup();
-        isPending = false;
-        reject(new TimeoutError("Event \"".concat(eventName, "\" timed out.")));
-      }, timeout);
-      eventCleanup = table.addEventListener(eventName, event => {
-        if (matcher != null && !matcher(event)) {
-          log.debug2('Event triggered, but matcher returned false.');
-          return;
-        }
-        log.debug2('Event triggered, resolving.');
-        eventCleanup();
-        clearTimeout(timeoutId);
-        isPending = false;
-        resolve(event);
-      });
-    });
-    wrappedPromise.cancel = () => {
-      if (isPending) {
-        log.debug2('Pending promise cleanup.');
-        eventCleanup();
-        clearTimeout(timeoutId);
-        isPending = false;
-        return;
-      }
-      log.debug2('Ignoring non-pending promise cancel.');
-    };
-    return wrappedPromise;
-  }
-  static makeAdvancedFilter(column, options, timeZone) {
+  makeAdvancedFilter(column, options, timeZone) {
     var {
       filterItems,
       filterOperators,
@@ -799,7 +920,7 @@ export class TableUtils {
       } = filterItem;
       if (selectedType != null && selectedType.length > 0 && value != null && value.length > 0) {
         try {
-          var newFilter = TableUtils.makeAdvancedValueFilter(column, selectedType, value, timeZone);
+          var newFilter = this.makeAdvancedValueFilter(column, selectedType, value, timeZone);
           if (newFilter != null) {
             if (i === 0) {
               filter = newFilter;
@@ -825,7 +946,7 @@ export class TableUtils {
         }
       }
     }
-    var selectValueFilter = TableUtils.makeSelectValueFilter(column, selectedValues, invertSelection);
+    var selectValueFilter = this.makeSelectValueFilter(column, selectedValues, invertSelection);
     if (selectValueFilter != null) {
       if (filter != null) {
         filter = filter.and(selectValueFilter);
@@ -835,8 +956,167 @@ export class TableUtils {
     }
     return filter;
   }
-  static removeCommas(value) {
-    return value.replace(/[\s|,]/g, '');
+  makeAdvancedValueFilter(column, operation, value, timeZone) {
+    var {
+      dh
+    } = this;
+    if (TableUtils.isDateType(column.type)) {
+      return this.makeQuickDateFilterWithOperation(column, value, operation, timeZone);
+    }
+    if (TableUtils.isNumberType(column.type) || TableUtils.isCharType(column.type)) {
+      return this.makeQuickFilter(column, "".concat(TableUtils.getFilterOperatorString(operation)).concat(value));
+    }
+    var filterValue = this.makeFilterValue(column.type, value);
+    var filter = column.filter();
+    switch (operation) {
+      case FilterType.eq:
+        return filter.eq(filterValue);
+      case FilterType.eqIgnoreCase:
+        return filter.eqIgnoreCase(filterValue);
+      case FilterType.notEq:
+        return filter.notEq(filterValue);
+      case FilterType.notEqIgnoreCase:
+        return filter.notEqIgnoreCase(filterValue);
+      case FilterType.greaterThan:
+        return filter.greaterThan(filterValue);
+      case FilterType.greaterThanOrEqualTo:
+        return filter.greaterThanOrEqualTo(filterValue);
+      case FilterType.lessThan:
+        return filter.lessThan(filterValue);
+      case FilterType.lessThanOrEqualTo:
+        return filter.lessThanOrEqualTo(filterValue);
+      case FilterType.isTrue:
+        return filter.isTrue();
+      case FilterType.isFalse:
+        return filter.isFalse();
+      case FilterType.isNull:
+        return filter.isNull();
+      case FilterType.contains:
+        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E.*"))));
+      case FilterType.notContains:
+        return filter.isNull().or(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E.*"))).not());
+      case FilterType.startsWith:
+        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i)^\\Q".concat(value, "\\E.*"))));
+      case FilterType.endsWith:
+        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E$"))));
+      case FilterType.in:
+      case FilterType.inIgnoreCase:
+      case FilterType.notIn:
+      case FilterType.notInIgnoreCase:
+      case FilterType.invoke:
+      default:
+        throw new Error("Unexpected filter operation: ".concat(operation));
+    }
+  }
+
+  /**
+   * Apply a filter to a table that won't match anything.
+   * @table The table to apply the filter to
+   * @columnName The name of the column to apploy the filter to
+   * @param timeout Timeout before cancelling the promise that waits for the next
+   * dh.Table.EVENT_FILTERCHANGED event
+   * @returns a Promise to the Table that resolves after the next
+   * dh.Table.EVENT_FILTERCHANGED event
+   */
+  applyNeverFilter(table, columnName) {
+    var _arguments = arguments,
+      _this = this;
+    return _asyncToGenerator(function* () {
+      var timeout = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
+      if (table == null) {
+        return null;
+      }
+      var column = table.findColumn(columnName);
+      var filters = [_this.makeNeverFilter(column)];
+      yield _this.applyFilter(table, filters, timeout);
+      return table;
+    })();
+  }
+
+  /**
+   * Apply custom columns to a given table. Return a Promise that resolves with
+   * the table once the dh.Table.EVENT_CUSTOMCOLUMNSCHANGED event has fired.
+   * @param table The table to apply custom columns to.
+   * @param columns The list of column expressions or definitions to apply.
+   * @returns A Promise that will be resolved with the given table after the
+   * columns are applied.
+   */
+  applyCustomColumns(table, columns) {
+    var _arguments2 = arguments,
+      _this2 = this;
+    return _asyncToGenerator(function* () {
+      var timeout = _arguments2.length > 2 && _arguments2[2] !== undefined ? _arguments2[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
+      var {
+        dh
+      } = _this2;
+      return TableUtils.executeAndWaitForEvent(t => t === null || t === void 0 ? void 0 : t.applyCustomColumns(columns), table, dh.Table.EVENT_CUSTOMCOLUMNSCHANGED, timeout);
+    })();
+  }
+
+  /**
+   * Apply filters to a given table.
+   * @param table Table to apply filters to
+   * @param filters Filters to apply
+   * @param timeout Timeout before cancelling the promise that waits for the next
+   * dh.Table.EVENT_FILTERCHANGED event
+   * @returns a Promise to the Table that resolves after the next
+   * dh.Table.EVENT_FILTERCHANGED event
+   */
+  applyFilter(table, filters) {
+    var _arguments3 = arguments,
+      _this3 = this;
+    return _asyncToGenerator(function* () {
+      var timeout = _arguments3.length > 2 && _arguments3[2] !== undefined ? _arguments3[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
+      var {
+        dh
+      } = _this3;
+      return TableUtils.executeAndWaitForEvent(t => t === null || t === void 0 ? void 0 : t.applyFilter(filters), table, dh.Table.EVENT_FILTERCHANGED, timeout);
+    })();
+  }
+
+  /**
+   * Apply sorts to a given Table.
+   * @param table The table to apply sorts to
+   * @param sorts The sorts to apply
+   * @param timeout Timeout before cancelling the promise that waits for the next
+   * dh.Table.EVENT_SORTCHANGED event
+   * @returns a Promise to the Table that resolves after the next
+   * dh.Table.EVENT_SORTCHANGED event
+   */
+  applySort(table, sorts) {
+    var _arguments4 = arguments,
+      _this4 = this;
+    return _asyncToGenerator(function* () {
+      var timeout = _arguments4.length > 2 && _arguments4[2] !== undefined ? _arguments4[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
+      var {
+        dh
+      } = _this4;
+      return TableUtils.executeAndWaitForEvent(t => t === null || t === void 0 ? void 0 : t.applySort(sorts), table, dh.Table.EVENT_SORTCHANGED, timeout);
+    })();
+  }
+
+  /**
+   * Create a filter condition that results in zero results for a given column
+   * @param column
+   */
+  makeNeverFilter(column) {
+    var {
+      dh
+    } = this;
+    var value = null;
+    if (TableUtils.isTextType(column.type)) {
+      // Use 'a' so that it can work for String or Character types
+      value = dh.FilterValue.ofString('a');
+    } else if (TableUtils.isBooleanType(column.type)) {
+      value = dh.FilterValue.ofBoolean(true);
+    } else if (TableUtils.isDateType(column.type)) {
+      value = dh.FilterValue.ofNumber(dh.DateWrapper.ofJsDate(new Date()));
+    } else {
+      value = dh.FilterValue.ofNumber(0);
+    }
+    var eqFilter = column.filter().eq(value);
+    var notEqFilter = column.filter().notEq(value);
+    return eqFilter.and(notEqFilter);
   }
 
   /**
@@ -844,7 +1124,10 @@ export class TableUtils {
    * @param value The value to make the filter value from.
    * @returns The FilterValue item for this column/value combination
    */
-  static makeFilterValue(columnType, value) {
+  makeFilterValue(columnType, value) {
+    var {
+      dh
+    } = this;
     var type = TableUtils.getBaseType(columnType);
     if (TableUtils.isTextType(type)) {
       return dh.FilterValue.ofString(value);
@@ -862,7 +1145,10 @@ export class TableUtils {
    * @param value The value to actually set
    * @returns The FilterValue item for this column/value combination
    */
-  static makeFilterRawValue(columnType, rawValue) {
+  makeFilterRawValue(columnType, rawValue) {
+    var {
+      dh
+    } = this;
     if (TableUtils.isTextType(columnType)) {
       return dh.FilterValue.ofString(rawValue);
     }
@@ -878,7 +1164,10 @@ export class TableUtils {
    * @param text The string value to make a type for
    * @param timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
    */
-  static makeValue(columnType, text, timeZone) {
+  makeValue(columnType, text, timeZone) {
+    var {
+      dh
+    } = this;
     if (text === 'null') {
       return null;
     }
@@ -892,7 +1181,7 @@ export class TableUtils {
       return TableUtils.makeBooleanValue(text, true);
     }
     if (TableUtils.isDateType(columnType)) {
-      var [date] = DateUtils.parseDateRange(text, timeZone);
+      var [date] = DateUtils.parseDateRange(dh, text, timeZone);
       return date;
     }
     if (TableUtils.isNumberType(columnType)) {
@@ -901,124 +1190,6 @@ export class TableUtils {
     log.error('Unexpected column type', columnType);
     return null;
   }
-  static makeBooleanValue(text) {
-    var allowEmpty = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    if (text === '' && allowEmpty) {
-      return null;
-    }
-    switch (text === null || text === void 0 ? void 0 : text.toLowerCase()) {
-      case 'null':
-        return null;
-      case '0':
-      case 'f':
-      case 'fa':
-      case 'fal':
-      case 'fals':
-      case 'false':
-      case 'n':
-      case 'no':
-        return false;
-      case '1':
-      case 't':
-      case 'tr':
-      case 'tru':
-      case 'true':
-      case 'y':
-      case 'ye':
-      case 'yes':
-        return true;
-      default:
-        throw new Error("Invalid boolean '".concat(text, "'"));
-    }
-  }
-  static makeNumberValue(text) {
-    if (text === 'null' || text === '') {
-      return null;
-    }
-    var cleanText = text.toLowerCase().trim();
-    if (cleanText === '∞' || cleanText === 'infinity' || cleanText === 'inf') {
-      return Number.POSITIVE_INFINITY;
-    }
-    if (cleanText === '-∞' || cleanText === '-infinity' || cleanText === '-inf') {
-      return Number.NEGATIVE_INFINITY;
-    }
-    var numberText = TableUtils.removeCommas(cleanText);
-    if (TableUtils.NUMBER_REGEX.test(numberText)) {
-      return parseFloat(numberText);
-    }
-    throw new Error("Invalid number '".concat(text, "'"));
-  }
-  static getFilterOperatorString(operation) {
-    switch (operation) {
-      case FilterType.eq:
-        return '=';
-      case FilterType.notEq:
-        return '!=';
-      case FilterType.greaterThan:
-        return '>';
-      case FilterType.greaterThanOrEqualTo:
-        return '>=';
-      case FilterType.lessThan:
-        return '<';
-      case FilterType.lessThanOrEqualTo:
-        return '<=';
-      case FilterType.contains:
-        return '~';
-      case FilterType.notContains:
-        return '!~';
-      default:
-        throw new Error("Unexpected filter type ".concat(operation));
-    }
-  }
-  static makeAdvancedValueFilter(column, operation, value, timeZone) {
-    if (TableUtils.isDateType(column.type)) {
-      return TableUtils.makeQuickDateFilterWithOperation(column, value, operation, timeZone);
-    }
-    if (TableUtils.isNumberType(column.type) || TableUtils.isCharType(column.type)) {
-      return TableUtils.makeQuickFilter(column, "".concat(TableUtils.getFilterOperatorString(operation)).concat(value));
-    }
-    var filterValue = TableUtils.makeFilterValue(column.type, value);
-    var filter = column.filter();
-    switch (operation) {
-      case FilterType.eq:
-        return filter.eq(filterValue);
-      case FilterType.eqIgnoreCase:
-        return filter.eqIgnoreCase(filterValue);
-      case FilterType.notEq:
-        return filter.notEq(filterValue);
-      case FilterType.notEqIgnoreCase:
-        return filter.notEqIgnoreCase(filterValue);
-      case FilterType.greaterThan:
-        return filter.greaterThan(filterValue);
-      case FilterType.greaterThanOrEqualTo:
-        return filter.greaterThanOrEqualTo(filterValue);
-      case FilterType.lessThan:
-        return filter.lessThan(filterValue);
-      case FilterType.lessThanOrEqualTo:
-        return filter.lessThanOrEqualTo(filterValue);
-      case FilterType.isTrue:
-        return filter.isTrue();
-      case FilterType.isFalse:
-        return filter.isFalse();
-      case FilterType.isNull:
-        return filter.isNull();
-      case FilterType.contains:
-        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E.*"))));
-      case FilterType.notContains:
-        return filter.isNull().or(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E.*"))).not());
-      case FilterType.startsWith:
-        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i)^\\Q".concat(value, "\\E.*"))));
-      case FilterType.endsWith:
-        return filter.isNull().not().and(filter.invoke('matches', dh.FilterValue.ofString("(?s)(?i).*\\Q".concat(value, "\\E$"))));
-      case FilterType.in:
-      case FilterType.inIgnoreCase:
-      case FilterType.notIn:
-      case FilterType.notInIgnoreCase:
-      case FilterType.invoke:
-      default:
-        throw new Error("Unexpected filter operation: ".concat(operation));
-    }
-  }
 
   /**
    * Create a filter using the selected items
@@ -1029,7 +1200,10 @@ export class TableUtils {
    * @param invertSelection Invert the selection (eg. All items are selected, then you deselect items)
    * @returns Returns a `in` or `notIn` FilterCondition as necessary, or null if no filtering should be applied (everything selected)
    */
-  static makeSelectValueFilter(column, selectedValues, invertSelection) {
+  makeSelectValueFilter(column, selectedValues, invertSelection) {
+    var {
+      dh
+    } = this;
     if (selectedValues.length === 0) {
       if (invertSelection) {
         // No filter means select everything
@@ -1039,33 +1213,20 @@ export class TableUtils {
       // KLUDGE: Return a conflicting filter to show no results.
       // Could recognize this situation at a higher or lower level and pause updates on the
       // table, but this situation should be rare and that wouldn't be much gains for some added complexity
-      var value = null;
-      if (TableUtils.isTextType(column.type)) {
-        // Use 'a' so that it can work for String or Character types
-        value = dh.FilterValue.ofString('a');
-      } else if (TableUtils.isBooleanType(column.type)) {
-        value = dh.FilterValue.ofBoolean(true);
-      } else if (TableUtils.isDateType(column.type)) {
-        value = dh.FilterValue.ofNumber(dh.DateWrapper.ofJsDate(new Date()));
-      } else {
-        value = dh.FilterValue.ofNumber(0);
-      }
-      var eqFilter = column.filter().eq(value);
-      var notEqFilter = column.filter().notEq(value);
-      return eqFilter.and(notEqFilter);
+      return this.makeNeverFilter(column);
     }
     var values = [];
     var isNullSelected = false;
     for (var i = 0; i < selectedValues.length; i += 1) {
-      var _value = selectedValues[i];
-      if (_value == null) {
+      var value = selectedValues[i];
+      if (value == null) {
         isNullSelected = true;
       } else if (TableUtils.isTextType(column.type)) {
-        values.push(dh.FilterValue.ofString(typeof _value === 'number' ? String.fromCharCode(_value) : _value));
+        values.push(dh.FilterValue.ofString(typeof value === 'number' ? String.fromCharCode(value) : value));
       } else if (TableUtils.isBooleanType(column.type)) {
-        values.push(dh.FilterValue.ofBoolean(Boolean(_value)));
+        values.push(dh.FilterValue.ofBoolean(Boolean(value)));
       } else {
-        values.push(dh.FilterValue.ofNumber(_value));
+        values.push(dh.FilterValue.ofNumber(value));
       }
     }
     if (isNullSelected) {
@@ -1085,23 +1246,6 @@ export class TableUtils {
     }
     return column.filter().in(values);
   }
-  static isTreeTable(table) {
-    return table != null && table.expand !== undefined && table.collapse !== undefined;
-  }
-
-  /**
-   * Copies the provided array, sorts by column name case insensitive, and returns the sorted array.
-   * @param columns The columns to sort
-   * @param isAscending Whether to sort ascending
-   */
-  static sortColumns(columns) {
-    var isAscending = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    return [...columns].sort((a, b) => {
-      var aName = a.name.toUpperCase();
-      var bName = b.name.toUpperCase();
-      return TextUtils.sort(aName, bName, isAscending);
-    });
-  }
 }
 _defineProperty(TableUtils, "dataType", {
   BOOLEAN: 'boolean',
@@ -1118,11 +1262,27 @@ _defineProperty(TableUtils, "sortDirection", {
   reverse: 'REVERSE',
   none: null
 });
+_defineProperty(TableUtils, "APPLY_TABLE_CHANGE_TIMEOUT_MS", 30000);
 _defineProperty(TableUtils, "REVERSE_TYPE", Object.freeze({
   NONE: 'none',
   PRE_SORT: 'pre-sort',
   POST_SORT: 'post-sort'
 }));
 _defineProperty(TableUtils, "NUMBER_REGEX", /^-?\d+(\.\d+)?$/);
+_defineProperty(TableUtils, "executeAndWaitForEvent", /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator(function* (exec, table, eventType) {
+    var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
+    if (table == null) {
+      return null;
+    }
+    var eventPromise = TableUtils.makeCancelableTableEventPromise(table, eventType, timeout);
+    exec(table);
+    yield eventPromise;
+    return table;
+  });
+  return function (_x, _x2, _x3) {
+    return _ref2.apply(this, arguments);
+  };
+}());
 export default TableUtils;
 //# sourceMappingURL=TableUtils.js.map