fix(types): resolve arrays correctly with multi-property resolver (#295)

danielroe · Oct 7, 2022 · a422167 · a422167
1 parent 3f34410
commit a422167
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/src/query/builder.ts b/src/query/builder.ts
@@ -12,7 +12,9 @@ type ResolveFieldType<T> = NonNullable<T> extends Record<string, any>
   : ResolverAction<NonNullable<T>>
 
 interface ResolverFunction<T, Arr = false> {
-  <P extends keyof T>(props: P[]): ResolverAction<Pick<T, P>>
+  <P extends keyof T>(props: P[]): Arr extends true
+    ? ResolveFieldType<Array<Pick<T, P>>>
+    : ResolverAction<Pick<T, P>>
 }
 interface ResolverFunction<T, Arr = false> {
   <P extends keyof T>(prop: P): Arr extends true

diff --git a/test/builder.spec.ts b/test/builder.spec.ts
@@ -1,6 +1,5 @@
 import groq from 'groq'
 import { describe, test, expect } from 'vitest'
-
 import { defineDocument, defineFields } from 'sanity-typed-queries'
 
 const { author } = defineDocument('author', {

diff --git a/test/types/builder.spec.ts b/test/types/builder.spec.ts
@@ -231,6 +231,13 @@ describe('builder types', () => {
         .first()
         .use()[1]
     ).toEqualTypeOf<(string[] | undefined)[] | undefined>()
+    expectTypeOf(
+      referenceBuilder
+        .map(r => ({ fields: r.authors.resolveIn(['_id', 'more']).use() }))
+        .pick('fields')
+        .first()
+        .use()[1]
+    ).toEqualTypeOf<Array<{ _id: string; more?: string[] }> | undefined>()
 
     const subqueryType = defineDocument('test', { title: { type: 'string' } })
       .builder.subquery({