feat: optional field reference

ishowta · Feb 14, 2022 · ce77af5 · ce77af5
1 parent a4c32f3
commit ce77af5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/types.ts b/src/types.ts
@@ -123,7 +123,9 @@ export type JoinedDataInner<
     [K in Exclude<
       keyof GraphQueryQueryType<T, Q>,
       keyof T
-    >]: GraphQueryQueryType<T, Q>[K] extends [infer Ref, infer UQuery]
+    >]: GraphQueryQueryType<T, Q>[K] extends
+      | [infer Ref, infer UQuery]
+      | undefined
       ? Ref extends AnyReference
         ? UQuery extends Function
           ? UQuery extends GraphQuery<RefToDoc<Ref>>

diff --git a/src/useQuery.ts b/src/useQuery.ts
@@ -66,8 +66,8 @@ export function useQuery<
 }
 
 export function field<
-  Ref extends AnyReference,
-  Q extends GraphQuery<RefToDoc<Ref>>
->(ref: Ref, query: Q): [Ref, Q] {
-  return [ref, query];
+  Ref extends AnyReference | undefined,
+  Q extends GraphQuery<RefToDoc<NonNullable<Ref>>>
+>(ref: Ref, query: Q): undefined extends Ref ? [Ref, Q] | undefined : [Ref, Q] {
+  return ref ? [ref, query] : (undefined as any);
 }