@deephaven/jsapi-utils 0.38.1-beta.5 → 0.38.1-beta.9

package/dist/Formatter.d.ts

@@ -1,3 +1,4 @@
+import type { dh as DhType } from '@deephaven/jsapi-types';
 import { DataType } from './TableUtils';
 import { DateTimeColumnFormatter, DecimalColumnFormatter, IntegerColumnFormatter, TableColumnFormat, TableColumnFormatter } from './formatters';
 export type ColumnName = string;
@@ -21,13 +22,14 @@ export declare class Formatter {
      */
     static makeColumnFormattingRule(columnType: DataType, columnName: ColumnName, format: TableColumnFormat): FormattingRule;
     /**
+     * @param dh JSAPI instance
      * @param columnFormattingRules Optional array of column formatting rules
      * @param dateTimeOptions Optional object with DateTime configuration
      * @param decimalFormatOptions Optional object with Decimal configuration
      * @param integerFormatOptions Optional object with Integer configuration
      * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end
      */
-    constructor(columnFormattingRules?: FormattingRule[], dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[0], decimalFormatOptions?: ConstructorParameters<typeof DecimalColumnFormatter>[0], integerFormatOptions?: ConstructorParameters<typeof IntegerColumnFormatter>[0], truncateNumbersWithPound?: boolean);
+    constructor(dh: DhType, columnFormattingRules?: FormattingRule[], dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[1], decimalFormatOptions?: ConstructorParameters<typeof DecimalColumnFormatter>[1], integerFormatOptions?: ConstructorParameters<typeof IntegerColumnFormatter>[1], truncateNumbersWithPound?: boolean);
     defaultColumnFormatter: TableColumnFormatter;
     typeFormatterMap: Map<DataType, TableColumnFormatter>;
     columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;

package/dist/Formatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.ts"],"names":[],"mappings":"AAAA,OAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAGL,uBAAuB,EACvB,sBAAsB,EAEtB,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,qBAAa,SAAS;IACpB;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CACxB,qBAAqB,EAAE,cAAc,EAAE,GACtC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAmBpD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAC7B,UAAU,EAAE,QAAQ,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,GACxB,cAAc;IAQjB;;;;;;OAMG;gBAED,qBAAqB,GAAE,cAAc,EAAO,EAC5C,eAAe,CAAC,EAAE,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAC1E,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,wBAAwB,UAAQ;IAiClC,sBAAsB,EAAE,oBAAoB,CAAC;IAE7C,gBAAgB,EAAE,GAAG,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAEtD,eAAe,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE/D,wBAAwB,EAAE,OAAO,CAAC;IAElC;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,UAAQ,GACxB,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS;IAY7C;;;;;OAKG;IACH,eAAe,CACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,iBAAiB,GAAG,IAAI;IAK3B,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAUhE;;;;;;OAMG;IACH,kBAAkB,CAChB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,SAAK,EACf,cAAc,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAC1C,MAAM;IAYT;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"Formatter.d.ts","sourceRoot":"","sources":["../src/Formatter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAmB,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAGL,uBAAuB,EACvB,sBAAsB,EAEtB,sBAAsB,EAEtB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,cAAc,CAAC;AAEtB,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC;AAEhC,MAAM,WAAW,cAAc;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,iBAAiB,CAAC;CAC3B;AAED,qBAAa,SAAS;IACpB;;;;OAIG;IACH,MAAM,CAAC,mBAAmB,CACxB,qBAAqB,EAAE,cAAc,EAAE,GACtC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,CAAC;IAmBpD;;;;;OAKG;IACH,MAAM,CAAC,wBAAwB,CAC7B,UAAU,EAAE,QAAQ,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,iBAAiB,GACxB,cAAc;IAQjB;;;;;;;OAOG;gBAED,EAAE,EAAE,MAAM,EACV,qBAAqB,GAAE,cAAc,EAAO,EAC5C,eAAe,CAAC,EAAE,qBAAqB,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC,CAAC,EAC1E,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,oBAAoB,CAAC,EAAE,qBAAqB,CAC1C,OAAO,sBAAsB,CAC9B,CAAC,CAAC,CAAC,EACJ,wBAAwB,UAAQ;IAiClC,sBAAsB,EAAE,oBAAoB,CAAC;IAE7C,gBAAgB,EAAE,GAAG,CAAC,QAAQ,EAAE,oBAAoB,CAAC,CAAC;IAEtD,eAAe,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAE/D,wBAAwB,EAAE,OAAO,CAAC;IAElC;;;;;OAKG;IACH,yBAAyB,CACvB,UAAU,EAAE,MAAM,EAClB,iBAAiB,UAAQ,GACxB,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAAS;IAY7C;;;;;OAKG;IACH,eAAe,CACb,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,UAAU,GACrB,iBAAiB,GAAG,IAAI;IAK3B,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB;IAUhE;;;;;;OAMG;IACH,kBAAkB,CAChB,KAAK,EAAE,OAAO,EACd,UAAU,EAAE,MAAM,EAClB,UAAU,SAAK,EACf,cAAc,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,GAC1C,MAAM;IAYT;;;OAGG;IACH,IAAI,QAAQ,IAAI,MAAM,CAKrB;CACF;AAED,eAAe,SAAS,CAAC"}

package/dist/Formatter.js

@@ -42,18 +42,19 @@ export class Formatter {
   }
 
   /**
+   * @param dh JSAPI instance
    * @param columnFormattingRules Optional array of column formatting rules
    * @param dateTimeOptions Optional object with DateTime configuration
    * @param decimalFormatOptions Optional object with Decimal configuration
    * @param integerFormatOptions Optional object with Integer configuration
    * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end
    */
-  constructor() {
-    var columnFormattingRules = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var dateTimeOptions = arguments.length > 1 ? arguments[1] : undefined;
-    var decimalFormatOptions = arguments.length > 2 ? arguments[2] : undefined;
-    var integerFormatOptions = arguments.length > 3 ? arguments[3] : undefined;
-    var truncateNumbersWithPound = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
+  constructor(dh) {
+    var columnFormattingRules = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var dateTimeOptions = arguments.length > 2 ? arguments[2] : undefined;
+    var decimalFormatOptions = arguments.length > 3 ? arguments[3] : undefined;
+    var integerFormatOptions = arguments.length > 4 ? arguments[4] : undefined;
+    var truncateNumbersWithPound = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : false;
     _defineProperty(this, "defaultColumnFormatter", void 0);
     _defineProperty(this, "typeFormatterMap", void 0);
     _defineProperty(this, "columnFormatMap", void 0);
@@ -66,7 +67,7 @@ export class Formatter {
     this.defaultColumnFormatter = new DefaultColumnFormatter();
 
     // Default formatters by data type
-    this.typeFormatterMap = new Map([[TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()], [TableUtils.dataType.CHAR, new CharColumnFormatter()], [TableUtils.dataType.DATETIME, new DateTimeColumnFormatter(dateTimeOptions)], [TableUtils.dataType.DECIMAL, new DecimalColumnFormatter(decimalFormatOptions)], [TableUtils.dataType.INT, new IntegerColumnFormatter(integerFormatOptions)], [TableUtils.dataType.STRING, new StringColumnFormatter()]]);
+    this.typeFormatterMap = new Map([[TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()], [TableUtils.dataType.CHAR, new CharColumnFormatter()], [TableUtils.dataType.DATETIME, new DateTimeColumnFormatter(dh, dateTimeOptions)], [TableUtils.dataType.DECIMAL, new DecimalColumnFormatter(dh, decimalFormatOptions)], [TableUtils.dataType.INT, new IntegerColumnFormatter(dh, integerFormatOptions)], [TableUtils.dataType.STRING, new StringColumnFormatter()]]);
 
     // Formats indexed by data type and column name
     this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);

package/dist/Formatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"Formatter.js","names":["TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","StringColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dateTimeOptions","decimalFormatOptions","integerFormatOptions","truncateNumbersWithPound","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","STRING","columnFormatMap","getColumnFormatMapForType","createIfNecessary","undefined","getColumnFormat","getColumnTypeFormatter","columnTypeFormatter","getFormattedString","value","formatOverride","formatter","timeZone","dhTimeZone","id"],"sources":["../src/Formatter.ts"],"sourcesContent":["import TableUtils, { DataType } from './TableUtils';\nimport {\n  BooleanColumnFormatter,\n  CharColumnFormatter,\n  DateTimeColumnFormatter,\n  DecimalColumnFormatter,\n  DefaultColumnFormatter,\n  IntegerColumnFormatter,\n  StringColumnFormatter,\n  TableColumnFormat,\n  TableColumnFormatter,\n} from './formatters';\n\nexport type ColumnName = string;\n\nexport interface FormattingRule {\n  columnType: string;\n  columnName: ColumnName;\n  format: TableColumnFormat;\n}\n\nexport class Formatter {\n  /**\n   * Converts FormattingRule[] to Map\n   * @param columnFormattingRules Array or column formatting rules\n   * @returns Map of columnName-to-format Maps indexed by normalized dataType\n   */\n  static makeColumnFormatMap(\n    columnFormattingRules: FormattingRule[]\n  ): Map<DataType, Map<ColumnName, TableColumnFormat>> {\n    if (columnFormattingRules == null) {\n      return new Map();\n    }\n    return columnFormattingRules.reduce((map, next) => {\n      const dataType = TableUtils.getNormalizedType(next.columnType);\n      if (dataType === null) {\n        return map;\n      }\n\n      if (!map.has(dataType)) {\n        map.set(dataType, new Map());\n      }\n      const formatMap = map.get(dataType);\n      formatMap?.set(next.columnName, next.format);\n      return map;\n    }, new Map<DataType, Map<ColumnName, TableColumnFormat>>());\n  }\n\n  /**\n   * Creates a column formatting rule\n   * @param columnType Normalized data type\n   * @param columnName Column name\n   * @param format Format object\n   */\n  static makeColumnFormattingRule(\n    columnType: DataType,\n    columnName: ColumnName,\n    format: TableColumnFormat\n  ): FormattingRule {\n    return {\n      columnType,\n      columnName,\n      format,\n    };\n  }\n\n  /**\n   * @param columnFormattingRules Optional array of column formatting rules\n   * @param dateTimeOptions Optional object with DateTime configuration\n   * @param decimalFormatOptions Optional object with Decimal configuration\n   * @param integerFormatOptions Optional object with Integer configuration\n   * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end\n   */\n  constructor(\n    columnFormattingRules: FormattingRule[] = [],\n    dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[0],\n    decimalFormatOptions?: ConstructorParameters<\n      typeof DecimalColumnFormatter\n    >[0],\n    integerFormatOptions?: ConstructorParameters<\n      typeof IntegerColumnFormatter\n    >[0],\n    truncateNumbersWithPound = false\n  ) {\n    // Formatting order:\n    // - columnFormatMap[type][name]\n    // - typeFormatterMap[type]\n    // - defaultColumnFormatter\n\n    this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n    // Default formatters by data type\n    this.typeFormatterMap = new Map<DataType, TableColumnFormatter>([\n      [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n      [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n      [\n        TableUtils.dataType.DATETIME,\n        new DateTimeColumnFormatter(dateTimeOptions),\n      ],\n      [\n        TableUtils.dataType.DECIMAL,\n        new DecimalColumnFormatter(decimalFormatOptions),\n      ],\n      [\n        TableUtils.dataType.INT,\n        new IntegerColumnFormatter(integerFormatOptions),\n      ],\n      [TableUtils.dataType.STRING, new StringColumnFormatter()],\n    ]);\n\n    // Formats indexed by data type and column name\n    this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n    this.truncateNumbersWithPound = truncateNumbersWithPound;\n  }\n\n  defaultColumnFormatter: TableColumnFormatter;\n\n  typeFormatterMap: Map<DataType, TableColumnFormatter>;\n\n  columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;\n\n  truncateNumbersWithPound: boolean;\n\n  /**\n   * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n   * @param columnType column type\n   * @param createIfNecessary create new entry if true\n   * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n   */\n  getColumnFormatMapForType(\n    columnType: string,\n    createIfNecessary = false\n  ): Map<string, TableColumnFormat> | undefined {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (dataType === null) {\n      return undefined;\n    }\n\n    if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n      this.columnFormatMap.set(dataType, new Map());\n    }\n    return this.columnFormatMap.get(dataType);\n  }\n\n  /**\n   * Gets a column format object for a given column type and name\n   * @param columnType column type\n   * @param columnName column name\n   * @returns format object or null for Default\n   */\n  getColumnFormat(\n    columnType: string,\n    columnName: ColumnName\n  ): TableColumnFormat | null {\n    const columnFormatMap = this.getColumnFormatMapForType(columnType);\n    return columnFormatMap?.get(columnName) ?? null;\n  }\n\n  getColumnTypeFormatter(columnType: string): TableColumnFormatter {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    let columnTypeFormatter = this.defaultColumnFormatter;\n    if (dataType) {\n      columnTypeFormatter =\n        this.typeFormatterMap.get(dataType) ?? columnTypeFormatter;\n    }\n    return columnTypeFormatter;\n  }\n\n  /**\n   * Gets formatted string for a given value, column type and name\n   * @param value Value to format\n   * @param columnType Column type used to determine the formatting settings\n   * @param columnName Column name used to determine the formatting settings\n   * @param formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n   */\n  getFormattedString(\n    value: unknown,\n    columnType: string,\n    columnName = '',\n    formatOverride?: Partial<TableColumnFormat>\n  ): string {\n    if (value == null) {\n      return '';\n    }\n\n    const formatter = this.getColumnTypeFormatter(columnType);\n    const format =\n      formatOverride || this.getColumnFormat(columnType, columnName);\n\n    return formatter.format(value, format ?? undefined);\n  }\n\n  /**\n   * Gets the timeZone name\n   * @returns The time zone name E.g. America/New_York\n   */\n  get timeZone(): string {\n    const formatter = this.typeFormatterMap.get(\n      TableUtils.dataType.DATETIME\n    ) as DateTimeColumnFormatter;\n    return formatter?.dhTimeZone?.id;\n  }\n}\n\nexport default Formatter;\n"],"mappings":";;;OAAOA,UAAU;AAAA,SAEfC,sBAAsB,EACtBC,mBAAmB,EACnBC,uBAAuB,EACvBC,sBAAsB,EACtBC,sBAAsB,EACtBC,sBAAsB,EACtBC,qBAAqB;AAavB,OAAO,MAAMC,SAAS,CAAC;EACrB;AACF;AACA;AACA;AACA;EACE,OAAOC,mBAAmB,CACxBC,qBAAuC,EACY;IACnD,IAAIA,qBAAqB,IAAI,IAAI,EAAE;MACjC,OAAO,IAAIC,GAAG,EAAE;IAClB;IACA,OAAOD,qBAAqB,CAACE,MAAM,CAAC,CAACC,GAAG,EAAEC,IAAI,KAAK;MACjD,IAAMC,QAAQ,GAAGf,UAAU,CAACgB,iBAAiB,CAACF,IAAI,CAACG,UAAU,CAAC;MAC9D,IAAIF,QAAQ,KAAK,IAAI,EAAE;QACrB,OAAOF,GAAG;MACZ;MAEA,IAAI,CAACA,GAAG,CAACK,GAAG,CAACH,QAAQ,CAAC,EAAE;QACtBF,GAAG,CAACM,GAAG,CAACJ,QAAQ,EAAE,IAAIJ,GAAG,EAAE,CAAC;MAC9B;MACA,IAAMS,SAAS,GAAGP,GAAG,CAACQ,GAAG,CAACN,QAAQ,CAAC;MACnCK,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAED,GAAG,CAACL,IAAI,CAACQ,UAAU,EAAER,IAAI,CAACS,MAAM,CAAC;MAC5C,OAAOV,GAAG;IACZ,CAAC,EAAE,IAAIF,GAAG,EAAgD,CAAC;EAC7D;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE,OAAOa,wBAAwB,CAC7BP,UAAoB,EACpBK,UAAsB,EACtBC,MAAyB,EACT;IAChB,OAAO;MACLN,UAAU;MACVK,UAAU;MACVC;IACF,CAAC;EACH;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEE,WAAW,GAUT;IAAA,IATAf,qBAAuC,uEAAG,EAAE;IAAA,IAC5CgB,eAA0E;IAAA,IAC1EC,oBAEI;IAAA,IACJC,oBAEI;IAAA,IACJC,wBAAwB,uEAAG,KAAK;IAAA;IAAA;IAAA;IAAA;IAEhC;IACA;IACA;IACA;;IAEA,IAAI,CAACC,sBAAsB,GAAG,IAAIzB,sBAAsB,EAAE;;IAE1D;IACA,IAAI,CAAC0B,gBAAgB,GAAG,IAAIpB,GAAG,CAAiC,CAC9D,CAACX,UAAU,CAACe,QAAQ,CAACiB,OAAO,EAAE,IAAI/B,sBAAsB,EAAE,CAAC,EAC3D,CAACD,UAAU,CAACe,QAAQ,CAACkB,IAAI,EAAE,IAAI/B,mBAAmB,EAAE,CAAC,EACrD,CACEF,UAAU,CAACe,QAAQ,CAACmB,QAAQ,EAC5B,IAAI/B,uBAAuB,CAACuB,eAAe,CAAC,CAC7C,EACD,CACE1B,UAAU,CAACe,QAAQ,CAACoB,OAAO,EAC3B,IAAI/B,sBAAsB,CAACuB,oBAAoB,CAAC,CACjD,EACD,CACE3B,UAAU,CAACe,QAAQ,CAACqB,GAAG,EACvB,IAAI9B,sBAAsB,CAACsB,oBAAoB,CAAC,CACjD,EACD,CAAC5B,UAAU,CAACe,QAAQ,CAACsB,MAAM,EAAE,IAAI9B,qBAAqB,EAAE,CAAC,CAC1D,CAAC;;IAEF;IACA,IAAI,CAAC+B,eAAe,GAAG9B,SAAS,CAACC,mBAAmB,CAACC,qBAAqB,CAAC;IAC3E,IAAI,CAACmB,wBAAwB,GAAGA,wBAAwB;EAC1D;EAUA;AACF;AACA;AACA;AACA;AACA;EACEU,yBAAyB,CACvBtB,UAAkB,EAE0B;IAAA,IAD5CuB,iBAAiB,uEAAG,KAAK;IAEzB,IAAMzB,QAAQ,GAAGf,UAAU,CAACgB,iBAAiB,CAACC,UAAU,CAAC;IACzD,IAAIF,QAAQ,KAAK,IAAI,EAAE;MACrB,OAAO0B,SAAS;IAClB;IAEA,IAAID,iBAAiB,IAAI,CAAC,IAAI,CAACF,eAAe,CAACpB,GAAG,CAACH,QAAQ,CAAC,EAAE;MAC5D,IAAI,CAACuB,eAAe,CAACnB,GAAG,CAACJ,QAAQ,EAAE,IAAIJ,GAAG,EAAE,CAAC;IAC/C;IACA,OAAO,IAAI,CAAC2B,eAAe,CAACjB,GAAG,CAACN,QAAQ,CAAC;EAC3C;;EAEA;AACF;AACA;AACA;AACA;AACA;EACE2B,eAAe,CACbzB,UAAkB,EAClBK,UAAsB,EACI;IAAA;IAC1B,IAAMgB,eAAe,GAAG,IAAI,CAACC,yBAAyB,CAACtB,UAAU,CAAC;IAClE,+BAAOqB,eAAe,aAAfA,eAAe,uBAAfA,eAAe,CAAEjB,GAAG,CAACC,UAAU,CAAC,uEAAI,IAAI;EACjD;EAEAqB,sBAAsB,CAAC1B,UAAkB,EAAwB;IAC/D,IAAMF,QAAQ,GAAGf,UAAU,CAACgB,iBAAiB,CAACC,UAAU,CAAC;IACzD,IAAI2B,mBAAmB,GAAG,IAAI,CAACd,sBAAsB;IACrD,IAAIf,QAAQ,EAAE;MAAA;MACZ6B,mBAAmB,4BACjB,IAAI,CAACb,gBAAgB,CAACV,GAAG,CAACN,QAAQ,CAAC,yEAAI6B,mBAAmB;IAC9D;IACA,OAAOA,mBAAmB;EAC5B;;EAEA;AACF;AACA;AACA;AACA;AACA;AACA;EACEC,kBAAkB,CAChBC,KAAc,EACd7B,UAAkB,EAGV;IAAA,IAFRK,UAAU,uEAAG,EAAE;IAAA,IACfyB,cAA2C;IAE3C,IAAID,KAAK,IAAI,IAAI,EAAE;MACjB,OAAO,EAAE;IACX;IAEA,IAAME,SAAS,GAAG,IAAI,CAACL,sBAAsB,CAAC1B,UAAU,CAAC;IACzD,IAAMM,MAAM,GACVwB,cAAc,IAAI,IAAI,CAACL,eAAe,CAACzB,UAAU,EAAEK,UAAU,CAAC;IAEhE,OAAO0B,SAAS,CAACzB,MAAM,CAACuB,KAAK,EAAEvB,MAAM,aAANA,MAAM,cAANA,MAAM,GAAIkB,SAAS,CAAC;EACrD;;EAEA;AACF;AACA;AACA;EACE,IAAIQ,QAAQ,GAAW;IAAA;IACrB,IAAMD,SAAS,GAAG,IAAI,CAACjB,gBAAgB,CAACV,GAAG,CACzCrB,UAAU,CAACe,QAAQ,CAACmB,QAAQ,CACF;IAC5B,OAAOc,SAAS,aAATA,SAAS,gDAATA,SAAS,CAAEE,UAAU,0DAArB,sBAAuBC,EAAE;EAClC;AACF;AAEA,eAAe3C,SAAS"}
+{"version":3,"file":"Formatter.js","names":["TableUtils","BooleanColumnFormatter","CharColumnFormatter","DateTimeColumnFormatter","DecimalColumnFormatter","DefaultColumnFormatter","IntegerColumnFormatter","StringColumnFormatter","Formatter","makeColumnFormatMap","columnFormattingRules","Map","reduce","map","next","dataType","getNormalizedType","columnType","has","set","formatMap","get","columnName","format","makeColumnFormattingRule","constructor","dh","dateTimeOptions","decimalFormatOptions","integerFormatOptions","truncateNumbersWithPound","defaultColumnFormatter","typeFormatterMap","BOOLEAN","CHAR","DATETIME","DECIMAL","INT","STRING","columnFormatMap","getColumnFormatMapForType","createIfNecessary","undefined","getColumnFormat","getColumnTypeFormatter","columnTypeFormatter","getFormattedString","value","formatOverride","formatter","timeZone","dhTimeZone","id"],"sources":["../src/Formatter.ts"],"sourcesContent":["import type { dh as DhType } from '@deephaven/jsapi-types';\nimport TableUtils, { DataType } from './TableUtils';\nimport {\n  BooleanColumnFormatter,\n  CharColumnFormatter,\n  DateTimeColumnFormatter,\n  DecimalColumnFormatter,\n  DefaultColumnFormatter,\n  IntegerColumnFormatter,\n  StringColumnFormatter,\n  TableColumnFormat,\n  TableColumnFormatter,\n} from './formatters';\n\nexport type ColumnName = string;\n\nexport interface FormattingRule {\n  columnType: string;\n  columnName: ColumnName;\n  format: TableColumnFormat;\n}\n\nexport class Formatter {\n  /**\n   * Converts FormattingRule[] to Map\n   * @param columnFormattingRules Array or column formatting rules\n   * @returns Map of columnName-to-format Maps indexed by normalized dataType\n   */\n  static makeColumnFormatMap(\n    columnFormattingRules: FormattingRule[]\n  ): Map<DataType, Map<ColumnName, TableColumnFormat>> {\n    if (columnFormattingRules == null) {\n      return new Map();\n    }\n    return columnFormattingRules.reduce((map, next) => {\n      const dataType = TableUtils.getNormalizedType(next.columnType);\n      if (dataType === null) {\n        return map;\n      }\n\n      if (!map.has(dataType)) {\n        map.set(dataType, new Map());\n      }\n      const formatMap = map.get(dataType);\n      formatMap?.set(next.columnName, next.format);\n      return map;\n    }, new Map<DataType, Map<ColumnName, TableColumnFormat>>());\n  }\n\n  /**\n   * Creates a column formatting rule\n   * @param columnType Normalized data type\n   * @param columnName Column name\n   * @param format Format object\n   */\n  static makeColumnFormattingRule(\n    columnType: DataType,\n    columnName: ColumnName,\n    format: TableColumnFormat\n  ): FormattingRule {\n    return {\n      columnType,\n      columnName,\n      format,\n    };\n  }\n\n  /**\n   * @param dh JSAPI instance\n   * @param columnFormattingRules Optional array of column formatting rules\n   * @param dateTimeOptions Optional object with DateTime configuration\n   * @param decimalFormatOptions Optional object with Decimal configuration\n   * @param integerFormatOptions Optional object with Integer configuration\n   * @param truncateNumbersWithPound Determine if numbers should be truncated w/ repeating # instead of ellipsis at the end\n   */\n  constructor(\n    dh: DhType,\n    columnFormattingRules: FormattingRule[] = [],\n    dateTimeOptions?: ConstructorParameters<typeof DateTimeColumnFormatter>[1],\n    decimalFormatOptions?: ConstructorParameters<\n      typeof DecimalColumnFormatter\n    >[1],\n    integerFormatOptions?: ConstructorParameters<\n      typeof IntegerColumnFormatter\n    >[1],\n    truncateNumbersWithPound = false\n  ) {\n    // Formatting order:\n    // - columnFormatMap[type][name]\n    // - typeFormatterMap[type]\n    // - defaultColumnFormatter\n\n    this.defaultColumnFormatter = new DefaultColumnFormatter();\n\n    // Default formatters by data type\n    this.typeFormatterMap = new Map<DataType, TableColumnFormatter>([\n      [TableUtils.dataType.BOOLEAN, new BooleanColumnFormatter()],\n      [TableUtils.dataType.CHAR, new CharColumnFormatter()],\n      [\n        TableUtils.dataType.DATETIME,\n        new DateTimeColumnFormatter(dh, dateTimeOptions),\n      ],\n      [\n        TableUtils.dataType.DECIMAL,\n        new DecimalColumnFormatter(dh, decimalFormatOptions),\n      ],\n      [\n        TableUtils.dataType.INT,\n        new IntegerColumnFormatter(dh, integerFormatOptions),\n      ],\n      [TableUtils.dataType.STRING, new StringColumnFormatter()],\n    ]);\n\n    // Formats indexed by data type and column name\n    this.columnFormatMap = Formatter.makeColumnFormatMap(columnFormattingRules);\n    this.truncateNumbersWithPound = truncateNumbersWithPound;\n  }\n\n  defaultColumnFormatter: TableColumnFormatter;\n\n  typeFormatterMap: Map<DataType, TableColumnFormatter>;\n\n  columnFormatMap: Map<DataType, Map<string, TableColumnFormat>>;\n\n  truncateNumbersWithPound: boolean;\n\n  /**\n   * Gets columnFormatMap indexed by name for a given column type, creates new Map entry if necessary\n   * @param columnType column type\n   * @param createIfNecessary create new entry if true\n   * @returns Map of format strings indexed by column name or undefined if it doesn't exist\n   */\n  getColumnFormatMapForType(\n    columnType: string,\n    createIfNecessary = false\n  ): Map<string, TableColumnFormat> | undefined {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    if (dataType === null) {\n      return undefined;\n    }\n\n    if (createIfNecessary && !this.columnFormatMap.has(dataType)) {\n      this.columnFormatMap.set(dataType, new Map());\n    }\n    return this.columnFormatMap.get(dataType);\n  }\n\n  /**\n   * Gets a column format object for a given column type and name\n   * @param columnType column type\n   * @param columnName column name\n   * @returns format object or null for Default\n   */\n  getColumnFormat(\n    columnType: string,\n    columnName: ColumnName\n  ): TableColumnFormat | null {\n    const columnFormatMap = this.getColumnFormatMapForType(columnType);\n    return columnFormatMap?.get(columnName) ?? null;\n  }\n\n  getColumnTypeFormatter(columnType: string): TableColumnFormatter {\n    const dataType = TableUtils.getNormalizedType(columnType);\n    let columnTypeFormatter = this.defaultColumnFormatter;\n    if (dataType) {\n      columnTypeFormatter =\n        this.typeFormatterMap.get(dataType) ?? columnTypeFormatter;\n    }\n    return columnTypeFormatter;\n  }\n\n  /**\n   * Gets formatted string for a given value, column type and name\n   * @param value Value to format\n   * @param columnType Column type used to determine the formatting settings\n   * @param columnName Column name used to determine the formatting settings\n   * @param formatOverride Format object passed to the formatter in place of the format defined in columnFormatMap\n   */\n  getFormattedString(\n    value: unknown,\n    columnType: string,\n    columnName = '',\n    formatOverride?: Partial<TableColumnFormat>\n  ): string {\n    if (value == null) {\n      return '';\n    }\n\n    const formatter = this.getColumnTypeFormatter(columnType);\n    const format =\n      formatOverride || this.getColumnFormat(columnType, columnName);\n\n    return formatter.format(value, format ?? undefined);\n  }\n\n  /**\n   * Gets the timeZone name\n   * @returns The time zone name E.g. America/New_York\n   */\n  get timeZone(): string {\n    const formatter = this.typeFormatterMap.get(\n      TableUtils.dataType.DATETIME\n    ) as DateTimeColumnFormatter;\n    return formatter?.dhTimeZone?.id;\n  }\n}\n\nexport default Formatter;\n"],"mappings":"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"}

package/dist/FormatterUtils.d.ts

@@ -3,7 +3,7 @@ import Formatter from './Formatter';
 import { DateTimeColumnFormatter } from './formatters';
 import { ColumnFormatSettings, DateTimeFormatSettings } from './Settings';
 export declare function getColumnFormats(settings?: ColumnFormatSettings): FormattingRule[] | undefined;
-export declare function getDateTimeFormatterOptions(settings?: DateTimeFormatSettings | null): ConstructorParameters<typeof DateTimeColumnFormatter>[0];
+export declare function getDateTimeFormatterOptions(settings?: DateTimeFormatSettings | null): ConstructorParameters<typeof DateTimeColumnFormatter>[1];
 /**
  * Check if the formatter has a custom format defined for the column name and type
  * @param formatter Formatter to check

package/dist/FormatterUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormatterUtils.js","names":["TableColumnFormatter","getColumnFormats","settings","formatter","undefined","getDateTimeFormatterOptions","timeZone","defaultDateTimeFormatString","defaultDateTimeFormat","showTimeZone","showTSeparator","isCustomColumnFormatDefined","columnName","columnType","columnFormat","getColumnFormat","type","TYPE_CONTEXT_PRESET","TYPE_CONTEXT_CUSTOM"],"sources":["../src/FormatterUtils.ts"],"sourcesContent":["import type { FormattingRule } from './Formatter';\nimport Formatter from './Formatter';\nimport { DateTimeColumnFormatter, TableColumnFormatter } from './formatters';\nimport { ColumnFormatSettings, DateTimeFormatSettings } from './Settings';\n\nexport function getColumnFormats(\n  settings?: ColumnFormatSettings\n): FormattingRule[] | undefined {\n  if (settings && settings.formatter) {\n    const { formatter } = settings;\n    return formatter;\n  }\n  return undefined;\n}\n\nexport function getDateTimeFormatterOptions(\n  settings?: DateTimeFormatSettings | null\n): ConstructorParameters<typeof DateTimeColumnFormatter>[0] {\n  return {\n    timeZone: settings?.timeZone,\n    defaultDateTimeFormatString: settings?.defaultDateTimeFormat,\n    showTimeZone: settings?.showTimeZone,\n    showTSeparator: settings?.showTSeparator,\n  };\n}\n\n/**\n * Check if the formatter has a custom format defined for the column name and type\n * @param formatter Formatter to check\n * @param columnName Column name\n * @param columnType Column type\n * @returns True, if a custom format is defined\n */\nexport function isCustomColumnFormatDefined(\n  formatter: Formatter,\n  columnName: string,\n  columnType: string\n): boolean {\n  const columnFormat = formatter.getColumnFormat(columnType, columnName);\n  return (\n    columnFormat != null &&\n    (columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_PRESET ||\n      columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_CUSTOM)\n  );\n}\n\nexport default {\n  getColumnFormats,\n  getDateTimeFormatterOptions,\n  isCustomColumnFormatDefined,\n};\n"],"mappings":"SAEkCA,oBAAoB;AAGtD,OAAO,SAASC,gBAAgB,CAC9BC,QAA+B,EACD;EAC9B,IAAIA,QAAQ,IAAIA,QAAQ,CAACC,SAAS,EAAE;IAClC,IAAM;MAAEA;IAAU,CAAC,GAAGD,QAAQ;IAC9B,OAAOC,SAAS;EAClB;EACA,OAAOC,SAAS;AAClB;AAEA,OAAO,SAASC,2BAA2B,CACzCH,QAAwC,EACkB;EAC1D,OAAO;IACLI,QAAQ,EAAEJ,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEI,QAAQ;IAC5BC,2BAA2B,EAAEL,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEM,qBAAqB;IAC5DC,YAAY,EAAEP,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEO,YAAY;IACpCC,cAAc,EAAER,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEQ;EAC5B,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,2BAA2B,CACzCR,SAAoB,EACpBS,UAAkB,EAClBC,UAAkB,EACT;EACT,IAAMC,YAAY,GAAGX,SAAS,CAACY,eAAe,CAACF,UAAU,EAAED,UAAU,CAAC;EACtE,OACEE,YAAY,IAAI,IAAI,KACnBA,YAAY,CAACE,IAAI,KAAKhB,oBAAoB,CAACiB,mBAAmB,IAC7DH,YAAY,CAACE,IAAI,KAAKhB,oBAAoB,CAACkB,mBAAmB,CAAC;AAErE;AAEA,eAAe;EACbjB,gBAAgB;EAChBI,2BAA2B;EAC3BM;AACF,CAAC"}
+{"version":3,"file":"FormatterUtils.js","names":["TableColumnFormatter","getColumnFormats","settings","formatter","undefined","getDateTimeFormatterOptions","timeZone","defaultDateTimeFormatString","defaultDateTimeFormat","showTimeZone","showTSeparator","isCustomColumnFormatDefined","columnName","columnType","columnFormat","getColumnFormat","type","TYPE_CONTEXT_PRESET","TYPE_CONTEXT_CUSTOM"],"sources":["../src/FormatterUtils.ts"],"sourcesContent":["import type { FormattingRule } from './Formatter';\nimport Formatter from './Formatter';\nimport { DateTimeColumnFormatter, TableColumnFormatter } from './formatters';\nimport { ColumnFormatSettings, DateTimeFormatSettings } from './Settings';\n\nexport function getColumnFormats(\n  settings?: ColumnFormatSettings\n): FormattingRule[] | undefined {\n  if (settings && settings.formatter) {\n    const { formatter } = settings;\n    return formatter;\n  }\n  return undefined;\n}\n\nexport function getDateTimeFormatterOptions(\n  settings?: DateTimeFormatSettings | null\n): ConstructorParameters<typeof DateTimeColumnFormatter>[1] {\n  return {\n    timeZone: settings?.timeZone,\n    defaultDateTimeFormatString: settings?.defaultDateTimeFormat,\n    showTimeZone: settings?.showTimeZone,\n    showTSeparator: settings?.showTSeparator,\n  };\n}\n\n/**\n * Check if the formatter has a custom format defined for the column name and type\n * @param formatter Formatter to check\n * @param columnName Column name\n * @param columnType Column type\n * @returns True, if a custom format is defined\n */\nexport function isCustomColumnFormatDefined(\n  formatter: Formatter,\n  columnName: string,\n  columnType: string\n): boolean {\n  const columnFormat = formatter.getColumnFormat(columnType, columnName);\n  return (\n    columnFormat != null &&\n    (columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_PRESET ||\n      columnFormat.type === TableColumnFormatter.TYPE_CONTEXT_CUSTOM)\n  );\n}\n\nexport default {\n  getColumnFormats,\n  getDateTimeFormatterOptions,\n  isCustomColumnFormatDefined,\n};\n"],"mappings":"SAEkCA,oBAAoB;AAGtD,OAAO,SAASC,gBAAgB,CAC9BC,QAA+B,EACD;EAC9B,IAAIA,QAAQ,IAAIA,QAAQ,CAACC,SAAS,EAAE;IAClC,IAAM;MAAEA;IAAU,CAAC,GAAGD,QAAQ;IAC9B,OAAOC,SAAS;EAClB;EACA,OAAOC,SAAS;AAClB;AAEA,OAAO,SAASC,2BAA2B,CACzCH,QAAwC,EACkB;EAC1D,OAAO;IACLI,QAAQ,EAAEJ,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEI,QAAQ;IAC5BC,2BAA2B,EAAEL,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEM,qBAAqB;IAC5DC,YAAY,EAAEP,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEO,YAAY;IACpCC,cAAc,EAAER,QAAQ,aAARA,QAAQ,uBAARA,QAAQ,CAAEQ;EAC5B,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,2BAA2B,CACzCR,SAAoB,EACpBS,UAAkB,EAClBC,UAAkB,EACT;EACT,IAAMC,YAAY,GAAGX,SAAS,CAACY,eAAe,CAACF,UAAU,EAAED,UAAU,CAAC;EACtE,OACEE,YAAY,IAAI,IAAI,KACnBA,YAAY,CAACE,IAAI,KAAKhB,oBAAoB,CAACiB,mBAAmB,IAC7DH,YAAY,CAACE,IAAI,KAAKhB,oBAAoB,CAACkB,mBAAmB,CAAC;AAErE;AAEA,eAAe;EACbjB,gBAAgB;EAChBI,2BAA2B;EAC3BM;AACF,CAAC"}

package/dist/SessionUtils.d.ts

@@ -1,4 +1,4 @@
-import type { ConnectOptions, CoreClient, IdeConnection, IdeSession } from '@deephaven/jsapi-types';
+import type { ConnectOptions, CoreClient, dh as DhType, IdeConnection, IdeSession } from '@deephaven/jsapi-types';
 export interface SessionConfig {
     type: string;
     id: string;
@@ -16,13 +16,13 @@ export interface SessionWrapper {
 /**
  * @returns New connection to the server
  */
-export declare function createConnection(websocketUrl: string): IdeConnection;
+export declare function createConnection(dh: DhType, websocketUrl: string): IdeConnection;
 /**
  * Create a new session using the default URL
  * @returns A session and config that is ready to use
  */
 export declare function createSessionWrapper(connection: IdeConnection, details: SessionDetails): Promise<SessionWrapper>;
-export declare function createCoreClient(websocketUrl: string, options?: ConnectOptions): CoreClient;
+export declare function createCoreClient(dh: DhType, websocketUrl: string, options?: ConnectOptions): CoreClient;
 export declare function getSessionDetails(): Promise<SessionDetails>;
 export declare function loadSessionWrapper(connection: IdeConnection, sessionDetails: SessionDetails): Promise<SessionWrapper | undefined>;
 //# sourceMappingURL=SessionUtils.d.ts.map

package/dist/SessionUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionUtils.d.ts","sourceRoot":"","sources":["../src/SessionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,aAAa,EACb,UAAU,EACX,MAAM,wBAAwB,CAAC;AAWhC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,aAAa,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,GAAG,aAAa,CAIpE;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA2BzB;AAED,wBAAgB,gBAAgB,CAC9B,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,cAAc,GACvB,UAAU,CAIZ;AAcD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC,CAOjE;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,aAAa,EACzB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAWrC"}
+{"version":3,"file":"SessionUtils.d.ts","sourceRoot":"","sources":["../src/SessionUtils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,UAAU,EACV,EAAE,IAAI,MAAM,EACZ,aAAa,EACb,UAAU,EACX,MAAM,wBAAwB,CAAC;AAWhC,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,OAAO,EAAE,UAAU,CAAC;IACpB,UAAU,EAAE,aAAa,CAAC;IAC1B,MAAM,EAAE,aAAa,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,EACV,YAAY,EAAE,MAAM,GACnB,aAAa,CAIf;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,cAAc,CAAC,CA2BzB;AAED,wBAAgB,gBAAgB,CAC9B,EAAE,EAAE,MAAM,EACV,YAAY,EAAE,MAAM,EACpB,OAAO,CAAC,EAAE,cAAc,GACvB,UAAU,CAIZ;AAcD,wBAAsB,iBAAiB,IAAI,OAAO,CAAC,cAAc,CAAC,CAOjE;AAED,wBAAsB,kBAAkB,CACtC,UAAU,EAAE,aAAa,EACzB,cAAc,EAAE,cAAc,GAC7B,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAWrC"}

package/dist/SessionUtils.js

@@ -8,7 +8,7 @@ var log = Log.module('SessionUtils');
 /**
  * @returns New connection to the server
  */
-export function createConnection(websocketUrl) {
+export function createConnection(dh, websocketUrl) {
   log.info("Starting connection to '".concat(websocketUrl, "'..."));
   return new dh.IdeConnection(websocketUrl);
 }
@@ -45,7 +45,7 @@ function _createSessionWrapper() {
   });
   return _createSessionWrapper.apply(this, arguments);
 }
-export function createCoreClient(websocketUrl, options) {
+export function createCoreClient(dh, websocketUrl, options) {
   log.info('createCoreClient', websocketUrl);
   return new dh.CoreClient(websocketUrl, options);
 }

package/dist/SessionUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionUtils.js","names":["requestParentResponse","SESSION_DETAILS_REQUEST","Log","shortid","NoConsolesError","isNoConsolesError","log","module","createConnection","websocketUrl","info","dh","IdeConnection","createSessionWrapper","connection","details","types","getConsoleTypes","length","type","session","startSession","config","id","generate","createCoreClient","options","CoreClient","isSessionDetails","obj","requestParentSessionDetails","response","Error","getSessionDetails","searchParams","URLSearchParams","window","location","search","get","loadSessionWrapper","sessionDetails","sessionWrapper","e"],"sources":["../src/SessionUtils.ts"],"sourcesContent":["import type {\n  ConnectOptions,\n  CoreClient,\n  IdeConnection,\n  IdeSession,\n} from '@deephaven/jsapi-types';\nimport {\n  requestParentResponse,\n  SESSION_DETAILS_REQUEST,\n} from '@deephaven/jsapi-utils';\nimport Log from '@deephaven/log';\nimport shortid from 'shortid';\nimport NoConsolesError, { isNoConsolesError } from './NoConsolesError';\n\nconst log = Log.module('SessionUtils');\n\nexport interface SessionConfig {\n  type: string;\n  id: string;\n}\n\nexport interface SessionDetails {\n  workerName?: string;\n  processInfoId?: string;\n}\n\nexport interface SessionWrapper {\n  session: IdeSession;\n  connection: IdeConnection;\n  config: SessionConfig;\n  details?: SessionDetails;\n}\n\n/**\n * @returns New connection to the server\n */\nexport function createConnection(websocketUrl: string): IdeConnection {\n  log.info(`Starting connection to '${websocketUrl}'...`);\n\n  return new dh.IdeConnection(websocketUrl);\n}\n\n/**\n * Create a new session using the default URL\n * @returns A session and config that is ready to use\n */\nexport async function createSessionWrapper(\n  connection: IdeConnection,\n  details: SessionDetails\n): Promise<SessionWrapper> {\n  log.info('Getting console types...');\n\n  const types = await connection.getConsoleTypes();\n\n  if (types.length === 0) {\n    throw new NoConsolesError('No console types available');\n  }\n\n  log.info('Available types:', types);\n\n  const type = types[0];\n\n  log.info('Starting session with type', type);\n\n  const session = await connection.startSession(type);\n\n  const config = { type, id: shortid.generate() };\n\n  log.info('Console session established', config);\n\n  return {\n    session,\n    config,\n    connection,\n    details,\n  };\n}\n\nexport function createCoreClient(\n  websocketUrl: string,\n  options?: ConnectOptions\n): CoreClient {\n  log.info('createCoreClient', websocketUrl);\n\n  return new dh.CoreClient(websocketUrl, options);\n}\n\nfunction isSessionDetails(obj: unknown): obj is SessionDetails {\n  return obj != null && typeof obj === 'object';\n}\n\nasync function requestParentSessionDetails(): Promise<SessionDetails> {\n  const response = await requestParentResponse(SESSION_DETAILS_REQUEST);\n  if (!isSessionDetails(response)) {\n    throw new Error(`Unexpected session details response: ${response}`);\n  }\n  return response;\n}\n\nexport async function getSessionDetails(): Promise<SessionDetails> {\n  const searchParams = new URLSearchParams(window.location.search);\n  switch (searchParams.get('authProvider')) {\n    case 'parent':\n      return requestParentSessionDetails();\n  }\n  return {};\n}\n\nexport async function loadSessionWrapper(\n  connection: IdeConnection,\n  sessionDetails: SessionDetails\n): Promise<SessionWrapper | undefined> {\n  let sessionWrapper: SessionWrapper | undefined;\n  try {\n    sessionWrapper = await createSessionWrapper(connection, sessionDetails);\n  } catch (e) {\n    // Consoles may be disabled on the server, but we should still be able to start up and open existing objects\n    if (!isNoConsolesError(e)) {\n      throw e;\n    }\n  }\n  return sessionWrapper;\n}\n"],"mappings":"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"}
+{"version":3,"file":"SessionUtils.js","names":["requestParentResponse","SESSION_DETAILS_REQUEST","Log","shortid","NoConsolesError","isNoConsolesError","log","module","createConnection","dh","websocketUrl","info","IdeConnection","createSessionWrapper","connection","details","types","getConsoleTypes","length","type","session","startSession","config","id","generate","createCoreClient","options","CoreClient","isSessionDetails","obj","requestParentSessionDetails","response","Error","getSessionDetails","searchParams","URLSearchParams","window","location","search","get","loadSessionWrapper","sessionDetails","sessionWrapper","e"],"sources":["../src/SessionUtils.ts"],"sourcesContent":["import type {\n  ConnectOptions,\n  CoreClient,\n  dh as DhType,\n  IdeConnection,\n  IdeSession,\n} from '@deephaven/jsapi-types';\nimport {\n  requestParentResponse,\n  SESSION_DETAILS_REQUEST,\n} from '@deephaven/jsapi-utils';\nimport Log from '@deephaven/log';\nimport shortid from 'shortid';\nimport NoConsolesError, { isNoConsolesError } from './NoConsolesError';\n\nconst log = Log.module('SessionUtils');\n\nexport interface SessionConfig {\n  type: string;\n  id: string;\n}\n\nexport interface SessionDetails {\n  workerName?: string;\n  processInfoId?: string;\n}\n\nexport interface SessionWrapper {\n  session: IdeSession;\n  connection: IdeConnection;\n  config: SessionConfig;\n  details?: SessionDetails;\n}\n\n/**\n * @returns New connection to the server\n */\nexport function createConnection(\n  dh: DhType,\n  websocketUrl: string\n): IdeConnection {\n  log.info(`Starting connection to '${websocketUrl}'...`);\n\n  return new dh.IdeConnection(websocketUrl);\n}\n\n/**\n * Create a new session using the default URL\n * @returns A session and config that is ready to use\n */\nexport async function createSessionWrapper(\n  connection: IdeConnection,\n  details: SessionDetails\n): Promise<SessionWrapper> {\n  log.info('Getting console types...');\n\n  const types = await connection.getConsoleTypes();\n\n  if (types.length === 0) {\n    throw new NoConsolesError('No console types available');\n  }\n\n  log.info('Available types:', types);\n\n  const type = types[0];\n\n  log.info('Starting session with type', type);\n\n  const session = await connection.startSession(type);\n\n  const config = { type, id: shortid.generate() };\n\n  log.info('Console session established', config);\n\n  return {\n    session,\n    config,\n    connection,\n    details,\n  };\n}\n\nexport function createCoreClient(\n  dh: DhType,\n  websocketUrl: string,\n  options?: ConnectOptions\n): CoreClient {\n  log.info('createCoreClient', websocketUrl);\n\n  return new dh.CoreClient(websocketUrl, options);\n}\n\nfunction isSessionDetails(obj: unknown): obj is SessionDetails {\n  return obj != null && typeof obj === 'object';\n}\n\nasync function requestParentSessionDetails(): Promise<SessionDetails> {\n  const response = await requestParentResponse(SESSION_DETAILS_REQUEST);\n  if (!isSessionDetails(response)) {\n    throw new Error(`Unexpected session details response: ${response}`);\n  }\n  return response;\n}\n\nexport async function getSessionDetails(): Promise<SessionDetails> {\n  const searchParams = new URLSearchParams(window.location.search);\n  switch (searchParams.get('authProvider')) {\n    case 'parent':\n      return requestParentSessionDetails();\n  }\n  return {};\n}\n\nexport async function loadSessionWrapper(\n  connection: IdeConnection,\n  sessionDetails: SessionDetails\n): Promise<SessionWrapper | undefined> {\n  let sessionWrapper: SessionWrapper | undefined;\n  try {\n    sessionWrapper = await createSessionWrapper(connection, sessionDetails);\n  } catch (e) {\n    // Consoles may be disabled on the server, but we should still be able to start up and open existing objects\n    if (!isNoConsolesError(e)) {\n      throw e;\n    }\n  }\n  return sessionWrapper;\n}\n"],"mappings":"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"}

package/dist/TableUtils.d.ts

@@ -66,45 +66,6 @@ export declare class TableUtils {
      * event
      */
     static executeAndWaitForEvent: <T extends Table | TreeTable>(exec: (maybeTable: T | null | undefined) => void, table: T | null | undefined, eventType: string, timeout?: number) => Promise<T | null>;
-    /**
-     * 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.
-     */
-    static applyCustomColumns(table: Table | null | undefined, columns: (string | CustomColumn)[], timeout?: number): Promise<Table | null>;
-    /**
-     * 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
-     */
-    static applyFilter<T extends Table | TreeTable>(table: T | null | undefined, filters: FilterCondition[], timeout?: number): Promise<T | null>;
-    /**
-     * 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
-     */
-    static applyNeverFilter<T extends Table | TreeTable>(table: T | null | undefined, columnName: string, timeout?: number): Promise<T | null>;
-    /**
-     * 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
-     */
-    static applySort<T extends Table | TreeTable>(table: T | null | undefined, sorts: Sort[], timeout?: number): Promise<T | null>;
     static getSortIndex(sort: readonly Sort[], columnName: ColumnName): number | null;
     /**
      * @param tableSort The sorts from the table to get the sort from
@@ -238,11 +199,50 @@ export declare class TableUtils {
     makeQuickCharFilter(column: Column, text: string): FilterCondition | null;
     makeAdvancedFilter(column: Column, options: AdvancedFilterOptions, timeZone: string): FilterCondition | null;
     makeAdvancedValueFilter(column: Column, operation: FilterTypeValue, value: string, timeZone: string): FilterCondition | null;
+    /**
+     * 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<T extends Table | TreeTable>(table: T | null | undefined, columnName: string, timeout?: number): Promise<T | null>;
+    /**
+     * 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: Table | null | undefined, columns: (string | CustomColumn)[], timeout?: number): Promise<Table | null>;
+    /**
+     * 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<T extends Table | TreeTable>(table: T | null | undefined, filters: FilterCondition[], timeout?: number): Promise<T | null>;
+    /**
+     * 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<T extends Table | TreeTable>(table: T | null | undefined, sorts: Sort[], timeout?: number): Promise<T | null>;
     /**
      * Create a filter condition that results in zero results for a given column
      * @param column
      */
-    static makeNeverFilter(column: Column): FilterCondition;
+    makeNeverFilter(column: Column): FilterCondition;
     /**
      * @param columnType The column type to make the filter value from.
      * @param value The value to make the filter value from.

package/dist/TableUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableUtils.d.ts","sourceRoot":"","sources":["../src/TableUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,SAAS,IAAI,eAAe,EAC5B,aAAa,IAAI,mBAAmB,EACrC,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EACV,MAAM,EACN,YAAY,EACZ,EAAE,IAAI,MAAM,EACZ,eAAe,EACf,WAAW,EACX,WAAW,EAEX,IAAI,EACJ,KAAK,EACL,SAAS,EACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,iBAAiB,EAIlB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAC5B,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,QAAQ,CAAC,CAAC;AAC1D,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,aAAa,CAAC,CAAC;AACpE,MAAM,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC;AACjE,MAAM,MAAM,sBAAsB,GAAG;IACnC,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,YAAY,EAAE,eAAe,CAAC;IAC9B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,eAAe,EAAE,mBAAmB,EAAE,CAAC;IACvC,eAAe,EAAE,OAAO,CAAC;IACzB,cAAc,EAAE,OAAO,EAAE,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,YAAY,EAAE,OAAO,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;AAE7D,sEAAsE;AACtE,qBAAa,UAAU;IACrB,MAAM,CAAC,QAAQ;;;;;;;;MAQJ;IAEX,MAAM,CAAC,aAAa;;;;;MAKT;IAEX,MAAM,CAAC,6BAA6B,SAAS;IAE7C,MAAM,CAAC,YAAY;;;;OAIP;IAGZ,MAAM,CAAC,YAAY,SAAqB;IAExC;;;;;;;;;;;OAWG;IACH,MAAM,CAAC,sBAAsB,4EACiB,IAAI,0CAErC,MAAM,yCAkBjB;IAEF;;;;;;;OAOG;WACU,kBAAkB,CAC7B,KAAK,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC/B,OAAO,EAAE,CAAC,MAAM,GAAG,YAAY,CAAC,EAAE,EAClC,OAAO,SAA2C,GACjD,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IASxB;;;;;;;;OAQG;WACU,WAAW,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,EAClD,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3B,OAAO,EAAE,eAAe,EAAE,EAC1B,OAAO,SAA2C,GACjD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IASpB;;;;;;;;OAQG;WACU,gBAAgB,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,EACvD,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3B,UAAU,EAAE,MAAM,EAClB,OAAO,SAA2C,GACjD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAapB;;;;;;;;OAQG;WACU,SAAS,CAAC,CAAC,SAAS,KAAK,GAAG,SAAS,EAChD,KAAK,EAAE,CAAC,GAAG,IAAI,GAAG,SAAS,EAC3B,KAAK,EAAE,IAAI,EAAE,EACb,OAAO,SAA2C,GACjD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IASpB,MAAM,CAAC,YAAY,CACjB,IAAI,EAAE,SAAS,IAAI,EAAE,EACrB,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,IAAI;IAWhB;;;;OAIG;IACH,MAAM,CAAC,gBAAgB,CACrB,SAAS,EAAE,SAAS,IAAI,EAAE,EAC1B,UAAU,EAAE,UAAU,GACrB,IAAI,GAAG,IAAI;IAQd,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI;IAOpE,mDAAmD;IACnD,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,EAAE;IAiC5D,MAAM,CAAC,WAAW,CAChB,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,KAAK,EAAE,SAAS,IAAI,EAAE,EACtB,WAAW,EAAE,MAAM,GAClB,IAAI,GAAG,IAAI;IAed,MAAM,CAAC,cAAc,CACnB,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,OAAO,GACb,IAAI,GAAG,IAAI;IA2Bd;;;;;;OAMG;IACH,MAAM,CAAC,mBAAmB,CACxB,KAAK,EAAE,SAAS,IAAI,EAAE,EACtB,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,aAAa,UAAQ,GACpB,IAAI,EAAE;IAeT,MAAM,CAAC,UAAU,CACf,KAAK,EAAE,SAAS,IAAI,EAAE,EACtB,OAAO,EAAE,SAAS,MAAM,EAAE,EAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,OAAO,EACd,aAAa,EAAE,OAAO,GACrB,IAAI,EAAE;IAoBT;;;;;;;OAOG;IACH,MAAM,CAAC,gBAAgB,CACrB,SAAS,EAAE,SAAS,IAAI,EAAE,EAC1B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,IAAI,GAAG,IAAI,EACjB,aAAa,UAAQ,GACpB,IAAI,EAAE;IAqBT,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ;IA2C9D,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAU9C,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAa9C,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAOhD,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAiBjD,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAajD,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IASpD,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IASpD,MAAM,CAAC,aAAa,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAUjD,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAU9C,MAAM,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAShD,MAAM,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI9C;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM;IAI9C;;;;;OAKG;IACH,MAAM,CAAC,gBAAgB,CACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GACpB,OAAO;IAOV;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAWxC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAcnD;;;;;OAKG;IACH,MAAM,CAAC,4BAA4B,CACjC,MAAM,EAAE,WAAW,EACnB,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,WAAW,GACjB,eAAe,GAAG,IAAI;IAsBzB;;;;OAIG;IACH,MAAM,CAAC,0BAA0B,CAC/B,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,GAC5B,iBAAiB,CAAC,KAAK,CAAC;IAM3B;;;;;;;OAOG;IACH,MAAM,CAAC,+BAA+B,CACpC,KAAK,EAAE,KAAK,GAAG,SAAS,EACxB,SAAS,EAAE,MAAM,EACjB,OAAO,SAAI,EACX,OAAO,GAAE,CAAC,CAAC,KAAK,EAAE,WAAW,KAAK,OAAO,CAAC,GAAG,IAAW,GACvD,iBAAiB,CAAC,WAAW,CAAC;IAmCjC,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI1C,MAAM,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,UAAQ,GAAG,OAAO,GAAG,IAAI;IA+BzE,MAAM,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAyBnD,MAAM,CAAC,uBAAuB,CAAC,SAAS,EAAE,eAAe,GAAG,MAAM;IAuBlE,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS;IAQtD;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,UAAO,GAAG,MAAM,EAAE;IAQ5E,EAAE,EAAE,MAAM,CAAC;gBAEC,EAAE,EAAE,MAAM;IAItB;;;;;;OAMG;IACH,eAAe,CACb,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,GAAG,IAAI;IAqCzB;;;;;;OAMG;IACH,4BAA4B,CAC1B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,CAAC,EAAE,MAAM,GAChB,eAAe,GAAG,IAAI;IAiBzB,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IA0F3E,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IA4IzE,sBAAsB,CACpB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,GAAG,MAAM,GACpB,eAAe,GAAG,IAAI;IA4BzB;;;;;OAKG;IACH,mBAAmB,CACjB,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,eAAe;IAgDlB;;;;;;OAMG;IACH,gCAAgC,CAC9B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,eAAe,EAC1B,QAAQ,EAAE,MAAM,GACf,eAAe;IAuDlB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI;IAoDzE,kBAAkB,CAChB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,qBAAqB,EAC9B,QAAQ,EAAE,MAAM,GACf,eAAe,GAAG,IAAI;IAsEzB,uBAAuB,CACrB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,eAAe,EAC1B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,eAAe,GAAG,IAAI;IAgGzB;;;OAGG;IACH,MAAM,CAAC,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,eAAe;IAoBvD;;;;OAIG;IACH,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW;IAe/D;;;;;;OAMG;IACH,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,WAAW;IAatE;;;;;OAKG;IACH,SAAS,CACP,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,WAAW,GAAG,IAAI;IA2BjD;;;;;;;;OAQG;IACH,qBAAqB,CAAC,OAAO,SAAS,OAAO,EAC3C,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,OAAO,EAAE,EACzB,eAAe,EAAE,OAAO,GACvB,OAAO,SAAS,IAAI,GAAG,eAAe,GAAG,IAAI,GAAG,eAAe;CA2DnE;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"TableUtils.d.ts","sourceRoot":"","sources":["../src/TableUtils.ts"],"names":[],"mappings":"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"}

package/dist/TableUtils.js

@@ -25,78 +25,6 @@ export class TableUtils {
    * event
    */
 
-  /**
-   * 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.
-   */
-  static applyCustomColumns(table, columns) {
-    var _arguments = arguments;
-    return _asyncToGenerator(function* () {
-      var timeout = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
-      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
-   */
-  static applyFilter(table, filters) {
-    var _arguments2 = arguments;
-    return _asyncToGenerator(function* () {
-      var timeout = _arguments2.length > 2 && _arguments2[2] !== undefined ? _arguments2[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
-      return TableUtils.executeAndWaitForEvent(t => t === null || t === void 0 ? void 0 : t.applyFilter(filters), table, dh.Table.EVENT_FILTERCHANGED, timeout);
-    })();
-  }
-
-  /**
-   * 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
-   */
-  static applyNeverFilter(table, columnName) {
-    var _arguments3 = arguments;
-    return _asyncToGenerator(function* () {
-      var timeout = _arguments3.length > 2 && _arguments3[2] !== undefined ? _arguments3[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
-      if (table == null) {
-        return null;
-      }
-      var column = table.findColumn(columnName);
-      var filters = [TableUtils.makeNeverFilter(column)];
-      yield TableUtils.applyFilter(table, filters, timeout);
-      return table;
-    })();
-  }
-
-  /**
-   * 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
-   */
-  static applySort(table, sorts) {
-    var _arguments4 = arguments;
-    return _asyncToGenerator(function* () {
-      var timeout = _arguments4.length > 2 && _arguments4[2] !== undefined ? _arguments4[2] : TableUtils.APPLY_TABLE_CHANGE_TIMEOUT_MS;
-      return TableUtils.executeAndWaitForEvent(t => t === null || t === void 0 ? void 0 : t.applySort(sorts), table, dh.Table.EVENT_SORTCHANGED, timeout);
-    })();
-  }
   static getSortIndex(sort, columnName) {
     for (var i = 0; i < sort.length; i += 1) {
       var _s$column;
@@ -1078,11 +1006,100 @@ export class TableUtils {
     }
   }
 
+  /**
+   * 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
    */
-  static makeNeverFilter(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
@@ -1193,7 +1210,7 @@ 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
-      return TableUtils.makeNeverFilter(column);
+      return this.makeNeverFilter(column);
     }
     var values = [];
     var isNullSelected = false;