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

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<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 export interface Row_Core<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData,
 > extends Row_Row<TFeatures, TData> {}
 
+export interface Row_FeatureMap<
+  in out TFeatures extends TableFeatures,
+  in out 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)
-  > &
-  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

@@ -1,127 +1,37 @@
-import type {
-  CachedRowModel_Faceted,
-  CreateRowModel_Faceted,
-} from '../features/column-faceting/columnFacetingFeature.types'
-import type {
-  CachedRowModel_Grouped,
-  CreateRowModel_Grouped,
-} from '../features/column-grouping/columnGroupingFeature.types'
-import type {
-  CachedRowModel_Filtered,
-  CreateRowModel_Filtered,
-} from '../features/column-filtering/columnFilteringFeature.types'
+import type { CachedRowModel_Faceted } from '../features/column-faceting/columnFacetingFeature.types'
+import type { CachedRowModel_Grouped } from '../features/column-grouping/columnGroupingFeature.types'
+import type { CachedRowModel_Filtered } from '../features/column-filtering/columnFilteringFeature.types'
 import type {
   CachedRowModel_Core,
-  CreateRowModel_Core,
   RowModel,
 } from '../core/row-models/coreRowModelsFeature.types'
-import type {
-  CachedRowModel_Expanded,
-  CreateRowModel_Expanded,
-} from '../features/row-expanding/rowExpandingFeature.types'
-import type {
-  CachedRowModel_Paginated,
-  CreateRowModel_Paginated,
-} from '../features/row-pagination/rowPaginationFeature.types'
-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'
-
-/**
- * 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<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
-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>
-
-export type CreateRowModels_All<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> = CreateRowModel_Core<TFeatures, TData> &
-  CreateRowModel_Expanded<TFeatures, TData> &
-  CreateRowModel_Faceted<TFeatures, TData> &
-  CreateRowModel_Filtered<TFeatures, TData> &
-  CreateRowModel_Grouped<TFeatures, TData> &
-  CreateRowModel_Paginated<TFeatures, TData> &
-  CreateRowModel_Sorted<TFeatures, TData>
-
-export interface CachedRowModels_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { CachedRowModel_Expanded } from '../features/row-expanding/rowExpandingFeature.types'
+import type { CachedRowModel_Paginated } from '../features/row-pagination/rowPaginationFeature.types'
+import type { CachedRowModel_Sorted } from '../features/row-sorting/rowSortingFeature.types'
+import type { RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
+
+export interface CachedRowModels_FeatureMap<
+  in out TFeatures extends TableFeatures,
+  in out 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'
-
-/**
- * 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<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
 export interface RowModelFns_Core {}
 
+export interface RowModelFns_FeatureMap<
+  in out TFeatures extends TableFeatures,
+  in out 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)
-  > &
-    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,

package/src/types/Table.ts

@@ -14,30 +14,23 @@ import type { Table_RowPagination } from '../features/row-pagination/rowPaginati
 import type { Table_RowSelection } from '../features/row-selection/rowSelectionFeature.types'
 import type { Table_RowSorting } from '../features/row-sorting/rowSortingFeature.types'
 import type { Table_RowModels } from '../core/row-models/coreRowModelsFeature.types'
-import type { CachedRowModel_All, CreateRowModels_All } from './RowModel'
+import type { CachedRowModel_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 { TableState, TableState_All } from './TableState'
+import type { RowData } from './type-utils'
+import type { ExtractFeatureMapTypes, 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'
 import type {
+  Atoms,
   Atoms_All,
+  BaseAtoms,
   BaseAtoms_All,
   ExternalAtoms_All,
   Table_Table,
 } from '../core/table/coreTablesFeature.types'
-import type { TableOptions_All } from './TableOptions'
-
-/**
- * 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 Table_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { DebugOptions, TableOptions_All } from './TableOptions'
 
 /**
  * The core table object that only includes the core table functionality such as column, header, row, and table APIS.
@@ -52,6 +45,26 @@ export type Table_Core<
   Table_RowModels<TFeatures, TData> &
   Table_Headers<TFeatures, TData>
 
+export interface Table_FeatureMap<
+  in out TFeatures extends TableFeatures,
+  in out 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,74 +72,66 @@ 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)
-  > &
-  ExtractFeatureTypes<'Table', TFeatures> &
-  Table_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, Table_FeatureMap<TFeatures, TData>>
 
-// export type Table<
-//   TFeatures extends TableFeatures,
-//   TData extends RowData,
-// > = Table_Core<TFeatures, TData> &
-//   ExtractFeatureTypes<'Table', TFeatures> &
-//   Table_Plugins<TFeatures, TData>
+/**
+ * `Table_Table` members that `Table_Internal` re-declares with broadened
+ * (all-features) types so internal code can read any feature's slots and
+ * construction code can assign them.
+ */
+type Table_InternalBroadenedKeys =
+  | '_rowModels'
+  | '_rowModelFns'
+  | 'options'
+  | 'initialState'
+  | 'store'
 
