chore: separate row models as feature

Author: KevinVandy

packages/table-core/src/core/row-models/RowModels.ts

@@ -0,0 +1,10 @@
+import { table_getCoreRowModel, table_getRowModel } from './RowModels.utils'
+import type { RowData, Table, TableFeature } from '../../types'
+
+export const RowModels: TableFeature = {
+  _createTable: <TData extends RowData>(table: Table<TData>): void => {
+    table.getCoreRowModel = () => table_getCoreRowModel(table)
+
+    table.getRowModel = () => table_getRowModel(table)
+  },
+}

packages/table-core/src/core/row-models/RowModels.types.ts

@@ -0,0 +1,26 @@
+import type { RowData, RowModel, Table } from '../../types'
+
+export interface TableOptions_RowModels<TData extends RowData> {
+  /**
+   * This required option is a factory for a function that computes and returns the core row model for the table.
+   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getcorerowmodel)
+   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
+   */
+  getCoreRowModel: (table: Table<TData>) => () => RowModel<any>
+}
+
+export interface Table_RowModels<TData extends RowData> {
+  _getCoreRowModel?: () => RowModel<TData>
+  /**
+   * Returns the core row model before any processing has been applied.
+   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getcorerowmodel)
+   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
+   */
+  getCoreRowModel: () => RowModel<TData>
+  /**
+   * Returns the final model after all processing from other used features has been applied. This is the row model that is most commonly used for rendering.
+   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getrowmodel)
+   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
+   */
+  getRowModel: () => RowModel<TData>
+}

packages/table-core/src/core/row-models/RowModels.utils.ts

@@ -0,0 +1,18 @@
+import { table_getPaginationRowModel } from '../../features/row-pagination/RowPagination.utils'
+import type { RowData, RowModel, Table } from '../../types'
+
+export function table_getCoreRowModel<TData extends RowData>(
+  table: Table<TData>,
+): RowModel<TData> {
+  if (!table._getCoreRowModel) {
+    table._getCoreRowModel = table.options.getCoreRowModel(table)
+  }
+
+  return table._getCoreRowModel()
+}
+
+export function table_getRowModel<TData extends RowData>(
+  table: Table<TData>,
+): RowModel<TData> {
+  return table_getPaginationRowModel(table)
+}

…e-core/src/core/table/getCoreRowModel.ts …e/src/core/row-models/getCoreRowModel.tspackages/table-core/src/core/table/getCoreRowModel.ts renamed to packages/table-core/src/core/row-models/getCoreRowModel.ts packages/table-core/src/core/table/getCoreRowModel.ts renamed to packages/table-core/src/core/row-models/getCoreRowModel.ts

@@ -1,6 +1,4 @@
 import {
-  table_getCoreRowModel,
-  table_getRowModel,
   table_getState,
   table_reset,
   table_setOptions,
@@ -17,9 +15,5 @@ export const Tables: TableFeature = {
     table.getState = () => table_getState(table)
 
     table.setState = (updater) => table_setState(table, updater)
-
-    table.getCoreRowModel = () => table_getCoreRowModel(table)
-
-    table.getRowModel = () => table_getRowModel(table)
   },
 }

packages/table-core/src/core/table/Tables.ts

