@deephaven/iris-grid 1.10.0 → 1.10.1

package/dist/IrisGridTestUtils.d.ts

@@ -1,11 +1,12 @@
 import { type GridRangeIndex, type ModelSizeMap } from '@deephaven/grid';
-import { type dh as DhType } from '@deephaven/jsapi-types';
-import { Formatter } from '@deephaven/jsapi-utils';
+import type { dh as DhType } from '@deephaven/jsapi-types';
+import { Formatter, type SortDescriptor } 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;
+    private irisGridUtils;
     constructor(dh: typeof DhType);
     makeColumn(name?: string, type?: string, index?: number): DhType.Column;
     makeRollupTableConfig(): DhType.RollupConfig;
@@ -13,11 +14,12 @@ declare class IrisGridTestUtils {
     static makeUserColumnWidths(count?: number): ModelSizeMap;
     makeRow(i: number): DhType.Row;
     makeFilter(): DhType.FilterCondition;
-    makeSort(): DhType.Sort;
+    makeSort(column?: DhType.Column): DhType.Sort;
+    hydrateSort(sortDescriptor: readonly SortDescriptor[], columns: DhType.Column[]): DhType.Sort[];
     makeTable({ columns, size, sort, layoutHints, }?: {
         columns?: DhType.Column[];
         size?: number;
-        sort?: readonly DhType.Sort[];
+        sort?: readonly SortDescriptor[];
         layoutHints?: Partial<DhType.LayoutHints>;
     }): DhType.Table;
     makeTreeTable(columns?: DhType.Column[], aggregatedColumns?: DhType.Column[], groupedColumns?: DhType.Column[], size?: number, sort?: never[], layoutHints?: Partial<DhType.LayoutHints>): DhType.TreeTable;

package/dist/IrisGridTestUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridTestUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridTestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,EAAE,KAAK,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,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAO,EACvC,cAAc,GAAE,MAAM,CAAC,MAAM,EAAO,EACpC,IAAI,SAAa,EACjB,IAAI,UAAK,EACT,WAAW,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GACxC,MAAM,CAAC,SAAS;IAcnB,MAAM,CAAC,cAAc,CACnB,UAAU,GAAE,MAAM,CAAC,MAAM,EAAO,EAChC,YAAY,GAAE,MAAM,CAAC,MAAM,EAAO,GACjC,MAAM,CAAC,UAAU;IAYpB,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"}
+{"version":3,"file":"IrisGridTestUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridTestUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACzE,OAAO,KAAK,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,KAAK,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxE,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAGtD,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;IAE1B,OAAO,CAAC,aAAa,CAAgB;gBAEzB,EAAE,EAAE,OAAO,MAAM;IAK7B,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,CAAC,MAAM,GAAE,MAAM,CAAC,MAA0B,GAAG,MAAM,CAAC,IAAI;IAKhE,WAAW,CACT,cAAc,EAAE,SAAS,cAAc,EAAE,EACzC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GACvB,MAAM,CAAC,IAAI,EAAE;IAIhB,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,cAAc,EAAE,CAAC;QACjC,WAAW,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;KACtC,GAAG,MAAM,CAAC,KAAK;IASrB,aAAa,CACX,OAAO,kBAAqB,EAC5B,iBAAiB,GAAE,MAAM,CAAC,MAAM,EAAO,EACvC,cAAc,GAAE,MAAM,CAAC,MAAM,EAAO,EACpC,IAAI,SAAa,EACjB,IAAI,UAAK,EACT,WAAW,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,GACxC,MAAM,CAAC,SAAS;IAcnB,MAAM,CAAC,cAAc,CACnB,UAAU,GAAE,MAAM,CAAC,MAAM,EAAO,EAChC,YAAY,GAAE,MAAM,CAAC,MAAM,EAAO,GACjC,MAAM,CAAC,UAAU;IAYpB,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

@@ -3,6 +3,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { Formatter } from '@deephaven/jsapi-utils';
 import IrisGridProxyModel from "./IrisGridProxyModel.js";
+import IrisGridUtils from "./IrisGridUtils.js";
 class IrisGridTestUtils {
   static valueForCell(rowIndex, columnIndex, formatValue) {
     var value = "".concat(rowIndex, ",").concat(columnIndex);
@@ -13,7 +14,9 @@ class IrisGridTestUtils {
   }
   constructor(dh) {
     _defineProperty(this, "dh", void 0);
+    _defineProperty(this, "irisGridUtils", void 0);
     this.dh = dh;
+    this.irisGridUtils = new IrisGridUtils(dh);
   }
   makeColumn(name) {
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : IrisGridTestUtils.DEFAULT_TYPE;
@@ -60,8 +63,14 @@ class IrisGridTestUtils {
     return new this.dh.FilterCondition();
   }
   makeSort() {
+    var column = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.makeColumn();
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return new this.dh.Sort();
+    return new this.dh.Sort({
+      column
+    });
+  }
+  hydrateSort(sortDescriptor, columns) {
+    return this.irisGridUtils.hydrateDhSort(columns, sortDescriptor);
   }
   makeTable() {
     var {

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","aggregatedColumns","groupedColumns","TreeTable","makeInputTable","keyColumns","valueColumns","keys","values","reduce","acc","col","includes","makeSubscription","TableViewportSubscription","makeModel","formatter","inputTable"],"sources":["../src/IrisGridTestUtils.ts"],"sourcesContent":["import { type GridRangeIndex, type 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    aggregatedColumns: DhType.Column[] = [],\n    groupedColumns: DhType.Column[] = [],\n    size = 1000000000,\n    sort = [],\n    layoutHints?: Partial<DhType.LayoutHints>\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      aggregatedColumns,\n      groupedColumns,\n      size,\n      sort,\n      layoutHints,\n    });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    return table;\n  }\n\n  static makeInputTable(\n    keyColumns: DhType.Column[] = [],\n    valueColumns: DhType.Column[] = []\n  ): DhType.InputTable {\n    const { keys, values } = [...keyColumns, ...valueColumns].reduce(\n      (acc, col) => {\n        if (keyColumns.includes(col)) acc.keys.push(col.name);\n        else acc.values.push(col.name);\n        return acc;\n      },\n      { keys: [], values: [] } as { keys: string[]; values: string[] }\n    );\n    return { keys, values } as DhType.InputTable;\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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","ignoreList":[]}
+{"version":3,"file":"IrisGridTestUtils.js","names":["Formatter","IrisGridProxyModel","IrisGridUtils","IrisGridTestUtils","valueForCell","rowIndex","columnIndex","formatValue","value","concat","undefined","constructor","dh","_defineProperty","irisGridUtils","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","hydrateSort","sortDescriptor","hydrateDhSort","makeTable","size","sort","layoutHints","table","Table","copy","Promise","resolve","freeze","makeTreeTable","aggregatedColumns","groupedColumns","TreeTable","makeInputTable","keyColumns","valueColumns","keys","values","reduce","acc","col","includes","makeSubscription","TableViewportSubscription","makeModel","formatter","inputTable"],"sources":["../src/IrisGridTestUtils.ts"],"sourcesContent":["import { type GridRangeIndex, type ModelSizeMap } from '@deephaven/grid';\nimport type { dh as DhType } from '@deephaven/jsapi-types';\nimport { Formatter, type SortDescriptor } from '@deephaven/jsapi-utils';\nimport IrisGridProxyModel from './IrisGridProxyModel';\nimport IrisGridUtils from './IrisGridUtils';\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  private irisGridUtils: IrisGridUtils;\n\n  constructor(dh: typeof DhType) {\n    this.dh = dh;\n    this.irisGridUtils = new IrisGridUtils(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(column: DhType.Column = this.makeColumn()): DhType.Sort {\n    // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    return new (this.dh as any).Sort({ column });\n  }\n\n  hydrateSort(\n    sortDescriptor: readonly SortDescriptor[],\n    columns: DhType.Column[]\n  ): DhType.Sort[] {\n    return this.irisGridUtils.hydrateDhSort(columns, sortDescriptor);\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 SortDescriptor[];\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    aggregatedColumns: DhType.Column[] = [],\n    groupedColumns: DhType.Column[] = [],\n    size = 1000000000,\n    sort = [],\n    layoutHints?: Partial<DhType.LayoutHints>\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      aggregatedColumns,\n      groupedColumns,\n      size,\n      sort,\n      layoutHints,\n    });\n    table.copy = jest.fn(() => Promise.resolve(table));\n    return table;\n  }\n\n  static makeInputTable(\n    keyColumns: DhType.Column[] = [],\n    valueColumns: DhType.Column[] = []\n  ): DhType.InputTable {\n    const { keys, values } = [...keyColumns, ...valueColumns].reduce(\n      (acc, col) => {\n        if (keyColumns.includes(col)) acc.keys.push(col.name);\n        else acc.values.push(col.name);\n        return acc;\n      },\n      { keys: [], values: [] } as { keys: string[]; values: string[] }\n    );\n    return { keys, values } as DhType.InputTable;\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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","ignoreList":[]}

package/dist/IrisGridUtils.d.ts

@@ -1,6 +1,6 @@
 import { type GridRange, type GridState, type ModelIndex, type ModelSizeMap, type MoveOperation, type VisibleIndex } from '@deephaven/grid';
 import type { dh as DhType } from '@deephaven/jsapi-types';
-import { type ReverseType, type SortDirection, type FormattingRule } from '@deephaven/jsapi-utils';
+import { type ReverseType, type SortDirection, type FormattingRule, type SortDescriptor } from '@deephaven/jsapi-utils';
 import { type FilterData, type IrisGridState } from './IrisGrid';
 import { type ColumnName, type ReadonlyAdvancedFilterMap, type ReadonlyQuickFilterMap, type InputFilter, type CellData, type UIRow, type AdvancedFilterOptions } from './CommonTypes';
 import { type UIRollupConfig } from './sidebar/RollupRows';
@@ -150,7 +150,7 @@ declare class IrisGridUtils {
      * @param  sorts The table sorts
      * @returns The dehydrated sorts
      */
-    static dehydrateSort(sorts: readonly DhType.Sort[]): DehydratedSort[];
+    static dehydrateSort(sorts: readonly SortDescriptor[]): DehydratedSort[];
     /**
      * Pulls just the table settings from the panel state, eg. filters/sorts
      * @param  panelState The dehydrated panel state
@@ -183,7 +183,7 @@ 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 DhType.Sort[], columnNames: readonly string[]): DhType.Sort[];
+    static removeSortsInColumns(sorts: readonly SortDescriptor[], columnNames: readonly string[]): readonly SortDescriptor[];
     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[];
@@ -346,12 +346,14 @@ declare class IrisGridUtils {
     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
+     * Import the saved sorts to apply to the model. Does not actually apply the sort.
+     * @param columns The columns the sorts will be applied to
+     * @param sorts Exported sort definitions
+     * @param dropReverse If true, drop reverse sort descriptors from the result
+     * @returns The sort descriptors to apply to the model
      */
-    hydrateSort(columns: readonly DhType.Column[], sorts: readonly (DehydratedSort | LegacyDehydratedSort)[]): DhType.Sort[];
+    hydrateSort(columns: readonly DhType.Column[], sorts: readonly (DehydratedSort | LegacyDehydratedSort)[], dropReverse?: boolean): readonly SortDescriptor[];
+    hydrateDhSort(columns: readonly DhType.Column[], sorts: readonly SortDescriptor[]): DhType.Sort[];
     /**
      * Applies the passed in table settings directly to the provided table
      * @param  table The table to apply the settings to

package/dist/IrisGridUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"IrisGridUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"IrisGridUtils.d.ts","sourceRoot":"","sources":["../src/IrisGridUtils.ts"],"names":[],"mappings":"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"}

package/dist/IrisGridUtils.js

@@ -10,7 +10,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { GridUtils } from '@deephaven/grid';
 import { DateUtils, TableUtils } from '@deephaven/jsapi-utils';
 import Log from '@deephaven/log';
-import { assertNotNull, bindAllMethods, EMPTY_ARRAY, EMPTY_MAP } from '@deephaven/utils';
+import { assertNotNull, bindAllMethods, EMPTY_ARRAY, EMPTY_MAP, isNotNullOrUndefined } from '@deephaven/utils';
 import AggregationUtils from "./sidebar/aggregations/AggregationUtils.js";
 import AggregationOperation from "./sidebar/aggregations/AggregationOperation.js";
 import AdvancedSettings from "./sidebar/AdvancedSettings.js";
@@ -621,7 +621,8 @@ class IrisGridUtils {
    * @param  columnName The column name to retrieve
    */
   static getColumnByName(columns, columnName) {
-    var column = columns.find(_ref14 => {
+    // Columns can contain ColumnBy sources with negative indexes
+    var column = Object.values(columns).find(_ref14 => {
       var {
         name
       } = _ref14;
@@ -742,7 +743,10 @@ class IrisGridUtils {
         name
       } = group;
       assertNotNull(name, 'Column header group has no name');
-      if (model.getColumnIndexByName(name) != null) {
+      var columnIndex = model.getColumnIndexByName(name);
+      // Groups cannot have names matching columns to avoid parent-child collision
+      // unless they refer to ColumnBy sources with negative indexes
+      if (columnIndex != null && columnIndex >= 0) {
         throw new Error("Column header group has same name as column: ".concat(name));
       }
       var existingGroup = groupMap.get(name);
@@ -970,7 +974,7 @@ class IrisGridUtils {
       columnAlignmentMap: new Map(columnAlignmentMap),
       isFilterBarShown,
       quickFilters: this.hydrateQuickFilters(columns, quickFilters, formatter.timeZone),
-      sorts: this.hydrateSort(columns, sorts),
+      sorts: this.hydrateSort(columns, sorts, true),
       userColumnWidths: new Map(userColumnWidths.map(_ref20 => {
         var [column, width] = _ref20;
         if (typeof column === 'string' || column instanceof String) {
@@ -1199,12 +1203,14 @@ class IrisGridUtils {
   }
 
   /**
-   * 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
+   * Import the saved sorts to apply to the model. Does not actually apply the sort.
+   * @param columns The columns the sorts will be applied to
+   * @param sorts Exported sort definitions
+   * @param dropReverse If true, drop reverse sort descriptors from the result
+   * @returns The sort descriptors to apply to the model
    */
   hydrateSort(columns, sorts) {
+    var dropReverse = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
     var {
       dh
     } = this;
@@ -1218,6 +1224,40 @@ class IrisGridUtils {
         return dh.Table.reverse();
       }
       var column = typeof columnIndexOrName === 'string' ? IrisGridUtils.getColumnByName(columns, columnIndexOrName) : IrisGridUtils.getColumn(columns, columnIndexOrName);
+      if (column != null) {
+        return {
+          column: {
+            name: column.name,
+            type: column.type
+          },
+          isAbs,
+          direction
+        };
+      }
+      return null;
+    })
+    // If we can't find the column any more, it's null, filter it out
+    // If the item is a reverse sort item, and dropReverse is true, filter it out
+    // - it will get applied with the `reverse` property
+    // This should only happen when loading a legacy dashboard
+    .filter(item => item != null && (item.direction !== TableUtils.sortDirection.reverse || !dropReverse));
+  }
+  hydrateDhSort(columns, sorts) {
+    var {
+      dh
+    } = this;
+    return sorts.map(sortDescriptor => {
+      var {
+        column: {
+          name
+        },
+        isAbs,
+        direction
+      } = sortDescriptor;
+      if (direction === TableUtils.sortDirection.reverse) {
+        return dh.Table.reverse();
+      }
+      var column = IrisGridUtils.getColumnByName(columns, name);
       if (column != null) {
         var columnSort = column.sort();
         if (isAbs) {
@@ -1233,9 +1273,7 @@ class IrisGridUtils {
       return null;
     })
     // If we can't find the column any more, it's null, filter it out
-    // If the item is a reverse sort item, filter it out - it will get applied with the `reverse` property
-    // This should only happen when loading a legacy dashboard
-    .filter(item => item != null && item.direction !== TableUtils.sortDirection.reverse);
+    .filter(isNotNullOrUndefined);
   }
 
   /**
@@ -1259,7 +1297,7 @@ class IrisGridUtils {
     var inputFilters = this.getFiltersFromInputFilters(columns, tableSettings.inputFilters, timeZone);
     var sorts = [];
     if (tableSettings.sorts) {
-      sorts = this.hydrateSort(columns, tableSettings.sorts);
+      sorts = this.hydrateDhSort(columns, this.hydrateSort(columns, tableSettings.sorts));
     }
     var filters = [...quickFilters, ...advancedFilters];
     var {