chore(release): v3.0.0-beta.96 [skip ci]

## Description

Fixes a bug with nested arrays within either localized blocks or arrays.

docs/configuration/overview.mdx

@@ -71,6 +71,7 @@ The following options are available:
 | **`db`** \*                | The Database Adapter which will be used by Payload. [More details](../database/overview).                                                                                                      |
 | **`serverURL`**            | A string used to define the absolute URL of your app. This includes the protocol, for example `https://example.com`. No paths allowed, only protocol, domain and (optionally) port.            |
 | **`collections`**          | An array of Collections for Payload to manage. [More details](./collections).                                                                                                                  |
+| **`compatibility`**        | Compatibility flags for earlier versions of Payload. [More details](#compatibility-flags).                                                                                                     |
 | **`globals`**              | An array of Globals for Payload to manage. [More details](./globals).                                                                                                                          |
 | **`cors`**                 | Cross-origin resource sharing (CORS) is a mechanism that accept incoming requests from given domains. You can also customize the `Access-Control-Allow-Headers` header. [More details](#cors). |
 | **`localization`**         | Opt-in to translate your content into multiple locales. [More details](./localization).                                                                                                        |
@@ -253,3 +254,13 @@ import type { Config, SanitizedConfig } from 'payload'
 The Payload Config only lives on the server and is not allowed to contain any client-side code. That way, you can load up the Payload Config in any server environment or standalone script, without having to use Bundlers or Node.js loaders to handle importing client-only modules (e.g. scss files or React Components) without any errors.
 
 Behind the curtains, the Next.js-based Admin Panel generates a ClientConfig, which strips away any server-only code and enriches the config with React Components.
+
+## Compatibility flags
+
+The Payload Config can accept compatibility flags for running the newest versions but with older databases. You should only use these flags if you need to, and should confirm that you need to prior to enabling these flags.
+
+`allowLocalizedWithinLocalized`
+
+Payload localization works on a field-by-field basis. As you can nest fields within other fields, you could potentially nest a localized field within a localized field—but this would be redundant and unnecessary. There would be no reason to define a localized field within a localized parent field, given that the entire data structure from the parent field onward would be localized.
+
+By default, Payload will remove the `localized: true` property from sub-fields if a parent field is localized. Set this compatibility flag to `true` only if you have an existing Payload MongoDB database from pre-3.0, and you have nested localized fields that you would like to maintain without migrating. 

eslint.config.js

@@ -40,6 +40,7 @@ export const rootEslintConfig = [
   {
     ignores: [
       ...defaultESLintIgnores,
+      'packages/eslint-*/**',
       'test/live-preview/next-app',
       'packages/**/*.spec.ts',
       'templates/**',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-monorepo",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "private": true,
   "type": "module",
   "scripts": {
@@ -64,10 +64,10 @@
     "docker:restart": "pnpm docker:stop --remove-orphans && pnpm docker:start",
     "docker:start": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml up -d",
     "docker:stop": "docker compose -f packages/plugin-cloud-storage/docker-compose.yml down",
-    "fix": "eslint \"packages/**/*.ts\" --fix",
     "force:build": "pnpm run build:core:force",
-    "lint": "eslint \"packages/**/*.ts\"",
+    "lint": "turbo run lint --concurrency 1 --continue",
     "lint-staged": "lint-staged",
+    "lint:fix": "turbo run lint:fix --concurrency 1 --continue",
     "obliterate-playwright-cache-macos": "rm -rf ~/Library/Caches/ms-playwright && find /System/Volumes/Data/private/var/folders -type d -name 'playwright*' -exec rm -rf {} +",
     "prepare": "husky",
     "reinstall": "pnpm clean:all && pnpm install",

packages/create-payload-app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-payload-app",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -42,6 +42,8 @@
     "build": "pnpm pack-template-files && pnpm typecheck && pnpm build:swc",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "pack-template-files": "node --no-deprecation --import @swc-node/register/esm-register src/scripts/pack-template-files.ts",
     "prepublishOnly": "pnpm clean && pnpm build",
     "test": "jest",

packages/create-payload-app/src/lib/create-project.spec.ts

@@ -14,6 +14,7 @@ import { getValidTemplates } from './templates.js'
 describe('createProject', () => {
   let projectDir: string
   beforeAll(() => {
+    // eslint-disable-next-line no-console
     console.log = jest.fn()
   })
 
@@ -57,7 +58,7 @@ describe('createProject', () => {
       const packageJson = fse.readJsonSync(packageJsonPath)
 
       // Check package name and description
-      expect(packageJson.name).toEqual(projectName)
+      expect(packageJson.name).toStrictEqual(projectName)
     })
 
     describe('creates project from template', () => {
@@ -115,10 +116,6 @@ describe('createProject', () => {
           })
         )?.[0]
 
-        if (!payloadConfigPath) {
-          throw new Error(`Could not find payload.config.ts inside ${projectDir}`)
-        }
-
         const content = fse.readFileSync(payloadConfigPath, 'utf-8')
 
         // Check payload.config.ts

packages/create-payload-app/src/lib/init-next.ts

@@ -2,7 +2,6 @@ import type { CompilerOptions } from 'typescript'
 
 import * as p from '@clack/prompts'
 import { parse, stringify } from 'comment-json'
-import execa from 'execa'
 import fs from 'fs'
 import fse from 'fs-extra'
 import globby from 'globby'
@@ -53,8 +52,7 @@ export async function initNext(args: InitNextArgs): Promise<InitNextResult> {
     nextAppDetails.nextAppDir = createdAppDir
   }
 
-  const { hasTopLevelLayout, isPayloadInstalled, isSrcDir, nextAppDir, nextConfigType } =
-    nextAppDetails
+  const { hasTopLevelLayout, isSrcDir, nextAppDir, nextConfigType } = nextAppDetails
 
   if (!nextConfigType) {
     return {
@@ -169,7 +167,9 @@ async function installAndConfigurePayload(
   }
 
   const logDebug = (message: string) => {
-    if (debug) origDebug(message)
+    if (debug) {
+      origDebug(message)
+    }
   }
 
   if (!fs.existsSync(projectDir)) {
@@ -210,7 +210,7 @@ async function installAndConfigurePayload(
   )
 
   // This is a little clunky and needs to account for isSrcDir
-  copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath), debug)
+  copyRecursiveSync(templateSrcDir, path.dirname(nextConfigPath))
 
   // Wrap next.config.js with withPayload
   await wrapNextConfig({ nextConfigPath, nextConfigType })

packages/create-payload-app/src/lib/parse-project-name.ts

@@ -4,13 +4,19 @@ import slugify from '@sindresorhus/slugify'
 import type { CliArgs } from '../types.js'
 
 export async function parseProjectName(args: CliArgs): Promise<string> {
-  if (args['--name']) return slugify(args['--name'])
-  if (args._[0]) return slugify(args._[0])
+  if (args['--name']) {
+    return slugify(args['--name'])
+  }
+  if (args._[0]) {
+    return slugify(args._[0])
+  }
 
   const projectName = await p.text({
     message: 'Project name?',
     validate: (value) => {
-      if (!value) return 'Please enter a project name.'
+      if (!value) {
+        return 'Please enter a project name.'
+      }
     },
   })
   if (p.isCancel(projectName)) {

packages/create-payload-app/src/lib/parse-template.ts

@@ -9,7 +9,9 @@ export async function parseTemplate(
   if (args['--template']) {
     const templateName = args['--template']
     const template = validTemplates.find((t) => t.name === templateName)
-    if (!template) throw new Error('Invalid template given')
+    if (!template) {
+      throw new Error('Invalid template given')
+    }
     return template
   }
 

packages/create-payload-app/src/lib/select-db.ts

@@ -54,7 +54,9 @@ export async function selectDb(args: CliArgs, projectName: string): Promise<DbDe
         value: dbChoice.value,
       })),
     })
-    if (p.isCancel(dbType)) process.exit(0)
+    if (p.isCancel(dbType)) {
+      process.exit(0)
+    }
   }
 
   const dbChoice = dbChoiceRecord[dbType]
@@ -73,7 +75,9 @@ export async function selectDb(args: CliArgs, projectName: string): Promise<DbDe
       initialValue: initialDbUri,
       message: `Enter ${dbChoice.title.split(' ')[0]} connection string`, // strip beta from title
     })
-    if (p.isCancel(dbUri)) process.exit(0)
+    if (p.isCancel(dbUri)) {
+      process.exit(0)
+    }
   }
 
   return {

packages/create-payload-app/src/lib/update-payload-in-project.ts

@@ -16,7 +16,9 @@ import { installPackages } from './install-packages.js'
 export async function updatePayloadInProject(
   appDetails: NextAppDetails,
 ): Promise<{ message: string; success: boolean }> {
-  if (!appDetails.nextConfigPath) return { message: 'No Next.js config found', success: false }
+  if (!appDetails.nextConfigPath) {
+    return { message: 'No Next.js config found', success: false }
+  }
 
   const projectDir = path.dirname(appDetails.nextConfigPath)
 

packages/create-payload-app/src/lib/wrap-next-config.ts

@@ -42,8 +42,6 @@ export async function parseAndModifyConfigContent(
 ): Promise<{ modifiedConfigContent: string; success: boolean }> {
   content = withPayloadStatement[configType] + '\n' + content
 
-  console.log({ configType, content })
-
   if (configType === 'cjs' || configType === 'esm') {
     try {
       const ast = parseModule(content, { loc: true })

packages/create-payload-app/src/lib/write-env-file.ts

@@ -36,7 +36,9 @@ export async function writeEnvFile(args: {
           .split('\n')
           .filter((e) => e)
           .map((line) => {
-            if (line.startsWith('#') || !line.includes('=')) return line
+            if (line.startsWith('#') || !line.includes('=')) {
+              return line
+            }
 
             const split = line.split('=')
             const key = split[0]

packages/create-payload-app/src/utils/copy-recursive-sync.ts

@@ -6,7 +6,7 @@ import path from 'path'
  *
  * @internal
  */
-export function copyRecursiveSync(src: string, dest: string, debug?: boolean) {
+export function copyRecursiveSync(src: string, dest: string) {
   const exists = fs.existsSync(src)
   const stats = exists && fs.statSync(src)
   const isDirectory = exists && stats !== false && stats.isDirectory()

packages/db-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -30,6 +30,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "dependencies": {

packages/db-mongodb/src/connect.ts

@@ -59,8 +59,10 @@ export const connect: Connect = async function connect(
       await this.migrate({ migrations: this.prodMigrations })
     }
   } catch (err) {
-    console.log(err)
-    this.payload.logger.error(`Error: cannot connect to MongoDB. Details: ${err.message}`, err)
+    this.payload.logger.error({
+      err,
+      msg: `Error: cannot connect to MongoDB. Details: ${err.message}`,
+    })
     process.exit(1)
   }
 }

packages/db-mongodb/src/createGlobal.ts

@@ -2,7 +2,7 @@ import type { CreateGlobal, PayloadRequest } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const createGlobal: CreateGlobal = async function createGlobal(

packages/db-mongodb/src/deleteOne.ts

@@ -2,7 +2,7 @@ import type { DeleteOne, Document, PayloadRequest } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const deleteOne: DeleteOne = async function deleteOne(

packages/db-mongodb/src/find.ts

@@ -6,7 +6,7 @@ import { flattenWhereToOperators } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { buildSortParam } from './queries/buildSortParam.js'
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const find: Find = async function find(

packages/db-mongodb/src/findGlobal.ts

@@ -4,7 +4,7 @@ import { combineQueries } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const findGlobal: FindGlobal = async function findGlobal(

packages/db-mongodb/src/findGlobalVersions.ts

@@ -6,7 +6,7 @@ import { buildVersionGlobalFields, flattenWhereToOperators } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { buildSortParam } from './queries/buildSortParam.js'
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(

packages/db-mongodb/src/findOne.ts

@@ -3,7 +3,7 @@ import type { Document, FindOne, PayloadRequest } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const findOne: FindOne = async function findOne(

packages/db-mongodb/src/findVersions.ts

@@ -6,7 +6,7 @@ import { flattenWhereToOperators } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { buildSortParam } from './queries/buildSortParam.js'
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const findVersions: FindVersions = async function findVersions(

packages/db-mongodb/src/init.ts

@@ -8,10 +8,10 @@ import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'
 import type { MongooseAdapter } from './index.js'
 import type { CollectionModel } from './types.js'
 
-import buildCollectionSchema from './models/buildCollectionSchema.js'
+import { buildCollectionSchema } from './models/buildCollectionSchema.js'
 import { buildGlobalModel } from './models/buildGlobalModel.js'
-import buildSchema from './models/buildSchema.js'
-import getBuildQueryPlugin from './queries/buildQuery.js'
+import { buildSchema } from './models/buildSchema.js'
+import { getBuildQueryPlugin } from './queries/buildQuery.js'
 import { getDBName } from './utilities/getDBName.js'
 
 export const init: Init = function init(this: MongooseAdapter) {

packages/db-mongodb/src/models/buildCollectionSchema.ts

@@ -3,10 +3,10 @@ import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'
 
 import paginate from 'mongoose-paginate-v2'
 
-import getBuildQueryPlugin from '../queries/buildQuery.js'
-import buildSchema from './buildSchema.js'
+import { getBuildQueryPlugin } from '../queries/buildQuery.js'
+import { buildSchema } from './buildSchema.js'
 
-const buildCollectionSchema = (
+export const buildCollectionSchema = (
   collection: SanitizedCollectionConfig,
   config: SanitizedConfig,
   schemaOptions = {},
@@ -44,5 +44,3 @@ const buildCollectionSchema = (
 
   return schema
 }
-
-export default buildCollectionSchema

packages/db-mongodb/src/models/buildGlobalModel.ts

@@ -4,8 +4,8 @@ import mongoose from 'mongoose'
 
 import type { GlobalModel } from '../types.js'
 
-import getBuildQueryPlugin from '../queries/buildQuery.js'
-import buildSchema from './buildSchema.js'
+import { getBuildQueryPlugin } from '../queries/buildQuery.js'
+import { buildSchema } from './buildSchema.js'
 
 export const buildGlobalModel = (config: SanitizedConfig): GlobalModel | null => {
   if (config.globals && config.globals.length > 0) {

packages/db-mongodb/src/models/buildSchema.ts

@@ -111,7 +111,7 @@ const localizeSchema = (
   return schema
 }
 
-const buildSchema = (
+export const buildSchema = (
   config: SanitizedConfig,
   configFields: Field[],
   buildSchemaOptions: BuildSchemaOptions = {},
@@ -669,5 +669,3 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
     })
   },
 }
-
-export default buildSchema

packages/db-mongodb/src/queries/buildQuery.ts

@@ -18,7 +18,10 @@ export type BuildQueryArgs = {
 
 // This plugin asynchronously builds a list of Mongoose query constraints
 // which can then be used in subsequent Mongoose queries.
-const getBuildQueryPlugin = ({ collectionSlug, versionsFields }: GetBuildQueryPluginArgs = {}) => {
+export const getBuildQueryPlugin = ({
+  collectionSlug,
+  versionsFields,
+}: GetBuildQueryPluginArgs = {}) => {
   return function buildQueryPlugin(schema) {
     const modifiedSchema = schema
     async function buildQuery({
@@ -57,5 +60,3 @@ const getBuildQueryPlugin = ({ collectionSlug, versionsFields }: GetBuildQueryPl
     modifiedSchema.statics.buildQuery = buildQuery
   }
 }
-
-export default getBuildQueryPlugin

packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts

@@ -16,7 +16,7 @@ describe('get localized sort property', () => {
       },
     } as Config)
   })
-  it('passes through a non-localized sort property', async () => {
+  it('passes through a non-localized sort property', () => {
     const result = getLocalizedSortProperty({
       config,
       fields: [

packages/db-mongodb/src/queryDrafts.ts

@@ -6,7 +6,7 @@ import { combineQueries, flattenWhereToOperators } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { buildSortParam } from './queries/buildSortParam.js'
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const queryDrafts: QueryDrafts = async function queryDrafts(

packages/db-mongodb/src/transactions/beginTransaction.ts

@@ -6,6 +6,8 @@ import { v4 as uuid } from 'uuid'
 
 import type { MongooseAdapter } from '../index.js'
 
+// Needs await to fulfill the interface
+// eslint-disable-next-line @typescript-eslint/require-await
 export const beginTransaction: BeginTransaction = async function beginTransaction(
   this: MongooseAdapter,
   options: TransactionOptions,

packages/db-mongodb/src/updateGlobal.ts

@@ -2,7 +2,7 @@ import type { PayloadRequest, UpdateGlobal } from 'payload'
 
 import type { MongooseAdapter } from './index.js'
 
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const updateGlobal: UpdateGlobal = async function updateGlobal(

packages/db-mongodb/src/updateOne.ts

@@ -3,7 +3,7 @@ import type { PayloadRequest, UpdateOne } from 'payload'
 import type { MongooseAdapter } from './index.js'
 
 import { handleError } from './utilities/handleError.js'
-import sanitizeInternalFields from './utilities/sanitizeInternalFields.js'
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'
 import { withSession } from './withSession.js'
 
 export const updateOne: UpdateOne = async function updateOne(

packages/db-mongodb/src/utilities/sanitizeInternalFields.ts

@@ -1,6 +1,6 @@
 const internalFields = ['__v']
 
-const sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc: T): T =>
+export const sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc: T): T =>
   Object.entries(incomingDoc).reduce((newDoc, [key, val]): T => {
     if (key === '_id') {
       return {
@@ -18,5 +18,3 @@ const sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc:
       [key]: val,
     }
   }, {} as T)
-
-export default sanitizeInternalFields

packages/db-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-postgres",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "The officially supported Postgres database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -40,6 +40,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepack": "pnpm clean && pnpm turbo build",
     "prepublishOnly": "pnpm clean && pnpm turbo build",
     "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"

packages/db-sqlite/.eslintignore

@@ -1,10 +0,0 @@
-.tmp
-**/.git
-**/.hg
-**/.pnp.*
-**/.svn
-**/.yarn/**
-**/build
-**/dist/**
-**/node_modules
-**/temp

packages/db-sqlite/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-sqlite",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "The officially supported SQLite database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -39,6 +39,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepack": "pnpm clean && pnpm turbo build",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
   },

packages/db-vercel-postgres/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-vercel-postgres",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "Vercel Postgres adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -40,6 +40,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepack": "pnpm clean && pnpm turbo build",
     "prepublishOnly": "pnpm clean && pnpm turbo build",
     "renamePredefinedMigrations": "node --no-deprecation --import @swc-node/register/esm-register ./scripts/renamePredefinedMigrations.ts"

packages/drizzle/.eslintignore

@@ -1,10 +0,0 @@
-.tmp
-**/.git
-**/.hg
-**/.pnp.*
-**/.svn
-**/.yarn/**
-**/build
-**/dist/**
-**/node_modules
-**/temp

packages/drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/drizzle",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "A library of shared functions used by different payload database adapters",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -39,6 +39,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepack": "pnpm clean && pnpm turbo build",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
   },

packages/drizzle/src/find/buildFindManyArgs.ts

@@ -12,11 +12,11 @@ type BuildFindQueryArgs = {
   tableName: string
 }
 
-export type Result = DBQueryConfig<'many', true, any, any> & {
-  with?: DBQueryConfig<'many', true, any, any> & {
+export type Result = {
+  with?: {
     _locales?: DBQueryConfig<'many', true, any, any>
-  }
-}
+  } & DBQueryConfig<'many', true, any, any>
+} & DBQueryConfig<'many', true, any, any>
 
 // Generate the Drizzle query for findMany based on
 // a collection field structure

packages/drizzle/src/migrateDown.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload'
 
 import {

packages/drizzle/src/migrateRefresh.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload'
 
 import {

packages/drizzle/src/migrateReset.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from 'payload'
 
 import {

packages/drizzle/src/migrateStatus.ts

@@ -30,7 +30,7 @@ export async function migrateStatus(this: DrizzleAdapter): Promise<void> {
     const existingMigration = existingMigrations.find((m) => m.name === migration.name)
     return {
       Name: migration.name,
-      // eslint-disable-next-line perfectionist/sort-objects
+
       Batch: existingMigration?.batch,
       Ran: existingMigration ? 'Yes' : 'No',
     }

packages/drizzle/src/queries/buildAndOrConditions.ts

@@ -28,11 +28,10 @@ export async function buildAndOrConditions({
   const completedConditions = []
   // Loop over all AND / OR operations and add them to the AND / OR query param
   // Operations should come through as an array
-  // eslint-disable-next-line no-restricted-syntax
+
   for (const condition of where) {
     // If the operation is properly formatted as an object
     if (typeof condition === 'object') {
-      // eslint-disable-next-line no-await-in-loop
       const result = await parseParams({
         adapter,
         fields,

packages/drizzle/src/queries/parseParams.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-await-in-loop */
 import type { SQL } from 'drizzle-orm'
 import type { Field, Operator, Where } from 'payload'
 

packages/drizzle/src/queries/selectDistinct.ts

@@ -5,6 +5,7 @@ import type { ChainedMethods } from '../find/chainMethods.js'
 import type {
   DrizzleAdapter,
   DrizzleTransaction,
+  GenericColumn,
   GenericPgColumn,
   TransactionPg,
   TransactionSQLite,
@@ -12,7 +13,6 @@ import type {
 import type { BuildQueryJoinAliases } from './buildQuery.js'
 
 import { chainMethods } from '../find/chainMethods.js'
-import { type GenericColumn } from '../types.js'
 
 type Args = {
   adapter: DrizzleAdapter
@@ -35,7 +35,7 @@ export const selectDistinct = ({
   selectFields,
   tableName,
   where,
-}: Args): QueryPromise<Record<string, GenericColumn> & { id: number | string }[]> => {
+}: Args): QueryPromise<{ id: number | string }[] & Record<string, GenericColumn>> => {
   if (Object.keys(joins).length > 0) {
     if (where) {
       chainedMethods.push({ args: [where], method: 'where' })

packages/drizzle/src/queryDrafts.ts

@@ -35,7 +35,6 @@ export const queryDrafts: QueryDrafts = async function queryDrafts(
   return {
     ...result,
     docs: result.docs.map((doc) => {
-      // eslint-disable-next-line no-param-reassign
       doc = {
         id: doc.parent,
         ...doc.version,

packages/drizzle/src/transform/read/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { Field, SanitizedConfig, TypeWithID } from 'payload'
 
 import type { DrizzleAdapter } from '../../types.js'

packages/drizzle/src/transform/read/traverseFields.ts

@@ -177,7 +177,7 @@ export const traverseFields = <T extends Record<string, unknown>>({
               return arrayResult
             }, {})
           } else {
-            result[field.name] = fieldData.map((row, i) => {
+            result[field.name] = fieldData.reduce((acc, row, i) => {
               if (row._uuid) {
                 row.id = row._uuid
                 delete row._uuid
@@ -187,22 +187,35 @@ export const traverseFields = <T extends Record<string, unknown>>({
                 delete row._order
               }
 
-              return traverseFields<T>({
-                adapter,
-                blocks,
-                config,
-                dataRef: row,
-                deletions,
-                fieldPrefix: '',
-                fields: field.fields,
-                numbers,
-                path: `${sanitizedPath}${field.name}.${i}`,
-                relationships,
-                table: row,
-                texts,
-                withinArrayOrBlockLocale,
-              })
-            })
+              if (
+                !withinArrayOrBlockLocale ||
+                (withinArrayOrBlockLocale && withinArrayOrBlockLocale === row._locale)
+              ) {
+                if (row._locale) {
+                  delete row._locale
+                }
+
+                acc.push(
+                  traverseFields<T>({
+                    adapter,
+                    blocks,
+                    config,
+                    dataRef: row,
+                    deletions,
+                    fieldPrefix: '',
+                    fields: field.fields,
+                    numbers,
+                    path: `${sanitizedPath}${field.name}.${i}`,
+                    relationships,
+                    table: row,
+                    texts,
+                    withinArrayOrBlockLocale,
+                  }),
+                )
+              }
+
+              return acc
+            }, [])
           }
         }
 

packages/drizzle/src/transform/write/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { Field } from 'payload'
 
 import type { DrizzleAdapter } from '../../types.js'

packages/drizzle/src/transform/write/selects.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import { isArrayOfRows } from '../../utilities/isArrayOfRows.js'
 
 type Args = {

packages/drizzle/src/upsertRow/index.ts

@@ -348,20 +348,52 @@ export const upsertRow = async <T extends Record<string, unknown> | TypeWithID>(
     // Error Handling
     // //////////////////////////////////
   } catch (error) {
-    throw error.code === '23505'
-      ? new ValidationError(
-          {
-            id,
-            errors: [
-              {
-                field: adapter.fieldConstraints[tableName][error.constraint],
-                message: req.t('error:valueMustBeUnique'),
-              },
-            ],
-          },
-          req.t,
-        )
-      : error
+    if (error.code === '23505') {
+      let fieldName: null | string = null
+      // We need to try and find the right constraint for the field but if we can't we fallback to a generic message
+      if (adapter.fieldConstraints?.[tableName]) {
+        if (adapter.fieldConstraints[tableName]?.[error.constraint]) {
+          fieldName = adapter.fieldConstraints[tableName]?.[error.constraint]
+        } else {
+          const replacement = `${tableName}_`
+
+          if (error.constraint.includes(replacement)) {
+            const replacedConstraint = error.constraint.replace(replacement, '')
+
+            if (replacedConstraint && adapter.fieldConstraints[tableName]?.[replacedConstraint])
+              fieldName = adapter.fieldConstraints[tableName][replacedConstraint]
+          }
+        }
+      }
+
+      if (!fieldName) {
+        // Last case scenario we extract the key and value from the detail on the error
+        const detail = error.detail
+        const regex = /Key \(([^)]+)\)=\(([^)]+)\)/
+        const match = detail.match(regex)
+
+        if (match) {
+          const key = match[1]
+
+          fieldName = key
+        }
+      }
+
+      throw new ValidationError(
+        {
+          id,
+          errors: [
+            {
+              field: fieldName,
+              message: req.t('error:valueMustBeUnique'),
+            },
+          ],
+        },
+        req.t,
+      )
+    } else {
+      throw error
+    }
   }
 
   if (ignoreResult) return data as T

packages/drizzle/src/upsertRow/insertArrays.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { ArrayRowToInsert } from '../transform/write/types.js'
 import type { DrizzleAdapter, DrizzleTransaction } from '../types.js'
 

packages/drizzle/src/upsertRow/types.ts

@@ -18,18 +18,18 @@ type BaseArgs = {
   tableName: string
 }
 
-type CreateArgs = BaseArgs & {
+type CreateArgs = {
   id?: never
   operation: 'create'
   upsertTarget?: never
   where?: never
-}
+} & BaseArgs
 
-type UpdateArgs = BaseArgs & {
+type UpdateArgs = {
   id?: number | string
   operation: 'update'
   upsertTarget?: GenericColumn
   where?: SQL<unknown>
-}
+} & BaseArgs
 
 export type Args = CreateArgs | UpdateArgs

packages/drizzle/src/utilities/createBlocksMap.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 export type BlocksMap = {
   [path: string]: Record<string, unknown>[]
 }

packages/email-nodemailer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-nodemailer",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "Payload Nodemailer Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -29,6 +29,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "dependencies": {

packages/email-nodemailer/src/index.ts

@@ -47,7 +47,9 @@ async function buildEmail(emailConfig?: NodemailerAdapterArgs): Promise<{
 }> {
   if (!emailConfig) {
     const transport = await createMockAccount(emailConfig)
-    if (!transport) throw new InvalidConfiguration('Unable to create Nodemailer test account.')
+    if (!transport) {
+      throw new InvalidConfiguration('Unable to create Nodemailer test account.')
+    }
 
     return {
       defaultFromAddress: 'info@payloadcms.com',

packages/email-nodemailer/src/plugin.spec.ts

@@ -1,7 +1,11 @@
-import { jest } from '@jest/globals'
+import type { Transporter } from 'nodemailer'
 
-import nodemailer, { Transporter } from 'nodemailer'
-import { nodemailerAdapter, NodemailerAdapterArgs } from './index.js'
+import { jest } from '@jest/globals'
+import nodemailer from 'nodemailer'
+
+import type { NodemailerAdapterArgs } from './index.js'
+
+import { nodemailerAdapter } from './index.js'
 
 const defaultArgs: NodemailerAdapterArgs = {
   defaultFromAddress: 'test@test.com',
@@ -9,7 +13,6 @@ const defaultArgs: NodemailerAdapterArgs = {
 }
 
 describe('email-nodemailer', () => {
-
   describe('transport verification', () => {
     let mockedVerify: jest.Mock<Transporter['verify']>
     let mockTransport: Transporter
@@ -18,20 +21,21 @@ describe('email-nodemailer', () => {
       mockedVerify = jest.fn<Transporter['verify']>()
       mockTransport = nodemailer.createTransport({
         name: 'existing-transport',
-        // eslint-disable-next-line @typescript-eslint/require-await
+        // eslint-disable-next-line @typescript-eslint/require-await, @typescript-eslint/no-misused-promises
         send: async (mail) => {
+          // eslint-disable-next-line no-console
           console.log('mock send', mail)
         },
-        version: '0.0.1',
         verify: mockedVerify,
+        version: '0.0.1',
       })
     })
 
     it('should be invoked when skipVerify = false', async () => {
       await nodemailerAdapter({
         ...defaultArgs,
-        transport: mockTransport,
         skipVerify: false,
+        transport: mockTransport,
       })
 
       expect(mockedVerify.mock.calls).toHaveLength(1)
@@ -40,8 +44,8 @@ describe('email-nodemailer', () => {
     it('should be invoked when skipVerify is undefined', async () => {
       await nodemailerAdapter({
         ...defaultArgs,
-        transport: mockTransport,
         skipVerify: false,
+        transport: mockTransport,
       })
 
       expect(mockedVerify.mock.calls).toHaveLength(1)
@@ -50,8 +54,8 @@ describe('email-nodemailer', () => {
     it('should not be invoked when skipVerify = true', async () => {
       await nodemailerAdapter({
         ...defaultArgs,
-        transport: mockTransport,
         skipVerify: true,
+        transport: mockTransport,
       })
 
       expect(mockedVerify.mock.calls).toHaveLength(0)

packages/email-resend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/email-resend",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "description": "Payload Resend Email Adapter",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -28,6 +28,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepublishOnly": "pnpm clean && pnpm turbo build",
     "test": "jest"
   },

packages/eslint-config/index.mjs

@@ -14,6 +14,7 @@ import { deepMerge } from './deepMerge.js'
 const baseRules = {
   // This rule makes no sense when overriding class methods. This is used a lot in richtext-lexical.
   'class-methods-use-this': 'off',
+  curly: ['warn', 'all'],
   'arrow-body-style': 0,
   'import-x/prefer-default-export': 'off',
   'no-restricted-exports': ['warn', { restrictDefaultExports: { direct: true } }],

packages/graphql/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/graphql",
-  "version": "3.0.0-beta.95",
+  "version": "3.0.0-beta.96",
   "homepage": "https://payloadcms.com",
   "repository": {
     "type": "git",
@@ -38,6 +38,8 @@
     "build:swc": "swc ./src -d ./dist --config-file .swcrc --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "prepublishOnly": "pnpm clean && pnpm turbo build"
   },
   "dependencies": {

packages/graphql/src/index.ts

@@ -8,12 +8,12 @@ import {
   fieldExtensionsEstimator,
   simpleEstimator,
 } from './packages/graphql-query-complexity/index.js'
-import accessResolver from './resolvers/auth/access.js'
-import buildFallbackLocaleInputType from './schema/buildFallbackLocaleInputType.js'
-import buildLocaleInputType from './schema/buildLocaleInputType.js'
-import buildPoliciesType from './schema/buildPoliciesType.js'
-import initCollections from './schema/initCollections.js'
-import initGlobals from './schema/initGlobals.js'
+import { accessResolver } from './resolvers/auth/access.js'
+import { buildFallbackLocaleInputType } from './schema/buildFallbackLocaleInputType.js'
+import { buildLocaleInputType } from './schema/buildLocaleInputType.js'
+import { buildPoliciesType } from './schema/buildPoliciesType.js'
+import { initCollections } from './schema/initCollections.js'
+import { initGlobals } from './schema/initGlobals.js'
 import { wrapCustomFields } from './utilities/wrapCustomResolver.js'
 
 export function configToSchema(config: SanitizedConfig): {

packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts

@@ -122,7 +122,7 @@ export function getComplexity(options: {
   return visitor.complexity
 }
 
-export default class QueryComplexity {
+export class QueryComplexity {
   OperationDefinition: Record<string, any>
   complexity: number
   context: ValidationContext

packages/graphql/src/packages/graphql-query-complexity/createComplexityRule.ts

@@ -2,7 +2,7 @@ import type { ValidationContext } from 'graphql'
 
 import type { QueryComplexityOptions } from './QueryComplexity.js'
 
-import QueryComplexity from './QueryComplexity.js'
+import { QueryComplexity } from './QueryComplexity.js'
 
 export function createComplexityRule(
   options: QueryComplexityOptions,

packages/graphql/src/resolvers/auth/access.ts

@@ -4,7 +4,7 @@ import { accessOperation, isolateObjectProperty } from 'payload'
 
 import type { Context } from '../types.js'
 
-import formatName from '../../utilities/formatName.js'
+import { formatName } from '../../utilities/formatName.js'
 const formatConfigNames = (results, configs) => {
   const formattedResults = { ...results }
 
@@ -17,7 +17,7 @@ const formatConfigNames = (results, configs) => {
   return formattedResults
 }
 
-function accessResolver(config: SanitizedConfig) {
+export function accessResolver(config: SanitizedConfig) {
   async function resolver(_, args, context: Context) {
     const options = {
       req: isolateObjectProperty<any>(context.req, 'transactionID'),
@@ -34,5 +34,3 @@ function accessResolver(config: SanitizedConfig) {
 
   return resolver
 }
-
-export default accessResolver

packages/graphql/src/resolvers/auth/forgotPassword.ts

@@ -4,7 +4,7 @@ import { forgotPasswordOperation, isolateObjectProperty } from 'payload'
 
 import type { Context } from '../types.js'
 
-function forgotPasswordResolver(collection: Collection): any {
+export function forgotPassword(collection: Collection): any {
   async function resolver(_, args, context: Context) {
     const options = {
       collection,
@@ -23,5 +23,3 @@ function forgotPasswordResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default forgotPasswordResolver

packages/graphql/src/resolvers/auth/init.ts

@@ -2,7 +2,7 @@ import { initOperation, isolateObjectProperty } from 'payload'
 
 import type { Context } from '../types.js'
 
-function initResolver(collection: string) {
+export function init(collection: string) {
   async function resolver(_, args, context: Context) {
     const options = {
       collection,
@@ -14,5 +14,3 @@ function initResolver(collection: string) {
 
   return resolver
 }
-
-export default initResolver

packages/graphql/src/resolvers/auth/login.ts

@@ -4,7 +4,7 @@ import { generatePayloadCookie, isolateObjectProperty, loginOperation } from 'pa
 
 import type { Context } from '../types.js'
 
-function loginResolver(collection: Collection): any {
+export function login(collection: Collection): any {
   async function resolver(_, args, context: Context) {
     const options = {
       collection,
@@ -35,5 +35,3 @@ function loginResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default loginResolver

packages/graphql/src/resolvers/auth/logout.ts

@@ -4,7 +4,7 @@ import { generateExpiredPayloadCookie, isolateObjectProperty, logoutOperation }
 
 import type { Context } from '../types.js'
 
-function logoutResolver(collection: Collection): any {
+export function logout(collection: Collection): any {
   async function resolver(_, args, context: Context) {
     const options = {
       collection,
@@ -22,5 +22,3 @@ function logoutResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default logoutResolver

packages/graphql/src/resolvers/auth/me.ts

@@ -4,7 +4,7 @@ import { extractJWT, isolateObjectProperty, meOperation } from 'payload'
 
 import type { Context } from '../types.js'
 
-function meResolver(collection: Collection): any {
+export function me(collection: Collection): any {
   async function resolver(_, args, context: Context) {
     const currentToken = extractJWT(context.req)
 
@@ -26,5 +26,3 @@ function meResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default meResolver

packages/graphql/src/resolvers/auth/refresh.ts

@@ -4,7 +4,7 @@ import { generatePayloadCookie, isolateObjectProperty, refreshOperation } from '
 
 import type { Context } from '../types.js'
 
-function refreshResolver(collection: Collection): any {
+export function refresh(collection: Collection): any {
   async function resolver(_, __, context: Context) {
     const options = {
       collection,
@@ -29,5 +29,3 @@ function refreshResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default refreshResolver

packages/graphql/src/resolvers/auth/resetPassword.ts

@@ -4,10 +4,14 @@ import { generatePayloadCookie, isolateObjectProperty, resetPasswordOperation }
 
 import type { Context } from '../types.js'
 
-function resetPasswordResolver(collection: Collection): any {
+export function resetPassword(collection: Collection): any {
   async function resolver(_, args, context: Context) {
-    if (args.locale) context.req.locale = args.locale
-    if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale
+    if (args.locale) {
+      context.req.locale = args.locale
+    }
+    if (args.fallbackLocale) {
+      context.req.fallbackLocale = args.fallbackLocale
+    }
 
     const options = {
       api: 'GraphQL',
@@ -34,5 +38,3 @@ function resetPasswordResolver(collection: Collection): any {
 
   return resolver
 }
-
-export default resetPasswordResolver

packages/graphql/src/resolvers/auth/unlock.ts

@@ -4,7 +4,7 @@ import { isolateObjectProperty, unlockOperation } from 'payload'
 
 import type { Context } from '../types.js'
 
-function unlockResolver(collection: Collection) {
+export function unlock(collection: Collection) {
   async function resolver(_, args, context: Context) {
     const options = {
       collection,
@@ -18,5 +18,3 @@ function unlockResolver(collection: Collection) {
 
   return resolver
 }
-
-export default unlockResolver

packages/graphql/src/resolvers/auth/verifyEmail.ts

@@ -4,10 +4,14 @@ import { isolateObjectProperty, verifyEmailOperation } from 'payload'
 
 import type { Context } from '../types.js'
 
-function verifyEmailResolver(collection: Collection) {
+export function verifyEmail(collection: Collection) {
   async function resolver(_, args, context: Context) {
-    if (args.locale) context.req.locale = args.locale
-    if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale
+    if (args.locale) {
+      context.req.locale = args.locale
+    }
+    if (args.fallbackLocale) {
+      context.req.fallbackLocale = args.fallbackLocale
+    }
 
     const options = {
       api: 'GraphQL',
@@ -22,5 +26,3 @@ function verifyEmailResolver(collection: Collection) {
 
   return resolver
 }
-
-export default verifyEmailResolver

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

@@ -22,7 +22,7 @@ export type Resolver<TSlug extends CollectionSlug> = (
   },
 ) => Promise<DataFromCollectionSlug<TSlug>>
 
-export default function createResolver<TSlug extends CollectionSlug>(
+export function createResolver<TSlug extends CollectionSlug>(
   collection: Collection,
 ): Resolver<TSlug> {
   return async function resolver(_, args, context: Context) {

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

@@ -28,7 +28,9 @@ export function getDeleteResolver<TSlug extends CollectionSlug>(
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
-    if (!req.query) req.query = {}
+    if (!req.query) {
+      req.query = {}
+    }
 
     const draft: boolean =
       args.draft ?? req.query?.draft === 'false'
@@ -36,7 +38,9 @@ export function getDeleteResolver<TSlug extends CollectionSlug>(
         : req.query?.draft === 'true'
           ? true
           : undefined
-    if (typeof draft === 'boolean') req.query.draft = String(draft)
+    if (typeof draft === 'boolean') {
+      req.query.draft = String(draft)
+    }
 
     context.req = req
 

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

@@ -17,7 +17,7 @@ export type Resolver<TData> = (
   },
 ) => Promise<TData>
 
-export default function duplicateResolver<TSlug extends CollectionSlug>(
+export function duplicateResolver<TSlug extends CollectionSlug>(
   collection: Collection,
 ): Resolver<DataFromCollectionSlug<TSlug>> {
   return async function resolver(_, args, context: Context) {

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

@@ -31,7 +31,9 @@ export function findResolver(collection: Collection): Resolver {
     req = isolateObjectProperty(req, ['locale', 'fallbackLocale', 'transactionID'])
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
-    if (!req.query) req.query = {}
+    if (!req.query) {
+      req.query = {}
+    }
 
     const draft: boolean =
       args.draft ?? req.query?.draft === 'false'
@@ -39,7 +41,9 @@ export function findResolver(collection: Collection): Resolver {
         : req.query?.draft === 'true'
           ? true
           : undefined
-    if (typeof draft === 'boolean') req.query.draft = String(draft)
+    if (typeof draft === 'boolean') {
+      req.query.draft = String(draft)
+    }
 
     context.req = req
 

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

@@ -28,7 +28,9 @@ export function findByIDResolver<TSlug extends CollectionSlug>(
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
-    if (!req.query) req.query = {}
+    if (!req.query) {
+      req.query = {}
+    }
 
     const draft: boolean =
       args.draft ?? req.query?.draft === 'false'
@@ -36,7 +38,9 @@ export function findByIDResolver<TSlug extends CollectionSlug>(
         : req.query?.draft === 'true'
           ? true
           : undefined
-    if (typeof draft === 'boolean') req.query.draft = String(draft)
+    if (typeof draft === 'boolean') {
+      req.query.draft = String(draft)
+    }
 
     context.req = req
 

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

@@ -29,7 +29,9 @@ export function findVersionsResolver(collection: Collection): Resolver {
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
-    if (!req.query) req.query = {}
+    if (!req.query) {
+      req.query = {}
+    }
 
     const draft: boolean =
       args.draft ?? req.query?.draft === 'false'
@@ -37,7 +39,9 @@ export function findVersionsResolver(collection: Collection): Resolver {
         : req.query?.draft === 'true'
           ? true
           : undefined
-    if (typeof draft === 'boolean') req.query.draft = String(draft)
+    if (typeof draft === 'boolean') {
+      req.query.draft = String(draft)
+    }
 
     context.req = req
 

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

@@ -15,7 +15,7 @@ export type Resolver = (
   },
 ) => Promise<Document>
 
-export default function restoreVersionResolver(collection: Collection): Resolver {
+export function restoreVersionResolver(collection: Collection): Resolver {
   async function resolver(_, args, context: Context) {
     const options = {
       id: args.id,

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

@@ -30,7 +30,9 @@ export function updateResolver<TSlug extends CollectionSlug>(
     req = isolateObjectProperty(req, 'fallbackLocale')
     req.locale = args.locale || locale
     req.fallbackLocale = args.fallbackLocale || fallbackLocale
-    if (!req.query) req.query = {}
+    if (!req.query) {
+      req.query = {}
+    }
 
     const draft: boolean =
       args.draft ?? req.query?.draft === 'false'
@@ -38,7 +40,9 @@ export function updateResolver<TSlug extends CollectionSlug>(
         : req.query?.draft === 'true'
           ? true
           : undefined
-    if (typeof draft === 'boolean') req.query.draft = String(draft)
+    if (typeof draft === 'boolean') {
+      req.query.draft = String(draft)
+    }
 
     context.req = req
 

packages/graphql/src/resolvers/globals/findOne.ts

@@ -4,10 +4,14 @@ import { findOneOperation, isolateObjectProperty } from 'payload'
 
 import type { Context } from '../types.js'
 
-export default function findOneResolver(globalConfig: SanitizedGlobalConfig): Document {
+export function findOne(globalConfig: SanitizedGlobalConfig): Document {
   return async function resolver(_, args, context: Context) {
-    if (args.locale) context.req.locale = args.locale
-    if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale
+    if (args.locale) {
+      context.req.locale = args.locale
+    }
+    if (args.fallbackLocale) {
+      context.req.fallbackLocale = args.fallbackLocale
+    }
 
     const { slug } = globalConfig
 

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

@@ -17,10 +17,14 @@ export type Resolver = (
   },
 ) => Promise<Document>
 
-export default function findVersionByIDResolver(globalConfig: SanitizedGlobalConfig): Resolver {
+export function findVersionByID(globalConfig: SanitizedGlobalConfig): Resolver {
   return async function resolver(_, args, context: Context) {
-    if (args.locale) context.req.locale = args.locale
-    if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale
+    if (args.locale) {
+      context.req.locale = args.locale
+    }
+    if (args.fallbackLocale) {
+      context.req.fallbackLocale = args.fallbackLocale
+    }
 
     const options = {
       id: args.id,

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

@@ -19,7 +19,7 @@ export type Resolver = (
   },
 ) => Promise<Document>
 
-export default function findVersionsResolver(globalConfig: SanitizedGlobalConfig): Resolver {
+export function findVersions(globalConfig: SanitizedGlobalConfig): Resolver {
   return async function resolver(_, args, context: Context) {
     const options = {
       depth: 0,

packages/graphql/src/resolvers/globals/index.ts

@@ -1,7 +1,7 @@
-import findOne from './findOne.js'
-import findVersionByID from './findVersionByID.js'
-import findVersions from './findVersions.js'
-import restoreVersion from './restoreVersion.js'
-import update from './update.js'
+import { findOne } from './findOne.js'
+import { findVersionByID } from './findVersionByID.js'
+import { findVersions } from './findVersions.js'
+import { restoreVersion } from './restoreVersion.js'
+import { update } from './update.js'
 
 export { findOne, findVersionByID, findVersions, restoreVersion, update }

packages/graphql/src/resolvers/globals/restoreVersion.ts

@@ -14,7 +14,7 @@ type Resolver = (
     req: PayloadRequest
   },
 ) => Promise<Document>
-export default function restoreVersionResolver(globalConfig: SanitizedGlobalConfig): Resolver {
+export function restoreVersion(globalConfig: SanitizedGlobalConfig): Resolver {
   return async function resolver(_, args, context: Context) {
     const options = {
       id: args.id,

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

@@ -18,12 +18,16 @@ type Resolver<TSlug extends GlobalSlug> = (
   },
 ) => Promise<DataFromGlobalSlug<TSlug>>
 
-export default function updateResolver<TSlug extends GlobalSlug>(
+export function update<TSlug extends GlobalSlug>(
   globalConfig: SanitizedGlobalConfig,
 ): Resolver<TSlug> {
   return async function resolver(_, args, context: Context) {
-    if (args.locale) context.req.locale = args.locale
-    if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale
+    if (args.locale) {
+      context.req.locale = args.locale
+    }
+    if (args.fallbackLocale) {
+      context.req.fallbackLocale = args.fallbackLocale
+    }
 
     const { slug } = globalConfig
 

packages/graphql/src/schema/buildFallbackLocaleInputType.ts

@@ -2,9 +2,9 @@ import type { SanitizedLocalizationConfig } from 'payload'
 
 import { GraphQLEnumType } from 'graphql'
 
-import formatName from '../utilities/formatName.js'
+import { formatName } from '../utilities/formatName.js'
 
-const buildFallbackLocaleInputType = (
+export const buildFallbackLocaleInputType = (
   localization: SanitizedLocalizationConfig,
 ): GraphQLEnumType => {
   return new GraphQLEnumType({
@@ -20,5 +20,3 @@ const buildFallbackLocaleInputType = (
     ),
   })
 }
-
-export default buildFallbackLocaleInputType

packages/graphql/src/schema/buildLocaleInputType.ts

@@ -3,9 +3,9 @@ import type { SanitizedLocalizationConfig } from 'payload'
 
 import { GraphQLEnumType } from 'graphql'
 
-import formatName from '../utilities/formatName.js'
+import { formatName } from '../utilities/formatName.js'
 
-const buildLocaleInputType = (
+export const buildLocaleInputType = (
   localization: SanitizedLocalizationConfig,
 ): GraphQLEnumType | GraphQLScalarType => {
   return new GraphQLEnumType({
@@ -21,5 +21,3 @@ const buildLocaleInputType = (
     ),
   })
 }
-
-export default buildLocaleInputType

packages/graphql/src/schema/buildMutationInputType.ts

@@ -40,10 +40,10 @@ import { flattenTopLevelFields, toWords } from 'payload'
 import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/shared'
 
 import { GraphQLJSON } from '../packages/graphql-type-json/index.js'
-import combineParentName from '../utilities/combineParentName.js'
-import formatName from '../utilities/formatName.js'
+import { combineParentName } from '../utilities/combineParentName.js'
+import { formatName } from '../utilities/formatName.js'
 import { groupOrTabHasRequiredSubfield } from '../utilities/groupOrTabHasRequiredSubfield.js'
-import withNullableType from './withNullableType.js'
+import { withNullableType } from './withNullableType.js'
 
 const idFieldTypes = {
   number: GraphQLInt,
@@ -97,7 +97,9 @@ export function buildMutationInputType({
         parentName: fullName,
       })
 
-      if (!type) return inputObjectTypeConfig
+      if (!type) {
+        return inputObjectTypeConfig
+      }
 
       type = new GraphQLList(withNullableType(field, type, forceNullable))
       return {
@@ -120,7 +122,9 @@ export function buildMutationInputType({
     collapsible: (inputObjectTypeConfig: InputObjectTypeConfig, field: CollapsibleField) =>
       field.fields.reduce((acc, subField: CollapsibleField) => {
         const addSubField = fieldToSchemaMap[subField.type]
-        if (addSubField) return addSubField(acc, subField)
+        if (addSubField) {
+          return addSubField(acc, subField)
+        }
         return acc
       }, inputObjectTypeConfig),
     date: (inputObjectTypeConfig: InputObjectTypeConfig, field: DateField) => ({
@@ -142,9 +146,13 @@ export function buildMutationInputType({
         parentName: fullName,
       })
 
-      if (!type) return inputObjectTypeConfig
+      if (!type) {
+        return inputObjectTypeConfig
+      }
 
-      if (requiresAtLeastOneField) type = new GraphQLNonNull(type)
+      if (requiresAtLeastOneField) {
+        type = new GraphQLNonNull(type)
+      }
       return {
         ...inputObjectTypeConfig,
         [field.name]: { type },
@@ -227,7 +235,9 @@ export function buildMutationInputType({
     row: (inputObjectTypeConfig: InputObjectTypeConfig, field: RowField) =>
       field.fields.reduce((acc, subField: Field) => {
         const addSubField = fieldToSchemaMap[subField.type]
-        if (addSubField) return addSubField(acc, subField)
+        if (addSubField) {
+          return addSubField(acc, subField)
+        }
         return acc
       }, inputObjectTypeConfig),
     select: (inputObjectTypeConfig: InputObjectTypeConfig, field: SelectField) => {
@@ -274,9 +284,13 @@ export function buildMutationInputType({
             parentName: fullName,
           })
 
-          if (!type) return acc
+          if (!type) {
+            return acc
+          }
 
-          if (requiresAtLeastOneField) type = new GraphQLNonNull(type)
+          if (requiresAtLeastOneField) {
+            type = new GraphQLNonNull(type)
+          }
           return {
             ...acc,
             [tab.name]: { type },
@@ -287,7 +301,9 @@ export function buildMutationInputType({
           ...acc,
           ...tab.fields.reduce((subFieldSchema, subField) => {
             const addSubField = fieldToSchemaMap[subField.type]
-            if (addSubField) return addSubField(subFieldSchema, subField)
+            if (addSubField) {
+              return addSubField(subFieldSchema, subField)
+            }
             return subFieldSchema
           }, acc),
         }

packages/graphql/src/schema/buildObjectType.ts

@@ -44,24 +44,11 @@ import { tabHasName } from 'payload/shared'
 import type { Context } from '../resolvers/types.js'
 
 import { GraphQLJSON } from '../packages/graphql-type-json/index.js'
-import combineParentName from '../utilities/combineParentName.js'
-import formatName from '../utilities/formatName.js'
-import formatOptions from '../utilities/formatOptions.js'
-import buildWhereInputType from './buildWhereInputType.js'
-import isFieldNullable from './isFieldNullable.js'
-import withNullableType from './withNullableType.js'
-
-type LocaleInputType = {
-  fallbackLocale: {
-    type: GraphQLType
-  }
-  locale: {
-    type: GraphQLType
-  }
-  where: {
-    type: GraphQLType
-  }
-}
+import { combineParentName } from '../utilities/combineParentName.js'
+import { formatName } from '../utilities/formatName.js'
+import { formatOptions } from '../utilities/formatOptions.js'
+import { isFieldNullable } from './isFieldNullable.js'
+import { withNullableType } from './withNullableType.js'
 
 export type ObjectTypeConfig = {
   [path: string]: GraphQLFieldConfig<any, any>
@@ -184,7 +171,9 @@ export function buildObjectType({
     collapsible: (objectTypeConfig: ObjectTypeConfig, field: CollapsibleField) =>
       field.fields.reduce((objectTypeConfigWithCollapsibleFields, subField) => {
         const addSubField = fieldToSchemaMap[subField.type]
-        if (addSubField) return addSubField(objectTypeConfigWithCollapsibleFields, subField)
+        if (addSubField) {
+          return addSubField(objectTypeConfigWithCollapsibleFields, subField)
+        }
         return objectTypeConfigWithCollapsibleFields
       }, objectTypeConfig),
     date: (objectTypeConfig: ObjectTypeConfig, field: DateField) => ({
@@ -297,7 +286,7 @@ export function buildObjectType({
             value: {
               type: new GraphQLUnionType({
                 name: relationshipName,
-                resolveType(data, { req }) {
+                resolveType(data) {
                   return graphqlResult.collections[data.collection].graphQL.type.name
                 },
                 types,
@@ -472,7 +461,9 @@ export function buildObjectType({
         },
         async resolve(parent, args, context: Context) {
           let depth = config.defaultDepth
-          if (typeof args.depth !== 'undefined') depth = args.depth
+          if (typeof args.depth !== 'undefined') {
+            depth = args.depth
+          }
           if (!field?.editor) {
             throw new MissingEditorProp(field) // while we allow disabling editor functionality, you should not have any richText fields defined if you do not have an editor
           }
@@ -519,7 +510,9 @@ export function buildObjectType({
     row: (objectTypeConfig: ObjectTypeConfig, field: RowField) =>
       field.fields.reduce((objectTypeConfigWithRowFields, subField) => {
         const addSubField = fieldToSchemaMap[subField.type]
-        if (addSubField) return addSubField(objectTypeConfigWithRowFields, subField)
+        if (addSubField) {
+          return addSubField(objectTypeConfigWithRowFields, subField)
+        }
         return objectTypeConfigWithRowFields
       }, objectTypeConfig),
     select: (objectTypeConfig: ObjectTypeConfig, field: SelectField) => {
@@ -573,7 +566,9 @@ export function buildObjectType({
           ...tabSchema,
           ...tab.fields.reduce((subFieldSchema, subField) => {
             const addSubField = fieldToSchemaMap[subField.type]
-            if (addSubField) return addSubField(subFieldSchema, subField)
+            if (addSubField) {
+              return addSubField(subFieldSchema, subField)
+            }
             return subFieldSchema
           }, tabSchema),
         }
@@ -626,7 +621,7 @@ export function buildObjectType({
             value: {
               type: new GraphQLUnionType({
                 name: relationshipName,
-                resolveType(data, { req }) {
+                resolveType(data) {
                   return graphqlResult.collections[data.collection].graphQL.type.name
                 },
                 types,
@@ -704,7 +699,7 @@ export function buildObjectType({
 
               const result = await context.req.payloadDataLoader.load(
                 createDataloaderCacheKey({
-                  collectionSlug: collectionSlug as string,
+                  collectionSlug,
                   currentDepth: 0,
                   depth: 0,
                   docID: id,
@@ -751,7 +746,7 @@ export function buildObjectType({
           if (id) {
             const relatedDocument = await context.req.payloadDataLoader.load(
               createDataloaderCacheKey({
-                collectionSlug: relatedCollectionSlug as string,
+                collectionSlug: relatedCollectionSlug,
                 currentDepth: 0,
                 depth: 0,
                 docID: id,

packages/graphql/src/schema/buildPoliciesType.ts

@@ -11,7 +11,7 @@ import { GraphQLBoolean, GraphQLNonNull, GraphQLObjectType } from 'graphql'
 import { toWords } from 'payload'
 
 import { GraphQLJSONObject } from '../packages/graphql-type-json/index.js'
-import formatName from '../utilities/formatName.js'
+import { formatName } from '../utilities/formatName.js'
 
 type OperationType = 'create' | 'delete' | 'read' | 'readVersions' | 'unlock' | 'update'
 
@@ -148,7 +148,9 @@ export function buildPolicyType(args: BuildPolicyType): GraphQLObjectType {
 
   let operations = []
 
-  if (graphQL === false) return null
+  if (graphQL === false) {
+    return null
+  }
 
   if (type === 'collection') {
     operations = ['create', 'read', 'update', 'delete']
@@ -199,7 +201,7 @@ export function buildPolicyType(args: BuildPolicyType): GraphQLObjectType {
   })
 }
 
-export default function buildPoliciesType(config: SanitizedConfig): GraphQLObjectType {
+export function buildPoliciesType(config: SanitizedConfig): GraphQLObjectType {
   const fields = {
     canAccessAdmin: {
       type: new GraphQLNonNull(GraphQLBoolean),

packages/graphql/src/schema/buildWhereInputType.ts

@@ -4,8 +4,8 @@ import { GraphQLInputObjectType, GraphQLList } from 'graphql'
 import { flattenTopLevelFields } from 'payload'
 import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/shared'
 
-import formatName from '../utilities/formatName.js'
-import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js'
+import { formatName } from '../utilities/formatName.js'
+import { fieldToSchemaMap } from './fieldToWhereInputSchemaMap.js'
 import { withOperators } from './withOperators.js'
 
 type Args = {
@@ -28,7 +28,7 @@ type Args = {
  *    directly searchable. Instead, we need to build a chained pathname
  *    using dot notation so MongoDB can properly search nested paths.
  */
-const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputObjectType => {
+export const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputObjectType => {
   // This is the function that builds nested paths for all
   // field types with nested paths.
 
@@ -109,5 +109,3 @@ const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputOb
     },
   })
 }
-
-export default buildWhereInputType

packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts

@@ -23,9 +23,9 @@ import type {
 import { GraphQLEnumType, GraphQLInputObjectType } from 'graphql'
 
 import { GraphQLJSON } from '../packages/graphql-type-json/index.js'
-import combineParentName from '../utilities/combineParentName.js'
-import formatName from '../utilities/formatName.js'
-import recursivelyBuildNestedPaths from './recursivelyBuildNestedPaths.js'
+import { combineParentName } from '../utilities/combineParentName.js'
+import { formatName } from '../utilities/formatName.js'
+import { recursivelyBuildNestedPaths } from './recursivelyBuildNestedPaths.js'
 import { withOperators } from './withOperators.js'
 
 type Args = {
@@ -33,7 +33,7 @@ type Args = {
   parentName: string
 }
 
-const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({
+export const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({
   array: (field: ArrayField) =>
     recursivelyBuildNestedPaths({
       field,
@@ -161,5 +161,3 @@ const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({
     }
   },
 })
-
-export default fieldToSchemaMap

packages/graphql/src/schema/initCollections.ts

@@ -18,38 +18,38 @@ import { fieldAffectsData } from 'payload/shared'
 
 import type { ObjectTypeConfig } from './buildObjectType.js'
 
-import forgotPassword from '../resolvers/auth/forgotPassword.js'
-import init from '../resolvers/auth/init.js'
-import login from '../resolvers/auth/login.js'
-import logout from '../resolvers/auth/logout.js'
-import me from '../resolvers/auth/me.js'
-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 { forgotPassword } from '../resolvers/auth/forgotPassword.js'
+import { init } from '../resolvers/auth/init.js'
+import { login } from '../resolvers/auth/login.js'
+import { logout } from '../resolvers/auth/logout.js'
+import { me } from '../resolvers/auth/me.js'
+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 createResolver from '../resolvers/collections/create.js'
+import { createResolver } from '../resolvers/collections/create.js'
 import { getDeleteResolver } from '../resolvers/collections/delete.js'
 import { docAccessResolver } from '../resolvers/collections/docAccess.js'
-import duplicateResolver from '../resolvers/collections/duplicate.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 restoreVersionResolver from '../resolvers/collections/restoreVersion.js'
+import { restoreVersionResolver } from '../resolvers/collections/restoreVersion.js'
 import { updateResolver } from '../resolvers/collections/update.js'
-import formatName from '../utilities/formatName.js'
+import { formatName } from '../utilities/formatName.js'
 import { buildMutationInputType, getCollectionIDType } from './buildMutationInputType.js'
 import { buildObjectType } from './buildObjectType.js'
 import { buildPaginatedListType } from './buildPaginatedListType.js'
 import { buildPolicyType } from './buildPoliciesType.js'
-import buildWhereInputType from './buildWhereInputType.js'
+import { buildWhereInputType } from './buildWhereInputType.js'
 
 type InitCollectionsGraphQLArgs = {
   config: SanitizedConfig
   graphqlResult: GraphQLInfo
 }
-function initCollectionsGraphQL({ config, graphqlResult }: InitCollectionsGraphQLArgs): void {
+export function initCollections({ config, graphqlResult }: InitCollectionsGraphQLArgs): void {
   Object.keys(graphqlResult.collections).forEach((slug) => {
     const collection: Collection = graphqlResult.collections[slug]
     const {
@@ -57,7 +57,9 @@ function initCollectionsGraphQL({ config, graphqlResult }: InitCollectionsGraphQ
       config: { fields, graphQL = {} as SanitizedCollectionConfig['graphQL'], versions },
     } = collection
 
-    if (!graphQL) return
+    if (!graphQL) {
+      return
+    }
 
     let singularName
     let pluralName
@@ -514,5 +516,3 @@ function initCollectionsGraphQL({ config, graphqlResult }: InitCollectionsGraphQ
     }
   })
 }
-
-export default initCollectionsGraphQL

packages/graphql/src/schema/initGlobals.ts

@@ -7,23 +7,23 @@ import type { Field, GraphQLInfo, SanitizedConfig, SanitizedGlobalConfig } from
 import { buildVersionGlobalFields, toWords } from 'payload'
 
 import { docAccessResolver } from '../resolvers/globals/docAccess.js'
-import findOneResolver from '../resolvers/globals/findOne.js'
-import findVersionByIDResolver from '../resolvers/globals/findVersionByID.js'
-import findVersionsResolver from '../resolvers/globals/findVersions.js'
-import restoreVersionResolver from '../resolvers/globals/restoreVersion.js'
-import updateResolver from '../resolvers/globals/update.js'
-import formatName from '../utilities/formatName.js'
+import { findOne } from '../resolvers/globals/findOne.js'
+import { findVersionByID } from '../resolvers/globals/findVersionByID.js'
+import { findVersions } from '../resolvers/globals/findVersions.js'
+import { restoreVersion } from '../resolvers/globals/restoreVersion.js'
+import { update } from '../resolvers/globals/update.js'
+import { formatName } from '../utilities/formatName.js'
 import { buildMutationInputType } from './buildMutationInputType.js'
 import { buildObjectType } from './buildObjectType.js'
 import { buildPaginatedListType } from './buildPaginatedListType.js'
 import { buildPolicyType } from './buildPoliciesType.js'
-import buildWhereInputType from './buildWhereInputType.js'
+import { buildWhereInputType } from './buildWhereInputType.js'
 
 type InitGlobalsGraphQLArgs = {
   config: SanitizedConfig
   graphqlResult: GraphQLInfo
 }
-function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): void {
+export function initGlobals({ config, graphqlResult }: InitGlobalsGraphQLArgs): void {
   Object.keys(graphqlResult.globals.config).forEach((slug) => {
     const global: SanitizedGlobalConfig = graphqlResult.globals.config[slug]
     const { fields, graphQL, versions } = global
@@ -36,7 +36,9 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
 
     const forceNullableObjectType = Boolean(versions?.drafts)
 
-    if (!graphqlResult.globals.graphQL) graphqlResult.globals.graphQL = {}
+    if (!graphqlResult.globals.graphQL) {
+      graphqlResult.globals.graphQL = {}
+    }
 
     const updateMutationInputType = buildMutationInputType({
       name: formattedName,
@@ -70,7 +72,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
             }
           : {}),
       },
-      resolve: findOneResolver(global),
+      resolve: findOne(global),
     }
 
     graphqlResult.Mutation.fields[`update${formattedName}`] = {
@@ -86,7 +88,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
             }
           : {}),
       },
-      resolve: updateResolver(global),
+      resolve: update(global),
     }
 
     graphqlResult.Query.fields[`docAccess${formattedName}`] = {
@@ -141,7 +143,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
               }
             : {}),
         },
-        resolve: findVersionByIDResolver(global),
+        resolve: findVersionByID(global),
       }
       graphqlResult.Query.fields[`versions${formattedName}`] = {
         type: buildPaginatedListType(
@@ -166,7 +168,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
           page: { type: GraphQLInt },
           sort: { type: GraphQLString },
         },
-        resolve: findVersionsResolver(global),
+        resolve: findVersions(global),
       }
       graphqlResult.Mutation.fields[`restoreVersion${formatName(formattedName)}`] = {
         type: graphqlResult.globals.graphQL[slug].type,
@@ -174,10 +176,8 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs):
           id: { type: idType },
           draft: { type: GraphQLBoolean },
         },
-        resolve: restoreVersionResolver(global),
+        resolve: restoreVersion(global),
       }
     }
   })
 }
-
-export default initGlobalsGraphQL

packages/graphql/src/schema/isFieldNullable.ts

@@ -2,7 +2,7 @@ import type { FieldAffectingData } from 'payload'
 
 import { fieldAffectsData } from 'payload/shared'
 
-const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => {
+export const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => {
   const hasReadAccessControl = field.access && field.access.read
   const condition = field.admin && field.admin.condition
   return !(
@@ -15,5 +15,3 @@ const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean =>
     !hasReadAccessControl
   )
 }
-
-export default isFieldNullable

packages/graphql/src/schema/operators.ts

@@ -1,4 +1,4 @@
-const operators = {
+export const operators = {
   comparison: ['greater_than_equal', 'greater_than', 'less_than_equal', 'less_than'],
   contains: ['in', 'not_in', 'all'],
   equality: ['equals', 'not_equals'],
@@ -6,5 +6,3 @@ const operators = {
   geojson: ['within', 'intersects'],
   partial: ['like', 'contains'],
 }
-
-export default operators