trying out internal types

TanStack · Sep 29, 2024 · 199fffc · 199fffc
1 parent c3de177
commit 199fffc
Show file tree

Hide file tree

Showing 17 changed files with 175 additions and 68 deletions.
diff --git a/packages/table-core/src/features/column-filtering/ColumnFiltering.types.ts b/packages/table-core/src/features/column-filtering/ColumnFiltering.types.ts
@@ -22,7 +22,7 @@ export interface TableState_ColumnFiltering_Unavailable {
   /**
    * @deprecated Import the `ColumnFiltering` feature to use the column filtering APIs.
    */
-  columnFilters: ColumnFiltersState
+  columnFilters?: ColumnFiltersState
 }
 
 export type ColumnFiltersState = Array<ColumnFilter>

diff --git a/packages/table-core/src/features/column-grouping/ColumnGrouping.types.ts b/packages/table-core/src/features/column-grouping/ColumnGrouping.types.ts
@@ -21,7 +21,7 @@ export interface TableState_ColumnGrouping_Unavailable {
   /**
    * @deprecated Import the `ColumnGrouping` feature to use the column grouping APIs.
    */
-  grouping: GroupingState
+  grouping?: GroupingState
 }
 
 export interface AggregationFns {}

diff --git a/packages/table-core/src/features/column-ordering/ColumnOrdering.types.ts b/packages/table-core/src/features/column-ordering/ColumnOrdering.types.ts
@@ -12,7 +12,7 @@ export interface TableState_ColumnOrdering_Unavailable {
   /**
    * @deprecated Import the `ColumnOrdering` feature to use the column ordering APIs.
    */
-  columnOrder: ColumnOrderState
+  columnOrder?: ColumnOrderState
 }
 
 export interface TableOptions_ColumnOrdering {

diff --git a/packages/table-core/src/features/column-pinning/ColumnPinning.types.ts b/packages/table-core/src/features/column-pinning/ColumnPinning.types.ts
@@ -20,7 +20,7 @@ export interface TableState_ColumnPinning_Unavailable {
   /**
    * @deprecated Import the `ColumnPinning` feature to use the column pinning APIs.
    */
-  columnPinning: ColumnPinningState
+  columnPinning?: ColumnPinningState
 }
 
 export interface TableOptions_ColumnPinning {

diff --git a/packages/table-core/src/features/column-resizing/ColumnResizing.types.ts b/packages/table-core/src/features/column-resizing/ColumnResizing.types.ts
@@ -8,7 +8,7 @@ export interface TableState_ColumnResizing_Unavailable {
   /**
    * @deprecated Import the `ColumnResizing` feature to use the column resizing APIs.
    */
-  columnResizing: columnResizingState
+  columnResizing?: columnResizingState
 }
 
 export interface columnResizingState {

diff --git a/packages/table-core/src/features/column-sizing/ColumnSizing.types.ts b/packages/table-core/src/features/column-sizing/ColumnSizing.types.ts
@@ -9,7 +9,7 @@ export interface TableState_ColumnSizing_Unavailable {
   /**
    * @deprecated Import the `ColumnSizing` feature to use the column sizing APIs.
    */
-  columnSizing: ColumnSizingState
+  columnSizing?: ColumnSizingState
 }
 
 export type ColumnSizingState = Record<string, number>

diff --git a/packages/table-core/src/features/column-visibility/ColumnVisibility.types.ts b/packages/table-core/src/features/column-visibility/ColumnVisibility.types.ts
@@ -13,7 +13,7 @@ export interface TableState_ColumnVisibility_Unavailable {
   /**
    * @deprecated Import the `ColumnVisibility` feature to use the column visibility APIs.
    */
-  columnVisibility: ColumnVisibilityState
+  columnVisibility?: ColumnVisibilityState
 }
 
 export interface TableOptions_ColumnVisibility {

diff --git a/packages/table-core/src/features/global-filtering/GlobalFiltering.types.ts b/packages/table-core/src/features/global-filtering/GlobalFiltering.types.ts
@@ -19,7 +19,7 @@ export interface TableState_GlobalFiltering_Unavailable {
   /**
    * @deprecated Import the `GlobalFiltering` feature to use the global filtering APIs.
    */
-  globalFilter: any
+  globalFilter?: any
 }
 
 export interface ColumnDef_GlobalFiltering {

diff --git a/packages/table-core/src/features/global-filtering/GlobalFiltering.utils.ts b/packages/table-core/src/features/global-filtering/GlobalFiltering.utils.ts
@@ -1,18 +1,15 @@
 import { filterFns } from '../../fns/filterFns'
 import { isFunction } from '../../utils'
 import { table_getInitialState } from '../../core/table/Tables.utils'
+import type { ColumnDefBase_All } from '../../types/ColumnDef'
+import type { TableOptions_GlobalFiltering } from './GlobalFiltering.types'
 import type {
-  ColumnDef_GlobalFiltering,
-  TableOptions_GlobalFiltering,
-} from './GlobalFiltering.types'
-import type {
-  ColumnDef_ColumnFiltering,
   FilterFn,
   TableOptions_ColumnFiltering,
 } from '../column-filtering/ColumnFiltering.types'
 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 { Column } from '../../types/Column'
 import type { BuiltInFilterFn } from '../../fns/filterFns'
 
@@ -28,16 +25,9 @@ export function column_getCanGlobalFilter<
   TValue extends CellData = CellData,
 >(
   column: Column<TFeatures, TData, TValue> & {
-    columnDef: Partial<
-      ColumnDef_GlobalFiltering & ColumnDef_ColumnFiltering<TFeatures, TData>
-    >
-  },
-  table: Table<TFeatures, TData> & {
-    options: Partial<
-      TableOptions_GlobalFiltering<TFeatures, TData> &
-        TableOptions_ColumnFiltering<TFeatures, TData>
-    >
+    columnDef: ColumnDefBase_All<TFeatures, TData, TValue>
   },
+  table: Table_Internal<TFeatures, TData>,
 ): boolean {
   return (
     (column.columnDef.enableGlobalFilter ?? true) &&
@@ -61,12 +51,7 @@ export function table_getGlobalFilterFn<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  table: Table<TFeatures, TData> & {
-    options: Partial<
-      TableOptions_GlobalFiltering<TFeatures, TData> &
-        TableOptions_ColumnFiltering<TFeatures, TData>
-    >
-  },
+  table: Table_Internal<TFeatures, TData>
 ): FilterFn<TFeatures, TData> | FilterFn<TFeatures, TData> | undefined {
   const { globalFilterFn: globalFilterFn } = table.options
 
@@ -87,9 +72,7 @@ export function table_setGlobalFilter<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  table: Table<TFeatures, TData> & {
-    options: Partial<TableOptions_GlobalFiltering<TFeatures, TData>>
-  },
+  table: Table_Internal<TFeatures, TData>,
   updater: any,
 ) {
   table.options.onGlobalFilterChange?.(updater)
@@ -104,12 +87,7 @@ export function table_resetGlobalFilter<
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  table: Table<TFeatures, TData> & {
-    options: Partial<
-      TableOptions_GlobalFiltering<TFeatures, TData> &
-        TableOptions_ColumnFiltering<TFeatures, TData>
-    >
-  },
+  table: Table_Internal<TFeatures, TData>,
   defaultState?: boolean,
 ) {
   table_setGlobalFilter(

diff --git a/packages/table-core/src/features/row-expanding/RowExpanding.types.ts b/packages/table-core/src/features/row-expanding/RowExpanding.types.ts
@@ -14,7 +14,7 @@ export interface TableState_RowExpanding_Unavailable {
   /**
    * @deprecated Import the `RowExpanding` feature to use the row expansion APIs.
    */
-  expanded: ExpandedState
+  expanded?: ExpandedState
 }
 
 export interface Row_RowExpanding {

diff --git a/packages/table-core/src/features/row-pagination/RowPagination.types.ts b/packages/table-core/src/features/row-pagination/RowPagination.types.ts
@@ -14,7 +14,7 @@ export interface TableState_RowPagination_Unavailable {
   /**
    * @deprecated Import the `RowPagination` feature to use the row pagination  APIs.
    */
-  pagination: PaginationState
+  pagination?: PaginationState
 }
 
 export interface TableOptions_RowPagination {

diff --git a/packages/table-core/src/features/row-pinning/RowPinning.types.ts b/packages/table-core/src/features/row-pinning/RowPinning.types.ts
@@ -17,7 +17,7 @@ export interface TableState_RowPinning_Unavailable {
   /**
    * @deprecated Import the `RowPinning` feature to use the row pinning APIs.
    */
-  rowPinning: RowPinningState
+  rowPinning?: RowPinningState
 }
 
 export interface TableOptions_RowPinning<

diff --git a/packages/table-core/src/features/row-selection/RowSelection.types.ts b/packages/table-core/src/features/row-selection/RowSelection.types.ts
@@ -13,7 +13,7 @@ export interface TableState_RowSelection_Unavailable {
   /**
    * @deprecated Import the `RowSelection` feature to use the row selection APIs.
    */
-  rowSelection: RowSelectionState
+  rowSelection?: RowSelectionState
 }
 
 export interface TableOptions_RowSelection<

diff --git a/packages/table-core/src/features/row-sorting/RowSorting.types.ts b/packages/table-core/src/features/row-sorting/RowSorting.types.ts
@@ -21,7 +21,7 @@ export interface TableState_RowSorting_Unavailable {
   /**
    * @deprecated Import the `RowSorting` feature to use the row sorting APIs.
    */
-  sorting: SortingState
+  sorting?: SortingState
 }
 
 export interface SortingFns {}

diff --git a/packages/table-core/src/types/ColumnDef.ts b/packages/table-core/src/types/ColumnDef.ts
@@ -2,14 +2,35 @@ import type { CellData, RowData, UnionToIntersection } from './type-utils'
 import type { TableFeatures } from './TableFeatures'
 import type { CellContext } from '../core/cells/Cells.types'
 import type { HeaderContext } from '../core/headers/Headers.types'
-import type { ColumnDef_ColumnFiltering } from '../features/column-filtering/ColumnFiltering.types'
-import type { ColumnDef_ColumnGrouping } from '../features/column-grouping/ColumnGrouping.types'
-import type { ColumnDef_ColumnPinning } from '../features/column-pinning/ColumnPinning.types'
-import type { ColumnDef_ColumnResizing } from '../features/column-resizing/ColumnResizing.types'
+import type {
+  ColumnDef_ColumnFiltering,
+  ColumnDef_ColumnFiltering_Unavailable,
+} from '../features/column-filtering/ColumnFiltering.types'
+import type {
+  ColumnDef_ColumnGrouping,
+  ColumnDef_ColumnGrouping_Unavailable,
+} from '../features/column-grouping/ColumnGrouping.types'
+import type {
+  ColumnDef_ColumnPinning,
+  ColumnDef_ColumnPinning_Unavailable,
+} from '../features/column-pinning/ColumnPinning.types'
+import type {
+  ColumnDef_ColumnResizing,
+  ColumnDef_ColumnResizing_Unavailable,
+} from '../features/column-resizing/ColumnResizing.types'
 import type { ColumnDef_ColumnSizing } from '../features/column-sizing/ColumnSizing.types'
-import type { ColumnDef_ColumnVisibility } from '../features/column-visibility/ColumnVisibility.types'
-import type { ColumnDef_GlobalFiltering } from '../features/global-filtering/GlobalFiltering.types'
-import type { ColumnDef_RowSorting } from '../features/row-sorting/RowSorting.types'
+import type {
+  ColumnDef_ColumnVisibility,
+  ColumnDef_ColumnVisibility_Unavailable,
+} from '../features/column-visibility/ColumnVisibility.types'
+import type {
+  ColumnDef_GlobalFiltering,
+  ColumnDef_GlobalFiltering_Unavailable,
+} from '../features/global-filtering/GlobalFiltering.types'
+import type {
+  ColumnDef_RowSorting,
+  ColumnDef_RowSorting_Unavailable,
+} from '../features/row-sorting/RowSorting.types'
 
 export interface ColumnMeta<
   TFeatures extends TableFeatures,
@@ -92,6 +113,34 @@ export type ColumnDefBase<
         : never)
   >
 
+// export type ColumnDefBase<
+//   TFeatures extends TableFeatures,
+//   TData extends RowData,
+//   TValue extends CellData = CellData,
+// > = ColumnDefBase_Core<TFeatures, TData, TValue> &
+//   ('ColumnVisibility' extends keyof TFeatures
+//     ? ColumnDef_ColumnVisibility
+//     : ColumnDef_ColumnVisibility_Unavailable) &
+//   ('ColumnPinning' extends keyof TFeatures
+//     ? ColumnDef_ColumnPinning
+//     : ColumnDef_ColumnPinning_Unavailable) &
+//   ('ColumnFiltering' extends keyof TFeatures
+//     ? ColumnDef_ColumnFiltering<TFeatures, TData>
+//     : ColumnDef_ColumnFiltering_Unavailable<TFeatures, TData>) &
+//   ('GlobalFiltering' extends keyof TFeatures
+//     ? ColumnDef_GlobalFiltering
+//     : ColumnDef_GlobalFiltering_Unavailable) &
+//   ('RowSorting' extends keyof TFeatures
+//     ? ColumnDef_RowSorting<TFeatures, TData>
+//     : ColumnDef_RowSorting_Unavailable<TFeatures, TData>) &
+//   ('ColumnGrouping' extends keyof TFeatures
+//     ? ColumnDef_ColumnGrouping<TFeatures, TData, TValue>
+//     : ColumnDef_ColumnGrouping_Unavailable<TFeatures, TData, TValue>) &
+//   ('ColumnSizing' extends keyof TFeatures ? ColumnDef_ColumnSizing : {}) &
+//   ('ColumnResizing' extends keyof TFeatures
+//     ? ColumnDef_ColumnResizing
+//     : ColumnDef_ColumnResizing_Unavailable)
+
 export type ColumnDefBase_All<
   TFeatures extends TableFeatures,
   TData extends RowData,

diff --git a/packages/table-core/src/types/TableFeatures.ts b/packages/table-core/src/types/TableFeatures.ts
@@ -54,11 +54,11 @@ export interface TableFeature {
 }
 
 export interface CoreTableFeatures {
-  Tables?: TableFeature
-  Rows?: TableFeature
-  Headers?: TableFeature
-  Columns?: TableFeature
   Cells?: TableFeature
+  Columns?: TableFeature
+  Headers?: TableFeature
+  Rows?: TableFeature
+  Tables?: TableFeature
 }
 
 export interface TableFeatures extends CoreTableFeatures {