@tanstack/table-core 8.5.4 → 8.5.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.5.4",
+  "version": "8.5.7",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/columnHelper.ts

@@ -15,6 +15,7 @@ import { DeepKeys, DeepValue, RequiredKeys } from './utils'
 //   visits: number
 //   status: string
 //   progress: number
+//   createdAt: Date
 //   nested: {
 //     foo: [
 //       {

package/src/types.ts

@@ -240,7 +240,7 @@ export type AccessorFnColumnDef<
 
 export type AccessorKeyColumnDef<TData extends RowData, TValue = unknown> = {
   id?: string
-} & ColumnIdentifiers<TData, TValue> &
+} & Partial<ColumnIdentifiers<TData, TValue>> &
   ColumnDefBase<TData, TValue> & {
     accessorKey: DeepKeys<TData>
   }

package/src/utils.ts

@@ -48,16 +48,48 @@ export type DeepKeys<T> = unknown extends T
   : object extends T
   ? string
   : T extends readonly any[] & IsTuple<T>
-  ? AllowedIndexes<T> | DeepKeysPrefix<T, AllowedIndexes<T>>
+  ? AllowedIndexes<T> | DeepKeysPrefix<T>
   : T extends any[]
   ? never & 'Dynamic length array indexing is not supported'
+  : T extends Date
+  ? never
   : T extends object
-  ? (keyof T & string) | DeepKeysPrefix<T, keyof T>
+  ? (keyof T & string) | DeepKeysPrefix<T>
   : never
 
-type DeepKeysPrefix<T, TPrefix> = TPrefix extends keyof T & (number | string)
-  ? `${TPrefix}.${DeepKeys<T[TPrefix]> & string}`
-  : never
+type Key = string | number | symbol
+type Join<L extends Key | undefined, R extends Key | undefined> = L extends
+  | string
+  | number
+  ? R extends string | number
+    ? `${L}.${R}`
+    : L
+  : R extends string | number
+  ? R
+  : undefined
+type Union<
+  L extends unknown | undefined,
+  R extends unknown | undefined
+> = L extends undefined
+  ? R extends undefined
+    ? undefined
+    : R
+  : R extends undefined
+  ? L
+  : L | R
+type DeepKeysPrefix<
+  T extends object,
+  Prev extends Key | undefined = undefined,
+  Path extends Key | undefined = undefined,
+  PrevTypes extends object = T
+> = string &
+  {
+    [K in keyof T]: T[K] extends PrevTypes | T
+      ? Union<Union<Prev, Path>, Join<Path, K>>
+      : T[K] extends object
+      ? DeepKeysPrefix<T[K], Union<Prev, Path>, Join<Path, K>, PrevTypes | T>
+      : Union<Union<Prev, Path>, Join<Path, K>>
+  }[keyof T]
 
 export type DeepValue<T, TProp> = T extends Record<string | number, any>
   ? TProp extends `${infer TBranch}.${infer TDeepProp}`