@deephaven/iris-grid 0.67.1-beta.0 → 0.67.1-beta.1

package/dist/IrisGridTestUtils.d.ts

@@ -1,29 +1,29 @@
 import { GridRangeIndex, ModelSizeMap } from '@deephaven/grid';
-import type { Column, dh as DhType, FilterCondition, InputTable, LayoutHints, RollupConfig, Row, Sort, Table, TableViewportSubscription, TreeTable } from '@deephaven/jsapi-types';
+import type { dh as DhType } from '@deephaven/jsapi-types';
 import { Formatter } from '@deephaven/jsapi-utils';
 import IrisGridProxyModel from './IrisGridProxyModel';
 declare class IrisGridTestUtils {
     static DEFAULT_TYPE: string;
     static valueForCell(rowIndex: GridRangeIndex, columnIndex: GridRangeIndex, formatValue?: boolean): string;
     private dh;
-    constructor(dh: DhType);
-    makeColumn(name?: string, type?: string, index?: number): Column;
-    makeRollupTableConfig(): RollupConfig;
-    makeColumns(count?: number, prefix?: string): Column[];
+    constructor(dh: typeof DhType);
+    makeColumn(name?: string, type?: string, index?: number): DhType.Column;
+    makeRollupTableConfig(): DhType.RollupConfig;
+    makeColumns(count?: number, prefix?: string): DhType.Column[];
     static makeUserColumnWidths(count?: number): ModelSizeMap;
-    makeRow(i: number): Row;
-    makeFilter(): FilterCondition;
-    makeSort(): Sort;
+    makeRow(i: number): DhType.Row;
+    makeFilter(): DhType.FilterCondition;
+    makeSort(): DhType.Sort;
     makeTable({ columns, size, sort, layoutHints, }?: {
-        columns?: Column[];
+        columns?: DhType.Column[];
         size?: number;
-        sort?: readonly Sort[];
-        layoutHints?: LayoutHints;
-    }): Table;
-    makeTreeTable(columns?: Column[], size?: number, sort?: never[]): TreeTable;
-    makeInputTable(keyColumns?: Column[]): InputTable;
-    makeSubscription(table?: Table): TableViewportSubscription;
-    makeModel(table?: Table, formatter?: Formatter | null, inputTable?: InputTable | null): IrisGridProxyModel;
+        sort?: readonly DhType.Sort[];
+        layoutHints?: Partial<DhType.LayoutHints>;
+    }): DhType.Table;
+    makeTreeTable(columns?: DhType.Column[], groupedColumns?: DhType.Column[], size?: number, sort?: never[]): DhType.TreeTable;
+    makeInputTable(keyColumns?: DhType.Column[]): DhType.InputTable;
+    makeSubscription(table?: DhType.Table): DhType.TableViewportSubscription;
+    makeModel(table?: DhType.Table, formatter?: Formatter | null, inputTable?: DhType.InputTable | null): IrisGridProxyModel;
 }
 export default IrisGridTestUtils;
 //# sourceMappingURL=IrisGridTestUtils.d.ts.map

package/dist/IrisGridTestUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridTestUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridTestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EACV,MAAM,EACN,EAAE,IAAI,MAAM,EACZ,eAAe,EACf,UAAU,EACV,WAAW,EACX,YAAY,EACZ,GAAG,EACH,IAAI,EACJ,KAAK,EACL,yBAAyB,EACzB,SAAS,EACV,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,cAAM,iBAAiB;IACrB,MAAM,CAAC,YAAY,SAAsB;IAEzC,MAAM,CAAC,YAAY,CACjB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,cAAc,EAC3B,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM;IAQT,OAAO,CAAC,EAAE,CAAS;gBAEP,EAAE,EAAE,MAAM;IAItB,UAAU,CACR,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,GAAE,MAAuC,EAC7C,KAAK,SAAI,GACR,MAAM;IAKT,qBAAqB,IAAI,YAAY;IAKrC,WAAW,CAAC,KAAK,SAAI,EAAE,MAAM,SAAK,GAAG,MAAM,EAAE;IAU7C,MAAM,CAAC,oBAAoB,CAAC,KAAK,SAAI,GAAG,YAAY;IAQpD,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG;IAWvB,UAAU,IAAI,eAAe;IAK7B,QAAQ,IAAI,IAAI;IAKhB,SAAS,CAAC,EACR,OAA4B,EAC5B,IAAiB,EACjB,IAAS,EACT,WAAgB,GACjB,GAAE;QACD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;QACnB,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC;QACvB,WAAW,CAAC,EAAE,WAAW,CAAC;KACtB,GAAG,KAAK;IASd,aAAa,CACX,OAAO,WAAqB,EAC5B,IAAI,SAAa,EACjB,IAAI,UAAK,GACR,SAAS;IAOZ,cAAc,CAAC,UAAU,GAAE,MAAM,EAAO,GAAG,UAAU;IAKrD,gBAAgB,CAAC,KAAK,QAAmB,GAAG,yBAAyB;IAKrE,SAAS,CACP,KAAK,QAAmB,EACxB,SAAS,GAAE,SAAS,GAAG,IAAW,EAClC,UAAU,GAAE,UAAU,GAAG,IAAW,GACnC,kBAAkB;CAStB;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"IrisGridTestUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridTestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/D,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAEtD,cAAM,iBAAiB;IACrB,MAAM,CAAC,YAAY,SAAsB;IAEzC,MAAM,CAAC,YAAY,CACjB,QAAQ,EAAE,cAAc,EACxB,WAAW,EAAE,cAAc,EAC3B,WAAW,CAAC,EAAE,OAAO,GACpB,MAAM;IAQT,OAAO,CAAC,EAAE,CAAgB;gBAEd,EAAE,EAAE,OAAO,MAAM;IAI7B,UAAU,CACR,IAAI,CAAC,EAAE,MAAM,EACb,IAAI,GAAE,MAAuC,EAC7C,KAAK,SAAI,GACR,MAAM,CAAC,MAAM;IAKhB,qBAAqB,IAAI,MAAM,CAAC,YAAY;IAK5C,WAAW,CAAC,KAAK,SAAI,EAAE,MAAM,SAAK,GAAG,MAAM,CAAC,MAAM,EAAE;IAUpD,MAAM,CAAC,oBAAoB,CAAC,KAAK,SAAI,GAAG,YAAY;IAQpD,OAAO,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG;IAW9B,UAAU,IAAI,MAAM,CAAC,eAAe;IAKpC,QAAQ,IAAI,MAAM,CAAC,IAAI;IAKvB,SAAS,CAAC,EACR,OAA4B,EAC5B,IAAiB,EACjB,IAAS,EACT,WAAgB,GACjB,GAAE;QACD,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;QAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,IAAI,CAAC,EAAE,SAAS,MAAM,CAAC,IAAI,EAAE,CAAC;QAC9B,WAAW,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;KACtC,GAAG,MAAM,CAAC,KAAK;IASrB,aAAa,CACX,OAAO,kBAAqB,EAC5B,cAAc,GAAE,MAAM,CAAC,MAAM,EAAO,EACpC,IAAI,SAAa,EACjB,IAAI,UAAK,GACR,MAAM,CAAC,SAAS;IAYnB,cAAc,CAAC,UAAU,GAAE,MAAM,CAAC,MAAM,EAAO,GAAG,MAAM,CAAC,UAAU;IAKnE,gBAAgB,CAAC,KAAK,eAAmB,GAAG,MAAM,CAAC,yBAAyB;IAK5E,SAAS,CACP,KAAK,eAAmB,EACxB,SAAS,GAAE,SAAS,GAAG,IAAW,EAClC,UAAU,GAAE,MAAM,CAAC,UAAU,GAAG,IAAW,GAC1C,kBAAkB;CAStB;AAED,eAAe,iBAAiB,CAAC"}

package/dist/IrisGridTestUtils.js

