fix some types for fns internally

KevinVandy · KevinVandy · commit 99df25a2de4e · 2024-10-01T17:25:58.000-05:00
diff --git a/examples/react/custom-features/src/main.tsx b/examples/react/custom-features/src/main.tsx
@@ -186,7 +186,6 @@ function App() {
   const table = useTable({
     _features: { DensityFeature }, //pass our custom feature to the table to be instantiated upon creation
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
       Sorted: createSortedRowModel(),
diff --git a/examples/react/expanding/src/main.tsx b/examples/react/expanding/src/main.tsx
@@ -131,7 +131,6 @@ function App() {
   const table = useTable({
     _features,
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
       Sorted: createSortedRowModel(),
diff --git a/examples/react/filters-faceted/src/main.tsx b/examples/react/filters-faceted/src/main.tsx
@@ -15,11 +15,15 @@ import {
   createFilteredRowModel,
   createPaginatedRowModel,
   createSortedRowModel,
+  filterFns,
   flexRender,
+  sortingFns,
   tableFeatures,
+  tableFns,
   useTable,
 } from '@tanstack/react-table'
 import { makeData } from './makeData'
+import type { Fns } from '../../../../packages/table-core/dist/esm/types/Fns'
 import type {
   CellData,
   Column,
@@ -38,8 +42,13 @@ const _features = tableFeatures({
   RowSorting,
 })
 
+const _fns = tableFns(_features, {
+  filterFns,
+  sortingFns,
+})
+
 declare module '@tanstack/react-table' {
-  //allows us to define custom properties for our columns
+  // allows us to define custom properties for our columns
   interface ColumnMeta<
     TFeatures extends TableFeatures,
     TFns extends Fns<TFeatures, TFns, TData>,
@@ -55,7 +64,9 @@ function App() {
     [],
   )
 
-  const columns = React.useMemo<Array<ColumnDef<typeof _features, {}, Person>>>(
+  const columns = React.useMemo<
+    Array<ColumnDef<typeof _features, typeof _fns, Person>>
+  >(
     () => [
       {
         accessorKey: 'firstName',
@@ -100,19 +111,19 @@ function App() {
   )
 
   const [data, setData] = React.useState<Array<Person>>(() => makeData(5_000))
-  const refreshData = () => setData((_old) => makeData(100_000)) //stress test
+  const refreshData = () => setData((_old) => makeData(100_000)) // stress test
   const rerender = React.useReducer(() => ({}), {})[1]
 
   const table = useTable({
     _features,
+    _fns,
     _rowModels: {
-      Core: createCoreRowModel(),
-      Filtered: createFilteredRowModel(), //client-side filtering
+      Filtered: createFilteredRowModel(), // client-side filtering
       Paginated: createPaginatedRowModel(),
       Sorted: createSortedRowModel(),
-      Faceted: createFacetedRowModel(), //client-side faceting
-      FacetedMinMax: createFacetedMinMaxValues(), //generate min/max values for range filter
-      FacetedUnique: createFacetedUniqueValues(), //generate unique values for select filter/autocomplete
+      Faceted: createFacetedRowModel(), // client-side faceting
+      FacetedMinMax: createFacetedMinMaxValues(), // generate min/max values for range filter
+      FacetedUnique: createFacetedUniqueValues(), // generate unique values for select filter/autocomplete
     },
     columns,
     data,
@@ -319,7 +330,7 @@ function Filter({ column }: { column: Column<any, Person, unknown> }) {
     >
       <option value="">All</option>
       {sortedUniqueValues.map((value) => (
-        //dynamically generated select options from faceted values feature
+        // dynamically generated select options from faceted values feature
         <option value={value} key={value}>
           {value}
         </option>
diff --git a/examples/react/filters-fuzzy/src/main.tsx b/examples/react/filters-fuzzy/src/main.tsx
@@ -127,7 +127,6 @@ function App() {
   const table = useTable<typeof _features, Person>({
     _features,
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
       Sorted: createSortedRowModel(),
diff --git a/examples/react/filters/src/main.tsx b/examples/react/filters/src/main.tsx
@@ -272,7 +272,11 @@ function App() {
   )
 }
 
-function Filter({ column }: { column: Column<any, any, Person, unknown> }) {
+function Filter({
+  column,
+}: {
+  column: Column<typeof _features, typeof _fns, Person, unknown>
+}) {
   const columnFilterValue = column.getFilterValue()
   const { filterVariant } = column.columnDef.meta ?? {}
 
diff --git a/examples/react/full-width-resizable-table/src/main.tsx b/examples/react/full-width-resizable-table/src/main.tsx
@@ -63,9 +63,7 @@ function App() {
   const data = React.useMemo(() => makeData(20), [])
 
   const table = useTable({
-    _rowModels: {
-      Core: createCoreRowModel(),
-    },
+    _rowModels: {},
     columns,
     data,
     enableColumnResizing: true,
diff --git a/examples/react/full-width-table/src/main.tsx b/examples/react/full-width-table/src/main.tsx
@@ -75,7 +75,6 @@ function App() {
 
   const table = useTable({
     _rowModels: {
-      Core: createCoreRowModel(),
       Paginated: createPaginatedRowModel(),
     },
     columns,
diff --git a/examples/react/fully-controlled/src/main.tsx b/examples/react/fully-controlled/src/main.tsx
@@ -84,7 +84,6 @@ function App() {
   // Create the table and pass your options
   const table = useTable({
     _rowModels: {
-      Core: createCoreRowModel(),
       Paginated: createPaginatedRowModel(),
     },
     columns,
diff --git a/examples/react/grouping/src/main.tsx b/examples/react/grouping/src/main.tsx
@@ -32,7 +32,6 @@ const tableHelper = createTableHelper({
     RowExpanding,
   },
   _rowModels: {
-    Core: createCoreRowModel(),
     Filtered: createFilteredRowModel(),
     Paginated: createPaginatedRowModel(),
     Sorted: createSortedRowModel(),
diff --git a/examples/react/kitchen-sink/src/App.tsx b/examples/react/kitchen-sink/src/App.tsx
@@ -88,7 +88,6 @@ export const App = () => {
 
   const table = useTable({
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
       Sorted: createSortedRowModel(),
diff --git a/examples/react/material-ui-pagination/src/main.tsx b/examples/react/material-ui-pagination/src/main.tsx
@@ -114,7 +114,6 @@ function LocalTable({
 }) {
   const table = useTable({
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
     },
diff --git a/examples/react/pagination-controlled/src/main.tsx b/examples/react/pagination-controlled/src/main.tsx
@@ -93,9 +93,7 @@ function App() {
 
   const table = useTable({
     _features: {},
-    _rowModels: {
-      Core: createCoreRowModel(),
-    },
+    _rowModels: {},
     columns,
     data: dataQuery.data?.rows ?? defaultData,
     rowCount: dataQuery.data?.rowCount, //alternatively, just pass in `pageCount` directly
diff --git a/examples/react/pagination/src/main.tsx b/examples/react/pagination/src/main.tsx
@@ -98,7 +98,6 @@ function MyTable({
 
   const table = useTable({
     _rowModels: {
-      Core: createCoreRowModel(),
       Sorted: createSortedRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
diff --git a/examples/react/query-router-search-params/src/components/table.tsx b/examples/react/query-router-search-params/src/components/table.tsx
@@ -37,7 +37,7 @@ export default function Table<T extends Record<string, string | number>>({
   sorting,
 }: Props<T>) {
   const table = useTable({
-    _rowModels: { Core: createCoreRowModel() },
+    _rowModels: {},
     columns,
     data,
     manualFiltering: true,
diff --git a/examples/react/row-dnd/src/main.tsx b/examples/react/row-dnd/src/main.tsx
@@ -120,9 +120,7 @@ function App() {
 
   const table = useTable({
     _features: {},
-    _rowModels: {
-      Core: createCoreRowModel(),
-    },
+    _rowModels: {},
     columns,
     data,
     getRowId: (row) => row.userId, //required because row indexes will change
diff --git a/examples/react/row-pinning/src/main.tsx b/examples/react/row-pinning/src/main.tsx
@@ -157,7 +157,6 @@ function App() {
   const table = useTable({
     _features,
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Expanded: createExpandedRowModel(),
       Paginated: createPaginatedRowModel(),
diff --git a/examples/react/row-selection/src/main.tsx b/examples/react/row-selection/src/main.tsx
@@ -113,7 +113,6 @@ function App() {
   const table = useTable({
     _features,
     _rowModels: {
-      Core: createCoreRowModel(),
       Filtered: createFilteredRowModel(),
       Paginated: createPaginatedRowModel(),
     },
diff --git a/examples/react/sorting/src/main.tsx b/examples/react/sorting/src/main.tsx
@@ -82,7 +82,6 @@ function App() {
   const table = useTable({
     _features: { RowSorting },
     _rowModels: {
-      Core: createCoreRowModel(),
       Sorted: createSortedRowModel(), //client-side sorting
     },
     columns,
diff --git a/examples/react/sub-components/src/main.tsx b/examples/react/sub-components/src/main.tsx
@@ -115,7 +115,6 @@ function Table({
   const table = useTable({
     _features: { RowExpanding },
     _rowModels: {
-      Core: createCoreRowModel(),
       Expanded: createExpandedRowModel(),
     },
     columns,
diff --git a/examples/react/virtualized-columns/src/main.tsx b/examples/react/virtualized-columns/src/main.tsx
@@ -28,7 +28,7 @@ function App() {
 
   const table = useTable({
     _features: { ColumnSizing, RowSorting },
-    _rowModels: { Core: createCoreRowModel(), Sorted: createSortedRowModel() },
+    _rowModels: { Sorted: createSortedRowModel() },
     columns,
     data,
     debugTable: true,
diff --git a/examples/react/virtualized-infinite-scrolling/src/main.tsx b/examples/react/virtualized-infinite-scrolling/src/main.tsx
@@ -129,7 +129,7 @@ function App() {
 
   const table = useTable({
     _features: { ColumnSizing, RowSorting },
-    _rowModels: { Core: createCoreRowModel(), Sorted: createSortedRowModel() },
+    _rowModels: { Sorted: createSortedRowModel() },
     data: flatData,
     columns,
     state: {
diff --git a/examples/react/virtualized-rows/src/main.tsx b/examples/react/virtualized-rows/src/main.tsx
@@ -71,7 +71,7 @@ function App() {
 
   const table = useTable({
     _features: { ColumnSizing, RowSorting },
-    _rowModels: { Core: createCoreRowModel(), Sorted: createSortedRowModel() },
+    _rowModels: { Sorted: createSortedRowModel() },
     columns,
     data,
     debugTable: true,
diff --git a/packages/table-core/src/features/column-filtering/ColumnFiltering.types.ts b/packages/table-core/src/features/column-filtering/ColumnFiltering.types.ts
@@ -48,7 +48,7 @@ export interface TableFns_ColumnFiltering<
   TFns extends Fns<TFeatures, TFns, TData>,
   TData extends RowData,
 > {
-  filterFns?: Record<keyof FilterFns, FilterFn<TFeatures, TFns, TData>>
+  filterFns: Record<keyof FilterFns, FilterFn<TFeatures, TFns, TData>>
 }
 
 export interface FilterFn<
diff --git a/packages/table-core/src/features/column-filtering/ColumnFiltering.utils.ts b/packages/table-core/src/features/column-filtering/ColumnFiltering.utils.ts
@@ -25,7 +25,10 @@ export function column_getAutoFilterFn<
   column: Column<TFeatures, TFns, TData, TValue>,
   table: Table_Internal<TFeatures, TFns, TData>,
 ) {
-  const { filterFns } = table._fns
+  const filterFns = table._fns.filterFns as
+    | Record<string, FilterFn<TFeatures, TFns, TData>>
+    | undefined
+
   const firstRow = table_getCoreRowModel(table).flatRows[0]
 
   const value = firstRow ? row_getValue(firstRow, table, column.id) : undefined
@@ -64,11 +67,14 @@ export function column_getFilterFn<
   },
   table: Table_Internal<TFeatures, TFns, TData>,
 ): FilterFn<TFeatures, TFns, TData> | undefined {
+  const filterFns = table._fns.filterFns as
+    | Record<string, FilterFn<TFeatures, TFns, TData>>
+    | undefined
   return isFunction(column.columnDef.filterFn)
     ? column.columnDef.filterFn
     : column.columnDef.filterFn === 'auto'
       ? column_getAutoFilterFn(column, table)
-      : table._fns.filterFns?.[column.columnDef.filterFn as string]
+      : filterFns?.[column.columnDef.filterFn as string]
 }
 
 export function column_getCanFilter<
@@ -258,7 +264,10 @@ export function shouldAutoRemoveFilter<
 ) {
   return (
     (filterFn && filterFn.autoRemove
-      ? filterFn.autoRemove(value, column)
+      ? filterFn.autoRemove(
+          value,
+          column as Column<TFeatures, TFns, TData, unknown>,
+        )
       : false) ||
     typeof value === 'undefined' ||
     (typeof value === 'string' && !value)
diff --git a/packages/table-core/src/features/column-grouping/ColumnGrouping.types.ts b/packages/table-core/src/features/column-grouping/ColumnGrouping.types.ts
@@ -30,7 +30,7 @@ export interface TableFns_ColumnGrouping<
   TFns extends Fns<TFeatures, TFns, TData>,
   TData extends RowData,
 > {
-  aggregationFns?: Record<
+  aggregationFns: Record<
     keyof AggregationFns,
     AggregationFn<TFeatures, TFns, TData>
   >
diff --git a/packages/table-core/src/features/column-grouping/ColumnGrouping.utils.ts b/packages/table-core/src/features/column-grouping/ColumnGrouping.utils.ts
@@ -14,6 +14,7 @@ import type { Row } from '../../types/Row'
 import type { Cell } from '../../types/Cell'
 import type { Column } from '../../types/Column'
 import type {
+  AggregationFn,
   ColumnDef_ColumnGrouping,
   GroupingState,
   Row_ColumnGrouping,
@@ -114,7 +115,10 @@ export function column_getAutoAggregationFn<
   },
   table: Table_Internal<TFeatures, TFns, TData>,
 ) {
-  const { aggregationFns } = table._fns
+  const aggregationFns = table._fns.aggregationFns as
+    | Record<string, AggregationFn<TFeatures, TFns, TData>>
+    | undefined
+
   const firstRow = table.getCoreRowModel().flatRows[0]
 
   const value = firstRow?.getValue(column.id)
@@ -139,11 +143,15 @@ export function column_getAggregationFn<
   },
   table: Table_Internal<TFeatures, TFns, TData>,
 ) {
+  const aggregationFns = table._fns.aggregationFns as
+    | Record<string, AggregationFn<TFeatures, TFns, TData>>
+    | undefined
+
   return isFunction(column.columnDef.aggregationFn)
     ? column.columnDef.aggregationFn
     : column.columnDef.aggregationFn === 'auto'
       ? column_getAutoAggregationFn(column, table)
-      : table._fns.aggregationFns?.[column.columnDef.aggregationFn as string]
+      : aggregationFns?.[column.columnDef.aggregationFn as string]
 }
 
 export function table_setGrouping<
diff --git a/packages/table-core/src/features/row-sorting/RowSorting.types.ts b/packages/table-core/src/features/row-sorting/RowSorting.types.ts
@@ -30,7 +30,7 @@ export interface TableFns_RowSorting<
   TFns extends Fns<TFeatures, TFns, TData>,
   TData extends RowData,
 > {
-  sortingFns?: Record<keyof SortingFns, SortingFn<TFeatures, TFns, TData>>
+  sortingFns: Record<keyof SortingFns, SortingFn<TFeatures, TFns, TData>>
 }
 
 export interface SortingFns {}
diff --git a/packages/table-core/src/features/row-sorting/RowSorting.utils.ts b/packages/table-core/src/features/row-sorting/RowSorting.utils.ts
diff --git a/packages/table-core/src/types/Fns.ts b/packages/table-core/src/types/Fns.ts
diff --git a/packages/table-core/tests/RowPinning.test.ts b/packages/table-core/tests/RowPinning.test.ts
diff --git a/packages/table-core/tests/RowSelection.test.ts b/packages/table-core/tests/RowSelection.test.ts
diff --git a/packages/table-core/tests/getGroupedRowModel.test.ts b/packages/table-core/tests/getGroupedRowModel.test.ts

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,11 @@ function App() {`
`272`	`272`	`)`
`273`	`273`	`}`
`274`	`274`
`275`		`-function Filter({ column }: { column: Column<any, any, Person, unknown> }) {`
	`275`	`+function Filter({`
	`276`	`+ column,`
	`277`	`+}: {`
	`278`	`+ column: Column<typeof _features, typeof _fns, Person, unknown>`
	`279`	`+}) {`
`276`	`280`	`const columnFilterValue = column.getFilterValue()`
`277`	`281`	`const { filterVariant } = column.columnDef.meta ?? {}`
`278`	`282`