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

package/src/types/TableFeatures.ts

@@ -7,22 +7,10 @@ import type { TableOptions_All } from './TableOptions'
 import type { TableState_All } from './TableState'
 import type { StockFeatures } from '../features/stockFeatures'
 
-export type ExtractFeatureTypes<
-  TKey extends keyof FeatureConstructors,
-  TFeatures extends TableFeatures,
-> = UnionToIntersection<
-  {
-    [K in keyof TFeatures]: K extends 'coreReativityFeature'
-      ? never
-      : TFeatures[K] extends TableFeature<infer FeatureConstructorOptions>
-        ? TKey extends keyof FeatureConstructorOptions
-          ? FeatureConstructorOptions[TKey]
-          : never
-        : any
-  }[keyof TFeatures]
->
-
 type IsAny<T> = 0 extends 1 & T ? true : false
+type UnionToIntersectionOrEmpty<T> = [T] extends [never]
+  ? {}
+  : UnionToIntersection<T> & {}
 
 export type ExtractFeatureMapTypes<
   TFeatures extends TableFeatures,
@@ -30,133 +18,84 @@ export type ExtractFeatureMapTypes<
 > =
   IsAny<TFeatures> extends true
     ? UnionToIntersection<TFeatureMap[keyof TFeatureMap]>
-    : UnionToIntersection<
+    : UnionToIntersectionOrEmpty<
         TFeatureMap[Extract<keyof TFeatures, keyof TFeatureMap>]
       >
 
-export interface FeatureConstructors {
-  CachedRowModel?: any
-  Cell?: any
-  Column?: any
-  ColumnDef?: any
-  CreateRowModels?: any
-  Header?: any
-  HeaderGroup?: any
-  Row?: any
-  RowModelFns?: any
-  Table?: any
-  TableOptions?: any
-  TableState?: any
-}
-
 export interface Plugins {}
 
 export interface TableFeatures
   extends Partial<CoreFeatures>, Partial<StockFeatures>, Partial<Plugins> {}
 
