fix(core): update resolveTypeForDocument to work with version docs (#8962)

Author: pedrobonamin

packages/sanity/src/core/store/_legacy/document/hooks/__tests__/useDocumentType.test.tsx

@@ -79,7 +79,7 @@ test('should return correct document type on document ID transition', async () =
   const responseGot = defer(() => of(['book']).pipe(observeOn(asyncScheduler)))
 
   client.observable.fetch = (_query, params) =>
-    params.documentId === 'grrm' ? responseGrrm : responseGot
+    params.publishedId === 'grrm' ? responseGrrm : responseGot
 
   let documentId = 'grrm'
   const {result, rerender} = renderHook(() => useDocumentType(documentId, undefined), {

packages/sanity/src/core/store/_legacy/document/resolveTypeForDocument.ts

@@ -2,7 +2,7 @@ import {type SanityClient} from '@sanity/client'
 import {type Observable, of} from 'rxjs'
 import {map} from 'rxjs/operators'
 
-import {getDraftId, getPublishedId} from '../../../util'
+import {getPublishedId} from '../../../util'
 
 export function resolveTypeForDocument(
   client: SanityClient,
@@ -14,9 +14,15 @@ export function resolveTypeForDocument(
     return of(specifiedType)
   }
 
-  const query = '*[_id in [$documentId, $draftId]]._type'
-  const documentId = getPublishedId(id)
-  const draftId = getDraftId(documentId)
+  const query = '*[sanity::versionOf($publishedId)]._type'
 
-  return client.observable.fetch(query, {documentId, draftId}).pipe(map((types) => types[0]))
+  return client.observable
+    .fetch(
+      query,
+      {publishedId: getPublishedId(id)},
+      {
+        tag: 'document.resolve-type',
+      },
+    )
+    .pipe(map((types) => types[0]))
 }

packages/sanity/src/structure/structureBuilder/util/resolveTypeForDocument.ts

@@ -1,22 +1,15 @@
 import {type SanityClient} from '@sanity/client'
-import {
-  DEFAULT_STUDIO_CLIENT_OPTIONS,
-  getDraftId,
-  getPublishedId,
-  type SourceClientOptions,
-} from 'sanity'
+import {DEFAULT_STUDIO_CLIENT_OPTIONS, getPublishedId, type SourceClientOptions} from 'sanity'
 
 export async function resolveTypeForDocument(
   getClient: (options: SourceClientOptions) => SanityClient,
   id: string,
 ): Promise<string | undefined> {
-  const query = '*[_id in [$documentId, $draftId]]._type'
-  const documentId = getPublishedId(id)
-  const draftId = getDraftId(id)
+  const query = '*[sanity::versionOf($publishedId)]._type'
 
   const types = await getClient(DEFAULT_STUDIO_CLIENT_OPTIONS).fetch(
     query,
-    {documentId, draftId},
+    {publishedId: getPublishedId(id)},
     {tag: 'structure.resolve-type'},
   )