@tanstack/table-core 9.0.0-beta.7 → 9.0.0-beta.71

package/dist/features/column-grouping/columnGroupingFeature.types.d.ts

@@ -1,33 +1,13 @@
-import { CellData, OnChangeFn, RowData, Updater } from "../../types/type-utils.js";
+import { OnChangeFn, RowData, Updater } from "../../types/type-utils.js";
 import { Row } from "../../types/Row.js";
-import { ColumnDefTemplate } from "../../types/ColumnDef.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
-import { BuiltInAggregationFn } from "../../fns/aggregationFns.js";
-import { Cell } from "../../types/Cell.js";
-
+import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/features/column-grouping/columnGroupingFeature.types.d.ts
 type GroupingState = Array<string>;
 interface TableState_ColumnGrouping {
   grouping: GroupingState;
 }
-interface RowModelFns_ColumnGrouping<TFeatures extends TableFeatures, TData extends RowData> {
-  aggregationFns: Record<keyof AggregationFns, AggregationFn<TFeatures, TData>>;
-}
-interface AggregationFns {}
-type AggregationFn<TFeatures extends TableFeatures, TData extends RowData> = (columnId: string, leafRows: Array<Row<TFeatures, TData>>, childRows: Array<Row<TFeatures, TData>>) => any;
-type CustomAggregationFns<TFeatures extends TableFeatures, TData extends RowData> = Record<string, AggregationFn<TFeatures, TData>>;
-type AggregationFnOption<TFeatures extends TableFeatures, TData extends RowData> = 'auto' | keyof AggregationFns | BuiltInAggregationFn | AggregationFn<TFeatures, TData>;
-interface ColumnDef_ColumnGrouping<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData> {
-  /**
-   * The cell to display each row for the column if the cell is an aggregate. If a function is passed, it will be passed a props object with the context of the cell and should return the property type for your adapter (the exact type depends on the adapter being used).
-   */
-  aggregatedCell?: ColumnDefTemplate<ReturnType<Cell<TFeatures, TData, TValue>['getContext']>>;
-  /**
-   * The resolved aggregation function for the column.
-   */
-  aggregationFn?: AggregationFnOption<TFeatures, TData>;
+interface ColumnDef_ColumnGrouping<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Allows this column to be added to grouping state.
    *
@@ -35,19 +15,14 @@ interface ColumnDef_ColumnGrouping<TFeatures extends TableFeatures, TData extend
    */
   enableGrouping?: boolean;
   /**
-   * Specify a value to be used for grouping rows on this column. If this option is not specified, the value derived from `accessorKey` / `accessorFn` will be used instead.
+   * Returns the value used to group rows for this column.
+   *
+   * When omitted, grouping uses the value derived from this column's
+   * `accessorKey` or `accessorFn`.
    */
-  getGroupingValue?: (row: TData) => any;
+  getGroupingValue?: (originalRow: TData, index: number, row: Row<TFeatures, TData>) => any;
 }