-export type ConstructTableAPIs<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  table: Table_Internal<TFeatures, TData> &
-    Partial<TConstructors['Table']> & {
-      options: Partial<TConstructors['TableOptions']>
-    },
-) => void
-
-export type GetDefaultColumnDef<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
->() => ColumnDefBase_All<TFeatures, TData, TValue> &
-  Partial<TConstructors['ColumnDef']>
-
-export type GetDefaultTableOptions<TConstructors extends FeatureConstructors> =
-  <TFeatures extends TableFeatures, TData extends RowData>(
-    table: Table_Internal<TFeatures, TData> & Partial<TConstructors['Table']>,
-  ) => Partial<TableOptions_All<TFeatures, TData>> &
-    Partial<TConstructors['TableOptions']>
-
-export type GetInitialState<TConstructors extends FeatureConstructors> = (
-  initialState: Partial<TableState_All> & Partial<TConstructors['TableState']>,
-) => TableState_All & Partial<TConstructors['TableState']>
-
-export type GetDefaultStateSelector<TConstructors extends FeatureConstructors> =
-  (
-    state: TableState_All,
-  ) => Partial<TableState_All> & Partial<TConstructors['TableState']>
-
-export type AssignCellPrototype<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  prototype: Record<string, any>,
-  table: Table_Internal<TFeatures, TData>,
-) => void
-
-export type AssignColumnPrototype<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  prototype: Record<string, any>,
-  table: Table_Internal<TFeatures, TData>,
-) => void
-
-export type AssignHeaderPrototype<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  prototype: Record<string, any>,
-  table: Table_Internal<TFeatures, TData>,
-) => void
-
-export type AssignRowPrototype<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  prototype: Record<string, any>,
-  table: Table_Internal<TFeatures, TData>,
-) => void
-
-export type InitRowInstanceData<TConstructors extends FeatureConstructors> = <
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(
-  row: Row<TFeatures, TData> & Partial<TConstructors['Row']>,
-) => void
-
-export interface TableFeature<TConstructors extends FeatureConstructors> {
+export interface TableFeature {
   /**
    * Assigns Cell APIs to the cell prototype for memory-efficient method sharing.
    * This is called once per table to build a shared prototype for all cells.
    */
-  assignCellPrototype?: AssignCellPrototype<TConstructors>
+  assignCellPrototype?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+  >(
+    prototype: Record<string, any>,
+    table: Table_Internal<TFeatures, TData>,
+  ) => void
   /**
    * Assigns Column APIs to the column prototype for memory-efficient method sharing.
    * This is called once per table to build a shared prototype for all columns.
    */
-  assignColumnPrototype?: AssignColumnPrototype<TConstructors>
+  assignColumnPrototype?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+  >(
+    prototype: Record<string, any>,
+    table: Table_Internal<TFeatures, TData>,
+  ) => void
   /**
    * Assigns Header APIs to the header prototype for memory-efficient method sharing.
    * This is called once per table to build a shared prototype for all headers.
    */
-  assignHeaderPrototype?: AssignHeaderPrototype<TConstructors>
+  assignHeaderPrototype?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+  >(
+    prototype: Record<string, any>,
+    table: Table_Internal<TFeatures, TData>,
+  ) => void
   /**
    * Assigns Row APIs to the row prototype for memory-efficient method sharing.
    * This is called once per table to build a shared prototype for all rows.
    */
-  assignRowPrototype?: AssignRowPrototype<TConstructors>
+  assignRowPrototype?: <TFeatures extends TableFeatures, TData extends RowData>(
+    prototype: Record<string, any>,
+    table: Table_Internal<TFeatures, TData>,
+  ) => void
   /**
    * Assigns Table APIs to the table instance.
    * Unlike row/cell/column/header, the table is a singleton so methods are assigned directly.
    */
-  constructTableAPIs?: ConstructTableAPIs<TConstructors>
-  getDefaultColumnDef?: GetDefaultColumnDef<TConstructors>
-  getDefaultTableOptions?: GetDefaultTableOptions<TConstructors>
-  getInitialState?: GetInitialState<TConstructors>
+  constructTableAPIs?: <TFeatures extends TableFeatures, TData extends RowData>(
+    table: Table_Internal<TFeatures, TData>,
+  ) => void
+  getDefaultColumnDef?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+    TValue extends CellData = CellData,
+  >() => ColumnDefBase_All<TFeatures, TData, TValue>
+  getDefaultTableOptions?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+  >(
+    table: Table_Internal<TFeatures, TData>,
+  ) => Partial<TableOptions_All<TFeatures, TData>>
+  getInitialState?: (initialState: Partial<TableState_All>) => TableState_All
   /**
    * Initializes instance-specific data on each row (e.g., caches).
    * Methods should be assigned via assignRowPrototype instead.
    */
-  initRowInstanceData?: InitRowInstanceData<TConstructors>
+  initRowInstanceData?: <
+    TFeatures extends TableFeatures,
+    TData extends RowData,
+  >(
+    row: Row<TFeatures, TData>,
+  ) => void
 }

package/src/types/TableOptions.ts

@@ -17,16 +17,7 @@ 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 {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
-
-export interface TableOptions_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
 /**
  * Core options that are always available on a table, before optional feature
@@ -97,8 +88,6 @@ export type TableOptions<
   TData extends RowData,
 > = TableOptions_Core<TFeatures, TData> &
   ExtractFeatureMapTypes<TFeatures, TableOptions_FeatureMap<TFeatures, TData>> &
-  ExtractFeatureTypes<'TableOptions', TFeatures> &
-  TableOptions_Plugins<TFeatures, TData> &
   DebugOptions<TFeatures>
 
 /**

package/src/types/TableState.ts

@@ -11,17 +11,7 @@ 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 {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
-
-/**
- * Use this interface as a target for declaration merging to add your own state properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface TableState_Plugins<TFeatures extends TableFeatures> {}
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
 export interface TableState_FeatureMap {
   columnFilteringFeature: TableState_ColumnFiltering
@@ -46,28 +36,12 @@ export interface TableState_FeatureMap {
  * then custom feature/plugin state is mixed in.
  */
 export type TableState<TFeatures extends TableFeatures> =
-  ExtractFeatureMapTypes<TFeatures, TableState_FeatureMap> &
-    ExtractFeatureTypes<'TableState', TFeatures> &
-    TableState_Plugins<TFeatures>
+  ExtractFeatureMapTypes<TFeatures, TableState_FeatureMap>
 
 /**
- * Internal broad state shape containing every stock feature state slice.
+ * Internal broad state shape containing every registered feature state slice.
  *
  * Feature internals use this when they may need to inspect optional slices owned
  * by other features.
  */
-export type TableState_All = Partial<
-  TableState_ColumnFiltering &
-    TableState_ColumnGrouping &
-    TableState_ColumnOrdering &
-    TableState_ColumnPinning &
-    TableState_ColumnResizing &
-    TableState_ColumnSizing &
-    TableState_ColumnVisibility &
-    TableState_GlobalFiltering &
-    TableState_RowExpanding &
-    TableState_RowPagination &
-    TableState_RowPinning &
-    TableState_RowSelection &
-    TableState_RowSorting
->
+export type TableState_All = Partial<TableState<TableFeatures>>

package/src/utils.ts

@@ -427,13 +427,14 @@ export function assignPrototypeAPIs<
  */
 export function callMemoOrStaticFn<
   TObject extends Record<string, any>,
-  TStaticFn extends AnyFunction,
+  TArgs extends Array<any>,
+  TReturn,
 >(
   obj: TObject,
   fnKey: string,
-  staticFn: TStaticFn,
-  ...args: Parameters<TStaticFn> extends [any, ...infer Rest] ? Rest : never
-): ReturnType<TStaticFn> {
+  staticFn: (obj: TObject, ...args: TArgs) => TReturn,
+  ...args: TArgs
+): TReturn {
   return (
     (obj[fnKey] as Function | undefined)?.(...args) ?? staticFn(obj, ...args)
   )