@@ -83,11 +83,13 @@ class IrisGridTestUtils {
   }
   makeTreeTable() {
     var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.makeColumns();
-    var size = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000000000;
-    var sort = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+    var groupedColumns = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var size = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1000000000;
+    var sort = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     var table = new this.dh.TreeTable({
       columns,
+      groupedColumns,
       size,
       sort
     });

package/dist/IrisGridTestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridTestUtils.js","names":["Formatter","IrisGridProxyModel","IrisGridTestUtils","valueForCell","rowIndex","columnIndex","formatValue","value","concat","undefined","constructor","dh","_defineProperty","makeColumn","name","type","arguments","length","DEFAULT_TYPE","index","Column","makeRollupTableConfig","RollupTableConfig","makeColumns","count","prefix","columns","i","push","makeUserColumnWidths","userColumnWidths","Map","set","toString","makeRow","row","Row","get","jest","fn","column","makeFilter","FilterCondition","makeSort","Sort","makeTable","size","sort","layoutHints","table","Table","copy","Promise","resolve","freeze","makeTreeTable","TreeTable","makeInputTable","keyColumns","InputTable","makeSubscription","TableViewportSubscription","makeModel","formatter","inputTable"],"sources":["../src/IrisGridTestUtils.ts"],"sourcesContent":["import { GridRangeIndex, ModelSizeMap } from '@deephaven/grid';\nimport type {\n  Column,\n  dh as DhType,\n  FilterCondition,\n  InputTable,\n  LayoutHints,\n  RollupConfig,\n  Row,\n  Sort,\n  Table,\n  TableViewportSubscription,\n  TreeTable,\n} from '@deephaven/jsapi-types';\nimport { Formatter } from '@deephaven/jsapi-utils';\nimport IrisGridProxyModel from './IrisGridProxyModel';\n\nclass IrisGridTestUtils {\n  static DEFAULT_TYPE = 'java.lang.String';\n\n  static valueForCell(\n    rowIndex: GridRangeIndex,\n    columnIndex: GridRangeIndex,\n    formatValue?: boolean\n  ): string {\n    let value = `${rowIndex},${columnIndex}`;\n    if (formatValue !== undefined && formatValue) {\n      value = `(${value})`;\n    }\n    return value;\n  }\n\n  private dh: DhType;\n\n  constructor(dh: DhType) {\n    this.dh = dh;\n  }\n\n  makeColumn(\n    name?: string,\n    type: string = IrisGridTestUtils.DEFAULT_TYPE,\n    index = 0\n  ): Column {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).Column({ index, name, type });\n  }\n\n  makeRollupTableConfig(): RollupConfig {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).RollupTableConfig();\n  }\n\n  makeColumns(count = 5, prefix = ''): Column[] {\n    const columns = [];\n    for (let i = 0; i < count; i += 1) {\n      columns.push(\n        this.makeColumn(`${prefix}${i}`, IrisGridTestUtils.DEFAULT_TYPE, i)\n      );\n    }\n    return columns;\n  }\n\n  static makeUserColumnWidths(count = 5): ModelSizeMap {\n    const userColumnWidths = new Map();\n    for (let i = 0; i < count; i += 1) {\n      userColumnWidths.set(i.toString(), 100);\n    }\n    return userColumnWidths;\n  }\n\n  makeRow(i: number): Row {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const row = new (this.dh as any).Row({ index: i, name: `${i}` });\n\n    row.get = jest.fn(column =>\n      IrisGridTestUtils.valueForCell(i, column.index)\n    );\n\n    return row;\n  }\n\n  makeFilter(): FilterCondition {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).FilterCondition();\n  }\n\n  makeSort(): Sort {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).Sort();\n  }\n\n  makeTable({\n    columns = this.makeColumns(),\n    size = 1000000000,\n    sort = [],\n    layoutHints = {},\n  }: {\n    columns?: Column[];\n    size?: number;\n    sort?: readonly Sort[];\n    layoutHints?: LayoutHints;\n  } = {}): Table {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const table = new (this.dh as any).Table({ columns, size, sort });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    table.freeze = jest.fn(() => Promise.resolve(table));\n    table.layoutHints = layoutHints;\n    return table;\n  }\n\n  makeTreeTable(\n    columns = this.makeColumns(),\n    size = 1000000000,\n    sort = []\n  ): TreeTable {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const table = new (this.dh as any).TreeTable({ columns, size, sort });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    return table;\n  }\n\n  makeInputTable(keyColumns: Column[] = []): InputTable {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).InputTable(keyColumns);\n  }\n\n  makeSubscription(table = this.makeTable()): TableViewportSubscription {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).TableViewportSubscription({ table });\n  }\n\n  makeModel(\n    table = this.makeTable(),\n    formatter: Formatter | null = null,\n    inputTable: InputTable | null = null\n  ): IrisGridProxyModel {\n    const { dh } = this;\n    return new IrisGridProxyModel(\n      dh,\n      table,\n      formatter ?? new Formatter(dh),\n      inputTable\n    );\n  }\n}\n\nexport default IrisGridTestUtils;\n"],"mappings":"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"}
+{"version":3,"file":"IrisGridTestUtils.js","names":["Formatter","IrisGridProxyModel","IrisGridTestUtils","valueForCell","rowIndex","columnIndex","formatValue","value","concat","undefined","constructor","dh","_defineProperty","makeColumn","name","type","arguments","length","DEFAULT_TYPE","index","Column","makeRollupTableConfig","RollupTableConfig","makeColumns","count","prefix","columns","i","push","makeUserColumnWidths","userColumnWidths","Map","set","toString","makeRow","row","Row","get","jest","fn","column","makeFilter","FilterCondition","makeSort","Sort","makeTable","size","sort","layoutHints","table","Table","copy","Promise","resolve","freeze","makeTreeTable","groupedColumns","TreeTable","makeInputTable","keyColumns","InputTable","makeSubscription","TableViewportSubscription","makeModel","formatter","inputTable"],"sources":["../src/IrisGridTestUtils.ts"],"sourcesContent":["import { GridRangeIndex, ModelSizeMap } from '@deephaven/grid';\nimport type { dh as DhType } from '@deephaven/jsapi-types';\nimport { Formatter } from '@deephaven/jsapi-utils';\nimport IrisGridProxyModel from './IrisGridProxyModel';\n\nclass IrisGridTestUtils {\n  static DEFAULT_TYPE = 'java.lang.String';\n\n  static valueForCell(\n    rowIndex: GridRangeIndex,\n    columnIndex: GridRangeIndex,\n    formatValue?: boolean\n  ): string {\n    let value = `${rowIndex},${columnIndex}`;\n    if (formatValue !== undefined && formatValue) {\n      value = `(${value})`;\n    }\n    return value;\n  }\n\n  private dh: typeof DhType;\n\n  constructor(dh: typeof DhType) {\n    this.dh = dh;\n  }\n\n  makeColumn(\n    name?: string,\n    type: string = IrisGridTestUtils.DEFAULT_TYPE,\n    index = 0\n  ): DhType.Column {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).Column({ index, name, type });\n  }\n\n  makeRollupTableConfig(): DhType.RollupConfig {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).RollupTableConfig();\n  }\n\n  makeColumns(count = 5, prefix = ''): DhType.Column[] {\n    const columns = [];\n    for (let i = 0; i < count; i += 1) {\n      columns.push(\n        this.makeColumn(`${prefix}${i}`, IrisGridTestUtils.DEFAULT_TYPE, i)\n      );\n    }\n    return columns;\n  }\n\n  static makeUserColumnWidths(count = 5): ModelSizeMap {\n    const userColumnWidths = new Map();\n    for (let i = 0; i < count; i += 1) {\n      userColumnWidths.set(i.toString(), 100);\n    }\n    return userColumnWidths;\n  }\n\n  makeRow(i: number): DhType.Row {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const row = new (this.dh as any).Row({ index: i, name: `${i}` });\n\n    row.get = jest.fn(column =>\n      IrisGridTestUtils.valueForCell(i, column.index)\n    );\n\n    return row;\n  }\n\n  makeFilter(): DhType.FilterCondition {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).FilterCondition();\n  }\n\n  makeSort(): DhType.Sort {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).Sort();\n  }\n\n  makeTable({\n    columns = this.makeColumns(),\n    size = 1000000000,\n    sort = [],\n    layoutHints = {},\n  }: {\n    columns?: DhType.Column[];\n    size?: number;\n    sort?: readonly DhType.Sort[];\n    layoutHints?: Partial<DhType.LayoutHints>;\n  } = {}): DhType.Table {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const table = new (this.dh as any).Table({ columns, size, sort });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    table.freeze = jest.fn(() => Promise.resolve(table));\n    table.layoutHints = layoutHints;\n    return table;\n  }\n\n  makeTreeTable(\n    columns = this.makeColumns(),\n    groupedColumns: DhType.Column[] = [],\n    size = 1000000000,\n    sort = []\n  ): DhType.TreeTable {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    const table = new (this.dh as any).TreeTable({\n      columns,\n      groupedColumns,\n      size,\n      sort,\n    });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    return table;\n  }\n\n  makeInputTable(keyColumns: DhType.Column[] = []): DhType.InputTable {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).InputTable(keyColumns);\n  }\n\n  makeSubscription(table = this.makeTable()): DhType.TableViewportSubscription {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).TableViewportSubscription({ table });\n  }\n\n  makeModel(\n    table = this.makeTable(),\n    formatter: Formatter | null = null,\n    inputTable: DhType.InputTable | null = null\n  ): IrisGridProxyModel {\n    const { dh } = this;\n    return new IrisGridProxyModel(\n      dh,\n      table,\n      formatter ?? new Formatter(dh),\n      inputTable\n    );\n  }\n}\n\nexport default IrisGridTestUtils;\n"],"mappings":"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"}