-interface Column_ColumnGrouping<TFeatures extends TableFeatures, TData extends RowData> {
-  /**
-   * Returns the aggregation function for the column.
-   */
-  getAggregationFn: () => AggregationFn<TFeatures, TData> | undefined;
-  /**
-   * Returns the automatically inferred aggregation function for the column.
-   */
-  getAutoAggregationFn: () => AggregationFn<TFeatures, TData> | undefined;
+interface Column_ColumnGrouping {
   /**
    * Checks whether this column can currently be grouped.
    */
@@ -89,10 +64,6 @@ interface Row_ColumnGrouping {
   groupingValue?: unknown;
 }
 interface Cell_ColumnGrouping {
-  /**
-   * Checks whether this cell should render an aggregated value.
-   */
-  getIsAggregated: () => boolean;
   /**
    * Checks whether this cell represents the active grouping column.
    */
@@ -127,7 +98,7 @@ interface TableOptions_ColumnGrouping {
   onGroupingChange?: OnChangeFn<GroupingState>;
 }
 type GroupingColumnMode = false | 'reorder' | 'remove';
-interface Table_ColumnGrouping<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_ColumnGrouping<in out _TFeatures extends TableFeatures, in out _TData extends RowData> {
   /**
    * Resets `grouping` to `initialState.grouping`.
    *
@@ -139,9 +110,9 @@ interface Table_ColumnGrouping<TFeatures extends TableFeatures, TData extends Ro
    */
   setGrouping: (updater: Updater<GroupingState>) => void;
 }
-interface Table_RowModels_Grouped<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_RowModels_Grouped<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
-   * Resolves the row model after grouping and aggregation have been applied.
+   * Resolves the row model after grouping has been applied.
    */
   getGroupedRowModel: () => RowModel<TFeatures, TData>;
   /**
@@ -149,17 +120,8 @@ interface Table_RowModels_Grouped<TFeatures extends TableFeatures, TData extends
    */
   getPreGroupedRowModel: () => RowModel<TFeatures, TData>;
 }
-interface CreateRowModel_Grouped<TFeatures extends TableFeatures, TData extends RowData> {
-  /**
-   * Factory used to retrieve the grouped row model. If using server-side
-   * grouping, this is not required. To use client-side grouping, pass
-   * `createGroupedRowModel()` or implement your own factory.
-   */
-  groupedRowModel?: (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
-}
-interface CachedRowModel_Grouped<TFeatures extends TableFeatures, TData extends RowData> {
+interface CachedRowModel_Grouped<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   groupedRowModel: () => RowModel<TFeatures, TData>;
 }
 //#endregion
-export { AggregationFn, AggregationFnOption, AggregationFns, CachedRowModel_Grouped, Cell_ColumnGrouping, ColumnDef_ColumnGrouping, ColumnDefaultOptions, Column_ColumnGrouping, CreateRowModel_Grouped, CustomAggregationFns, GroupingColumnMode, GroupingState, RowModelFns_ColumnGrouping, Row_ColumnGrouping, TableOptions_ColumnGrouping, TableState_ColumnGrouping, Table_ColumnGrouping, Table_RowModels_Grouped };
-//# sourceMappingURL=columnGroupingFeature.types.d.ts.map
+export { CachedRowModel_Grouped, Cell_ColumnGrouping, ColumnDef_ColumnGrouping, ColumnDefaultOptions, Column_ColumnGrouping, GroupingColumnMode, GroupingState, Row_ColumnGrouping, TableOptions_ColumnGrouping, TableState_ColumnGrouping, Table_ColumnGrouping, Table_RowModels_Grouped };

package/dist/features/column-grouping/columnGroupingFeature.utils.d.ts

@@ -1,11 +1,10 @@
 import { CellData, RowData, Updater } from "../../types/type-utils.js";
-import { Column_Internal } from "../../types/Column.js";
+import { GroupingState, Row_ColumnGrouping } from "./columnGroupingFeature.types.js";
+import { Column } from "../../types/Column.js";
 import { Row } from "../../types/Row.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table_Internal } from "../../types/Table.js";
-import { AggregationFn, GroupingState, Row_ColumnGrouping } from "./columnGroupingFeature.types.js";
+import { Table } from "../../types/Table.js";
 import { Cell } from "../../types/Cell.js";
-
+import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/features/column-grouping/columnGroupingFeature.utils.d.ts
 /**
  * Creates the default grouping state.
@@ -30,7 +29,7 @@ declare function getDefaultGroupingState(): GroupingState;
  * column_toggleGrouping(column)
  * ```
  */
-declare function column_toggleGrouping<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): void;
+declare function column_toggleGrouping<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>): void;
 /**
  * Checks whether this column can be used for grouping.
  *
@@ -42,7 +41,7 @@ declare function column_toggleGrouping<TFeatures extends TableFeatures, TData ex
  * const canGroup = column_getCanGroup(column)
  * ```
  */
-declare function column_getCanGroup<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): boolean;
+declare function column_getCanGroup<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>): boolean;
 /**
  * Checks whether this column id is present in `state.grouping`.
  *
@@ -54,7 +53,7 @@ declare function column_getCanGroup<TFeatures extends TableFeatures, TData exten
  * const isGrouped = column_getIsGrouped(column)
  * ```
  */
