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

package/src/core/headers/coreHeadersFeature.ts

@@ -7,72 +7,50 @@ import {
   table_getHeaderGroups,
   table_getLeafHeaders,
 } from './coreHeadersFeature.utils'
-import type { RowData } from '../../types/type-utils'
-import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type { Header_Header, Table_Headers } from './coreHeadersFeature.types'
-
-export interface CoreHeadersFeatureConstructors<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {
-  // Header: Header_Header<TFeatures, TData>
-  // Table: Table_Headers<TFeatures, TData>
-}
+import type { TableFeature } from '../../types/TableFeatures'
 
 /**
- * Creates the stock core headers feature.
- *
- * The returned feature registers its state defaults, option defaults, and instance APIs so it can be included in a `tableFeatures({ ... })` call.
+ * Core feature that builds header groups and exposes header context APIs.
  */
-export function constructCoreHeadersFeature<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(): TableFeature<CoreHeadersFeatureConstructors<TFeatures, TData>> {
-  return {
-    assignHeaderPrototype: (prototype, table) => {
-      assignPrototypeAPIs('coreHeadersFeature', prototype, table, {
-        header_getLeafHeaders: {
-          fn: (header) => header_getLeafHeaders(header),
-          memoDeps: (header) => [header.column.table.options.columns],
-        },
-        header_getContext: {
-          fn: (header) => header_getContext(header),
-          memoDeps: (header) => [header.column.table.options.columns],
-        },
-      })
-    },
+export const coreHeadersFeature: TableFeature = {
+  assignHeaderPrototype: (prototype, table) => {
+    assignPrototypeAPIs('coreHeadersFeature', prototype, table, {
+      header_getLeafHeaders: {
+        fn: (header) => header_getLeafHeaders(header),
+        memoDeps: (header) => [header.column.table.options.columns],
+      },
+      header_getContext: {
+        fn: (header) => header_getContext(header),
+        memoDeps: (header) => [header.column.table.options.columns],
+      },
+    })
+  },
 
-    constructTableAPIs: (table) => {
-      assignTableAPIs('coreHeadersFeature', table, {
-        table_getHeaderGroups: {
-          fn: () => table_getHeaderGroups(table),
-          memoDeps: () => [
-            table.options.columns,
-            table.atoms.columnOrder?.get(),
-            table.atoms.grouping?.get(),
-            table.atoms.columnPinning?.get(),
-            table.atoms.columnVisibility?.get(),
-            table.options.groupedColumnMode,
-          ],
-        },
-        table_getFooterGroups: {
-          fn: () => table_getFooterGroups(table),
-          memoDeps: () => [table.getHeaderGroups()],
-        },
-        table_getFlatHeaders: {
-          fn: () => table_getFlatHeaders(table),
-          memoDeps: () => [table.getHeaderGroups()],
-        },
-        table_getLeafHeaders: {
-          fn: () => table_getLeafHeaders(table),
-          memoDeps: () => [table.getHeaderGroups()],
-        },
-      })
-    },
-  }
+  constructTableAPIs: (table) => {
+    assignTableAPIs('coreHeadersFeature', table, {
+      table_getHeaderGroups: {
+        fn: () => table_getHeaderGroups(table),
+        memoDeps: () => [
+          table.options.columns,
+          table.atoms.columnOrder?.get(),
+          table.atoms.grouping?.get(),
+          table.atoms.columnPinning?.get(),
+          table.atoms.columnVisibility?.get(),
+          table.options.groupedColumnMode,
+        ],
+      },
+      table_getFooterGroups: {
+        fn: () => table_getFooterGroups(table),
+        memoDeps: () => [table.getHeaderGroups()],
+      },
+      table_getFlatHeaders: {
+        fn: () => table_getFlatHeaders(table),
+        memoDeps: () => [table.getHeaderGroups()],
+      },
+      table_getLeafHeaders: {
+        fn: () => table_getLeafHeaders(table),
+        memoDeps: () => [table.getHeaderGroups()],
+      },
+    })
+  },
 }
-
-/**
- * The Core Headers feature provides the core header functionality.
- */
-export const coreHeadersFeature = constructCoreHeadersFeature()

package/src/core/headers/coreHeadersFeature.utils.ts

@@ -86,7 +86,7 @@ export function table_getHeaderGroups<
     table,
     'getVisibleLeafColumns',
     table_getVisibleLeafColumns,
-  ) as Array<Column<TFeatures, TData, unknown>>
+  )
 
   // Fast path: no columns are pinned — skip per-side lookups, partition, and spread.
   if (!left.length && !right.length) {

package/src/core/row-models/coreRowModelsFeature.ts

@@ -13,71 +13,50 @@ import {
   table_getRowModel,
   table_getSortedRowModel,
 } from './coreRowModelsFeature.utils'
-import type { RowData } from '../../types/type-utils'
-import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type { Table_RowModels } from './coreRowModelsFeature.types'
-
-export interface CoreRowModelsFeatureConstructors<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {
-  // Table: Table_RowModels<TFeatures, TData>
-}
+import type { TableFeature } from '../../types/TableFeatures'
 
 /**
- * Creates the stock core row models feature.
- *
- * The returned feature registers its state defaults, option defaults, and instance APIs so it can be included in a `tableFeatures({ ... })` call.
+ * Core feature that wires table row-model accessors and row-model caches.
  */
-export function constructCoreRowModelsFeature<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(): TableFeature<CoreRowModelsFeatureConstructors<TFeatures, TData>> {
-  return {
-    constructTableAPIs: (table) => {
-      assignTableAPIs('coreRowModelsFeature', table, {
-        table_getCoreRowModel: {
-          fn: () => table_getCoreRowModel(table),
-        },
-        table_getPreFilteredRowModel: {
-          fn: () => table_getPreFilteredRowModel(table),
-        },
-        table_getFilteredRowModel: {
-          fn: () => table_getFilteredRowModel(table),
-        },
-        table_getPreGroupedRowModel: {
-          fn: () => table_getPreGroupedRowModel(table),
-        },
-        table_getGroupedRowModel: {
-          fn: () => table_getGroupedRowModel(table),
-        },
-        table_getPreSortedRowModel: {
-          fn: () => table_getPreSortedRowModel(table),
-        },
-        table_getSortedRowModel: {
-          fn: () => table_getSortedRowModel(table),
-        },
-        table_getPreExpandedRowModel: {
-          fn: () => table_getPreExpandedRowModel(table),
-        },
-        table_getExpandedRowModel: {
-          fn: () => table_getExpandedRowModel(table),
-        },
-        table_getPrePaginatedRowModel: {
-          fn: () => table_getPrePaginatedRowModel(table),
-        },
-        table_getPaginatedRowModel: {
-          fn: () => table_getPaginatedRowModel(table),
-        },
-        table_getRowModel: {
-          fn: () => table_getRowModel(table),
-        },
-      })
-    },
-  }
+export const coreRowModelsFeature: TableFeature = {
+  constructTableAPIs: (table) => {
+    assignTableAPIs('coreRowModelsFeature', table, {
+      table_getCoreRowModel: {
+        fn: () => table_getCoreRowModel(table),
+      },
+      table_getPreFilteredRowModel: {
+        fn: () => table_getPreFilteredRowModel(table),
+      },
+      table_getFilteredRowModel: {
+        fn: () => table_getFilteredRowModel(table),
+      },
+      table_getPreGroupedRowModel: {
+        fn: () => table_getPreGroupedRowModel(table),
+      },
+      table_getGroupedRowModel: {
+        fn: () => table_getGroupedRowModel(table),
+      },
+      table_getPreSortedRowModel: {
+        fn: () => table_getPreSortedRowModel(table),
+      },
+      table_getSortedRowModel: {
+        fn: () => table_getSortedRowModel(table),
+      },
+      table_getPreExpandedRowModel: {
+        fn: () => table_getPreExpandedRowModel(table),
+      },
+      table_getExpandedRowModel: {
+        fn: () => table_getExpandedRowModel(table),
+      },
+      table_getPrePaginatedRowModel: {
+        fn: () => table_getPrePaginatedRowModel(table),
+      },
+      table_getPaginatedRowModel: {
+        fn: () => table_getPaginatedRowModel(table),
+      },
+      table_getRowModel: {
+        fn: () => table_getRowModel(table),
+      },
+    })
+  },
 }
-
-/**
- * The Core Row Models feature provides the core row model functionality.
- */
-export const coreRowModelsFeature = constructCoreRowModelsFeature()

package/src/core/row-models/coreRowModelsFeature.types.ts

@@ -18,12 +18,10 @@ export interface RowModel<
   rowsById: Record<string, Row<TFeatures, TData>>
 }
 
-export interface CreateRowModel_Plugins {}
-
 export interface CreateRowModel_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> extends CreateRowModel_Plugins {
+> {
   /**
    * Optional factory for the core row model. When omitted, the built-in
    * `createCoreRowModel()` factory is used.
@@ -33,12 +31,10 @@ export interface CreateRowModel_Core<
   ) => () => RowModel<TFeatures, TData>
 }
 
-export interface CachedRowModel_Plugins {}
-
 export interface CachedRowModel_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> extends CachedRowModel_Plugins {
+> {
   coreRowModel: () => RowModel<TFeatures, TData>
 }
 

package/src/core/row-models/createCoreRowModel.ts

@@ -17,7 +17,7 @@ export function createCoreRowModel<
   TData extends RowData,
 >(): (table: Table<TFeatures, TData>) => () => RowModel<TFeatures, TData> {
   return (_table) => {
-    const table: Table_Internal<TFeatures, TData> = _table
+    const table = _table as unknown as Table_Internal<TFeatures, TData>
     return tableMemo({
       feature: 'coreRowModelsFeature',
       table,

package/src/core/rows/coreRowsFeature.ts

@@ -11,79 +11,52 @@ import {
   table_getRow,
   table_getRowId,
 } from './coreRowsFeature.utils'
-import type { RowData } from '../../types/type-utils'
-import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type {
-//   Row_Row,
-//   TableOptions_Rows,
-//   Table_Rows,
-// } from './coreRowsFeature.types'
-
-export interface CoreRowsFeatureConstructors<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {
-  // Row: Row_Row<TFeatures, TData>
-  // TableOptions: TableOptions_Rows<TFeatures, TData>
-  // Table: Table_Rows<TFeatures, TData>
-}
+import type { TableFeature } from '../../types/TableFeatures'
 
 /**
- * Creates the stock core rows feature.
- *
- * The returned feature registers its state defaults, option defaults, and instance APIs so it can be included in a `tableFeatures({ ... })` call.
+ * Core feature that creates row APIs for values, cells, and tree traversal.
  */
-export function constructCoreRowsFeature<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(): TableFeature<CoreRowsFeatureConstructors<TFeatures, TData>> {
-  return {
-    assignRowPrototype: (prototype, table) => {
-      assignPrototypeAPIs('coreRowsFeature', prototype, table, {
-        row_getAllCellsByColumnId: {
-          fn: (row) => row_getAllCellsByColumnId(row),
-          memoDeps: (row) => [row.getAllCells()],
-        },
-        row_getAllCells: {
-          fn: (row) => row_getAllCells(row),
-          memoDeps: (row) => [row.table.getAllLeafColumns()],
-        },
-        row_getLeafRows: {
-          fn: (row) => row_getLeafRows(row),
-        },
-        row_getParentRow: {
-          fn: (row) => row_getParentRow(row),
-        },
-        row_getParentRows: {
-          fn: (row) => row_getParentRows(row),
-        },
-        row_getUniqueValues: {
-          fn: (row, columnId) => row_getUniqueValues(row, columnId),
-        },
-        row_getValue: {
-          fn: (row, columnId) => row_getValue(row, columnId),
-        },
-        row_renderValue: {
-          fn: (row, columnId) => row_renderValue(row, columnId),
-        },
-      })
-    },
-    constructTableAPIs: (table) => {
-      assignTableAPIs('coreRowsFeature', table, {
-        table_getRowId: {
-          fn: (originalRow, index, parent) =>
-            table_getRowId(originalRow, table, index, parent),
-        },
-        table_getRow: {
-          fn: (id: string, searchAll?: boolean) =>
-            table_getRow(table, id, searchAll),
-        },
-      })
-    },
-  }
+export const coreRowsFeature: TableFeature = {
+  assignRowPrototype: (prototype, table) => {
+    assignPrototypeAPIs('coreRowsFeature', prototype, table, {
+      row_getAllCellsByColumnId: {
+        fn: (row) => row_getAllCellsByColumnId(row),
+        memoDeps: (row) => [row.getAllCells()],
+      },
+      row_getAllCells: {
+        fn: (row) => row_getAllCells(row),
+        memoDeps: (row) => [row.table.getAllLeafColumns()],
+      },
+      row_getLeafRows: {
+        fn: (row) => row_getLeafRows(row),
+      },
+      row_getParentRow: {
+        fn: (row) => row_getParentRow(row),
+      },
+      row_getParentRows: {
+        fn: (row) => row_getParentRows(row),
+      },
+      row_getUniqueValues: {
+        fn: (row, columnId) => row_getUniqueValues(row, columnId),
+      },
+      row_getValue: {
+        fn: (row, columnId) => row_getValue(row, columnId),
+      },
+      row_renderValue: {
+        fn: (row, columnId) => row_renderValue(row, columnId),
+      },
+    })
+  },
+  constructTableAPIs: (table) => {
+    assignTableAPIs('coreRowsFeature', table, {
+      table_getRowId: {
+        fn: (originalRow, index, parent) =>
+          table_getRowId(originalRow, table, index, parent),
+      },
+      table_getRow: {
+        fn: (id: string, searchAll?: boolean) =>
+          table_getRow(table, id, searchAll),
+      },
+    })
+  },
 }
-
-/**
- * The Core Rows feature provides the core row functionality.
- */
-export const coreRowsFeature = constructCoreRowsFeature()

package/src/core/table/constructTable.ts

@@ -7,7 +7,7 @@ import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
 import type { Table, Table_Internal } from '../../types/Table'
 import type { TableOptions } from '../../types/TableOptions'
-import type { TableState } from '../../types/TableState'
+import type { TableState, TableState_All } from '../../types/TableState'
 
 /**
  * Builds the initial table state from registered features and user initial state.
@@ -44,7 +44,7 @@ export function constructTable<
     atoms: {},
   } as Table_Internal<TFeatures, TData>
 
-  const featuresList: Array<TableFeature<{}>> = Object.values(table._features)
+  const featuresList: Array<TableFeature> = Object.values(table._features)
 
   const defaultOptions = featuresList.reduce((obj, feature) => {
     return Object.assign(obj, feature.getDefaultTableOptions?.(table))
@@ -100,7 +100,7 @@ export function constructTable<
   )
 
   const stateKeys = Object.keys(table.initialState) as Array<
-    string & keyof TableState<TFeatures>
+    string & keyof TableState_All
   >
 
   for (let i = 0; i < stateKeys.length; i++) {
@@ -115,11 +115,14 @@ export function constructTable<
     // create readonly derived atom: on each get(), read either external atom or base atom
     ;(table.atoms as any)[key] = _reactivity.createReadonlyAtom(
       () => {
-        const externalAtom = table.options.atoms?.[key]
+        const externalAtoms = table.options.atoms as
+          | Partial<Record<keyof TableState_All, Atom<unknown>>>
+          | undefined
+        const externalAtom = externalAtoms?.[key]
         if (externalAtom) {
           return externalAtom.get()
         }
-        return table.baseAtoms[key].get()
+        return table.baseAtoms[key]!.get()
       },
       { debugName: `table/atoms/${key}` },
     )
@@ -130,10 +133,10 @@ export function constructTable<
   table.store = atomToStore(
     _reactivity.createReadonlyAtom(
       () => {
-        const snapshot = {} as TableState<TFeatures>
+        const snapshot = {} as TableState<TFeatures> & TableState_All
         for (let i = 0; i < stateKeys.length; i++) {
           const key = stateKeys[i]!
-          snapshot[key] = table.atoms[key].get()
+          ;(snapshot as Record<string, unknown>)[key] = table.atoms[key]!.get()
         }
         return snapshot
       },

package/src/core/table/coreTablesFeature.ts

@@ -1,41 +1,19 @@
 import { assignTableAPIs } from '../../utils'
 import { table_reset, table_setOptions } from './coreTablesFeature.utils'
-import type { RowData } from '../../types/type-utils'
-import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type { TableOptions_Table, Table_Table } from './coreTablesFeature.types'
-
-export interface CoreTablesFeatureConstructors<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {
-  // Table: Table_Table<TFeatures, TData>
-  // TableOptions: TableOptions_Table<TFeatures, TData>
-}
+import type { TableFeature } from '../../types/TableFeatures'
 
 /**
- * Creates the stock core tables feature.
- *
- * The returned feature registers its state defaults, option defaults, and instance APIs so it can be included in a `tableFeatures({ ... })` call.
+ * Core feature that adds base table instance APIs such as reset and setOptions.
  */
-export function constructCoreTablesFeature<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
->(): TableFeature<CoreTablesFeatureConstructors<TFeatures, TData>> {
-  return {
-    constructTableAPIs: (table) => {
-      assignTableAPIs('coreTablesFeature', table, {
-        table_reset: {
-          fn: () => table_reset(table),
-        },
-        table_setOptions: {
-          fn: (updater) => table_setOptions(table, updater),
-        },
-      })
-    },
-  }
+export const coreTablesFeature: TableFeature = {
+  constructTableAPIs: (table) => {
+    assignTableAPIs('coreTablesFeature', table, {
+      table_reset: {
+        fn: () => table_reset(table),
+      },
+      table_setOptions: {
+        fn: (updater) => table_setOptions(table, updater),
+      },
+    })
+  },
 }
-
-/**
- * The Core Tables feature provides the core table functionality for handling state and options.
- */
-export const coreTablesFeature = constructCoreTablesFeature()

package/src/core/table/coreTablesFeature.utils.ts

@@ -59,7 +59,7 @@ export function table_reset<
     const keys = Object.keys(snap) as Array<keyof typeof snap>
     for (let i = 0; i < keys.length; i++) {
       const key = keys[i]!
-      ;(table.baseAtoms as any)[key].set(snap[key] as any)
+      ;(table.baseAtoms as any)[key].set(snap[key])
     }
   })
 }