fix: threads draft arg through for child resolvers in GraphQL queries (…

…#6196)

packages/graphql/src/resolvers/collections/count.ts

@@ -19,7 +19,7 @@ export type Resolver = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ) => Promise<{ totalDocs: number }>
 
-export default function countResolver(collection: Collection): Resolver {
+export function countResolver(collection: Collection): Resolver {
   return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale

packages/graphql/src/resolvers/collections/delete.ts

@@ -10,25 +10,37 @@ import type { Context } from '../types.js'
 export type Resolver<TSlug extends keyof GeneratedTypes['collections']> = (
   _: unknown,
   args: {
+    draft: boolean
     fallbackLocale?: string
+    id: number | string
     locale?: string
   },
   context: {
     req: PayloadRequestWithData
   },
 ) => Promise<GeneratedTypes['collections'][TSlug]>
 
-export default function getDeleteResolver<TSlug extends keyof GeneratedTypes['collections']>(
+export function getDeleteResolver<TSlug extends keyof GeneratedTypes['collections']>(
   collection: Collection,
 ): Resolver<TSlug> {
-  async function resolver(_, args, context: Context) {
+  return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale
     const fallbackLocale = req.fallbackLocale
     req = isolateObjectProperty(req, 'locale')
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+    if (!req.query) req.query = {}
+
+    const draft: boolean =
+      args.draft ?? req.query?.draft === 'false'
+        ? false
+        : req.query?.draft === 'true'
+          ? true
+          : undefined
+    if (typeof draft === 'boolean') req.query.draft = String(draft)
+
     context.req = req
 
     const options = {
@@ -42,6 +54,4 @@ export default function getDeleteResolver<TSlug extends keyof GeneratedTypes['co
 
     return result
   }
-
-  return resolver
 }

packages/graphql/src/resolvers/collections/find.ts

@@ -25,7 +25,7 @@ export type Resolver = (
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ) => Promise<PaginatedDocs<any>>
 
-export default function findResolver(collection: Collection): Resolver {
+export function findResolver(collection: Collection): Resolver {
   return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale
@@ -34,6 +34,16 @@ export default function findResolver(collection: Collection): Resolver {
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+    if (!req.query) req.query = {}
+
+    const draft: boolean =
+      args.draft ?? req.query?.draft === 'false'
+        ? false
+        : req.query?.draft === 'true'
+          ? true
+          : undefined
+    if (typeof draft === 'boolean') req.query.draft = String(draft)
+
     context.req = req
 
     const options = {

packages/graphql/src/resolvers/collections/findByID.ts

@@ -20,7 +20,7 @@ export type Resolver<T> = (
   },
 ) => Promise<T>
 
-export default function findByIDResolver<T extends keyof GeneratedTypes['collections']>(
+export function findByIDResolver<T extends keyof GeneratedTypes['collections']>(
   collection: Collection,
 ): Resolver<GeneratedTypes['collections'][T]> {
   return async function resolver(_, args, context: Context) {
@@ -31,6 +31,16 @@ export default function findByIDResolver<T extends keyof GeneratedTypes['collect
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+    if (!req.query) req.query = {}
+
+    const draft: boolean =
+      args.draft ?? req.query?.draft === 'false'
+        ? false
+        : req.query?.draft === 'true'
+          ? true
+          : undefined
+    if (typeof draft === 'boolean') req.query.draft = String(draft)
+
     context.req = req
 
     const options = {

packages/graphql/src/resolvers/collections/findVersionByID.ts

@@ -10,7 +10,6 @@ import type { Context } from '../types.js'
 export type Resolver<T extends TypeWithID = any> = (
   _: unknown,
   args: {
-    draft: boolean
     fallbackLocale?: string
     id: number | string
     locale?: string
@@ -20,7 +19,7 @@ export type Resolver<T extends TypeWithID = any> = (
   },
 ) => Promise<TypeWithVersion<T>>
 
-export default function findVersionByIDResolver(collection: Collection): Resolver {
+export function findVersionByIDResolver(collection: Collection): Resolver {
   return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale
@@ -29,13 +28,13 @@ export default function findVersionByIDResolver(collection: Collection): Resolve
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+
     context.req = req
 
     const options = {
       id: args.id,
       collection,
       depth: 0,
-      draft: args.draft,
       req: isolateObjectProperty(req, 'transactionID'),
     }
 

packages/graphql/src/resolvers/collections/findVersions.ts

@@ -10,6 +10,7 @@ import type { Context } from '../types.js'
 export type Resolver = (
   _: unknown,
   args: {
+    draft?: boolean
     fallbackLocale?: string
     limit?: number
     locale?: string
@@ -22,15 +23,25 @@ export type Resolver = (
   },
 ) => Promise<PaginatedDocs<any>>
 
-export default function findVersionsResolver(collection: Collection): Resolver {
-  async function resolver(_, args, context: Context) {
+export function findVersionsResolver(collection: Collection): Resolver {
+  return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale
     const fallbackLocale = req.fallbackLocale
     req = isolateObjectProperty(req, 'locale')
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+    if (!req.query) req.query = {}
+
+    const draft: boolean =
+      args.draft ?? req.query?.draft === 'false'
+        ? false
+        : req.query?.draft === 'true'
+          ? true
+          : undefined
+    if (typeof draft === 'boolean') req.query.draft = String(draft)
+
     context.req = req
 
     const options = {
@@ -47,6 +58,4 @@ export default function findVersionsResolver(collection: Collection): Resolver {
 
     return result
   }
-
-  return resolver
 }

packages/graphql/src/resolvers/collections/update.ts

@@ -13,6 +13,7 @@ export type Resolver<TSlug extends keyof GeneratedTypes['collections']> = (
     autosave: boolean
     data: GeneratedTypes['collections'][TSlug]
     draft: boolean
+    fallbackLocale?: string
     id: number | string
     locale?: string
   },
@@ -21,24 +22,34 @@ export type Resolver<TSlug extends keyof GeneratedTypes['collections']> = (
   },
 ) => Promise<GeneratedTypes['collections'][TSlug]>
 
-export default function updateResolver<TSlug extends keyof GeneratedTypes['collections']>(
+export function updateResolver<TSlug extends keyof GeneratedTypes['collections']>(
   collection: Collection,
 ): Resolver<TSlug> {
-  async function resolver(_, args, context: Context) {
+  return async function resolver(_, args, context: Context) {
     let { req } = context
     const locale = req.locale
     const fallbackLocale = req.fallbackLocale
     req = isolateObjectProperty(req, 'locale')
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
+    if (!req.query) req.query = {}
+
+    const draft: boolean =
+      args.draft ?? req.query?.draft === 'false'
+        ? false
+        : req.query?.draft === 'true'
+          ? true
+          : undefined
+    if (typeof draft === 'boolean') req.query.draft = String(draft)
+
     context.req = req
 
     const options = {
       id: args.id,
       autosave: args.autosave,
       collection,
-      data: args.data,
+      data: args.data as any,
       depth: 0,
       draft: args.draft,
       req: isolateObjectProperty(req, 'transactionID'),
@@ -48,6 +59,4 @@ export default function updateResolver<TSlug extends keyof GeneratedTypes['colle
 
     return result
   }
-
-  return resolver
 }

packages/graphql/src/schema/buildObjectType.ts

@@ -42,7 +42,7 @@ import {
 } from 'graphql'
 import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars'
 import { tabHasName } from 'payload/types'
-import { toWords } from 'payload/utilities'
+import { createDataloaderCacheKey, toWords } from 'payload/utilities'
 
 import type { Context } from '../resolvers/types.js'
 
@@ -320,13 +320,24 @@ function buildObjectType({
       type = type || newlyCreatedBlockType
 
       const relationshipArgs: {
+        draft?: unknown
         fallbackLocale?: unknown
         limit?: unknown
         locale?: unknown
         page?: unknown
         where?: unknown
       } = {}
 
+      const relationsUseDrafts = (Array.isArray(relationTo) ? relationTo : [relationTo]).some(
+        (relation) => graphqlResult.collections[relation].config.versions?.drafts,
+      )
+
+      if (relationsUseDrafts) {
+        relationshipArgs.draft = {
+          type: GraphQLBoolean,
+        }
+      }
+
       if (config.localization) {
         relationshipArgs.locale = {
           type: graphqlResult.types.localeInputType,
@@ -350,6 +361,7 @@ function buildObjectType({
           const locale = args.locale || context.req.locale
           const fallbackLocale = args.fallbackLocale || context.req.fallbackLocale
           let relatedCollectionSlug = field.relationTo
+          const draft = args.draft ?? context.req.query?.draft
 
           if (hasManyValues) {
             const results = []
@@ -365,17 +377,18 @@ function buildObjectType({
               }
 
               const result = await context.req.payloadDataLoader.load(
-                JSON.stringify([
-                  context.req.transactionID,
-                  collectionSlug,
-                  id,
-                  0,
-                  0,
-                  locale,
+                createDataloaderCacheKey({
+                  collectionSlug: collectionSlug as string,
+                  currentDepth: 0,
+                  depth: 0,
+                  docID: id,
+                  draft,
                   fallbackLocale,
-                  false,
-                  false,
-                ]),
+                  locale,
+                  overrideAccess: false,
+                  showHiddenFields: false,
+                  transactionID: context.req.transactionID,
+                }),
               )
 
               if (result) {
@@ -411,17 +424,18 @@ function buildObjectType({
 
           if (id) {
             const relatedDocument = await context.req.payloadDataLoader.load(
-              JSON.stringify([
-                context.req.transactionID,
-                relatedCollectionSlug,
-                id,
-                0,
-                0,
-                locale,
+              createDataloaderCacheKey({
+                collectionSlug: relatedCollectionSlug as string,
+                currentDepth: 0,
+                depth: 0,
+                docID: id,
+                draft,
                 fallbackLocale,
-                false,
-                false,
-              ]),
+                locale,
+                overrideAccess: false,
+                showHiddenFields: false,
+                transactionID: context.req.transactionID,
+              }),
             )
 
             if (relatedDocument) {
@@ -479,6 +493,7 @@ function buildObjectType({
             editor?.populationPromises({
               context,
               depth,
+              draft: args.draft,
               field,
               fieldPromises,
               findMany: false,
@@ -615,17 +630,18 @@ function buildObjectType({
 
           if (id) {
             const relatedDocument = await context.req.payloadDataLoader.load(
-              JSON.stringify([
-                context.req.transactionID,
-                relatedCollectionSlug,
-                id,
-                0,
-                0,
-                locale,
+              createDataloaderCacheKey({
+                collectionSlug: relatedCollectionSlug,
+                currentDepth: 0,
+                depth: 0,
+                docID: id,
+                draft: false,
                 fallbackLocale,
-                false,
-                false,
-              ]),
+                locale,
+                overrideAccess: false,
+                showHiddenFields: false,
+                transactionID: context.req.transactionID,
+              }),
             )
 
             return relatedDocument || null

packages/graphql/src/schema/initCollections.ts

@@ -24,17 +24,17 @@ import refresh from '../resolvers/auth/refresh.js'
 import resetPassword from '../resolvers/auth/resetPassword.js'
 import unlock from '../resolvers/auth/unlock.js'
 import verifyEmail from '../resolvers/auth/verifyEmail.js'
-import countResolver from '../resolvers/collections/count.js'
+import { countResolver } from '../resolvers/collections/count.js'
 import createResolver from '../resolvers/collections/create.js'
-import getDeleteResolver from '../resolvers/collections/delete.js'
+import { getDeleteResolver } from '../resolvers/collections/delete.js'
 import { docAccessResolver } from '../resolvers/collections/docAccess.js'
 import duplicateResolver from '../resolvers/collections/duplicate.js'
-import findResolver from '../resolvers/collections/find.js'
-import findByIDResolver from '../resolvers/collections/findByID.js'
-import findVersionByIDResolver from '../resolvers/collections/findVersionByID.js'
-import findVersionsResolver from '../resolvers/collections/findVersions.js'
+import { findResolver } from '../resolvers/collections/find.js'
+import { findByIDResolver } from '../resolvers/collections/findByID.js'
+import { findVersionByIDResolver } from '../resolvers/collections/findVersionByID.js'
+import { findVersionsResolver } from '../resolvers/collections/findVersions.js'
 import restoreVersionResolver from '../resolvers/collections/restoreVersion.js'
-import updateResolver from '../resolvers/collections/update.js'
+import { updateResolver } from '../resolvers/collections/update.js'
 import formatName from '../utilities/formatName.js'
 import { buildMutationInputType, getCollectionIDType } from './buildMutationInputType.js'
 import buildObjectType from './buildObjectType.js'