-declare function column_getIsGrouped<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): boolean;
+declare function column_getIsGrouped<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>): boolean;
 /**
  * Finds this column's position in the ordered grouping state.
  *
@@ -65,7 +64,7 @@ declare function column_getIsGrouped<TFeatures extends TableFeatures, TData exte
  * const index = column_getGroupedIndex(column)
  * ```
  */
-declare function column_getGroupedIndex<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): number;
+declare function column_getGroupedIndex<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>): number;
 /**
  * Creates a header/control handler that toggles grouping for this column.
  *
@@ -76,32 +75,7 @@ declare function column_getGroupedIndex<TFeatures extends TableFeatures, TData e
  * const onClick = column_getToggleGroupingHandler(column)
  * ```
  */
-declare function column_getToggleGroupingHandler<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): () => void;
-/**
- * Chooses a built-in aggregation function from the first core row value.
- *
- * Numeric columns default to `sum`, date-like values default to `extent`, and
- * other value types leave aggregation unspecified.
- *
- * @example
- * ```ts
- * const aggregationFn = column_getAutoAggregationFn(column)
- * ```
- */
-declare function column_getAutoAggregationFn<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): AggregationFn<TFeatures, TData> | undefined;
-/**
- * Resolves the aggregation function configured for a column.
- *
- * Function-valued `columnDef.aggregationFn` is returned directly, `'auto'`
- * delegates to `column_getAutoAggregationFn`, and string values are looked up in
- * the table's aggregation function registry.
- *
- * @example
- * ```ts
- * const aggregationFn = column_getAggregationFn(column)
- * ```
- */
-declare function column_getAggregationFn<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>): AggregationFn<TFeatures, TData> | undefined;
+declare function column_getToggleGroupingHandler<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>): () => void;
 /**
  * Routes a grouping updater through the table's grouping change handler.
  *
@@ -113,7 +87,7 @@ declare function column_getAggregationFn<TFeatures extends TableFeatures, TData
  * table_setGrouping(table, (old) => [...old, 'status'])
  * ```
  */
-declare function table_setGrouping<TFeatures extends TableFeatures, TData extends RowData>(table: Table_Internal<TFeatures, TData>, updater: Updater<GroupingState>): void;
+declare function table_setGrouping<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>, updater: Updater<GroupingState>): void;
 /**
  * Resets `grouping` to the configured initial state or feature default.
  *
@@ -126,7 +100,7 @@ declare function table_setGrouping<TFeatures extends TableFeatures, TData extend
  * table_resetGrouping(table, true)
  * ```
  */
-declare function table_resetGrouping<TFeatures extends TableFeatures, TData extends RowData>(table: Table_Internal<TFeatures, TData>, defaultState?: boolean): void;
+declare function table_resetGrouping<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>, defaultState?: boolean): void;
 /**
  * Checks whether this row was created as a grouped row.
  *
@@ -173,18 +147,5 @@ declare function cell_getIsGrouped<TFeatures extends TableFeatures, TData extend
  * ```
  */
 declare function cell_getIsPlaceholder<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(cell: Cell<TFeatures, TData, TValue>): boolean;
-/**
- * Checks whether this cell should render an aggregated value.
- *
- * Aggregated cells are non-placeholder, non-grouped cells on rows that have
- * subRows.
- *
- * @example
- * ```ts
- * const isAggregated = cell_getIsAggregated(cell)
- * ```
- */
-declare function cell_getIsAggregated<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(cell: Cell<TFeatures, TData, TValue>): boolean;
 //#endregion
