fix: inject data type to features

packages/angular-table/src/injectTable.ts

@@ -21,8 +21,9 @@ export function injectTable<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  options: () => TableOptions<TFeatures, TData>,
-): Table<TFeatures, TData> & Signal<Table<TFeatures, TData>> {
+  options: () => TableOptions<TFeatures & { Data: TData }, TData>,
+): Table<TFeatures & { Data: TData }, TData> &
+  Signal<Table<TFeatures & { Data: TData }, TData>> {
   return lazyInit(() => {
     const features = () => {
       return {
@@ -47,7 +48,9 @@ export function injectTable<
 
     // Compose table options using computed.
     // This is to allow `tableSignal` to listen and set table option
-    const updatedOptions = computed<TableOptions<TFeatures, TData>>(() => {
+    const updatedOptions = computed<
+      TableOptions<TFeatures & { Data: TData }, TData>
+    >(() => {
       // listen to table state changed
       const tableState = state()
       // listen to input options changed

packages/qwik-table/src/useTable.ts

@@ -16,14 +16,16 @@ import type {
 export function useTable<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(tableOptions: TableOptions<TFeatures, TData>): Table<TFeatures, TData> {
+>(
+  tableOptions: TableOptions<TFeatures & { Data: TData }, TData>,
+): Table<TFeatures & { Data: TData }, TData> {
   const _features = { ...coreFeatures, ...tableOptions._features }
 
   const state = useSignal(
     getInitialTableState(_features, tableOptions.initialState),
   )
 
-  const statefulOptions: TableOptions<TFeatures, TData> = {
+  const statefulOptions: TableOptions<TFeatures & { Data: TData }, TData> = {
     ...tableOptions,
     _features,
     state: {
@@ -37,7 +39,7 @@ export function useTable<
   }
 
   const table = useStore<{
-    instance: NoSerialize<Table<TFeatures, TData>>
+    instance: NoSerialize<Table<TFeatures & { Data: TData }, TData>>
   }>({
     instance: noSerialize(constructTable(statefulOptions)),
   })

packages/react-table/src/createTableHelper.ts

@@ -28,10 +28,9 @@ export function createTableHelper<
   tableHelperOptions: TableHelperOptions<TFeatures, TData>,
 ): TableHelper<TFeatures, TData> {
   const tableHelper = constructTableHelper(useTable, tableHelperOptions)
-  return {
-    ...tableHelper,
+  return Object.assign(tableHelper, {
     useTable: tableHelper.tableCreator,
-  } as unknown as TableHelper<TFeatures, TData>
+  }) as unknown as TableHelper<TFeatures, TData>
 }
 
 // test

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

@@ -6,14 +6,14 @@ import {
 } from './coreCellsFeature.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type { Cell_Cell, TableOptions_Cell } from './coreCellsFeature.types'
+import type { Cell_Cell, TableOptions_Cell } from './coreCellsFeature.types'
 
 interface CoreCellsFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Cell: Cell_Cell<TableFeatures, RowData>
-  // TableOptions: TableOptions_Cell
+  Cell: Cell_Cell<TableFeatures, RowData>
+  TableOptions: TableOptions_Cell
 }
 
 export function constructCoreCellsFeature<

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

@@ -11,19 +11,19 @@ import {
 } from './coreColumnsFeature.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type {
-//   Column_Column,
-//   TableOptions_Columns,
-//   Table_Columns,
-// } from './coreColumnsFeature.types'
+import type {
+  Column_Column,
+  TableOptions_Columns,
+  Table_Columns,
+} from './coreColumnsFeature.types'
 
 interface CoreColumnsFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Column: Column_Column<TFeatures, TData>
-  // Table: Table_Columns<TFeatures, TData>
-  // TableOptions: TableOptions_Columns<TFeatures, TData>
+  Column: Column_Column<TFeatures, TData>
+  Table: Table_Columns<TFeatures, TData>
+  TableOptions: TableOptions_Columns<TFeatures, TData>
 }
 
 export function constructCoreColumnsFeature<

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

@@ -14,14 +14,14 @@ import {
 } 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'
+import type { Header_Header, Table_Headers } from './coreHeadersFeature.types'
 
 interface CoreHeadersFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Header: Header_Header<TFeatures, TData>
-  // Table: Table_Headers<TFeatures, TData>
+  Header: Header_Header<TFeatures, TData>
+  Table: Table_Headers<TFeatures, TData>
 }
 
 export function constructCoreHeadersFeature<
@@ -47,7 +47,7 @@ export function constructCoreHeadersFeature<
     constructTableAPIs: (table) => {
       assignAPIs('coreHeadersFeature', table, [
         {
-          fn: () => table_getHeaderGroups(table),
+          fn: () => table_getHeaderGroups(table as any),
           fnName: 'table_getHeaderGroups',
           memoDeps: () => [
             table.options.columns,

packages/table-core/src/core/headers/coreHeadersFeature.utils.ts

@@ -48,15 +48,15 @@ export function header_getContext<
 export function table_getHeaderGroups<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(table: Table_Internal<TFeatures, TData>) {
+>(table: Table_Internal<TFeatures & { Data: TData }, TData>) {
   const { left, right } =
     table.options.state?.columnPinning ?? getDefaultColumnPinningState()
   const allColumns = table.getAllColumns()
   const leafColumns = callMemoOrStaticFn(
     table,
     'getVisibleLeafColumns',
     table_getVisibleLeafColumns,
-  ) as unknown as Array<Column<TFeatures, TData, unknown>>
+  ) as unknown as Array<Column<TFeatures & { Data: TData }, TData, unknown>>
 
   const leftColumns = left
     .map((columnId) => leafColumns.find((d) => d.id === columnId)!)

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

@@ -15,13 +15,13 @@ import {
 } from './coreRowModelsFeature.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type { Table_RowModels } from './coreRowModelsFeature.types'
+import type { Table_RowModels } from './coreRowModelsFeature.types'
 
 interface CoreRowModelsFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Table: Table_RowModels<TFeatures, TData>
+  Table: Table_RowModels<TFeatures, TData>
 }
 
 export function constructCoreRowModelsFeature<

packages/table-core/src/core/rows/coreRowsFeature.ts

@@ -13,19 +13,19 @@ import {
 } 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'
+import type {
+  Row_Row,
+  TableOptions_Rows,
+  Table_Rows,
+} from './coreRowsFeature.types'
 
 interface CoreRowsFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Row: Row_Row<TFeatures, TData>
-  // TableOptions: TableOptions_Rows<TFeatures, TData>
-  // Table: Table_Rows<TFeatures, TData>
+  Row: Row_Row<TFeatures, TData>
+  TableOptions: TableOptions_Rows<TFeatures, TData>
+  Table: Table_Rows<TFeatures, TData>
 }
 
 export function constructCoreRowsFeature<

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

@@ -23,7 +23,9 @@ export function getInitialTableState<TFeatures extends TableFeatures>(
 export function constructTable<
   TFeatures extends TableFeatures,
   TData extends RowData,
->(options: TableOptions<TFeatures, TData>): Table<TFeatures, TData> {
+>(
+  options: TableOptions<TFeatures, TData>,
+): Table<TFeatures & { Data: TData }, TData> {
   const { _features = {} as TFeatures } = options
 
   const featuresList: Array<TableFeature<{}>> = Object.values(_features)
@@ -35,7 +37,7 @@ export function constructTable<
     )
   }
 
-  const table = {} as unknown as Table<TFeatures, TData>
+  const table = {} as unknown as Table<TFeatures & { Data: TData }, TData>
 
   const defaultOptions = featuresList.reduce((obj, feature) => {
     return Object.assign(obj, feature.getDefaultTableOptions?.(table as any))

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

@@ -7,14 +7,14 @@ import {
 } 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'
+import type { TableOptions_Table, Table_Table } from './coreTablesFeature.types'
 
 interface CoreTablesFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // Table: Table_Table<TFeatures, TData>
-  // TableOptions: TableOptions_Table<TFeatures, TData>
+  Table: Table_Table<TFeatures, TData>
+  TableOptions: TableOptions_Table<TFeatures, TData>
 }
 
 export function constructCoreTablesFeature<

packages/table-core/src/features/column-faceting/columnFacetingFeature.ts

@@ -9,19 +9,19 @@ import {
 } from './columnFacetingFeature.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type {
-//   CachedRowModel_Faceted,
-//   Column_ColumnFaceting,
-//   CreateRowModel_Faceted,
-// } from './columnFacetingFeature.types'
+import type {
+  CachedRowModel_Faceted,
+  Column_ColumnFaceting,
+  CreateRowModel_Faceted,
+} from './columnFacetingFeature.types'
 
 interface ColumnFacetingFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // CachedRowModel: CachedRowModel_Faceted<TFeatures, TData>
-  // Column: Column_ColumnFaceting<TFeatures, TData>
-  // CreateRowModels: CreateRowModel_Faceted<TFeatures, TData>
+  CachedRowModel: CachedRowModel_Faceted<TFeatures, TData>
+  Column: Column_ColumnFaceting<TFeatures, TData>
+  CreateRowModels: CreateRowModel_Faceted<TFeatures, TData>
 }
 
 export function constructColumnFacetingFeature<

packages/table-core/src/features/column-faceting/createFacetedRowModel.ts

@@ -5,18 +5,18 @@ import type {
   ColumnFiltersState,
   Row_ColumnFiltering,
 } from '../column-filtering/columnFilteringFeature.types'
-import type { TableFeatures } from '../../types/TableFeatures'
+import type { GetFeatureData, TableFeatures } from '../../types/TableFeatures'
 import type { RowModel } from '../../core/row-models/coreRowModelsFeature.types'
 import type { Row } from '../../types/Row'
 import type { RowData } from '../../types/type-utils'
 
 export function createFacetedRowModel<
   TFeatures extends TableFeatures,
-  TData extends RowData = any,
+  TData extends RowData = GetFeatureData<TFeatures>,
 >(): (
-  table: Table_Internal<TFeatures, TData>,
+  table: Table_Internal<TFeatures & { Data: TData }, TData>,
   columnId: string,
-) => () => RowModel<TFeatures, TData> {
+) => () => RowModel<TFeatures & { Data: TData }, TData> {
   return (table, columnId) =>
     tableMemo({
       feature: 'columnFacetingFeature',
@@ -41,11 +41,11 @@ export function createFacetedRowModel<
 
 function _createFacetedRowModel<
   TFeatures extends TableFeatures,
-  TData extends RowData = any,
+  TData extends RowData = GetFeatureData<TFeatures>,
 >(
-  table: Table_Internal<TFeatures, TData>,
+  table: Table_Internal<TFeatures & { Data: TData }, TData>,
   columnId: string,
-  preRowModel: RowModel<TFeatures, TData>,
+  preRowModel: RowModel<TFeatures & { Data: TData }, TData>,
   columnFilters?: ColumnFiltersState,
   globalFilter?: string,
 ) {
@@ -59,7 +59,7 @@ function _createFacetedRowModel<
   ].filter(Boolean) as Array<string>
 
   const filterRowsImpl = (
-    row: Row<TFeatures, TData> & Partial<Row_ColumnFiltering<TFeatures, TData>>,
+    row: Row<TFeatures & { Data: TData }, TData> & Partial<Row_ColumnFiltering>,
   ) => {
     // Horizontally filter rows through each column
     for (const colId of filterableIds) {

packages/table-core/src/features/column-filtering/columnFilteringFeature.ts

@@ -13,31 +13,31 @@ import {
 } from './columnFilteringFeature.utils'
 import type { RowData } from '../../types/type-utils'
 import type { TableFeature, TableFeatures } from '../../types/TableFeatures'
-// import type {
-//   CachedRowModel_Filtered,
-//   ColumnDef_ColumnFiltering,
-//   Column_ColumnFiltering,
-//   CreateRowModel_Filtered,
-//   RowModelFns_ColumnFiltering,
-//   Row_ColumnFiltering,
-//   TableOptions_ColumnFiltering,
-//   TableState_ColumnFiltering,
-//   Table_ColumnFiltering,
-// } from './columnFilteringFeature.types'
+import type {
+  CachedRowModel_Filtered,
+  ColumnDef_ColumnFiltering,
+  Column_ColumnFiltering,
+  CreateRowModel_Filtered,
+  RowModelFns_ColumnFiltering,
+  Row_ColumnFiltering,
+  TableOptions_ColumnFiltering,
+  TableState_ColumnFiltering,
+  Table_ColumnFiltering,
+} from './columnFilteringFeature.types'
 
 interface ColumnFilteringFeatureConstructors<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > {
-  // CachedRowModel: CachedRowModel_Filtered<TFeatures, TData>
-  // Column: Column_ColumnFiltering<TFeatures, TData>
-  // ColumnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
-  // CreateRowModels: CreateRowModel_Filtered<TFeatures, TData>
-  // Row: Row_ColumnFiltering<TFeatures, TData>
-  // RowModelFns: RowModelFns_ColumnFiltering<TFeatures, TData>
-  // Table: Table_ColumnFiltering<TFeatures, TData>
-  // TableOptions: TableOptions_ColumnFiltering<TFeatures, TData>
-  // TableState: TableState_ColumnFiltering
+  CachedRowModel: CachedRowModel_Filtered<TFeatures, TData>
+  Column: Column_ColumnFiltering<TFeatures, TData>
+  ColumnDef: ColumnDef_ColumnFiltering<TFeatures, TData>
+  CreateRowModels: CreateRowModel_Filtered<TFeatures, TData>
+  Row: Row_ColumnFiltering
+  RowModelFns: RowModelFns_ColumnFiltering<TFeatures, TData>
+  Table: Table_ColumnFiltering
+  TableOptions: TableOptions_ColumnFiltering
+  TableState: TableState_ColumnFiltering
 }
 
 export function constructColumnFilteringFeature<