simplify api assignment

Author: KevinVandy

packages/table-core/src/core/cells/Cells.ts

@@ -1,29 +1,27 @@
 import { assignAPIs } from '../../utils'
 import { cell_getContext, cell_getValue, cell_renderValue } from './Cells.utils'
-import type { Table_Internal } from '../../types/Table'
 import type { CellData, RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
 import type { Cell } from '../../types/Cell'
 
 export const Cells: TableFeature = {
-  constructCell: <
+  constructCellAPIs: <
     TFeatures extends TableFeatures,
     TData extends RowData,
     TValue extends CellData = CellData,
   >(
     cell: Cell<TFeatures, TData, TValue>,
-    table: Table_Internal<TFeatures, TData>,
   ) => {
-    assignAPIs(cell, table, [
+    assignAPIs(cell, [
       {
         fn: () => cell_getValue(cell),
       },
       {
-        fn: () => cell_renderValue(cell, table),
+        fn: () => cell_renderValue(cell),
       },
       {
-        fn: () => cell_getContext(cell, table),
-        memoDeps: () => [cell, table],
+        fn: () => cell_getContext(cell),
+        memoDeps: () => [cell],
       },
     ])
   },

packages/table-core/src/core/cells/Cells.types.ts

@@ -1,6 +1,6 @@
 import type { CellData, Getter, RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
-import type { Table } from '../../types/Table'
+import type { Table, Table_Internal } from '../../types/Table'
 import type { Row } from '../../types/Row'
 import type { Cell } from '../../types/Cell'
 import type { Column } from '../../types/Column'
@@ -41,6 +41,10 @@ export interface Cell_CoreProperties<
    * @link [Guide](https://tanstack.com/table/v8/docs/guide/cells)
    */
   row: Row<TFeatures, TData>
+  /**
+   * @deprecated Reference to the table instance.
+   */
+  table: Table_Internal<TFeatures, TData>
 }
 
 export interface Cell_Cell<

packages/table-core/src/core/cells/Cells.utils.ts

@@ -1,31 +1,32 @@
+import { callMemoOrStaticFn } from '../../utils'
+import { row_getValue } from '../rows/Rows.utils'
 import type { CellData, RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
-import type { Table } from '../../types/Table'
 import type { Cell } from '../../types/Cell'
 
 export function cell_getValue<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
 >(cell: Cell<TFeatures, TData, TValue>): TValue {
-  return cell.row.getValue(cell.column.id)
+  return callMemoOrStaticFn(cell.row, row_getValue, [cell.column.id])
 }
 
 export function cell_renderValue<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(cell: Cell<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
-  return cell.getValue() ?? table.options.renderFallbackValue
+>(cell: Cell<TFeatures, TData, TValue>) {
+  return cell.getValue() ?? cell.table.options.renderFallbackValue
 }
 
 export function cell_getContext<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
->(cell: Cell<TFeatures, TData, TValue>, table: Table<TFeatures, TData>) {
+>(cell: Cell<TFeatures, TData, TValue>) {
   return {
-    table,
+    table: cell.table,
     column: cell.column,
     row: cell.row,
     cell: cell,

packages/table-core/src/core/cells/constructCell.ts

@@ -1,5 +1,5 @@
 import type { CellData, RowData } from '../../types/type-utils'
-import type { TableFeatures } from '../../types/TableFeatures'
+import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
 import type { Table } from '../../types/Table'
 import type { Row } from '../../types/Row'
 import type { Cell } from '../../types/Cell'
@@ -19,10 +19,11 @@ export function constructCell<
     column,
     id: `${row.id}_${column.id}`,
     row,
+    table,
   }
 
-  for (const feature of Object.values(table._features)) {
-    feature?.constructCell?.(cell as Cell<TFeatures, TData, TValue>, table)
+  for (const feature of Object.values(table._features) as Array<TableFeature>) {
+    feature.constructCellAPIs?.(cell as Cell<TFeatures, TData, TValue>, table)
   }
 
   return cell as Cell<TFeatures, TData, TValue>

packages/table-core/src/core/columns/Columns.ts

@@ -15,21 +15,21 @@ import type { Table_Internal } from '../../types/Table'
 import type { Column } from '../../types/Column'
 
 export const Columns: TableFeature = {
-  constructColumn: <
+  constructColumnAPIs: <
     TFeatures extends TableFeatures,
     TData extends RowData,
     TValue extends CellData = CellData,
   >(
     column: Column<TFeatures, TData, TValue>,
     table: Table_Internal<TFeatures, TData>,
   ) => {
-    assignAPIs(column, table, [
+    assignAPIs(column, [
       {
         fn: () => column_getFlatColumns(column),
         memoDeps: () => [table.options.columns],
       },
       {
-        fn: () => column_getLeafColumns(column, table),
+        fn: () => column_getLeafColumns(column),
         memoDeps: () => [
           table.getState().columnOrder,
           table.getState().grouping,
@@ -40,10 +40,10 @@ export const Columns: TableFeature = {
     ])
   },
 
-  constructTable: <TFeatures extends TableFeatures, TData extends RowData>(
+  constructTableAPIs: <TFeatures extends TableFeatures, TData extends RowData>(
     table: Table_Internal<TFeatures, TData>,
   ) => {
-    assignAPIs(table, table, [
+    assignAPIs(table, [
       {
         fn: () => table_getDefaultColumnDef(table),
         memoDeps: () => [table.options.defaultColumn],

packages/table-core/src/core/columns/Columns.types.ts

@@ -1,3 +1,4 @@
+import type { Table_Internal } from '../../types/Table'
 import type { CellData, RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
 import type { AccessorFn, ColumnDef } from '../../types/ColumnDef'
@@ -47,6 +48,10 @@ export interface Column_CoreProperties<
    * @link [Guide](https://tanstack.com/table/v8/docs/guide/column-defs)
    */
   parent?: Column<TFeatures, TData, TValue>
+  /**
+   * @deprecated Reference to the table instance.
+   */
+  table: Table_Internal<TFeatures, TData>
 }
 
 export interface Column_Column<

packages/table-core/src/core/columns/Columns.utils.ts

@@ -26,14 +26,13 @@ export function column_getLeafColumns<
   TValue extends CellData = CellData,
 >(
   column: Column<TFeatures, TData, TValue>,
-  table: Table<TFeatures, TData>,
 ): Array<Column<TFeatures, TData, TValue>> {
   if (column.columns.length) {
     const leafColumns = column.columns.flatMap(
       (col) => col.getLeafColumns(), // recursive
     )
 
-    return table_getOrderColumnsFn(table)(leafColumns) as any
+    return table_getOrderColumnsFn(column.table)(leafColumns as any) as any
   }
 
   return [column]
@@ -144,3 +143,4 @@ export function table_getColumn<
 
   return column
 }
+

packages/table-core/src/core/columns/constructColumn.ts

@@ -1,5 +1,5 @@
 import type { CellData, RowData } from '../../types/type-utils'
-import type { TableFeatures } from '../../types/TableFeatures'
+import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
 import type { Table } from '../../types/Table'
 import type {
   AccessorFn,
@@ -74,16 +74,17 @@ export function constructColumn<
   }
 
   const column: Column_CoreProperties<TFeatures, TData, TValue> = {
-    id: `${String(id)}`,
     accessorFn,
-    parent: parent,
-    depth,
     columnDef: resolvedColumnDef as ColumnDef<TFeatures, TData, TValue>,
     columns: [],
+    depth,
+    id: `${String(id)}`,
+    parent: parent,
+    table,
   }
 
-  for (const feature of Object.values(table._features)) {
-    feature?.constructColumn?.(
+  for (const feature of Object.values(table._features) as Array<TableFeature>) {
+    feature.constructColumnAPIs?.(
       column as Column<TFeatures, TData, TValue>,
       table,
     )

packages/table-core/src/core/headers/Headers.ts

@@ -18,30 +18,30 @@ import type { Table, Table_Internal } from '../../types/Table'
 import type { Header } from '../../types/Header'
 
 export const Headers: TableFeature = {
-  constructHeader: <
+  constructHeaderAPIs: <
     TFeatures extends TableFeatures,
     TData extends RowData,
     TValue extends CellData = CellData,
   >(
     header: Header<TFeatures, TData, TValue>,
     table: Table<TFeatures, TData>,
   ): void => {
-    assignAPIs(header, table, [
+    assignAPIs(header, [
       {
         fn: () => header_getLeafHeaders(header),
         memoDeps: () => [table.options.columns],
       },
       {
-        fn: () => header_getContext(header, table),
+        fn: () => header_getContext(header),
         memoDeps: () => [table.options.columns],
       },
     ])
   },
 
-  constructTable: <TFeatures extends TableFeatures, TData extends RowData>(
+  constructTableAPIs: <TFeatures extends TableFeatures, TData extends RowData>(
     table: Table_Internal<TFeatures, TData>,
   ): void => {
-    assignAPIs(table, table, [
+    assignAPIs(table, [
       {
         fn: () => table_getHeaderGroups(table),
         memoDeps: () => [

packages/table-core/src/core/headers/Headers.types.ts

@@ -1,6 +1,6 @@
 import type { CellData, RowData } from '../../types/type-utils'
 import type { TableFeatures } from '../../types/TableFeatures'
-import type { Table } from '../../types/Table'
+import type { Table, Table_Internal } from '../../types/Table'
 import type { Header } from '../../types/Header'
 import type { HeaderGroup } from '../../types/HeaderGroup'
 import type { Column } from '../../types/Column'
@@ -128,6 +128,10 @@ export interface Header_CoreProperties<
    * @link [Guide](https://tanstack.com/table/v8/docs/guide/headers)
    */
   subHeaders: Array<Header<TFeatures, TData, TValue>>
+  /**
+   * @deprecated Reference to the table instance.
+   */
+  table: Table_Internal<TFeatures, TData>
 }
 
 export interface Header_Header<