-export { cell_getIsAggregated, cell_getIsGrouped, cell_getIsPlaceholder, column_getAggregationFn, column_getAutoAggregationFn, column_getCanGroup, column_getGroupedIndex, column_getIsGrouped, column_getToggleGroupingHandler, column_toggleGrouping, getDefaultGroupingState, row_getGroupingValue, row_getIsGrouped, table_resetGrouping, table_setGrouping };
-//# sourceMappingURL=columnGroupingFeature.utils.d.ts.map
+export { cell_getIsGrouped, cell_getIsPlaceholder, column_getCanGroup, column_getGroupedIndex, column_getIsGrouped, column_getToggleGroupingHandler, column_toggleGrouping, getDefaultGroupingState, row_getGroupingValue, row_getIsGrouped, table_resetGrouping, table_setGrouping };

package/dist/features/column-grouping/columnGroupingFeature.utils.js

@@ -1,4 +1,4 @@
-import { cloneState, isFunction } from "../../utils.js";
+import { cloneState, hasOwn } from "../../utils.js";
 
 //#region src/features/column-grouping/columnGroupingFeature.utils.ts
 /**
@@ -58,8 +58,7 @@ function column_getCanGroup(column) {
 * ```
 */
 function column_getIsGrouped(column) {
-	var _column$table$atoms$g;
-	return !!((_column$table$atoms$g = column.table.atoms.grouping) === null || _column$table$atoms$g === void 0 || (_column$table$atoms$g = _column$table$atoms$g.get()) === null || _column$table$atoms$g === void 0 ? void 0 : _column$table$atoms$g.includes(column.id));
+	return !!column.table.atoms.grouping?.get()?.includes(column.id);
 }
 /**
 * Finds this column's position in the ordered grouping state.
@@ -72,8 +71,7 @@ function column_getIsGrouped(column) {
 * ```
 */
 function column_getGroupedIndex(column) {
-	var _column$table$atoms$g2;
-	return ((_column$table$atoms$g2 = column.table.atoms.grouping) === null || _column$table$atoms$g2 === void 0 || (_column$table$atoms$g2 = _column$table$atoms$g2.get()) === null || _column$table$atoms$g2 === void 0 ? void 0 : _column$table$atoms$g2.indexOf(column.id)) ?? -1;
+	return column.table.atoms.grouping?.get()?.indexOf(column.id) ?? -1;
 }
 /**
 * Creates a header/control handler that toggles grouping for this column.
@@ -93,40 +91,6 @@ function column_getToggleGroupingHandler(column) {
 	};
 }
 /**
-* Chooses a built-in aggregation function from the first core row value.
-*
-* Numeric columns default to `sum`, date-like values default to `extent`, and
-* other value types leave aggregation unspecified.
-*
-* @example
-* ```ts
-* const aggregationFn = column_getAutoAggregationFn(column)
-* ```
-*/
-function column_getAutoAggregationFn(column) {
-	const aggregationFns = column.table._rowModelFns.aggregationFns;
-	const firstRow = column.table.getCoreRowModel().flatRows[0];
-	const value = firstRow === null || firstRow === void 0 ? void 0 : firstRow.getValue(column.id);
-	if (typeof value === "number") return aggregationFns === null || aggregationFns === void 0 ? void 0 : aggregationFns.sum;
-	if (Object.prototype.toString.call(value) === "[object Date]") return aggregationFns === null || aggregationFns === void 0 ? void 0 : aggregationFns.extent;
-}
-/**
-* Resolves the aggregation function configured for a column.
-*
-* Function-valued `columnDef.aggregationFn` is returned directly, `'auto'`
-* delegates to `column_getAutoAggregationFn`, and string values are looked up in
-* the table's aggregation function registry.
-*
-* @example
-* ```ts
-* const aggregationFn = column_getAggregationFn(column)
-* ```
-*/
-function column_getAggregationFn(column) {
-	const aggregationFns = column.table._rowModelFns.aggregationFns;
-	return isFunction(column.columnDef.aggregationFn) ? column.columnDef.aggregationFn : column.columnDef.aggregationFn === "auto" ? column_getAutoAggregationFn(column) : aggregationFns === null || aggregationFns === void 0 ? void 0 : aggregationFns[column.columnDef.aggregationFn];
-}
-/**
 * Routes a grouping updater through the table's grouping change handler.
 *
 * The updater may be a next `GroupingState` array or a function of the previous
@@ -138,8 +102,7 @@ function column_getAggregationFn(column) {
 * ```
 */
 function table_setGrouping(table, updater) {
-	var _table$options$onGrou, _table$options;
-	(_table$options$onGrou = (_table$options = table.options).onGroupingChange) === null || _table$options$onGrou === void 0 || _table$options$onGrou.call(_table$options, updater);
+	table.options.onGroupingChange?.(updater);
 }
 /**
 * Resets `grouping` to the configured initial state or feature default.
@@ -181,12 +144,11 @@ function row_getIsGrouped(row) {
 * ```
 */
 function row_getGroupingValue(row, columnId) {
-	var _row$_groupingValuesC, _row$_groupingValuesC2;
-	if ((_row$_groupingValuesC = row._groupingValuesCache) === null || _row$_groupingValuesC === void 0 ? void 0 : _row$_groupingValuesC.hasOwnProperty(columnId)) return row._groupingValuesCache[columnId];
+	if (row._groupingValuesCache && hasOwn(row._groupingValuesCache, columnId)) return row._groupingValuesCache[columnId];
 	const column = row.table.getColumn(columnId);
 	if (!column.columnDef.getGroupingValue) return row.getValue(columnId);
-	if (row._groupingValuesCache) row._groupingValuesCache[columnId] = column.columnDef.getGroupingValue(row.original);
-	return (_row$_groupingValuesC2 = row._groupingValuesCache) === null || _row$_groupingValuesC2 === void 0 ? void 0 : _row$_groupingValuesC2[columnId];
+	if (row._groupingValuesCache) row._groupingValuesCache[columnId] = column.columnDef.getGroupingValue(row.original, row.index, row);
+	return row._groupingValuesCache?.[columnId];
 }
 /**
 * Checks whether this cell represents the grouped column for a grouped row.
@@ -216,21 +178,6 @@ function cell_getIsGrouped(cell) {
 function cell_getIsPlaceholder(cell) {
 	return !cell_getIsGrouped(cell) && column_getIsGrouped(cell.column);
 }
-/**
-* Checks whether this cell should render an aggregated value.
-*
-* Aggregated cells are non-placeholder, non-grouped cells on rows that have
-* subRows.
-*
-* @example
-* ```ts
-* const isAggregated = cell_getIsAggregated(cell)
-* ```
-*/
-function cell_getIsAggregated(cell) {
-	return !cell_getIsGrouped(cell) && !cell_getIsPlaceholder(cell) && !!cell.row.subRows.length;
-}
 
 //#endregion
