@tanstack/table-core 9.0.0-beta.2 → 9.0.0-beta.7

package/src/fns/sortFns.ts

@@ -1,7 +1,6 @@
 import type { RowData } from '../types/type-utils'
 import type { TableFeatures } from '../types/TableFeatures'
 import type { Row } from '../types/Row'
-import type { SortFn } from '../features/row-sorting/rowSortingFeature.types'
 
 /**
  * Regular expression used to split mixed text and numeric chunks.
@@ -16,12 +15,12 @@ export const reSplitAlphaNumeric = /([0-9]+)/gm
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_alphanumeric: SortFn<any, any> = <
+export const sortFn_alphanumeric = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareAlphanumeric(
@@ -35,12 +34,12 @@ export const sortFn_alphanumeric: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_alphanumericCaseSensitive: SortFn<any, any> = <
+export const sortFn_alphanumericCaseSensitive = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareAlphanumeric(
@@ -56,12 +55,12 @@ export const sortFn_alphanumericCaseSensitive: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_text: SortFn<any, any> = <
+export const sortFn_text = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(
@@ -77,12 +76,12 @@ export const sortFn_text: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_textCaseSensitive: SortFn<any, any> = <
+export const sortFn_textCaseSensitive = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(
@@ -96,12 +95,12 @@ export const sortFn_textCaseSensitive: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_datetime: SortFn<any, any> = <
+export const sortFn_datetime = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   const a: number | string = rowA.getValue(columnId)
@@ -118,12 +117,12 @@ export const sortFn_datetime: SortFn<any, any> = <
  *
  * This comparator returns ascending-order results; descending order is applied by the sorting row model.
  */