@@ -1,7 +1,5 @@
 import type {
   RowData,
-  RowModel,
-  Table,
   TableFeature,
   TableMeta,
   TableOptions,
@@ -42,12 +40,6 @@ export interface TableOptions_Core<TData extends RowData> {
    * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
    */
   debugTable?: boolean
-  /**
-   * This required option is a factory for a function that computes and returns the core row model for the table.
-   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getcorerowmodel)
-   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
-   */
-  getCoreRowModel: (table: Table<any>) => () => RowModel<any>
   /**
    * Use this option to optionally pass initial state to the table. This state will be used when resetting various table states either automatically by the table (eg. `options.autoResetPageIndex`) or via functions like `table.resetRowSelection()`. Most reset function allow you optionally pass a flag to reset to a blank/default state instead of the initial state.
    *
@@ -105,20 +97,7 @@ export interface Table_CoreProperties<TData extends RowData> {
 
 export interface Table_Core<TData extends RowData>
   extends Table_CoreProperties<TData> {
-  _getCoreRowModel?: () => RowModel<TData>
   _queue: (cb: () => void) => void
-  /**
-   * Returns the core row model before any processing has been applied.
-   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getcorerowmodel)
-   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
-   */
-  getCoreRowModel: () => RowModel<TData>
-  /**
-   * Returns the final model after all processing from other used features has been applied. This is the row model that is most commonly used for rendering.
-   * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getrowmodel)
-   * @link [Guide](https://tanstack.com/table/v8/docs/guide/tables)
-   */
-  getRowModel: () => RowModel<TData>
   /**
    * Call this function to get the table's current state. It's recommended to use this function and its state, especially when managing the table state manually. It is the exact same state used internally by the table for every feature and function it provides.
    * @link [API Docs](https://tanstack.com/table/v8/docs/api/core/table#getstate)

packages/table-core/src/core/table/Tables.types.ts

@@ -51,19 +51,3 @@ export function table_setState<TData extends RowData>(
 ): void {
   table.options.onStateChange(updater)
 }
-
-export function table_getCoreRowModel<TData extends RowData>(
-  table: Table<TData>,
-): RowModel<TData> {
-  if (!table._getCoreRowModel) {
-    table._getCoreRowModel = table.options.getCoreRowModel(table)
-  }
-
-  return table._getCoreRowModel()
-}
-
-export function table_getRowModel<TData extends RowData>(
-  table: Table<TData>,
-): RowModel<TData> {
-  return table_getPaginationRowModel(table)
-}

packages/table-core/src/core/table/Tables.utils.ts

@@ -2,7 +2,6 @@ import { Headers } from '../headers/Headers'
 import { Rows } from '../rows/Rows'
 import { Cells } from '../cells/Cells'
 import { Columns } from '../columns/Columns'
-
 import { ColumnFaceting } from '../../features/column-faceting/ColumnFaceting'
 import { ColumnFiltering } from '../../features/column-filtering/ColumnFiltering'
 import { ColumnGrouping } from '../../features/column-grouping/ColumnGrouping'
@@ -18,6 +17,7 @@ import { RowPagination } from '../../features/row-pagination/RowPagination'
 import { RowPinning } from '../../features/row-pinning/RowPinning'
 import { RowSelection } from '../../features/row-selection/RowSelection'
 import { RowSorting } from '../../features/row-sorting/RowSorting'
+import { RowModels } from '../row-models/RowModels'
 import { Tables } from './Tables'
 import type { Table_CoreProperties } from './Tables.types'
 import type {
@@ -27,7 +27,7 @@ import type {
   TableState,
 } from '../../types'
 
-const coreFeatures = [Tables, Rows, Headers, Columns, Cells]
+const coreFeatures = [Tables, RowModels, Rows, Headers, Columns, Cells]
 
 const builtInFeatures = [
   ColumnFaceting,

packages/table-core/src/core/table/_createTable.ts

@@ -2,10 +2,10 @@
  * Core
  */
 
-export * from './core/table/getCoreRowModel'
 export * from './helpers'
 export * from './types'
 export * from './utils'
+export * from './utils.types'
 
 //Cells
 export * from './core/cells/_createCell'
@@ -26,6 +26,12 @@ export * from './core/headers/Headers'
 export * from './core/headers/Headers.types'
 export * from './core/headers/Headers.utils'
 
+//Row Models
+export * from './core/row-models/getCoreRowModel'
+export * from './core/row-models/RowModels'
+export * from './core/row-models/RowModels.types'
+export * from './core/row-models/RowModels.utils'
+
 //Rows
 export * from './core/rows/_createRow'
 export * from './core/rows/Rows'

packages/table-core/src/index.ts

@@ -1,3 +1,7 @@
+import type {
+  TableOptions_RowModels,
+  Table_RowModels,
+} from './core/row-models/RowModels.types'
 import type { TableOptions_Core, Table_Core } from './core/table/Tables.types'
 import type {
   ColumnDef_ColumnVisibility,
@@ -157,6 +161,7 @@ export type AnyRender = (Comp: any, props: any) => any
 export interface Table<TData extends RowData>
   extends Table_Core<TData>,
     Table_Columns<TData>,
+    Table_RowModels<TData>,
     Table_Rows<TData>,
     Table_Headers<TData>,
     Table_ColumnFiltering<TData>,
@@ -178,6 +183,7 @@ export interface TableOptionsResolved<TData extends RowData>
   extends TableOptions_Core<TData>,
     TableOptions_Cell,
     TableOptions_Columns<TData>,
+    TableOptions_RowModels<TData>,
     TableOptions_Rows<TData>,
     TableOptions_Headers,
     TableOptions_ColumnFaceting<TData>,