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

package/dist/features/column-faceting/createFacetedRowModel.js

@@ -14,32 +14,27 @@ function createFacetedRowModel() {
 			feature: "columnFacetingFeature",
 			table,
 			fnName: "createFacetedRowModel",
-			memoDeps: () => {
-				var _table$atoms$columnFi, _table$atoms$globalFi;
-				return [
-					table.getPreFilteredRowModel(),
-					(_table$atoms$columnFi = table.atoms.columnFilters) === null || _table$atoms$columnFi === void 0 ? void 0 : _table$atoms$columnFi.get(),
-					(_table$atoms$globalFi = table.atoms.globalFilter) === null || _table$atoms$globalFi === void 0 ? void 0 : _table$atoms$globalFi.get(),
-					table.getFilteredRowModel()
-				];
-			},
+			memoDeps: () => [
+				table.getPreFilteredRowModel(),
+				table.atoms.columnFilters?.get(),
+				table.atoms.globalFilter?.get(),
+				table.getFilteredRowModel()
+			],
 			fn: (preRowModel, columnFilters, globalFilter) => _createFacetedRowModel(table, columnId, preRowModel, columnFilters, globalFilter)
 		});
 	};
 }
 function _createFacetedRowModel(table, columnId, preRowModel, columnFilters, globalFilter) {
-	if (!preRowModel.rows.length || !(columnFilters === null || columnFilters === void 0 ? void 0 : columnFilters.length) && !globalFilter) return preRowModel;
+	if (!preRowModel.rows.length || !columnFilters?.length && !globalFilter) return preRowModel;
 	const filterableIds = [];
 	if (columnFilters) for (let i = 0; i < columnFilters.length; i++) {
 		const id = columnFilters[i].id;
 		if (id !== columnId) filterableIds.push(id);
 	}
-	if (globalFilter) filterableIds.push("__global__");
+	if (globalFilter && columnId !== "__global__") filterableIds.push("__global__");
+	if (!filterableIds.length) return preRowModel;
 	const filterRowsImpl = (row) => {
-		for (let i = 0; i < filterableIds.length; i++) {
-			var _row$columnFilters;
-			if (((_row$columnFilters = row.columnFilters) === null || _row$columnFilters === void 0 ? void 0 : _row$columnFilters[filterableIds[i]]) === false) return false;
-		}
+		for (let i = 0; i < filterableIds.length; i++) if (row.columnFilters?.[filterableIds[i]] === false) return false;
 		return true;
 	};
 	return filterRows(preRowModel.rows, filterRowsImpl, table);

package/dist/features/column-faceting/createFacetedRowModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"createFacetedRowModel.js","names":[],"sources":["../../../src/features/column-faceting/createFacetedRowModel.ts"],"sourcesContent":["import { tableMemo } from '../../utils'\nimport { filterRows } from '../column-filtering/filterRowsUtils'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type {\n  ColumnFiltersState,\n  Row_ColumnFiltering,\n} from '../column-filtering/columnFilteringFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted 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 createFacetedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => RowModel<TFeatures, TData> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'createFacetedRowModel',\n      memoDeps: () => [\n        table.getPreFilteredRowModel(),\n        table.atoms.columnFilters?.get(),\n        table.atoms.globalFilter?.get(),\n        table.getFilteredRowModel(),\n      ],\n      fn: (preRowModel, columnFilters, globalFilter) =>\n        _createFacetedRowModel(\n          table,\n          columnId,\n          preRowModel,\n          columnFilters,\n          globalFilter,\n        ),\n    })\n  }\n}\n\nfunction _createFacetedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  table: Table_Internal<TFeatures, TData>,\n  columnId: string,\n  preRowModel: RowModel<TFeatures, TData>,\n  columnFilters?: ColumnFiltersState,\n  globalFilter?: string,\n) {\n  if (!preRowModel.rows.length || (!columnFilters?.length && !globalFilter)) {\n    return preRowModel\n  }\n\n  const filterableIds: Array<string> = []\n  if (columnFilters) {\n    for (let i = 0; i < columnFilters.length; i++) {\n      const id = columnFilters[i]!.id\n      if (id !== columnId) filterableIds.push(id)\n    }\n  }\n  if (globalFilter) filterableIds.push('__global__')\n\n  const filterRowsImpl = (\n    row: Row<TFeatures, TData> & Partial<Row_ColumnFiltering<TFeatures, TData>>,\n  ) => {\n    // Horizontally filter rows through each column\n    for (let i = 0; i < filterableIds.length; i++) {\n      if (row.columnFilters?.[filterableIds[i]!] === false) {\n        return false\n      }\n    }\n    return true\n  }\n\n  return filterRows(preRowModel.rows, filterRowsImpl, table)\n}\n"],"mappings":";;;;;;;;;AAiBA,SAAgB,wBAMsB;CACpC,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAO,UAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;;;KACd,MAAM,uBAAuB;8BAC7B,MAAM,MAAM,6FAAe,IAAI;8BAC/B,MAAM,MAAM,4FAAc,IAAI;KAC9B,MAAM,oBAAoB;IAC5B;;GACA,KAAK,aAAa,eAAe,iBAC/B,uBACE,OACA,UACA,aACA,eACA,YACF;EACJ,CAAC;CACH;AACF;AAEA,SAAS,uBAIP,OACA,UACA,aACA,eACA,cACA;CACA,IAAI,CAAC,YAAY,KAAK,UAAW,gEAAC,cAAe,WAAU,CAAC,cAC1D,OAAO;CAGT,MAAM,gBAA+B,CAAC;CACtC,IAAI,eACF,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,QAAQ,KAAK;EAC7C,MAAM,KAAK,cAAc,EAAE,CAAE;EAC7B,IAAI,OAAO,UAAU,cAAc,KAAK,EAAE;CAC5C;CAEF,IAAI,cAAc,cAAc,KAAK,YAAY;CAEjD,MAAM,kBACJ,QACG;EAEH,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,QAAQ,KAAK;;GAC7C,2BAAI,IAAI,uFAAgB,cAAc,SAAS,OAC7C,OAAO;EAEX;EACA,OAAO;CACT;CAEA,OAAO,WAAW,YAAY,MAAM,gBAAgB,KAAK;AAC3D"}
+{"version":3,"file":"createFacetedRowModel.js","names":[],"sources":["../../../src/features/column-faceting/createFacetedRowModel.ts"],"sourcesContent":["import { tableMemo } from '../../utils'\nimport { filterRows } from '../column-filtering/filterRowsUtils'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type {\n  ColumnFiltersState,\n  Row_ColumnFiltering,\n} from '../column-filtering/columnFilteringFeature.types'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'\nimport type { Row } from '../../types/Row'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted 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 createFacetedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => RowModel<TFeatures, TData> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'createFacetedRowModel',\n      memoDeps: () => [\n        table.getPreFilteredRowModel(),\n        table.atoms.columnFilters?.get(),\n        table.atoms.globalFilter?.get(),\n        table.getFilteredRowModel(),\n      ],\n      fn: (preRowModel, columnFilters, globalFilter) =>\n        _createFacetedRowModel(\n          table,\n          columnId,\n          preRowModel,\n          columnFilters,\n          globalFilter,\n        ),\n    })\n  }\n}\n\nfunction _createFacetedRowModel<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  table: Table_Internal<TFeatures, TData>,\n  columnId: string,\n  preRowModel: RowModel<TFeatures, TData>,\n  columnFilters?: ColumnFiltersState,\n  globalFilter?: string,\n) {\n  if (!preRowModel.rows.length || (!columnFilters?.length && !globalFilter)) {\n    return preRowModel\n  }\n\n  const filterableIds: Array<string> = []\n  if (columnFilters) {\n    for (let i = 0; i < columnFilters.length; i++) {\n      const id = columnFilters[i]!.id\n      if (id !== columnId) filterableIds.push(id)\n    }\n  }\n  // The global context excludes the global filter itself, mirroring how a\n  // column's faceted model excludes that column's own filter\n  if (globalFilter && columnId !== '__global__')\n    filterableIds.push('__global__')\n\n  if (!filterableIds.length) {\n    return preRowModel\n  }\n\n  const filterRowsImpl = (\n    row: Row<TFeatures, TData> & Partial<Row_ColumnFiltering<TFeatures, TData>>,\n  ) => {\n    // Horizontally filter rows through each column\n    for (let i = 0; i < filterableIds.length; i++) {\n      if (row.columnFilters?.[filterableIds[i]!] === false) {\n        return false\n      }\n    }\n    return true\n  }\n\n  return filterRows(preRowModel.rows, filterRowsImpl, table)\n}\n"],"mappings":";;;;;;;;;AAiBA,SAAgB,wBAMsB;CACpC,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAO,UAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;IACd,MAAM,uBAAuB;IAC7B,MAAM,MAAM,eAAe,IAAI;IAC/B,MAAM,MAAM,cAAc,IAAI;IAC9B,MAAM,oBAAoB;GAC5B;GACA,KAAK,aAAa,eAAe,iBAC/B,uBACE,OACA,UACA,aACA,eACA,YACF;EACJ,CAAC;CACH;AACF;AAEA,SAAS,uBAIP,OACA,UACA,aACA,eACA,cACA;CACA,IAAI,CAAC,YAAY,KAAK,UAAW,CAAC,eAAe,UAAU,CAAC,cAC1D,OAAO;CAGT,MAAM,gBAA+B,CAAC;CACtC,IAAI,eACF,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,QAAQ,KAAK;EAC7C,MAAM,KAAK,cAAc,EAAE,CAAE;EAC7B,IAAI,OAAO,UAAU,cAAc,KAAK,EAAE;CAC5C;CAIF,IAAI,gBAAgB,aAAa,cAC/B,cAAc,KAAK,YAAY;CAEjC,IAAI,CAAC,cAAc,QACjB,OAAO;CAGT,MAAM,kBACJ,QACG;EAEH,KAAK,IAAI,IAAI,GAAG,IAAI,cAAc,QAAQ,KACxC,IAAI,IAAI,gBAAgB,cAAc,QAAS,OAC7C,OAAO;EAGX,OAAO;CACT;CAEA,OAAO,WAAW,YAAY,MAAM,gBAAgB,KAAK;AAC3D"}

