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

package/src/types/TableOptions.ts

@@ -17,7 +17,11 @@ import type { TableOptions_RowPinning } from '../features/row-pinning/rowPinning
 import type { TableOptions_RowSelection } from '../features/row-selection/rowSelectionFeature.types'
 import type { TableOptions_RowSorting } from '../features/row-sorting/rowSortingFeature.types'
 import type { RowData, UnionToIntersection } from './type-utils'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type {
+  ExtractFeatureMapTypes,
+  ExtractFeatureTypes,
+  TableFeatures,
+} from './TableFeatures'
 
 export interface TableOptions_Plugins<
   TFeatures extends TableFeatures,
@@ -52,6 +56,35 @@ export type DebugOptions<TFeatures extends TableFeatures> = {
   debugTable?: boolean
 } & DebugKeysFor<CoreFeatures & TFeatures>
 
+export interface TableOptions_FeatureMap<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> {
+  columnFilteringFeature: TableOptions_ColumnFiltering<TFeatures, TData>
+  columnGroupingFeature: TableOptions_ColumnGrouping
+  columnOrderingFeature: TableOptions_ColumnOrdering
+  columnPinningFeature: TableOptions_ColumnPinning
+  columnResizingFeature: TableOptions_ColumnResizing
+  columnSizingFeature: TableOptions_ColumnSizing
+  columnVisibilityFeature: TableOptions_ColumnVisibility
+  globalFilteringFeature: TableOptions_GlobalFiltering<TFeatures, TData>
+  rowExpandingFeature: TableOptions_RowExpanding<TFeatures, TData>
+  rowPaginationFeature: TableOptions_RowPagination
+  rowPinningFeature: TableOptions_RowPinning<TFeatures, TData>
+  rowSelectionFeature: TableOptions_RowSelection<TFeatures, TData>
+  rowSortingFeature: TableOptions_RowSorting
+}
+
+export type TableOptions_FeatureMap_All<
+  TFeatures extends TableFeatures,
+  TData extends RowData,
+> = UnionToIntersection<
+  TableOptions_FeatureMap<TFeatures, TData>[keyof TableOptions_FeatureMap<
+    TFeatures,
+    TData
+  >]
+>
+
 /**
  * Complete table options for a specific feature set.
  *
@@ -63,58 +96,11 @@ export type TableOptions<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = TableOptions_Core<TFeatures, TData> &
-  UnionToIntersection<
-    | ('columnFilteringFeature' extends keyof TFeatures
-        ? TableOptions_ColumnFiltering<TFeatures, TData>
-        : never)
-    | ('columnGroupingFeature' extends keyof TFeatures
-        ? TableOptions_ColumnGrouping
-        : never)
-    | ('columnOrderingFeature' extends keyof TFeatures
-        ? TableOptions_ColumnOrdering
-        : never)
-    | ('columnPinningFeature' extends keyof TFeatures
-        ? TableOptions_ColumnPinning
-        : never)
-    | ('columnResizingFeature' extends keyof TFeatures
-        ? TableOptions_ColumnResizing
-        : never)
-    | ('columnSizingFeature' extends keyof TFeatures
-        ? TableOptions_ColumnSizing
-        : never)
-    | ('columnVisibilityFeature' extends keyof TFeatures
-        ? TableOptions_ColumnVisibility
-        : never)
-    | ('globalFilteringFeature' extends keyof TFeatures
-        ? TableOptions_GlobalFiltering<TFeatures, TData>
-        : never)
-    | ('rowExpandingFeature' extends keyof TFeatures
-        ? TableOptions_RowExpanding<TFeatures, TData>
-        : never)
-    | ('rowPaginationFeature' extends keyof TFeatures
-        ? TableOptions_RowPagination
-        : never)
-    | ('rowPinningFeature' extends keyof TFeatures
-        ? TableOptions_RowPinning<TFeatures, TData>
-        : never)
-    | ('rowSelectionFeature' extends keyof TFeatures
-        ? TableOptions_RowSelection<TFeatures, TData>
-        : never)
-    | ('rowSortingFeature' extends keyof TFeatures
-        ? TableOptions_RowSorting
-        : never)
-  > &
+  ExtractFeatureMapTypes<TFeatures, TableOptions_FeatureMap<TFeatures, TData>> &
   ExtractFeatureTypes<'TableOptions', TFeatures> &
   TableOptions_Plugins<TFeatures, TData> &
   DebugOptions<TFeatures>
 
-// export type TableOptions<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = TableOptions_Core<TFeatures, TData> &
-//   ExtractFeatureTypes<'TableOptions', TFeatures> &
-//   TableOptions_Plugins<TFeatures, TData>
-
 /**
  * Internal broad option shape used where feature code may need to read options
  * from features that are not present in the current generic feature set.
@@ -123,18 +109,4 @@ export type TableOptions_All<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = TableOptions_Core<TFeatures, TData> &
-  Partial<
-    TableOptions_ColumnFiltering<TFeatures, TData> &
-      TableOptions_ColumnGrouping &
-      TableOptions_ColumnOrdering &
-      TableOptions_ColumnPinning &
-      TableOptions_ColumnResizing &
-      TableOptions_ColumnSizing &
-      TableOptions_ColumnVisibility &
-      TableOptions_GlobalFiltering<TFeatures, TData> &
-      TableOptions_RowExpanding<TFeatures, TData> &
-      TableOptions_RowPagination &
-      TableOptions_RowPinning<TFeatures, TData> &
-      TableOptions_RowSelection<TFeatures, TData> &
-      TableOptions_RowSorting
-  >
+  Partial<TableOptions_FeatureMap_All<TFeatures, TData>>

package/src/types/TableState.ts

@@ -1,4 +1,3 @@
-import type { UnionToIntersection } from './type-utils'
 import type { TableState_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
 import type { TableState_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
 import type { TableState_ColumnOrdering } from '../features/column-ordering/columnOrderingFeature.types'
@@ -12,7 +11,11 @@ import type { TableState_RowPagination } from '../features/row-pagination/rowPag
 import type { TableState_RowPinning } from '../features/row-pinning/rowPinningFeature.types'
 import type { TableState_RowSelection } from '../features/row-selection/rowSelectionFeature.types'
 import type { TableState_RowSorting } from '../features/row-sorting/rowSortingFeature.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 state properties.
@@ -20,62 +23,32 @@ import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
  */
 export interface TableState_Plugins<TFeatures extends TableFeatures> {}
 