-export const sortFn_basic: SortFn<any, any> = <
+export const sortFn_basic = <
   TFeatures extends TableFeatures,
   TData extends RowData,
 >(
-  rowA: Row<any, any>,
-  rowB: Row<any, any>,
+  rowA: Row<TFeatures, TData>,
+  rowB: Row<TFeatures, TData>,
   columnId: string,
 ) => {
   return compareBasic(rowA.getValue(columnId), rowB.getValue(columnId))
@@ -152,10 +151,8 @@ function toString(a: any) {
 // It handles numbers, mixed alphanumeric combinations, and even
 // null, undefined, and Infinity
 function compareAlphanumeric(aStr: string, bStr: string) {
-  // Split on number groups, but keep the delimiter
-  // Then remove falsey split values
-  const a = aStr.split(reSplitAlphaNumeric).filter(Boolean)
-  const b = bStr.split(reSplitAlphaNumeric).filter(Boolean)
+  const a = aStr.split(reSplitAlphaNumeric)
+  const b = bStr.split(reSplitAlphaNumeric)
 
   let ai = 0
   let bi = 0
@@ -163,16 +160,29 @@ function compareAlphanumeric(aStr: string, bStr: string) {
   const bLen = b.length
 
   while (ai < aLen && bi < bLen) {
+    // Skip the empty boundary chunks that .filter(Boolean) used to remove
+    if (!a[ai]) {
+      ai++
+      continue
+    }
+    if (!b[bi]) {
+      bi++
+      continue
+    }
+
     const aa = a[ai++]!
     const bb = b[bi++]!
 
+    // Chunks are either all-digit (parseInt always succeeds) or digit-free
+    // (parseInt is always NaN), so NaN-ness fully classifies each chunk
     const an = parseInt(aa, 10)
     const bn = parseInt(bb, 10)
 
-    const combo = [an, bn].sort()
+    const aIsNaN = isNaN(an)
+    const bIsNaN = isNaN(bn)
 
     // Both are string
-    if (isNaN(combo[0]!)) {
+    if (aIsNaN && bIsNaN) {
       if (aa > bb) {
         return 1
       }
@@ -182,9 +192,9 @@ function compareAlphanumeric(aStr: string, bStr: string) {
       continue
     }
 
-    // One is a string, one is a number
-    if (isNaN(combo[1]!)) {
-      return isNaN(an) ? -1 : 1
+    // One is a string, one is a number — the string chunk sorts first
+    if (aIsNaN || bIsNaN) {
+      return aIsNaN ? -1 : 1
     }
 
     // Both are numbers
@@ -196,7 +206,19 @@ function compareAlphanumeric(aStr: string, bStr: string) {
     }
   }
 
-  return aLen - ai - (bLen - bi)
+  // One side is exhausted — compare the counts of remaining non-empty chunks
+  let remaining = 0
+  for (; ai < aLen; ai++) {
+    if (a[ai]) {
+      remaining++
+    }
+  }
+  for (; bi < bLen; bi++) {
+    if (b[bi]) {
+      remaining--
+    }
+  }
+  return remaining
 }
 
 // Exports

package/src/types/Cell.ts

@@ -1,22 +1,8 @@
 import type { Cell_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
 import type { CellData, RowData } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Cell_Cell } from '../core/cells/coreCellsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Cell_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface Cell_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -31,7 +17,5 @@ export type Cell<
   TFeatures extends TableFeatures,
   TData extends RowData,
   TValue extends CellData = CellData,
-> = Cell_Cell<TFeatures, TData, TValue> &
-  ExtractFeatureMapTypes<TFeatures, Cell_FeatureMap> &
-  ExtractFeatureTypes<'Cell', TFeatures> &
-  Cell_Plugins<TFeatures, TData, TValue>
+> = Cell_Core<TFeatures, TData, TValue> &
+  ExtractFeatureMapTypes<TFeatures, Cell_FeatureMap>

package/src/types/Column.ts

@@ -10,23 +10,9 @@ import type { Column_ColumnSizing } from '../features/column-sizing/columnSizing
 import type { Column_ColumnVisibility } from '../features/column-visibility/columnVisibilityFeature.types'
 import type { ColumnDefBase_All } from './ColumnDef'
 import type { RowData } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Column_Column } from '../core/columns/coreColumnsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Column_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue = unknown,
-> {}
-
 export interface Column_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -54,9 +40,7 @@ export type Column<
   TData extends RowData,
   TValue = unknown,
 > = Column_Core<TFeatures, TData, TValue> &
-  ExtractFeatureMapTypes<TFeatures, Column_FeatureMap<TFeatures, TData>> &
-  ExtractFeatureTypes<'Column', TFeatures> &
-  Column_Plugins<TFeatures, TData, TValue>
+  ExtractFeatureMapTypes<TFeatures, Column_FeatureMap<TFeatures, TData>>
 
 export type Column_Internal<
   TFeatures extends TableFeatures,

package/src/types/ColumnDef.ts

@@ -1,9 +1,5 @@
 import type { CellData, RowData, UnionToIntersection } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { CellContext } from '../core/cells/coreCellsFeature.types'
 import type { HeaderContext } from '../core/headers/coreHeadersFeature.types'
 import type { ColumnDef_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
@@ -15,16 +11,6 @@ import type { ColumnDef_ColumnVisibility } from '../features/column-visibility/c
 import type { ColumnDef_GlobalFiltering } from '../features/global-filtering/globalFilteringFeature.types'
 import type { ColumnDef_RowSorting } from '../features/row-sorting/rowSortingFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface ColumnDef_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface ColumnMeta<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -137,9 +123,7 @@ export type ColumnDefBase<
   ExtractFeatureMapTypes<
     TFeatures,
     ColumnDef_FeatureMap<TFeatures, TData, TValue>
-  > &
-  ExtractFeatureTypes<'ColumnDef', TFeatures> &
-  ColumnDef_Plugins<TFeatures, TData, TValue>
+  >
 
 export type ColumnDefBase_All<
   TFeatures extends TableFeatures,

package/src/types/Header.ts

@@ -1,23 +1,9 @@
 import type { Header_ColumnSizing } from '../features/column-sizing/columnSizingFeature.types'
 import type { CellData, RowData } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Header_Header } from '../core/headers/coreHeadersFeature.types'
 import type { Header_ColumnResizing } from '../features/column-resizing/columnResizingFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Header_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-  TValue extends CellData = CellData,
-> {}
-
 export interface Header_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -34,6 +20,4 @@ export type Header<
   TData extends RowData,
   TValue extends CellData = CellData,
 > = Header_Core<TFeatures, TData, TValue> &
-  ExtractFeatureMapTypes<TFeatures, Header_FeatureMap> &
-  ExtractFeatureTypes<'Header', TFeatures> &
-  Header_Plugins<TFeatures, TData, TValue>
+  ExtractFeatureMapTypes<TFeatures, Header_FeatureMap>

package/src/types/HeaderGroup.ts

@@ -1,16 +1,7 @@
 import type { HeaderGroup_Header } from '../core/headers/coreHeadersFeature.types'
-import type { ExtractFeatureTypes, TableFeatures } from './TableFeatures'
+import type { TableFeatures } from './TableFeatures'
 import type { RowData } from './type-utils'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface HeaderGroup_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 export interface HeaderGroup_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -19,6 +10,4 @@ export interface HeaderGroup_Core<
 export type HeaderGroup<
   TFeatures extends TableFeatures,
   TData extends RowData,
-> = HeaderGroup_Core<TFeatures, TData> &
-  ExtractFeatureTypes<'HeaderGroup', TFeatures> &
-  HeaderGroup_Plugins<TFeatures, TData>
+> = HeaderGroup_Core<TFeatures, TData>

package/src/types/Row.ts

@@ -6,22 +6,9 @@ import type { RowData } from './type-utils'
 import type { Row_RowExpanding } from '../features/row-expanding/rowExpandingFeature.types'
 import type { Row_RowPinning } from '../features/row-pinning/rowPinningFeature.types'
 import type { Row_RowSelection } from '../features/row-selection/rowSelectionFeature.types'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Row_Row } from '../core/rows/coreRowsFeature.types'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Row_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 export interface Row_Core<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -44,6 +31,4 @@ export type Row<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Row_Core<TFeatures, TData> &
-  ExtractFeatureMapTypes<TFeatures, Row_FeatureMap<TFeatures, TData>> &
-  ExtractFeatureTypes<'Row', TFeatures> &
-  Row_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, Row_FeatureMap<TFeatures, TData>>

package/src/types/RowModel.ts

@@ -28,20 +28,7 @@ import type {
   CreateRowModel_Sorted,
 } from '../features/row-sorting/rowSortingFeature.types'
 import type { RowData } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
-
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface CreateRowModels_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
 export interface CreateRowModels_FeatureMap<
   TFeatures extends TableFeatures,
@@ -62,9 +49,7 @@ export type CreateRowModels<
   ExtractFeatureMapTypes<
     TFeatures,
     CreateRowModels_FeatureMap<TFeatures, TData>
-  > &
-  ExtractFeatureTypes<'CreateRowModels', TFeatures> &
-  CreateRowModels_Plugins<TFeatures, TData>
+  >
 
 export type CreateRowModels_All<
   TFeatures extends TableFeatures,
@@ -77,11 +62,6 @@ export type CreateRowModels_All<
   CreateRowModel_Paginated<TFeatures, TData> &
   CreateRowModel_Sorted<TFeatures, TData>
 
-export interface CachedRowModels_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 export interface CachedRowModels_FeatureMap<
   TFeatures extends TableFeatures,
   TData extends RowData,
@@ -102,9 +82,7 @@ export type CachedRowModels<
 } & ExtractFeatureMapTypes<
   TFeatures,
   CachedRowModels_FeatureMap<TFeatures, TData>
-> &
-  ExtractFeatureTypes<'CachedRowModel', TFeatures> &
-  CachedRowModels_Plugins<TFeatures, TData>
+>
 
 export type CachedRowModel_All<
   TFeatures extends TableFeatures,

package/src/types/RowModelFns.ts

@@ -2,20 +2,7 @@ import type { RowModelFns_RowSorting } from '../features/row-sorting/rowSortingF
 import type { RowModelFns_ColumnGrouping } from '../features/column-grouping/columnGroupingFeature.types'
 import type { RowData } from './type-utils'
 import type { RowModelFns_ColumnFiltering } from '../features/column-filtering/columnFilteringFeature.types'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
-
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface RowModelFns_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 
 export interface RowModelFns_Core {}
 
@@ -32,9 +19,7 @@ export type RowModelFns<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Partial<
-  ExtractFeatureMapTypes<TFeatures, RowModelFns_FeatureMap<TFeatures, TData>> &
-    ExtractFeatureTypes<'RowModelFns', TFeatures> &
-    RowModelFns_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, RowModelFns_FeatureMap<TFeatures, TData>>
 >
 
 export type RowModelFns_All<

package/src/types/Table.ts

@@ -18,11 +18,7 @@ import type { CachedRowModel_All, CreateRowModels_All } from './RowModel'
 import type { RowModelFns_All } from './RowModelFns'
 import type { TableState_All } from './TableState'
 import type { RowData } from './type-utils'
-import type {
-  ExtractFeatureMapTypes,
-  ExtractFeatureTypes,
-  TableFeatures,
-} from './TableFeatures'
+import type { ExtractFeatureMapTypes, TableFeatures } from './TableFeatures'
 import type { Table_Columns } from '../core/columns/coreColumnsFeature.types'
 import type { Table_Headers } from '../core/headers/coreHeadersFeature.types'
 import type { Table_Rows } from '../core/rows/coreRowsFeature.types'
@@ -34,15 +30,6 @@ import type {
 } from '../core/table/coreTablesFeature.types'
 import type { TableOptions_All } from './TableOptions'
 
-/**
- * Use this interface as a target for declaration merging to add your own plugin properties.
- * Note: This will affect the types of all tables in your project.
- */
-export interface Table_Plugins<
-  TFeatures extends TableFeatures,
-  TData extends RowData,
-> {}
-
 /**
  * The core table object that only includes the core table functionality such as column, header, row, and table APIS.
  * No features are included.
@@ -83,9 +70,7 @@ export type Table<
   TFeatures extends TableFeatures,
   TData extends RowData,
 > = Table_Core<TFeatures, TData> &
-  ExtractFeatureMapTypes<TFeatures, Table_FeatureMap<TFeatures, TData>> &
-  ExtractFeatureTypes<'Table', TFeatures> &
-  Table_Plugins<TFeatures, TData>
+  ExtractFeatureMapTypes<TFeatures, Table_FeatureMap<TFeatures, TData>>
 
 export type Table_Internal<
   TFeatures extends TableFeatures,