package/dist/features/column-faceting/createFacetedUniqueValues.cjs

@@ -1,5 +1,6 @@
 const require_utils = require('../../utils.cjs');
 const require_columnFacetingFeature_utils = require('./columnFacetingFeature.utils.cjs');
+const require_globalFilteringFeature_utils = require('../global-filtering/globalFilteringFeature.utils.cjs');
 
 //#region src/features/column-faceting/createFacetedUniqueValues.ts
 /**
@@ -15,22 +16,25 @@ function createFacetedUniqueValues() {
 			table,
 			fnName: "table.getFacetedUniqueValues",
 			memoDeps: () => {
+				if (columnId === "__global__") return [require_utils.callMemoOrStaticFn(table, "getGlobalFacetedRowModel", require_columnFacetingFeature_utils.table_getGlobalFacetedRowModel).flatRows];
 				const column = table.getColumn(columnId);
 				if (!column) return [table.getPreFilteredRowModel().flatRows];
 				return [require_utils.callMemoOrStaticFn(column, "getFacetedRowModel", require_columnFacetingFeature_utils.column_getFacetedRowModel, table).flatRows];
 			},
-			fn: (flatRows) => _createFacetedUniqueValues(columnId, flatRows)
+			fn: (flatRows) => _createFacetedUniqueValues(table, columnId, flatRows)
 		});
 	};
 }
-function _createFacetedUniqueValues(columnId, flatRows) {
+function _createFacetedUniqueValues(table, columnId, flatRows) {
+	const columnIds = columnId === "__global__" ? table.getAllLeafColumns().filter((column) => require_globalFilteringFeature_utils.column_getCanGlobalFilter(column)).map((column) => column.id) : [columnId];
 	const facetedUniqueValues = /* @__PURE__ */ new Map();
