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

package/dist/features/row-sorting/createSortedRowModel.cjs

@@ -7,84 +7,103 @@ const require_rowSortingFeature_utils = require('./rowSortingFeature.utils.cjs')
 * Creates a memoized sorted 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.
+*
+* Register the sorting functions you use with the `sortFns` slot on the
+* `features` option:
+* `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.
+* Importing individual `sortFn_*` functions keeps unused built-ins out of
+* your bundle; sorting functions passed directly to the `sortFn` column
+* option need no registration at all.
 */
-function createSortedRowModel(sortFns) {
+function createSortedRowModel() {
 	return (_table) => {
 		const table = _table;
-		if (!table._rowModelFns.sortFns) table._rowModelFns.sortFns = sortFns;
 		return require_utils.tableMemo({
 			feature: "rowSortingFeature",
 			table,
 			fnName: "table.getSortedRowModel",
-			memoDeps: () => {
-				var _table$atoms$sorting;
-				return [(_table$atoms$sorting = table.atoms.sorting) === null || _table$atoms$sorting === void 0 ? void 0 : _table$atoms$sorting.get(), table.getPreSortedRowModel()];
-			},
+			memoDeps: () => [table.atoms.sorting?.get(), table.getPreSortedRowModel()],
 			fn: () => _createSortedRowModel(table),
 			onAfterUpdate: () => require_rowPaginationFeature_utils.table_autoResetPageIndex(table)
 		});
 	};
 }
 function _createSortedRowModel(table) {
-	var _table$atoms$sorting2;
 	const preSortedRowModel = table.getPreSortedRowModel();
-	const sorting = (_table$atoms$sorting2 = table.atoms.sorting) === null || _table$atoms$sorting2 === void 0 ? void 0 : _table$atoms$sorting2.get();
-	if (!preSortedRowModel.rows.length || !(sorting === null || sorting === void 0 ? void 0 : sorting.length)) return preSortedRowModel;
+	const sorting = table.atoms.sorting?.get();
+	if (!preSortedRowModel.rows.length || !sorting?.length) return preSortedRowModel;
 	const sortedFlatRows = [];
-	const availableSorting = sorting.filter((sort) => require_rowSortingFeature_utils.column_getCanSort(table.getColumn(sort.id)));
-	const columnInfoById = {};
-	availableSorting.forEach((sortEntry) => {
+	const availableSorting = sorting.filter((sort) => {
+		const column = table.getColumn(sort.id);
+		return column ? require_rowSortingFeature_utils.column_getCanSort(column) : false;
+	});
+	if (!availableSorting.length) return preSortedRowModel;
+	const resolvedSorting = [];
+	for (let i = 0; i < availableSorting.length; i++) {
+		const sortEntry = availableSorting[i];
 		const column = table.getColumn(sortEntry.id);
-		if (!column) return;
-		columnInfoById[sortEntry.id] = {
+		if (!column) continue;
+		resolvedSorting.push({
+			id: sortEntry.id,
+			desc: sortEntry.desc,
 			sortUndefined: column.columnDef.sortUndefined,
 			invertSorting: column.columnDef.invertSorting,
 			sortFn: require_rowSortingFeature_utils.column_getSortFn(column)
-		};
-	});
-	const sortData = (rows) => {
-		const sortedData = rows.slice();
-		sortedData.sort((rowA, rowB) => {
-			for (let i = 0; i < availableSorting.length; i++) {
-				const sortEntry = availableSorting[i];
-				const columnInfo = columnInfoById[sortEntry.id];
-				const sortUndefined = columnInfo.sortUndefined;
-				const isDesc = sortEntry.desc;
-				let sortInt = 0;
-				if (sortUndefined) {
-					const aValue = rowA.getValue(sortEntry.id);
-					const bValue = rowB.getValue(sortEntry.id);
-					const aUndefined = aValue === void 0;
-					const bUndefined = bValue === void 0;
-					if (aUndefined || bUndefined) {
-						if (sortUndefined === "first") return aUndefined ? -1 : 1;
-						if (sortUndefined === "last") return aUndefined ? 1 : -1;
-						sortInt = aUndefined && bUndefined ? 0 : aUndefined ? sortUndefined : -sortUndefined;
-					}
-				}
-				if (sortInt === 0) sortInt = columnInfo.sortFn(rowA, rowB, sortEntry.id);
-				if (sortInt !== 0) {
-					if (isDesc) sortInt *= -1;
-					if (columnInfo.invertSorting) sortInt *= -1;
-					return sortInt;
+		});
+	}
+	const compareRows = (rowA, rowB) => {
+		for (let i = 0; i < resolvedSorting.length; i++) {
+			const sortEntry = resolvedSorting[i];
+			const sortUndefined = sortEntry.sortUndefined;
+			const isDesc = sortEntry.desc;
+			let sortInt = 0;
+			if (sortUndefined) {
+				const aValue = rowA.getValue(sortEntry.id);
+				const bValue = rowB.getValue(sortEntry.id);
+				const aUndefined = aValue === void 0;
+				const bUndefined = bValue === void 0;
+				if (aUndefined && bUndefined) continue;
+				if (aUndefined || bUndefined) {
+					if (sortUndefined === "first") return aUndefined ? -1 : 1;
+					if (sortUndefined === "last") return aUndefined ? 1 : -1;
+					sortInt = aUndefined ? sortUndefined : -sortUndefined;
 				}
 			}
-			return rowA.index - rowB.index;
-		});
+			if (sortInt === 0) sortInt = sortEntry.sortFn(rowA, rowB, sortEntry.id);
+			if (sortInt !== 0) {
+				if (isDesc) sortInt *= -1;
+				if (sortEntry.invertSorting) sortInt *= -1;
+				return sortInt;
+			}
+		}
+		return rowA.index - rowB.index;
+	};
+	const sortData = (rows) => {
+		const sortedData = rows.slice();
+		sortedData.sort(compareRows);
+		let changed = false;
 		for (let i = 0; i < sortedData.length; i++) {
 			const row = sortedData[i];
+			if (row !== rows[i]) changed = true;
 			if (row.subRows.length) {
-				const cloned = Object.create(Object.getPrototypeOf(row));
-				Object.assign(cloned, row);
-				cloned.subRows = sortData(row.subRows);
-				sortedData[i] = cloned;
-				sortedFlatRows.push(cloned);
+				const sortedSubRows = sortData(row.subRows);
+				if (sortedSubRows.changed) {
+					const cloned = Object.create(Object.getPrototypeOf(row));
+					require_utils.copyInstancePropertiesWithoutMemos(cloned, row);
+					cloned.subRows = sortedSubRows.rows;
+					sortedData[i] = cloned;
+					sortedFlatRows.push(cloned);
+					changed = true;
+				} else sortedFlatRows.push(row);
 			} else sortedFlatRows.push(row);
 		}
-		return sortedData;
+		return {
+			rows: sortedData,
+			changed
+		};
 	};
 	return {
-		rows: sortData(preSortedRowModel.rows),
+		rows: sortData(preSortedRowModel.rows).rows,
 		flatRows: sortedFlatRows,
 		rowsById: preSortedRowModel.rowsById
 	};

package/dist/features/row-sorting/createSortedRowModel.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createSortedRowModel.cjs","names":["tableMemo","table_autoResetPageIndex","column_getCanSort","column_getSortFn"],"sources":["../../../src/features/row-sorting/createSortedRowModel.ts"],"sourcesContent":["import { tableMemo } from '../../utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport { column_getCanSort, column_getSortFn } from './rowSortingFeature.utils'\nimport type { Column_Internal } from '../../types/Column'\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 { SortFn, SortFns } from './rowSortingFeature.types'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized sorted 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 createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(\n  sortFns: Record<keyof SortFns, SortFn<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.sortFns) table._rowModelFns.sortFns = sortFns\n    return tableMemo({\n      feature: 'rowSortingFeature',\n      table,\n      fnName: 'table.getSortedRowModel',\n      memoDeps: () => [\n        table.atoms.sorting?.get(),\n        table.getPreSortedRowModel(),\n      ],\n      fn: () => _createSortedRowModel(table),\n      onAfterUpdate: () => table_autoResetPageIndex(table),\n    })\n  }\n}\n\nfunction _createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const preSortedRowModel = table.getPreSortedRowModel()\n  const sorting = table.atoms.sorting?.get()\n\n  if (!preSortedRowModel.rows.length || !sorting?.length) {\n    return preSortedRowModel\n  }\n\n  const sortedFlatRows: Array<Row<TFeatures, TData>> = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sorting.filter((sort) =>\n    column_getCanSort(\n      table.getColumn(sort.id) as Column_Internal<TFeatures, TData>,\n    ),\n  )\n\n  const columnInfoById: Record<\n    string,\n    {\n      sortUndefined?: false | -1 | 1 | 'first' | 'last'\n      invertSorting?: boolean\n      sortFn: SortFn<TFeatures, TData>\n    }\n  > = {}\n\n  availableSorting.forEach((sortEntry) => {\n    const column: Column_Internal<TFeatures, TData> | undefined =\n      table.getColumn(sortEntry.id)\n    if (!column) return\n\n    columnInfoById[sortEntry.id] = {\n      sortUndefined: column.columnDef.sortUndefined,\n      invertSorting: column.columnDef.invertSorting,\n      sortFn: column_getSortFn(column),\n    }\n  })\n\n  const sortData = (rows: Array<Row<TFeatures, TData>>) => {\n    const sortedData = rows.slice()\n\n    sortedData.sort((rowA, rowB) => {\n      for (let i = 0; i < availableSorting.length; i++) {\n        const sortEntry = availableSorting[i]!\n        const columnInfo = columnInfoById[sortEntry.id]!\n        const sortUndefined = columnInfo.sortUndefined\n        const isDesc = sortEntry.desc\n\n        let sortInt = 0\n\n        // All sorting ints should always return in ascending order\n        if (sortUndefined) {\n          const aValue = rowA.getValue(sortEntry.id)\n          const bValue = rowB.getValue(sortEntry.id)\n\n          const aUndefined = aValue === undefined\n          const bUndefined = bValue === undefined\n\n          if (aUndefined || bUndefined) {\n            if (sortUndefined === 'first') return aUndefined ? -1 : 1\n            if (sortUndefined === 'last') return aUndefined ? 1 : -1\n            sortInt =\n              aUndefined && bUndefined\n                ? 0\n                : aUndefined\n                  ? sortUndefined\n                  : -sortUndefined\n          }\n        }\n\n        if (sortInt === 0) {\n          sortInt = columnInfo.sortFn(rowA, rowB, sortEntry.id)\n        }\n\n        // If sorting is non-zero, take care of desc and inversion\n        if (sortInt !== 0) {\n          if (isDesc) {\n            sortInt *= -1\n          }\n\n          if (columnInfo.invertSorting) {\n            sortInt *= -1\n          }\n\n          return sortInt\n        }\n      }\n      return rowA.index - rowB.index\n    })\n\n    // If there are sub-rows, sort them. Clone only rows that need mutation\n    // (i.e. have subRows) so we don't corrupt the source row model.\n    for (let i = 0; i < sortedData.length; i++) {\n      const row = sortedData[i]!\n      if (row.subRows.length) {\n        // Preserve prototype chain so methods like getValue() remain accessible\n        const cloned = Object.create(Object.getPrototypeOf(row))\n        Object.assign(cloned, row)\n        cloned.subRows = sortData(row.subRows)\n        sortedData[i] = cloned\n        sortedFlatRows.push(cloned)\n      } else {\n        sortedFlatRows.push(row)\n      }\n    }\n\n    return sortedData\n  }\n\n  return {\n    rows: sortData(preSortedRowModel.rows),\n    flatRows: sortedFlatRows,\n    rowsById: preSortedRowModel.rowsById,\n  }\n}\n"],"mappings":";;;;;;;;;;AAgBA,SAAgB,qBAId,SACsE;CACtE,QAAQ,WAAW;EACjB,MAAM,QAAQ;EACd,IAAI,CAAC,MAAM,aAAa,SAAS,MAAM,aAAa,UAAU;EAC9D,OAAOA,wBAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;;oCACd,MAAM,MAAM,qFAAS,IAAI,GACzB,MAAM,qBAAqB,CAC7B;;GACA,UAAU,sBAAsB,KAAK;GACrC,qBAAqBC,4DAAyB,KAAK;EACrD,CAAC;CACH;AACF;AAEA,SAAS,sBAGP,OAAqE;;CACrE,MAAM,oBAAoB,MAAM,qBAAqB;CACrD,MAAM,mCAAU,MAAM,MAAM,uFAAS,IAAI;CAEzC,IAAI,CAAC,kBAAkB,KAAK,UAAU,oDAAC,QAAS,SAC9C,OAAO;CAGT,MAAM,iBAA+C,CAAC;CAGtD,MAAM,mBAAmB,QAAQ,QAAQ,SACvCC,kDACE,MAAM,UAAU,KAAK,EAAE,CACzB,CACF;CAEA,MAAM,iBAOF,CAAC;CAEL,iBAAiB,SAAS,cAAc;EACtC,MAAM,SACJ,MAAM,UAAU,UAAU,EAAE;EAC9B,IAAI,CAAC,QAAQ;EAEb,eAAe,UAAU,MAAM;GAC7B,eAAe,OAAO,UAAU;GAChC,eAAe,OAAO,UAAU;GAChC,QAAQC,iDAAiB,MAAM;EACjC;CACF,CAAC;CAED,MAAM,YAAY,SAAuC;EACvD,MAAM,aAAa,KAAK,MAAM;EAE9B,WAAW,MAAM,MAAM,SAAS;GAC9B,KAAK,IAAI,IAAI,GAAG,IAAI,iBAAiB,QAAQ,KAAK;IAChD,MAAM,YAAY,iBAAiB;IACnC,MAAM,aAAa,eAAe,UAAU;IAC5C,MAAM,gBAAgB,WAAW;IACjC,MAAM,SAAS,UAAU;IAEzB,IAAI,UAAU;IAGd,IAAI,eAAe;KACjB,MAAM,SAAS,KAAK,SAAS,UAAU,EAAE;KACzC,MAAM,SAAS,KAAK,SAAS,UAAU,EAAE;KAEzC,MAAM,aAAa,WAAW;KAC9B,MAAM,aAAa,WAAW;KAE9B,IAAI,cAAc,YAAY;MAC5B,IAAI,kBAAkB,SAAS,OAAO,aAAa,KAAK;MACxD,IAAI,kBAAkB,QAAQ,OAAO,aAAa,IAAI;MACtD,UACE,cAAc,aACV,IACA,aACE,gBACA,CAAC;KACX;IACF;IAEA,IAAI,YAAY,GACd,UAAU,WAAW,OAAO,MAAM,MAAM,UAAU,EAAE;IAItD,IAAI,YAAY,GAAG;KACjB,IAAI,QACF,WAAW;KAGb,IAAI,WAAW,eACb,WAAW;KAGb,OAAO;IACT;GACF;GACA,OAAO,KAAK,QAAQ,KAAK;EAC3B,CAAC;EAID,KAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;GAC1C,MAAM,MAAM,WAAW;GACvB,IAAI,IAAI,QAAQ,QAAQ;IAEtB,MAAM,SAAS,OAAO,OAAO,OAAO,eAAe,GAAG,CAAC;IACvD,OAAO,OAAO,QAAQ,GAAG;IACzB,OAAO,UAAU,SAAS,IAAI,OAAO;IACrC,WAAW,KAAK;IAChB,eAAe,KAAK,MAAM;GAC5B,OACE,eAAe,KAAK,GAAG;EAE3B;EAEA,OAAO;CACT;CAEA,OAAO;EACL,MAAM,SAAS,kBAAkB,IAAI;EACrC,UAAU;EACV,UAAU,kBAAkB;CAC9B;AACF"}
+{"version":3,"file":"createSortedRowModel.cjs","names":["tableMemo","table_autoResetPageIndex","column_getCanSort","column_getSortFn"],"sources":["../../../src/features/row-sorting/createSortedRowModel.ts"],"sourcesContent":["import { copyInstancePropertiesWithoutMemos, tableMemo } from '../../utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport { column_getCanSort, column_getSortFn } from './rowSortingFeature.utils'\nimport type { Column_Internal } from '../../types/Column'\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 { SortFn } from './rowSortingFeature.types'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized sorted 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 * Register the sorting functions you use with the `sortFns` slot on the\n * `features` option:\n * `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.\n * Importing individual `sortFn_*` functions keeps unused built-ins out of\n * your bundle; sorting functions passed directly to the `sortFn` column\n * option need no registration at all.\n */\nexport function createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\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: 'rowSortingFeature',\n      table,\n      fnName: 'table.getSortedRowModel',\n      memoDeps: () => [\n        table.atoms.sorting?.get(),\n        table.getPreSortedRowModel(),\n      ],\n      fn: () => _createSortedRowModel(table),\n      onAfterUpdate: () => table_autoResetPageIndex(table),\n    })\n  }\n}\n\nfunction _createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const preSortedRowModel = table.getPreSortedRowModel()\n  const sorting = table.atoms.sorting?.get()\n\n  if (!preSortedRowModel.rows.length || !sorting?.length) {\n    return preSortedRowModel\n  }\n\n  const sortedFlatRows: Array<Row<TFeatures, TData>> = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sorting.filter((sort) => {\n    const column = table.getColumn(sort.id)\n    return column ? column_getCanSort(column) : false\n  })\n\n  if (!availableSorting.length) {\n    return preSortedRowModel\n  }\n\n  const resolvedSorting: Array<{\n    id: string\n    desc?: boolean\n    sortUndefined?: false | -1 | 1 | 'first' | 'last'\n    invertSorting?: boolean\n    sortFn: SortFn<TFeatures, TData>\n  }> = []\n\n  for (let i = 0; i < availableSorting.length; i++) {\n    const sortEntry = availableSorting[i]!\n    const column: Column_Internal<TFeatures, TData> | undefined =\n      table.getColumn(sortEntry.id)\n    if (!column) {\n      continue\n    }\n\n    resolvedSorting.push({\n      id: sortEntry.id,\n      desc: sortEntry.desc,\n      sortUndefined: column.columnDef.sortUndefined,\n      invertSorting: column.columnDef.invertSorting,\n      sortFn: column_getSortFn(column),\n    })\n  }\n\n  const compareRows = (\n    rowA: Row<TFeatures, TData>,\n    rowB: Row<TFeatures, TData>,\n  ) => {\n    for (let i = 0; i < resolvedSorting.length; i++) {\n      const sortEntry = resolvedSorting[i]!\n      const sortUndefined = sortEntry.sortUndefined\n      const isDesc = sortEntry.desc\n\n      let sortInt = 0\n\n      // All sorting ints should always return in ascending order\n      if (sortUndefined) {\n        const aValue = rowA.getValue(sortEntry.id)\n        const bValue = rowB.getValue(sortEntry.id)\n\n        const aUndefined = aValue === undefined\n        const bUndefined = bValue === undefined\n\n        if (aUndefined && bUndefined) {\n          continue\n        }\n\n        if (aUndefined || bUndefined) {\n          if (sortUndefined === 'first') return aUndefined ? -1 : 1\n          if (sortUndefined === 'last') return aUndefined ? 1 : -1\n          sortInt = aUndefined ? sortUndefined : -sortUndefined\n        }\n      }\n\n      if (sortInt === 0) {\n        sortInt = sortEntry.sortFn(rowA, rowB, sortEntry.id)\n      }\n\n      // If sorting is non-zero, take care of desc and inversion\n      if (sortInt !== 0) {\n        if (isDesc) {\n          sortInt *= -1\n        }\n\n        if (sortEntry.invertSorting) {\n          sortInt *= -1\n        }\n\n        return sortInt\n      }\n    }\n\n    return rowA.index - rowB.index\n  }\n\n  const sortData = (\n    rows: Array<Row<TFeatures, TData>>,\n  ): {\n    rows: Array<Row<TFeatures, TData>>\n    changed: boolean\n  } => {\n    const sortedData = rows.slice()\n\n    sortedData.sort(compareRows)\n    let changed = false\n\n    // If there are sub-rows, sort them. Clone only rows that need mutation\n    // (i.e. have subRows) so we don't corrupt the source row model.\n    for (let i = 0; i < sortedData.length; i++) {\n      const row = sortedData[i]!\n      if (row !== rows[i]) {\n        changed = true\n      }\n\n      if (row.subRows.length) {\n        const sortedSubRows = sortData(row.subRows)\n\n        if (sortedSubRows.changed) {\n          // Preserve prototype chain so methods like getValue() remain accessible\n          const cloned = Object.create(Object.getPrototypeOf(row))\n          copyInstancePropertiesWithoutMemos(cloned, row)\n          cloned.subRows = sortedSubRows.rows\n          sortedData[i] = cloned\n          sortedFlatRows.push(cloned)\n          changed = true\n        } else {\n          sortedFlatRows.push(row)\n        }\n      } else {\n        sortedFlatRows.push(row)\n      }\n    }\n\n    return { rows: sortedData, changed }\n  }\n\n  return {\n    rows: sortData(preSortedRowModel.rows).rows,\n    flatRows: sortedFlatRows,\n    rowsById: preSortedRowModel.rowsById,\n  }\n}\n"],"mappings":"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"}

package/dist/features/row-sorting/createSortedRowModel.d.cts

@@ -1,16 +1,22 @@
 import { RowData } from "../../types/type-utils.cjs";
-import { SortFn, SortFns } from "./rowSortingFeature.types.cjs";
-import { TableFeatures } from "../../types/TableFeatures.cjs";
-import { Table } from "../../types/Table.cjs";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.cjs";
+import { Table } from "../../types/Table.cjs";
+import { TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/row-sorting/createSortedRowModel.d.ts
 /**
  * Creates a memoized sorted 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.
+ *
+ * Register the sorting functions you use with the `sortFns` slot on the
+ * `features` option:
+ * `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.
+ * Importing individual `sortFn_*` functions keeps unused built-ins out of
+ * your bundle; sorting functions passed directly to the `sortFn` column
+ * option need no registration at all.
  */
-declare function createSortedRowModel<TFeatures extends TableFeatures, TData extends RowData>(sortFns: Record<keyof SortFns, SortFn<TFeatures, TData>>): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
+declare function createSortedRowModel<TFeatures extends TableFeatures, TData extends RowData>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
 //#endregion
 export { createSortedRowModel };
 //# sourceMappingURL=createSortedRowModel.d.cts.map

package/dist/features/row-sorting/createSortedRowModel.d.ts

@@ -1,16 +1,22 @@
 import { RowData } from "../../types/type-utils.js";
-import { SortFn, SortFns } from "./rowSortingFeature.types.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
+import { Table } from "../../types/Table.js";
+import { TableFeatures } from "../../types/TableFeatures.js";
 
 //#region src/features/row-sorting/createSortedRowModel.d.ts
 /**
  * Creates a memoized sorted 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.
+ *
+ * Register the sorting functions you use with the `sortFns` slot on the
+ * `features` option:
+ * `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.
+ * Importing individual `sortFn_*` functions keeps unused built-ins out of
+ * your bundle; sorting functions passed directly to the `sortFn` column
+ * option need no registration at all.
  */
-declare function createSortedRowModel<TFeatures extends TableFeatures, TData extends RowData>(sortFns: Record<keyof SortFns, SortFn<TFeatures, TData>>): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
+declare function createSortedRowModel<TFeatures extends TableFeatures, TData extends RowData>(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
 //#endregion
 export { createSortedRowModel };
 //# sourceMappingURL=createSortedRowModel.d.ts.map

package/dist/features/row-sorting/createSortedRowModel.js

@@ -1,4 +1,4 @@
-import { tableMemo } from "../../utils.js";
+import { copyInstancePropertiesWithoutMemos, tableMemo } from "../../utils.js";
 import { table_autoResetPageIndex } from "../row-pagination/rowPaginationFeature.utils.js";
 import { column_getCanSort, column_getSortFn } from "./rowSortingFeature.utils.js";
 
@@ -7,84 +7,103 @@ import { column_getCanSort, column_getSortFn } from "./rowSortingFeature.utils.j
 * Creates a memoized sorted 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.
+*
+* Register the sorting functions you use with the `sortFns` slot on the
+* `features` option:
+* `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.
+* Importing individual `sortFn_*` functions keeps unused built-ins out of
+* your bundle; sorting functions passed directly to the `sortFn` column
+* option need no registration at all.
 */
-function createSortedRowModel(sortFns) {
+function createSortedRowModel() {
 	return (_table) => {
 		const table = _table;
-		if (!table._rowModelFns.sortFns) table._rowModelFns.sortFns = sortFns;
 		return tableMemo({
 			feature: "rowSortingFeature",
 			table,
 			fnName: "table.getSortedRowModel",
-			memoDeps: () => {
-				var _table$atoms$sorting;
-				return [(_table$atoms$sorting = table.atoms.sorting) === null || _table$atoms$sorting === void 0 ? void 0 : _table$atoms$sorting.get(), table.getPreSortedRowModel()];
-			},
+			memoDeps: () => [table.atoms.sorting?.get(), table.getPreSortedRowModel()],
 			fn: () => _createSortedRowModel(table),
 			onAfterUpdate: () => table_autoResetPageIndex(table)
 		});
 	};
 }
 function _createSortedRowModel(table) {
-	var _table$atoms$sorting2;
 	const preSortedRowModel = table.getPreSortedRowModel();
-	const sorting = (_table$atoms$sorting2 = table.atoms.sorting) === null || _table$atoms$sorting2 === void 0 ? void 0 : _table$atoms$sorting2.get();
-	if (!preSortedRowModel.rows.length || !(sorting === null || sorting === void 0 ? void 0 : sorting.length)) return preSortedRowModel;
+	const sorting = table.atoms.sorting?.get();
+	if (!preSortedRowModel.rows.length || !sorting?.length) return preSortedRowModel;
 	const sortedFlatRows = [];
-	const availableSorting = sorting.filter((sort) => column_getCanSort(table.getColumn(sort.id)));
-	const columnInfoById = {};
-	availableSorting.forEach((sortEntry) => {
+	const availableSorting = sorting.filter((sort) => {
+		const column = table.getColumn(sort.id);
+		return column ? column_getCanSort(column) : false;
+	});
+	if (!availableSorting.length) return preSortedRowModel;
+	const resolvedSorting = [];
+	for (let i = 0; i < availableSorting.length; i++) {
+		const sortEntry = availableSorting[i];
 		const column = table.getColumn(sortEntry.id);
-		if (!column) return;
-		columnInfoById[sortEntry.id] = {
+		if (!column) continue;
+		resolvedSorting.push({
+			id: sortEntry.id,
+			desc: sortEntry.desc,
 			sortUndefined: column.columnDef.sortUndefined,
 			invertSorting: column.columnDef.invertSorting,
 			sortFn: column_getSortFn(column)
-		};
-	});
-	const sortData = (rows) => {
-		const sortedData = rows.slice();
-		sortedData.sort((rowA, rowB) => {
-			for (let i = 0; i < availableSorting.length; i++) {
-				const sortEntry = availableSorting[i];
-				const columnInfo = columnInfoById[sortEntry.id];
-				const sortUndefined = columnInfo.sortUndefined;
-				const isDesc = sortEntry.desc;
-				let sortInt = 0;
-				if (sortUndefined) {
-					const aValue = rowA.getValue(sortEntry.id);
-					const bValue = rowB.getValue(sortEntry.id);
-					const aUndefined = aValue === void 0;
-					const bUndefined = bValue === void 0;
-					if (aUndefined || bUndefined) {
-						if (sortUndefined === "first") return aUndefined ? -1 : 1;
-						if (sortUndefined === "last") return aUndefined ? 1 : -1;
-						sortInt = aUndefined && bUndefined ? 0 : aUndefined ? sortUndefined : -sortUndefined;
-					}
-				}
-				if (sortInt === 0) sortInt = columnInfo.sortFn(rowA, rowB, sortEntry.id);
-				if (sortInt !== 0) {
-					if (isDesc) sortInt *= -1;
-					if (columnInfo.invertSorting) sortInt *= -1;
-					return sortInt;
+		});
+	}
+	const compareRows = (rowA, rowB) => {
+		for (let i = 0; i < resolvedSorting.length; i++) {
+			const sortEntry = resolvedSorting[i];
+			const sortUndefined = sortEntry.sortUndefined;
+			const isDesc = sortEntry.desc;
+			let sortInt = 0;
+			if (sortUndefined) {
+				const aValue = rowA.getValue(sortEntry.id);
+				const bValue = rowB.getValue(sortEntry.id);
+				const aUndefined = aValue === void 0;
+				const bUndefined = bValue === void 0;
+				if (aUndefined && bUndefined) continue;
+				if (aUndefined || bUndefined) {
+					if (sortUndefined === "first") return aUndefined ? -1 : 1;
+					if (sortUndefined === "last") return aUndefined ? 1 : -1;
+					sortInt = aUndefined ? sortUndefined : -sortUndefined;
 				}
 			}
-			return rowA.index - rowB.index;
-		});
+			if (sortInt === 0) sortInt = sortEntry.sortFn(rowA, rowB, sortEntry.id);
+			if (sortInt !== 0) {
+				if (isDesc) sortInt *= -1;
+				if (sortEntry.invertSorting) sortInt *= -1;
+				return sortInt;
+			}
+		}
+		return rowA.index - rowB.index;
+	};
+	const sortData = (rows) => {
+		const sortedData = rows.slice();
+		sortedData.sort(compareRows);
+		let changed = false;
 		for (let i = 0; i < sortedData.length; i++) {
 			const row = sortedData[i];
+			if (row !== rows[i]) changed = true;
 			if (row.subRows.length) {
-				const cloned = Object.create(Object.getPrototypeOf(row));
-				Object.assign(cloned, row);
-				cloned.subRows = sortData(row.subRows);
-				sortedData[i] = cloned;
-				sortedFlatRows.push(cloned);
+				const sortedSubRows = sortData(row.subRows);
+				if (sortedSubRows.changed) {
+					const cloned = Object.create(Object.getPrototypeOf(row));
+					copyInstancePropertiesWithoutMemos(cloned, row);
+					cloned.subRows = sortedSubRows.rows;
+					sortedData[i] = cloned;
+					sortedFlatRows.push(cloned);
+					changed = true;
+				} else sortedFlatRows.push(row);
 			} else sortedFlatRows.push(row);
 		}
-		return sortedData;
+		return {
+			rows: sortedData,
+			changed
+		};
 	};
 	return {
-		rows: sortData(preSortedRowModel.rows),
+		rows: sortData(preSortedRowModel.rows).rows,
 		flatRows: sortedFlatRows,
 		rowsById: preSortedRowModel.rowsById
 	};

package/dist/features/row-sorting/createSortedRowModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSortedRowModel.js","names":[],"sources":["../../../src/features/row-sorting/createSortedRowModel.ts"],"sourcesContent":["import { tableMemo } from '../../utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport { column_getCanSort, column_getSortFn } from './rowSortingFeature.utils'\nimport type { Column_Internal } from '../../types/Column'\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 { SortFn, SortFns } from './rowSortingFeature.types'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized sorted 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 createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\n>(\n  sortFns: Record<keyof SortFns, SortFn<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.sortFns) table._rowModelFns.sortFns = sortFns\n    return tableMemo({\n      feature: 'rowSortingFeature',\n      table,\n      fnName: 'table.getSortedRowModel',\n      memoDeps: () => [\n        table.atoms.sorting?.get(),\n        table.getPreSortedRowModel(),\n      ],\n      fn: () => _createSortedRowModel(table),\n      onAfterUpdate: () => table_autoResetPageIndex(table),\n    })\n  }\n}\n\nfunction _createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const preSortedRowModel = table.getPreSortedRowModel()\n  const sorting = table.atoms.sorting?.get()\n\n  if (!preSortedRowModel.rows.length || !sorting?.length) {\n    return preSortedRowModel\n  }\n\n  const sortedFlatRows: Array<Row<TFeatures, TData>> = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sorting.filter((sort) =>\n    column_getCanSort(\n      table.getColumn(sort.id) as Column_Internal<TFeatures, TData>,\n    ),\n  )\n\n  const columnInfoById: Record<\n    string,\n    {\n      sortUndefined?: false | -1 | 1 | 'first' | 'last'\n      invertSorting?: boolean\n      sortFn: SortFn<TFeatures, TData>\n    }\n  > = {}\n\n  availableSorting.forEach((sortEntry) => {\n    const column: Column_Internal<TFeatures, TData> | undefined =\n      table.getColumn(sortEntry.id)\n    if (!column) return\n\n    columnInfoById[sortEntry.id] = {\n      sortUndefined: column.columnDef.sortUndefined,\n      invertSorting: column.columnDef.invertSorting,\n      sortFn: column_getSortFn(column),\n    }\n  })\n\n  const sortData = (rows: Array<Row<TFeatures, TData>>) => {\n    const sortedData = rows.slice()\n\n    sortedData.sort((rowA, rowB) => {\n      for (let i = 0; i < availableSorting.length; i++) {\n        const sortEntry = availableSorting[i]!\n        const columnInfo = columnInfoById[sortEntry.id]!\n        const sortUndefined = columnInfo.sortUndefined\n        const isDesc = sortEntry.desc\n\n        let sortInt = 0\n\n        // All sorting ints should always return in ascending order\n        if (sortUndefined) {\n          const aValue = rowA.getValue(sortEntry.id)\n          const bValue = rowB.getValue(sortEntry.id)\n\n          const aUndefined = aValue === undefined\n          const bUndefined = bValue === undefined\n\n          if (aUndefined || bUndefined) {\n            if (sortUndefined === 'first') return aUndefined ? -1 : 1\n            if (sortUndefined === 'last') return aUndefined ? 1 : -1\n            sortInt =\n              aUndefined && bUndefined\n                ? 0\n                : aUndefined\n                  ? sortUndefined\n                  : -sortUndefined\n          }\n        }\n\n        if (sortInt === 0) {\n          sortInt = columnInfo.sortFn(rowA, rowB, sortEntry.id)\n        }\n\n        // If sorting is non-zero, take care of desc and inversion\n        if (sortInt !== 0) {\n          if (isDesc) {\n            sortInt *= -1\n          }\n\n          if (columnInfo.invertSorting) {\n            sortInt *= -1\n          }\n\n          return sortInt\n        }\n      }\n      return rowA.index - rowB.index\n    })\n\n    // If there are sub-rows, sort them. Clone only rows that need mutation\n    // (i.e. have subRows) so we don't corrupt the source row model.\n    for (let i = 0; i < sortedData.length; i++) {\n      const row = sortedData[i]!\n      if (row.subRows.length) {\n        // Preserve prototype chain so methods like getValue() remain accessible\n        const cloned = Object.create(Object.getPrototypeOf(row))\n        Object.assign(cloned, row)\n        cloned.subRows = sortData(row.subRows)\n        sortedData[i] = cloned\n        sortedFlatRows.push(cloned)\n      } else {\n        sortedFlatRows.push(row)\n      }\n    }\n\n    return sortedData\n  }\n\n  return {\n    rows: sortData(preSortedRowModel.rows),\n    flatRows: sortedFlatRows,\n    rowsById: preSortedRowModel.rowsById,\n  }\n}\n"],"mappings":";;;;;;;;;;AAgBA,SAAgB,qBAId,SACsE;CACtE,QAAQ,WAAW;EACjB,MAAM,QAAQ;EACd,IAAI,CAAC,MAAM,aAAa,SAAS,MAAM,aAAa,UAAU;EAC9D,OAAO,UAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;;oCACd,MAAM,MAAM,qFAAS,IAAI,GACzB,MAAM,qBAAqB,CAC7B;;GACA,UAAU,sBAAsB,KAAK;GACrC,qBAAqB,yBAAyB,KAAK;EACrD,CAAC;CACH;AACF;AAEA,SAAS,sBAGP,OAAqE;;CACrE,MAAM,oBAAoB,MAAM,qBAAqB;CACrD,MAAM,mCAAU,MAAM,MAAM,uFAAS,IAAI;CAEzC,IAAI,CAAC,kBAAkB,KAAK,UAAU,oDAAC,QAAS,SAC9C,OAAO;CAGT,MAAM,iBAA+C,CAAC;CAGtD,MAAM,mBAAmB,QAAQ,QAAQ,SACvC,kBACE,MAAM,UAAU,KAAK,EAAE,CACzB,CACF;CAEA,MAAM,iBAOF,CAAC;CAEL,iBAAiB,SAAS,cAAc;EACtC,MAAM,SACJ,MAAM,UAAU,UAAU,EAAE;EAC9B,IAAI,CAAC,QAAQ;EAEb,eAAe,UAAU,MAAM;GAC7B,eAAe,OAAO,UAAU;GAChC,eAAe,OAAO,UAAU;GAChC,QAAQ,iBAAiB,MAAM;EACjC;CACF,CAAC;CAED,MAAM,YAAY,SAAuC;EACvD,MAAM,aAAa,KAAK,MAAM;EAE9B,WAAW,MAAM,MAAM,SAAS;GAC9B,KAAK,IAAI,IAAI,GAAG,IAAI,iBAAiB,QAAQ,KAAK;IAChD,MAAM,YAAY,iBAAiB;IACnC,MAAM,aAAa,eAAe,UAAU;IAC5C,MAAM,gBAAgB,WAAW;IACjC,MAAM,SAAS,UAAU;IAEzB,IAAI,UAAU;IAGd,IAAI,eAAe;KACjB,MAAM,SAAS,KAAK,SAAS,UAAU,EAAE;KACzC,MAAM,SAAS,KAAK,SAAS,UAAU,EAAE;KAEzC,MAAM,aAAa,WAAW;KAC9B,MAAM,aAAa,WAAW;KAE9B,IAAI,cAAc,YAAY;MAC5B,IAAI,kBAAkB,SAAS,OAAO,aAAa,KAAK;MACxD,IAAI,kBAAkB,QAAQ,OAAO,aAAa,IAAI;MACtD,UACE,cAAc,aACV,IACA,aACE,gBACA,CAAC;KACX;IACF;IAEA,IAAI,YAAY,GACd,UAAU,WAAW,OAAO,MAAM,MAAM,UAAU,EAAE;IAItD,IAAI,YAAY,GAAG;KACjB,IAAI,QACF,WAAW;KAGb,IAAI,WAAW,eACb,WAAW;KAGb,OAAO;IACT;GACF;GACA,OAAO,KAAK,QAAQ,KAAK;EAC3B,CAAC;EAID,KAAK,IAAI,IAAI,GAAG,IAAI,WAAW,QAAQ,KAAK;GAC1C,MAAM,MAAM,WAAW;GACvB,IAAI,IAAI,QAAQ,QAAQ;IAEtB,MAAM,SAAS,OAAO,OAAO,OAAO,eAAe,GAAG,CAAC;IACvD,OAAO,OAAO,QAAQ,GAAG;IACzB,OAAO,UAAU,SAAS,IAAI,OAAO;IACrC,WAAW,KAAK;IAChB,eAAe,KAAK,MAAM;GAC5B,OACE,eAAe,KAAK,GAAG;EAE3B;EAEA,OAAO;CACT;CAEA,OAAO;EACL,MAAM,SAAS,kBAAkB,IAAI;EACrC,UAAU;EACV,UAAU,kBAAkB;CAC9B;AACF"}
+{"version":3,"file":"createSortedRowModel.js","names":[],"sources":["../../../src/features/row-sorting/createSortedRowModel.ts"],"sourcesContent":["import { copyInstancePropertiesWithoutMemos, tableMemo } from '../../utils'\nimport { table_autoResetPageIndex } from '../row-pagination/rowPaginationFeature.utils'\nimport { column_getCanSort, column_getSortFn } from './rowSortingFeature.utils'\nimport type { Column_Internal } from '../../types/Column'\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 { SortFn } from './rowSortingFeature.types'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized sorted 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 * Register the sorting functions you use with the `sortFns` slot on the\n * `features` option:\n * `tableFeatures({ rowSortingFeature, sortedRowModel: createSortedRowModel(), sortFns: { alphanumeric: sortFn_alphanumeric } })`.\n * Importing individual `sortFn_*` functions keeps unused built-ins out of\n * your bundle; sorting functions passed directly to the `sortFn` column\n * option need no registration at all.\n */\nexport function createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData,\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: 'rowSortingFeature',\n      table,\n      fnName: 'table.getSortedRowModel',\n      memoDeps: () => [\n        table.atoms.sorting?.get(),\n        table.getPreSortedRowModel(),\n      ],\n      fn: () => _createSortedRowModel(table),\n      onAfterUpdate: () => table_autoResetPageIndex(table),\n    })\n  }\n}\n\nfunction _createSortedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData> {\n  const preSortedRowModel = table.getPreSortedRowModel()\n  const sorting = table.atoms.sorting?.get()\n\n  if (!preSortedRowModel.rows.length || !sorting?.length) {\n    return preSortedRowModel\n  }\n\n  const sortedFlatRows: Array<Row<TFeatures, TData>> = []\n\n  // Filter out sortings that correspond to non existing columns\n  const availableSorting = sorting.filter((sort) => {\n    const column = table.getColumn(sort.id)\n    return column ? column_getCanSort(column) : false\n  })\n\n  if (!availableSorting.length) {\n    return preSortedRowModel\n  }\n\n  const resolvedSorting: Array<{\n    id: string\n    desc?: boolean\n    sortUndefined?: false | -1 | 1 | 'first' | 'last'\n    invertSorting?: boolean\n    sortFn: SortFn<TFeatures, TData>\n  }> = []\n\n  for (let i = 0; i < availableSorting.length; i++) {\n    const sortEntry = availableSorting[i]!\n    const column: Column_Internal<TFeatures, TData> | undefined =\n      table.getColumn(sortEntry.id)\n    if (!column) {\n      continue\n    }\n\n    resolvedSorting.push({\n      id: sortEntry.id,\n      desc: sortEntry.desc,\n      sortUndefined: column.columnDef.sortUndefined,\n      invertSorting: column.columnDef.invertSorting,\n      sortFn: column_getSortFn(column),\n    })\n  }\n\n  const compareRows = (\n    rowA: Row<TFeatures, TData>,\n    rowB: Row<TFeatures, TData>,\n  ) => {\n    for (let i = 0; i < resolvedSorting.length; i++) {\n      const sortEntry = resolvedSorting[i]!\n      const sortUndefined = sortEntry.sortUndefined\n      const isDesc = sortEntry.desc\n\n      let sortInt = 0\n\n      // All sorting ints should always return in ascending order\n      if (sortUndefined) {\n        const aValue = rowA.getValue(sortEntry.id)\n        const bValue = rowB.getValue(sortEntry.id)\n\n        const aUndefined = aValue === undefined\n        const bUndefined = bValue === undefined\n\n        if (aUndefined && bUndefined) {\n          continue\n        }\n\n        if (aUndefined || bUndefined) {\n          if (sortUndefined === 'first') return aUndefined ? -1 : 1\n          if (sortUndefined === 'last') return aUndefined ? 1 : -1\n          sortInt = aUndefined ? sortUndefined : -sortUndefined\n        }\n      }\n\n      if (sortInt === 0) {\n        sortInt = sortEntry.sortFn(rowA, rowB, sortEntry.id)\n      }\n\n      // If sorting is non-zero, take care of desc and inversion\n      if (sortInt !== 0) {\n        if (isDesc) {\n          sortInt *= -1\n        }\n\n        if (sortEntry.invertSorting) {\n          sortInt *= -1\n        }\n\n        return sortInt\n      }\n    }\n\n    return rowA.index - rowB.index\n  }\n\n  const sortData = (\n    rows: Array<Row<TFeatures, TData>>,\n  ): {\n    rows: Array<Row<TFeatures, TData>>\n    changed: boolean\n  } => {\n    const sortedData = rows.slice()\n\n    sortedData.sort(compareRows)\n    let changed = false\n\n    // If there are sub-rows, sort them. Clone only rows that need mutation\n    // (i.e. have subRows) so we don't corrupt the source row model.\n    for (let i = 0; i < sortedData.length; i++) {\n      const row = sortedData[i]!\n      if (row !== rows[i]) {\n        changed = true\n      }\n\n      if (row.subRows.length) {\n        const sortedSubRows = sortData(row.subRows)\n\n        if (sortedSubRows.changed) {\n          // Preserve prototype chain so methods like getValue() remain accessible\n          const cloned = Object.create(Object.getPrototypeOf(row))\n          copyInstancePropertiesWithoutMemos(cloned, row)\n          cloned.subRows = sortedSubRows.rows\n          sortedData[i] = cloned\n          sortedFlatRows.push(cloned)\n          changed = true\n        } else {\n          sortedFlatRows.push(row)\n        }\n      } else {\n        sortedFlatRows.push(row)\n      }\n    }\n\n    return { rows: sortedData, changed }\n  }\n\n  return {\n    rows: sortData(preSortedRowModel.rows).rows,\n    flatRows: sortedFlatRows,\n    rowsById: preSortedRowModel.rowsById,\n  }\n}\n"],"mappings":"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"}

package/dist/features/row-sorting/rowSortingFeature.types.d.cts

@@ -1,9 +1,8 @@
-import { OnChangeFn, RowData, Updater } from "../../types/type-utils.cjs";
-import { BuiltInSortFn } from "../../fns/sortFns.cjs";
+import { OnChangeFn, RowData, TransformDataValueFn, Updater } from "../../types/type-utils.cjs";
+import { BuiltInSortFn } from "./sortFns.cjs";
 import { Row } from "../../types/Row.cjs";
-import { TableFeatures } from "../../types/TableFeatures.cjs";
-import { Table } from "../../types/Table.cjs";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.cjs";
+import { IsAny, TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/row-sorting/rowSortingFeature.types.d.ts
 type SortDirection = 'asc' | 'desc';
@@ -15,16 +14,57 @@ type SortingState = Array<ColumnSort>;
 interface TableState_RowSorting {
   sorting: SortingState;
 }
-interface RowModelFns_RowSorting<TFeatures extends TableFeatures, TData extends RowData> {
-  sortFns: Record<keyof SortFns, SortFn<TFeatures, TData>>;
+interface RowModelFns_RowSorting<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  sortFns: Record<string, SortFn<TFeatures, TData>>;
 }
 interface SortFns {}
-interface SortFn<TFeatures extends TableFeatures, TData extends RowData> {
+interface SortFn<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   (rowA: Row<TFeatures, TData>, rowB: Row<TFeatures, TData>, columnId: string): number;
+  /**
+   * Normalizes each row's value before the two sides are compared. Only
+   * honored by sorting functions built with `constructSortFn` (including all
+   * built-in sorting functions).
+   */
+  resolveDataValue?: TransformDataValueFn;
+}
+/**
+ * The definition object accepted by `constructSortFn`.
+ *
+ * `sort` is a value-level comparator: it receives both rows' (resolved) data
+ * values instead of the whole rows, so normalization concerns stay in
+ * `resolveDataValue`.
+ */
+interface SortFnDef<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  sort: (dataValueA: any, dataValueB: any, rowA: Row<TFeatures, TData>, rowB: Row<TFeatures, TData>, columnId: string) => number;
+  resolveDataValue?: TransformDataValueFn;
+}
+/**
+ * The shape returned by `constructSortFn`: a `SortFn` with its definition
+ * attached, so variants can be built by spreading it into another
+ * `constructSortFn` call.
+ *
+ * The call signature is generic so a created sorting function can be used
+ * with any table's rows, regardless of the feature set it was defined
+ * against.
+ */
+interface CreatedSortFn<in out TFeatures extends TableFeatures, in out TData extends RowData> extends SortFnDef<TFeatures, TData> {
+  <TRowFeatures extends TableFeatures, TRowData extends RowData>(rowA: Row<TRowFeatures, TRowData>, rowB: Row<TRowFeatures, TRowData>, columnId: string): number;
 }
 type CustomSortFns<TFeatures extends TableFeatures, TData extends RowData> = Record<string, SortFn<TFeatures, TData>>;
-type SortFnOption<TFeatures extends TableFeatures, TData extends RowData> = 'auto' | keyof SortFns | BuiltInSortFn | SortFn<TFeatures, TData>;
-interface ColumnDef_RowSorting<TFeatures extends TableFeatures, TData extends RowData> {
+/**
+ * Resolves the valid string names for `columnDef.sortFn` for a feature set.
+ *
+ * When the features object declares a `sortFns` registry
+ * (`tableFeatures({ ..., sortFns })`), its keys are the only valid names; a
+ * name is only assignable if a sorting function is actually registered for it.
+ * Otherwise this falls back to the global declaration-merged `SortFns`
+ * interface.
+ */
+type ExtractSortFnKeys<TFeatures extends TableFeatures> = IsAny<TFeatures> extends true ? keyof SortFns | BuiltInSortFn : TFeatures extends {
+  sortFns: infer TSortFns extends object;
+} ? Extract<keyof TSortFns, string> : keyof SortFns;
+type SortFnOption<TFeatures extends TableFeatures, TData extends RowData> = 'auto' | ExtractSortFnKeys<TFeatures> | SortFn<TFeatures, TData>;
+interface ColumnDef_RowSorting<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Enables/Disables multi-sorting for this column.
    */
@@ -58,7 +98,7 @@ interface ColumnDef_RowSorting<TFeatures extends TableFeatures, TData extends Ro
    */
   sortUndefined?: false | -1 | 1 | 'first' | 'last';
 }
-interface Column_RowSorting<TFeatures extends TableFeatures, TData extends RowData> {
+interface Column_RowSorting<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Removes this column from the table's sorting state
    */
@@ -150,7 +190,7 @@ interface TableOptions_RowSorting {
    */
   sortDescFirst?: boolean;
 }
-interface Table_RowSorting<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_RowSorting<in out _TFeatures extends TableFeatures, in out _TData extends RowData> {
   /**
    * Resets `sorting` to `initialState.sorting`.
    *
@@ -162,7 +202,7 @@ interface Table_RowSorting<TFeatures extends TableFeatures, TData extends RowDat
    */
   setSorting: (updater: Updater<SortingState>) => void;
 }
-interface Table_RowModels_Sorted<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_RowModels_Sorted<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Reads the row model immediately before sorting.
    */
@@ -172,17 +212,9 @@ interface Table_RowModels_Sorted<TFeatures extends TableFeatures, TData extends
    */
   getSortedRowModel: () => RowModel<TFeatures, TData>;
 }
-interface CreateRowModel_Sorted<TFeatures extends TableFeatures, TData extends RowData> {
-  /**
-   * Factory used to retrieve the sorted row model. If using server-side
-   * sorting, this is not required. To use client-side sorting, pass the
-   * exported `createSortedRowModel()` or implement your own factory.
-   */
-  sortedRowModel?: (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
-}
-interface CachedRowModel_Sorted<TFeatures extends TableFeatures, TData extends RowData> {
+interface CachedRowModel_Sorted<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   sortedRowModel: () => RowModel<TFeatures, TData>;
 }
 //#endregion
-export { CachedRowModel_Sorted, ColumnDef_RowSorting, ColumnSort, Column_RowSorting, CreateRowModel_Sorted, CustomSortFns, RowModelFns_RowSorting, SortDirection, SortFn, SortFnOption, SortFns, SortingState, TableOptions_RowSorting, TableState_RowSorting, Table_RowModels_Sorted, Table_RowSorting };
+export { CachedRowModel_Sorted, ColumnDef_RowSorting, ColumnSort, Column_RowSorting, CreatedSortFn, CustomSortFns, ExtractSortFnKeys, RowModelFns_RowSorting, SortDirection, SortFn, SortFnDef, SortFnOption, SortFns, SortingState, TableOptions_RowSorting, TableState_RowSorting, Table_RowModels_Sorted, Table_RowSorting };
 //# sourceMappingURL=rowSortingFeature.types.d.cts.map