@tanstack/table-core 8.0.0-alpha.42 → 8.0.0-alpha.45

package/src/utils/getGroupedRowModel.ts

@@ -6,7 +6,7 @@ export function getGroupedRowModelSync<TGenerics extends AnyGenerics>(): (
 ) => () => RowModel<TGenerics> {
   return instance =>
     memo(
-      () => [instance.getState().grouping, instance.getSortedRowModel()],
+      () => [instance.getState().grouping, instance.getPreGroupedRowModel()],
       (grouping, rowModel) => {
         if (!rowModel.rows.length || !grouping.length) {
           return rowModel
@@ -52,7 +52,7 @@ export function getGroupedRowModelSync<TGenerics extends AnyGenerics>(): (
                   }),
                 () => groupedRows.map(row => row.values[column.id])
               )
-            } else if (column.aggregationType) {
+            } else if (column.aggregationFn) {
               console.info({ column })
               throw new Error(
                 process.env.NODE_ENV !== 'production'

package/src/utils/getPaginationRowModel.ts

@@ -7,7 +7,10 @@ export function getPaginationRowModel<TGenerics extends AnyGenerics>(opts?: {
 }): (instance: TableInstance<TGenerics>) => () => RowModel<TGenerics> {
   return instance =>
     memo(
-      () => [instance.getState().pagination, instance.getExpandedRowModel()],
+      () => [
+        instance.getState().pagination,
+        instance.getPrePaginationRowModel(),
+      ],
       (pagination, rowModel) => {
         if (!rowModel.rows.length) {
           return rowModel

package/src/utils/getSortedRowModelAsync.ts

@@ -7,7 +7,7 @@ export function getSortedRowModelSync<TGenerics extends AnyGenerics>(opts?: {
 }): (instance: TableInstance<TGenerics>) => () => RowModel<TGenerics> {
   return instance =>
     incrementalMemo(
-      () => [instance.getState().sorting, instance.getGlobalFilteredRowModel()],
+      () => [instance.getState().sorting, instance.getPreSortedRowModel()],
       (_sorting, rowModel): RowModel<TGenerics> => {
         return {
           rows: rowModel.rows.slice(),

package/src/utils/getSortedRowModelSync.ts

@@ -7,7 +7,7 @@ export function getSortedRowModelSync<TGenerics extends AnyGenerics>(): (
 ) => () => RowModel<TGenerics> {
   return instance =>
     memo(
-      () => [instance.getState().sorting, instance.getGlobalFilteredRowModel()],
+      () => [instance.getState().sorting, instance.getPreSortedRowModel()],
       (sorting, rowModel) => {
         if (!rowModel.rows.length || !sorting?.length) {
           return rowModel

package/src/utils.ts

@@ -10,6 +10,17 @@ export type Overwrite<T, U extends { [TKey in keyof T]?: any }> = Omit<
 > &
   U
 
+export type IfDefined<T, N> = 0 extends 1 & T ? N : T extends {} ? T : N
+
+// export type DefinedGenericKeys<T extends AnyGenerics> = {
+//   [K in keyof T]: 0 extends 1 & T[K] ? never : T[K] extends {} ? K : never
+// }[keyof T]
+
+// export type DefinedGenerics<T extends AnyGenerics> = Pick<
+//   T,
+//   DefinedGenericKeys<T>
+// >
+
 export type DataUpdateFunction<T> = (input: T) => T
 
 export function functionalUpdate<T>(updater: Updater<T>, input: T): T {
@@ -53,7 +64,7 @@ export function getBatchGroups<T>(arr: T[], count: number) {
 
 export function makeStateUpdater(key: keyof TableState, instance: unknown) {
   return (updater: Updater<any>) => {
-    ;(instance as any).setState(<TTableState,>(old: TTableState) => {
+    ;(instance as any).setState(<TTableState>(old: TTableState) => {
       return {
         ...old,
         [key]: functionalUpdate(updater, (old as any)[key]),

package/build/cjs/aggregationTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"aggregationTypes.js","sources":["../../src/aggregationTypes.ts"],"sourcesContent":["export const aggregationTypes = {\n  sum,\n  min,\n  max,\n  extent,\n  mean,\n  median,\n  unique,\n  uniqueCount,\n  count,\n}\n\nexport type BuiltInAggregationType = keyof typeof aggregationTypes\n\nfunction sum(_getLeafValues: () => unknown[], getChildValues: () => unknown[]) {\n  // It's faster to just add the aggregations together instead of\n  // process leaf nodes individually\n  return getChildValues().reduce(\n    (sum: number, next: unknown) => sum + (typeof next === 'number' ? next : 0),\n    0\n  )\n}\n\nfunction min(_getLeafValues: () => unknown[], getChildValues: () => unknown[]) {\n  let min: number | undefined\n\n  for (const value of getChildValues() as number[]) {\n    if (\n      value != null &&\n      (min! > value || (min === undefined && value >= value))\n    ) {\n      min = value\n    }\n  }\n\n  return min\n}\n\nfunction max(_getLeafValues: () => unknown[], getChildValues: () => unknown[]) {\n  let max: number | undefined\n\n  for (const value of getChildValues() as number[]) {\n    if (\n      value != null &&\n      (max! < value || (max === undefined && value >= value))\n    ) {\n      max = value\n    }\n  }\n\n  return max\n}\n\nfunction extent(\n  _getLeafValues: () => unknown[],\n  getChildValues: () => unknown[]\n) {\n  let min: number | undefined\n  let max: number | undefined\n\n  for (const value of getChildValues() as number[]) {\n    if (value != null) {\n      if (min === undefined) {\n        if (value >= value) min = max = value\n      } else {\n        if (min > value) min = value\n        if (max! < value) max = value\n      }\n    }\n  }\n\n  return [min, max]\n}\n\nexport function mean(getLeafValues: () => unknown[]) {\n  let count = 0\n  let sum = 0\n\n  for (let value of getLeafValues() as number[]) {\n    if (value != null && (value = +value) >= value) {\n      ++count, (sum += value)\n    }\n  }\n\n  if (count) return sum / count\n\n  return\n}\n\nfunction median(getLeafValues: () => unknown[]) {\n  const leafValues = getLeafValues()\n  if (!leafValues.length) {\n    return\n  }\n\n  let min = 0\n  let max = 0\n\n  leafValues.forEach(value => {\n    if (typeof value === 'number') {\n      min = Math.min(min, value)\n      max = Math.max(max, value)\n    }\n  })\n\n  return (min + max) / 2\n}\n\nfunction unique<T>(getLeafValues: () => T[]) {\n  return Array.from(new Set(getLeafValues()).values())\n}\n\nfunction uniqueCount(getLeafValues: () => unknown[]) {\n  return new Set(getLeafValues()).size\n}\n\nfunction count(getLeafValues: () => unknown[]) {\n  return getLeafValues().length\n}\n"],"names":["aggregationTypes","sum","min","max","extent","mean","median","unique","uniqueCount","count","_getLeafValues","getChildValues","reduce","next","value","undefined","getLeafValues","leafValues","length","forEach","Math","Array","from","Set","values","size"],"mappings":"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"}

package/build/cjs/filterTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filterTypes.js","sources":["../../src/filterTypes.ts"],"sourcesContent":["import { PartialGenerics, AnyGenerics, Row } from './types'\n\nexport const filterTypes = {\n  includesString,\n  includesStringSensitive,\n  equalsString,\n  equalsStringSensitive,\n  arrIncludes,\n  arrIncludesAll,\n  equals,\n  weakEquals,\n  betweenNumberRange,\n}\n\nexport type BuiltInFilterType = keyof typeof filterTypes\n\nfunction includesString<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  const search = String(filterValue).toLowerCase()\n\n  rows = rows.filter(row => {\n    return columnIds.some(id => {\n      return String(row.values[id]).toLowerCase().includes(search)\n    })\n  })\n  return rows\n}\n\nincludesString.autoRemove = (val: any) => testFalsey(val)\n\nfunction includesStringSensitive<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  const search = String(filterValue)\n\n  rows = rows.filter(row => {\n    return columnIds.some(id => {\n      return String(row.values[id]).includes(search)\n    })\n  })\n  return rows\n}\n\nincludesStringSensitive.autoRemove = (val: any) => testFalsey(val)\n\nfunction equalsString<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  const search = String(filterValue).toLowerCase()\n\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return rowValue !== undefined\n        ? String(rowValue).toLowerCase() === search\n        : true\n    })\n  })\n}\n\nequalsString.autoRemove = (val: any) => testFalsey(val)\n\nfunction equalsStringSensitive<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  const search = String(filterValue)\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return rowValue !== undefined ? String(rowValue) === search : true\n    })\n  })\n}\n\nequalsStringSensitive.autoRemove = (val: any) => testFalsey(val)\n\nfunction arrIncludes<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return rowValue.includes(filterValue)\n    })\n  })\n}\n\narrIncludes.autoRemove = (val: any) => testFalsey(val) || !val?.length\n\nfunction arrIncludesAll<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown[]\n) {\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return (\n        rowValue &&\n        rowValue.length &&\n        filterValue.every(val => rowValue.includes(val))\n      )\n    })\n  })\n}\n\narrIncludesAll.autoRemove = (val: any) => testFalsey(val) || !val?.length\n\nfunction equals<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return rowValue === filterValue\n    })\n  })\n}\n\nequals.autoRemove = (val: any) => testFalsey(val)\n\nfunction weakEquals<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: unknown\n) {\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      // eslint-disable-next-line eqeqeq\n      return rowValue == filterValue\n    })\n  })\n}\n\nweakEquals.autoRemove = (val: any) => testFalsey(val)\n\nfunction betweenNumberRange<TGenerics extends AnyGenerics>(\n  rows: Row<TGenerics>[],\n  columnIds: string[],\n  filterValue: [unknown, unknown]\n) {\n  let [unsafeMin, unsafeMax] = filterValue || []\n\n  let parsedMin =\n    typeof unsafeMin !== 'number' ? parseFloat(unsafeMin as string) : unsafeMin\n  let parsedMax =\n    typeof unsafeMax !== 'number' ? parseFloat(unsafeMax as string) : unsafeMax\n\n  let min =\n    unsafeMin === null || Number.isNaN(parsedMin) ? -Infinity : parsedMin\n  let max = unsafeMax === null || Number.isNaN(parsedMax) ? Infinity : parsedMax\n\n  if (min > max) {\n    const temp = min\n    min = max\n    max = temp\n  }\n\n  return rows.filter(row => {\n    return columnIds.some(id => {\n      const rowValue = row.values[id]\n      return rowValue >= min && rowValue <= max\n    })\n  })\n}\n\nbetweenNumberRange.autoRemove = (val: any) =>\n  testFalsey(val) || (testFalsey(val[0]) && testFalsey(val[1]))\n\n// Utils\n\nfunction testFalsey(val: any) {\n  return val === undefined || val === null || val === ''\n}\n"],"names":["filterTypes","includesString","includesStringSensitive","equalsString","equalsStringSensitive","arrIncludes","arrIncludesAll","equals","weakEquals","betweenNumberRange","rows","columnIds","filterValue","search","String","toLowerCase","filter","row","some","id","values","includes","autoRemove","val","testFalsey","rowValue","undefined","length","every","unsafeMin","unsafeMax","parsedMin","parseFloat","parsedMax","min","Number","isNaN","Infinity","max","temp"],"mappings":"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"}

package/build/cjs/sortTypes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"sortTypes.js","sources":["../../src/sortTypes.ts"],"sourcesContent":["import { PartialGenerics, AnyGenerics, Row } from './types'\n\nexport const reSplitAlphaNumeric = /([0-9]+)/gm\n\nexport const sortTypes = {\n  alphanumeric,\n  alphanumericCaseSensitive,\n  text,\n  textCaseSensitive,\n  datetime,\n  basic,\n}\n\nexport type BuiltInSortType = keyof typeof sortTypes\n\nfunction alphanumeric<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareAlphanumeric(\n    toString(rowA.values[columnId]).toLowerCase(),\n    toString(rowB.values[columnId]).toLowerCase()\n  )\n}\n\nfunction alphanumericCaseSensitive<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareAlphanumeric(\n    toString(rowA.values[columnId]),\n    toString(rowB.values[columnId])\n  )\n}\n\n// Mixed sorting is slow, but very inclusive of many edge cases.\n// It handles numbers, mixed alphanumeric combinations, and even\n// null, undefined, and Infinity\nfunction compareAlphanumeric(aStr: string, bStr: string) {\n  // Split on number groups, but keep the delimiter\n  // Then remove falsey split values\n  const a = aStr.split(reSplitAlphaNumeric).filter(Boolean)\n  const b = bStr.split(reSplitAlphaNumeric).filter(Boolean)\n\n  // While\n  while (a.length && b.length) {\n    const aa = a.shift()!\n    const bb = b.shift()!\n\n    const an = parseInt(aa, 10)\n    const bn = parseInt(bb, 10)\n\n    const combo = [an, bn].sort()\n\n    // Both are string\n    if (isNaN(combo[0]!)) {\n      if (aa > bb) {\n        return 1\n      }\n      if (bb > aa) {\n        return -1\n      }\n      continue\n    }\n\n    // One is a string, one is a number\n    if (isNaN(combo[1]!)) {\n      return isNaN(an) ? -1 : 1\n    }\n\n    // Both are numbers\n    if (an > bn) {\n      return 1\n    }\n    if (bn > an) {\n      return -1\n    }\n  }\n\n  return a.length - b.length\n}\n\n// The text filter is more basic (less numeric support)\n// but is much faster\nfunction text<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareBasic(\n    toString(rowA.values[columnId]).toLowerCase(),\n    toString(rowB.values[columnId]).toLowerCase()\n  )\n}\n\n// The text filter is more basic (less numeric support)\n// but is much faster\nfunction textCaseSensitive<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareBasic(\n    toString(rowA.values[columnId]),\n    toString(rowB.values[columnId])\n  )\n}\n\nfunction datetime<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareBasic(\n    (rowA.values[columnId] as Date).getTime(),\n    (rowB.values[columnId] as Date).getTime()\n  )\n}\n\nfunction basic<TGenerics extends AnyGenerics>(\n  rowA: Row<TGenerics>,\n  rowB: Row<TGenerics>,\n  columnId: string\n) {\n  return compareBasic(rowA.values[columnId], rowB.values[columnId])\n}\n\n// Utils\n\nfunction compareBasic(a: any, b: any) {\n  return a === b ? 0 : a > b ? 1 : -1\n}\n\nfunction toString(a: any) {\n  if (typeof a === 'number') {\n    if (isNaN(a) || a === Infinity || a === -Infinity) {\n      return ''\n    }\n    return String(a)\n  }\n  if (typeof a === 'string') {\n    return a\n  }\n  return ''\n}\n"],"names":["reSplitAlphaNumeric","sortTypes","alphanumeric","alphanumericCaseSensitive","text","textCaseSensitive","datetime","basic","rowA","rowB","columnId","compareAlphanumeric","toString","values","toLowerCase","aStr","bStr","a","split","filter","Boolean","b","length","aa","shift","bb","an","parseInt","bn","combo","sort","isNaN","compareBasic","getTime","Infinity","String"],"mappings":"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"}