-	for (let i = 0; i < flatRows.length; i++) {
-		const values = flatRows[i].getUniqueValues(columnId);
+	for (let i = 0; i < flatRows.length; i++) for (let c = 0; c < columnIds.length; c++) {
+		const values = flatRows[i].getUniqueValues(columnIds[c]);
+		if (!values) continue;
 		for (let j = 0; j < values.length; j++) {
 			const value = values[j];
-			if (facetedUniqueValues.has(value)) facetedUniqueValues.set(value, (facetedUniqueValues.get(value) ?? 0) + 1);
-			else facetedUniqueValues.set(value, 1);
+			const previousValue = facetedUniqueValues.get(value);
+			facetedUniqueValues.set(value, previousValue === void 0 ? 1 : previousValue + 1);
 		}
 	}
 	return facetedUniqueValues;

package/dist/features/column-faceting/createFacetedUniqueValues.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createFacetedUniqueValues.cjs","names":["tableMemo","callMemoOrStaticFn","column_getFacetedRowModel"],"sources":["../../../src/features/column-faceting/createFacetedUniqueValues.ts"],"sourcesContent":["import { callMemoOrStaticFn, tableMemo } from '../../utils'\nimport { column_getFacetedRowModel } from './columnFacetingFeature.utils'\nimport type { Row } from '../../types/Row'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted unique values helper for faceted filtering.\n *\n * The returned function derives facet data from the table row model and relevant filter state so filter UIs can display available values.\n */\nexport function createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => Map<any, number> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'table.getFacetedUniqueValues',\n      memoDeps: () => {\n        const column = table.getColumn(columnId)\n        if (!column) return [table.getPreFilteredRowModel().flatRows]\n        return [\n          callMemoOrStaticFn(\n            column,\n            'getFacetedRowModel',\n            column_getFacetedRowModel,\n            table,\n          ).flatRows,\n        ]\n      },\n      fn: (flatRows) => _createFacetedUniqueValues(columnId, flatRows),\n    })\n  }\n}\n\nfunction _createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(columnId: string, flatRows: Array<Row<TFeatures, TData>>): Map<any, number> {\n  const facetedUniqueValues = new Map<any, number>()\n\n  for (let i = 0; i < flatRows.length; i++) {\n    const values = flatRows[i]!.getUniqueValues(columnId)\n\n    for (let j = 0; j < values.length; j++) {\n      const value = values[j]\n      if (facetedUniqueValues.has(value)) {\n        facetedUniqueValues.set(\n          value,\n          (facetedUniqueValues.get(value) ?? 0) + 1,\n        )\n      } else {\n        facetedUniqueValues.set(value, 1)\n      }\n    }\n  }\n\n  return facetedUniqueValues\n}\n"],"mappings":";;;;;;;;;AAYA,SAAgB,4BAMY;CAC1B,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAOA,wBAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;IACd,MAAM,SAAS,MAAM,UAAU,QAAQ;IACvC,IAAI,CAAC,QAAQ,OAAO,CAAC,MAAM,uBAAuB,CAAC,CAAC,QAAQ;IAC5D,OAAO,CACLC,iCACE,QACA,sBACAC,+DACA,KACF,CAAC,CAAC,QACJ;GACF;GACA,KAAK,aAAa,2BAA2B,UAAU,QAAQ;EACjE,CAAC;CACH;AACF;AAEA,SAAS,2BAGP,UAAkB,UAA0D;CAC5E,MAAM,sCAAsB,IAAI,IAAiB;CAEjD,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,SAAS,SAAS,EAAE,CAAE,gBAAgB,QAAQ;EAEpD,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;GACtC,MAAM,QAAQ,OAAO;GACrB,IAAI,oBAAoB,IAAI,KAAK,GAC/B,oBAAoB,IAClB,QACC,oBAAoB,IAAI,KAAK,KAAK,KAAK,CAC1C;QAEA,oBAAoB,IAAI,OAAO,CAAC;EAEpC;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"createFacetedUniqueValues.cjs","names":["tableMemo","callMemoOrStaticFn","table_getGlobalFacetedRowModel","column_getFacetedRowModel","column_getCanGlobalFilter"],"sources":["../../../src/features/column-faceting/createFacetedUniqueValues.ts"],"sourcesContent":["import { callMemoOrStaticFn, tableMemo } from '../../utils'\nimport { column_getCanGlobalFilter } from '../global-filtering/globalFilteringFeature.utils'\nimport {\n  column_getFacetedRowModel,\n  table_getGlobalFacetedRowModel,\n} from './columnFacetingFeature.utils'\nimport type { Row } from '../../types/Row'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted unique values helper for faceted filtering.\n *\n * The returned function derives facet data from the table row model and relevant filter state so filter UIs can display available values.\n */\nexport function createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => Map<any, number> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'table.getFacetedUniqueValues',\n      memoDeps: () => {\n        if (columnId === '__global__') {\n          return [\n            callMemoOrStaticFn(\n              table,\n              'getGlobalFacetedRowModel',\n              table_getGlobalFacetedRowModel,\n            ).flatRows,\n          ]\n        }\n        const column = table.getColumn(columnId)\n        if (!column) return [table.getPreFilteredRowModel().flatRows]\n        return [\n          callMemoOrStaticFn(\n            column,\n            'getFacetedRowModel',\n            column_getFacetedRowModel,\n            table,\n          ).flatRows,\n        ]\n      },\n      fn: (flatRows) => _createFacetedUniqueValues(table, columnId, flatRows),\n    })\n  }\n}\n\nfunction _createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  table: Table_Internal<TFeatures, TData>,\n  columnId: string,\n  flatRows: Array<Row<TFeatures, TData>>,\n): Map<any, number> {\n  // The global context aggregates unique values across every column that\n  // participates in global filtering\n  const columnIds =\n    columnId === '__global__'\n      ? table\n          .getAllLeafColumns()\n          .filter((column) => column_getCanGlobalFilter(column))\n          .map((column) => column.id)\n      : [columnId]\n\n  const facetedUniqueValues = new Map<any, number>()\n\n  for (let i = 0; i < flatRows.length; i++) {\n    for (let c = 0; c < columnIds.length; c++) {\n      // the declared return type is Array, but rows return undefined for\n      // columns without an accessor (e.g. display columns)\n      const values = flatRows[i]!.getUniqueValues(columnIds[c]!) as\n        | Array<unknown>\n        | undefined\n      if (!values) continue\n\n      for (let j = 0; j < values.length; j++) {\n        const value = values[j]\n        const previousValue = facetedUniqueValues.get(value)\n        facetedUniqueValues.set(\n          value,\n          previousValue === undefined ? 1 : previousValue + 1,\n        )\n      }\n    }\n  }\n\n  return facetedUniqueValues\n}\n"],"mappings":";;;;;;;;;;AAgBA,SAAgB,4BAMY;CAC1B,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAOA,wBAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;IACd,IAAI,aAAa,cACf,OAAO,CACLC,iCACE,OACA,4BACAC,kEACF,CAAC,CAAC,QACJ;IAEF,MAAM,SAAS,MAAM,UAAU,QAAQ;IACvC,IAAI,CAAC,QAAQ,OAAO,CAAC,MAAM,uBAAuB,CAAC,CAAC,QAAQ;IAC5D,OAAO,CACLD,iCACE,QACA,sBACAE,+DACA,KACF,CAAC,CAAC,QACJ;GACF;GACA,KAAK,aAAa,2BAA2B,OAAO,UAAU,QAAQ;EACxE,CAAC;CACH;AACF;AAEA,SAAS,2BAIP,OACA,UACA,UACkB;CAGlB,MAAM,YACJ,aAAa,eACT,MACG,kBAAkB,CAAC,CACnB,QAAQ,WAAWC,+DAA0B,MAAM,CAAC,CAAC,CACrD,KAAK,WAAW,OAAO,EAAE,IAC5B,CAAC,QAAQ;CAEf,MAAM,sCAAsB,IAAI,IAAiB;CAEjD,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KACnC,KAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;EAGzC,MAAM,SAAS,SAAS,EAAE,CAAE,gBAAgB,UAAU,EAAG;EAGzD,IAAI,CAAC,QAAQ;EAEb,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;GACtC,MAAM,QAAQ,OAAO;GACrB,MAAM,gBAAgB,oBAAoB,IAAI,KAAK;GACnD,oBAAoB,IAClB,OACA,kBAAkB,SAAY,IAAI,gBAAgB,CACpD;EACF;CACF;CAGF,OAAO;AACT"}

package/dist/features/column-faceting/createFacetedUniqueValues.d.cts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.cjs";
-import { TableFeatures } from "../../types/TableFeatures.cjs";
 import { Table } from "../../types/Table.cjs";