package/dist/IrisGridTreeTableModel.d.ts

@@ -1,5 +1,5 @@
 import { BoundedAxisRange, GridCell, GridRange, ModelIndex } from '@deephaven/grid';
-import type { dh as DhType, Column, InputTable, TreeRow, TreeTable } from '@deephaven/jsapi-types';
+import type { dh as DhType } from '@deephaven/jsapi-types';
 import { Formatter } from '@deephaven/jsapi-utils';
 import { UIRow, ColumnName } from './CommonTypes';
 import IrisGridTableModelTemplate from './IrisGridTableModelTemplate';
@@ -8,18 +8,18 @@ export interface UITreeRow extends UIRow {
     hasChildren: boolean;
     depth: number;
 }
-declare class IrisGridTreeTableModel extends IrisGridTableModelTemplate<TreeTable, UITreeRow> {
+declare class IrisGridTreeTableModel extends IrisGridTableModelTemplate<DhType.TreeTable, UITreeRow> {
     /** We keep a virtual column at the front that tracks the "group" that is expanded */
     private virtualColumns;
-    constructor(dh: DhType, table: TreeTable, formatter?: Formatter, inputTable?: InputTable | null);
-    applyBufferedViewport(viewportTop: number, viewportBottom: number, columns: Column[]): void;
+    constructor(dh: typeof DhType, table: DhType.TreeTable, formatter?: Formatter, inputTable?: DhType.InputTable | null);
+    applyBufferedViewport(viewportTop: number, viewportBottom: number, columns: DhType.Column[]): void;
     textForCell(x: ModelIndex, y: ModelIndex): string;
-    extractViewportRow(row: TreeRow, columns: Column[]): UITreeRow;
-    snapshot(ranges: GridRange[], includeHeaders?: boolean, formatValue?: (value: unknown, column: Column) => unknown): Promise<unknown[][]>;
-    get columns(): Column[];
-    get groupedColumns(): readonly Column[];
+    extractViewportRow(row: DhType.TreeRow, columns: DhType.Column[]): UITreeRow;
+    snapshot(ranges: GridRange[], includeHeaders?: boolean, formatValue?: (value: unknown, column: DhType.Column) => unknown): Promise<unknown[][]>;
+    get columns(): DhType.Column[];
+    get groupedColumns(): readonly DhType.Column[];
     sourceForCell(column: ModelIndex, row: ModelIndex): GridCell;
-    sourceColumn(column: ModelIndex, row: ModelIndex): Column;
+    sourceColumn(column: ModelIndex, row: ModelIndex): DhType.Column;
     getClearFilterRange(column: ModelIndex): BoundedAxisRange | null;
     get hasExpandableRows(): boolean;
     get isExpandAllAvailable(): boolean;
@@ -34,10 +34,10 @@ declare class IrisGridTreeTableModel extends IrisGridTableModelTemplate<TreeTabl
     expandAll(): void;
     collapseAll(): void;
     depthForRow(y: ModelIndex): ModelIndex;
-    getCachedColumns: (virtualColumns: readonly Column[], tableColumns: readonly Column[]) => Column[];
-    getCachedGroupColumns: (virtualColumns: readonly Column[], tableGroupedColumns: readonly Column[]) => Column[];
-    getCachedFilterableColumnSet: (columns: readonly Column[], groupedColumns: readonly Column[], virtualColumns: readonly Column[]) => Set<number>;
-    getCachedGroupedColumnSet: (groupedColumns: readonly Column[]) => Set<number>;
+    getCachedColumns: (virtualColumns: readonly DhType.Column[], tableColumns: readonly DhType.Column[]) => DhType.Column[];
+    getCachedGroupColumns: (virtualColumns: readonly DhType.Column[], tableGroupedColumns: readonly DhType.Column[]) => DhType.Column[];
+    getCachedFilterableColumnSet: (columns: readonly DhType.Column[], groupedColumns: readonly DhType.Column[], virtualColumns: readonly DhType.Column[]) => Set<number>;
+    getCachedGroupedColumnSet: (groupedColumns: readonly DhType.Column[]) => Set<number>;
     updateFrozenColumns(columns: ColumnName[]): void;
 }
 export default IrisGridTreeTableModel;

package/dist/IrisGridTreeTableModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridTreeTableModel.d.ts","sourceRoot":"","sources":["../src/IrisGridTreeTableModel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IrisGridTreeTableModel.d.ts","sourceRoot":"","sources":["../src/IrisGridTreeTableModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,gBAAgB,EAChB,QAAQ,EACR,SAAS,EACT,UAAU,EACX,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAc,MAAM,wBAAwB,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,UAAU,EAAY,MAAM,eAAe,CAAC;AAC5D,OAAO,0BAA0B,MAAM,8BAA8B,CAAC;AAKtE,MAAM,WAAW,SAAU,SAAQ,KAAK;IACtC,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;CACf;AACD,cAAM,sBAAuB,SAAQ,0BAA0B,CAC7D,MAAM,CAAC,SAAS,EAChB,SAAS,CACV;IACC,qFAAqF;IACrF,OAAO,CAAC,cAAc,CAAkB;gBAGtC,EAAE,EAAE,OAAO,MAAM,EACjB,KAAK,EAAE,MAAM,CAAC,SAAS,EACvB,SAAS,YAAoB,EAC7B,UAAU,GAAE,MAAM,CAAC,UAAU,GAAG,IAAW;IA8C7C,qBAAqB,CACnB,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GACvB,IAAI;IAaP,WAAW,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,UAAU,GAAG,MAAM;IAsBjD,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,SAAS;IAyBtE,QAAQ,CACZ,MAAM,EAAE,SAAS,EAAE,EACnB,cAAc,CAAC,EAAE,OAAO,EACxB,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,KAAK,OAAO,GAC/D,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;IA+CvB,IAAI,OAAO,IAAI,MAAM,CAAC,MAAM,EAAE,CAE7B;IAED,IAAI,cAAc,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,CAK7C;IAED,aAAa,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,QAAQ;IAQ5D,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,MAAM;IAShE,mBAAmB,CAAC,MAAM,EAAE,UAAU,GAAG,gBAAgB,GAAG,IAAI;IAShE,IAAI,iBAAiB,IAAI,OAAO,CAE/B;IAED,IAAI,oBAAoB,IAAI,OAAO,CAElC;IAED,IAAI,uBAAuB,IAAI,OAAO,CAErC;IAED,IAAI,yBAAyB,IAAI,OAAO,CAEvC;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;IAED,YAAY,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO;IAQ9C,eAAe,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO;IAI5C,eAAe,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAKvC,aAAa,CAAC,CAAC,EAAE,UAAU,GAAG,OAAO;IAKrC,cAAc,CACZ,CAAC,EAAE,UAAU,EACb,UAAU,EAAE,OAAO,EACnB,iBAAiB,UAAQ,GACxB,IAAI;IAQP,SAAS,IAAI,IAAI;IAMjB,WAAW,IAAI,IAAI;IAMnB,WAAW,CAAC,CAAC,EAAE,UAAU,GAAG,UAAU;IAKtC,gBAAgB,mBAEI,SAAS,OAAO,MAAM,EAAE,gBAC1B,SAAS,OAAO,MAAM,EAAE,qBAExC;IAEF,qBAAqB,mBAED,SAAS,OAAO,MAAM,EAAE,uBACnB,SAAS,OAAO,MAAM,EAAE,qBAE/C;IAEF,4BAA4B,YAEf,SAAS,OAAO,MAAM,EAAE,kBACjB,SAAS,OAAO,MAAM,EAAE,kBACxB,SAAS,OAAO,MAAM,EAAE,iBAO1C;IAEF,yBAAyB,mBACN,SAAS,OAAO,MAAM,EAAE,iBAMzC;IAEF,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI;CAKjD;AAED,eAAe,sBAAsB,CAAC"}

package/dist/IrisGridTreeTableModel.js

@@ -25,7 +25,7 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate {
     _defineProperty(this, "getCachedGroupColumns", memoize((virtualColumns, tableGroupedColumns) => [...virtualColumns, ...tableGroupedColumns]));
     _defineProperty(this, "getCachedFilterableColumnSet", memoize((columns, groupedColumns, virtualColumns) => new Set(((groupedColumns === null || groupedColumns === void 0 ? void 0 : groupedColumns.length) > 0 ? groupedColumns : columns).filter(c => !virtualColumns.includes(c)).map(c1 => columns.findIndex(c2 => c1.name === c2.name)))));
     _defineProperty(this, "getCachedGroupedColumnSet", memoize(groupedColumns => new Set(groupedColumns.map(c1 => this.columns.findIndex(c2 => c1.name === c2.name)))));
-    this.virtualColumns = [{
+    this.virtualColumns = table.groupedColumns.length > 1 ? [{
       name: '__DH_UI_GROUP__',
       displayName: 'Group',
       type: TableUtils.dataType.STRING,
@@ -34,6 +34,7 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate {
       isSortable: false,
       isProxy: true,
       description: 'Key column',
+      index: -1,
       filter: () => {
         throw new Error('Filter not implemented for virtual column');
       },
@@ -43,10 +44,19 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate {
       formatColor: () => {
         throw new Error('Color not implemented for virtual column');
       },
-      formatRowColor: () => {
-        throw new Error('Color not implemented for virtual column');
+      get: () => {
+        throw new Error('get not implemented for virtual column');
+      },
+      getFormat: () => {
+        throw new Error('getFormat not implemented for virtual column');
+      },
+      formatNumber: () => {
+        throw new Error('formatNumber not implemented for virtual column');
+      },
+      formatDate: () => {
+        throw new Error('formatDate not implemented for virtual column');
       }
-    }];
+    }] : [];
   }
   applyBufferedViewport(viewportTop, viewportBottom, columns) {
     var viewportColumns = [
@@ -203,12 +213,12 @@ class IrisGridTreeTableModel extends IrisGridTableModelTemplate {
     }
   }
   expandAll() {
-    if (this.table.expandAll) {
+    if (this.table.expandAll != null) {
       this.table.expandAll();
     }
   }
   collapseAll() {
-    if (this.table.collapseAll) {
+    if (this.table.collapseAll != null) {
       this.table.collapseAll();
     }
   }

package/dist/IrisGridTreeTableModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridTreeTableModel.js","names":["memoize","GridRange","Log","Formatter","TableUtils","assertNotNull","IrisGridTableModelTemplate","log","module","IrisGridTreeTableModel","constructor","dh","table","formatter","arguments","length","undefined","inputTable","_defineProperty","virtualColumns","tableColumns","tableGroupedColumns","columns","groupedColumns","Set","filter","c","includes","map","c1","findIndex","c2","name","displayName","type","dataType","STRING","constituentType","isPartitionColumn","isSortable","isProxy","description","Error","sort","formatColor","formatRowColor","applyBufferedViewport","viewportTop","viewportBottom","viewportColumns","setViewport","textForCell","x","y","column","sourceColumn","row","hasChildren","value","valueForCell","displayString","depth","getCachedGroupedColumnSet","has","extractViewportRow","isExpanded","extractedRow","modifiedData","Map","data","i","key","cellData","get","warn","set","_objectSpread","snapshot","ranges","includeHeaders","formatValue","_this","_asyncToGenerator","_this$viewport$column","_this$viewportData","viewport","viewportData","result","push","viewportRange","offset","rows","intersection","startRow","endRow","r","resultRow","viewportRow","startColumn","endColumn","_viewportRow$data$get","getCachedColumns","getCachedGroupColumns","sourceForCell","depthForRow","getClearFilterRange","hasExpandableRows","isExpandAllAvailable","expandAll","isChartBuilderAvailable","isSelectDistinctAvailable","isReversible","isFilterable","columnIndex","getCachedFilterableColumnSet","isColumnMovable","isRowExpandable","_row$hasChildren","isRowExpanded","_row$isExpanded","setRowExpanded","expandDescendants","setExpanded","collapseAll","_row$depth","updateFrozenColumns"],"sources":["../src/IrisGridTreeTableModel.ts"],"sourcesContent":["/* eslint class-methods-use-this: \"off\" */\nimport memoize from 'memoize-one';\nimport {\n  BoundedAxisRange,\n  GridCell,\n  GridRange,\n  ModelIndex,\n} from '@deephaven/grid';\nimport type {\n  dh as DhType,\n  Column,\n  InputTable,\n  TreeRow,\n  TreeTable,\n} from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport { Formatter, TableUtils } from '@deephaven/jsapi-utils';\nimport { assertNotNull } from '@deephaven/utils';\nimport { UIRow, ColumnName, CellData } from './CommonTypes';\nimport IrisGridTableModelTemplate from './IrisGridTableModelTemplate';\nimport { DisplayColumn } from './IrisGridModel';\n\nconst log = Log.module('IrisGridTreeTableModel');\n\nexport interface UITreeRow extends UIRow {\n  isExpanded: boolean;\n  hasChildren: boolean;\n  depth: number;\n}\nclass IrisGridTreeTableModel extends IrisGridTableModelTemplate<\n  TreeTable,\n  UITreeRow\n> {\n  /** We keep a virtual column at the front that tracks the \"group\" that is expanded */\n  private virtualColumns: DisplayColumn[];\n\n  constructor(\n    dh: DhType,\n    table: TreeTable,\n    formatter = new Formatter(dh),\n    inputTable: InputTable | null = null\n  ) {\n    super(dh, table, formatter, inputTable);\n    this.virtualColumns = [\n      {\n        name: '__DH_UI_GROUP__',\n        displayName: 'Group',\n        type: TableUtils.dataType.STRING,\n        constituentType: TableUtils.dataType.STRING,\n        isPartitionColumn: false,\n        isSortable: false,\n        isProxy: true,\n        description: 'Key column',\n        filter: () => {\n          throw new Error('Filter not implemented for virtual column');\n        },\n        sort: () => {\n          throw new Error('Sort not implemented virtual column');\n        },\n        formatColor: () => {\n          throw new Error('Color not implemented for virtual column');\n        },\n        formatRowColor: () => {\n          throw new Error('Color not implemented for virtual column');\n        },\n      },\n    ];\n  }\n\n  applyBufferedViewport(\n    viewportTop: number,\n    viewportBottom: number,\n    columns: Column[]\n  ): void {\n    const viewportColumns = [\n      // Need to always fetch the grouped columns so we always have key data for the rows\n      // Used to display our virtual key column\n      ...this.table.groupedColumns,\n      ...columns.filter(\n        c =>\n          !this.virtualColumns.includes(c) && !this.groupedColumns.includes(c)\n      ),\n    ];\n    this.table.setViewport(viewportTop, viewportBottom, viewportColumns);\n  }\n\n  textForCell(x: ModelIndex, y: ModelIndex): string {\n    const column = this.sourceColumn(x, y);\n    const row = this.row(y);\n    if (row != null && column != null) {\n      if (!row.hasChildren && column.constituentType != null) {\n        const value = this.valueForCell(x, y);\n        return this.displayString(value, column.constituentType, column.name);\n      }\n      // Show empty string instead of null in rollup grouping columns (issue #1483)\n      if (\n        row.hasChildren &&\n        row.depth <= x + 1 &&\n        this.valueForCell(x, y) === null &&\n        this.getCachedGroupedColumnSet(this.groupedColumns).has(x)\n      ) {\n        return '';\n      }\n    }\n\n    return super.textForCell(x, y);\n  }\n\n  extractViewportRow(row: TreeRow, columns: Column[]): UITreeRow {\n    const { isExpanded, hasChildren, depth } = row;\n    const extractedRow = super.extractViewportRow(row, columns);\n    const modifiedData = new Map<ModelIndex, CellData>(extractedRow.data);\n    if (hasChildren) {\n      for (let i = 0; i < this.virtualColumns.length; i += 1) {\n        const key = i + (depth - 1) + (this.virtualColumns.length - 1);\n        const cellData = modifiedData.get(key);\n        if (cellData == null) {\n          log.warn('Missing key data for virtual column', i, depth, key, row);\n        } else {\n          modifiedData.set(i, cellData);\n        }\n      }\n    }\n\n    return {\n      ...extractedRow,\n      data: modifiedData,\n      isExpanded,\n      hasChildren,\n      depth,\n    };\n  }\n\n  async snapshot(\n    ranges: GridRange[],\n    includeHeaders?: boolean,\n    formatValue?: (value: unknown, column: Column) => unknown\n  ): Promise<unknown[][]> {\n    assertNotNull(this.viewport);\n    assertNotNull(this.viewportData);\n    const columns = this.viewport.columns ?? this.columns;\n    const result = [];\n\n    if (includeHeaders != null && includeHeaders) {\n      result.push(columns.map(c => c.name));\n    }\n\n    const viewportRange = new GridRange(\n      0,\n      this.viewportData?.offset,\n      columns.length,\n      this.viewportData.offset + this.viewportData.rows.length\n    );\n\n    for (let i = 0; i < ranges.length; i += 1) {\n      const intersection = GridRange.intersection(viewportRange, ranges[i]);\n\n      assertNotNull(intersection);\n      assertNotNull(intersection.startRow);\n      assertNotNull(intersection.endRow);\n\n      for (let r = intersection.startRow; r <= intersection.endRow; r += 1) {\n        const resultRow = [];\n        const viewportRow =\n          this.viewportData.rows[r - this.viewportData.offset];\n        assertNotNull(intersection.startColumn);\n        assertNotNull(intersection.endColumn);\n        for (\n          let c = intersection.startColumn;\n          c <= intersection.endColumn;\n          c += 1\n        ) {\n          assertNotNull(formatValue);\n          resultRow.push(\n            formatValue(viewportRow.data.get(c)?.value, this.columns[c])\n          );\n        }\n        result.push(resultRow);\n      }\n    }\n\n    return result;\n  }\n\n  get columns(): Column[] {\n    return this.getCachedColumns(this.virtualColumns, super.columns);\n  }\n\n  get groupedColumns(): readonly Column[] {\n    return this.getCachedGroupColumns(\n      this.virtualColumns,\n      this.table.groupedColumns\n    );\n  }\n\n  sourceForCell(column: ModelIndex, row: ModelIndex): GridCell {\n    if (column >= this.virtualColumns.length) {\n      return { column, row };\n    }\n    const depth = this.depthForRow(row);\n    return { column: column + depth, row };\n  }\n\n  sourceColumn(column: ModelIndex, row: ModelIndex): Column {\n    if (column >= this.virtualColumns.length) {\n      return super.sourceColumn(column, row);\n    }\n\n    const depth = this.depthForRow(row);\n    return this.columns[column + depth];\n  }\n\n  getClearFilterRange(column: ModelIndex): BoundedAxisRange | null {\n    if (column >= this.virtualColumns.length) {\n      return super.getClearFilterRange(column);\n    }\n    // Source for the proxied column could be any of the grouped columns.\n    // Return the range of columns matching the grouped columns.\n    return [this.virtualColumns.length, this.groupedColumns.length];\n  }\n\n  get hasExpandableRows(): boolean {\n    return true;\n  }\n\n  get isExpandAllAvailable(): boolean {\n    return this.table.expandAll !== undefined;\n  }\n\n  get isChartBuilderAvailable(): boolean {\n    return false;\n  }\n\n  get isSelectDistinctAvailable(): boolean {\n    return false;\n  }\n\n  get isReversible(): boolean {\n    return false;\n  }\n\n  isFilterable(columnIndex: ModelIndex): boolean {\n    return this.getCachedFilterableColumnSet(\n      this.columns,\n      this.groupedColumns,\n      this.virtualColumns\n    ).has(columnIndex);\n  }\n\n  isColumnMovable(column: ModelIndex): boolean {\n    return column >= this.groupedColumns.length;\n  }\n\n  isRowExpandable(y: ModelIndex): boolean {\n    const row = this.row(y);\n    return row?.hasChildren ?? false;\n  }\n\n  isRowExpanded(y: ModelIndex): boolean {\n    const row = this.row(y);\n    return row?.isExpanded ?? false;\n  }\n\n  setRowExpanded(\n    y: ModelIndex,\n    isExpanded: boolean,\n    expandDescendants = false\n  ): void {\n    if (this.isExpandAllAvailable) {\n      this.table.setExpanded(y, isExpanded, expandDescendants);\n    } else {\n      this.table.setExpanded(y, isExpanded);\n    }\n  }\n\n  expandAll(): void {\n    if (this.table.expandAll) {\n      this.table.expandAll();\n    }\n  }\n\n  collapseAll(): void {\n    if (this.table.collapseAll) {\n      this.table.collapseAll();\n    }\n  }\n\n  depthForRow(y: ModelIndex): ModelIndex {\n    const row = this.row(y);\n    return (row?.depth ?? 1) - 1;\n  }\n\n  getCachedColumns = memoize(\n    (virtualColumns: readonly Column[], tableColumns: readonly Column[]) => [\n      ...virtualColumns,\n      ...tableColumns,\n    ]\n  );\n\n  getCachedGroupColumns = memoize(\n    (\n      virtualColumns: readonly Column[],\n      tableGroupedColumns: readonly Column[]\n    ) => [...virtualColumns, ...tableGroupedColumns]\n  );\n\n  getCachedFilterableColumnSet = memoize(\n    (\n      columns: readonly Column[],\n      groupedColumns: readonly Column[],\n      virtualColumns: readonly Column[]\n    ) =>\n      new Set(\n        (groupedColumns?.length > 0 ? groupedColumns : columns)\n          .filter(c => !virtualColumns.includes(c))\n          .map(c1 => columns.findIndex(c2 => c1.name === c2.name))\n      )\n  );\n\n  getCachedGroupedColumnSet = memoize(\n    (groupedColumns: readonly Column[]) =>\n      new Set(\n        groupedColumns.map(c1 =>\n          this.columns.findIndex(c2 => c1.name === c2.name)\n        )\n      )\n  );\n\n  updateFrozenColumns(columns: ColumnName[]): void {\n    if (columns.length > 0) {\n      throw new Error('Cannot freeze columns on a tree table');\n    }\n  }\n}\n\nexport default IrisGridTreeTableModel;\n"],"mappings":"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"}
+{"version":3,"file":"IrisGridTreeTableModel.js","names":["memoize","GridRange","Log","Formatter","TableUtils","assertNotNull","IrisGridTableModelTemplate","log","module","IrisGridTreeTableModel","constructor","dh","table","formatter","arguments","length","undefined","inputTable","_defineProperty","virtualColumns","tableColumns","tableGroupedColumns","columns","groupedColumns","Set","filter","c","includes","map","c1","findIndex","c2","name","displayName","type","dataType","STRING","constituentType","isPartitionColumn","isSortable","isProxy","description","index","Error","sort","formatColor","get","getFormat","formatNumber","formatDate","applyBufferedViewport","viewportTop","viewportBottom","viewportColumns","setViewport","textForCell","x","y","column","sourceColumn","row","hasChildren","value","valueForCell","displayString","depth","getCachedGroupedColumnSet","has","extractViewportRow","isExpanded","extractedRow","modifiedData","Map","data","i","key","cellData","warn","set","_objectSpread","snapshot","ranges","includeHeaders","formatValue","_this","_asyncToGenerator","_this$viewport$column","_this$viewportData","viewport","viewportData","result","push","viewportRange","offset","rows","intersection","startRow","endRow","r","resultRow","viewportRow","startColumn","endColumn","_viewportRow$data$get","getCachedColumns","getCachedGroupColumns","sourceForCell","depthForRow","getClearFilterRange","hasExpandableRows","isExpandAllAvailable","expandAll","isChartBuilderAvailable","isSelectDistinctAvailable","isReversible","isFilterable","columnIndex","getCachedFilterableColumnSet","isColumnMovable","isRowExpandable","_row$hasChildren","isRowExpanded","_row$isExpanded","setRowExpanded","expandDescendants","setExpanded","collapseAll","_row$depth","updateFrozenColumns"],"sources":["../src/IrisGridTreeTableModel.ts"],"sourcesContent":["/* eslint class-methods-use-this: \"off\" */\nimport memoize from 'memoize-one';\nimport {\n  BoundedAxisRange,\n  GridCell,\n  GridRange,\n  ModelIndex,\n} from '@deephaven/grid';\nimport type { dh as DhType } from '@deephaven/jsapi-types';\nimport Log from '@deephaven/log';\nimport { Formatter, TableUtils } from '@deephaven/jsapi-utils';\nimport { assertNotNull } from '@deephaven/utils';\nimport { UIRow, ColumnName, CellData } from './CommonTypes';\nimport IrisGridTableModelTemplate from './IrisGridTableModelTemplate';\nimport { DisplayColumn } from './IrisGridModel';\n\nconst log = Log.module('IrisGridTreeTableModel');\n\nexport interface UITreeRow extends UIRow {\n  isExpanded: boolean;\n  hasChildren: boolean;\n  depth: number;\n}\nclass IrisGridTreeTableModel extends IrisGridTableModelTemplate<\n  DhType.TreeTable,\n  UITreeRow\n> {\n  /** We keep a virtual column at the front that tracks the \"group\" that is expanded */\n  private virtualColumns: DisplayColumn[];\n\n  constructor(\n    dh: typeof DhType,\n    table: DhType.TreeTable,\n    formatter = new Formatter(dh),\n    inputTable: DhType.InputTable | null = null\n  ) {\n    super(dh, table, formatter, inputTable);\n    this.virtualColumns =\n      table.groupedColumns.length > 1\n        ? [\n            {\n              name: '__DH_UI_GROUP__',\n              displayName: 'Group',\n              type: TableUtils.dataType.STRING,\n              constituentType: TableUtils.dataType.STRING,\n              isPartitionColumn: false,\n              isSortable: false,\n              isProxy: true,\n              description: 'Key column',\n              index: -1,\n              filter: () => {\n                throw new Error('Filter not implemented for virtual column');\n              },\n              sort: () => {\n                throw new Error('Sort not implemented virtual column');\n              },\n              formatColor: () => {\n                throw new Error('Color not implemented for virtual column');\n              },\n              get: () => {\n                throw new Error('get not implemented for virtual column');\n              },\n              getFormat: () => {\n                throw new Error('getFormat not implemented for virtual column');\n              },\n              formatNumber: () => {\n                throw new Error(\n                  'formatNumber not implemented for virtual column'\n                );\n              },\n              formatDate: () => {\n                throw new Error(\n                  'formatDate not implemented for virtual column'\n                );\n              },\n            },\n          ]\n        : [];\n  }\n\n  applyBufferedViewport(\n    viewportTop: number,\n    viewportBottom: number,\n    columns: DhType.Column[]\n  ): void {\n    const viewportColumns = [\n      // Need to always fetch the grouped columns so we always have key data for the rows\n      // Used to display our virtual key column\n      ...this.table.groupedColumns,\n      ...columns.filter(\n        c =>\n          !this.virtualColumns.includes(c) && !this.groupedColumns.includes(c)\n      ),\n    ];\n    this.table.setViewport(viewportTop, viewportBottom, viewportColumns);\n  }\n\n  textForCell(x: ModelIndex, y: ModelIndex): string {\n    const column = this.sourceColumn(x, y);\n    const row = this.row(y);\n    if (row != null && column != null) {\n      if (!row.hasChildren && column.constituentType != null) {\n        const value = this.valueForCell(x, y);\n        return this.displayString(value, column.constituentType, column.name);\n      }\n      // Show empty string instead of null in rollup grouping columns (issue #1483)\n      if (\n        row.hasChildren &&\n        row.depth <= x + 1 &&\n        this.valueForCell(x, y) === null &&\n        this.getCachedGroupedColumnSet(this.groupedColumns).has(x)\n      ) {\n        return '';\n      }\n    }\n\n    return super.textForCell(x, y);\n  }\n\n  extractViewportRow(row: DhType.TreeRow, columns: DhType.Column[]): UITreeRow {\n    const { isExpanded, hasChildren, depth } = row;\n    const extractedRow = super.extractViewportRow(row, columns);\n    const modifiedData = new Map<ModelIndex, CellData>(extractedRow.data);\n    if (hasChildren) {\n      for (let i = 0; i < this.virtualColumns.length; i += 1) {\n        const key = i + (depth - 1) + (this.virtualColumns.length - 1);\n        const cellData = modifiedData.get(key);\n        if (cellData == null) {\n          log.warn('Missing key data for virtual column', i, depth, key, row);\n        } else {\n          modifiedData.set(i, cellData);\n        }\n      }\n    }\n\n    return {\n      ...extractedRow,\n      data: modifiedData,\n      isExpanded,\n      hasChildren,\n      depth,\n    };\n  }\n\n  async snapshot(\n    ranges: GridRange[],\n    includeHeaders?: boolean,\n    formatValue?: (value: unknown, column: DhType.Column) => unknown\n  ): Promise<unknown[][]> {\n    assertNotNull(this.viewport);\n    assertNotNull(this.viewportData);\n    const columns = this.viewport.columns ?? this.columns;\n    const result = [];\n\n    if (includeHeaders != null && includeHeaders) {\n      result.push(columns.map(c => c.name));\n    }\n\n    const viewportRange = new GridRange(\n      0,\n      this.viewportData?.offset,\n      columns.length,\n      this.viewportData.offset + this.viewportData.rows.length\n    );\n\n    for (let i = 0; i < ranges.length; i += 1) {\n      const intersection = GridRange.intersection(viewportRange, ranges[i]);\n\n      assertNotNull(intersection);\n      assertNotNull(intersection.startRow);\n      assertNotNull(intersection.endRow);\n\n      for (let r = intersection.startRow; r <= intersection.endRow; r += 1) {\n        const resultRow = [];\n        const viewportRow =\n          this.viewportData.rows[r - this.viewportData.offset];\n        assertNotNull(intersection.startColumn);\n        assertNotNull(intersection.endColumn);\n        for (\n          let c = intersection.startColumn;\n          c <= intersection.endColumn;\n          c += 1\n        ) {\n          assertNotNull(formatValue);\n          resultRow.push(\n            formatValue(viewportRow.data.get(c)?.value, this.columns[c])\n          );\n        }\n        result.push(resultRow);\n      }\n    }\n\n    return result;\n  }\n\n  get columns(): DhType.Column[] {\n    return this.getCachedColumns(this.virtualColumns, super.columns);\n  }\n\n  get groupedColumns(): readonly DhType.Column[] {\n    return this.getCachedGroupColumns(\n      this.virtualColumns,\n      this.table.groupedColumns\n    );\n  }\n\n  sourceForCell(column: ModelIndex, row: ModelIndex): GridCell {\n    if (column >= this.virtualColumns.length) {\n      return { column, row };\n    }\n    const depth = this.depthForRow(row);\n    return { column: column + depth, row };\n  }\n\n  sourceColumn(column: ModelIndex, row: ModelIndex): DhType.Column {\n    if (column >= this.virtualColumns.length) {\n      return super.sourceColumn(column, row);\n    }\n\n    const depth = this.depthForRow(row);\n    return this.columns[column + depth];\n  }\n\n  getClearFilterRange(column: ModelIndex): BoundedAxisRange | null {\n    if (column >= this.virtualColumns.length) {\n      return super.getClearFilterRange(column);\n    }\n    // Source for the proxied column could be any of the grouped columns.\n    // Return the range of columns matching the grouped columns.\n    return [this.virtualColumns.length, this.groupedColumns.length];\n  }\n\n  get hasExpandableRows(): boolean {\n    return true;\n  }\n\n  get isExpandAllAvailable(): boolean {\n    return this.table.expandAll !== undefined;\n  }\n\n  get isChartBuilderAvailable(): boolean {\n    return false;\n  }\n\n  get isSelectDistinctAvailable(): boolean {\n    return false;\n  }\n\n  get isReversible(): boolean {\n    return false;\n  }\n\n  isFilterable(columnIndex: ModelIndex): boolean {\n    return this.getCachedFilterableColumnSet(\n      this.columns,\n      this.groupedColumns,\n      this.virtualColumns\n    ).has(columnIndex);\n  }\n\n  isColumnMovable(column: ModelIndex): boolean {\n    return column >= this.groupedColumns.length;\n  }\n\n  isRowExpandable(y: ModelIndex): boolean {\n    const row = this.row(y);\n    return row?.hasChildren ?? false;\n  }\n\n  isRowExpanded(y: ModelIndex): boolean {\n    const row = this.row(y);\n    return row?.isExpanded ?? false;\n  }\n\n  setRowExpanded(\n    y: ModelIndex,\n    isExpanded: boolean,\n    expandDescendants = false\n  ): void {\n    if (this.isExpandAllAvailable) {\n      this.table.setExpanded(y, isExpanded, expandDescendants);\n    } else {\n      this.table.setExpanded(y, isExpanded);\n    }\n  }\n\n  expandAll(): void {\n    if (this.table.expandAll != null) {\n      this.table.expandAll();\n    }\n  }\n\n  collapseAll(): void {\n    if (this.table.collapseAll != null) {\n      this.table.collapseAll();\n    }\n  }\n\n  depthForRow(y: ModelIndex): ModelIndex {\n    const row = this.row(y);\n    return (row?.depth ?? 1) - 1;\n  }\n\n  getCachedColumns = memoize(\n    (\n      virtualColumns: readonly DhType.Column[],\n      tableColumns: readonly DhType.Column[]\n    ) => [...virtualColumns, ...tableColumns]\n  );\n\n  getCachedGroupColumns = memoize(\n    (\n      virtualColumns: readonly DhType.Column[],\n      tableGroupedColumns: readonly DhType.Column[]\n    ) => [...virtualColumns, ...tableGroupedColumns]\n  );\n\n  getCachedFilterableColumnSet = memoize(\n    (\n      columns: readonly DhType.Column[],\n      groupedColumns: readonly DhType.Column[],\n      virtualColumns: readonly DhType.Column[]\n    ) =>\n      new Set(\n        (groupedColumns?.length > 0 ? groupedColumns : columns)\n          .filter(c => !virtualColumns.includes(c))\n          .map(c1 => columns.findIndex(c2 => c1.name === c2.name))\n      )\n  );\n\n  getCachedGroupedColumnSet = memoize(\n    (groupedColumns: readonly DhType.Column[]) =>\n      new Set(\n        groupedColumns.map(c1 =>\n          this.columns.findIndex(c2 => c1.name === c2.name)\n        )\n      )\n  );\n\n  updateFrozenColumns(columns: ColumnName[]): void {\n    if (columns.length > 0) {\n      throw new Error('Cannot freeze columns on a tree table');\n    }\n  }\n}\n\nexport default IrisGridTreeTableModel;\n"],"mappings":"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"}

package/dist/IrisGridUtils.d.ts

@@ -1,5 +1,5 @@
 import { GridMetrics, GridRange, ModelIndex, ModelSizeMap, MoveOperation, VisibleIndex } from '@deephaven/grid';
-import type { Column, ColumnGroup, DateWrapper, dh as DhType, FilterCondition, LongWrapper, RangeSet, RollupConfig, Sort, Table, TableData } from '@deephaven/jsapi-types';
+import type { dh as DhType } from '@deephaven/jsapi-types';
 import { ReverseType, SortDirection, FormattingRule } from '@deephaven/jsapi-utils';
 import { FilterData, IrisGridProps, IrisGridState } from './IrisGrid';
 import { ColumnName, ReadonlyAdvancedFilterMap, ReadonlyQuickFilterMap, InputFilter, CellData, UIRow, AdvancedFilterOptions } from './CommonTypes';
@@ -41,7 +41,7 @@ export interface LegacyDehydratedSort {
 export interface DehydratedSort {
     column: ColumnName;
     isAbs: boolean;
-    direction: SortDirection;
+    direction: string;
 }
 export interface TableSettings {
     quickFilters?: readonly DehydratedQuickFilter[];
@@ -71,7 +71,7 @@ export interface DehydratedIrisGridState {
     invertSearchColumns: boolean;
     pendingDataMap: DehydratedPendingDataMap<string | CellData | null>;
     frozenColumns: readonly ColumnName[];
-    columnHeaderGroups?: readonly ColumnGroup[];
+    columnHeaderGroups?: readonly DhType.ColumnGroup[];
     partitionConfig?: DehydratedPartitionConfig;
 }
 export interface DehydratedIrisGridPanelStateV1 {
@@ -152,7 +152,7 @@ declare class IrisGridUtils {
      * @param  sorts The table sorts
      * @returns The dehydrated sorts
      */
-    static dehydrateSort(sorts: readonly Sort[]): DehydratedSort[];
+    static dehydrateSort(sorts: readonly DhType.Sort[]): DehydratedSort[];
     /**
      * Pulls just the table settings from the panel state, eg. filters/sorts
      * @param  panelState The dehydrated panel state
@@ -172,8 +172,8 @@ declare class IrisGridUtils {
         quickFilters: QF;
         sorts: S;
     };
-    static getInputFiltersForColumns(columns: readonly Column[], inputFilters?: readonly InputFilter[]): InputFilter[];
-    static getFiltersFromFilterMap(filterMap: ReadonlyAdvancedFilterMap | ReadonlyQuickFilterMap): FilterCondition[];
+    static getInputFiltersForColumns(columns: readonly DhType.Column[], inputFilters?: readonly InputFilter[]): InputFilter[];
+    static getFiltersFromFilterMap(filterMap: ReadonlyAdvancedFilterMap | ReadonlyQuickFilterMap): DhType.FilterCondition[];
     /**
      * Get array of hidden column indexes
      * @param  userColumnWidths Map of user column widths
@@ -182,15 +182,15 @@ declare class IrisGridUtils {
     static getHiddenColumns(userColumnWidths: ModelSizeMap): ModelIndex[];
     static parseCustomColumnNames(customColumns: readonly ColumnName[]): ColumnName[];
     static getRemovedCustomColumnNames(oldCustomColumns: readonly ColumnName[], customColumns: readonly ColumnName[]): ColumnName[];
-    static removeSortsInColumns(sorts: readonly Sort[], columnNames: readonly string[]): Sort[];
-    static removeFiltersInColumns<T>(columns: readonly Column[], filters: ReadonlyMap<number, T>, removedColumnNames: readonly ColumnName[]): Map<number, T>;
-    static removeColumnFromMovedColumns(columns: readonly Column[], movedColumns: readonly MoveOperation[], removedColumnNames: readonly ColumnName[]): MoveOperation[];
+    static removeSortsInColumns(sorts: readonly DhType.Sort[], columnNames: readonly string[]): DhType.Sort[];
+    static removeFiltersInColumns<T>(columns: readonly DhType.Column[], filters: ReadonlyMap<number, T>, removedColumnNames: readonly ColumnName[]): Map<number, T>;
+    static removeColumnFromMovedColumns(columns: readonly DhType.Column[], movedColumns: readonly MoveOperation[], removedColumnNames: readonly ColumnName[]): MoveOperation[];
     static removeColumnsFromSelectDistinctColumns(selectDistinctColumns: readonly ColumnName[], removedColumnNames: readonly ColumnName[]): ColumnName[];
-    static getVisibleColumnsInRange(tableColumns: readonly Column[], left: number, right: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly number[]): Column[];
-    static getPrevVisibleColumns(tableColumns: readonly Column[], startIndex: VisibleIndex, count: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly VisibleIndex[]): Column[];
-    static getNextVisibleColumns(tableColumns: readonly Column[], startIndex: VisibleIndex, count: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly VisibleIndex[]): Column[];
-    static getColumnsToFetch(tableColumns: readonly Column[], viewportColumns: readonly Column[], alwaysFetchColumnNames: readonly ColumnName[]): Column[];
-    static getModelViewportColumns(columns: readonly Column[], left: number | null, right: number | null, movedColumns: readonly MoveOperation[], hiddenColumns?: readonly VisibleIndex[], alwaysFetchColumnNames?: readonly ColumnName[], bufferPages?: number): Column[] | undefined;
+    static getVisibleColumnsInRange(tableColumns: readonly DhType.Column[], left: number, right: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly number[]): DhType.Column[];
+    static getPrevVisibleColumns(tableColumns: readonly DhType.Column[], startIndex: VisibleIndex, count: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly VisibleIndex[]): DhType.Column[];
+    static getNextVisibleColumns(tableColumns: readonly DhType.Column[], startIndex: VisibleIndex, count: number, movedColumns: readonly MoveOperation[], hiddenColumns: readonly VisibleIndex[]): DhType.Column[];
+    static getColumnsToFetch(tableColumns: readonly DhType.Column[], viewportColumns: readonly DhType.Column[], alwaysFetchColumnNames: readonly ColumnName[]): DhType.Column[];
+    static getModelViewportColumns(columns: readonly DhType.Column[], left: number | null, right: number | null, movedColumns: readonly MoveOperation[], hiddenColumns?: readonly VisibleIndex[], alwaysFetchColumnNames?: readonly ColumnName[], bufferPages?: number): DhType.Column[] | undefined;
     /**
      * Validate whether the ranges passed in are valid to take a snapshot from.
      * Multiple selections are valid if all of the selected rows have the same columns selected.
@@ -210,13 +210,13 @@ declare class IrisGridUtils {
      * @param  allColumns All the columns to pull from
      * @returns The columns selected in the range
      */
-    static columnsFromRanges(ranges: readonly GridRange[], allColumns: readonly Column[]): Column[];
+    static columnsFromRanges(ranges: readonly GridRange[], allColumns: readonly DhType.Column[]): DhType.Column[];
     /**
      * Transforms an iris data snapshot into a simple data matrix
      * @param  data The Iris formatted table data
      * @returns A matrix of the values of the data
      */
-    static snapshotDataToMatrix(data: TableData): unknown[][];
+    static snapshotDataToMatrix(data: DhType.TableData): unknown[][];
     /**
      * Hydrate model rollup config
      * @param  originalColumns Original model columns
@@ -224,7 +224,7 @@ declare class IrisGridUtils {
      * @param  aggregationSettings Aggregation settings
      * @returns Rollup config for the model
      */
-    static getModelRollupConfig(originalColumns: readonly Column[], config: UIRollupConfig | undefined, aggregationSettings: AggregationSettings): RollupConfig | null;
+    static getModelRollupConfig(originalColumns: readonly DhType.Column[], config: UIRollupConfig | undefined, aggregationSettings: AggregationSettings): DhType.RollupConfig | null;
     /**
      * @param  pendingDataMap Map of pending data
      * @returns A map with the errors in the pending data
@@ -236,20 +236,20 @@ declare class IrisGridUtils {
      * @param  columns The columns to get the column from
      * @param  columnIndex The column index to get
      */
-    static getColumn(columns: readonly Column[], columnIndex: ModelIndex): Column | null;
+    static getColumn(columns: readonly DhType.Column[], columnIndex: ModelIndex): DhType.Column | null;
     /**
      * Retrieves a column from the provided array matching the name, or `null` and logs an error if not found
      * @param  columns The columns to get the column from
      * @param  columnName The column name to retrieve
      */
-    static getColumnByName(columns: readonly Column[], columnName: ColumnName): Column | undefined;
+    static getColumnByName(columns: readonly DhType.Column[], columnName: ColumnName): DhType.Column | undefined;
     /**
      * Get filter configs with column names changed to indexes, exclude missing columns
      * @param  columns The columns to get column indexes from
      * @param  filters Filter configs
      * @returns Updated filter configs with column names changed to indexes
      */
-    static changeFilterColumnNamesToIndexes<T>(columns: readonly Column[], filters: {
+    static changeFilterColumnNamesToIndexes<T>(columns: readonly DhType.Column[], filters: {
         name: ColumnName;
         filter: T;
     }[]): [number, T][];
@@ -265,7 +265,7 @@ declare class IrisGridUtils {
      *
      * @returns Object containing groups array, max depth, map of name to parent group, and map of name to group
      */
-    static parseColumnHeaderGroups(model: IrisGridModel, groupsParam: readonly ColumnGroup[]): {
+    static parseColumnHeaderGroups(model: IrisGridModel, groupsParam: readonly (DhType.ColumnGroup | ColumnHeaderGroup)[]): {
         groups: ColumnHeaderGroup[];
         maxDepth: number;
         parentMap: Map<string, ColumnHeaderGroup>;
@@ -279,7 +279,7 @@ declare class IrisGridUtils {
     static convertValueToText(value: unknown, columnType: string): string;
     private dh;
     private tableUtils;
-    constructor(dh: DhType);
+    constructor(dh: typeof DhType);
     /**
      * Exports the state from IrisGrid to a JSON stringifiable object
      * @param model The table model to export the state for
@@ -302,14 +302,14 @@ declare class IrisGridUtils {
      * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
      * @returns The quick filters to apply to the columns
      */
-    hydrateQuickFilters(columns: readonly Column[], savedQuickFilters: readonly DehydratedQuickFilter[], timeZone?: string): ReadonlyQuickFilterMap;
+    hydrateQuickFilters(columns: readonly DhType.Column[], savedQuickFilters: readonly DehydratedQuickFilter[], timeZone?: string): ReadonlyQuickFilterMap;
     /**
      * Export the advanced filters from the provided columns to JSON striginfiable object
      * @param columns The columns for the filters
      * @param advancedFilters The advanced filters to dehydrate
      * @returns The dehydrated advanced filters
      */
-    dehydrateAdvancedFilters(columns: readonly Column[], advancedFilters: ReadonlyAdvancedFilterMap): DehydratedAdvancedFilter[];
+    dehydrateAdvancedFilters(columns: readonly DhType.Column[], advancedFilters: ReadonlyAdvancedFilterMap): DehydratedAdvancedFilter[];
     /**
      * Import the saved advanced filters to apply to the columns. Does not actually apply the filters.
      * @param  columns The columns the filters will be applied to
@@ -317,17 +317,17 @@ declare class IrisGridUtils {
      * @param  timeZone The time zone to make this filter in if it is a date type. E.g. America/New_York
      * @returns The advanced filters to apply to the columns
      */
-    hydrateAdvancedFilters(columns: readonly Column[], savedAdvancedFilters: readonly DehydratedAdvancedFilter[], timeZone: string): ReadonlyAdvancedFilterMap;
-    dehydrateAdvancedFilterOptions(column: Column, options: AdvancedFilterOptions): AdvancedFilterOptions;
-    hydrateAdvancedFilterOptions(column: Column, options: AdvancedFilterOptions): AdvancedFilterOptions;
-    dehydratePendingDataMap(columns: readonly Column[], pendingDataMap: ReadonlyMap<ModelIndex, {
+    hydrateAdvancedFilters(columns: readonly DhType.Column[], savedAdvancedFilters: readonly DehydratedAdvancedFilter[], timeZone: string): ReadonlyAdvancedFilterMap;
+    dehydrateAdvancedFilterOptions(column: DhType.Column, options: AdvancedFilterOptions): AdvancedFilterOptions;
+    hydrateAdvancedFilterOptions(column: DhType.Column, options: AdvancedFilterOptions): AdvancedFilterOptions;
+    dehydratePendingDataMap(columns: readonly DhType.Column[], pendingDataMap: ReadonlyMap<ModelIndex, {
         data: Map<ModelIndex, CellData | string>;
     }>): DehydratedPendingDataMap<CellData | string | null>;
-    hydratePendingDataMap(columns: readonly Column[], pendingDataMap: DehydratedPendingDataMap<CellData | string | null>): Map<number, {
-        data: Map<ModelIndex | null, string | CellData | LongWrapper | null>;
+    hydratePendingDataMap(columns: readonly DhType.Column[], pendingDataMap: DehydratedPendingDataMap<CellData | string | null>): Map<number, {
+        data: Map<ModelIndex | null, string | CellData | DhType.LongWrapper | null>;
     }>;
-    dehydratePartitionConfig(partitionColumns: readonly Column[], partitionConfig: PartitionConfig | undefined): PartitionConfig | undefined;
-    hydratePartitionConfig(partitionColumns: readonly Column[], partitionConfig: PartitionConfig | undefined): PartitionConfig | undefined;
+    dehydratePartitionConfig(partitionColumns: readonly DhType.Column[], partitionConfig: PartitionConfig | undefined): PartitionConfig | undefined;
+    hydratePartitionConfig(partitionColumns: readonly DhType.Column[], partitionConfig: PartitionConfig | undefined): PartitionConfig | undefined;
     /**
      * Dehydrates/serializes a value for storage.
      * @param  value The value to dehydrate
@@ -339,25 +339,25 @@ declare class IrisGridUtils {
      * @param  value The dehydrated value that needs to be hydrated
      * @param  columnType The type of column
      */
-    hydrateValue<T>(value: T, columnType: string): DateWrapper | LongWrapper | T | null;
-    dehydrateDateTime(value: number | DateWrapper | Date): string | null;
-    hydrateDateTime(value: string): DateWrapper | null;
-    hydrateLong(value: string): LongWrapper | null;
+    hydrateValue<T>(value: T, columnType: string): DhType.DateWrapper | DhType.LongWrapper | T | null;
+    dehydrateDateTime(value: number | DhType.DateWrapper | Date): string | null;
+    hydrateDateTime(value: string): DhType.DateWrapper | null;
+    hydrateLong(value: string): DhType.LongWrapper | null;
     /**
      * Import the saved sorts to apply to the table. Does not actually apply the sort.
      * @param  columns The columns the sorts will be applied to
      * @param  sorts Exported sort definitions
      * @returns The sorts to apply to the table
      */
-    hydrateSort(columns: readonly Column[], sorts: readonly (DehydratedSort | LegacyDehydratedSort)[]): Sort[];
+    hydrateSort(columns: readonly DhType.Column[], sorts: readonly (DehydratedSort | LegacyDehydratedSort)[]): DhType.Sort[];
     /**
      * Applies the passed in table settings directly to the provided table
      * @param  table The table to apply the settings to
      * @param  tableSettings Dehydrated table settings extracted with `extractTableSettings`
      * @param  timeZone The time zone to make this value in if it is a date type. E.g. America/New_York
      */
-    applyTableSettings(table: Table, tableSettings: TableSettings, timeZone: string): void;
-    getFiltersFromInputFilters(columns: readonly Column[], inputFilters?: readonly InputFilter[], timeZone?: string): FilterCondition[];
+    applyTableSettings(table: DhType.Table, tableSettings: TableSettings, timeZone: string): void;
+    getFiltersFromInputFilters(columns: readonly DhType.Column[], inputFilters?: readonly InputFilter[], timeZone?: string): DhType.FilterCondition[];
     /**
      * Get the dh.RangeSet representation of the provided ranges.
      * Ranges are sorted prior to creating the RangeSet. Only the rows are taken into account,
@@ -365,7 +365,7 @@ declare class IrisGridUtils {
      * @param  ranges The ranges to get the range set for
      * @returns The rangeset for the provided ranges
      */
-    rangeSetFromRanges(ranges: readonly GridRange[]): RangeSet;
+    rangeSetFromRanges(ranges: readonly GridRange[]): DhType.RangeSet;
 }
 export default IrisGridUtils;
 //# sourceMappingURL=IrisGridUtils.d.ts.map