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

package/src/types/Cell.ts

@@ -1,6 +1,10 @@
 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 import type { Cell_Cell } from '../core/cells/coreCellsFeature.types'
 
 /**
@@ -19,23 +23,15 @@ export interface Cell_Core<
   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
-  > &
+  ExtractFeatureMapTypes<TFeatures, Cell_FeatureMap> &
   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>

package/src/types/Column.ts

@@ -9,8 +9,12 @@ 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 import type { Column_Column } from '../core/columns/coreColumnsFeature.types'
 
 /**
@@ -29,54 +33,31 @@ export interface Column_Core<
   TValue = unknown,
 > extends Column_Column<TFeatures, TData, TValue> {}
 
+export interface Column_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> {
+  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)
-  > &
+  ExtractFeatureMapTypes<TFeatures, Column_FeatureMap<TFeatures, TData>> &
   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>
-
 export type Column_Internal<
   TFeatures extends TableFeatures,
   TData extends RowData,

package/src/types/ColumnDef.ts

@@ -1,5 +1,9 @@
 import type { CellData, RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type {
+  ExtractFeatureMapTypes,
+  ExtractFeatureTypes,
+  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'
@@ -110,48 +114,33 @@ 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)
+  ExtractFeatureMapTypes<
+    TFeatures,
+    ColumnDef_FeatureMap<TFeatures, TData, TValue>
   > &
   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>
-
 export type ColumnDefBase_All<
   TFeatures extends TableFeatures,
   TData extends RowData,

package/src/types/Header.ts

@@ -1,6 +1,10 @@
 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 import type { Header_Header } from '../core/headers/coreHeadersFeature.types'
 import type { Header_ColumnResizing } from '../features/column-resizing/columnResizingFeature.types'
 
@@ -20,26 +24,16 @@ export interface Header_Core<
   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)
-  > &
+  ExtractFeatureMapTypes<TFeatures, Header_FeatureMap> &
   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>

package/src/types/Row.ts

@@ -2,11 +2,15 @@ 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 import type { Row_Row } from '../core/rows/coreRowsFeature.types'
 
 /**
@@ -23,33 +27,23 @@ export interface Row_Core<
   TData extends RowData,
 > extends Row_Row<TFeatures, TData> {}
 
+export interface Row_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> {
+  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)
-  > &
+  ExtractFeatureMapTypes<TFeatures, Row_FeatureMap<TFeatures, TData>> &
   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>

package/src/types/RowModel.ts

@@ -27,8 +27,12 @@ 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 
 /**
  * Use this interface as a target for declaration merging to add your own plugin properties.
@@ -39,40 +43,29 @@ export interface CreateRowModels_Plugins<
   TData extends RowData,
 > {}
 
+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)
+  ExtractFeatureMapTypes<
+    TFeatures,
+    CreateRowModels_FeatureMap<TFeatures, TData>
   > &
   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>
-
 export type CreateRowModels_All<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -89,40 +82,30 @@ export interface CachedRowModels_Plugins<
   TData extends RowData,
 > {}
 
+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)
+} & ExtractFeatureMapTypes<
+  TFeatures,
+  CachedRowModels_FeatureMap<TFeatures, TData>
 > &
   ExtractFeatureTypes<'CachedRowModel', TFeatures> &
   CachedRowModels_Plugins<TFeatures, TData>
 
-// export type CachedRowModels<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = ExtractFeatureTypes<'CachedRowModel', TFeatures> &
-//   CachedRowModels_Plugins<TFeatures, TData>
-
 export type CachedRowModel_All<
   TFeatures extends TableFeatures,
   TData extends RowData = any,

package/src/types/RowModelFns.ts

@@ -1,8 +1,12 @@
 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,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 
 /**
  * Use this interface as a target for declaration merging to add your own plugin properties.
@@ -15,32 +19,24 @@ export interface RowModelFns_Plugins<
 
 export interface RowModelFns_Core {}
 
+export interface RowModelFns_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> {
+  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)
-  > &
+  ExtractFeatureMapTypes<TFeatures, RowModelFns_FeatureMap<TFeatures, TData>> &
     ExtractFeatureTypes<'RowModelFns', TFeatures> &
     RowModelFns_Plugins<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,

package/src/types/Table.ts

@@ -17,8 +17,12 @@ import type { Table_RowModels } from '../core/row-models/coreRowModelsFeature.ty
 import type { CachedRowModel_All, CreateRowModels_All } from './RowModel'
 import type { RowModelFns_All } from './RowModelFns'
 import type { TableState_All } from './TableState'
-import type { RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { RowData } from './type-utils'
+import type {
+  ExtractFeatureMapTypes,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 import type { Table_Columns } from '../core/columns/coreColumnsFeature.types'
 import type { Table_Headers } from '../core/headers/coreHeadersFeature.types'
 import type { Table_Rows } from '../core/rows/coreRowsFeature.types'
@@ -52,6 +56,26 @@ export type Table_Core<
   Table_RowModels<TFeatures, TData> &
   Table_Headers<TFeatures, TData>
 
+export interface Table_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> {
+  columnFilteringFeature: Table_ColumnFiltering
+  columnGroupingFeature: Table_ColumnGrouping<TFeatures, TData>
+  columnOrderingFeature: Table_ColumnOrdering<TFeatures, TData>
+  columnPinningFeature: Table_ColumnPinning<TFeatures, TData>
+  columnResizingFeature: Table_ColumnResizing
+  columnSizingFeature: Table_ColumnSizing
+  columnVisibilityFeature: Table_ColumnVisibility<TFeatures, TData>
+  columnFacetingFeature: Table_ColumnFaceting<TFeatures, TData>
+  globalFilteringFeature: Table_GlobalFiltering<TFeatures, TData>
+  rowExpandingFeature: Table_RowExpanding<TFeatures, TData>
+  rowPaginationFeature: Table_RowPagination<TFeatures, TData>
+  rowPinningFeature: Table_RowPinning<TFeatures, TData>
+  rowSelectionFeature: Table_RowSelection<TFeatures, TData>
+  rowSortingFeature: Table_RowSorting<TFeatures, TData>
+}
+
 /**
  * The table object that includes both the core table functionality and the features that are enabled via the `features` table option.
  */