+export interface TableState_FeatureMap {
+  columnFilteringFeature: TableState_ColumnFiltering
+  columnGroupingFeature: TableState_ColumnGrouping
+  columnOrderingFeature: TableState_ColumnOrdering
+  columnPinningFeature: TableState_ColumnPinning
+  columnResizingFeature: TableState_ColumnResizing
+  columnSizingFeature: TableState_ColumnSizing
+  columnVisibilityFeature: TableState_ColumnVisibility
+  globalFilteringFeature: TableState_GlobalFiltering
+  rowExpandingFeature: TableState_RowExpanding
+  rowPaginationFeature: TableState_RowPagination
+  rowPinningFeature: TableState_RowPinning
+  rowSelectionFeature: TableState_RowSelection
+  rowSortingFeature: TableState_RowSorting
+}
+
 /**
  * Complete table state for a specific feature set.
  *
  * State slices are included only when their feature is present in `TFeatures`,
  * then custom feature/plugin state is mixed in.
  */
-export type TableState<TFeatures extends TableFeatures> = UnionToIntersection<
-  | ('columnFilteringFeature' extends keyof TFeatures
-      ? TableState_ColumnFiltering
-      : never)
-  | ('columnGroupingFeature' extends keyof TFeatures
-      ? TableState_ColumnGrouping
-      : never)
-  | ('columnOrderingFeature' extends keyof TFeatures
-      ? TableState_ColumnOrdering
-      : never)
-  | ('columnPinningFeature' extends keyof TFeatures
-      ? TableState_ColumnPinning
-      : never)
-  | ('columnResizingFeature' extends keyof TFeatures
-      ? TableState_ColumnResizing
-      : never)
-  | ('columnSizingFeature' extends keyof TFeatures
-      ? TableState_ColumnSizing
-      : never)
-  | ('columnVisibilityFeature' extends keyof TFeatures
-      ? TableState_ColumnVisibility
-      : never)
-  | ('globalFilteringFeature' extends keyof TFeatures
-      ? TableState_GlobalFiltering
-      : never)
-  | ('rowExpandingFeature' extends keyof TFeatures
-      ? TableState_RowExpanding
-      : never)
-  | ('rowPaginationFeature' extends keyof TFeatures
-      ? TableState_RowPagination
-      : never)
-  | ('rowPinningFeature' extends keyof TFeatures
-      ? TableState_RowPinning
-      : never)
-  | ('rowSelectionFeature' extends keyof TFeatures
-      ? TableState_RowSelection
-      : never)
-  | ('rowSortingFeature' extends keyof TFeatures
-      ? TableState_RowSorting
-      : never)
-> &
-  ExtractFeatureTypes<'TableState', TFeatures> &
-  TableState_Plugins<TFeatures>
-
-// export type TableState<TFeatures extends TableFeatures> = ExtractFeatureTypes<
-// export type TableState<TFeatures extends TableFeatures> = ExtractFeatureTypes<
-//   'TableState',
-//   TFeatures
-// > &
-//   TableState_Plugins<TFeatures>
+export type TableState<TFeatures extends TableFeatures> =
+  ExtractFeatureMapTypes<TFeatures, TableState_FeatureMap> &
+    ExtractFeatureTypes<'TableState', TFeatures> &
+    TableState_Plugins<TFeatures>
 
 /**
  * Internal broad state shape containing every stock feature state slice.