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

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

@@ -1,10 +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 { Cell } from "../../types/Cell.js";
 import { Row } from "../../types/Row.js";
+import { Table } from "../../types/Table.js";
+import { Column } from "../../types/Column.js";
 import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table_Internal } from "../../types/Table.js";
-import { AggregationFn, GroupingState, Row_ColumnGrouping } from "./columnGroupingFeature.types.js";
-import { Cell } from "../../types/Cell.js";
 
 //#region src/features/column-grouping/columnGroupingFeature.utils.d.ts
 /**
@@ -30,7 +30,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 +42,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 +54,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 +65,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 +76,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 +88,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 +101,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 +148,6 @@ 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 };
+export { cell_getIsGrouped, cell_getIsPlaceholder, 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

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,7 @@ 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 };
+export { cell_getIsGrouped, cell_getIsPlaceholder, column_getCanGroup, column_getGroupedIndex, column_getIsGrouped, column_getToggleGroupingHandler, column_toggleGrouping, getDefaultGroupingState, row_getGroupingValue, row_getIsGrouped, table_resetGrouping, table_setGrouping };
 //# sourceMappingURL=columnGroupingFeature.utils.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"columnGroupingFeature.utils.js","names":[],"sources":["../../../src/features/column-grouping/columnGroupingFeature.utils.ts"],"sourcesContent":["import { cloneState, isFunction } from '../../utils'\nimport type { Column_Internal } from '../../types/Column'\nimport type { CellData, RowData, Updater } from '../../types/type-utils'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { Cell } from '../../types/Cell'\nimport type {\n  AggregationFn,\n  GroupingState,\n  Row_ColumnGrouping,\n} from './columnGroupingFeature.types'\n\n/**\n * Creates the default grouping state.\n *\n * The feature default is an empty array, meaning no columns are grouped. Reset\n * APIs use this value when `defaultState` is `true`.\n *\n * @example\n * ```ts\n * const grouping = getDefaultGroupingState()\n * ```\n */\nexport function getDefaultGroupingState(): GroupingState {\n  return []\n}\n\n/**\n * Adds or removes this column id from the grouping state.\n *\n * Existing grouped columns keep their order. A column already present in\n * `state.grouping` is removed; otherwise it is appended.\n *\n * @example\n * ```ts\n * column_toggleGrouping(column)\n * ```\n */\nexport function column_toggleGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  table_setGrouping(column.table, (old) => {\n    // Find any existing grouping for this column\n    if (old.includes(column.id)) {\n      return old.filter((d) => d !== column.id)\n    }\n\n    return [...old, column.id]\n  })\n}\n\n/**\n * Checks whether this column can be used for grouping.\n *\n * Grouping must be enabled at the column and table level, and the column must\n * either have an accessor or provide `getGroupingValue`.\n *\n * @example\n * ```ts\n * const canGroup = column_getCanGroup(column)\n * ```\n */\nexport function column_getCanGroup<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  return (\n    (column.columnDef.enableGrouping ?? true) &&\n    (column.table.options.enableGrouping ?? true) &&\n    (!!column.accessorFn || !!column.columnDef.getGroupingValue)\n  )\n}\n\n/**\n * Checks whether this column id is present in `state.grouping`.\n *\n * The result only reflects grouping state, not whether the grouped row model has\n * been calculated yet.\n *\n * @example\n * ```ts\n * const isGrouped = column_getIsGrouped(column)\n * ```\n */\nexport function column_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>): boolean {\n  return !!column.table.atoms.grouping?.get()?.includes(column.id)\n}\n\n/**\n * Finds this column's position in the ordered grouping state.\n *\n * The result is `-1` when the column is not grouped.\n *\n * @example\n * ```ts\n * const index = column_getGroupedIndex(column)\n * ```\n */\nexport function column_getGroupedIndex<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>): number {\n  return column.table.atoms.grouping?.get()?.indexOf(column.id) ?? -1\n}\n\n/**\n * Creates a header/control handler that toggles grouping for this column.\n *\n * The handler is a no-op when `column_getCanGroup(column)` is false.\n *\n * @example\n * ```ts\n * const onClick = column_getToggleGroupingHandler(column)\n * ```\n */\nexport function column_getToggleGroupingHandler<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  const canGroup = column_getCanGroup(column)\n\n  return () => {\n    if (!canGroup) return\n    column_toggleGrouping(column)\n  }\n}\n\n/**\n * Chooses a built-in aggregation function from the first core row value.\n *\n * Numeric columns default to `sum`, date-like values default to `extent`, and\n * other value types leave aggregation unspecified.\n *\n * @example\n * ```ts\n * const aggregationFn = column_getAutoAggregationFn(column)\n * ```\n */\nexport function column_getAutoAggregationFn<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  const aggregationFns:\n    | Record<string, AggregationFn<TFeatures, TData>>\n    | undefined = column.table._rowModelFns.aggregationFns\n\n  const firstRow = column.table.getCoreRowModel().flatRows[0]\n\n  const value = firstRow?.getValue(column.id)\n\n  if (typeof value === 'number') {\n    return aggregationFns?.sum\n  }\n\n  if (Object.prototype.toString.call(value) === '[object Date]') {\n    return aggregationFns?.extent\n  }\n}\n\n/**\n * Resolves the aggregation function configured for a column.\n *\n * Function-valued `columnDef.aggregationFn` is returned directly, `'auto'`\n * delegates to `column_getAutoAggregationFn`, and string values are looked up in\n * the table's aggregation function registry.\n *\n * @example\n * ```ts\n * const aggregationFn = column_getAggregationFn(column)\n * ```\n */\nexport function column_getAggregationFn<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  const aggregationFns:\n    | Record<string, AggregationFn<TFeatures, TData>>\n    | undefined = column.table._rowModelFns.aggregationFns\n\n  return isFunction(column.columnDef.aggregationFn)\n    ? column.columnDef.aggregationFn\n    : column.columnDef.aggregationFn === 'auto'\n      ? column_getAutoAggregationFn(column)\n      : aggregationFns?.[column.columnDef.aggregationFn as string]\n}\n\n/**\n * Routes a grouping updater through the table's grouping change handler.\n *\n * The updater may be a next `GroupingState` array or a function of the previous\n * grouping state, matching the instance `table.setGrouping` behavior.\n *\n * @example\n * ```ts\n * table_setGrouping(table, (old) => [...old, 'status'])\n * ```\n */\nexport function table_setGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(table: Table_Internal<TFeatures, TData>, updater: Updater<GroupingState>) {\n  table.options.onGroupingChange?.(updater)\n}\n\n/**\n * Resets `grouping` to the configured initial state or feature default.\n *\n * With no argument, the reset clones `table.initialState.grouping` when it\n * exists. Passing `true` ignores initial state and resets to `[]`.\n *\n * @example\n * ```ts\n * table_resetGrouping(table)\n * table_resetGrouping(table, true)\n * ```\n */\nexport function table_resetGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {\n  table_setGrouping(\n    table,\n    defaultState ? [] : cloneState(table.initialState.grouping ?? []),\n  )\n}\n\n/**\n * Checks whether this row was created as a grouped row.\n *\n * Grouped rows carry a `groupingColumnId`; ordinary leaf rows do not.\n *\n * @example\n * ```ts\n * const isGrouped = row_getIsGrouped(row)\n * ```\n */\nexport function row_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(row: Row<TFeatures, TData> & Partial<Row_ColumnGrouping>) {\n  return !!row.groupingColumnId\n}\n\n/**\n * Reads and caches this row's grouping value for a column.\n *\n * `columnDef.getGroupingValue` wins when provided; otherwise the normal row\n * accessor value is used.\n *\n * @example\n * ```ts\n * const groupValue = row_getGroupingValue(row, 'status')\n * ```\n */\nexport function row_getGroupingValue<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(row: Row<TFeatures, TData> & Partial<Row_ColumnGrouping>, columnId: string) {\n  if (row._groupingValuesCache?.hasOwnProperty(columnId)) {\n    return row._groupingValuesCache[columnId]\n  }\n\n  const column = row.table.getColumn(columnId) as Column_Internal<\n    TFeatures,\n    TData\n  >\n\n  if (!column.columnDef.getGroupingValue) {\n    return row.getValue(columnId)\n  }\n\n  if (row._groupingValuesCache) {\n    row._groupingValuesCache[columnId] = column.columnDef.getGroupingValue(\n      row.original,\n    )\n  }\n\n  return row._groupingValuesCache?.[columnId]\n}\n\n/**\n * Checks whether this cell represents the grouped column for a grouped row.\n *\n * This is the cell that usually renders the grouped value and expansion control.\n *\n * @example\n * ```ts\n * const isGroupedCell = cell_getIsGrouped(cell)\n * ```\n */\nexport function cell_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(cell: Cell<TFeatures, TData, TValue>) {\n  const row = cell.row as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n  return (\n    column_getIsGrouped(cell.column) && cell.column.id === row.groupingColumnId\n  )\n}\n\n/**\n * Checks whether this cell is a placeholder hidden by grouping.\n *\n * Placeholder cells belong to grouped columns other than the row's active\n * grouping column.\n *\n * @example\n * ```ts\n * const isPlaceholder = cell_getIsPlaceholder(cell)\n * ```\n */\nexport function cell_getIsPlaceholder<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(cell: Cell<TFeatures, TData, TValue>) {\n  return !cell_getIsGrouped(cell) && column_getIsGrouped(cell.column)\n}\n\n/**\n * Checks whether this cell should render an aggregated value.\n *\n * Aggregated cells are non-placeholder, non-grouped cells on rows that have\n * subRows.\n *\n * @example\n * ```ts\n * const isAggregated = cell_getIsAggregated(cell)\n * ```\n */\nexport function cell_getIsAggregated<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(cell: Cell<TFeatures, TData, TValue>) {\n  return (\n    !cell_getIsGrouped(cell) &&\n    !cell_getIsPlaceholder(cell) &&\n    !!cell.row.subRows.length\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;AAwBA,SAAgB,0BAAyC;CACvD,OAAO,CAAC;AACV;;;;;;;;;;;;AAaA,SAAgB,sBAId,QAAmD;CACnD,kBAAkB,OAAO,QAAQ,QAAQ;EAEvC,IAAI,IAAI,SAAS,OAAO,EAAE,GACxB,OAAO,IAAI,QAAQ,MAAM,MAAM,OAAO,EAAE;EAG1C,OAAO,CAAC,GAAG,KAAK,OAAO,EAAE;CAC3B,CAAC;AACH;;;;;;;;;;;;AAaA,SAAgB,mBAId,QAAmD;CACnD,QACG,OAAO,UAAU,kBAAkB,UACnC,OAAO,MAAM,QAAQ,kBAAkB,UACvC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,OAAO,UAAU;AAE/C;;;;;;;;;;;;AAaA,SAAgB,oBAId,QAA4D;;CAC5D,OAAO,CAAC,2BAAC,OAAO,MAAM,MAAM,yGAAU,IAAI,iFAAG,SAAS,OAAO,EAAE;AACjE;;;;;;;;;;;AAYA,SAAgB,uBAId,QAA2D;;CAC3D,kCAAO,OAAO,MAAM,MAAM,4GAAU,IAAI,mFAAG,QAAQ,OAAO,EAAE,MAAK;AACnE;;;;;;;;;;;AAYA,SAAgB,gCAId,QAAmD;CACnD,MAAM,WAAW,mBAAmB,MAAM;CAE1C,aAAa;EACX,IAAI,CAAC,UAAU;EACf,sBAAsB,MAAM;CAC9B;AACF;;;;;;;;;;;;AAaA,SAAgB,4BAId,QAAmD;CACnD,MAAM,iBAEU,OAAO,MAAM,aAAa;CAE1C,MAAM,WAAW,OAAO,MAAM,gBAAgB,CAAC,CAAC,SAAS;CAEzD,MAAM,4DAAQ,SAAU,SAAS,OAAO,EAAE;CAE1C,IAAI,OAAO,UAAU,UACnB,uEAAO,eAAgB;CAGzB,IAAI,OAAO,UAAU,SAAS,KAAK,KAAK,MAAM,iBAC5C,uEAAO,eAAgB;AAE3B;;;;;;;;;;;;;AAcA,SAAgB,wBAId,QAAmD;CACnD,MAAM,iBAEU,OAAO,MAAM,aAAa;CAE1C,OAAO,WAAW,OAAO,UAAU,aAAa,IAC5C,OAAO,UAAU,gBACjB,OAAO,UAAU,kBAAkB,SACjC,4BAA4B,MAAM,oEAClC,eAAiB,OAAO,UAAU;AAC1C;;;;;;;;;;;;AAaA,SAAgB,kBAGd,OAAyC,SAAiC;;CAC1E,iDAAM,SAAQ,6GAAmB,OAAO;AAC1C;;;;;;;;;;;;;AAcA,SAAgB,oBAGd,OAAyC,cAAwB;CACjE,kBACE,OACA,eAAe,CAAC,IAAI,WAAW,MAAM,aAAa,YAAY,CAAC,CAAC,CAClE;AACF;;;;;;;;;;;AAYA,SAAgB,iBAGd,KAA0D;CAC1D,OAAO,CAAC,CAAC,IAAI;AACf;;;;;;;;;;;;AAaA,SAAgB,qBAGd,KAA0D,UAAkB;;CAC5E,6BAAI,IAAI,oGAAsB,eAAe,QAAQ,GACnD,OAAO,IAAI,qBAAqB;CAGlC,MAAM,SAAS,IAAI,MAAM,UAAU,QAAQ;CAK3C,IAAI,CAAC,OAAO,UAAU,kBACpB,OAAO,IAAI,SAAS,QAAQ;CAG9B,IAAI,IAAI,sBACN,IAAI,qBAAqB,YAAY,OAAO,UAAU,iBACpD,IAAI,QACN;CAGF,iCAAO,IAAI,sGAAuB;AACpC;;;;;;;;;;;AAYA,SAAgB,kBAId,MAAsC;CACtC,MAAM,MAAM,KAAK;CACjB,OACE,oBAAoB,KAAK,MAAM,KAAK,KAAK,OAAO,OAAO,IAAI;AAE/D;;;;;;;;;;;;AAaA,SAAgB,sBAId,MAAsC;CACtC,OAAO,CAAC,kBAAkB,IAAI,KAAK,oBAAoB,KAAK,MAAM;AACpE;;;;;;;;;;;;AAaA,SAAgB,qBAId,MAAsC;CACtC,OACE,CAAC,kBAAkB,IAAI,KACvB,CAAC,sBAAsB,IAAI,KAC3B,CAAC,CAAC,KAAK,IAAI,QAAQ;AAEvB"}
+{"version":3,"file":"columnGroupingFeature.utils.js","names":[],"sources":["../../../src/features/column-grouping/columnGroupingFeature.utils.ts"],"sourcesContent":["import { cloneState, hasOwn } from '../../utils'\nimport type { Column_Internal } from '../../types/Column'\nimport type { CellData, RowData, Updater } from '../../types/type-utils'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { Table_Internal } from '../../types/Table'\nimport type { Row } from '../../types/Row'\nimport type { Cell } from '../../types/Cell'\nimport type {\n  GroupingState,\n  Row_ColumnGrouping,\n} from './columnGroupingFeature.types'\n\n/**\n * Creates the default grouping state.\n *\n * The feature default is an empty array, meaning no columns are grouped. Reset\n * APIs use this value when `defaultState` is `true`.\n *\n * @example\n * ```ts\n * const grouping = getDefaultGroupingState()\n * ```\n */\nexport function getDefaultGroupingState(): GroupingState {\n  return []\n}\n\n/**\n * Adds or removes this column id from the grouping state.\n *\n * Existing grouped columns keep their order. A column already present in\n * `state.grouping` is removed; otherwise it is appended.\n *\n * @example\n * ```ts\n * column_toggleGrouping(column)\n * ```\n */\nexport function column_toggleGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  table_setGrouping(column.table, (old) => {\n    // Find any existing grouping for this column\n    if (old.includes(column.id)) {\n      return old.filter((d) => d !== column.id)\n    }\n\n    return [...old, column.id]\n  })\n}\n\n/**\n * Checks whether this column can be used for grouping.\n *\n * Grouping must be enabled at the column and table level, and the column must\n * either have an accessor or provide `getGroupingValue`.\n *\n * @example\n * ```ts\n * const canGroup = column_getCanGroup(column)\n * ```\n */\nexport function column_getCanGroup<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  return (\n    (column.columnDef.enableGrouping ?? true) &&\n    (column.table.options.enableGrouping ?? true) &&\n    (!!column.accessorFn || !!column.columnDef.getGroupingValue)\n  )\n}\n\n/**\n * Checks whether this column id is present in `state.grouping`.\n *\n * The result only reflects grouping state, not whether the grouped row model has\n * been calculated yet.\n *\n * @example\n * ```ts\n * const isGrouped = column_getIsGrouped(column)\n * ```\n */\nexport function column_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>): boolean {\n  return !!column.table.atoms.grouping?.get()?.includes(column.id)\n}\n\n/**\n * Finds this column's position in the ordered grouping state.\n *\n * The result is `-1` when the column is not grouped.\n *\n * @example\n * ```ts\n * const index = column_getGroupedIndex(column)\n * ```\n */\nexport function column_getGroupedIndex<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>): number {\n  return column.table.atoms.grouping?.get()?.indexOf(column.id) ?? -1\n}\n\n/**\n * Creates a header/control handler that toggles grouping for this column.\n *\n * The handler is a no-op when `column_getCanGroup(column)` is false.\n *\n * @example\n * ```ts\n * const onClick = column_getToggleGroupingHandler(column)\n * ```\n */\nexport function column_getToggleGroupingHandler<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(column: Column_Internal<TFeatures, TData, TValue>) {\n  const canGroup = column_getCanGroup(column)\n\n  return () => {\n    if (!canGroup) return\n    column_toggleGrouping(column)\n  }\n}\n\n/**\n * Routes a grouping updater through the table's grouping change handler.\n *\n * The updater may be a next `GroupingState` array or a function of the previous\n * grouping state, matching the instance `table.setGrouping` behavior.\n *\n * @example\n * ```ts\n * table_setGrouping(table, (old) => [...old, 'status'])\n * ```\n */\nexport function table_setGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(table: Table_Internal<TFeatures, TData>, updater: Updater<GroupingState>) {\n  table.options.onGroupingChange?.(updater)\n}\n\n/**\n * Resets `grouping` to the configured initial state or feature default.\n *\n * With no argument, the reset clones `table.initialState.grouping` when it\n * exists. Passing `true` ignores initial state and resets to `[]`.\n *\n * @example\n * ```ts\n * table_resetGrouping(table)\n * table_resetGrouping(table, true)\n * ```\n */\nexport function table_resetGrouping<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(table: Table_Internal<TFeatures, TData>, defaultState?: boolean) {\n  table_setGrouping(\n    table,\n    defaultState ? [] : cloneState(table.initialState.grouping ?? []),\n  )\n}\n\n/**\n * Checks whether this row was created as a grouped row.\n *\n * Grouped rows carry a `groupingColumnId`; ordinary leaf rows do not.\n *\n * @example\n * ```ts\n * const isGrouped = row_getIsGrouped(row)\n * ```\n */\nexport function row_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(row: Row<TFeatures, TData> & Partial<Row_ColumnGrouping>) {\n  return !!row.groupingColumnId\n}\n\n/**\n * Reads and caches this row's grouping value for a column.\n *\n * `columnDef.getGroupingValue` wins when provided; otherwise the normal row\n * accessor value is used.\n *\n * @example\n * ```ts\n * const groupValue = row_getGroupingValue(row, 'status')\n * ```\n */\nexport function row_getGroupingValue<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(row: Row<TFeatures, TData> & Partial<Row_ColumnGrouping>, columnId: string) {\n  if (row._groupingValuesCache && hasOwn(row._groupingValuesCache, columnId)) {\n    return row._groupingValuesCache[columnId]\n  }\n\n  const column = row.table.getColumn(columnId) as Column_Internal<\n    TFeatures,\n    TData\n  >\n\n  if (!column.columnDef.getGroupingValue) {\n    return row.getValue(columnId)\n  }\n\n  if (row._groupingValuesCache) {\n    row._groupingValuesCache[columnId] = column.columnDef.getGroupingValue(\n      row.original,\n      row.index,\n      row,\n    )\n  }\n\n  return row._groupingValuesCache?.[columnId]\n}\n\n/**\n * Checks whether this cell represents the grouped column for a grouped row.\n *\n * This is the cell that usually renders the grouped value and expansion control.\n *\n * @example\n * ```ts\n * const isGroupedCell = cell_getIsGrouped(cell)\n * ```\n */\nexport function cell_getIsGrouped<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(cell: Cell<TFeatures, TData, TValue>) {\n  const row = cell.row as Row<TFeatures, TData> & Partial<Row_ColumnGrouping>\n  return (\n    column_getIsGrouped(cell.column) && cell.column.id === row.groupingColumnId\n  )\n}\n\n/**\n * Checks whether this cell is a placeholder hidden by grouping.\n *\n * Placeholder cells belong to grouped columns other than the row's active\n * grouping column.\n *\n * @example\n * ```ts\n * const isPlaceholder = cell_getIsPlaceholder(cell)\n * ```\n */\nexport function cell_getIsPlaceholder<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n  TValue extends CellData = CellData,\n>(cell: Cell<TFeatures, TData, TValue>) {\n  return !cell_getIsGrouped(cell) && column_getIsGrouped(cell.column)\n}\n"],"mappings":";;;;;;;;;;;;;;AAuBA,SAAgB,0BAAyC;CACvD,OAAO,CAAC;AACV;;;;;;;;;;;;AAaA,SAAgB,sBAId,QAAmD;CACnD,kBAAkB,OAAO,QAAQ,QAAQ;EAEvC,IAAI,IAAI,SAAS,OAAO,EAAE,GACxB,OAAO,IAAI,QAAQ,MAAM,MAAM,OAAO,EAAE;EAG1C,OAAO,CAAC,GAAG,KAAK,OAAO,EAAE;CAC3B,CAAC;AACH;;;;;;;;;;;;AAaA,SAAgB,mBAId,QAAmD;CACnD,QACG,OAAO,UAAU,kBAAkB,UACnC,OAAO,MAAM,QAAQ,kBAAkB,UACvC,CAAC,CAAC,OAAO,cAAc,CAAC,CAAC,OAAO,UAAU;AAE/C;;;;;;;;;;;;AAaA,SAAgB,oBAId,QAA4D;CAC5D,OAAO,CAAC,CAAC,OAAO,MAAM,MAAM,UAAU,IAAI,CAAC,EAAE,SAAS,OAAO,EAAE;AACjE;;;;;;;;;;;AAYA,SAAgB,uBAId,QAA2D;CAC3D,OAAO,OAAO,MAAM,MAAM,UAAU,IAAI,CAAC,EAAE,QAAQ,OAAO,EAAE,KAAK;AACnE;;;;;;;;;;;AAYA,SAAgB,gCAId,QAAmD;CACnD,MAAM,WAAW,mBAAmB,MAAM;CAE1C,aAAa;EACX,IAAI,CAAC,UAAU;EACf,sBAAsB,MAAM;CAC9B;AACF;;;;;;;;;;;;AAaA,SAAgB,kBAGd,OAAyC,SAAiC;CAC1E,MAAM,QAAQ,mBAAmB,OAAO;AAC1C;;;;;;;;;;;;;AAcA,SAAgB,oBAGd,OAAyC,cAAwB;CACjE,kBACE,OACA,eAAe,CAAC,IAAI,WAAW,MAAM,aAAa,YAAY,CAAC,CAAC,CAClE;AACF;;;;;;;;;;;AAYA,SAAgB,iBAGd,KAA0D;CAC1D,OAAO,CAAC,CAAC,IAAI;AACf;;;;;;;;;;;;AAaA,SAAgB,qBAGd,KAA0D,UAAkB;CAC5E,IAAI,IAAI,wBAAwB,OAAO,IAAI,sBAAsB,QAAQ,GACvE,OAAO,IAAI,qBAAqB;CAGlC,MAAM,SAAS,IAAI,MAAM,UAAU,QAAQ;CAK3C,IAAI,CAAC,OAAO,UAAU,kBACpB,OAAO,IAAI,SAAS,QAAQ;CAG9B,IAAI,IAAI,sBACN,IAAI,qBAAqB,YAAY,OAAO,UAAU,iBACpD,IAAI,UACJ,IAAI,OACJ,GACF;CAGF,OAAO,IAAI,uBAAuB;AACpC;;;;;;;;;;;AAYA,SAAgB,kBAId,MAAsC;CACtC,MAAM,MAAM,KAAK;CACjB,OACE,oBAAoB,KAAK,MAAM,KAAK,KAAK,OAAO,OAAO,IAAI;AAE/D;;;;;;;;;;;;AAaA,SAAgB,sBAId,MAAsC;CACtC,OAAO,CAAC,kBAAkB,IAAI,KAAK,oBAAoB,KAAK,MAAM;AACpE"}

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

@@ -2,6 +2,7 @@ const require_utils = require('../../utils.cjs');
 const require_coreColumnsFeature_utils = require('../../core/columns/coreColumnsFeature.utils.cjs');
 const require_constructRow = require('../../core/rows/constructRow.cjs');
 const require_rowPaginationFeature_utils = require('../row-pagination/rowPaginationFeature.utils.cjs');
+const require_rowAggregationFeature_utils = require('../row-aggregation/rowAggregationFeature.utils.cjs');
 const require_columnGroupingFeature_utils = require('./columnGroupingFeature.utils.cjs');
 const require_rowExpandingFeature_utils = require('../row-expanding/rowExpandingFeature.utils.cjs');
 
@@ -10,19 +11,22 @@ const require_rowExpandingFeature_utils = require('../row-expanding/rowExpanding
 * 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;
 		return require_utils.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: () => {
 				require_rowExpandingFeature_utils.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) => require_coreColumnsFeature_utils.table_getColumn(table, columnId));
 	const groupedFlatRows = [];
-	const groupedRowsById = {};
+	const groupedRowsById = require_utils.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 ? require_utils.flattenBy(groupedRows, (row) => row.subRows) : groupedRows;
+			const leafRows = require_rowAggregationFeature_utils.normalizeAggregationRows(groupedRows, Infinity);
 			const row = require_constructRow.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 (require_utils.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 = require_columnGroupingFeature_utils.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 && require_utils.hasOwn(aggregationCache, colId)) return aggregationCache[colId];
+					const column = table.getColumn(colId);
+					if (typeof column.getAggregationFns !== "function") return void 0;
+					const cache = row._aggregationValuesCache ??= require_utils.makeObjectMap();
+					cache[colId] = require_rowAggregationFeature_utils.aggregateColumnValue({
+						subRows,
+						column,
+						groupingRow: row,
+						rows: groupedRows
+					});
+					return cache[colId];
 				}
 			});
 			subRows.forEach((subRow) => {

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":"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"}
+{"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 '../row-aggregation/rowAggregationFeature.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 rowAggregationFeature 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 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.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 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

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 "../row-aggregation/rowAggregationFeature.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 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;
 		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) => {