@@ -59,60 +83,10 @@ export type Table<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Table_Core<TFeatures, TData> &
-  UnionToIntersection<
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? Table_ColumnFiltering
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? Table_ColumnGrouping<TFeatures, TData>
-        : never)
-    | ('columnOrderingFeature' extends keyof TFeatures
-        ? Table_ColumnOrdering<TFeatures, TData>
-        : never)
-    | ('columnPinningFeature' extends keyof TFeatures
-        ? Table_ColumnPinning<TFeatures, TData>
-        : never)
-    | ('columnResizingFeature' extends keyof TFeatures
-        ? Table_ColumnResizing
-        : never)
-    | ('columnSizingFeature' extends keyof TFeatures
-        ? Table_ColumnSizing
-        : never)
-    | ('columnVisibilityFeature' extends keyof TFeatures
-        ? Table_ColumnVisibility<TFeatures, TData>
-        : never)
-    | ('columnFacetingFeature' extends keyof TFeatures
-        ? Table_ColumnFaceting<TFeatures, TData>
-        : never)
-    | ('globalFilteringFeature' extends keyof TFeatures
-        ? Table_GlobalFiltering<TFeatures, TData>
-        : never)
-    | ('rowExpandingFeature' extends keyof TFeatures
-        ? Table_RowExpanding<TFeatures, TData>
-        : never)
-    | ('rowPaginationFeature' extends keyof TFeatures
-        ? Table_RowPagination<TFeatures, TData>
-        : never)
-    | ('rowPinningFeature' extends keyof TFeatures
-        ? Table_RowPinning<TFeatures, TData>
-        : never)
-    | ('rowSelectionFeature' extends keyof TFeatures
-        ? Table_RowSelection<TFeatures, TData>
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? Table_RowSorting<TFeatures, TData>
-        : never)
-  > &
+  ExtractFeatureMapTypes<TFeatures, Table_FeatureMap<TFeatures, TData>> &
   ExtractFeatureTypes<'Table', TFeatures> &
   Table_Plugins<TFeatures, TData>
 
-// export type Table<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = Table_Core<TFeatures, TData> &
-//   ExtractFeatureTypes<'Table', TFeatures> &
-//   Table_Plugins<TFeatures, TData>
-
 export type Table_Internal<
   TFeatures extends TableFeatures,
   TData extends RowData = any,

package/src/types/TableFeatures.ts

@@ -22,6 +22,18 @@ export type ExtractFeatureTypes<
   }[keyof TFeatures]
 >
 
+type IsAny<T> = 0 extends 1 & T ? true : false
+
+export type ExtractFeatureMapTypes<
+  TFeatures extends TableFeatures,
+  TFeatureMap extends object,
+> =
+  IsAny<TFeatures> extends true
+    ? UnionToIntersection<TFeatureMap[keyof TFeatureMap]>
+    : UnionToIntersection<
+        TFeatureMap[Extract<keyof TFeatures, keyof TFeatureMap>]
+      >
+
 export interface FeatureConstructors {
   CachedRowModel?: any
   Cell?: any