@tanstack/table-core 9.0.0-beta.5 → 9.0.0-beta.50

package/dist/features/column-grouping/createGroupedRowModel.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createGroupedRowModel.cjs","names":["tableMemo","table_getColumn","flattenBy","constructRow","column_getAggregationFn","row_getGroupingValue"],"sources":["../../../src/features/column-grouping/createGroupedRowModel.ts"],"sourcesContent":["import { flattenBy, tableMemo } from '../../utils'\nimport { constructRow } from '../../core/rows/constructRow'\nimport { table_getColumn } from '../../core/columns/coreColumnsFeature.utils'\nimport { table_autoResetExpanded } from '../row-expanding/rowExpandingFeature.utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport {\n  column_getAggregationFn,\n  row_getGroupingValue,\n} from './columnGroupingFeature.utils'\nimport type { Column } from '../../types/Column'\nimport type {\n  AggregationFn,\n  AggregationFns,\n  Row_ColumnGrouping,\n} from './columnGroupingFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized grouped row model factory.\n *\n * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.\n */\nexport function createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  aggregationFns: Record<keyof AggregationFns, AggregationFn<TFeatures, TData>>,\n): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData> {\n  return (_table) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    if (!table._rowModelFns.aggregationFns)\n      table._rowModelFns.aggregationFns = aggregationFns\n    return tableMemo({\n      feature: 'columnGroupingFeature',\n      table,\n      fnName: 'table.getGroupedRowModel',\n      memoDeps: () => [\n        table.atoms.grouping?.get(),\n        table.getPreGroupedRowModel(),\n      ],\n      fn: () => _createGroupedRowModel(table),\n      onAfterUpdate: () => {\n        table_autoResetExpanded(table)\n        table_autoResetPageIndex(table)\n      },\n    })\n  }\n}\n\nfunction _createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const rowModel = table.getPreGroupedRowModel()\n  const grouping = table.atoms.grouping?.get()\n\n  if (!rowModel.rows.length || !grouping?.length) {\n    rowModel.rows.forEach((row) => {\n      row.depth = 0\n      row.parentId = undefined\n    })\n    return rowModel\n  }\n\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = grouping.filter((columnId) =>\n    table_getColumn(table, columnId),\n  )\n\n  const groupedFlatRows: Array<Row<TFeatures, TData>> &\n    Partial<Row_ColumnGrouping> = []\n  const groupedRowsById: Record<string, Row<TFeatures, TData>> = {}\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Array<Row<TFeatures, TData>>,\n    depth = 0,\n    parentId?: string,\n  ) => {\n    // Grouping depth has been been met\n    // Stop grouping and simply rewrite thd depth and row relationships\n    if (depth >= existingGrouping.length) {\n      return rows.map((row) => {\n        row.depth = depth\n\n        groupedFlatRows.push(row)\n        groupedRowsById[row.id] = row\n\n        if (row.subRows.length) {\n          row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id)\n        }\n\n        return row\n      })\n    }\n\n    const columnId = existingGrouping[depth] as string\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Perform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        subRows.forEach((subRow) => {\n          subRow.parentId = id\n        })\n\n        // Flatten the leaf rows of the rows in this group\n        const leafRows = depth\n          ? flattenBy(groupedRows, (row) => row.subRows)\n          : groupedRows\n\n        const row = constructRow(\n          table,\n          id,\n          leafRows[0]!.original,\n          index,\n          depth,\n          undefined,\n          parentId,\n        ) as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n          getValue: (colId: string) => {\n            // Don't aggregate columns that are in the grouping\n            if (existingGrouping.includes(colId)) {\n              if (row._valuesCache.hasOwnProperty(colId)) {\n                return row._valuesCache[colId]\n              }\n\n              if (groupedRows[0]) {\n                row._valuesCache[colId] =\n                  groupedRows[0].getValue(colId) ?? undefined\n              }\n\n              return row._valuesCache[colId]\n            }\n\n            if (row._groupingValuesCache?.hasOwnProperty(colId)) {\n              return row._groupingValuesCache[colId]\n            }\n\n            // Aggregate the values\n            const column = table.getColumn(colId)\n            const aggregateFn = column_getAggregationFn(\n              column as Column<TFeatures, TData, unknown>,\n            )\n\n            if (!row._groupingValuesCache) row._groupingValuesCache = {}\n\n            if (aggregateFn) {\n              row._groupingValuesCache[colId] = aggregateFn(\n                colId,\n                leafRows,\n                groupedRows,\n              )\n\n              return row._groupingValuesCache[colId]\n            }\n          },\n        })\n\n        subRows.forEach((subRow) => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n        })\n\n        return row\n      },\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(rowModel.rows, 0)\n\n  groupedRows.forEach((subRow) => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TFeatures extends TableFeatures, TData extends RowData = any>(\n  rows: Array<Row<TFeatures, TData>>,\n  columnId: string,\n) {\n  const groupMap = new Map<any, Array<Row<TFeatures, TData>>>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row_getGroupingValue(row, columnId)}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      previous.push(row)\n    }\n    return map\n  }, groupMap)\n}\n"],"mappings":";;;;;;;;;;;;;AA0BA,SAAgB,sBAId,gBACsE;CACtE,QAAQ,WAAW;EACjB,MAAM,QAAQ;EACd,IAAI,CAAC,MAAM,aAAa,gBACtB,MAAM,aAAa,iBAAiB;EACtC,OAAOA,wBAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;;qCACd,MAAM,MAAM,wFAAU,IAAI,GAC1B,MAAM,sBAAsB,CAC9B;;GACA,UAAU,uBAAuB,KAAK;GACtC,qBAAqB;IACnB,0DAAwB,KAAK;IAC7B,4DAAyB,KAAK;GAChC;EACF,CAAC;CACH;AACF;AAEA,SAAS,uBAGP,OAAqE;;CACrE,MAAM,WAAW,MAAM,sBAAsB;CAC7C,MAAM,qCAAW,MAAM,MAAM,0FAAU,IAAI;CAE3C,IAAI,CAAC,SAAS,KAAK,UAAU,sDAAC,SAAU,SAAQ;EAC9C,SAAS,KAAK,SAAS,QAAQ;GAC7B,IAAI,QAAQ;GACZ,IAAI,WAAW;EACjB,CAAC;EACD,OAAO;CACT;CAGA,MAAM,mBAAmB,SAAS,QAAQ,aACxCC,iDAAgB,OAAO,QAAQ,CACjC;CAEA,MAAM,kBAC0B,CAAC;CACjC,MAAM,kBAAyD,CAAC;CAGhE,MAAM,sBACJ,MACA,QAAQ,GACR,aACG;EAGH,IAAI,SAAS,iBAAiB,QAC5B,OAAO,KAAK,KAAK,QAAQ;GACvB,IAAI,QAAQ;GAEZ,gBAAgB,KAAK,GAAG;GACxB,gBAAgB,IAAI,MAAM;GAE1B,IAAI,IAAI,QAAQ,QACd,IAAI,UAAU,mBAAmB,IAAI,SAAS,QAAQ,GAAG,IAAI,EAAE;GAGjE,OAAO;EACT,CAAC;EAGH,MAAM,WAAW,iBAAiB;EAGlC,MAAM,eAAe,QAAQ,MAAM,QAAQ;EAmF3C,OAhF8B,MAAM,KAAK,aAAa,QAAQ,CAAC,CAAC,CAAC,KAC9D,CAAC,eAAe,cAAc,UAAU;GACvC,IAAI,KAAK,GAAG,SAAS,GAAG;GACxB,KAAK,WAAW,GAAG,SAAS,GAAG,OAAO;GAGtC,MAAM,UAAU,mBAAmB,aAAa,QAAQ,GAAG,EAAE;GAE7D,QAAQ,SAAS,WAAW;IAC1B,OAAO,WAAW;GACpB,CAAC;GAGD,MAAM,WAAW,QACbC,wBAAU,cAAc,QAAQ,IAAI,OAAO,IAC3C;GAEJ,MAAM,MAAMC,kCACV,OACA,IACA,SAAS,EAAE,CAAE,UACb,OACA,OACA,QACA,QACF;GAEA,OAAO,OAAO,KAAK;IACjB,kBAAkB;IAClB;IACA;IACA;IACA,WAAW,UAAkB;;KAE3B,IAAI,iBAAiB,SAAS,KAAK,GAAG;MACpC,IAAI,IAAI,aAAa,eAAe,KAAK,GACvC,OAAO,IAAI,aAAa;MAG1B,IAAI,YAAY,IACd,IAAI,aAAa,SACf,YAAY,EAAE,CAAC,SAAS,KAAK,KAAK;MAGtC,OAAO,IAAI,aAAa;KAC1B;KAEA,6BAAI,IAAI,oGAAsB,eAAe,KAAK,GAChD,OAAO,IAAI,qBAAqB;KAKlC,MAAM,cAAcC,4DADL,MAAM,UAAU,KAExB,CACP;KAEA,IAAI,CAAC,IAAI,sBAAsB,IAAI,uBAAuB,CAAC;KAE3D,IAAI,aAAa;MACf,IAAI,qBAAqB,SAAS,YAChC,OACA,UACA,WACF;MAEA,OAAO,IAAI,qBAAqB;KAClC;IACF;GACF,CAAC;GAED,QAAQ,SAAS,WAAW;IAC1B,gBAAgB,KAAK,MAAM;IAC3B,gBAAgB,OAAO,MAAM;GAC/B,CAAC;GAED,OAAO;EACT,CAGyB;CAC7B;CAEA,MAAM,cAAc,mBAAmB,SAAS,MAAM,CAAC;CAEvD,YAAY,SAAS,WAAW;EAC9B,gBAAgB,KAAK,MAAM;EAC3B,gBAAgB,OAAO,MAAM;CAC/B,CAAC;CAED,OAAO;EACL,MAAM;EACN,UAAU;EACV,UAAU;CACZ;AACF;AAEA,SAAS,QACP,MACA,UACA;CACA,MAAM,2BAAW,IAAI,IAAuC;CAE5D,OAAO,KAAK,QAAQ,KAAK,QAAQ;EAC/B,MAAM,SAAS,GAAGC,yDAAqB,KAAK,QAAQ;EACpD,MAAM,WAAW,IAAI,IAAI,MAAM;EAC/B,IAAI,CAAC,UACH,IAAI,IAAI,QAAQ,CAAC,GAAG,CAAC;OAErB,SAAS,KAAK,GAAG;EAEnB,OAAO;CACT,GAAG,QAAQ;AACb"}
+{"version":3,"file":"createGroupedRowModel.cjs","names":["tableMemo","table_getColumn","makeObjectMap","normalizeAggregationRows","constructRow","hasOwn","aggregateColumnValue","row_getGroupingValue"],"sources":["../../../src/features/column-grouping/createGroupedRowModel.ts"],"sourcesContent":["import { hasOwn, makeObjectMap, tableMemo } from '../../utils'\nimport { constructRow } from '../../core/rows/constructRow'\nimport { table_getColumn } from '../../core/columns/coreColumnsFeature.utils'\nimport { table_autoResetExpanded } from '../row-expanding/rowExpandingFeature.utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport {\n  aggregateColumnValue,\n  normalizeAggregationRows,\n} from '../aggregation/aggregationFeature.utils'\nimport { row_getGroupingValue } from './columnGroupingFeature.utils'\nimport type { Row_ColumnGrouping } from './columnGroupingFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized grouped row model factory.\n *\n * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.\n *\n * When aggregationFeature is also registered, grouped rows use its shared\n * executor for non-group values. Grouping remains useful without aggregation.\n */\nexport function createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData> {\n  return (_table) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnGroupingFeature',\n      table,\n      fnName: 'table.getGroupedRowModel',\n      memoDeps: () => [\n        table.atoms.grouping?.get(),\n        table.getPreGroupedRowModel(),\n        table.options.columns,\n      ],\n      fn: () => _createGroupedRowModel(table),\n      onAfterUpdate: () => {\n        table_autoResetExpanded(table)\n        table_autoResetPageIndex(table)\n      },\n    })\n  }\n}\n\nfunction _createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const rowModel = table.getPreGroupedRowModel()\n  const grouping = table.atoms.grouping?.get()\n\n  if (!rowModel.rows.length || !grouping?.length) {\n    rowModel.rows.forEach((row) => {\n      row.depth = 0\n      row.parentId = undefined\n    })\n    return rowModel\n  }\n\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = grouping.filter((columnId) =>\n    table_getColumn(table, columnId),\n  )\n\n  const groupedFlatRows: Array<Row<TFeatures, TData>> &\n    Partial<Row_ColumnGrouping> = []\n  const groupedRowsById = makeObjectMap<Row<TFeatures, TData>>()\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Array<Row<TFeatures, TData>>,\n    depth = 0,\n    parentId?: string,\n  ) => {\n    // Grouping depth has been been met\n    // Stop grouping and simply rewrite thd depth and row relationships\n    if (depth >= existingGrouping.length) {\n      return rows.map((row) => {\n        row.depth = depth\n\n        // Every row is pushed into flatRows/rowsById exactly once, by its\n        // parent frame: rows returned here are pushed by the caller (the\n        // parent group's loop or the root loop), so only descendants below\n        // the terminal depth are pushed here.\n        if (row.subRows.length) {\n          row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id)\n          for (let i = 0; i < row.subRows.length; i++) {\n            const subRow = row.subRows[i]!\n            groupedFlatRows.push(subRow)\n            groupedRowsById[subRow.id] = subRow\n          }\n        }\n\n        return row\n      })\n    }\n\n    const columnId = existingGrouping[depth] as string\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Perform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        subRows.forEach((subRow) => {\n          subRow.parentId = id\n        })\n\n        const leafRows = normalizeAggregationRows(groupedRows, Infinity)\n\n        const row = constructRow(\n          table,\n          id,\n          leafRows[0]!.original,\n          index,\n          depth,\n          undefined,\n          parentId,\n        ) as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n          getValue: (colId: string) => {\n            const groupingIndex = existingGrouping.indexOf(colId)\n\n            // The active grouping column and ancestor grouping columns expose\n            // their inherited grouping values. Columns grouped at deeper\n            // levels are still eligible for aggregation here.\n            if (groupingIndex !== -1 && groupingIndex <= depth) {\n              if (hasOwn(row._valuesCache, colId)) {\n                return row._valuesCache[colId]\n              }\n\n              if (groupedRows[0]) {\n                row._valuesCache[colId] =\n                  groupedRows[0].getValue(colId) ?? undefined\n              }\n\n              return row._valuesCache[colId]\n            }\n\n            const aggregationCache = (row as any)._aggregationValuesCache as\n              | Record<string, unknown>\n              | undefined\n            if (aggregationCache && hasOwn(aggregationCache, colId)) {\n              return aggregationCache[colId]\n            }\n\n            const column = table.getColumn(colId) as any\n            if (typeof column.getAggregationFns !== 'function') return undefined\n\n            const cache = ((row as any)._aggregationValuesCache ??=\n              makeObjectMap())\n            cache[colId] = aggregateColumnValue({\n              subRows,\n              column,\n              groupingRow: row,\n              rows: groupedRows,\n            })\n            return cache[colId]\n          },\n        })\n\n        subRows.forEach((subRow) => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n        })\n\n        return row\n      },\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(rowModel.rows, 0)\n\n  groupedRows.forEach((subRow) => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TFeatures extends TableFeatures, TData extends RowData = any>(\n  rows: Array<Row<TFeatures, TData>>,\n  columnId: string,\n) {\n  const groupMap = new Map<any, Array<Row<TFeatures, TData>>>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row_getGroupingValue(row, columnId)}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      previous.push(row)\n    }\n    return map\n  }, groupMap)\n}\n"],"mappings":"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"}

package/dist/features/column-grouping/createGroupedRowModel.d.cts

@@ -1,16 +1,18 @@
 import { RowData } from "../../types/type-utils.cjs";
-import { TableFeatures } from "../../types/TableFeatures.cjs";
-import { Table } from "../../types/Table.cjs";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.cjs";
-import { AggregationFn, AggregationFns } from "./columnGroupingFeature.types.cjs";
+import { Table } from "../../types/Table.cjs";
+import { TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/column-grouping/createGroupedRowModel.d.ts
 /**
  * Creates a memoized grouped row model factory.
  *
  * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.
+ *
+ * When aggregationFeature is also registered, grouped rows use its shared
+ * executor for non-group values. Grouping remains useful without aggregation.
  */
-declare function createGroupedRowModel<TFeatures extends TableFeatures, TData extends RowData = any>(aggregationFns: Record<keyof AggregationFns, AggregationFn<TFeatures, TData>>): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
+declare function createGroupedRowModel<TFeatures extends TableFeatures, TData extends RowData = any>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
 //#endregion
 export { createGroupedRowModel };
 //# sourceMappingURL=createGroupedRowModel.d.cts.map

package/dist/features/column-grouping/createGroupedRowModel.d.ts

@@ -1,16 +1,18 @@
 import { RowData } from "../../types/type-utils.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
-import { AggregationFn, AggregationFns } from "./columnGroupingFeature.types.js";
+import { Table } from "../../types/Table.js";
+import { TableFeatures } from "../../types/TableFeatures.js";
 
 //#region src/features/column-grouping/createGroupedRowModel.d.ts
 /**
  * Creates a memoized grouped row model factory.
  *
  * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.
+ *
+ * When aggregationFeature is also registered, grouped rows use its shared
+ * executor for non-group values. Grouping remains useful without aggregation.
  */
-declare function createGroupedRowModel<TFeatures extends TableFeatures, TData extends RowData = any>(aggregationFns: Record<keyof AggregationFns, AggregationFn<TFeatures, TData>>): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
+declare function createGroupedRowModel<TFeatures extends TableFeatures, TData extends RowData = any>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
 //#endregion
 export { createGroupedRowModel };
 //# sourceMappingURL=createGroupedRowModel.d.ts.map

package/dist/features/column-grouping/createGroupedRowModel.js

@@ -1,8 +1,9 @@
-import { flattenBy, tableMemo } from "../../utils.js";
+import { hasOwn, makeObjectMap, tableMemo } from "../../utils.js";
 import { table_getColumn } from "../../core/columns/coreColumnsFeature.utils.js";
 import { constructRow } from "../../core/rows/constructRow.js";
 import { table_autoResetPageIndex } from "../row-pagination/rowPaginationFeature.utils.js";
-import { column_getAggregationFn, row_getGroupingValue } from "./columnGroupingFeature.utils.js";
+import { aggregateColumnValue, normalizeAggregationRows } from "../aggregation/aggregationFeature.utils.js";
+import { row_getGroupingValue } from "./columnGroupingFeature.utils.js";
 import { table_autoResetExpanded } from "../row-expanding/rowExpandingFeature.utils.js";
 
 //#region src/features/column-grouping/createGroupedRowModel.ts
@@ -10,19 +11,22 @@ import { table_autoResetExpanded } from "../row-expanding/rowExpandingFeature.ut
 * Creates a memoized grouped row model factory.
 *
 * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.
+*
+* When aggregationFeature is also registered, grouped rows use its shared
+* executor for non-group values. Grouping remains useful without aggregation.
 */
-function createGroupedRowModel(aggregationFns) {
+function createGroupedRowModel() {
 	return (_table) => {
 		const table = _table;
-		if (!table._rowModelFns.aggregationFns) table._rowModelFns.aggregationFns = aggregationFns;
 		return tableMemo({
 			feature: "columnGroupingFeature",
 			table,
 			fnName: "table.getGroupedRowModel",
-			memoDeps: () => {
-				var _table$atoms$grouping;
-				return [(_table$atoms$grouping = table.atoms.grouping) === null || _table$atoms$grouping === void 0 ? void 0 : _table$atoms$grouping.get(), table.getPreGroupedRowModel()];
-			},
+			memoDeps: () => [
+				table.atoms.grouping?.get(),
+				table.getPreGroupedRowModel(),
+				table.options.columns
+			],
 			fn: () => _createGroupedRowModel(table),
 			onAfterUpdate: () => {
 				table_autoResetExpanded(table);
@@ -32,10 +36,9 @@ function createGroupedRowModel(aggregationFns) {
 	};
 }
 function _createGroupedRowModel(table) {
-	var _table$atoms$grouping2;
 	const rowModel = table.getPreGroupedRowModel();
-	const grouping = (_table$atoms$grouping2 = table.atoms.grouping) === null || _table$atoms$grouping2 === void 0 ? void 0 : _table$atoms$grouping2.get();
-	if (!rowModel.rows.length || !(grouping === null || grouping === void 0 ? void 0 : grouping.length)) {
+	const grouping = table.atoms.grouping?.get();
+	if (!rowModel.rows.length || !grouping?.length) {
 		rowModel.rows.forEach((row) => {
 			row.depth = 0;
 			row.parentId = void 0;
@@ -44,13 +47,18 @@ function _createGroupedRowModel(table) {
 	}
 	const existingGrouping = grouping.filter((columnId) => table_getColumn(table, columnId));
 	const groupedFlatRows = [];
-	const groupedRowsById = {};
+	const groupedRowsById = makeObjectMap();
 	const groupUpRecursively = (rows, depth = 0, parentId) => {
 		if (depth >= existingGrouping.length) return rows.map((row) => {
 			row.depth = depth;
-			groupedFlatRows.push(row);
-			groupedRowsById[row.id] = row;
-			if (row.subRows.length) row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id);
+			if (row.subRows.length) {
+				row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id);
+				for (let i = 0; i < row.subRows.length; i++) {
+					const subRow = row.subRows[i];
+					groupedFlatRows.push(subRow);
+					groupedRowsById[subRow.id] = subRow;
+				}
+			}
 			return row;
 		});
 		const columnId = existingGrouping[depth];
@@ -62,7 +70,7 @@ function _createGroupedRowModel(table) {
 			subRows.forEach((subRow) => {
 				subRow.parentId = id;
 			});
-			const leafRows = depth ? flattenBy(groupedRows, (row) => row.subRows) : groupedRows;
+			const leafRows = normalizeAggregationRows(groupedRows, Infinity);
 			const row = constructRow(table, id, leafRows[0].original, index, depth, void 0, parentId);
 			Object.assign(row, {
 				groupingColumnId: columnId,
@@ -70,19 +78,24 @@ function _createGroupedRowModel(table) {
 				subRows,
 				leafRows,
 				getValue: (colId) => {
-					var _row$_groupingValuesC;
-					if (existingGrouping.includes(colId)) {
-						if (row._valuesCache.hasOwnProperty(colId)) return row._valuesCache[colId];
+					const groupingIndex = existingGrouping.indexOf(colId);
+					if (groupingIndex !== -1 && groupingIndex <= depth) {
+						if (hasOwn(row._valuesCache, colId)) return row._valuesCache[colId];
 						if (groupedRows[0]) row._valuesCache[colId] = groupedRows[0].getValue(colId) ?? void 0;
 						return row._valuesCache[colId];
 					}
-					if ((_row$_groupingValuesC = row._groupingValuesCache) === null || _row$_groupingValuesC === void 0 ? void 0 : _row$_groupingValuesC.hasOwnProperty(colId)) return row._groupingValuesCache[colId];
-					const aggregateFn = column_getAggregationFn(table.getColumn(colId));
-					if (!row._groupingValuesCache) row._groupingValuesCache = {};
-					if (aggregateFn) {
-						row._groupingValuesCache[colId] = aggregateFn(colId, leafRows, groupedRows);
-						return row._groupingValuesCache[colId];
-					}
+					const aggregationCache = row._aggregationValuesCache;
+					if (aggregationCache && hasOwn(aggregationCache, colId)) return aggregationCache[colId];
+					const column = table.getColumn(colId);
+					if (typeof column.getAggregationFns !== "function") return void 0;
+					const cache = row._aggregationValuesCache ??= makeObjectMap();
+					cache[colId] = aggregateColumnValue({
+						subRows,
+						column,
+						groupingRow: row,
+						rows: groupedRows
+					});
+					return cache[colId];
 				}
 			});
 			subRows.forEach((subRow) => {

package/dist/features/column-grouping/createGroupedRowModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"createGroupedRowModel.js","names":[],"sources":["../../../src/features/column-grouping/createGroupedRowModel.ts"],"sourcesContent":["import { flattenBy, tableMemo } from '../../utils'\nimport { constructRow } from '../../core/rows/constructRow'\nimport { table_getColumn } from '../../core/columns/coreColumnsFeature.utils'\nimport { table_autoResetExpanded } from '../row-expanding/rowExpandingFeature.utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport {\n  column_getAggregationFn,\n  row_getGroupingValue,\n} from './columnGroupingFeature.utils'\nimport type { Column } from '../../types/Column'\nimport type {\n  AggregationFn,\n  AggregationFns,\n  Row_ColumnGrouping,\n} from './columnGroupingFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized grouped row model factory.\n *\n * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.\n */\nexport function createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  aggregationFns: Record<keyof AggregationFns, AggregationFn<TFeatures, TData>>,\n): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData> {\n  return (_table) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    if (!table._rowModelFns.aggregationFns)\n      table._rowModelFns.aggregationFns = aggregationFns\n    return tableMemo({\n      feature: 'columnGroupingFeature',\n      table,\n      fnName: 'table.getGroupedRowModel',\n      memoDeps: () => [\n        table.atoms.grouping?.get(),\n        table.getPreGroupedRowModel(),\n      ],\n      fn: () => _createGroupedRowModel(table),\n      onAfterUpdate: () => {\n        table_autoResetExpanded(table)\n        table_autoResetPageIndex(table)\n      },\n    })\n  }\n}\n\nfunction _createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const rowModel = table.getPreGroupedRowModel()\n  const grouping = table.atoms.grouping?.get()\n\n  if (!rowModel.rows.length || !grouping?.length) {\n    rowModel.rows.forEach((row) => {\n      row.depth = 0\n      row.parentId = undefined\n    })\n    return rowModel\n  }\n\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = grouping.filter((columnId) =>\n    table_getColumn(table, columnId),\n  )\n\n  const groupedFlatRows: Array<Row<TFeatures, TData>> &\n    Partial<Row_ColumnGrouping> = []\n  const groupedRowsById: Record<string, Row<TFeatures, TData>> = {}\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Array<Row<TFeatures, TData>>,\n    depth = 0,\n    parentId?: string,\n  ) => {\n    // Grouping depth has been been met\n    // Stop grouping and simply rewrite thd depth and row relationships\n    if (depth >= existingGrouping.length) {\n      return rows.map((row) => {\n        row.depth = depth\n\n        groupedFlatRows.push(row)\n        groupedRowsById[row.id] = row\n\n        if (row.subRows.length) {\n          row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id)\n        }\n\n        return row\n      })\n    }\n\n    const columnId = existingGrouping[depth] as string\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Perform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        subRows.forEach((subRow) => {\n          subRow.parentId = id\n        })\n\n        // Flatten the leaf rows of the rows in this group\n        const leafRows = depth\n          ? flattenBy(groupedRows, (row) => row.subRows)\n          : groupedRows\n\n        const row = constructRow(\n          table,\n          id,\n          leafRows[0]!.original,\n          index,\n          depth,\n          undefined,\n          parentId,\n        ) as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n          getValue: (colId: string) => {\n            // Don't aggregate columns that are in the grouping\n            if (existingGrouping.includes(colId)) {\n              if (row._valuesCache.hasOwnProperty(colId)) {\n                return row._valuesCache[colId]\n              }\n\n              if (groupedRows[0]) {\n                row._valuesCache[colId] =\n                  groupedRows[0].getValue(colId) ?? undefined\n              }\n\n              return row._valuesCache[colId]\n            }\n\n            if (row._groupingValuesCache?.hasOwnProperty(colId)) {\n              return row._groupingValuesCache[colId]\n            }\n\n            // Aggregate the values\n            const column = table.getColumn(colId)\n            const aggregateFn = column_getAggregationFn(\n              column as Column<TFeatures, TData, unknown>,\n            )\n\n            if (!row._groupingValuesCache) row._groupingValuesCache = {}\n\n            if (aggregateFn) {\n              row._groupingValuesCache[colId] = aggregateFn(\n                colId,\n                leafRows,\n                groupedRows,\n              )\n\n              return row._groupingValuesCache[colId]\n            }\n          },\n        })\n\n        subRows.forEach((subRow) => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n        })\n\n        return row\n      },\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(rowModel.rows, 0)\n\n  groupedRows.forEach((subRow) => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TFeatures extends TableFeatures, TData extends RowData = any>(\n  rows: Array<Row<TFeatures, TData>>,\n  columnId: string,\n) {\n  const groupMap = new Map<any, Array<Row<TFeatures, TData>>>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row_getGroupingValue(row, columnId)}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      previous.push(row)\n    }\n    return map\n  }, groupMap)\n}\n"],"mappings":"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"}
+{"version":3,"file":"createGroupedRowModel.js","names":[],"sources":["../../../src/features/column-grouping/createGroupedRowModel.ts"],"sourcesContent":["import { hasOwn, makeObjectMap, tableMemo } from '../../utils'\nimport { constructRow } from '../../core/rows/constructRow'\nimport { table_getColumn } from '../../core/columns/coreColumnsFeature.utils'\nimport { table_autoResetExpanded } from '../row-expanding/rowExpandingFeature.utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport {\n  aggregateColumnValue,\n  normalizeAggregationRows,\n} from '../aggregation/aggregationFeature.utils'\nimport { row_getGroupingValue } from './columnGroupingFeature.utils'\nimport type { Row_ColumnGrouping } from './columnGroupingFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized grouped row model factory.\n *\n * The factory reads the relevant table state atoms and options, then returns a row model function used by the table row-model pipeline.\n *\n * When aggregationFeature is also registered, grouped rows use its shared\n * executor for non-group values. Grouping remains useful without aggregation.\n */\nexport function createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData> {\n  return (_table) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnGroupingFeature',\n      table,\n      fnName: 'table.getGroupedRowModel',\n      memoDeps: () => [\n        table.atoms.grouping?.get(),\n        table.getPreGroupedRowModel(),\n        table.options.columns,\n      ],\n      fn: () => _createGroupedRowModel(table),\n      onAfterUpdate: () => {\n        table_autoResetExpanded(table)\n        table_autoResetPageIndex(table)\n      },\n    })\n  }\n}\n\nfunction _createGroupedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const rowModel = table.getPreGroupedRowModel()\n  const grouping = table.atoms.grouping?.get()\n\n  if (!rowModel.rows.length || !grouping?.length) {\n    rowModel.rows.forEach((row) => {\n      row.depth = 0\n      row.parentId = undefined\n    })\n    return rowModel\n  }\n\n  // Filter the grouping list down to columns that exist\n  const existingGrouping = grouping.filter((columnId) =>\n    table_getColumn(table, columnId),\n  )\n\n  const groupedFlatRows: Array<Row<TFeatures, TData>> &\n    Partial<Row_ColumnGrouping> = []\n  const groupedRowsById = makeObjectMap<Row<TFeatures, TData>>()\n\n  // Recursively group the data\n  const groupUpRecursively = (\n    rows: Array<Row<TFeatures, TData>>,\n    depth = 0,\n    parentId?: string,\n  ) => {\n    // Grouping depth has been been met\n    // Stop grouping and simply rewrite thd depth and row relationships\n    if (depth >= existingGrouping.length) {\n      return rows.map((row) => {\n        row.depth = depth\n\n        // Every row is pushed into flatRows/rowsById exactly once, by its\n        // parent frame: rows returned here are pushed by the caller (the\n        // parent group's loop or the root loop), so only descendants below\n        // the terminal depth are pushed here.\n        if (row.subRows.length) {\n          row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id)\n          for (let i = 0; i < row.subRows.length; i++) {\n            const subRow = row.subRows[i]!\n            groupedFlatRows.push(subRow)\n            groupedRowsById[subRow.id] = subRow\n          }\n        }\n\n        return row\n      })\n    }\n\n    const columnId = existingGrouping[depth] as string\n\n    // Group the rows together for this level\n    const rowGroupsMap = groupBy(rows, columnId)\n\n    // Perform aggregations for each group\n    const aggregatedGroupedRows = Array.from(rowGroupsMap.entries()).map(\n      ([groupingValue, groupedRows], index) => {\n        let id = `${columnId}:${groupingValue}`\n        id = parentId ? `${parentId}>${id}` : id\n\n        // First, Recurse to group sub rows before aggregation\n        const subRows = groupUpRecursively(groupedRows, depth + 1, id)\n\n        subRows.forEach((subRow) => {\n          subRow.parentId = id\n        })\n\n        const leafRows = normalizeAggregationRows(groupedRows, Infinity)\n\n        const row = constructRow(\n          table,\n          id,\n          leafRows[0]!.original,\n          index,\n          depth,\n          undefined,\n          parentId,\n        ) as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n\n        Object.assign(row, {\n          groupingColumnId: columnId,\n          groupingValue,\n          subRows,\n          leafRows,\n          getValue: (colId: string) => {\n            const groupingIndex = existingGrouping.indexOf(colId)\n\n            // The active grouping column and ancestor grouping columns expose\n            // their inherited grouping values. Columns grouped at deeper\n            // levels are still eligible for aggregation here.\n            if (groupingIndex !== -1 && groupingIndex <= depth) {\n              if (hasOwn(row._valuesCache, colId)) {\n                return row._valuesCache[colId]\n              }\n\n              if (groupedRows[0]) {\n                row._valuesCache[colId] =\n                  groupedRows[0].getValue(colId) ?? undefined\n              }\n\n              return row._valuesCache[colId]\n            }\n\n            const aggregationCache = (row as any)._aggregationValuesCache as\n              | Record<string, unknown>\n              | undefined\n            if (aggregationCache && hasOwn(aggregationCache, colId)) {\n              return aggregationCache[colId]\n            }\n\n            const column = table.getColumn(colId) as any\n            if (typeof column.getAggregationFns !== 'function') return undefined\n\n            const cache = ((row as any)._aggregationValuesCache ??=\n              makeObjectMap())\n            cache[colId] = aggregateColumnValue({\n              subRows,\n              column,\n              groupingRow: row,\n              rows: groupedRows,\n            })\n            return cache[colId]\n          },\n        })\n\n        subRows.forEach((subRow) => {\n          groupedFlatRows.push(subRow)\n          groupedRowsById[subRow.id] = subRow\n        })\n\n        return row\n      },\n    )\n\n    return aggregatedGroupedRows\n  }\n\n  const groupedRows = groupUpRecursively(rowModel.rows, 0)\n\n  groupedRows.forEach((subRow) => {\n    groupedFlatRows.push(subRow)\n    groupedRowsById[subRow.id] = subRow\n  })\n\n  return {\n    rows: groupedRows,\n    flatRows: groupedFlatRows,\n    rowsById: groupedRowsById,\n  }\n}\n\nfunction groupBy<TFeatures extends TableFeatures, TData extends RowData = any>(\n  rows: Array<Row<TFeatures, TData>>,\n  columnId: string,\n) {\n  const groupMap = new Map<any, Array<Row<TFeatures, TData>>>()\n\n  return rows.reduce((map, row) => {\n    const resKey = `${row_getGroupingValue(row, columnId)}`\n    const previous = map.get(resKey)\n    if (!previous) {\n      map.set(resKey, [row])\n    } else {\n      previous.push(row)\n    }\n    return map\n  }, groupMap)\n}\n"],"mappings":"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"}

package/dist/features/column-ordering/columnOrderingFeature.cjs

@@ -17,37 +17,33 @@ const columnOrderingFeature = {
 	},
 	assignColumnPrototype: (prototype, table) => {
 		require_utils.assignPrototypeAPIs("columnOrderingFeature", prototype, table, {
-			column_getIndex: {
-				fn: (column, position) => require_columnOrderingFeature_utils.column_getIndex(column, position),
-				memoDeps: (column, position) => {
-					var _column$table$atoms$c, _column$table$atoms$c2, _column$table$atoms$g, _column$table$atoms$c3;
-					return [
-						position,
-						(_column$table$atoms$c = column.table.atoms.columnOrder) === null || _column$table$atoms$c === void 0 ? void 0 : _column$table$atoms$c.get(),
-						(_column$table$atoms$c2 = column.table.atoms.columnPinning) === null || _column$table$atoms$c2 === void 0 ? void 0 : _column$table$atoms$c2.get(),
-						(_column$table$atoms$g = column.table.atoms.grouping) === null || _column$table$atoms$g === void 0 ? void 0 : _column$table$atoms$g.get(),
-						(_column$table$atoms$c3 = column.table.atoms.columnVisibility) === null || _column$table$atoms$c3 === void 0 ? void 0 : _column$table$atoms$c3.get()
-					];
-				}
-			},
+			column_getIndex: { fn: (column, position) => require_columnOrderingFeature_utils.column_getIndex(column, position) },
 			column_getIsFirstColumn: { fn: (column, position) => require_columnOrderingFeature_utils.column_getIsFirstColumn(column, position) },
 			column_getIsLastColumn: { fn: (column, position) => require_columnOrderingFeature_utils.column_getIsLastColumn(column, position) }
 		});
 	},
 	constructTableAPIs: (table) => {
 		require_utils.assignTableAPIs("columnOrderingFeature", table, {
+			table_getColumnIndexes: {
+				fn: () => require_columnOrderingFeature_utils.table_getColumnIndexes(table),
+				memoDeps: () => [
+					table.options.columns,
+					table.atoms.columnOrder?.get(),
+					table.atoms.columnPinning?.get(),
+					table.atoms.columnVisibility?.get(),
+					table.atoms.grouping?.get(),
+					table.options.groupedColumnMode
+				]
+			},
 			table_setColumnOrder: { fn: (updater) => require_columnOrderingFeature_utils.table_setColumnOrder(table, updater) },
 			table_resetColumnOrder: { fn: (defaultState) => require_columnOrderingFeature_utils.table_resetColumnOrder(table, defaultState) },
 			table_getOrderColumnsFn: {
 				fn: () => require_columnOrderingFeature_utils.table_getOrderColumnsFn(table),
-				memoDeps: () => {
-					var _table$atoms$columnOr, _table$atoms$grouping;
-					return [
-						(_table$atoms$columnOr = table.atoms.columnOrder) === null || _table$atoms$columnOr === void 0 ? void 0 : _table$atoms$columnOr.get(),
-						(_table$atoms$grouping = table.atoms.grouping) === null || _table$atoms$grouping === void 0 ? void 0 : _table$atoms$grouping.get(),
-						table.options.groupedColumnMode
-					];
-				}
+				memoDeps: () => [
+					table.atoms.columnOrder?.get(),
+					table.atoms.grouping?.get(),
+					table.options.groupedColumnMode
+				]
 			}
 		});
 	}

package/dist/features/column-ordering/columnOrderingFeature.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"columnOrderingFeature.cjs","names":["getDefaultColumnOrderState","makeStateUpdater","column_getIndex","column_getIsFirstColumn","column_getIsLastColumn","table_setColumnOrder","table_resetColumnOrder","table_getOrderColumnsFn"],"sources":["../../../src/features/column-ordering/columnOrderingFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getIndex,\n  column_getIsFirstColumn,\n  column_getIsLastColumn,\n  getDefaultColumnOrderState,\n  table_getOrderColumnsFn,\n  table_resetColumnOrder,\n  table_setColumnOrder,\n} from './columnOrderingFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds column ordering state and APIs for ordering leaf columns.\n */\nexport const columnOrderingFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnOrder: getDefaultColumnOrderState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnOrderChange: makeStateUpdater('columnOrder', table),\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnOrderingFeature', prototype, table, {\n      column_getIndex: {\n        fn: (column, position) => column_getIndex(column, position),\n        memoDeps: (column, position) => [\n          position,\n          column.table.atoms.columnOrder?.get(),\n          column.table.atoms.columnPinning?.get(),\n          column.table.atoms.grouping?.get(),\n          column.table.atoms.columnVisibility?.get(),\n        ],\n      },\n      column_getIsFirstColumn: {\n        fn: (column, position) => column_getIsFirstColumn(column, position),\n      },\n      column_getIsLastColumn: {\n        fn: (column, position) => column_getIsLastColumn(column, position),\n      },\n    })\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnOrderingFeature', table, {\n      table_setColumnOrder: {\n        fn: (updater) => table_setColumnOrder(table, updater),\n      },\n      table_resetColumnOrder: {\n        fn: (defaultState) => table_resetColumnOrder(table, defaultState),\n      },\n      table_getOrderColumnsFn: {\n        fn: () => table_getOrderColumnsFn(table),\n        memoDeps: () => [\n          table.atoms.columnOrder?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAmBA,MAAa,wBAAsC;CACjD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,aAAaA,+DAA2B;GACxC,GAAG;EACL;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO,EACL,qBAAqBC,+BAAiB,eAAe,KAAK,EAC5D;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,kCAAoB,yBAAyB,WAAW,OAAO;GAC7D,iBAAiB;IACf,KAAK,QAAQ,aAAaC,oDAAgB,QAAQ,QAAQ;IAC1D,WAAW,QAAQ,aAAa;;;MAC9B;+BACA,OAAO,MAAM,MAAM,2FAAa,IAAI;gCACpC,OAAO,MAAM,MAAM,+FAAe,IAAI;+BACtC,OAAO,MAAM,MAAM,wFAAU,IAAI;gCACjC,OAAO,MAAM,MAAM,kGAAkB,IAAI;KAC3C;;GACF;GACA,yBAAyB,EACvB,KAAK,QAAQ,aAAaC,4DAAwB,QAAQ,QAAQ,EACpE;GACA,wBAAwB,EACtB,KAAK,QAAQ,aAAaC,2DAAuB,QAAQ,QAAQ,EACnE;EACF,CAAC;CACH;CAEA,qBAAqB,UAAU;EAC7B,8BAAgB,yBAAyB,OAAO;GAC9C,sBAAsB,EACpB,KAAK,YAAYC,yDAAqB,OAAO,OAAO,EACtD;GACA,wBAAwB,EACtB,KAAK,iBAAiBC,2DAAuB,OAAO,YAAY,EAClE;GACA,yBAAyB;IACvB,UAAUC,4DAAwB,KAAK;IACvC,gBAAgB;;;+BACd,MAAM,MAAM,2FAAa,IAAI;+BAC7B,MAAM,MAAM,wFAAU,IAAI;MAC1B,MAAM,QAAQ;KAChB;;GACF;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"columnOrderingFeature.cjs","names":["getDefaultColumnOrderState","makeStateUpdater","column_getIndex","column_getIsFirstColumn","column_getIsLastColumn","table_getColumnIndexes","table_setColumnOrder","table_resetColumnOrder","table_getOrderColumnsFn"],"sources":["../../../src/features/column-ordering/columnOrderingFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getIndex,\n  column_getIsFirstColumn,\n  column_getIsLastColumn,\n  getDefaultColumnOrderState,\n  table_getColumnIndexes,\n  table_getOrderColumnsFn,\n  table_resetColumnOrder,\n  table_setColumnOrder,\n} from './columnOrderingFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds column ordering state and APIs for ordering leaf columns.\n */\nexport const columnOrderingFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnOrder: getDefaultColumnOrderState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnOrderChange: makeStateUpdater('columnOrder', table),\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnOrderingFeature', prototype, table, {\n      column_getIndex: {\n        fn: (column, position) => column_getIndex(column, position),\n      },\n      column_getIsFirstColumn: {\n        fn: (column, position) => column_getIsFirstColumn(column, position),\n      },\n      column_getIsLastColumn: {\n        fn: (column, position) => column_getIsLastColumn(column, position),\n      },\n    })\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnOrderingFeature', table, {\n      table_getColumnIndexes: {\n        fn: () => table_getColumnIndexes(table),\n        memoDeps: () => [\n          table.options.columns,\n          table.atoms.columnOrder?.get(),\n          table.atoms.columnPinning?.get(),\n          table.atoms.columnVisibility?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n      table_setColumnOrder: {\n        fn: (updater) => table_setColumnOrder(table, updater),\n      },\n      table_resetColumnOrder: {\n        fn: (defaultState) => table_resetColumnOrder(table, defaultState),\n      },\n      table_getOrderColumnsFn: {\n        fn: () => table_getOrderColumnsFn(table),\n        memoDeps: () => [\n          table.atoms.columnOrder?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAoBA,MAAa,wBAAsC;CACjD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,aAAaA,+DAA2B;GACxC,GAAG;EACL;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO,EACL,qBAAqBC,+BAAiB,eAAe,KAAK,EAC5D;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,kCAAoB,yBAAyB,WAAW,OAAO;GAC7D,iBAAiB,EACf,KAAK,QAAQ,aAAaC,oDAAgB,QAAQ,QAAQ,EAC5D;GACA,yBAAyB,EACvB,KAAK,QAAQ,aAAaC,4DAAwB,QAAQ,QAAQ,EACpE;GACA,wBAAwB,EACtB,KAAK,QAAQ,aAAaC,2DAAuB,QAAQ,QAAQ,EACnE;EACF,CAAC;CACH;CAEA,qBAAqB,UAAU;EAC7B,8BAAgB,yBAAyB,OAAO;GAC9C,wBAAwB;IACtB,UAAUC,2DAAuB,KAAK;IACtC,gBAAgB;KACd,MAAM,QAAQ;KACd,MAAM,MAAM,aAAa,IAAI;KAC7B,MAAM,MAAM,eAAe,IAAI;KAC/B,MAAM,MAAM,kBAAkB,IAAI;KAClC,MAAM,MAAM,UAAU,IAAI;KAC1B,MAAM,QAAQ;IAChB;GACF;GACA,sBAAsB,EACpB,KAAK,YAAYC,yDAAqB,OAAO,OAAO,EACtD;GACA,wBAAwB,EACtB,KAAK,iBAAiBC,2DAAuB,OAAO,YAAY,EAClE;GACA,yBAAyB;IACvB,UAAUC,4DAAwB,KAAK;IACvC,gBAAgB;KACd,MAAM,MAAM,aAAa,IAAI;KAC7B,MAAM,MAAM,UAAU,IAAI;KAC1B,MAAM,QAAQ;IAChB;GACF;EACF,CAAC;CACH;AACF"}

package/dist/features/column-ordering/columnOrderingFeature.js

@@ -1,5 +1,5 @@
 import { assignPrototypeAPIs, assignTableAPIs, makeStateUpdater } from "../../utils.js";
-import { column_getIndex, column_getIsFirstColumn, column_getIsLastColumn, getDefaultColumnOrderState, table_getOrderColumnsFn, table_resetColumnOrder, table_setColumnOrder } from "./columnOrderingFeature.utils.js";
+import { column_getIndex, column_getIsFirstColumn, column_getIsLastColumn, getDefaultColumnOrderState, table_getColumnIndexes, table_getOrderColumnsFn, table_resetColumnOrder, table_setColumnOrder } from "./columnOrderingFeature.utils.js";
 
 //#region src/features/column-ordering/columnOrderingFeature.ts
 /**
@@ -17,37 +17,33 @@ const columnOrderingFeature = {
 	},
 	assignColumnPrototype: (prototype, table) => {
 		assignPrototypeAPIs("columnOrderingFeature", prototype, table, {
-			column_getIndex: {
-				fn: (column, position) => column_getIndex(column, position),
-				memoDeps: (column, position) => {
-					var _column$table$atoms$c, _column$table$atoms$c2, _column$table$atoms$g, _column$table$atoms$c3;
-					return [
-						position,
-						(_column$table$atoms$c = column.table.atoms.columnOrder) === null || _column$table$atoms$c === void 0 ? void 0 : _column$table$atoms$c.get(),
-						(_column$table$atoms$c2 = column.table.atoms.columnPinning) === null || _column$table$atoms$c2 === void 0 ? void 0 : _column$table$atoms$c2.get(),
-						(_column$table$atoms$g = column.table.atoms.grouping) === null || _column$table$atoms$g === void 0 ? void 0 : _column$table$atoms$g.get(),
-						(_column$table$atoms$c3 = column.table.atoms.columnVisibility) === null || _column$table$atoms$c3 === void 0 ? void 0 : _column$table$atoms$c3.get()
-					];
-				}
-			},
+			column_getIndex: { fn: (column, position) => column_getIndex(column, position) },
 			column_getIsFirstColumn: { fn: (column, position) => column_getIsFirstColumn(column, position) },
 			column_getIsLastColumn: { fn: (column, position) => column_getIsLastColumn(column, position) }
 		});
 	},
 	constructTableAPIs: (table) => {
 		assignTableAPIs("columnOrderingFeature", table, {
+			table_getColumnIndexes: {
+				fn: () => table_getColumnIndexes(table),
+				memoDeps: () => [
+					table.options.columns,
+					table.atoms.columnOrder?.get(),
+					table.atoms.columnPinning?.get(),
+					table.atoms.columnVisibility?.get(),
+					table.atoms.grouping?.get(),
+					table.options.groupedColumnMode
+				]
+			},
 			table_setColumnOrder: { fn: (updater) => table_setColumnOrder(table, updater) },
 			table_resetColumnOrder: { fn: (defaultState) => table_resetColumnOrder(table, defaultState) },
 			table_getOrderColumnsFn: {
 				fn: () => table_getOrderColumnsFn(table),
-				memoDeps: () => {
-					var _table$atoms$columnOr, _table$atoms$grouping;
-					return [
-						(_table$atoms$columnOr = table.atoms.columnOrder) === null || _table$atoms$columnOr === void 0 ? void 0 : _table$atoms$columnOr.get(),
-						(_table$atoms$grouping = table.atoms.grouping) === null || _table$atoms$grouping === void 0 ? void 0 : _table$atoms$grouping.get(),
-						table.options.groupedColumnMode
-					];
-				}
+				memoDeps: () => [
+					table.atoms.columnOrder?.get(),
+					table.atoms.grouping?.get(),
+					table.options.groupedColumnMode
+				]
 			}
 		});
 	}

package/dist/features/column-ordering/columnOrderingFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"columnOrderingFeature.js","names":[],"sources":["../../../src/features/column-ordering/columnOrderingFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getIndex,\n  column_getIsFirstColumn,\n  column_getIsLastColumn,\n  getDefaultColumnOrderState,\n  table_getOrderColumnsFn,\n  table_resetColumnOrder,\n  table_setColumnOrder,\n} from './columnOrderingFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds column ordering state and APIs for ordering leaf columns.\n */\nexport const columnOrderingFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnOrder: getDefaultColumnOrderState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnOrderChange: makeStateUpdater('columnOrder', table),\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnOrderingFeature', prototype, table, {\n      column_getIndex: {\n        fn: (column, position) => column_getIndex(column, position),\n        memoDeps: (column, position) => [\n          position,\n          column.table.atoms.columnOrder?.get(),\n          column.table.atoms.columnPinning?.get(),\n          column.table.atoms.grouping?.get(),\n          column.table.atoms.columnVisibility?.get(),\n        ],\n      },\n      column_getIsFirstColumn: {\n        fn: (column, position) => column_getIsFirstColumn(column, position),\n      },\n      column_getIsLastColumn: {\n        fn: (column, position) => column_getIsLastColumn(column, position),\n      },\n    })\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnOrderingFeature', table, {\n      table_setColumnOrder: {\n        fn: (updater) => table_setColumnOrder(table, updater),\n      },\n      table_resetColumnOrder: {\n        fn: (defaultState) => table_resetColumnOrder(table, defaultState),\n      },\n      table_getOrderColumnsFn: {\n        fn: () => table_getOrderColumnsFn(table),\n        memoDeps: () => [\n          table.atoms.columnOrder?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAmBA,MAAa,wBAAsC;CACjD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,aAAa,2BAA2B;GACxC,GAAG;EACL;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO,EACL,qBAAqB,iBAAiB,eAAe,KAAK,EAC5D;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,oBAAoB,yBAAyB,WAAW,OAAO;GAC7D,iBAAiB;IACf,KAAK,QAAQ,aAAa,gBAAgB,QAAQ,QAAQ;IAC1D,WAAW,QAAQ,aAAa;;;MAC9B;+BACA,OAAO,MAAM,MAAM,2FAAa,IAAI;gCACpC,OAAO,MAAM,MAAM,+FAAe,IAAI;+BACtC,OAAO,MAAM,MAAM,wFAAU,IAAI;gCACjC,OAAO,MAAM,MAAM,kGAAkB,IAAI;KAC3C;;GACF;GACA,yBAAyB,EACvB,KAAK,QAAQ,aAAa,wBAAwB,QAAQ,QAAQ,EACpE;GACA,wBAAwB,EACtB,KAAK,QAAQ,aAAa,uBAAuB,QAAQ,QAAQ,EACnE;EACF,CAAC;CACH;CAEA,qBAAqB,UAAU;EAC7B,gBAAgB,yBAAyB,OAAO;GAC9C,sBAAsB,EACpB,KAAK,YAAY,qBAAqB,OAAO,OAAO,EACtD;GACA,wBAAwB,EACtB,KAAK,iBAAiB,uBAAuB,OAAO,YAAY,EAClE;GACA,yBAAyB;IACvB,UAAU,wBAAwB,KAAK;IACvC,gBAAgB;;;+BACd,MAAM,MAAM,2FAAa,IAAI;+BAC7B,MAAM,MAAM,wFAAU,IAAI;MAC1B,MAAM,QAAQ;KAChB;;GACF;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"columnOrderingFeature.js","names":[],"sources":["../../../src/features/column-ordering/columnOrderingFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getIndex,\n  column_getIsFirstColumn,\n  column_getIsLastColumn,\n  getDefaultColumnOrderState,\n  table_getColumnIndexes,\n  table_getOrderColumnsFn,\n  table_resetColumnOrder,\n  table_setColumnOrder,\n} from './columnOrderingFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds column ordering state and APIs for ordering leaf columns.\n */\nexport const columnOrderingFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnOrder: getDefaultColumnOrderState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnOrderChange: makeStateUpdater('columnOrder', table),\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnOrderingFeature', prototype, table, {\n      column_getIndex: {\n        fn: (column, position) => column_getIndex(column, position),\n      },\n      column_getIsFirstColumn: {\n        fn: (column, position) => column_getIsFirstColumn(column, position),\n      },\n      column_getIsLastColumn: {\n        fn: (column, position) => column_getIsLastColumn(column, position),\n      },\n    })\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnOrderingFeature', table, {\n      table_getColumnIndexes: {\n        fn: () => table_getColumnIndexes(table),\n        memoDeps: () => [\n          table.options.columns,\n          table.atoms.columnOrder?.get(),\n          table.atoms.columnPinning?.get(),\n          table.atoms.columnVisibility?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n      table_setColumnOrder: {\n        fn: (updater) => table_setColumnOrder(table, updater),\n      },\n      table_resetColumnOrder: {\n        fn: (defaultState) => table_resetColumnOrder(table, defaultState),\n      },\n      table_getOrderColumnsFn: {\n        fn: () => table_getOrderColumnsFn(table),\n        memoDeps: () => [\n          table.atoms.columnOrder?.get(),\n          table.atoms.grouping?.get(),\n          table.options.groupedColumnMode,\n        ],\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAoBA,MAAa,wBAAsC;CACjD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,aAAa,2BAA2B;GACxC,GAAG;EACL;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO,EACL,qBAAqB,iBAAiB,eAAe,KAAK,EAC5D;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,oBAAoB,yBAAyB,WAAW,OAAO;GAC7D,iBAAiB,EACf,KAAK,QAAQ,aAAa,gBAAgB,QAAQ,QAAQ,EAC5D;GACA,yBAAyB,EACvB,KAAK,QAAQ,aAAa,wBAAwB,QAAQ,QAAQ,EACpE;GACA,wBAAwB,EACtB,KAAK,QAAQ,aAAa,uBAAuB,QAAQ,QAAQ,EACnE;EACF,CAAC;CACH;CAEA,qBAAqB,UAAU;EAC7B,gBAAgB,yBAAyB,OAAO;GAC9C,wBAAwB;IACtB,UAAU,uBAAuB,KAAK;IACtC,gBAAgB;KACd,MAAM,QAAQ;KACd,MAAM,MAAM,aAAa,IAAI;KAC7B,MAAM,MAAM,eAAe,IAAI;KAC/B,MAAM,MAAM,kBAAkB,IAAI;KAClC,MAAM,MAAM,UAAU,IAAI;KAC1B,MAAM,QAAQ;IAChB;GACF;GACA,sBAAsB,EACpB,KAAK,YAAY,qBAAqB,OAAO,OAAO,EACtD;GACA,wBAAwB,EACtB,KAAK,iBAAiB,uBAAuB,OAAO,YAAY,EAClE;GACA,yBAAyB;IACvB,UAAU,wBAAwB,KAAK;IACvC,gBAAgB;KACd,MAAM,MAAM,aAAa,IAAI;KAC7B,MAAM,MAAM,UAAU,IAAI;KAC1B,MAAM,QAAQ;IAChB;GACF;EACF,CAAC;CACH;AACF"}

package/dist/features/column-ordering/columnOrderingFeature.types.d.cts

@@ -4,6 +4,24 @@ import { TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/column-ordering/columnOrderingFeature.types.d.ts
 type ColumnOrderState = Array<string>;
+interface ColumnIndexes {
+  /**
+   * Maps each visible leaf column id to its index in the full visible column list.
+   */
+  all: Record<string, number>;
+  /**
+   * Maps each unpinned visible leaf column id to its index within the center region.
+   */
+  center: Record<string, number>;
+  /**
+   * Maps each start-pinned visible leaf column id to its index within the start region.
+   */
+  start: Record<string, number>;
+  /**
+   * Maps each end-pinned visible leaf column id to its index within the end region.
+   */
+  end: Record<string, number>;
+}
 interface TableState_ColumnOrdering {
   columnOrder: ColumnOrderState;
 }
@@ -19,7 +37,7 @@ interface Column_ColumnOrdering {
   /**
    * Finds this column's zero-based index among visible columns.
    *
-   * Pass `'left'`, `'center'`, or `'right'` to measure within that pinned
+   * Pass `'start'`, `'center'`, or `'end'` to measure within that pinned
    * region instead of the full visible leaf order.
    */
   getIndex: (position?: ColumnPinningPosition | 'center') => number;
@@ -39,7 +57,14 @@ interface Column_ColumnOrdering {
 interface ColumnOrderDefaultOptions {
   onColumnOrderChange: OnChangeFn<ColumnOrderState>;
 }
-interface Table_ColumnOrdering<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_ColumnOrdering<in out _TFeatures extends TableFeatures, in out _TData extends RowData> {
+  /**
+   * Builds column-id to index records for each visible pinning region.
+   *
+   * This is the memoized source that `column.getIndex` reads from; most apps
+   * will not need to call it directly.
+   */
+  getColumnIndexes: () => ColumnIndexes;
   /**
    * Resets `columnOrder` to `initialState.columnOrder`.
    *
@@ -52,5 +77,5 @@ interface Table_ColumnOrdering<TFeatures extends TableFeatures, TData extends Ro
   setColumnOrder: (updater: Updater<ColumnOrderState>) => void;
 }
 //#endregion
-export { ColumnOrderDefaultOptions, ColumnOrderState, Column_ColumnOrdering, TableOptions_ColumnOrdering, TableState_ColumnOrdering, Table_ColumnOrdering };
+export { ColumnIndexes, ColumnOrderDefaultOptions, ColumnOrderState, Column_ColumnOrdering, TableOptions_ColumnOrdering, TableState_ColumnOrdering, Table_ColumnOrdering };
 //# sourceMappingURL=columnOrderingFeature.types.d.cts.map

package/dist/features/column-ordering/columnOrderingFeature.types.d.ts

@@ -4,6 +4,24 @@ import { TableFeatures } from "../../types/TableFeatures.js";
 
 //#region src/features/column-ordering/columnOrderingFeature.types.d.ts
 type ColumnOrderState = Array<string>;
+interface ColumnIndexes {
+  /**
+   * Maps each visible leaf column id to its index in the full visible column list.
+   */
+  all: Record<string, number>;
+  /**
+   * Maps each unpinned visible leaf column id to its index within the center region.
+   */
+  center: Record<string, number>;
+  /**
+   * Maps each start-pinned visible leaf column id to its index within the start region.
+   */
+  start: Record<string, number>;
+  /**
+   * Maps each end-pinned visible leaf column id to its index within the end region.
+   */
+  end: Record<string, number>;
+}
 interface TableState_ColumnOrdering {
   columnOrder: ColumnOrderState;
 }
@@ -19,7 +37,7 @@ interface Column_ColumnOrdering {
   /**
    * Finds this column's zero-based index among visible columns.
    *
-   * Pass `'left'`, `'center'`, or `'right'` to measure within that pinned
+   * Pass `'start'`, `'center'`, or `'end'` to measure within that pinned
    * region instead of the full visible leaf order.
    */
   getIndex: (position?: ColumnPinningPosition | 'center') => number;
@@ -39,7 +57,14 @@ interface Column_ColumnOrdering {
 interface ColumnOrderDefaultOptions {
   onColumnOrderChange: OnChangeFn<ColumnOrderState>;
 }
-interface Table_ColumnOrdering<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_ColumnOrdering<in out _TFeatures extends TableFeatures, in out _TData extends RowData> {
+  /**
+   * Builds column-id to index records for each visible pinning region.
+   *
+   * This is the memoized source that `column.getIndex` reads from; most apps
+   * will not need to call it directly.
+   */
+  getColumnIndexes: () => ColumnIndexes;
   /**
    * Resets `columnOrder` to `initialState.columnOrder`.
    *
@@ -52,5 +77,5 @@ interface Table_ColumnOrdering<TFeatures extends TableFeatures, TData extends Ro
   setColumnOrder: (updater: Updater<ColumnOrderState>) => void;
 }
 //#endregion
-export { ColumnOrderDefaultOptions, ColumnOrderState, Column_ColumnOrdering, TableOptions_ColumnOrdering, TableState_ColumnOrdering, Table_ColumnOrdering };
+export { ColumnIndexes, ColumnOrderDefaultOptions, ColumnOrderState, Column_ColumnOrdering, TableOptions_ColumnOrdering, TableState_ColumnOrdering, Table_ColumnOrdering };
 //# sourceMappingURL=columnOrderingFeature.types.d.ts.map