fix: ts support for all optional keys in data model (#5283)

* fix: improve ts support when data model has only optional keys * fix: improve ts inference by removing `object extends T` from DeepKeys * prettier --------- Co-authored-by: Jakub Różbicki <[email protected]> Co-authored-by: Kevin Van Cott <[email protected]>
TanStack · Feb 28, 2024 · bc7914a · bc7914a
1 parent b0d7b3a
commit bc7914a
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/packages/table-core/src/utils.ts b/packages/table-core/src/utils.ts
@@ -47,17 +47,15 @@ export type DeepKeys<T, TDepth extends any[] = []> = TDepth['length'] extends 5
   ? never
   : unknown extends T
     ? string
-    : object extends T
-      ? string
-      : T extends readonly any[] & IsTuple<T>
-        ? AllowedIndexes<T> | DeepKeysPrefix<T, AllowedIndexes<T>, TDepth>
-        : T extends any[]
-          ? DeepKeys<T[number], [...TDepth, any]>
-          : T extends Date
-            ? never
-            : T extends object
-              ? (keyof T & string) | DeepKeysPrefix<T, keyof T, TDepth>
-              : never
+    : T extends readonly any[] & IsTuple<T>
+      ? AllowedIndexes<T> | DeepKeysPrefix<T, AllowedIndexes<T>, TDepth>
+      : T extends any[]
+        ? DeepKeys<T[number], [...TDepth, any]>
+        : T extends Date
+          ? never
+          : T extends object
+            ? (keyof T & string) | DeepKeysPrefix<T, keyof T, TDepth>
+            : never
 
 type DeepKeysPrefix<
   T,