fix(core): fix inference for flat types, fix #56, fix #72

cordiverse · Feb 2, 2024 · 6621d2c · 6621d2c
1 parent dcbdf81
commit 6621d2c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/core/src/query.ts b/packages/core/src/query.ts
@@ -1,9 +1,9 @@
 import { Extract, isNullable } from 'cosmokit'
 import { Eval, executeEval } from './eval'
-import { Comparable, Indexable, isComparable, makeRegExp } from './utils'
+import { Comparable, Flatten, Indexable, isComparable, makeRegExp } from './utils'
 import { Selection } from './selection'
 
-export type Query<T = any> = Query.Expr<T> | Query.Shorthand<Indexable> | Selection.Callback<T, boolean>
+export type Query<T = any> = Query.Expr<Flatten<T>> | Query.Shorthand<Indexable> | Selection.Callback<T, boolean>
 
 export namespace Query {
   export interface FieldExpr<T = any> {

diff --git a/packages/core/src/utils.ts b/packages/core/src/utils.ts
@@ -4,7 +4,7 @@ import { Eval } from './eval'
 export type Values<S> = S[keyof S]
 
 export type Keys<O, T = any> = Values<{
-  [K in keyof O]: O[K] extends T ? K : never
+  [K in keyof O]: O[K] extends T | undefined ? K : never
 }> & string
 
 export type Atomic = number | string | boolean | bigint | symbol | Date