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

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

@@ -9,15 +9,12 @@ const columnFacetingFeature = {
 	assignColumnPrototype: (prototype, table) => {
 		assignPrototypeAPIs("columnFacetingFeature", prototype, table, {
 			column_getFacetedRowModel: {
-				memoDeps: () => {
-					var _table$atoms$columnFi, _table$atoms$globalFi;
-					return [
-						table.getPreFilteredRowModel().rows,
-						(_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().rows
-					];
-				},
+				memoDeps: () => [
+					table.getPreFilteredRowModel().rows,
+					table.atoms.columnFilters?.get(),
+					table.atoms.globalFilter?.get(),
+					table.getFilteredRowModel().rows
+				],
 				fn: (column) => column_getFacetedRowModel(column, column.table)
 			},
 			column_getFacetedMinMaxValues: {
@@ -33,15 +30,12 @@ const columnFacetingFeature = {
 	constructTableAPIs: (table) => {
 		assignTableAPIs("columnFacetingFeature", table, {
 			table_getGlobalFacetedRowModel: {
-				memoDeps: () => {
-					var _table$atoms$columnFi2, _table$atoms$globalFi2;
-					return [
-						table.getPreFilteredRowModel().rows,
-						(_table$atoms$columnFi2 = table.atoms.columnFilters) === null || _table$atoms$columnFi2 === void 0 ? void 0 : _table$atoms$columnFi2.get(),
-						(_table$atoms$globalFi2 = table.atoms.globalFilter) === null || _table$atoms$globalFi2 === void 0 ? void 0 : _table$atoms$globalFi2.get(),
-						table.getFilteredRowModel().rows
-					];
-				},
+				memoDeps: () => [
+					table.getPreFilteredRowModel().rows,
+					table.atoms.columnFilters?.get(),
+					table.atoms.globalFilter?.get(),
+					table.getFilteredRowModel().rows
+				],
 				fn: () => table_getGlobalFacetedRowModel(table)
 			},
 			table_getGlobalFacetedMinMaxValues: {
@@ -57,5 +51,4 @@ const columnFacetingFeature = {
 };
 
 //#endregion
-export { columnFacetingFeature };
-//# sourceMappingURL=columnFacetingFeature.js.map
+export { columnFacetingFeature };

package/dist/features/column-faceting/columnFacetingFeature.types.d.ts

@@ -1,10 +1,8 @@
 import { RowData } from "../../types/type-utils.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
-
+import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/features/column-faceting/columnFacetingFeature.types.d.ts
-interface Column_ColumnFaceting<TFeatures extends TableFeatures, TData extends RowData> {
+interface Column_ColumnFaceting<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Computes min/max numeric facet values for this column.
    */
@@ -21,52 +19,35 @@ interface Column_ColumnFaceting<TFeatures extends TableFeatures, TData extends R
    */
   getFacetedUniqueValues: () => Map<any, number>;
 }
-interface Table_RowModels_Faceted<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_RowModels_Faceted<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Computes min/max numeric facet values for the active faceting context.
    *
-   * Requires a `facetedMinMaxValues` row-model factory in `rowModels`.
+   * Requires a `facetedMinMaxValues` row-model factory on the `features` option.
    */
   getFacetedMinMaxValues: () => undefined | [number, number];
   /**
    * Computes the row model used to derive facet values.
    *
-   * Requires a `facetedRowModel` row-model factory in `rowModels`.
+   * Requires a `facetedRowModel` row-model factory on the `features` option.
    */
   getFacetedRowModel: () => RowModel<TFeatures, TData>;
   /**
    * Computes unique facet values and occurrence counts.
    *
-   * Requires a `facetedUniqueValues` row-model factory in `rowModels`.
+   * Requires a `facetedUniqueValues` row-model factory on the `features` option.
    */
   getFacetedUniqueValues: () => Map<any, number>;
 }
-interface CreateRowModel_Faceted<TFeatures extends TableFeatures, TData extends RowData> {
-  /**
-   * Factory used to retrieve faceted min/max values. If using server-side
-   * faceting, this is not required. To use client-side faceting, pass
-   * `createFacetedMinMaxValues()` or implement your own factory.
-   */
-  facetedMinMaxValues?: (table: Table<TFeatures, TData>, columnId: string) => () => [number, number] | undefined;
-  /**
-   * Factory used to retrieve the faceted row model. If using server-side
-   * faceting, this is not required. To use client-side faceting, pass
-   * `createFacetedRowModel()` or implement your own factory.
-   */
-  facetedRowModel?: (table: Table<TFeatures, TData>, columnId: string) => () => RowModel<TFeatures, TData>;
-  /**
-   * Factory used to retrieve faceted unique values. If using server-side
-   * faceting, this is not required. To use client-side faceting, pass
-   * `createFacetedUniqueValues()` or implement your own factory.
-   */
-  facetedUniqueValues?: (table: Table<TFeatures, TData>, columnId: string) => () => Map<any, number>;
-}
-interface CachedRowModel_Faceted<TFeatures extends TableFeatures, TData extends RowData> {
-  facetedRowModel?: (columnId: string) => () => RowModel<TFeatures, TData>;
-  facetedMinMaxValues?: (columnId: string) => [number, number];
-  facetedUniqueValues?: (columnId: string) => Map<any, number>;
+interface CachedRowModel_Faceted<in out TFeatures extends TableFeatures, in out TData extends RowData> {
+  facetedRowModels?: Record<string, () => RowModel<TFeatures, TData>>;
+  facetedMinMaxValues?: Record<string, () => undefined | [number, number]>;
+  facetedUniqueValues?: Record<string, () => Map<any, number>>;
+  globalFacetedRowModel?: () => RowModel<TFeatures, TData>;
+  globalFacetedMinMaxValues?: () => undefined | [number, number];
+  globalFacetedUniqueValues?: () => Map<any, number>;
 }
-interface Table_ColumnFaceting<TFeatures extends TableFeatures, TData extends RowData> {
+interface Table_ColumnFaceting<in out TFeatures extends TableFeatures, in out TData extends RowData> {
   /**
    * Returns the min and max values for the global filter.
    */
@@ -81,5 +62,4 @@ interface Table_ColumnFaceting<TFeatures extends TableFeatures, TData extends Ro
   getGlobalFacetedUniqueValues: () => Map<any, number>;
 }
 //#endregion
-export { CachedRowModel_Faceted, Column_ColumnFaceting, CreateRowModel_Faceted, Table_ColumnFaceting, Table_RowModels_Faceted };
-//# sourceMappingURL=columnFacetingFeature.types.d.ts.map
+export { CachedRowModel_Faceted, Column_ColumnFaceting, Table_ColumnFaceting, Table_RowModels_Faceted };

package/dist/features/column-faceting/columnFacetingFeature.utils.d.ts

@@ -1,9 +1,8 @@
 import { CellData, RowData } from "../../types/type-utils.js";
-import { Column_Internal } from "../../types/Column.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table_Internal } from "../../types/Table.js";
+import { Column } from "../../types/Column.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/column-faceting/columnFacetingFeature.utils.d.ts
 /**
  * Computes min and max numeric facet values for one column.
@@ -16,7 +15,7 @@ import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
  * const range = column_getFacetedMinMaxValues(column, table)
  * ```
  */
-declare function column_getFacetedMinMaxValues<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>, table: Table_Internal<TFeatures, TData>): [number, number] | undefined;
+declare function column_getFacetedMinMaxValues<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>): [number, number] | undefined;
 /**
  * Computes the row model used to derive one column's facet values.
  *
@@ -29,7 +28,7 @@ declare function column_getFacetedMinMaxValues<TFeatures extends TableFeatures,
  * const rows = column_getFacetedRowModel(column, table)
  * ```
  */
-declare function column_getFacetedRowModel<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue> | undefined, table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData>;
+declare function column_getFacetedRowModel<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue> | undefined, table: Table<TFeatures, TData>): RowModel<TFeatures, TData>;
 /**
  * Computes unique facet values and their occurrence counts for one column.
  *
@@ -41,7 +40,7 @@ declare function column_getFacetedRowModel<TFeatures extends TableFeatures, TDat
  * const values = column_getFacetedUniqueValues(column, table)
  * ```
  */
-declare function column_getFacetedUniqueValues<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column_Internal<TFeatures, TData, TValue>, table: Table_Internal<TFeatures, TData>): Map<any, number>;
+declare function column_getFacetedUniqueValues<TFeatures extends TableFeatures, TData extends RowData, TValue extends CellData = CellData>(column: Column<TFeatures, TData, TValue>, table: Table<TFeatures, TData>): Map<any, number>;
 /**
  * Computes min and max numeric facet values for the global filter context.
  *
@@ -53,7 +52,7 @@ declare function column_getFacetedUniqueValues<TFeatures extends TableFeatures,
  * const range = table_getGlobalFacetedMinMaxValues(table)
  * ```
  */
-declare function table_getGlobalFacetedMinMaxValues<TFeatures extends TableFeatures, TData extends RowData>(table: Table_Internal<TFeatures, TData>): undefined | [number, number];
+declare function table_getGlobalFacetedMinMaxValues<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>): undefined | [number, number];
 /**
  * Computes the row model used to derive global facet values.
  *
@@ -66,7 +65,7 @@ declare function table_getGlobalFacetedMinMaxValues<TFeatures extends TableFeatu
  * const rows = table_getGlobalFacetedRowModel(table)
  * ```
  */
-declare function table_getGlobalFacetedRowModel<TFeatures extends TableFeatures, TData extends RowData>(table: Table_Internal<TFeatures, TData>): RowModel<TFeatures, TData>;
+declare function table_getGlobalFacetedRowModel<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>): RowModel<TFeatures, TData>;
 /**
  * Computes unique values and occurrence counts for the global filter context.
  *
@@ -78,7 +77,6 @@ declare function table_getGlobalFacetedRowModel<TFeatures extends TableFeatures,
  * const values = table_getGlobalFacetedUniqueValues(table)
  * ```
  */
-declare function table_getGlobalFacetedUniqueValues<TFeatures extends TableFeatures, TData extends RowData>(table: Table_Internal<TFeatures, TData>): Map<any, number>;
+declare function table_getGlobalFacetedUniqueValues<TFeatures extends TableFeatures, TData extends RowData>(table: Table<TFeatures, TData>): Map<any, number>;
 //#endregion
-export { column_getFacetedMinMaxValues, column_getFacetedRowModel, column_getFacetedUniqueValues, table_getGlobalFacetedMinMaxValues, table_getGlobalFacetedRowModel, table_getGlobalFacetedUniqueValues };
-//# sourceMappingURL=columnFacetingFeature.utils.d.ts.map
+export { column_getFacetedMinMaxValues, column_getFacetedRowModel, column_getFacetedUniqueValues, table_getGlobalFacetedMinMaxValues, table_getGlobalFacetedRowModel, table_getGlobalFacetedUniqueValues };

package/dist/features/column-faceting/columnFacetingFeature.utils.js

@@ -1,3 +1,5 @@
+import { makeObjectMap } from "../../utils.js";
+
 //#region src/features/column-faceting/columnFacetingFeature.utils.ts
 /**
 * Computes min and max numeric facet values for one column.
@@ -11,8 +13,10 @@
 * ```
 */
 function column_getFacetedMinMaxValues(column, table) {
-	var _table$options$rowMod, _table$options$rowMod2;
-	return (((_table$options$rowMod = table.options.rowModels) === null || _table$options$rowMod === void 0 || (_table$options$rowMod2 = _table$options$rowMod.facetedMinMaxValues) === null || _table$options$rowMod2 === void 0 ? void 0 : _table$options$rowMod2.call(_table$options$rowMod, table, column.id)) ?? (() => void 0))();
+	const facetedMinMaxValues = table._rowModels.facetedMinMaxValues ??= makeObjectMap();
+	let facetedMinMaxValuesFn = facetedMinMaxValues[column.id];
+	if (!facetedMinMaxValuesFn) facetedMinMaxValuesFn = facetedMinMaxValues[column.id] = table.options.features.facetedMinMaxValues?.(table, column.id) ?? (() => void 0);
+	return facetedMinMaxValuesFn();
 }
 /**
 * Computes the row model used to derive one column's facet values.
@@ -27,8 +31,11 @@ function column_getFacetedMinMaxValues(column, table) {
 * ```
 */
 function column_getFacetedRowModel(column, table) {
-	var _table$options$rowMod3, _table$options$rowMod4;
-	return (((_table$options$rowMod3 = table.options.rowModels) === null || _table$options$rowMod3 === void 0 || (_table$options$rowMod4 = _table$options$rowMod3.facetedRowModel) === null || _table$options$rowMod4 === void 0 ? void 0 : _table$options$rowMod4.call(_table$options$rowMod3, table, (column === null || column === void 0 ? void 0 : column.id) ?? "")) ?? (() => table.getPreFilteredRowModel()))();
+	const columnId = column?.id ?? "";
+	const facetedRowModels = table._rowModels.facetedRowModels ??= makeObjectMap();
+	let facetedRowModelFn = facetedRowModels[columnId];
+	if (!facetedRowModelFn) facetedRowModelFn = facetedRowModels[columnId] = table.options.features.facetedRowModel?.(table, columnId) ?? (() => table.getPreFilteredRowModel());
+	return facetedRowModelFn();
 }
 /**
 * Computes unique facet values and their occurrence counts for one column.
@@ -42,8 +49,10 @@ function column_getFacetedRowModel(column, table) {
 * ```
 */
 function column_getFacetedUniqueValues(column, table) {
-	var _table$options$rowMod5, _table$options$rowMod6;
-	return (((_table$options$rowMod5 = table.options.rowModels) === null || _table$options$rowMod5 === void 0 || (_table$options$rowMod6 = _table$options$rowMod5.facetedUniqueValues) === null || _table$options$rowMod6 === void 0 ? void 0 : _table$options$rowMod6.call(_table$options$rowMod5, table, column.id)) ?? (() => /* @__PURE__ */ new Map()))();
+	const facetedUniqueValues = table._rowModels.facetedUniqueValues ??= makeObjectMap();
+	let facetedUniqueValuesFn = facetedUniqueValues[column.id];
+	if (!facetedUniqueValuesFn) facetedUniqueValuesFn = facetedUniqueValues[column.id] = table.options.features.facetedUniqueValues?.(table, column.id) ?? (() => /* @__PURE__ */ new Map());
+	return facetedUniqueValuesFn();
 }
 /**
 * Computes min and max numeric facet values for the global filter context.
@@ -57,8 +66,9 @@ function column_getFacetedUniqueValues(column, table) {
 * ```
 */
 function table_getGlobalFacetedMinMaxValues(table) {
-	var _table$options$rowMod7, _table$options$rowMod8;
-	return (((_table$options$rowMod7 = table.options.rowModels) === null || _table$options$rowMod7 === void 0 || (_table$options$rowMod8 = _table$options$rowMod7.facetedMinMaxValues) === null || _table$options$rowMod8 === void 0 ? void 0 : _table$options$rowMod8.call(_table$options$rowMod7, table, "__global__")) ?? (() => void 0))();
+	if (!table._rowModels.globalFacetedMinMaxValues) table._rowModels.globalFacetedMinMaxValues = table.options.features.facetedMinMaxValues?.(table, "__global__") ?? (() => void 0);
+	const facetedMinMaxValuesFn = table._rowModels.globalFacetedMinMaxValues;
+	return facetedMinMaxValuesFn();
 }
 /**
 * Computes the row model used to derive global facet values.
@@ -73,8 +83,9 @@ function table_getGlobalFacetedMinMaxValues(table) {
 * ```
 */
 function table_getGlobalFacetedRowModel(table) {
-	var _table$options$rowMod9, _table$options$rowMod10;
-	return (((_table$options$rowMod9 = table.options.rowModels) === null || _table$options$rowMod9 === void 0 || (_table$options$rowMod10 = _table$options$rowMod9.facetedRowModel) === null || _table$options$rowMod10 === void 0 ? void 0 : _table$options$rowMod10.call(_table$options$rowMod9, table, "__global__")) ?? (() => table.getPreFilteredRowModel()))();
+	if (!table._rowModels.globalFacetedRowModel) table._rowModels.globalFacetedRowModel = table.options.features.facetedRowModel?.(table, "__global__") ?? (() => table.getPreFilteredRowModel());
+	const facetedRowModelFn = table._rowModels.globalFacetedRowModel;
+	return facetedRowModelFn();
 }
 /**
 * Computes unique values and occurrence counts for the global filter context.
@@ -88,10 +99,10 @@ function table_getGlobalFacetedRowModel(table) {
 * ```
 */
 function table_getGlobalFacetedUniqueValues(table) {
-	var _table$options$rowMod11, _table$options$rowMod12;
-	return (((_table$options$rowMod11 = table.options.rowModels) === null || _table$options$rowMod11 === void 0 || (_table$options$rowMod12 = _table$options$rowMod11.facetedUniqueValues) === null || _table$options$rowMod12 === void 0 ? void 0 : _table$options$rowMod12.call(_table$options$rowMod11, table, "__global__")) ?? (() => /* @__PURE__ */ new Map()))();
+	if (!table._rowModels.globalFacetedUniqueValues) table._rowModels.globalFacetedUniqueValues = table.options.features.facetedUniqueValues?.(table, "__global__") ?? (() => /* @__PURE__ */ new Map());
+	const facetedUniqueValuesFn = table._rowModels.globalFacetedUniqueValues;
+	return facetedUniqueValuesFn();
 }
 
 //#endregion
-export { column_getFacetedMinMaxValues, column_getFacetedRowModel, column_getFacetedUniqueValues, table_getGlobalFacetedMinMaxValues, table_getGlobalFacetedRowModel, table_getGlobalFacetedUniqueValues };
-//# sourceMappingURL=columnFacetingFeature.utils.js.map
+export { column_getFacetedMinMaxValues, column_getFacetedRowModel, column_getFacetedUniqueValues, table_getGlobalFacetedMinMaxValues, table_getGlobalFacetedRowModel, table_getGlobalFacetedUniqueValues };

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

@@ -1,7 +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/createFacetedMinMaxValues.d.ts
 /**
  * Creates a memoized faceted min max values helper for faceted filtering.
@@ -10,5 +9,4 @@ import { Table } from "../../types/Table.js";
  */
 declare function createFacetedMinMaxValues<TFeatures extends TableFeatures, TData extends RowData = any>(): (table: Table<TFeatures, TData>, columnId: string) => () => undefined | [number, number];
 //#endregion
-export { createFacetedMinMaxValues };
-//# sourceMappingURL=createFacetedMinMaxValues.d.ts.map
+export { createFacetedMinMaxValues };

package/dist/features/column-faceting/createFacetedMinMaxValues.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/createFacetedMinMaxValues.ts
 /**
@@ -12,9 +13,10 @@ function createFacetedMinMaxValues() {
 		const table = _table;
 		return tableMemo({
 			feature: "columnFacetingFeature",
-			fn: (flatRows) => _createFacetedMinMaxValues(columnId, flatRows),
+			fn: (flatRows) => _createFacetedMinMaxValues(table, columnId, flatRows),
 			fnName: "table.getFacetedMinMaxValues",
 			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];
@@ -23,13 +25,14 @@ function createFacetedMinMaxValues() {
 		});
 	};
 }
-function _createFacetedMinMaxValues(columnId, flatRows) {
+function _createFacetedMinMaxValues(table, columnId, flatRows) {
 	if (!flatRows.length) return void 0;
+	const columnIds = columnId === "__global__" ? table.getAllLeafColumns().filter((column) => column_getCanGlobalFilter(column)).map((column) => column.id) : [columnId];
 	let facetedMinValue = Number.POSITIVE_INFINITY;
 	let facetedMaxValue = Number.NEGATIVE_INFINITY;
 	let foundAny = false;
-	for (let i = 0; i < flatRows.length; i++) {
-		const value = Number(flatRows[i].getValue(columnId));
+	for (let i = 0; i < flatRows.length; i++) for (let c = 0; c < columnIds.length; c++) {
+		const value = Number(flatRows[i].getValue(columnIds[c]));
 		if (Number.isNaN(value)) continue;
 		foundAny = true;
 		if (value < facetedMinValue) facetedMinValue = value;
@@ -40,5 +43,4 @@ function _createFacetedMinMaxValues(columnId, flatRows) {
 }
 
 //#endregion
-export { createFacetedMinMaxValues };
-//# sourceMappingURL=createFacetedMinMaxValues.js.map
+export { createFacetedMinMaxValues };

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

@@ -1,8 +1,7 @@
 import { RowData } from "../../types/type-utils.js";
-import { TableFeatures } from "../../types/TableFeatures.js";
-import { Table } from "../../types/Table.js";
 import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
-
+import { Table } from "../../types/Table.js";
+import { TableFeatures } from "../../types/TableFeatures.js";
 //#region src/features/column-faceting/createFacetedRowModel.d.ts
 /**
  * Creates a memoized faceted row model factory.
@@ -11,5 +10,4 @@ import { RowModel } from "../../core/row-models/coreRowModelsFeature.types.js";
  */
 declare function createFacetedRowModel<TFeatures extends TableFeatures, TData extends RowData = any>(): (table: Table<TFeatures, TData>, columnId: string) => () => RowModel<TFeatures, TData>;
 //#endregion
-export { createFacetedRowModel };
-//# sourceMappingURL=createFacetedRowModel.d.ts.map
+export { createFacetedRowModel };

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

@@ -14,37 +14,32 @@ 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;
+	const hasGlobalFilter = globalFilter !== void 0 && globalFilter !== null && globalFilter !== "";
+	if (!preRowModel.rows.length || !columnFilters?.length && !hasGlobalFilter) 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 (hasGlobalFilter && 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);
 }
 
 //#endregion
-export { createFacetedRowModel };
-//# sourceMappingURL=createFacetedRowModel.js.map
+export { createFacetedRowModel };

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

@@ -1,7 +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
 /**
  * Creates a memoized faceted unique values helper for faceted filtering.
@@ -10,5 +9,4 @@ import { Table } from "../../types/Table.js";
  */
 declare function createFacetedUniqueValues<TFeatures extends TableFeatures, TData extends RowData = any>(): (table: Table<TFeatures, TData>, columnId: string) => () => Map<any, number>;
 //#endregion
-export { createFacetedUniqueValues };
-//# sourceMappingURL=createFacetedUniqueValues.d.ts.map
+export { createFacetedUniqueValues };

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,27 +16,29 @@ 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;
 }
 
 //#endregion
-export { createFacetedUniqueValues };
-//# sourceMappingURL=createFacetedUniqueValues.js.map
+export { createFacetedUniqueValues };

package/dist/features/column-filtering/columnFilteringFeature.d.ts

@@ -1,10 +1,8 @@
 import { TableFeature } from "../../types/TableFeatures.js";
-
 //#region src/features/column-filtering/columnFilteringFeature.d.ts
 /**
  * Feature that adds per-column filtering state, options, and column/table filter APIs.
  */
 declare const columnFilteringFeature: TableFeature;
 //#endregion
-export { columnFilteringFeature };
-//# sourceMappingURL=columnFilteringFeature.d.ts.map
+export { columnFilteringFeature };

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, {
@@ -46,5 +46,4 @@ const columnFilteringFeature = {
 };
 
 //#endregion
-export { columnFilteringFeature };
-//# sourceMappingURL=columnFilteringFeature.js.map
+export { columnFilteringFeature };