+import { TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/column-faceting/createFacetedUniqueValues.d.ts
 /**

package/dist/features/column-faceting/createFacetedUniqueValues.d.ts

@@ -1,6 +1,6 @@
 import { RowData } from "../../types/type-utils.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
 import { Table } from "../../types/Table.js";
+import { TableFeatures } from "../../types/TableFeatures.js";
 
 //#region src/features/column-faceting/createFacetedUniqueValues.d.ts
 /**

package/dist/features/column-faceting/createFacetedUniqueValues.js

@@ -1,5 +1,6 @@
 import { callMemoOrStaticFn, tableMemo } from "../../utils.js";
-import { column_getFacetedRowModel } from "./columnFacetingFeature.utils.js";
+import { column_getFacetedRowModel, table_getGlobalFacetedRowModel } from "./columnFacetingFeature.utils.js";
+import { column_getCanGlobalFilter } from "../global-filtering/globalFilteringFeature.utils.js";
 
 //#region src/features/column-faceting/createFacetedUniqueValues.ts
 /**
@@ -15,22 +16,25 @@ function createFacetedUniqueValues() {
 			table,
 			fnName: "table.getFacetedUniqueValues",
 			memoDeps: () => {
+				if (columnId === "__global__") return [callMemoOrStaticFn(table, "getGlobalFacetedRowModel", table_getGlobalFacetedRowModel).flatRows];
 				const column = table.getColumn(columnId);
 				if (!column) return [table.getPreFilteredRowModel().flatRows];
 				return [callMemoOrStaticFn(column, "getFacetedRowModel", column_getFacetedRowModel, table).flatRows];
 			},
-			fn: (flatRows) => _createFacetedUniqueValues(columnId, flatRows)
+			fn: (flatRows) => _createFacetedUniqueValues(table, columnId, flatRows)
 		});
 	};
 }
-function _createFacetedUniqueValues(columnId, flatRows) {
+function _createFacetedUniqueValues(table, columnId, flatRows) {
+	const columnIds = columnId === "__global__" ? table.getAllLeafColumns().filter((column) => column_getCanGlobalFilter(column)).map((column) => column.id) : [columnId];
 	const facetedUniqueValues = /* @__PURE__ */ new Map();
-	for (let i = 0; i < flatRows.length; i++) {
-		const values = flatRows[i].getUniqueValues(columnId);
+	for (let i = 0; i < flatRows.length; i++) for (let c = 0; c < columnIds.length; c++) {
+		const values = flatRows[i].getUniqueValues(columnIds[c]);
+		if (!values) continue;
 		for (let j = 0; j < values.length; j++) {
 			const value = values[j];
-			if (facetedUniqueValues.has(value)) facetedUniqueValues.set(value, (facetedUniqueValues.get(value) ?? 0) + 1);
-			else facetedUniqueValues.set(value, 1);
+			const previousValue = facetedUniqueValues.get(value);
+			facetedUniqueValues.set(value, previousValue === void 0 ? 1 : previousValue + 1);
 		}
 	}
 	return facetedUniqueValues;

package/dist/features/column-faceting/createFacetedUniqueValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"createFacetedUniqueValues.js","names":[],"sources":["../../../src/features/column-faceting/createFacetedUniqueValues.ts"],"sourcesContent":["import { callMemoOrStaticFn, tableMemo } from '../../utils'\nimport { column_getFacetedRowModel } from './columnFacetingFeature.utils'\nimport type { Row } from '../../types/Row'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted unique values helper for faceted filtering.\n *\n * The returned function derives facet data from the table row model and relevant filter state so filter UIs can display available values.\n */\nexport function createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => Map<any, number> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'table.getFacetedUniqueValues',\n      memoDeps: () => {\n        const column = table.getColumn(columnId)\n        if (!column) return [table.getPreFilteredRowModel().flatRows]\n        return [\n          callMemoOrStaticFn(\n            column,\n            'getFacetedRowModel',\n            column_getFacetedRowModel,\n            table,\n          ).flatRows,\n        ]\n      },\n      fn: (flatRows) => _createFacetedUniqueValues(columnId, flatRows),\n    })\n  }\n}\n\nfunction _createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(columnId: string, flatRows: Array<Row<TFeatures, TData>>): Map<any, number> {\n  const facetedUniqueValues = new Map<any, number>()\n\n  for (let i = 0; i < flatRows.length; i++) {\n    const values = flatRows[i]!.getUniqueValues(columnId)\n\n    for (let j = 0; j < values.length; j++) {\n      const value = values[j]\n      if (facetedUniqueValues.has(value)) {\n        facetedUniqueValues.set(\n          value,\n          (facetedUniqueValues.get(value) ?? 0) + 1,\n        )\n      } else {\n        facetedUniqueValues.set(value, 1)\n      }\n    }\n  }\n\n  return facetedUniqueValues\n}\n"],"mappings":";;;;;;;;;AAYA,SAAgB,4BAMY;CAC1B,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAO,UAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;IACd,MAAM,SAAS,MAAM,UAAU,QAAQ;IACvC,IAAI,CAAC,QAAQ,OAAO,CAAC,MAAM,uBAAuB,CAAC,CAAC,QAAQ;IAC5D,OAAO,CACL,mBACE,QACA,sBACA,2BACA,KACF,CAAC,CAAC,QACJ;GACF;GACA,KAAK,aAAa,2BAA2B,UAAU,QAAQ;EACjE,CAAC;CACH;AACF;AAEA,SAAS,2BAGP,UAAkB,UAA0D;CAC5E,MAAM,sCAAsB,IAAI,IAAiB;CAEjD,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK;EACxC,MAAM,SAAS,SAAS,EAAE,CAAE,gBAAgB,QAAQ;EAEpD,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;GACtC,MAAM,QAAQ,OAAO;GACrB,IAAI,oBAAoB,IAAI,KAAK,GAC/B,oBAAoB,IAClB,QACC,oBAAoB,IAAI,KAAK,KAAK,KAAK,CAC1C;QAEA,oBAAoB,IAAI,OAAO,CAAC;EAEpC;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"createFacetedUniqueValues.js","names":[],"sources":["../../../src/features/column-faceting/createFacetedUniqueValues.ts"],"sourcesContent":["import { callMemoOrStaticFn, tableMemo } from '../../utils'\nimport { column_getCanGlobalFilter } from '../global-filtering/globalFilteringFeature.utils'\nimport {\n  column_getFacetedRowModel,\n  table_getGlobalFacetedRowModel,\n} from './columnFacetingFeature.utils'\nimport type { Row } from '../../types/Row'\nimport type { Table, Table_Internal } from '../../types/Table'\nimport type { TableFeatures } from '../../types/TableFeatures'\nimport type { RowData } from '../../types/type-utils'\n\n/**\n * Creates a memoized faceted unique values helper for faceted filtering.\n *\n * The returned function derives facet data from the table row model and relevant filter state so filter UIs can display available values.\n */\nexport function createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(): (\n  table: Table<TFeatures, TData>,\n  columnId: string,\n) => () => Map<any, number> {\n  return (_table, columnId) => {\n    const table = _table as unknown as Table_Internal<TFeatures, TData>\n    return tableMemo({\n      feature: 'columnFacetingFeature',\n      table,\n      fnName: 'table.getFacetedUniqueValues',\n      memoDeps: () => {\n        if (columnId === '__global__') {\n          return [\n            callMemoOrStaticFn(\n              table,\n              'getGlobalFacetedRowModel',\n              table_getGlobalFacetedRowModel,\n            ).flatRows,\n          ]\n        }\n        const column = table.getColumn(columnId)\n        if (!column) return [table.getPreFilteredRowModel().flatRows]\n        return [\n          callMemoOrStaticFn(\n            column,\n            'getFacetedRowModel',\n            column_getFacetedRowModel,\n            table,\n          ).flatRows,\n        ]\n      },\n      fn: (flatRows) => _createFacetedUniqueValues(table, columnId, flatRows),\n    })\n  }\n}\n\nfunction _createFacetedUniqueValues<\n  TFeatures extends TableFeatures,\n  TData extends RowData = any,\n>(\n  table: Table_Internal<TFeatures, TData>,\n  columnId: string,\n  flatRows: Array<Row<TFeatures, TData>>,\n): Map<any, number> {\n  // The global context aggregates unique values across every column that\n  // participates in global filtering\n  const columnIds =\n    columnId === '__global__'\n      ? table\n          .getAllLeafColumns()\n          .filter((column) => column_getCanGlobalFilter(column))\n          .map((column) => column.id)\n      : [columnId]\n\n  const facetedUniqueValues = new Map<any, number>()\n\n  for (let i = 0; i < flatRows.length; i++) {\n    for (let c = 0; c < columnIds.length; c++) {\n      // the declared return type is Array, but rows return undefined for\n      // columns without an accessor (e.g. display columns)\n      const values = flatRows[i]!.getUniqueValues(columnIds[c]!) as\n        | Array<unknown>\n        | undefined\n      if (!values) continue\n\n      for (let j = 0; j < values.length; j++) {\n        const value = values[j]\n        const previousValue = facetedUniqueValues.get(value)\n        facetedUniqueValues.set(\n          value,\n          previousValue === undefined ? 1 : previousValue + 1,\n        )\n      }\n    }\n  }\n\n  return facetedUniqueValues\n}\n"],"mappings":";;;;;;;;;;AAgBA,SAAgB,4BAMY;CAC1B,QAAQ,QAAQ,aAAa;EAC3B,MAAM,QAAQ;EACd,OAAO,UAAU;GACf,SAAS;GACT;GACA,QAAQ;GACR,gBAAgB;IACd,IAAI,aAAa,cACf,OAAO,CACL,mBACE,OACA,4BACA,8BACF,CAAC,CAAC,QACJ;IAEF,MAAM,SAAS,MAAM,UAAU,QAAQ;IACvC,IAAI,CAAC,QAAQ,OAAO,CAAC,MAAM,uBAAuB,CAAC,CAAC,QAAQ;IAC5D,OAAO,CACL,mBACE,QACA,sBACA,2BACA,KACF,CAAC,CAAC,QACJ;GACF;GACA,KAAK,aAAa,2BAA2B,OAAO,UAAU,QAAQ;EACxE,CAAC;CACH;AACF;AAEA,SAAS,2BAIP,OACA,UACA,UACkB;CAGlB,MAAM,YACJ,aAAa,eACT,MACG,kBAAkB,CAAC,CACnB,QAAQ,WAAW,0BAA0B,MAAM,CAAC,CAAC,CACrD,KAAK,WAAW,OAAO,EAAE,IAC5B,CAAC,QAAQ;CAEf,MAAM,sCAAsB,IAAI,IAAiB;CAEjD,KAAK,IAAI,IAAI,GAAG,IAAI,SAAS,QAAQ,KACnC,KAAK,IAAI,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;EAGzC,MAAM,SAAS,SAAS,EAAE,CAAE,gBAAgB,UAAU,EAAG;EAGzD,IAAI,CAAC,QAAQ;EAEb,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;GACtC,MAAM,QAAQ,OAAO;GACrB,MAAM,gBAAgB,oBAAoB,IAAI,KAAK;GACnD,oBAAoB,IAClB,OACA,kBAAkB,SAAY,IAAI,gBAAgB,CACpD;EACF;CACF;CAGF,OAAO;AACT"}

package/dist/features/column-filtering/columnFilteringFeature.cjs

@@ -34,8 +34,8 @@ const columnFilteringFeature = {
 		});
 	},
 	initRowInstanceData: (row) => {
-		row.columnFilters = {};
-		row.columnFiltersMeta = {};
+		row.columnFilters = require_utils.makeObjectMap();
+		row.columnFiltersMeta = require_utils.makeObjectMap();
 	},
 	constructTableAPIs: (table) => {
 		require_utils.assignTableAPIs("columnFilteringFeature", table, {

package/dist/features/column-filtering/columnFilteringFeature.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"columnFilteringFeature.cjs","names":["getDefaultColumnFiltersState","makeStateUpdater","column_getAutoFilterFn","column_getFilterFn","column_getCanFilter","column_getIsFiltered","column_getFilterValue","column_getFilterIndex","column_setFilterValue","table_setColumnFilters","table_resetColumnFilters"],"sources":["../../../src/features/column-filtering/columnFilteringFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getAutoFilterFn,\n  column_getCanFilter,\n  column_getFilterFn,\n  column_getFilterIndex,\n  column_getFilterValue,\n  column_getIsFiltered,\n  column_setFilterValue,\n  getDefaultColumnFiltersState,\n  table_resetColumnFilters,\n  table_setColumnFilters,\n} from './columnFilteringFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds per-column filtering state, options, and column/table filter APIs.\n */\nexport const columnFilteringFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnFilters: getDefaultColumnFiltersState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultColumnDef: () => {\n    return {\n      filterFn: 'auto',\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnFiltersChange: makeStateUpdater('columnFilters', table),\n      filterFromLeafRows: false,\n      maxLeafRowFilterDepth: 100,\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnFilteringFeature', prototype, table, {\n      column_getAutoFilterFn: {\n        fn: (column) => column_getAutoFilterFn(column),\n      },\n      column_getFilterFn: {\n        fn: (column) => column_getFilterFn(column),\n      },\n      column_getCanFilter: {\n        fn: (column) => column_getCanFilter(column),\n      },\n      column_getIsFiltered: {\n        fn: (column) => column_getIsFiltered(column),\n      },\n      column_getFilterValue: {\n        fn: (column) => column_getFilterValue(column),\n      },\n      column_getFilterIndex: {\n        fn: (column) => column_getFilterIndex(column),\n      },\n      column_setFilterValue: {\n        fn: (column, value) => column_setFilterValue(column, value),\n      },\n    })\n  },\n\n  initRowInstanceData: (row) => {\n    ;(row as any).columnFilters = {}\n    ;(row as any).columnFiltersMeta = {}\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnFilteringFeature', table, {\n      table_setColumnFilters: {\n        fn: (updater) => table_setColumnFilters(table, updater),\n      },\n      table_resetColumnFilters: {\n        fn: (defaultState) => table_resetColumnFilters(table, defaultState),\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAsBA,MAAa,yBAAuC;CAClD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,eAAeA,kEAA6B;GAC5C,GAAG;EACL;CACF;CAEA,2BAA2B;EACzB,OAAO,EACL,UAAU,OACZ;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO;GACL,uBAAuBC,+BAAiB,iBAAiB,KAAK;GAC9D,oBAAoB;GACpB,uBAAuB;EACzB;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,kCAAoB,0BAA0B,WAAW,OAAO;GAC9D,wBAAwB,EACtB,KAAK,WAAWC,4DAAuB,MAAM,EAC/C;GACA,oBAAoB,EAClB,KAAK,WAAWC,wDAAmB,MAAM,EAC3C;GACA,qBAAqB,EACnB,KAAK,WAAWC,yDAAoB,MAAM,EAC5C;GACA,sBAAsB,EACpB,KAAK,WAAWC,0DAAqB,MAAM,EAC7C;GACA,uBAAuB,EACrB,KAAK,WAAWC,2DAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,WAAWC,2DAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,QAAQ,UAAUC,2DAAsB,QAAQ,KAAK,EAC5D;EACF,CAAC;CACH;CAEA,sBAAsB,QAAQ;EAC3B,AAAC,IAAY,gBAAgB,CAAC;EAC9B,AAAC,IAAY,oBAAoB,CAAC;CACrC;CAEA,qBAAqB,UAAU;EAC7B,8BAAgB,0BAA0B,OAAO;GAC/C,wBAAwB,EACtB,KAAK,YAAYC,4DAAuB,OAAO,OAAO,EACxD;GACA,0BAA0B,EACxB,KAAK,iBAAiBC,8DAAyB,OAAO,YAAY,EACpE;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"columnFilteringFeature.cjs","names":["getDefaultColumnFiltersState","makeStateUpdater","column_getAutoFilterFn","column_getFilterFn","column_getCanFilter","column_getIsFiltered","column_getFilterValue","column_getFilterIndex","column_setFilterValue","makeObjectMap","table_setColumnFilters","table_resetColumnFilters"],"sources":["../../../src/features/column-filtering/columnFilteringFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeObjectMap,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getAutoFilterFn,\n  column_getCanFilter,\n  column_getFilterFn,\n  column_getFilterIndex,\n  column_getFilterValue,\n  column_getIsFiltered,\n  column_setFilterValue,\n  getDefaultColumnFiltersState,\n  table_resetColumnFilters,\n  table_setColumnFilters,\n} from './columnFilteringFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds per-column filtering state, options, and column/table filter APIs.\n */\nexport const columnFilteringFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnFilters: getDefaultColumnFiltersState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultColumnDef: () => {\n    return {\n      filterFn: 'auto',\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnFiltersChange: makeStateUpdater('columnFilters', table),\n      filterFromLeafRows: false,\n      maxLeafRowFilterDepth: 100,\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnFilteringFeature', prototype, table, {\n      column_getAutoFilterFn: {\n        fn: (column) => column_getAutoFilterFn(column),\n      },\n      column_getFilterFn: {\n        fn: (column) => column_getFilterFn(column),\n      },\n      column_getCanFilter: {\n        fn: (column) => column_getCanFilter(column),\n      },\n      column_getIsFiltered: {\n        fn: (column) => column_getIsFiltered(column),\n      },\n      column_getFilterValue: {\n        fn: (column) => column_getFilterValue(column),\n      },\n      column_getFilterIndex: {\n        fn: (column) => column_getFilterIndex(column),\n      },\n      column_setFilterValue: {\n        fn: (column, value) => column_setFilterValue(column, value),\n      },\n    })\n  },\n\n  initRowInstanceData: (row) => {\n    ;(row as any).columnFilters = makeObjectMap()\n    ;(row as any).columnFiltersMeta = makeObjectMap()\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnFilteringFeature', table, {\n      table_setColumnFilters: {\n        fn: (updater) => table_setColumnFilters(table, updater),\n      },\n      table_resetColumnFilters: {\n        fn: (defaultState) => table_resetColumnFilters(table, defaultState),\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAuBA,MAAa,yBAAuC;CAClD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,eAAeA,kEAA6B;GAC5C,GAAG;EACL;CACF;CAEA,2BAA2B;EACzB,OAAO,EACL,UAAU,OACZ;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO;GACL,uBAAuBC,+BAAiB,iBAAiB,KAAK;GAC9D,oBAAoB;GACpB,uBAAuB;EACzB;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,kCAAoB,0BAA0B,WAAW,OAAO;GAC9D,wBAAwB,EACtB,KAAK,WAAWC,4DAAuB,MAAM,EAC/C;GACA,oBAAoB,EAClB,KAAK,WAAWC,wDAAmB,MAAM,EAC3C;GACA,qBAAqB,EACnB,KAAK,WAAWC,yDAAoB,MAAM,EAC5C;GACA,sBAAsB,EACpB,KAAK,WAAWC,0DAAqB,MAAM,EAC7C;GACA,uBAAuB,EACrB,KAAK,WAAWC,2DAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,WAAWC,2DAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,QAAQ,UAAUC,2DAAsB,QAAQ,KAAK,EAC5D;EACF,CAAC;CACH;CAEA,sBAAsB,QAAQ;EAC3B,AAAC,IAAY,gBAAgBC,4BAAc;EAC3C,AAAC,IAAY,oBAAoBA,4BAAc;CAClD;CAEA,qBAAqB,UAAU;EAC7B,8BAAgB,0BAA0B,OAAO;GAC/C,wBAAwB,EACtB,KAAK,YAAYC,4DAAuB,OAAO,OAAO,EACxD;GACA,0BAA0B,EACxB,KAAK,iBAAiBC,8DAAyB,OAAO,YAAY,EACpE;EACF,CAAC;CACH;AACF"}

package/dist/features/column-filtering/columnFilteringFeature.js

@@ -1,4 +1,4 @@
-import { assignPrototypeAPIs, assignTableAPIs, makeStateUpdater } from "../../utils.js";
+import { assignPrototypeAPIs, assignTableAPIs, makeObjectMap, makeStateUpdater } from "../../utils.js";
 import { column_getAutoFilterFn, column_getCanFilter, column_getFilterFn, column_getFilterIndex, column_getFilterValue, column_getIsFiltered, column_setFilterValue, getDefaultColumnFiltersState, table_resetColumnFilters, table_setColumnFilters } from "./columnFilteringFeature.utils.js";
 
 //#region src/features/column-filtering/columnFilteringFeature.ts
@@ -34,8 +34,8 @@ const columnFilteringFeature = {
 		});
 	},
 	initRowInstanceData: (row) => {
-		row.columnFilters = {};
-		row.columnFiltersMeta = {};
+		row.columnFilters = makeObjectMap();
+		row.columnFiltersMeta = makeObjectMap();
 	},
 	constructTableAPIs: (table) => {
 		assignTableAPIs("columnFilteringFeature", table, {

package/dist/features/column-filtering/columnFilteringFeature.js.map

@@ -1 +1 @@
-{"version":3,"file":"columnFilteringFeature.js","names":[],"sources":["../../../src/features/column-filtering/columnFilteringFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getAutoFilterFn,\n  column_getCanFilter,\n  column_getFilterFn,\n  column_getFilterIndex,\n  column_getFilterValue,\n  column_getIsFiltered,\n  column_setFilterValue,\n  getDefaultColumnFiltersState,\n  table_resetColumnFilters,\n  table_setColumnFilters,\n} from './columnFilteringFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds per-column filtering state, options, and column/table filter APIs.\n */\nexport const columnFilteringFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnFilters: getDefaultColumnFiltersState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultColumnDef: () => {\n    return {\n      filterFn: 'auto',\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnFiltersChange: makeStateUpdater('columnFilters', table),\n      filterFromLeafRows: false,\n      maxLeafRowFilterDepth: 100,\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnFilteringFeature', prototype, table, {\n      column_getAutoFilterFn: {\n        fn: (column) => column_getAutoFilterFn(column),\n      },\n      column_getFilterFn: {\n        fn: (column) => column_getFilterFn(column),\n      },\n      column_getCanFilter: {\n        fn: (column) => column_getCanFilter(column),\n      },\n      column_getIsFiltered: {\n        fn: (column) => column_getIsFiltered(column),\n      },\n      column_getFilterValue: {\n        fn: (column) => column_getFilterValue(column),\n      },\n      column_getFilterIndex: {\n        fn: (column) => column_getFilterIndex(column),\n      },\n      column_setFilterValue: {\n        fn: (column, value) => column_setFilterValue(column, value),\n      },\n    })\n  },\n\n  initRowInstanceData: (row) => {\n    ;(row as any).columnFilters = {}\n    ;(row as any).columnFiltersMeta = {}\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnFilteringFeature', table, {\n      table_setColumnFilters: {\n        fn: (updater) => table_setColumnFilters(table, updater),\n      },\n      table_resetColumnFilters: {\n        fn: (defaultState) => table_resetColumnFilters(table, defaultState),\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAsBA,MAAa,yBAAuC;CAClD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,eAAe,6BAA6B;GAC5C,GAAG;EACL;CACF;CAEA,2BAA2B;EACzB,OAAO,EACL,UAAU,OACZ;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO;GACL,uBAAuB,iBAAiB,iBAAiB,KAAK;GAC9D,oBAAoB;GACpB,uBAAuB;EACzB;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,oBAAoB,0BAA0B,WAAW,OAAO;GAC9D,wBAAwB,EACtB,KAAK,WAAW,uBAAuB,MAAM,EAC/C;GACA,oBAAoB,EAClB,KAAK,WAAW,mBAAmB,MAAM,EAC3C;GACA,qBAAqB,EACnB,KAAK,WAAW,oBAAoB,MAAM,EAC5C;GACA,sBAAsB,EACpB,KAAK,WAAW,qBAAqB,MAAM,EAC7C;GACA,uBAAuB,EACrB,KAAK,WAAW,sBAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,WAAW,sBAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,QAAQ,UAAU,sBAAsB,QAAQ,KAAK,EAC5D;EACF,CAAC;CACH;CAEA,sBAAsB,QAAQ;EAC3B,AAAC,IAAY,gBAAgB,CAAC;EAC9B,AAAC,IAAY,oBAAoB,CAAC;CACrC;CAEA,qBAAqB,UAAU;EAC7B,gBAAgB,0BAA0B,OAAO;GAC/C,wBAAwB,EACtB,KAAK,YAAY,uBAAuB,OAAO,OAAO,EACxD;GACA,0BAA0B,EACxB,KAAK,iBAAiB,yBAAyB,OAAO,YAAY,EACpE;EACF,CAAC;CACH;AACF"}
+{"version":3,"file":"columnFilteringFeature.js","names":[],"sources":["../../../src/features/column-filtering/columnFilteringFeature.ts"],"sourcesContent":["import {\n  assignPrototypeAPIs,\n  assignTableAPIs,\n  makeObjectMap,\n  makeStateUpdater,\n} from '../../utils'\nimport {\n  column_getAutoFilterFn,\n  column_getCanFilter,\n  column_getFilterFn,\n  column_getFilterIndex,\n  column_getFilterValue,\n  column_getIsFiltered,\n  column_setFilterValue,\n  getDefaultColumnFiltersState,\n  table_resetColumnFilters,\n  table_setColumnFilters,\n} from './columnFilteringFeature.utils'\nimport type { TableFeature } from '../../types/TableFeatures'\n\n/**\n * Feature that adds per-column filtering state, options, and column/table filter APIs.\n */\nexport const columnFilteringFeature: TableFeature = {\n  getInitialState: (initialState) => {\n    return {\n      columnFilters: getDefaultColumnFiltersState(),\n      ...initialState,\n    }\n  },\n\n  getDefaultColumnDef: () => {\n    return {\n      filterFn: 'auto',\n    }\n  },\n\n  getDefaultTableOptions: (table) => {\n    return {\n      onColumnFiltersChange: makeStateUpdater('columnFilters', table),\n      filterFromLeafRows: false,\n      maxLeafRowFilterDepth: 100,\n    }\n  },\n\n  assignColumnPrototype: (prototype, table) => {\n    assignPrototypeAPIs('columnFilteringFeature', prototype, table, {\n      column_getAutoFilterFn: {\n        fn: (column) => column_getAutoFilterFn(column),\n      },\n      column_getFilterFn: {\n        fn: (column) => column_getFilterFn(column),\n      },\n      column_getCanFilter: {\n        fn: (column) => column_getCanFilter(column),\n      },\n      column_getIsFiltered: {\n        fn: (column) => column_getIsFiltered(column),\n      },\n      column_getFilterValue: {\n        fn: (column) => column_getFilterValue(column),\n      },\n      column_getFilterIndex: {\n        fn: (column) => column_getFilterIndex(column),\n      },\n      column_setFilterValue: {\n        fn: (column, value) => column_setFilterValue(column, value),\n      },\n    })\n  },\n\n  initRowInstanceData: (row) => {\n    ;(row as any).columnFilters = makeObjectMap()\n    ;(row as any).columnFiltersMeta = makeObjectMap()\n  },\n\n  constructTableAPIs: (table) => {\n    assignTableAPIs('columnFilteringFeature', table, {\n      table_setColumnFilters: {\n        fn: (updater) => table_setColumnFilters(table, updater),\n      },\n      table_resetColumnFilters: {\n        fn: (defaultState) => table_resetColumnFilters(table, defaultState),\n      },\n    })\n  },\n}\n"],"mappings":";;;;;;;AAuBA,MAAa,yBAAuC;CAClD,kBAAkB,iBAAiB;EACjC,OAAO;GACL,eAAe,6BAA6B;GAC5C,GAAG;EACL;CACF;CAEA,2BAA2B;EACzB,OAAO,EACL,UAAU,OACZ;CACF;CAEA,yBAAyB,UAAU;EACjC,OAAO;GACL,uBAAuB,iBAAiB,iBAAiB,KAAK;GAC9D,oBAAoB;GACpB,uBAAuB;EACzB;CACF;CAEA,wBAAwB,WAAW,UAAU;EAC3C,oBAAoB,0BAA0B,WAAW,OAAO;GAC9D,wBAAwB,EACtB,KAAK,WAAW,uBAAuB,MAAM,EAC/C;GACA,oBAAoB,EAClB,KAAK,WAAW,mBAAmB,MAAM,EAC3C;GACA,qBAAqB,EACnB,KAAK,WAAW,oBAAoB,MAAM,EAC5C;GACA,sBAAsB,EACpB,KAAK,WAAW,qBAAqB,MAAM,EAC7C;GACA,uBAAuB,EACrB,KAAK,WAAW,sBAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,WAAW,sBAAsB,MAAM,EAC9C;GACA,uBAAuB,EACrB,KAAK,QAAQ,UAAU,sBAAsB,QAAQ,KAAK,EAC5D;EACF,CAAC;CACH;CAEA,sBAAsB,QAAQ;EAC3B,AAAC,IAAY,gBAAgB,cAAc;EAC3C,AAAC,IAAY,oBAAoB,cAAc;CAClD;CAEA,qBAAqB,UAAU;EAC7B,gBAAgB,0BAA0B,OAAO;GAC/C,wBAAwB,EACtB,KAAK,YAAY,uBAAuB,OAAO,OAAO,EACxD;GACA,0BAA0B,EACxB,KAAK,iBAAiB,yBAAyB,OAAO,YAAY,EACpE;EACF,CAAC;CACH;AACF"}

package/dist/features/column-filtering/columnFilteringFeature.types.d.cts

@@ -1,13 +1,23 @@
-import { CellData, OnChangeFn, RowData, Updater } from "../../types/type-utils.cjs";
-import { BuiltInFilterFn } from "../../fns/filterFns.cjs";
-import { Column } from "../../types/Column.cjs";
+import { CellData, OnChangeFn, RowData, TransformDataValueFn, Updater } from "../../types/type-utils.cjs";
+import { BuiltInFilterFn } from "./filterFns.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 { Column } from "../../types/Column.cjs";
+import { IsAny, TableFeatures } from "../../types/TableFeatures.cjs";
 
 //#region src/features/column-filtering/columnFilteringFeature.types.d.ts
 interface FilterMeta {}
+/**
+ * Resolves the type of the filter meta attached to rows for a feature set.
+ *
+ * When the features object declares a `filterMeta` type-only slot
+ * (`tableFeatures({ ..., filterMeta: {} as MyFilterMeta })`), that type wins.
+ * Otherwise this falls back to the global declaration-merged `FilterMeta`
+ * interface.
+ */
+type ExtractFilterMeta<TFeatures extends TableFeatures> = IsAny<TFeatures> extends true ? FilterMeta : TFeatures extends {
+  filterMeta: infer TFilterMeta extends object;
+} ? TFilterMeta : FilterMeta;
 interface FilterFns {}
 interface TableState_ColumnFiltering {
   columnFilters: ColumnFiltersState;
@@ -17,24 +27,77 @@ interface ColumnFilter {
   id: string;
   value: unknown;
 }
-interface ResolvedColumnFilter<TFeatures extends TableFeatures, TData extends RowData> {
+interface ResolvedColumnFilter<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   filterFn: FilterFn<TFeatures, TData>;
   id: string;
   resolvedValue: unknown;
 }
-interface RowModelFns_ColumnFiltering<TFeatures extends TableFeatures, TData extends RowData> {
-  filterFns: Record<keyof FilterFns, FilterFn<TFeatures, RowData>>;
+interface RowModelFns_ColumnFiltering<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  filterFns: Record<string, FilterFn<TFeatures, TData>>;
 }
-interface FilterFn<TFeatures extends TableFeatures, TData extends RowData> {
-  (row: Row<TFeatures, TData>, columnId: string, filterValue: any, addMeta?: (meta: FilterMeta) => void): boolean;
+interface FilterFn<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  (row: Row<TFeatures, TData>, columnId: string, filterValue: any, addMeta?: (meta: ExtractFilterMeta<TFeatures>) => void): boolean;
+  /**
+   * Removes the filter from `state.columnFilters` when the filter value fails
+   * this test (e.g. empty strings for text filters).
+   */
   autoRemove?: ColumnFilterAutoRemoveTestFn<TFeatures, TData>;
+  /**
+   * Normalizes the filter value before filtering runs.
+   *
+   * The table applies this once per filter (not per row) and passes the
+   * resolved value to the filter function as `filterValue`.
+   */
   resolveFilterValue?: TransformFilterValueFn<TFeatures, TData>;
+  /**
+   * Normalizes each row's value before it is compared against the filter
+   * value. Only honored by filter functions built with `constructFilterFn`
+   * (including all built-in filter functions).
+   */
+  resolveDataValue?: TransformDataValueFn;
+}
+/**
+ * The definition object accepted by `constructFilterFn`.
+ *
+ * `filter` is a value-level comparator: it receives the row's (resolved) data
+ * value and the (resolved) filter value instead of the whole row, so
+ * normalization concerns stay in `resolveDataValue`/`resolveFilterValue`.
+ */
+interface FilterFnDef<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  filter: (dataValue: any, filterValue: any, row: Row<TFeatures, TData>, columnId: string, addMeta?: (meta: ExtractFilterMeta<TFeatures>) => void) => boolean;
+  autoRemove?: (filterValue: any) => boolean;
+  resolveFilterValue?: (filterValue: any) => any;
+  resolveDataValue?: TransformDataValueFn;
+}
+/**
+ * The shape returned by `constructFilterFn`: a `FilterFn` with its definition
+ * attached, so variants can be built by spreading it into another
+ * `constructFilterFn` call.
+ *
+ * The call signature is generic so a created filter function can be used with
+ * any table's rows, regardless of the feature set it was defined against.
+ */
+interface CreatedFilterFn<in out TFeatures extends TableFeatures, in out TData extends RowData> extends FilterFnDef<TFeatures, TData> {
+  <TRowFeatures extends TableFeatures, TRowData extends RowData>(row: Row<TRowFeatures, TRowData>, columnId: string, filterValue: any, addMeta?: (meta: ExtractFilterMeta<TRowFeatures>) => void): boolean;
 }
 type TransformFilterValueFn<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData> = (value: any, column?: Column<TFeatures, TData, TValue>) => TValue;
 type ColumnFilterAutoRemoveTestFn<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData> = (value: any, column?: Column<TFeatures, TData, TValue>) => boolean;
-type CustomFilterFns<TFeatures extends TableFeatures, TData extends RowData> = Record<string, FilterFn<TFeatures, RowData>>;
-type FilterFnOption<TFeatures extends TableFeatures, TData extends RowData> = 'auto' | BuiltInFilterFn | keyof FilterFns | FilterFn<TFeatures, RowData>;
-interface ColumnDef_ColumnFiltering<TFeatures extends TableFeatures, TData extends RowData> {
+type CustomFilterFns<TFeatures extends TableFeatures, TData extends RowData> = Record<string, FilterFn<TFeatures, TData>>;
+/**
+ * Resolves the valid string names for `columnDef.filterFn` and
+ * `options.globalFilterFn` for a feature set.
+ *
+ * When the features object declares a `filterFns` registry
+ * (`tableFeatures({ ..., filterFns })`), its keys are the only valid names; a
+ * name is only assignable if a filter function is actually registered for it.
+ * Otherwise this falls back to the global declaration-merged `FilterFns`
+ * interface.
+ */
+type ExtractFilterFnKeys<TFeatures extends TableFeatures> = IsAny<TFeatures> extends true ? keyof FilterFns | BuiltInFilterFn : TFeatures extends {
+  filterFns: infer TFilterFns extends object;
+} ? Extract<keyof TFilterFns, string> : keyof FilterFns;
+type FilterFnOption<TFeatures extends TableFeatures, TData extends RowData> = 'auto' | ExtractFilterFnKeys<TFeatures> | FilterFn<TFeatures, TData>;
+interface ColumnDef_ColumnFiltering<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Enables this column to participate in column-specific filtering.
    *
@@ -47,7 +110,7 @@ interface ColumnDef_ColumnFiltering<TFeatures extends TableFeatures, TData exten
    */
   filterFn?: FilterFnOption<TFeatures, TData>;
 }
-interface Column_ColumnFiltering<TFeatures extends TableFeatures, TData extends RowData> {
+interface Column_ColumnFiltering<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Returns an automatically calculated filter function for the column based off of the columns first known value.
    */
@@ -80,7 +143,7 @@ interface Column_ColumnFiltering<TFeatures extends TableFeatures, TData extends
    */
   setFilterValue: (updater: Updater<any>) => void;
 }
-interface Row_ColumnFiltering<TFeatures extends TableFeatures, TData extends RowData> {
+interface Row_ColumnFiltering<in out TFeatures extends TableFeatures, in out _TData extends RowData> {
   /**
    * The column filters map for the row. This object tracks whether a row is passing/failing specific filters by their column ID.
    */
@@ -88,9 +151,9 @@ interface Row_ColumnFiltering<TFeatures extends TableFeatures, TData extends Row
   /**
    * The column filters meta map for the row. This object tracks any filter meta for a row as optionally provided during the filtering process.
    */
-  columnFiltersMeta: Record<string, FilterMeta>;
+  columnFiltersMeta: Record<string, ExtractFilterMeta<TFeatures>>;
 }
-interface TableOptions_ColumnFiltering<TFeatures extends TableFeatures, TData extends RowData> {
+interface TableOptions_ColumnFiltering<in out _TFeatures extends TableFeatures, in out _TData extends RowData> {
   /**
    * Enables column-specific filtering for all columns that also allow it.
    */
@@ -133,7 +196,7 @@ interface Table_ColumnFiltering {
    */
   setColumnFilters: (updater: Updater<ColumnFiltersState>) => void;
 }
-interface Table_RowModels_Filtered<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_RowModels_Filtered<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Resolves the row model after column and global filters have been applied.
    */
@@ -143,18 +206,9 @@ interface Table_RowModels_Filtered<TFeatures extends TableFeatures, TData extend
    */
   getPreFilteredRowModel: () => RowModel<TFeatures, TData>;
 }
-interface CreateRowModel_Filtered<TFeatures extends TableFeatures, TData extends RowData> {
-  /**
-   * If provided, this factory is called once per table and should return a
-   * function that calculates the filtered row model.
-   * - For server-side filtering, this function is unnecessary and can be ignored since the server should already return the filtered row model.
-   * - For client-side filtering, pass the exported `createFilteredRowModel()` or implement your own factory.
-   */
-  filteredRowModel?: (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData>;
-}
-interface CachedRowModel_Filtered<TFeatures extends TableFeatures, TData extends RowData> {
+interface CachedRowModel_Filtered<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   filteredRowModel: () => RowModel<TFeatures, TData>;
 }
 //#endregion
-export { CachedRowModel_Filtered, ColumnDef_ColumnFiltering, ColumnFilter, ColumnFilterAutoRemoveTestFn, ColumnFiltersState, Column_ColumnFiltering, CreateRowModel_Filtered, CustomFilterFns, FilterFn, FilterFnOption, FilterFns, FilterMeta, ResolvedColumnFilter, RowModelFns_ColumnFiltering, Row_ColumnFiltering, TableOptions_ColumnFiltering, TableState_ColumnFiltering, Table_ColumnFiltering, Table_RowModels_Filtered, TransformFilterValueFn };
+export { CachedRowModel_Filtered, ColumnDef_ColumnFiltering, ColumnFilter, ColumnFilterAutoRemoveTestFn, ColumnFiltersState, Column_ColumnFiltering, CreatedFilterFn, CustomFilterFns, ExtractFilterFnKeys, ExtractFilterMeta, FilterFn, FilterFnDef, FilterFnOption, FilterFns, FilterMeta, ResolvedColumnFilter, RowModelFns_ColumnFiltering, Row_ColumnFiltering, TableOptions_ColumnFiltering, TableState_ColumnFiltering, Table_ColumnFiltering, Table_RowModels_Filtered, TransformFilterValueFn };
 //# sourceMappingURL=columnFilteringFeature.types.d.cts.map