-export { cell_getIsAggregated, cell_getIsGrouped, cell_getIsPlaceholder, column_getAggregationFn, column_getAutoAggregationFn, column_getCanGroup, column_getGroupedIndex, column_getIsGrouped, column_getToggleGroupingHandler, column_toggleGrouping, getDefaultGroupingState, row_getGroupingValue, row_getIsGrouped, table_resetGrouping, table_setGrouping };
-//# sourceMappingURL=columnGroupingFeature.utils.js.map
+export { cell_getIsGrouped, cell_getIsPlaceholder, column_getCanGroup, column_getGroupedIndex, column_getIsGrouped, column_getToggleGroupingHandler, column_toggleGrouping, getDefaultGroupingState, row_getGroupingValue, row_getIsGrouped, table_resetGrouping, table_setGrouping };

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

@@ -1,16 +1,16 @@
 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 rowAggregationFeature 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
+export { createGroupedRowModel };

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

@@ -1,8 +1,8 @@
-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, normalizeUniqueAggregationRows } from "../row-aggregation/rowAggregationFeature.utils.js";
 import { table_autoResetExpanded } from "../row-expanding/rowExpandingFeature.utils.js";
 
 //#region src/features/column-grouping/createGroupedRowModel.ts
@@ -10,32 +10,45 @@ 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 rowAggregationFeature 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;
+		let hasAutoResetDependencies = false;
+		let previousGrouping;
+		let previousPreGroupedRowModel;
 		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);
