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

package/src/fns/sortFns.ts

@@ -1,7 +1,6 @@
 import type { RowData } from '../types/type-utils'
 import type { TableFeatures } from '../types/TableFeatures'
 import type { Row } from '../types/Row'
-import type { SortFn } from '../features/row-sorting/rowSortingFeature.types'
 
 /**
  * Regular expression used to split mixed text and numeric chunks.
@@ -16,12 +15,12 @@ export const reSplitAlphaNumeric = /([0-9]+)/gm
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_alphanumeric: SortFn<any, any> = <
+export const sortFn_alphanumeric = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareAlphanumeric(
@@ -35,12 +34,12 @@ export const sortFn_alphanumeric: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_alphanumericCaseSensitive: SortFn<any, any> = <
+export const sortFn_alphanumericCaseSensitive = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareAlphanumeric(
@@ -56,12 +55,12 @@ export const sortFn_alphanumericCaseSensitive: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_text: SortFn<any, any> = <
+export const sortFn_text = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(
@@ -77,12 +76,12 @@ export const sortFn_text: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_textCaseSensitive: SortFn<any, any> = <
+export const sortFn_textCaseSensitive = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(
@@ -96,12 +95,12 @@ export const sortFn_textCaseSensitive: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_datetime: SortFn<any, any> = <
+export const sortFn_datetime = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   const a: number | string = rowA.getValue(columnId)
@@ -118,12 +117,12 @@ export const sortFn_datetime: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_basic: SortFn<any, any> = <
+export const sortFn_basic = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(rowA.getValue(columnId), rowB.getValue(columnId))

package/src/types/Cell.ts

@@ -1,41 +1,21 @@
 import type { Cell_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
-import type { CellData, RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { CellData, RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Cell_Cell } from '../core/cells/coreCellsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Cell_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface Cell_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
 > extends Cell_Cell<TFeatures, TData, TValue> {}
 
+export interface Cell_FeatureMap {
+  columnGroupingFeature: Cell_ColumnGrouping
+}
+
 export type Cell<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
-> = Cell_Cell<TFeatures, TData, TValue> &
-  UnionToIntersection<
-    'columnGroupingFeature' extends keyof TFeatures
-      ? Cell_ColumnGrouping
-      : never
-  > &
-  ExtractFeatureTypes<'Cell', TFeatures> &
-  Cell_Plugins<TFeatures, TData, TValue>
-
-// export type Cell<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-//   TValue extends CellData = CellData,
-// > = Cell_Core<TFeatures, TData, TValue> &
-//   ExtractFeatureTypes<TFeatures, 'Cell'> &
-//   Cell_Plugins<TFeatures, TData, TValue>
+> = Cell_Core<TFeatures, TData, TValue> &
+  ExtractFeatureMapTypes<TFeatures, Cell_FeatureMap>

package/src/types/Column.ts

@@ -9,73 +9,38 @@ import type { Column_ColumnResizing } from '../features/column-resizing/columnRe
 import type { Column_ColumnSizing } from '../features/column-sizing/columnSizingFeature.types'
 import type { Column_ColumnVisibility } from '../features/column-visibility/columnVisibilityFeature.types'
 import type { ColumnDefBase_All } from './ColumnDef'
-import type { RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Column_Column } from '../core/columns/coreColumnsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Column_Plugins<
+export interface Column_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue = unknown,
-> {}
+> extends Column_Column<TFeatures, TData, TValue> {}
 
-export interface Column_Core<
+export interface Column_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
-  TValue = unknown,
-> extends Column_Column<TFeatures, TData, TValue> {}
+> {
+  columnFacetingFeature: Column_ColumnFaceting<TFeatures, TData>
+  columnFilteringFeature: Column_ColumnFiltering<TFeatures, TData>
+  columnGroupingFeature: Column_ColumnGrouping<TFeatures, TData>
+  columnOrderingFeature: Column_ColumnOrdering
+  columnPinningFeature: Column_ColumnPinning
+  columnResizingFeature: Column_ColumnResizing
+  columnSizingFeature: Column_ColumnSizing
+  columnVisibilityFeature: Column_ColumnVisibility
+  globalFilteringFeature: Column_GlobalFiltering
+  rowSortingFeature: Column_RowSorting<TFeatures, TData>
+}
 
 export type Column<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue = unknown,
 > = Column_Core<TFeatures, TData, TValue> &
-  UnionToIntersection<
-    | ('columnFacetingFeature' extends keyof TFeatures
-        ? Column_ColumnFaceting<TFeatures, TData>
-        : never)
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? Column_ColumnFiltering<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? Column_ColumnGrouping<TFeatures, TData>
-        : never)
-    | ('columnOrderingFeature' extends keyof TFeatures
-        ? Column_ColumnOrdering
-        : never)
-    | ('columnPinningFeature' extends keyof TFeatures
-        ? Column_ColumnPinning
-        : never)
-    | ('columnResizingFeature' extends keyof TFeatures
-        ? Column_ColumnResizing
-        : never)
-    | ('columnSizingFeature' extends keyof TFeatures
-        ? Column_ColumnSizing
-        : never)
-    | ('columnVisibilityFeature' extends keyof TFeatures
-        ? Column_ColumnVisibility
-        : never)
-    | ('globalFilteringFeature' extends keyof TFeatures
-        ? Column_GlobalFiltering
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? Column_RowSorting<TFeatures, TData>
-        : never)
-  > &
-  ExtractFeatureTypes<'Column', TFeatures> &
-  Column_Plugins<TFeatures, TData, TValue>
-
-// export type Column<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-//   TValue = unknown,
-// > = Column_Core<TFeatures, TData, TValue> &
-//   ExtractFeatureTypes<'Column', TFeatures> &
-//   Column_Plugins<TFeatures, TData, TValue>
+  ExtractFeatureMapTypes<TFeatures, Column_FeatureMap<TFeatures, TData>>
 
 export type Column_Internal<
   TFeatures extends TableFeatures,

package/src/types/ColumnDef.ts

@@ -1,5 +1,5 @@
 import type { CellData, RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { CellContext } from '../core/cells/coreCellsFeature.types'
 import type { HeaderContext } from '../core/headers/coreHeadersFeature.types'
 import type { ColumnDef_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
@@ -11,16 +11,6 @@ import type { ColumnDef_ColumnVisibility } from '../features/column-visibility/c
 import type { ColumnDef_GlobalFiltering } from '../features/global-filtering/globalFilteringFeature.types'
 import type { ColumnDef_RowSorting } from '../features/row-sorting/rowSortingFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface ColumnDef_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface ColumnMeta<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -110,47 +100,30 @@ interface ColumnDefBase_Core<
   meta?: ColumnMeta<TFeatures, TData, TValue>
 }
 
+export interface ColumnDef_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+  TValue extends CellData,
+> {
+  columnVisibilityFeature: ColumnDef_ColumnVisibility
+  columnPinningFeature: ColumnDef_ColumnPinning
+  columnFilteringFeature: ColumnDef_ColumnFiltering<TFeatures, TData>
+  globalFilteringFeature: ColumnDef_GlobalFiltering
+  rowSortingFeature: ColumnDef_RowSorting<TFeatures, TData>
+  columnGroupingFeature: ColumnDef_ColumnGrouping<TFeatures, TData, TValue>
+  columnSizingFeature: ColumnDef_ColumnSizing
+  columnResizingFeature: ColumnDef_ColumnResizing
+}
+
 export type ColumnDefBase<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
 > = ColumnDefBase_Core<TFeatures, TData, TValue> &
-  UnionToIntersection<
-    | ('columnVisibilityFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnVisibility
-        : never)
-    | ('columnPinningFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnPinning
-        : never)
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnFiltering<TFeatures, TData>
-        : never)
-    | ('globalFilteringFeature' extends keyof TFeatures
-        ? ColumnDef_GlobalFiltering
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? ColumnDef_RowSorting<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnGrouping<TFeatures, TData, TValue>
-        : never)
-    | ('columnSizingFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnSizing
-        : never)
-    | ('columnResizingFeature' extends keyof TFeatures
-        ? ColumnDef_ColumnResizing
-        : never)
-  > &
-  ExtractFeatureTypes<'ColumnDef', TFeatures> &
-  ColumnDef_Plugins<TFeatures, TData, TValue>
-
-// export type ColumnDefBase<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-//   TValue extends CellData = CellData,
-// > = ColumnDefBase_Core<TFeatures, TData, TValue> &
-//   ExtractFeatureTypes<'ColumnDef', TFeatures> &
-//   ColumnDef_Plugins<TFeatures, TData, TValue>
+  ExtractFeatureMapTypes<
+    TFeatures,
+    ColumnDef_FeatureMap<TFeatures, TData, TValue>
+  >
 
 export type ColumnDefBase_All<
   TFeatures extends TableFeatures,

package/src/types/Header.ts

@@ -1,45 +1,23 @@
 import type { Header_ColumnSizing } from '../features/column-sizing/columnSizingFeature.types'
-import type { CellData, RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { CellData, RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Header_Header } from '../core/headers/coreHeadersFeature.types'
 import type { Header_ColumnResizing } from '../features/column-resizing/columnResizingFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Header_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface Header_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
 > extends Header_Header<TFeatures, TData, TValue> {}
 
+export interface Header_FeatureMap {
+  columnSizingFeature: Header_ColumnSizing
+  columnResizingFeature: Header_ColumnResizing
+}
+
 export type Header<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
 > = Header_Core<TFeatures, TData, TValue> &
-  UnionToIntersection<
-    | ('columnSizingFeature' extends keyof TFeatures
-        ? Header_ColumnSizing
-        : never)
-    | ('columnResizingFeature' extends keyof TFeatures
-        ? Header_ColumnResizing
-        : never)
-  > &
-  ExtractFeatureTypes<'Header', TFeatures> &
-  Header_Plugins<TFeatures, TData, TValue>
-
-// export type Header<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-//   TValue extends CellData = CellData,
-// > = Header_Core<TFeatures, TData, TValue> &
-//   ExtractFeatureTypes<'Header', TFeatures> &
-//   Header_Plugins<TFeatures, TData, TValue>
+  ExtractFeatureMapTypes<TFeatures, Header_FeatureMap>

package/src/types/HeaderGroup.ts

@@ -1,16 +1,7 @@
 import type { HeaderGroup_Header } from '../core/headers/coreHeadersFeature.types'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { TableFeatures } from './TableFeatures'
 import type { RowData } from './type-utils'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface HeaderGroup_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 export interface HeaderGroup_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -19,6 +10,4 @@ export interface HeaderGroup_Core<
 export type HeaderGroup<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> = HeaderGroup_Core<TFeatures, TData> &
-  ExtractFeatureTypes<'HeaderGroup', TFeatures> &
-  HeaderGroup_Plugins<TFeatures, TData>
+> = HeaderGroup_Core<TFeatures, TData>

package/src/types/Row.ts

@@ -2,54 +2,33 @@ import type { Row_ColumnVisibility } from '../features/column-visibility/columnV
 import type { Row_ColumnPinning } from '../features/column-pinning/columnPinningFeature.types'
 import type { Row_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
 import type { Row_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
-import type { RowData, UnionToIntersection } from './type-utils'
+import type { RowData } from './type-utils'
 import type { Row_RowExpanding } from '../features/row-expanding/rowExpandingFeature.types'
 import type { Row_RowPinning } from '../features/row-pinning/rowPinningFeature.types'
 import type { Row_RowSelection } from '../features/row-selection/rowSelectionFeature.types'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Row_Row } from '../core/rows/coreRowsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Row_Plugins<
+export interface Row_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> {}
+> extends Row_Row<TFeatures, TData> {}
 
-export interface Row_Core<
+export interface Row_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> extends Row_Row<TFeatures, TData> {}
+> {
+  columnFilteringFeature: Row_ColumnFiltering<TFeatures, TData>
+  columnGroupingFeature: Row_ColumnGrouping
+  columnPinningFeature: Row_ColumnPinning<TFeatures, TData>
+  columnVisibilityFeature: Row_ColumnVisibility<TFeatures, TData>
+  rowExpandingFeature: Row_RowExpanding
+  rowPinningFeature: Row_RowPinning
+  rowSelectionFeature: Row_RowSelection
+}
 
 export type Row<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Row_Core<TFeatures, TData> &
-  UnionToIntersection<
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? Row_ColumnFiltering<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? Row_ColumnGrouping
-        : never)
-    | ('columnPinningFeature' extends keyof TFeatures
-        ? Row_ColumnPinning<TFeatures, TData>
-        : never)
-    | ('columnVisibilityFeature' extends keyof TFeatures
-        ? Row_ColumnVisibility<TFeatures, TData>
-        : never)
-    | ('rowExpandingFeature' extends keyof TFeatures ? Row_RowExpanding : never)
-    | ('rowPinningFeature' extends keyof TFeatures ? Row_RowPinning : never)
-    | ('rowSelectionFeature' extends keyof TFeatures ? Row_RowSelection : never)
-  > &
-  ExtractFeatureTypes<'Row', TFeatures> &
-  Row_Plugins<TFeatures, TData>
-
-// export type Row<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = Row_Core<TFeatures, TData> &
-//   ExtractFeatureTypes<'Row', TFeatures> &
-//   Row_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, Row_FeatureMap<TFeatures, TData>>

package/src/types/RowModel.ts

@@ -27,51 +27,29 @@ import type {
   CachedRowModel_Sorted,
   CreateRowModel_Sorted,
 } from '../features/row-sorting/rowSortingFeature.types'
-import type { RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface CreateRowModels_Plugins<
+export interface CreateRowModels_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> {}
+> {
+  columnFacetingFeature: CreateRowModel_Faceted<TFeatures, TData>
+  columnFilteringFeature: CreateRowModel_Filtered<TFeatures, TData>
+  rowExpandingFeature: CreateRowModel_Expanded<TFeatures, TData>
+  columnGroupingFeature: CreateRowModel_Grouped<TFeatures, TData>
+  rowPaginationFeature: CreateRowModel_Paginated<TFeatures, TData>
+  rowSortingFeature: CreateRowModel_Sorted<TFeatures, TData>
+}
 
 export type CreateRowModels<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = CreateRowModel_Core<TFeatures, TData> &
-  UnionToIntersection<
-    | ('columnFacetingFeature' extends keyof TFeatures
-        ? CreateRowModel_Faceted<TFeatures, TData>
-        : never)
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? CreateRowModel_Filtered<TFeatures, TData>
-        : never)
-    | ('rowExpandingFeature' extends keyof TFeatures
-        ? CreateRowModel_Expanded<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? CreateRowModel_Grouped<TFeatures, TData>
-        : never)
-    | ('rowPaginationFeature' extends keyof TFeatures
-        ? CreateRowModel_Paginated<TFeatures, TData>
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? CreateRowModel_Sorted<TFeatures, TData>
-        : never)
-  > &
-  ExtractFeatureTypes<'CreateRowModels', TFeatures> &
-  CreateRowModels_Plugins<TFeatures, TData>
-
-// export type CreateRowModels<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = CreateRowModel_Core<TFeatures, TData> &
-//   ExtractFeatureTypes<'CreateRowModels', TFeatures> &
-//   CreateRowModels_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<
+    TFeatures,
+    CreateRowModels_FeatureMap<TFeatures, TData>
+  >
 
 export type CreateRowModels_All<
   TFeatures extends TableFeatures,
@@ -84,44 +62,27 @@ export type CreateRowModels_All<
   CreateRowModel_Paginated<TFeatures, TData> &
   CreateRowModel_Sorted<TFeatures, TData>
 
-export interface CachedRowModels_Plugins<
+export interface CachedRowModels_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> {}
+> {
+  columnFacetingFeature: CachedRowModel_Faceted<TFeatures, TData>
+  columnFilteringFeature: CachedRowModel_Filtered<TFeatures, TData>
+  rowExpandingFeature: CachedRowModel_Expanded<TFeatures, TData>
+  columnGroupingFeature: CachedRowModel_Grouped<TFeatures, TData>
+  rowPaginationFeature: CachedRowModel_Paginated<TFeatures, TData>
+  rowSortingFeature: CachedRowModel_Sorted<TFeatures, TData>
+}
 
 export type CachedRowModels<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = {
   CachedRowModel_Core: () => RowModel<TFeatures, TData>
-} & UnionToIntersection<
-  | ('columnFacetingFeature' extends keyof TFeatures
-      ? CachedRowModel_Faceted<TFeatures, TData>
-      : never)
-  | ('columnFilteringFeature' extends keyof TFeatures
-      ? CachedRowModel_Filtered<TFeatures, TData>
-      : never)
-  | ('rowExpandingFeature' extends keyof TFeatures
-      ? CachedRowModel_Expanded<TFeatures, TData>
-      : never)
-  | ('columnGroupingFeature' extends keyof TFeatures
-      ? CachedRowModel_Grouped<TFeatures, TData>
-      : never)
-  | ('rowPaginationFeature' extends keyof TFeatures
-      ? CachedRowModel_Paginated<TFeatures, TData>
-      : never)
-  | ('rowSortingFeature' extends keyof TFeatures
-      ? CachedRowModel_Sorted<TFeatures, TData>
-      : never)
-> &
-  ExtractFeatureTypes<'CachedRowModel', TFeatures> &
-  CachedRowModels_Plugins<TFeatures, TData>
-
-// export type CachedRowModels<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = ExtractFeatureTypes<'CachedRowModel', TFeatures> &
-//   CachedRowModels_Plugins<TFeatures, TData>
+} & ExtractFeatureMapTypes<
+  TFeatures,
+  CachedRowModels_FeatureMap<TFeatures, TData>
+>
 
 export type CachedRowModel_All<
   TFeatures extends TableFeatures,

package/src/types/RowModelFns.ts

@@ -1,46 +1,27 @@
 import type { RowModelFns_RowSorting } from '../features/row-sorting/rowSortingFeature.types'
 import type { RowModelFns_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
-import type { RowData, UnionToIntersection } from './type-utils'
+import type { RowData } from './type-utils'
 import type { RowModelFns_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface RowModelFns_Plugins<
+export interface RowModelFns_Core {}
+
+export interface RowModelFns_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> {}
-
-export interface RowModelFns_Core {}
+> {
+  columnFilteringFeature: RowModelFns_ColumnFiltering<TFeatures, TData>
+  columnGroupingFeature: RowModelFns_ColumnGrouping<TFeatures, TData>
+  rowSortingFeature: RowModelFns_RowSorting<TFeatures, TData>
+}
 
 export type RowModelFns<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Partial<
-  UnionToIntersection<
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? RowModelFns_ColumnFiltering<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? RowModelFns_ColumnGrouping<TFeatures, TData>
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? RowModelFns_RowSorting<TFeatures, TData>
-        : never)
-  > &
-    ExtractFeatureTypes<'RowModelFns', TFeatures> &
-    RowModelFns_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, RowModelFns_FeatureMap<TFeatures, TData>>
 >
 
-// export type RowModelFns<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = RowModelFns_Core &
-//   ExtractFeatureTypes<'RowModelFns', TFeatures> &
-//   RowModelFns_Plugins<TFeatures, TData>
-
 export type RowModelFns_All<
   TFeatures extends TableFeatures,
   TData extends RowData,