-export type Table_Internal<
-  TFeatures extends TableFeatures,
-  TData extends RowData = any,
-> = Table<TFeatures, TData> & {
+/**
+ * Internal broad table shape used by feature implementations.
+ *
+ * Declared as an interface extending every stock feature's table API (rather
+ * than the feature-conditional `Table` intersection) so that the compiler can
+ * relate `Table_Internal` instantiations nominally instead of structurally
+ * re-expanding the feature-map conditional for every internal call site.
+ * Mirrors the `*_All` convention used for options, state, and row models.
+ * Type parameters are annotated `in out` (invariant) so the checker can relate
+ * instantiations by their type arguments without measuring variance or falling
+ * back to member-by-member structural comparison.
+ */
+export interface Table_Internal<
+  in out TFeatures extends TableFeatures,
+  in out TData extends RowData = any,
+>
+  extends
+    Omit<Table_Table<TFeatures, TData>, Table_InternalBroadenedKeys>,
+    Table_Columns<TFeatures, TData>,
+    Table_Rows<TFeatures, TData>,
+    Table_RowModels<TFeatures, TData>,
+    Table_Headers<TFeatures, TData>,
+    Table_ColumnFiltering,
+    Table_ColumnGrouping<TFeatures, TData>,
+    Table_ColumnOrdering<TFeatures, TData>,
+    Table_ColumnPinning<TFeatures, TData>,
+    Table_ColumnResizing,
+    Table_ColumnSizing,
+    Table_ColumnVisibility<TFeatures, TData>,
+    Table_ColumnFaceting<TFeatures, TData>,
+    Table_GlobalFiltering<TFeatures, TData>,
+    Table_RowExpanding<TFeatures, TData>,
+    Table_RowPagination<TFeatures, TData>,
+    Table_RowPinning<TFeatures, TData>,
+    Table_RowSelection<TFeatures, TData>,
+    Table_RowSorting<TFeatures, TData> {
   _rowModels: CachedRowModel_All<TFeatures, TData>
   _rowModelFns: RowModelFns_All<TFeatures, TData>
-  options: TableOptions_All<TFeatures, TData> & {
-    rowModels?: CreateRowModels_All<TFeatures, TData>
-    state?: TableState_All
-    initialState?: TableState_All
-    atoms?: ExternalAtoms_All
-  }
-  initialState: TableState_All
-  baseAtoms: BaseAtoms_All
-  atoms: Atoms_All
-  store: ReadonlyStore<TableState_All>
+  options: DebugOptions<TableFeatures> &
+    TableOptions_All<TFeatures, TData> & {
+      state?: TableState_All
+      initialState?: TableState_All
+      atoms?: ExternalAtoms_All
+    }
+  initialState: TableState<TFeatures> & TableState_All
+  baseAtoms: BaseAtoms<TFeatures> & BaseAtoms_All
+  atoms: Atoms<TFeatures> & Atoms_All
+  store: ReadonlyStore<TableState<TFeatures>> & ReadonlyStore<TableState_All>
 }