-				table_autoResetPageIndex(table);
+				const grouping = table.atoms.grouping?.get();
+				const preGroupedRowModel = table.getPreGroupedRowModel();
+				const rowInputsChanged = !hasAutoResetDependencies || grouping !== previousGrouping || preGroupedRowModel !== previousPreGroupedRowModel;
+				previousGrouping = grouping;
+				previousPreGroupedRowModel = preGroupedRowModel;
+				hasAutoResetDependencies = true;
+				if (rowInputsChanged) {
+					table_autoResetExpanded(table);
+					table_autoResetPageIndex(table);
+				}
 			}
 		});
 	};
 }
 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,17 +57,22 @@ 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];
-		const rowGroupsMap = groupBy(rows, columnId);
+		const rowGroupsMap = groupBy(table, rows, columnId);
 		return Array.from(rowGroupsMap.entries()).map(([groupingValue, groupedRows], index) => {
 			let id = `${columnId}:${groupingValue}`;
 			id = parentId ? `${parentId}>${id}` : id;
@@ -62,7 +80,7 @@ function _createGroupedRowModel(table) {
 			subRows.forEach((subRow) => {
 				subRow.parentId = id;
 			});
-			const leafRows = depth ? flattenBy(groupedRows, (row) => row.subRows) : groupedRows;
+			const leafRows = normalizeUniqueAggregationRows(groupedRows, Infinity);
 			const row = constructRow(table, id, leafRows[0].original, index, depth, void 0, parentId);
 			Object.assign(row, {
 				groupingColumnId: columnId,
@@ -70,19 +88,25 @@ 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,
+						uniqueRows: true
+					});
+					return cache[colId];
 				}
 			});
 			subRows.forEach((subRow) => {
@@ -103,17 +127,24 @@ function _createGroupedRowModel(table) {
 		rowsById: groupedRowsById
 	};
 }
-function groupBy(rows, columnId) {
+function groupBy(table, rows, columnId) {
 	const groupMap = /* @__PURE__ */ new Map();
-	return rows.reduce((map, row) => {
-		const resKey = `${row_getGroupingValue(row, columnId)}`;
-		const previous = map.get(resKey);
-		if (!previous) map.set(resKey, [row]);
+	const getGroupingValue = table_getColumn(table, columnId)?.columnDef.getGroupingValue;
+	for (let i = 0; i < rows.length; i++) {
+		const row = rows[i];
+		let groupingValue;
+		if (getGroupingValue) {
+			const cache = row._groupingValuesCache;
+			if (cache && hasOwn(cache, columnId)) groupingValue = cache[columnId];
+			else if (cache) groupingValue = cache[columnId] = getGroupingValue(row.original, row.index, row);
+		} else groupingValue = row.getValue(columnId);
+		const resKey = `${groupingValue}`;
+		const previous = groupMap.get(resKey);
+		if (!previous) groupMap.set(resKey, [row]);
 		else previous.push(row);
-		return map;
-	}, groupMap);
+	}
+	return groupMap;
 }
 
 //#endregion
-export { createGroupedRowModel };
-//# sourceMappingURL=createGroupedRowModel.js.map
+export { createGroupedRowModel };

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

@@ -1,10 +1,8 @@
 import { TableFeature } from "../../types/TableFeatures.js";
-
 //#region src/features/column-ordering/columnOrderingFeature.d.ts
 /**
  * Feature that adds column ordering state and APIs for ordering leaf columns.
  */
 declare const columnOrderingFeature: TableFeature;
 //#endregion
-export { columnOrderingFeature };
-//# sourceMappingURL=columnOrderingFeature.d.ts.map
+export { columnOrderingFeature };

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,42 +17,37 @@ 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
+				]
 			}
 		});
 	}
 };
 
 //#endregion
-export { columnOrderingFeature };
-//# sourceMappingURL=columnOrderingFeature.js.map
+export { columnOrderingFeature };