chore: run lint and prettier on entire codebase

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

@@ -1,18 +1,20 @@
+import { jest } from '@jest/globals'
+import fs from 'fs'
 import fse from 'fs-extra'
+import globby from 'globby'
+import * as os from 'node:os'
 import path from 'path'
+
 import type { CliArgs, DbType, ProjectTemplate } from '../types.js'
+
 import { createProject } from './create-project.js'
 import { dbReplacements } from './replacements.js'
 import { getValidTemplates } from './templates.js'
-import globby from 'globby'
-import { jest } from '@jest/globals'
-import fs from 'fs'
-import * as os from 'node:os'
 
 describe('createProject', () => {
   let projectDir: string
   beforeAll(() => {
-    console.log = jest.fn()
+    jest.spyOn(console, 'log').mockImplementation()
   })
 
   beforeEach(() => {
@@ -27,7 +29,6 @@ describe('createProject', () => {
   })
 
   describe('#createProject', () => {
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const args = {
       _: ['project-name'],
       '--db': 'mongodb',
@@ -41,15 +42,15 @@ describe('createProject', () => {
       const template: ProjectTemplate = {
         name: 'plugin',
         type: 'plugin',
-        url: 'https://github.com/payloadcms/payload-plugin-template',
         description: 'Template for creating a Payload plugin',
+        url: 'https://github.com/payloadcms/payload-plugin-template',
       }
       await createProject({
         cliArgs: args,
-        projectName,
-        projectDir,
-        template,
         packageManager,
+        projectDir,
+        projectName,
+        template,
       })
 
       const packageJsonPath = path.resolve(projectDir, 'package.json')
@@ -84,14 +85,14 @@ describe('createProject', () => {
 
         await createProject({
           cliArgs,
-          projectName,
-          projectDir,
-          template: template as ProjectTemplate,
-          packageManager,
           dbDetails: {
-            dbUri: `${db}://localhost:27017/create-project-test`,
             type: db as DbType,
+            dbUri: `${db}://localhost:27017/create-project-test`,
           },
+          packageManager,
+          projectDir,
+          projectName,
+          template: template as ProjectTemplate,
         })
 
         const dbReplacement = dbReplacements[db as DbType]

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

@@ -24,13 +24,13 @@ const writeFile = promisify(fs.writeFile)
 const filename = fileURLToPath(import.meta.url)
 const dirname = path.dirname(filename)
 
-type InitNextArgs = Pick<CliArgs, '--debug'> & {
+type InitNextArgs = {
   dbType: DbType
   nextAppDetails?: NextAppDetails
   packageManager: PackageManager
   projectDir: string
   useDistFiles?: boolean
-}
+} & Pick<CliArgs, '--debug'>
 
 type InitNextResult =
   | {
@@ -144,11 +144,11 @@ async function addPayloadConfigToTsConfig(projectDir: string, isSrcDir: boolean)
 }
 
 function installAndConfigurePayload(
-  args: InitNextArgs & {
+  args: {
     nextAppDetails: NextAppDetails
     nextConfigType: NextConfigType
     useDistFiles?: boolean
-  },
+  } & InitNextArgs,
 ):
   | { payloadConfigPath: string; success: true }
   | { payloadConfigPath?: string; reason: string; success: false } {

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

@@ -1,11 +1,16 @@
-import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js'
 import * as p from '@clack/prompts'
 import { jest } from '@jest/globals'
 
+import { parseAndModifyConfigContent, withPayloadStatement } from './wrap-next-config.js'
+
 const esmConfigs = {
   defaultNextConfig: `/** @type {import('next').NextConfig} */
 const nextConfig = {};
 export default nextConfig;
+`,
+  nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+export { wrapped as default };
 `,
   nextConfigWithFunc: `const nextConfig = {};
 export default someFunc(nextConfig);
@@ -14,10 +19,6 @@ export default someFunc(nextConfig);
 export default someFunc(
   nextConfig
 );
-`,
-  nextConfigExportNamedDefault: `const nextConfig = {};
-const wrapped = someFunc(asdf);
-export { wrapped as default };
 `,
   nextConfigWithSpread: `const nextConfig = {
   ...someConfig,
@@ -27,12 +28,16 @@ export default nextConfig;
 }
 
 const cjsConfigs = {
+  anonConfig: `module.exports = {};`,
   defaultNextConfig: `
   /** @type {import('next').NextConfig} */
 const nextConfig = {};
 module.exports = nextConfig;
 `,
-  anonConfig: `module.exports = {};`,
+  nextConfigExportNamedDefault: `const nextConfig = {};
+const wrapped = someFunc(asdf);
+module.exports = wrapped;
+`,
   nextConfigWithFunc: `const nextConfig = {};
 module.exports = someFunc(nextConfig);
 `,
@@ -40,10 +45,6 @@ module.exports = someFunc(nextConfig);
 module.exports = someFunc(
   nextConfig
 );
-`,
-  nextConfigExportNamedDefault: `const nextConfig = {};
-const wrapped = someFunc(asdf);
-module.exports = wrapped;
 `,
   nextConfigWithSpread: `const nextConfig = { ...someConfig };
 module.exports = nextConfig;
@@ -76,7 +77,7 @@ describe('parseAndInsertWithPayload', () => {
         configType,
       )
       expect(modifiedConfigContent).toContain(importStatement)
-      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/)
+      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n {2}nextConfig\n\)\)/)
     })
 
     it('should parse the config with a spread', () => {
@@ -137,7 +138,7 @@ describe('parseAndInsertWithPayload', () => {
         configType,
       )
       expect(modifiedConfigContent).toContain(requireStatement)
-      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n  nextConfig\n\)\)/)
+      expect(modifiedConfigContent).toMatch(/withPayload\(someFunc\(\n {2}nextConfig\n\)\)/)
     })
     it('should parse the config with a named export as default', () => {
       const { modifiedConfigContent } = parseAndModifyConfigContent(

packages/create-payload-app/src/utils/log.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import * as p from '@clack/prompts'
 import chalk from 'chalk'
 

packages/db-mongodb/src/connect.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import type { ConnectOptions } from 'mongoose'
 import type { Connect } from 'payload'
 
@@ -24,7 +23,7 @@ export const connect: Connect = async function connect(
 
   const urlToConnect = this.url
 
-  const connectionOptions: ConnectOptions & { useFacet: undefined } = {
+  const connectionOptions: { useFacet: undefined } & ConnectOptions = {
     autoIndex: true,
     ...this.connectOptions,
     useFacet: undefined,

packages/db-mongodb/src/createMigration.ts

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

packages/db-mongodb/src/find.ts

@@ -86,7 +86,6 @@ export const find: Find = async function find(
   return {
     ...result,
     docs: docs.map((doc) => {
-      // eslint-disable-next-line no-param-reassign
       doc.id = doc._id
       return sanitizeInternalFields(doc)
     }),

packages/db-mongodb/src/findGlobalVersions.ts

@@ -104,7 +104,6 @@ export const findGlobalVersions: FindGlobalVersions = async function findGlobalV
   return {
     ...result,
     docs: docs.map((doc) => {
-      // eslint-disable-next-line no-param-reassign
       doc.id = doc._id
       return sanitizeInternalFields(doc)
     }),

packages/db-mongodb/src/findVersions.ts

@@ -101,7 +101,6 @@ export const findVersions: FindVersions = async function findVersions(
   return {
     ...result,
     docs: docs.map((doc) => {
-      // eslint-disable-next-line no-param-reassign
       doc.id = doc._id
       return sanitizeInternalFields(doc)
     }),

packages/db-mongodb/src/index.ts

@@ -43,10 +43,10 @@ export interface Args {
   /** Set to false to disable auto-pluralization of collection names, Defaults to true */
   autoPluralization?: boolean
   /** Extra configuration options */
-  connectOptions?: ConnectOptions & {
+  connectOptions?: {
     /** Set false to disable $facet aggregation in non-supporting databases, Defaults to true */
     useFacet?: boolean
-  }
+  } & ConnectOptions
   /** Set to true to disable hinting to MongoDB to use 'id' as index. This is currently done when counting documents for pagination. Disabling this optimization might fix some problems with AWS DocumentDB. Defaults to false */
   disableIndexHints?: boolean
   migrationDir?: string
@@ -59,19 +59,19 @@ export interface Args {
   url: false | string
 }
 
-export type MongooseAdapter = BaseDatabaseAdapter &
-  Args & {
-    collections: {
-      [slug: string]: CollectionModel
-    }
-    connection: Connection
-    globals: GlobalModel
-    mongoMemoryServer: MongoMemoryReplSet
-    sessions: Record<number | string, ClientSession>
-    versions: {
-      [slug: string]: CollectionModel
-    }
+export type MongooseAdapter = {
+  collections: {
+    [slug: string]: CollectionModel
   }
+  connection: Connection
+  globals: GlobalModel
+  mongoMemoryServer: MongoMemoryReplSet
+  sessions: Record<number | string, ClientSession>
+  versions: {
+    [slug: string]: CollectionModel
+  }
+} & Args &
+  BaseDatabaseAdapter
 
 declare module 'payload' {
   export interface DatabaseAdapter

packages/db-mongodb/src/init.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { PaginateOptions } from 'mongoose'
 import type { Init, SanitizedCollectionConfig } from 'payload'
 

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

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-/* eslint-disable class-methods-use-this */
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import type { IndexOptions, Schema, SchemaOptions, SchemaTypeOptions } from 'mongoose'
 import type {
   ArrayField,
@@ -196,12 +193,10 @@ const fieldToSchemaMap: Record<string, FieldSchemaGenerator> = {
 
       if (field.localized && config.localization) {
         config.localization.localeCodes.forEach((localeCode) => {
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
           // @ts-expect-error Possible incorrect typing in mongoose types, this works
           schema.path(`${field.name}.${localeCode}`).discriminator(blockItem.slug, blockSchema)
         })
       } else {
-        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-expect-error Possible incorrect typing in mongoose types, this works
         schema.path(field.name).discriminator(blockItem.slug, blockSchema)
       }

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

@@ -20,11 +20,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({
         collectionSlug,
         fields,

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

@@ -1,22 +1,23 @@
-import { SanitizedConfig, sanitizeConfig } from 'payload'
-import { Config } from 'payload'
+import type { Config, SanitizedConfig } from 'payload'
+
+import { sanitizeConfig } from 'payload'
+
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js'
 
 let config: SanitizedConfig
 
 describe('get localized sort property', () => {
   beforeAll(async () => {
-    config = (await sanitizeConfig({
+    config = await sanitizeConfig({
       localization: {
-        locales: ['en', 'es'],
         defaultLocale: 'en',
         fallback: true,
+        locales: ['en', 'es'],
       },
-    } as Config)) as SanitizedConfig
+    } as Config)
   })
   it('passes through a non-localized sort property', async () => {
     const result = getLocalizedSortProperty({
-      segments: ['title'],
       config,
       fields: [
         {
@@ -25,6 +26,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['title'],
     })
 
     expect(result).toStrictEqual('title')
@@ -32,7 +34,6 @@ describe('get localized sort property', () => {
 
   it('properly localizes an un-localized sort property', () => {
     const result = getLocalizedSortProperty({
-      segments: ['title'],
       config,
       fields: [
         {
@@ -42,6 +43,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['title'],
     })
 
     expect(result).toStrictEqual('title.en')
@@ -49,7 +51,6 @@ describe('get localized sort property', () => {
 
   it('keeps specifically asked-for localized sort properties', () => {
     const result = getLocalizedSortProperty({
-      segments: ['title', 'es'],
       config,
       fields: [
         {
@@ -59,6 +60,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['title', 'es'],
     })
 
     expect(result).toStrictEqual('title.es')
@@ -66,7 +68,6 @@ describe('get localized sort property', () => {
 
   it('properly localizes nested sort properties', () => {
     const result = getLocalizedSortProperty({
-      segments: ['group', 'title'],
       config,
       fields: [
         {
@@ -82,6 +83,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['group', 'title'],
     })
 
     expect(result).toStrictEqual('group.title.en')
@@ -89,7 +91,6 @@ describe('get localized sort property', () => {
 
   it('keeps requested locale with nested sort properties', () => {
     const result = getLocalizedSortProperty({
-      segments: ['group', 'title', 'es'],
       config,
       fields: [
         {
@@ -105,6 +106,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['group', 'title', 'es'],
     })
 
     expect(result).toStrictEqual('group.title.es')
@@ -112,7 +114,6 @@ describe('get localized sort property', () => {
 
   it('properly localizes field within row', () => {
     const result = getLocalizedSortProperty({
-      segments: ['title'],
       config,
       fields: [
         {
@@ -127,6 +128,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['title'],
     })
 
     expect(result).toStrictEqual('title.en')
@@ -134,7 +136,6 @@ describe('get localized sort property', () => {
 
   it('properly localizes field within named tab', () => {
     const result = getLocalizedSortProperty({
-      segments: ['tab', 'title'],
       config,
       fields: [
         {
@@ -154,6 +155,7 @@ describe('get localized sort property', () => {
         },
       ],
       locale: 'en',
+      segments: ['tab', 'title'],
     })
 
     expect(result).toStrictEqual('tab.title.en')
@@ -161,14 +163,12 @@ describe('get localized sort property', () => {
 
   it('properly localizes field within unnamed tab', () => {
     const result = getLocalizedSortProperty({
-      segments: ['title'],
       config,
       fields: [
         {
           type: 'tabs',
           tabs: [
             {
-              label: 'Tab',
               fields: [
                 {
                   name: 'title',
@@ -176,11 +176,13 @@ describe('get localized sort property', () => {
                   localized: true,
                 },
               ],
+              label: 'Tab',
             },
           ],
         },
       ],
       locale: 'en',
+      segments: ['title'],
     })
 
     expect(result).toStrictEqual('title.en')

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

@@ -1,5 +1,3 @@
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable no-await-in-loop */
 import type { FilterQuery } from 'mongoose'
 import type { Field, Operator, Payload, Where } from 'payload'
 

packages/db-mongodb/src/queryDrafts.ts

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

packages/email-resend/src/email-resend.spec.ts

@@ -1,7 +1,9 @@
-import { resendAdapter } from './index.js'
-import { Payload } from 'payload'
+import type { Payload } from 'payload'
+
 import { jest } from '@jest/globals'
 
+import { resendAdapter } from './index.js'
+
 describe('email-resend', () => {
   const defaultFromAddress = 'dev@payloadcms.com'
   const defaultFromName = 'Payload CMS'
@@ -29,16 +31,16 @@ describe('email-resend', () => {
     ) as jest.Mock
 
     const adapter = resendAdapter({
+      apiKey,
       defaultFromAddress,
       defaultFromName,
-      apiKey,
     })
 
     await adapter({ payload: mockPayload }).sendEmail({
       from,
-      to,
       subject,
       text,
+      to,
     })
 
     // @ts-expect-error
@@ -48,16 +50,16 @@ describe('email-resend', () => {
     expect(request.headers.Authorization).toStrictEqual(`Bearer ${apiKey}`)
     expect(JSON.parse(request.body)).toMatchObject({
       from,
-      to,
       subject,
       text,
+      to,
     })
   })
 
   it('should throw an error if the email fails to send', async () => {
     const errorResponse = {
-      message: 'error information',
       name: 'validation_error',
+      message: 'error information',
       statusCode: 403,
     }
     global.fetch = jest.spyOn(global, 'fetch').mockImplementation(
@@ -69,17 +71,17 @@ describe('email-resend', () => {
     ) as jest.Mock
 
     const adapter = resendAdapter({
+      apiKey,
       defaultFromAddress,
       defaultFromName,
-      apiKey,
     })
 
     await expect(() =>
       adapter({ payload: mockPayload }).sendEmail({
         from,
-        to,
         subject,
         text,
+        to,
       }),
     ).rejects.toThrow(
       `Error sending email: ${errorResponse.statusCode} ${errorResponse.name} - ${errorResponse.message}`,

packages/eslint-config/configs/jest/index.mjs

@@ -4,21 +4,20 @@ import jestDom from 'eslint-plugin-jest-dom'
 import jest from 'eslint-plugin-jest'
 import { deepMerge } from '../../deepMerge.js'
 
-
 /** @type {import('eslint').Linter.FlatConfig} */
 export const index = deepMerge(
   {
-    rules: jestRules
+    rules: jestRules,
   },
   {
-    rules: jestDomRules
+    rules: jestDomRules,
   },
   {
     plugins: {
       jest,
       'jest-dom': jestDom,
     },
-  }
+  },
 )
 
 export default index

packages/eslint-config/configs/react/index.mjs

@@ -1,19 +1,19 @@
 import reactRules from './rules/react.mjs'
 import reactA11yRules from './rules/react-a11y.mjs'
 import jsxA11y from 'eslint-plugin-jsx-a11y'
-import react from "@eslint-react/eslint-plugin";
+import react from '@eslint-react/eslint-plugin'
 import reactHooks from 'eslint-plugin-react-hooks'
-import globals from 'globals';
+import globals from 'globals'
 import { deepMerge } from '../../deepMerge.js'
 
 /** @type {import('eslint').Linter.FlatConfig} */
 export const index = deepMerge(
-  react.configs["recommended-type-checked"],
+  react.configs['recommended-type-checked'],
   {
-    rules: reactRules
+    rules: reactRules,
   },
   {
-    rules: reactA11yRules
+    rules: reactA11yRules,
   },
   {
     languageOptions: {
@@ -23,8 +23,8 @@ export const index = deepMerge(
       parserOptions: {
         ecmaFeatures: {
           jsx: true,
-        }
-      }
+        },
+      },
     },
     plugins: {
       'jsx-a11y': jsxA11y,
@@ -35,6 +35,6 @@ export const index = deepMerge(
         version: 'detect',
       },
     },
-  }
+  },
 )
 export default index

packages/eslint-config/configs/react/rules/react-a11y.mjs

@@ -1,4 +1,3 @@
-
 // Sourced from https://github.com/airbnb/javascript/blob/master/packages/eslint-config-airbnb/rules/react-a11y.js
 
 /** @type {import('eslint').Linter.FlatConfig} */

packages/eslint-config/index.mjs

@@ -2,11 +2,11 @@ import js from '@eslint/js'
 import tseslint from 'typescript-eslint'
 import perfectionistNatural from 'eslint-plugin-perfectionist/configs/recommended-natural'
 import { configs as regexpPluginConfigs } from 'eslint-plugin-regexp'
-import eslintConfigPrettier from 'eslint-config-prettier';
+import eslintConfigPrettier from 'eslint-config-prettier'
 import payloadPlugin from '@payloadcms/eslint-plugin'
 import reactExtends from './configs/react/index.mjs'
 import jestExtends from './configs/jest/index.mjs'
-import globals from 'globals';
+import globals from 'globals'
 import importX from 'eslint-plugin-import-x'
 import typescriptParser from '@typescript-eslint/parser'
 import { deepMerge } from './deepMerge.js'
@@ -102,9 +102,11 @@ const typescriptRules = {
 let FlatConfig
 
 /** @type {FlatConfig} */
-const baseExtends = deepMerge(js.configs.recommended, perfectionistNatural , regexpPluginConfigs['flat/recommended'])
-
-
+const baseExtends = deepMerge(
+  js.configs.recommended,
+  perfectionistNatural,
+  regexpPluginConfigs['flat/recommended'],
+)
 
 /** @type {FlatConfig[]} */
 export const rootEslintConfig = [
@@ -144,7 +146,7 @@ export const rootEslintConfig = [
           ...baseRules,
           ...typescriptRules,
         },
-      }
+      },
     ),
     files: ['**/*.ts'],
   },
@@ -166,31 +168,28 @@ export const rootEslintConfig = [
           ...typescriptRules,
           ...reactA11yRules,
         },
-      }
+      },
     ),
     files: ['**/*.tsx'],
   },
   {
     name: 'Unit Tests',
-    ...deepMerge(
-      jestExtends,
-      {
-        plugins: {
-          payload: payloadPlugin
-        },
-        rules: {
-          ...baseRules,
-          ...typescriptRules,
-          '@typescript-eslint/unbound-method': 'off',
-        },
-      }
-    ),
+    ...deepMerge(jestExtends, {
+      plugins: {
+        payload: payloadPlugin,
+      },
+      rules: {
+        ...baseRules,
+        ...typescriptRules,
+        '@typescript-eslint/unbound-method': 'off',
+      },
+    }),
     files: ['**/*.spec.ts'],
   },
   {
     name: 'Payload Config',
     plugins: {
-      payload: payloadPlugin
+      payload: payloadPlugin,
     },
     rules: {
       ...baseRules,

packages/eslint-plugin/index.mjs

@@ -4,7 +4,6 @@ import noRelativeMonorepoImports from './customRules/no-relative-monorepo-import
 import noImportsFromExportsDir from './customRules/no-imports-from-exports-dir.js'
 import noFlakyAssertions from './customRules/no-flaky-assertions.js'
 
-
 /**
  * @type {import('eslint').ESLint.Plugin}
  */

packages/graphql/src/bin/generateSchema.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-floating-promises */
 import type { SanitizedConfig } from 'payload'
 
 import fs from 'fs'

packages/graphql/src/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { OperationArgs } from 'graphql-http'
 import type { GraphQLInfo, SanitizedConfig } from 'payload'
 

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

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-use-before-define */
+
 /* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
 /**
  * Created by Ivo Meißner on 28.07.17.

packages/graphql/src/packages/graphql-type-json/index.ts

@@ -16,7 +16,6 @@ function ensureObject(value) {
 function parseObject(typeName, ast, variables) {
   const value = Object.create(null)
   ast.fields.forEach((field) => {
-    // eslint-disable-next-line no-use-before-define
     value[field.name.value] = parseLiteral(typeName, field.value, variables)
   })
 

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

@@ -14,7 +14,6 @@ export type Resolver = (
   context: {
     req: PayloadRequest
   },
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
 ) => Promise<{ totalDocs: number }>
 
 export function countResolver(collection: Collection): Resolver {

packages/graphql/src/schema/buildObjectType.ts

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-restricted-syntax */
 import type { GraphQLFieldConfig, GraphQLType } from 'graphql'
 import type {
   ArrayField,

packages/graphql/src/schema/buildWhereInputType.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-use-before-define */
 import type { Field, FieldAffectingData } from 'payload'
 
 import { GraphQLInputObjectType, GraphQLList } from 'graphql'

packages/graphql/src/schema/initCollections.ts

@@ -1,6 +1,10 @@
-/* eslint-disable no-param-reassign */
-import type { GraphQLInfo } from 'payload'
-import type { Collection, Field, SanitizedCollectionConfig, SanitizedConfig } from 'payload'
+import type {
+  Collection,
+  Field,
+  GraphQLInfo,
+  SanitizedCollectionConfig,
+  SanitizedConfig,
+} from 'payload'
 
 import {
   GraphQLBoolean,

packages/graphql/src/schema/initGlobals.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import { GraphQLBoolean, GraphQLInt, GraphQLNonNull, GraphQLString } from 'graphql'
 import pluralize from 'pluralize'
 const { singular } = pluralize

packages/graphql/src/schema/withOperators.ts

@@ -45,19 +45,19 @@ const GeoJSONObject = new GraphQLInputObjectType({
 })
 
 type DefaultsType = {
-  [key in staticTypes]: {
-    operators: {
-      name: string
-      type: ((field: FieldAffectingData, parentName: string) => GraphQLType) | GraphQLType
-    }[]
-  }
-} & {
   [key in dynamicTypes]: {
     operators: {
       name: string
       type: (field: FieldAffectingData, parentName: string) => GraphQLType
     }[]
   }
+} & {
+  [key in staticTypes]: {
+    operators: {
+      name: string
+      type: ((field: FieldAffectingData, parentName: string) => GraphQLType) | GraphQLType
+    }[]
+  }
 }
 
 const defaults: DefaultsType = {

packages/graphql/src/utilities/formatName.spec.ts

@@ -1,4 +1,3 @@
-/* eslint-disable indent */
 /* eslint-disable jest/prefer-strict-equal */
 import formatName from './formatName'
 

packages/live-preview/src/mergeData.ts

@@ -34,9 +34,9 @@ export const mergeData = async <T>(args: {
   returnNumberOfRequests?: boolean
   serverURL: string
 }): Promise<
-  T & {
+  {
     _numberOfRequests?: number
-  }
+  } & T
 > => {
   const {
     apiRoute,

packages/next/src/elements/DocumentHeader/Tabs/Tab/index.tsx

@@ -7,7 +7,7 @@ import './index.scss'
 
 export const baseClass = 'doc-tab'
 
-export const DocumentTab: React.FC<DocumentTabProps & DocumentTabConfig> = (props) => {
+export const DocumentTab: React.FC<DocumentTabConfig & DocumentTabProps> = (props) => {
   const {
     Pill,
     apiURL,

packages/next/src/elements/DocumentHeader/Tabs/tabs/index.tsx

@@ -16,9 +16,9 @@ export type DocumentViewKey = (typeof documentViewKeys)[number]
 
 export const tabs: Record<
   DocumentViewKey,
-  DocumentTabConfig & {
+  {
     order?: number // TODO: expose this to the globalConfig config
-  }
+  } & DocumentTabConfig
 > = {
   API: {
     condition: ({ collectionConfig, globalConfig }) =>

packages/next/src/layouts/Root/index.tsx

@@ -109,7 +109,6 @@ export const RootLayout = async ({
           fallbackLang={clientConfig.i18n.fallbackLanguage}
           languageCode={languageCode}
           languageOptions={languageOptions}
-          // eslint-disable-next-line react/jsx-no-bind
           switchLanguageServerAction={switchLanguageServerAction}
           theme={theme}
           translations={i18n.translations}

packages/next/src/routes/graphql/handler.ts

@@ -50,7 +50,6 @@ const handleError = async (
 let cached = global._payload_graphql
 
 if (!cached) {
-  // eslint-disable-next-line no-multi-assign
   cached = global._payload_graphql = { graphql: null, promise: null }
 }
 

packages/next/src/templates/Default/index.tsx

@@ -11,11 +11,11 @@ import './index.scss'
 
 const baseClass = 'template-default'
 
-export type DefaultTemplateProps = ServerProps & {
+export type DefaultTemplateProps = {
   children?: React.ReactNode
   className?: string
   visibleEntities: VisibleEntities
-}
+} & ServerProps
 
 export const DefaultTemplate: React.FC<DefaultTemplateProps> = ({
   children,

packages/next/src/utilities/getPayloadHMR.ts

@@ -10,7 +10,6 @@ let cached: {
 } = global._payload
 
 if (!cached) {
-  // eslint-disable-next-line no-multi-assign
   cached = global._payload = { payload: null, promise: null, reload: false }
 }
 

packages/next/src/utilities/meta.ts

@@ -12,7 +12,7 @@ const defaultOpenGraph = {
   title: 'Payload App',
 }
 
-export const meta = async (args: MetaConfig & { serverURL: string }): Promise<any> => {
+export const meta = async (args: { serverURL: string } & MetaConfig): Promise<any> => {
   const {
     defaultOGImageType,
     description,

packages/next/src/views/Dashboard/Default/index.tsx

@@ -10,12 +10,12 @@ import './index.scss'
 
 const baseClass = 'dashboard'
 
-export type DashboardProps = ServerProps & {
+export type DashboardProps = {
   Link: React.ComponentType<any>
   navGroups?: ReturnType<typeof groupNavItems>
   permissions: Permissions
   visibleEntities: VisibleEntities
-}
+} & ServerProps
 
 export const DefaultDashboard: React.FC<DashboardProps> = (props) => {
   const {

packages/next/src/views/Document/getMetaBySegment.tsx

@@ -12,10 +12,10 @@ import { generateMetadata as versionMeta } from '../Version/meta.js'
 import { generateMetadata as versionsMeta } from '../Versions/meta.js'
 
 export type GenerateEditViewMetadata = (
-  args: Parameters<GenerateViewMetadata>[0] & {
+  args: {
     collectionConfig?: SanitizedCollectionConfig | null
     globalConfig?: SanitizedGlobalConfig | null
-  },
+  } & Parameters<GenerateViewMetadata>[0],
 ) => Promise<Metadata>
 
 export const getMetaBySegment: GenerateEditViewMetadata = async ({

packages/next/src/views/Document/getViewsFromConfig.tsx

@@ -28,7 +28,7 @@ export const getViewsFromConfig = ({
 }: {
   collectionConfig?: SanitizedCollectionConfig
   config: SanitizedConfig
-  // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
+
   docPermissions: CollectionPermission | GlobalPermission
   globalConfig?: SanitizedGlobalConfig
   routeSegments: string[]

packages/next/src/views/List/meta.ts

@@ -8,9 +8,9 @@ import type { GenerateViewMetadata } from '../Root/index.js'
 import { meta } from '../../utilities/meta.js'
 
 export const generateListMetadata = async (
-  args: Parameters<GenerateViewMetadata>[0] & {
+  args: {
     collectionConfig: SanitizedCollectionConfig
-  },
+  } & Parameters<GenerateViewMetadata>[0],
 ): Promise<Metadata> => {
   const { collectionConfig, config, i18n } = args
 

packages/next/src/views/LivePreview/Toolbar/index.tsx

@@ -56,9 +56,9 @@ const StaticToolbar: React.FC<EditViewProps> = (props) => {
 }
 
 export const LivePreviewToolbar: React.FC<
-  EditViewProps & {
+  {
     draggable?: boolean
-  }
+  } & EditViewProps
 > = (props) => {
   const { draggable } = props
 

packages/next/src/views/LivePreview/usePopupWindow.ts

@@ -14,7 +14,7 @@ export interface PopupMessage {
 
 export const usePopupWindow = (props: {
   eventType?: string
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+
   onMessage?: (searchParams: PopupMessage['searchParams']) => Promise<void>
   url: string
 }): {

packages/next/src/views/Logout/index.tsx

@@ -10,9 +10,9 @@ const baseClass = 'logout'
 export { generateLogoutMetadata } from './meta.js'
 
 export const LogoutView: React.FC<
-  AdminViewProps & {
+  {
     inactivity?: boolean
-  }
+  } & AdminViewProps
 > = ({ inactivity, initPageResult, searchParams }) => {
   const {
     req: {

packages/next/src/views/NotFound/index.tsx

@@ -15,7 +15,6 @@ export const generatePageMetadata = async ({
 }: {
   config: Promise<SanitizedConfig> | SanitizedConfig
   params?: { [key: string]: string | string[] }
-  //eslint-disable-next-line @typescript-eslint/require-await
 }): Promise<Metadata> => {
   const config = await configPromise
 

packages/next/src/views/Version/RenderFieldsToDiff/fields/Select/index.tsx

@@ -47,9 +47,9 @@ const getTranslatedOptions = (
 }
 
 const Select: React.FC<
-  Omit<Props, 'field'> & {
+  {
     field: MappedField & SelectFieldProps
-  }
+  } & Omit<Props, 'field'>
 > = ({ comparison, diffMethod, field, i18n, locale, version }) => {
   let placeholder = ''
 

packages/next/src/views/Version/RenderFieldsToDiff/fields/Tabs/index.tsx

@@ -10,9 +10,9 @@ import Nested from '../Nested/index.js'
 const baseClass = 'tabs-diff'
 
 const Tabs: React.FC<
-  Omit<Props, 'field'> & {
+  {
     field: MappedField & TabsFieldProps
-  }
+  } & Omit<Props, 'field'>
 > = ({ comparison, diffComponents, field, i18n, locale, locales, permissions, version }) => {
   return (
     <div className={baseClass}>

packages/next/src/views/Version/RenderFieldsToDiff/types.ts

@@ -15,8 +15,8 @@ export type Props = {
   version: Record<string, any>
 }
 
-export type FieldDiffProps = Props & {
+export type FieldDiffProps = {
   diffMethod: DiffMethod
   field: MappedField
   isRichText: boolean
-}
+} & Props

packages/payload/src/admin/RichText.ts

@@ -9,13 +9,9 @@ import type { SanitizedGlobalConfig } from '../globals/config/types.js'
 import type { PayloadRequest, RequestContext } from '../types/index.js'
 import type { WithServerSidePropsComponentProps } from './elements/WithServerSideProps.js'
 
-export type RichTextFieldProps<
-  Value extends object,
-  AdapterProps,
-  ExtraFieldProperties = {},
-> = Omit<RichTextField<Value, AdapterProps, ExtraFieldProperties>, 'type'> & {
+export type RichTextFieldProps<Value extends object, AdapterProps, ExtraFieldProperties = {}> = {
   path?: string
-}
+} & Omit<RichTextField<Value, AdapterProps, ExtraFieldProperties>, 'type'>
 
 export type AfterReadRichTextHookArgs<
   TData extends TypeWithID = any,
@@ -146,8 +142,8 @@ export type AfterReadRichTextHook<
   TValue = any,
   TSiblingData = any,
 > = (
-  args: BaseRichTextHookArgs<TData, TValue, TSiblingData> &
-    AfterReadRichTextHookArgs<TData, TValue, TSiblingData>,
+  args: AfterReadRichTextHookArgs<TData, TValue, TSiblingData> &
+    BaseRichTextHookArgs<TData, TValue, TSiblingData>,
 ) => Promise<TValue> | TValue
 
 export type AfterChangeRichTextHook<
@@ -155,8 +151,8 @@ export type AfterChangeRichTextHook<
   TValue = any,
   TSiblingData = any,
 > = (
-  args: BaseRichTextHookArgs<TData, TValue, TSiblingData> &
-    AfterChangeRichTextHookArgs<TData, TValue, TSiblingData>,
+  args: AfterChangeRichTextHookArgs<TData, TValue, TSiblingData> &
+    BaseRichTextHookArgs<TData, TValue, TSiblingData>,
 ) => Promise<TValue> | TValue
 
 export type BeforeChangeRichTextHook<
@@ -252,10 +248,10 @@ export type RichTextAdapter<
   Value extends object = object,
   AdapterProps = any,
   ExtraFieldProperties = {},
-> = RichTextAdapterBase<Value, AdapterProps, ExtraFieldProperties> & {
+> = {
   CellComponent: React.FC<any>
   FieldComponent: React.FC<RichTextFieldProps<Value, AdapterProps, ExtraFieldProperties>>
-}
+} & RichTextAdapterBase<Value, AdapterProps, ExtraFieldProperties>
 
 export type RichTextAdapterProvider<
   Value extends object = object,

packages/payload/src/admin/elements/Cell.ts

@@ -35,11 +35,11 @@ export type CellComponentProps = {
   schemaPath: string
 }
 
-export type DefaultCellComponentProps<T = any> = CellComponentProps & {
+export type DefaultCellComponentProps<T = any> = {
   cellData: T
   customCellContext?: {
     collectionSlug?: SanitizedCollectionConfig['slug']
     uploadConfig?: SanitizedCollectionConfig['upload']
   }
   rowData: RowData
-}
+} & CellComponentProps

packages/payload/src/admin/elements/DatePicker.ts

@@ -25,23 +25,23 @@ export type MonthPickerProps = {
 }
 
 export type ConditionalDateProps =
-  | (SharedProps &
-      DayPickerProps &
-      TimePickerProps & {
-        pickerAppearance?: 'dayAndTime'
-      })
-  | (SharedProps &
-      DayPickerProps & {
-        pickerAppearance: 'dayOnly'
-      })
-  | (SharedProps &
-      MonthPickerProps & {
-        pickerAppearance: 'monthOnly'
-      })
-  | (SharedProps &
-      TimePickerProps & {
-        pickerAppearance: 'timeOnly'
-      })
-  | (SharedProps & {
+  | ({
+      pickerAppearance: 'dayOnly'
+    } & DayPickerProps &
+      SharedProps)
+  | ({
+      pickerAppearance: 'monthOnly'
+    } & MonthPickerProps &
+      SharedProps)
+  | ({
+      pickerAppearance: 'timeOnly'
+    } & SharedProps &
+      TimePickerProps)
+  | ({
+      pickerAppearance?: 'dayAndTime'
+    } & DayPickerProps &
+      SharedProps &
+      TimePickerProps)
+  | ({
       pickerAppearance?: 'default'
-    })
+    } & SharedProps)

packages/payload/src/auth/getFieldsToSign.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { CollectionConfig } from '../collections/config/types.js'
 import type { Field, TabAsField } from '../fields/config/types.js'
 import type { PayloadRequest } from '../types/index.js'

packages/payload/src/auth/index.ts

@@ -1,4 +1,4 @@
-export * from './types.js'
+export * from './cookies.js'
 
 export { extractJWT } from './extractJWT.js'
-export * from './cookies.js'
+export * from './types.js'

packages/payload/src/auth/operations/local/login.ts

@@ -27,7 +27,7 @@ export type Options<TSlug extends CollectionSlug> = {
 async function localLogin<TSlug extends CollectionSlug>(
   payload: Payload,
   options: Options<TSlug>,
-): Promise<Result & { user: DataFromCollectionSlug<TSlug> }> {
+): Promise<{ user: DataFromCollectionSlug<TSlug> } & Result> {
   const {
     collection: collectionSlug,
     data,

packages/payload/src/auth/operations/login.ts

@@ -39,7 +39,7 @@ export type Arguments<TSlug extends CollectionSlug> = {
 
 export const loginOperation = async <TSlug extends CollectionSlug>(
   incomingArgs: Arguments<TSlug>,
-): Promise<Result & { user: DataFromCollectionSlug<TSlug> }> => {
+): Promise<{ user: DataFromCollectionSlug<TSlug> } & Result> => {
   let args = incomingArgs
 
   try {
@@ -253,7 +253,7 @@ export const loginOperation = async <TSlug extends CollectionSlug>(
         })) || user
     }, Promise.resolve())
 
-    let result: Result & { user: DataFromCollectionSlug<TSlug> } = {
+    let result: { user: DataFromCollectionSlug<TSlug> } & Result = {
       exp: (jwt.decode(token) as jwt.JwtPayload).exp,
       token,
       user,

packages/payload/src/auth/operations/registerFirstUser.ts

@@ -14,8 +14,8 @@ import { killTransaction } from '../../utilities/killTransaction.js'
 
 export type Arguments<TSlug extends CollectionSlug> = {
   collection: Collection
-  data: RequiredDataFromCollectionSlug<TSlug> &
-    AuthOperationsFromCollectionSlug<TSlug>['registerFirstUser']
+  data: AuthOperationsFromCollectionSlug<TSlug>['registerFirstUser'] &
+    RequiredDataFromCollectionSlug<TSlug>
   req: PayloadRequest
 }
 

packages/payload/src/auth/strategies/jwt.ts

@@ -16,7 +16,7 @@ export const JWTAuthentication: AuthStrategyFunction = async ({
 }) => {
   try {
     const token = extractJWT({ headers, payload })
-    const decodedPayload = jwt.verify(token, payload.secret) as jwt.JwtPayload & JWTToken
+    const decodedPayload = jwt.verify(token, payload.secret) as JWTToken & jwt.JwtPayload
 
     const collection = payload.collections[decodedPayload.collection]
 

packages/payload/src/auth/strategies/local/authenticate.ts

@@ -3,7 +3,7 @@ import scmp from 'scmp'
 
 import type { TypeWithID } from '../../../collections/config/types.js'
 
-type Doc = TypeWithID & Record<string, unknown>
+type Doc = Record<string, unknown> & TypeWithID
 
 type Args = {
   doc: Doc

packages/payload/src/auth/strategies/local/incrementLoginAttempts.ts

@@ -4,7 +4,7 @@ import type { PayloadRequest } from '../../../types/index.js'
 
 type Args = {
   collection: SanitizedCollectionConfig
-  doc: TypeWithID & Record<string, unknown>
+  doc: Record<string, unknown> & TypeWithID
   payload: Payload
   req: PayloadRequest
 }

packages/payload/src/auth/strategies/local/resetLoginAttempts.ts

@@ -4,7 +4,7 @@ import type { PayloadRequest } from '../../../types/index.js'
 
 type Args = {
   collection: SanitizedCollectionConfig
-  doc: TypeWithID & Record<string, unknown>
+  doc: Record<string, unknown> & TypeWithID
   payload: Payload
   req: PayloadRequest
 }

packages/payload/src/bin/loader/compile.ts

@@ -26,7 +26,7 @@ const injectInlineSourceMap = ({
 export async function compile(
   sourcecode: string,
   filename: string,
-  options: ts.CompilerOptions & { fallbackToTs?: (filename: string) => boolean },
+  options: { fallbackToTs?: (filename: string) => boolean } & ts.CompilerOptions,
 ): Promise<string> {
   if (filename.endsWith('.d.ts')) {
     return ''

packages/payload/src/collections/config/client.ts

@@ -10,18 +10,15 @@ export type ServerOnlyCollectionAdminProperties = keyof Pick<
   'components' | 'hidden' | 'preview'
 >
 
-export type ClientCollectionConfig = Omit<
-  SanitizedCollectionConfig,
-  'admin' | 'fields' | ServerOnlyCollectionProperties
-> & {
-  admin: Omit<
+export type ClientCollectionConfig = {
+  admin: {
+    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>
+  } & Omit<
     SanitizedCollectionConfig['admin'],
     'fields' | 'livePreview' | ServerOnlyCollectionAdminProperties
-  > & {
-    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>
-  }
+  >
   fields: ClientFieldConfig[]
-}
+} & Omit<SanitizedCollectionConfig, 'admin' | 'fields' | ServerOnlyCollectionProperties>
 
 import type { TFunction } from '@payloadcms/translations'
 

packages/payload/src/collections/operations/delete.ts

@@ -111,7 +111,6 @@ export const deleteOperation = async <TSlug extends CollectionSlug>(
 
     const errors = []
 
-    /* eslint-disable no-param-reassign */
     const promises = docs.map(async (doc) => {
       let result
 

packages/payload/src/collections/operations/findByID.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 import type { FindOneArgs } from '../../database/types.js'
 import type { CollectionSlug } from '../../index.js'
 import type { PayloadRequest } from '../../types/index.js'

packages/payload/src/collections/operations/findVersionByID.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 import httpStatus from 'http-status'
 
 import type { PayloadRequest } from '../../types/index.js'

packages/payload/src/collections/operations/local/delete.ts

@@ -22,15 +22,15 @@ export type BaseOptions<TSlug extends CollectionSlug> = {
   user?: Document
 }
 
-export type ByIDOptions<TSlug extends CollectionSlug> = BaseOptions<TSlug> & {
+export type ByIDOptions<TSlug extends CollectionSlug> = {
   id: number | string
   where?: never
-}
+} & BaseOptions<TSlug>
 
-export type ManyOptions<TSlug extends CollectionSlug> = BaseOptions<TSlug> & {
+export type ManyOptions<TSlug extends CollectionSlug> = {
   id?: never
   where: Where
-}
+} & BaseOptions<TSlug>
 
 export type Options<TSlug extends CollectionSlug> = ByIDOptions<TSlug> | ManyOptions<TSlug>
 

packages/payload/src/collections/operations/local/update.ts

@@ -36,15 +36,15 @@ export type BaseOptions<TSlug extends CollectionSlug> = {
   user?: Document
 }
 
-export type ByIDOptions<TSlug extends CollectionSlug> = BaseOptions<TSlug> & {
+export type ByIDOptions<TSlug extends CollectionSlug> = {
   id: number | string
   where?: never
-}
+} & BaseOptions<TSlug>
 
-export type ManyOptions<TSlug extends CollectionSlug> = BaseOptions<TSlug> & {
+export type ManyOptions<TSlug extends CollectionSlug> = {
   id?: never
   where: Where
-}
+} & BaseOptions<TSlug>
 
 export type Options<TSlug extends CollectionSlug> = ByIDOptions<TSlug> | ManyOptions<TSlug>
 

packages/payload/src/collections/operations/restoreVersion.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 import httpStatus from 'http-status'
 
 import type { FindOneArgs } from '../../database/types.js'

packages/payload/src/collections/operations/utils.ts

@@ -98,7 +98,7 @@ export const buildAfterOperation = async <
   TOperationGeneric extends CollectionSlug,
   O extends keyof AfterOperationMap<TOperationGeneric> = keyof AfterOperationMap<TOperationGeneric>,
 >(
-  operationArgs: Omit<AfterOperationArg<TOperationGeneric>, 'req'> & { operation: O },
+  operationArgs: { operation: O } & Omit<AfterOperationArg<TOperationGeneric>, 'req'>,
 ): Promise<OperationResult<TOperationGeneric, O> | any> => {
   const { args, collection, operation, result } = operationArgs
 

packages/payload/src/config/client.ts

@@ -34,17 +34,14 @@ export type ServerOnlyRootProperties = keyof Pick<
 
 export type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>
 
-export type ClientConfig = Omit<
-  SanitizedConfig,
-  'admin' | 'collections' | 'globals' | ServerOnlyRootProperties
-> & {
-  admin: Omit<SanitizedConfig['admin'], ServerOnlyRootAdminProperties & 'livePreview'> & {
+export type ClientConfig = {
+  admin: {
     livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>
-  }
+  } & Omit<SanitizedConfig['admin'], 'livePreview' & ServerOnlyRootAdminProperties>
   collections: ClientCollectionConfig[]
   custom?: Record<string, any>
   globals: ClientGlobalConfig[]
-}
+} & Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | ServerOnlyRootProperties>
 
 export const createClientConfig = async ({
   config,

packages/payload/src/config/find.ts

@@ -73,7 +73,6 @@ export const findConfig = (): string => {
       ? [configPath, outPath, srcPath, rootPath]
       : [configPath, srcPath, rootPath]
 
-  // eslint-disable-next-line no-restricted-syntax
   for (const searchPath of searchPaths) {
     if (!searchPath) continue
 

packages/payload/src/config/types.ts

@@ -41,7 +41,6 @@ type Prettify<T> = {
   [K in keyof T]: T[K]
 } & NonNullable<unknown>
 
-// eslint-disable-next-line no-use-before-define
 export type Plugin = (config: Config) => Config | Promise<Config>
 
 export type LivePreviewConfig = {
@@ -347,7 +346,7 @@ export const serverProps: (keyof ServerProps)[] = [
 ]
 
 export type CustomComponent<TAdditionalProps extends any = any> = React.ComponentType<
-  TAdditionalProps & Partial<ServerProps>
+  Partial<ServerProps> & TAdditionalProps
 >
 
 export type Locale = {
@@ -382,17 +381,17 @@ export type BaseLocalizationConfig = {
 }
 
 export type LocalizationConfigWithNoLabels = Prettify<
-  BaseLocalizationConfig & {
+  {
     /**
      * List of supported locales
      * @example `["en", "es", "fr", "nl", "de", "jp"]`
      */
     locales: string[]
-  }
+  } & BaseLocalizationConfig
 >
 
 export type LocalizationConfigWithLabels = Prettify<
-  BaseLocalizationConfig & {
+  {
     /**
      * List of supported locales with labels
      * @example {
@@ -402,17 +401,17 @@ export type LocalizationConfigWithLabels = Prettify<
      * }
      */
     locales: Locale[]
-  }
+  } & BaseLocalizationConfig
 >
 
 export type SanitizedLocalizationConfig = Prettify<
-  LocalizationConfigWithLabels & {
+  {
     /**
      * List of supported locales
      * @example `["en", "es", "fr", "nl", "de", "jp"]`
      */
     localeCodes: string[]
-  }
+  } & LocalizationConfigWithLabels
 >
 
 /**
@@ -547,10 +546,10 @@ export type Config = {
     dateFormat?: string
     /** If set to true, the entire Admin panel will be disabled. */
     disable?: boolean
-    livePreview?: LivePreviewConfig & {
+    livePreview?: {
       collections?: string[]
       globals?: string[]
-    }
+    } & LivePreviewConfig
     /** Base meta data to use for the Admin Panel. Included properties are titleSuffix, ogImage, and favicon. */
     meta?: MetaConfig
     routes?: {
@@ -758,10 +757,7 @@ export type Config = {
   upload?: ExpressFileUploadOptions
 }
 
-export type SanitizedConfig = Omit<
-  DeepRequired<Config>,
-  'collections' | 'editor' | 'endpoint' | 'globals' | 'i18n' | 'localization' | 'upload'
-> & {
+export type SanitizedConfig = {
   collections: SanitizedCollectionConfig[]
   /** Default richtext editor to use for richText fields */
   editor?: RichTextAdapter<any, any, any>
@@ -774,13 +770,16 @@ export type SanitizedConfig = Omit<
     configDir: string
     rawConfig: string
   }
-  upload: ExpressFileUploadOptions & {
+  upload: {
     /**
      * Deduped list of adapters used in the project
      */
     adapters: string[]
-  }
-}
+  } & ExpressFileUploadOptions
+} & Omit<
+  DeepRequired<Config>,
+  'collections' | 'editor' | 'endpoint' | 'globals' | 'i18n' | 'localization' | 'upload'
+>
 
 export type EditConfig =
   | (

packages/payload/src/database/createDatabaseAdapter.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { MarkOptional } from 'ts-essentials'
 
 import type {

packages/payload/src/database/getLocalizedPaths.ts

@@ -129,7 +129,6 @@ export async function getLocalizedPaths({
               if (nestedPathToQuery) {
                 const relatedCollection = payload.collections[matchedField.relationTo].config
 
-                // eslint-disable-next-line no-await-in-loop
                 const remainingPaths = await getLocalizedPaths({
                   collectionSlug: relatedCollection.slug,
                   fields: relatedCollection.fields,

packages/payload/src/database/migrations/createMigration.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax, no-await-in-loop */
 import fs from 'fs'
 
 import type { CreateMigration } from '../types.js'

packages/payload/src/database/migrations/migrate.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax, no-await-in-loop */
 import type { PayloadRequest } from '../../types/index.js'
 import type { BaseDatabaseAdapter } from '../types.js'
 
@@ -23,7 +22,7 @@ export async function migrate(this: BaseDatabaseAdapter): Promise<void> {
 
     // Run migration if not found in database
     if (existingMigration) {
-      continue // eslint-disable-line no-continue
+      continue
     }
 
     const start = Date.now()

packages/payload/src/database/migrations/migrateDown.ts

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

packages/payload/src/database/migrations/migrateRefresh.ts

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

packages/payload/src/database/migrations/migrateReset.ts

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

packages/payload/src/database/migrations/migrateStatus.ts

@@ -25,7 +25,7 @@ export async function migrateStatus(this: BaseDatabaseAdapter): 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/payload/src/database/queryValidation/validateQueryPaths.ts

@@ -1,8 +1,6 @@
-/* eslint-disable no-restricted-syntax */
 import type { SanitizedCollectionConfig } from '../../collections/config/types.js'
 import type { Field, FieldAffectingData } from '../../fields/config/types.js'
 import type { SanitizedGlobalConfig } from '../../globals/config/types.js'
-/* eslint-disable no-await-in-loop */
 import type { Operator, PayloadRequest, Where, WhereField } from '../../types/index.js'
 import type { EntityPolicies } from './types.js'
 

packages/payload/src/database/queryValidation/validateSearchParams.ts

@@ -51,10 +51,8 @@ export async function validateSearchParam({
   const { slug } = collectionConfig || globalConfig
 
   if (globalConfig && !policies.globals[slug]) {
-    // eslint-disable-next-line no-param-reassign
     globalConfig.fields = fields
 
-    // eslint-disable-next-line no-param-reassign
     policies.globals[slug] = await getEntityPolicies({
       type: 'global',
       entity: globalConfig,
@@ -85,7 +83,6 @@ export async function validateSearchParam({
       if (!overrideAccess && fieldAffectsData(field)) {
         if (collectionSlug) {
           if (!policies.collections[collectionSlug]) {
-            // eslint-disable-next-line no-param-reassign
             policies.collections[collectionSlug] = await getEntityPolicies({
               type: 'collection',
               entity: req.payload.collections[collectionSlug].config,

packages/payload/src/database/types.ts

@@ -222,17 +222,17 @@ type BaseVersionArgs = {
   where?: Where
 }
 
-export type FindVersionsArgs = BaseVersionArgs & {
+export type FindVersionsArgs = {
   collection: string
-}
+} & BaseVersionArgs
 
 export type FindVersions = <T = TypeWithID>(
   args: FindVersionsArgs,
 ) => Promise<PaginatedDocs<TypeWithVersion<T>>>
 
-export type FindGlobalVersionsArgs = BaseVersionArgs & {
+export type FindGlobalVersionsArgs = {
   global: string
-}
+} & BaseVersionArgs
 
 export type FindGlobalArgs = {
   locale?: string
@@ -395,10 +395,10 @@ export type DeleteManyArgs = {
 
 export type DeleteMany = (args: DeleteManyArgs) => Promise<void>
 
-export type Migration = MigrationData & {
+export type Migration = {
   down: ({ payload, req }: { payload: Payload; req: PayloadRequest }) => Promise<boolean>
   up: ({ payload, req }: { payload: Payload; req: PayloadRequest }) => Promise<boolean>
-}
+} & MigrationData
 
 export type MigrationData = {
   batch?: number

packages/payload/src/errors/APIError.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import httpStatus from 'http-status'
 
 class ExtendableError<TData extends object = { [key: string]: unknown }> extends Error {

packages/payload/src/exports/shared.ts

@@ -1,7 +1,5 @@
-export * from '../fields/validations.js'
 export { defaults as collectionDefaults } from '../collections/config/defaults.js'
 export { serverProps } from '../config/types.js'
-
 export {
   fieldAffectsData,
   fieldHasMaxDepth,
@@ -19,6 +17,8 @@ export {
   valueIsValueWithRelation,
 } from '../fields/config/types.js'
 
+export * from '../fields/validations.js'
+
 export { validOperators } from '../types/constants.js'
 export { formatFilesize } from '../uploads/formatFilesize.js'
 

packages/payload/src/fields/config/sanitize.spec.ts

@@ -1,6 +1,4 @@
-import { Config } from '../../config/types.js'
-import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors/index.js'
-import { sanitizeFields } from './sanitize.js'
+import type { Config } from '../../config/types.js'
 import type {
   ArrayField,
   Block,
@@ -11,14 +9,17 @@ import type {
   TextField,
 } from './types.js'
 
+import { InvalidFieldName, InvalidFieldRelationship, MissingFieldType } from '../../errors/index.js'
+import { sanitizeFields } from './sanitize.js'
+
 describe('sanitizeFields', () => {
   const config = {} as Config
   it('should throw on missing type field', async () => {
     const fields: Field[] = [
       // @ts-expect-error
       {
-        label: 'some-collection',
         name: 'Some Collection',
+        label: 'some-collection',
       },
     ]
     await expect(async () => {
@@ -32,9 +33,9 @@ describe('sanitizeFields', () => {
   it('should throw on invalid field name', async () => {
     const fields: Field[] = [
       {
-        label: 'some.collection',
         name: 'some.collection',
         type: 'text',
+        label: 'some.collection',
       },
     ]
     await expect(async () => {
@@ -68,9 +69,9 @@ describe('sanitizeFields', () => {
     it('should allow auto-label override', async () => {
       const fields: Field[] = [
         {
-          label: 'Do not label',
           name: 'someField',
           type: 'text',
+          label: 'Do not label',
         },
       ]
       const sanitizedField = (
@@ -89,9 +90,9 @@ describe('sanitizeFields', () => {
       it('should allow label opt-out', async () => {
         const fields: Field[] = [
           {
-            label: false,
             name: 'someField',
             type: 'text',
+            label: false,
           },
         ]
         const sanitizedField = (
@@ -108,6 +109,8 @@ describe('sanitizeFields', () => {
 
       it('should allow label opt-out for arrays', async () => {
         const arrayField: ArrayField = {
+          name: 'items',
+          type: 'array',
           fields: [
             {
               name: 'itemName',
@@ -115,8 +118,6 @@ describe('sanitizeFields', () => {
             },
           ],
           label: false,
-          name: 'items',
-          type: 'array',
         }
         const sanitizedField = (
           await sanitizeFields({
@@ -133,20 +134,20 @@ describe('sanitizeFields', () => {
       it('should allow label opt-out for blocks', async () => {
         const fields: Field[] = [
           {
+            name: 'noLabelBlock',
+            type: 'blocks',
             blocks: [
               {
+                slug: 'number',
                 fields: [
                   {
                     name: 'testNumber',
                     type: 'number',
                   },
                 ],
-                slug: 'number',
               },
             ],
             label: false,
-            name: 'noLabelBlock',
-            type: 'blocks',
           },
         ]
         const sanitizedField = (
@@ -166,14 +167,14 @@ describe('sanitizeFields', () => {
     it('should label arrays with plural and singular', async () => {
       const fields: Field[] = [
         {
+          name: 'items',
+          type: 'array',
           fields: [
             {
               name: 'itemName',
               type: 'text',
             },
           ],
-          name: 'items',
-          type: 'array',
         },
       ]
       const sanitizedField = (
@@ -192,14 +193,14 @@ describe('sanitizeFields', () => {
     it('should label blocks with plural and singular', async () => {
       const fields: Field[] = [
         {
-          blocks: [
-            {
-              fields: [{ name: 'testNumber', type: 'number' }],
-              slug: 'number',
-            },
-          ],
           name: 'specialBlock',
           type: 'blocks',
+          blocks: [
+            {
+              slug: 'number',
+              fields: [{ name: 'testNumber', type: 'number' }],
+            },
+          ],
         },
       ]
       const sanitizedField = (
@@ -225,10 +226,10 @@ describe('sanitizeFields', () => {
       const validRelationships = ['some-collection']
       const fields: Field[] = [
         {
-          label: 'my-relationship',
           name: 'My Relationship',
-          relationTo: 'some-collection',
           type: 'relationship',
+          label: 'my-relationship',
+          relationTo: 'some-collection',
         },
       ]
       await expect(async () => {
@@ -240,10 +241,10 @@ describe('sanitizeFields', () => {
       const validRelationships = ['some-collection', 'another-collection']
       const fields: Field[] = [
         {
-          label: 'my-relationship',
           name: 'My Relationship',
-          relationTo: ['some-collection', 'another-collection'],
           type: 'relationship',
+          label: 'my-relationship',
+          relationTo: ['some-collection', 'another-collection'],
         },
       ]
       await expect(async () => {
@@ -254,22 +255,22 @@ describe('sanitizeFields', () => {
     it('should not throw on valid relationship inside blocks', async () => {
       const validRelationships = ['some-collection']
       const relationshipBlock: Block = {
+        slug: 'relationshipBlock',
         fields: [
           {
-            label: 'my-relationship',
             name: 'My Relationship',
-            relationTo: 'some-collection',
             type: 'relationship',
+            label: 'my-relationship',
+            relationTo: 'some-collection',
           },
         ],
-        slug: 'relationshipBlock',
       }
       const fields: Field[] = [
         {
-          blocks: [relationshipBlock],
-          label: 'Layout Blocks',
           name: 'layout',
           type: 'blocks',
+          blocks: [relationshipBlock],
+          label: 'Layout Blocks',
         },
       ]
       await expect(async () => {
@@ -281,10 +282,10 @@ describe('sanitizeFields', () => {
       const validRelationships = ['some-collection']
       const fields: Field[] = [
         {
-          label: 'my-relationship',
           name: 'My Relationship',
-          relationTo: 'not-valid',
           type: 'relationship',
+          label: 'my-relationship',
+          relationTo: 'not-valid',
         },
       ]
       await expect(async () => {
@@ -296,10 +297,10 @@ describe('sanitizeFields', () => {
       const validRelationships = ['some-collection', 'another-collection']
       const fields: Field[] = [
         {
-          label: 'my-relationship',
           name: 'My Relationship',
-          relationTo: ['some-collection', 'not-valid'],
           type: 'relationship',
+          label: 'my-relationship',
+          relationTo: ['some-collection', 'not-valid'],
         },
       ]
       await expect(async () => {
@@ -310,22 +311,22 @@ describe('sanitizeFields', () => {
     it('should throw on invalid relationship inside blocks', async () => {
       const validRelationships = ['some-collection']
       const relationshipBlock: Block = {
+        slug: 'relationshipBlock',
         fields: [
           {
-            label: 'my-relationship',
             name: 'My Relationship',
-            relationTo: 'not-valid',
             type: 'relationship',
+            label: 'my-relationship',
+            relationTo: 'not-valid',
           },
         ],
-        slug: 'relationshipBlock',
       }
       const fields: Field[] = [
         {
-          blocks: [relationshipBlock],
-          label: 'Layout Blocks',
           name: 'layout',
           type: 'blocks',
+          blocks: [relationshipBlock],
+          label: 'Layout Blocks',
         },
       ]
       await expect(async () => {
@@ -337,8 +338,8 @@ describe('sanitizeFields', () => {
       const fields: Field[] = [
         {
           name: 'My Checkbox',
-          required: true,
           type: 'checkbox',
+          required: true,
         },
       ]
 

packages/payload/src/fields/config/types.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-use-before-define */
+
 import type { EditorProps } from '@monaco-editor/react'
 import type { CSSProperties } from 'react'
 
@@ -241,8 +241,8 @@ export interface FieldBase {
   validate?: Validate
 }
 
-export type NumberField = FieldBase & {
-  admin?: Admin & {
+export type NumberField = {
+  admin?: {
     /** Set this property to a string that will be used for browser autocomplete. */
     autoComplete?: string
     components?: {
@@ -255,33 +255,34 @@ export type NumberField = FieldBase & {
     placeholder?: Record<string, string> | string
     /** Set a value for the number field to increment / decrement using browser controls. */
     step?: number
-  }
+  } & Admin
   /** Maximum value accepted. Used in the default `validation` function. */
   max?: number
   /** Minimum value accepted. Used in the default `validation` function. */
   min?: number
   type: 'number'
 } & (
-    | {
-        /** Makes this field an ordered array of numbers instead of just a single number. */
-        hasMany: true
-        /** Maximum number of numbers in the numbers array, if `hasMany` is set to true. */
-        maxRows?: number
-        /** Minimum number of numbers in the numbers array, if `hasMany` is set to true. */
-        minRows?: number
-      }
-    | {
-        /** Makes this field an ordered array of numbers instead of just a single number. */
-        hasMany?: false | undefined
-        /** Maximum number of numbers in the numbers array, if `hasMany` is set to true. */
-        maxRows?: undefined
-        /** Minimum number of numbers in the numbers array, if `hasMany` is set to true. */
-        minRows?: undefined
-      }
-  )
+  | {
+      /** Makes this field an ordered array of numbers instead of just a single number. */
+      hasMany: true
+      /** Maximum number of numbers in the numbers array, if `hasMany` is set to true. */
+      maxRows?: number
+      /** Minimum number of numbers in the numbers array, if `hasMany` is set to true. */
+      minRows?: number
+    }
+  | {
+      /** Makes this field an ordered array of numbers instead of just a single number. */
+      hasMany?: false | undefined
+      /** Maximum number of numbers in the numbers array, if `hasMany` is set to true. */
+      maxRows?: undefined
+      /** Minimum number of numbers in the numbers array, if `hasMany` is set to true. */
+      minRows?: undefined
+    }
+) &
+  FieldBase
 
-export type TextField = FieldBase & {
-  admin?: Admin & {
+export type TextField = {
+  admin?: {
     autoComplete?: string
     components?: {
       Error?: CustomComponent<ErrorProps>
@@ -291,31 +292,32 @@ export type TextField = FieldBase & {
     }
     placeholder?: Record<string, string> | string
     rtl?: boolean
-  }
+  } & Admin
   maxLength?: number
   minLength?: number
   type: 'text'
 } & (
-    | {
-        /** Makes this field an ordered array of strings instead of just a single string. */
-        hasMany: true
-        /** Maximum number of strings in the strings array, if `hasMany` is set to true. */
-        maxRows?: number
-        /** Minimum number of strings in the strings array, if `hasMany` is set to true. */
-        minRows?: number
-      }
-    | {
-        /** Makes this field an ordered array of strings instead of just a single string. */
-        hasMany?: false | undefined
-        /** Maximum number of strings in the strings array, if `hasMany` is set to true. */
-        maxRows?: undefined
-        /** Minimum number of strings in the strings array, if `hasMany` is set to true. */
-        minRows?: undefined
-      }
-  )
+  | {
+      /** Makes this field an ordered array of strings instead of just a single string. */
+      hasMany: true
+      /** Maximum number of strings in the strings array, if `hasMany` is set to true. */
+      maxRows?: number
+      /** Minimum number of strings in the strings array, if `hasMany` is set to true. */
+      minRows?: number
+    }
+  | {
+      /** Makes this field an ordered array of strings instead of just a single string. */
+      hasMany?: false | undefined
+      /** Maximum number of strings in the strings array, if `hasMany` is set to true. */
+      maxRows?: undefined
+      /** Minimum number of strings in the strings array, if `hasMany` is set to true. */
+      minRows?: undefined
+    }
+) &
+  FieldBase
 
-export type EmailField = FieldBase & {
-  admin?: Admin & {
+export type EmailField = {
+  admin?: {
     autoComplete?: string
     components?: {
       Error?: CustomComponent<ErrorProps>
@@ -324,12 +326,12 @@ export type EmailField = FieldBase & {
       beforeInput?: CustomComponent[]
     }
     placeholder?: Record<string, string> | string
-  }
+  } & Admin
   type: 'email'
-}
+} & FieldBase
 
-export type TextareaField = FieldBase & {
-  admin?: Admin & {
+export type TextareaField = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
@@ -339,26 +341,26 @@ export type TextareaField = FieldBase & {
     placeholder?: Record<string, string> | string
     rows?: number
     rtl?: boolean
-  }
+  } & Admin
   maxLength?: number
   minLength?: number
   type: 'textarea'
-}
+} & FieldBase
 
-export type CheckboxField = FieldBase & {
-  admin?: Admin & {
+export type CheckboxField = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
       afterInput?: CustomComponent[]
       beforeInput?: CustomComponent[]
     }
-  }
+  } & Admin
   type: 'checkbox'
-}
+} & FieldBase
 
-export type DateField = FieldBase & {
-  admin?: Admin & {
+export type DateField = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
@@ -367,14 +369,14 @@ export type DateField = FieldBase & {
     }
     date?: ConditionalDateProps
     placeholder?: Record<string, string> | string
-  }
+  } & Admin
   type: 'date'
-}
+} & FieldBase
 
-export type GroupField = Omit<FieldBase, 'required' | 'validation'> & {
-  admin?: Admin & {
+export type GroupField = {
+  admin?: {
     hideGutter?: boolean
-  }
+  } & Admin
   fields: Field[]
   /** Customize generated GraphQL and Typescript schema names.
    * By default, it is bound to the collection.
@@ -384,47 +386,48 @@ export type GroupField = Omit<FieldBase, 'required' | 'validation'> & {
    */
   interfaceName?: string
   type: 'group'
-}
+} & Omit<FieldBase, 'required' | 'validation'>
 
 export type RowAdmin = Omit<Admin, 'description'>
 
-export type RowField = Omit<FieldBase, 'admin' | 'label' | 'name'> & {
+export type RowField = {
   admin?: RowAdmin
   fields: Field[]
   type: 'row'
-}
+} & Omit<FieldBase, 'admin' | 'label' | 'name'>
 
-export type CollapsibleField = Omit<FieldBase, 'label' | 'name'> & {
+export type CollapsibleField = {
   fields: Field[]
   type: 'collapsible'
 } & (
-    | {
-        admin: Admin & {
-          components: {
-            RowLabel: RowLabelComponent
-          } & Admin['components']
-          initCollapsed?: boolean
-        }
-        label?: Required<FieldBase['label']>
-      }
-    | {
-        admin?: Admin & {
-          initCollapsed?: boolean
-        }
-        label: Required<FieldBase['label']>
-      }
-  )
+  | {
+      admin: {
+        components: {
+          RowLabel: RowLabelComponent
+        } & Admin['components']
+        initCollapsed?: boolean
+      } & Admin
+      label?: Required<FieldBase['label']>
+    }
+  | {
+      admin?: {
+        initCollapsed?: boolean
+      } & Admin
+      label: Required<FieldBase['label']>
+    }
+) &
+  Omit<FieldBase, 'label' | 'name'>
 
 export type TabsAdmin = Omit<Admin, 'description'>
 
-type TabBase = Omit<FieldBase, 'required' | 'validation'> & {
+type TabBase = {
   description?: Description
   fields: Field[]
   interfaceName?: string
   saveToJWT?: boolean | string
-}
+} & Omit<FieldBase, 'required' | 'validation'>
 
-export type NamedTab = TabBase & {
+export type NamedTab = {
   /** Customize generated GraphQL and Typescript schema names.
    * The slug is used by default.
    *
@@ -432,9 +435,9 @@ export type NamedTab = TabBase & {
    * **Note**: Top level types can collide, ensure they are unique amongst collections, arrays, groups, blocks, tabs.
    */
   interfaceName?: string
-}
+} & TabBase
 
-export type UnnamedTab = Omit<TabBase, 'name'> & {
+export type UnnamedTab = {
   interfaceName?: never
   /**
    * Can be either:
@@ -448,20 +451,20 @@ export type UnnamedTab = Omit<TabBase, 'name'> & {
     | LabelFunction
     | string
   localized?: never
-}
+} & Omit<TabBase, 'name'>
 
 export type Tab = NamedTab | UnnamedTab
 
-export type TabsField = Omit<FieldBase, 'admin' | 'localized' | 'name' | 'saveToJWT'> & {
+export type TabsField = {
   admin?: TabsAdmin
   tabs: Tab[]
   type: 'tabs'
-}
+} & Omit<FieldBase, 'admin' | 'localized' | 'name' | 'saveToJWT'>
 
-export type TabAsField = Tab & {
+export type TabAsField = {
   name?: string
   type: 'tab'
-}
+} & Tab
 
 export type UIField = {
   admin: {
@@ -492,7 +495,7 @@ export type UIField = {
   type: 'ui'
 }
 
-export type UploadField = FieldBase & {
+export type UploadField = {
   admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
@@ -508,33 +511,33 @@ export type UploadField = FieldBase & {
   maxDepth?: number
   relationTo: CollectionSlug
   type: 'upload'
-}
+} & FieldBase
 
-type CodeAdmin = Admin & {
+type CodeAdmin = {
   components?: {
     Error?: CustomComponent<ErrorProps>
     Label?: CustomComponent<LabelProps>
   }
   editorOptions?: EditorProps['options']
   language?: string
-}
+} & Admin
 
-export type CodeField = Omit<FieldBase, 'admin'> & {
+export type CodeField = {
   admin?: CodeAdmin
   maxLength?: number
   minLength?: number
   type: 'code'
-}
+} & Omit<FieldBase, 'admin'>
 
-type JSONAdmin = Admin & {
+type JSONAdmin = {
   components?: {
     Error?: CustomComponent<ErrorProps>
     Label?: CustomComponent<LabelProps>
   }
   editorOptions?: EditorProps['options']
-}
+} & Admin
 
-export type JSONField = Omit<FieldBase, 'admin'> & {
+export type JSONField = {
   admin?: JSONAdmin
   jsonSchema?: {
     fileMatch: string[]
@@ -542,17 +545,17 @@ export type JSONField = Omit<FieldBase, 'admin'> & {
     uri: string
   }
   type: 'json'
-}
+} & Omit<FieldBase, 'admin'>
 
-export type SelectField = FieldBase & {
-  admin?: Admin & {
+export type SelectField = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
     }
     isClearable?: boolean
     isSortable?: boolean
-  }
+  } & Admin
   /**
    * Customize the SQL table name
    */
@@ -564,9 +567,9 @@ export type SelectField = FieldBase & {
   hasMany?: boolean
   options: Option[]
   type: 'select'
-}
+} & FieldBase
 
-type SharedRelationshipProperties = FieldBase & {
+type SharedRelationshipProperties = {
   filterOptions?: FilterOptions
   hasMany?: boolean
   /**
@@ -577,54 +580,55 @@ type SharedRelationshipProperties = FieldBase & {
   maxDepth?: number
   type: 'relationship'
 } & (
-    | {
-        hasMany: true
-        /**
-         * @deprecated Use 'maxRows' instead
-         */
-        max?: number
-        maxRows?: number
-        /**
-         * @deprecated Use 'minRows' instead
-         */
-        min?: number
-        minRows?: number
-      }
-    | {
-        hasMany?: false | undefined
-        /**
-         * @deprecated Use 'maxRows' instead
-         */
-        max?: undefined
-        maxRows?: undefined
-        /**
-         * @deprecated Use 'minRows' instead
-         */
-        min?: undefined
-        minRows?: undefined
-      }
-  )
+  | {
+      hasMany: true
+      /**
+       * @deprecated Use 'maxRows' instead
+       */
+      max?: number
+      maxRows?: number
+      /**
+       * @deprecated Use 'minRows' instead
+       */
+      min?: number
+      minRows?: number
+    }
+  | {
+      hasMany?: false | undefined
+      /**
+       * @deprecated Use 'maxRows' instead
+       */
+      max?: undefined
+      maxRows?: undefined
+      /**
+       * @deprecated Use 'minRows' instead
+       */
+      min?: undefined
+      minRows?: undefined
+    }
+) &
+  FieldBase
 
-type RelationshipAdmin = Admin & {
+type RelationshipAdmin = {
   allowCreate?: boolean
   components?: {
     Error?: CustomComponent<ErrorProps>
     Label?: CustomComponent<LabelProps>
   }
   isSortable?: boolean
-}
-export type PolymorphicRelationshipField = SharedRelationshipProperties & {
-  admin?: RelationshipAdmin & {
+} & Admin
+export type PolymorphicRelationshipField = {
+  admin?: {
     sortOptions?: { [collectionSlug: CollectionSlug]: string }
-  }
+  } & RelationshipAdmin
   relationTo: CollectionSlug[]
-}
-export type SingleRelationshipField = SharedRelationshipProperties & {
-  admin?: RelationshipAdmin & {
+} & SharedRelationshipProperties
+export type SingleRelationshipField = {
+  admin?: {
     sortOptions?: string
-  }
+  } & RelationshipAdmin
   relationTo: CollectionSlug
-}
+} & SharedRelationshipProperties
 export type RelationshipField = PolymorphicRelationshipField | SingleRelationshipField
 
 export type ValueWithRelation = {
@@ -646,13 +650,13 @@ export type RichTextField<
   Value extends object = any,
   AdapterProps = any,
   ExtraProperties = object,
-> = FieldBase & {
-  admin?: Admin & {
+> = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
     }
-  }
+  } & Admin
   editor?:
     | RichTextAdapter<Value, AdapterProps, AdapterProps>
     | RichTextAdapterProvider<Value, AdapterProps, AdapterProps>
@@ -663,10 +667,11 @@ export type RichTextField<
    */
   maxDepth?: number
   type: 'richText'
-} & ExtraProperties
+} & ExtraProperties &
+  FieldBase
 
-export type ArrayField = FieldBase & {
-  admin?: Admin & {
+export type ArrayField = {
+  admin?: {
     components?: {
       RowLabel?: RowLabelComponent
     } & Admin['components']
@@ -675,7 +680,7 @@ export type ArrayField = FieldBase & {
      * Disable drag and drop sorting
      */
     isSortable?: boolean
-  }
+  } & Admin
   /**
    * Customize the SQL table name
    */
@@ -692,16 +697,16 @@ export type ArrayField = FieldBase & {
   maxRows?: number
   minRows?: number
   type: 'array'
-}
+} & FieldBase
 
-export type RadioField = FieldBase & {
-  admin?: Admin & {
+export type RadioField = {
+  admin?: {
     components?: {
       Error?: CustomComponent<ErrorProps>
       Label?: CustomComponent<LabelProps>
     }
     layout?: 'horizontal' | 'vertical'
-  }
+  } & Admin
   /**
    * Customize the SQL table name
    */
@@ -712,7 +717,7 @@ export type RadioField = FieldBase & {
   enumName?: DBIdentifierName
   options: Option[]
   type: 'radio'
-}
+} & FieldBase
 
 export type Block = {
   admin?: {
@@ -743,25 +748,25 @@ export type Block = {
   slug: string
 }
 
-export type BlockField = FieldBase & {
-  admin?: Admin & {
+export type BlockField = {
+  admin?: {
     initCollapsed?: boolean
     /**
      * Disable drag and drop sorting
      */
     isSortable?: boolean
-  }
+  } & Admin
   blocks: Block[]
   defaultValue?: unknown
   labels?: Labels
   maxRows?: number
   minRows?: number
   type: 'blocks'
-}
+} & FieldBase
 
-export type PointField = FieldBase & {
+export type PointField = {
   type: 'point'
-}
+} & FieldBase
 
 export type Field =
   | ArrayField
@@ -828,9 +833,9 @@ export type NonPresentationalField =
   | TextareaField
   | UploadField
 
-export type FieldWithPath = Field & {
+export type FieldWithPath = {
   path?: string
-}
+} & Field
 
 export type FieldWithSubFields = ArrayField | CollapsibleField | GroupField | RowField
 

packages/payload/src/fields/hooks/afterChange/promise.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'

packages/payload/src/fields/hooks/afterRead/promise.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'

packages/payload/src/fields/hooks/beforeValidate/promise.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-param-reassign */
 import type { RichTextAdapter } from '../../../admin/RichText.js'
 import type { SanitizedCollectionConfig } from '../../../collections/config/types.js'
 import type { SanitizedGlobalConfig } from '../../../globals/config/types.js'

packages/payload/src/fields/validations.spec.ts

@@ -1,6 +1,7 @@
-import type { ValidateOptions } from './config/types.js'
 import { jest } from '@jest/globals'
 
+import type { ValidateOptions } from './config/types.js'
+
 import { number, password, point, relationship, select, text, textarea } from './validations.js'
 
 const t = jest.fn((string) => string)
@@ -8,9 +9,7 @@ const t = jest.fn((string) => string)
 let options: ValidateOptions<any, any, any> = {
   data: undefined,
   operation: 'create',
-  siblingData: undefined,
   req: {
-    t,
     context: {},
     payload: {
       config: {
@@ -20,7 +19,9 @@ let options: ValidateOptions<any, any, any> = {
         },
       },
     },
+    t,
   },
+  siblingData: undefined,
 }
 
 describe('Field Validations', () => {
@@ -216,32 +217,32 @@ describe('Field Validations', () => {
 
   describe('relationship', () => {
     const relationCollection = {
+      slug: 'relation',
       fields: [
         {
           name: 'id',
           type: 'text',
         },
       ],
-      slug: 'relation',
     }
 
     const relationshipOptions = {
       ...options,
+      relationTo: 'relation',
       req: {
         ...options.req,
         payload: {
           ...options.req.payload,
-          config: {
-            collections: [relationCollection],
-          },
           collections: {
             relation: {
               config: relationCollection,
             },
           },
+          config: {
+            collections: [relationCollection],
+          },
         },
       },
-      relationTo: 'relation',
     }
     it('should handle required', async () => {
       const val = undefined
@@ -292,8 +293,8 @@ describe('Field Validations', () => {
   describe('select', () => {
     const selectOptions = {
       ...options,
-      options: ['one', 'two', 'three'],
       type: 'select',
+      options: ['one', 'two', 'three'],
     }
     const optionsRequired = {
       ...selectOptions,

packages/payload/src/fields/validations.ts

@@ -168,7 +168,7 @@ export const code: Validate<string, unknown, unknown, CodeField> = (
   return true
 }
 
-export const json: Validate<string, unknown, unknown, JSONField & { jsonError?: string }> = async (
+export const json: Validate<string, unknown, unknown, { jsonError?: string } & JSONField> = async (
   value,
   { jsonError, jsonSchema, req: { t }, required },
 ) => {
@@ -250,7 +250,6 @@ export const date: Validate<Date, unknown, unknown, DateField> = (
   { req: { t }, required },
 ) => {
   if (value && !isNaN(Date.parse(value.toString()))) {
-    /* eslint-disable-line */
     return true
   }
 

packages/payload/src/globals/config/client.ts

@@ -19,18 +19,15 @@ export type ServerOnlyGlobalAdminProperties = keyof Pick<
   'components' | 'hidden' | 'preview'
 >
 
-export type ClientGlobalConfig = Omit<
-  SanitizedGlobalConfig,
-  'admin' | 'fields' | ServerOnlyGlobalProperties
-> & {
-  admin: Omit<
-    SanitizedGlobalConfig['admin'],
-    ServerOnlyGlobalAdminProperties & 'fields' & 'livePreview'
-  > & {
+export type ClientGlobalConfig = {
+  admin: {
     livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>
-  }
+  } & Omit<
+    SanitizedGlobalConfig['admin'],
+    'fields' & 'livePreview' & ServerOnlyGlobalAdminProperties
+  >
   fields: ClientFieldConfig[]
-}
+} & Omit<SanitizedGlobalConfig, 'admin' | 'fields' | ServerOnlyGlobalProperties>
 
 export const createClientGlobalConfig = ({
   global,

packages/payload/src/globals/operations/findVersionByID.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-underscore-dangle */
 import type { FindGlobalVersionsArgs } from '../../database/types.js'
 import type { PayloadRequest } from '../../types/index.js'
 import type { TypeWithVersion } from '../../versions/types.js'

packages/payload/src/index.ts

@@ -83,7 +83,7 @@ export interface GeneratedTypes {
     }
   }
   collectionsUntyped: {
-    [slug: string]: TypeWithID & Record<string, unknown>
+    [slug: string]: Record<string, unknown> & TypeWithID
   }
   globalsUntyped: {
     [slug: string]: Record<string, unknown>
@@ -293,7 +293,7 @@ export class BasePayload {
 
   login = async <TSlug extends CollectionSlug>(
     options: LoginOptions<TSlug>,
-  ): Promise<LoginResult & { user: DataFromCollectionSlug<TSlug> }> => {
+  ): Promise<{ user: DataFromCollectionSlug<TSlug> } & LoginResult> => {
     const { login } = localOperations.auth
     return login<TSlug>(this, options)
   }
@@ -632,7 +632,6 @@ export default initialized
 let cached = global._payload
 
 if (!cached) {
-  // eslint-disable-next-line no-multi-assign
   cached = global._payload = { payload: null, promise: null }
 }
 
@@ -669,14 +668,52 @@ export interface DatabaseAdapter extends BaseDatabaseAdapter {}
 
 export type { Payload, RequestContext }
 
-export * from './types/index.js'
+export type { FieldTypes } from './admin/forms/FieldTypes.js'
 export type * from './admin/types.js'
-export type * from './uploads/types.js'
+export { default as executeAccess } from './auth/executeAccess.js'
+
+export { executeAuthStrategies } from './auth/executeAuthStrategies.js'
+
+export { getAccessResults } from './auth/getAccessResults.js'
+
+export { getFieldsToSign } from './auth/getFieldsToSign.js'
+
+export * from './auth/index.js'
+
+export { accessOperation } from './auth/operations/access.js'
+export { forgotPasswordOperation } from './auth/operations/forgotPassword.js'
+export { initOperation } from './auth/operations/init.js'
+
+export { loginOperation } from './auth/operations/login.js'
+
+export { logoutOperation } from './auth/operations/logout.js'
 
 export type { MeOperationResult } from './auth/operations/me.js'
 
+export { meOperation } from './auth/operations/me.js'
+export { refreshOperation } from './auth/operations/refresh.js'
+
+export { registerFirstUserOperation } from './auth/operations/registerFirstUser.js'
+export { resetPasswordOperation } from './auth/operations/resetPassword.js'
+export { unlockOperation } from './auth/operations/unlock.js'
+export { verifyEmailOperation } from './auth/operations/verifyEmail.js'
+
+export type {
+  AuthStrategyFunction,
+  AuthStrategyFunctionArgs,
+  CollectionPermission,
+  DocumentPermissions,
+  FieldPermissions,
+  GlobalPermission,
+  IncomingAuthType,
+  Permission,
+  Permissions,
+  User,
+  VerifyConfig,
+} from './auth/types.js'
 export type { ClientCollectionConfig } from './collections/config/client.js'
 
+export { createClientCollectionConfig } from './collections/config/client.js'
 export type {
   AfterChangeHook as CollectionAfterChangeHook,
   AfterDeleteHook as CollectionAfterDeleteHook,
@@ -712,9 +749,30 @@ export type {
 } from './collections/config/types.js'
 
 export { createDataloaderCacheKey, getDataLoader } from './collections/dataloader.js'
+export { countOperation } from './collections/operations/count.js'
 
+export { createOperation } from './collections/operations/create.js'
+
+export { deleteOperation } from './collections/operations/delete.js'
+export { deleteByIDOperation } from './collections/operations/deleteByID.js'
+export { docAccessOperation } from './collections/operations/docAccess.js'
+
+export { duplicateOperation } from './collections/operations/duplicate.js'
+
+export { findOperation } from './collections/operations/find.js'
+
+export { findByIDOperation } from './collections/operations/findByID.js'
+export { findVersionByIDOperation } from './collections/operations/findVersionByID.js'
+export { findVersionsOperation } from './collections/operations/findVersions.js'
+export { restoreVersionOperation } from './collections/operations/restoreVersion.js'
+export { updateOperation } from './collections/operations/update.js'
+export { updateByIDOperation } from './collections/operations/updateByID.js'
 export { buildConfig } from './config/build.js'
+
 export type { ClientConfig } from './config/client.js'
+export { createClientConfig } from './config/client.js'
+export { defaults } from './config/defaults.js'
+export { sanitizeConfig } from './config/sanitize.js'
 export type {
   Access,
   AccessArgs,
@@ -724,7 +782,85 @@ export type {
   EntityDescriptionFunction,
   SanitizedConfig,
 } from './config/types.js'
+export * from './config/types.js'
+export { combineQueries } from './database/combineQueries.js'
+export { createDatabaseAdapter } from './database/createDatabaseAdapter.js'
 
+export { default as flattenWhereToOperators } from './database/flattenWhereToOperators.js'
+export { getLocalizedPaths } from './database/getLocalizedPaths.js'
+export { createMigration } from './database/migrations/createMigration.js'
+
+export { getMigrations } from './database/migrations/getMigrations.js'
+export { getPredefinedMigration } from './database/migrations/getPredefinedMigration.js'
+export { migrate } from './database/migrations/migrate.js'
+export { migrateDown } from './database/migrations/migrateDown.js'
+
+export { migrateRefresh } from './database/migrations/migrateRefresh.js'
+export { migrateReset } from './database/migrations/migrateReset.js'
+export { migrateStatus } from './database/migrations/migrateStatus.js'
+export { migrationTemplate } from './database/migrations/migrationTemplate.js'
+export { migrationsCollection } from './database/migrations/migrationsCollection.js'
+export { readMigrationFiles } from './database/migrations/readMigrationFiles.js'
+
+export type * from './database/queryValidation/types.js'
+
+export type { EntityPolicies, PathToQuery } from './database/queryValidation/types.js'
+
+export { validateQueryPaths } from './database/queryValidation/validateQueryPaths.js'
+export { validateSearchParam } from './database/queryValidation/validateSearchParams.js'
+export type {
+  BaseDatabaseAdapter,
+  BeginTransaction,
+  CommitTransaction,
+  Connect,
+  Count,
+  CountArgs,
+  Create,
+  CreateArgs,
+  CreateGlobal,
+  CreateGlobalArgs,
+  CreateGlobalVersion,
+  CreateGlobalVersionArgs,
+  CreateMigration,
+  CreateVersion,
+  CreateVersionArgs,
+  DBIdentifierName,
+  DatabaseAdapterResult as DatabaseAdapterObj,
+  DeleteMany,
+  DeleteManyArgs,
+  DeleteOne,
+  DeleteOneArgs,
+  DeleteVersions,
+  DeleteVersionsArgs,
+  Destroy,
+  Find,
+  FindArgs,
+  FindGlobal,
+  FindGlobalArgs,
+  FindGlobalVersions,
+  FindGlobalVersionsArgs,
+  FindOne,
+  FindOneArgs,
+  FindVersions,
+  FindVersionsArgs,
+  Init,
+  Migration,
+  MigrationData,
+  MigrationTemplateArgs,
+  PaginatedDocs,
+  QueryDrafts,
+  QueryDraftsArgs,
+  RollbackTransaction,
+  Transaction,
+  UpdateGlobal,
+  UpdateGlobalArgs,
+  UpdateGlobalVersion,
+  UpdateGlobalVersionArgs,
+  UpdateOne,
+  UpdateOneArgs,
+  UpdateVersion,
+  UpdateVersionArgs,
+} from './database/types.js'
 export type { EmailAdapter as PayloadEmailAdapter, SendEmailOptions } from './email/types.js'
 
 export {
@@ -750,9 +886,11 @@ export {
   QueryError,
   ValidationError,
 } from './errors/index.js'
-
+export { baseBlockFields } from './fields/baseFields/baseBlockFields.js'
+export { baseIDField } from './fields/baseFields/baseIDField.js'
 export type { ClientFieldConfig } from './fields/config/client.js'
-
+export { createClientFieldConfig } from './fields/config/client.js'
+export { sanitizeFields } from './fields/config/sanitize.js'
 export type {
   ArrayField,
   Block,
@@ -809,14 +947,16 @@ export type {
   ValidateOptions,
   ValueWithRelation,
 } from './fields/config/types.js'
+export { default as getDefaultValue } from './fields/getDefaultValue.js'
 export { traverseFields as afterChangeTraverseFields } from './fields/hooks/afterChange/traverseFields.js'
-
 export { promise as afterReadPromise } from './fields/hooks/afterRead/promise.js'
 export { traverseFields as afterReadTraverseFields } from './fields/hooks/afterRead/traverseFields.js'
 export { traverseFields as beforeChangeTraverseFields } from './fields/hooks/beforeChange/traverseFields.js'
-export { traverseFields as beforeValidateTraverseFields } from './fields/hooks/beforeValidate/traverseFields.js'
 
+export { traverseFields as beforeValidateTraverseFields } from './fields/hooks/beforeValidate/traverseFields.js'
+export { default as sortableFieldTypes } from './fields/sortableFieldTypes.js'
 export type { ClientGlobalConfig } from './globals/config/client.js'
+export { createClientGlobalConfig } from './globals/config/client.js'
 export type {
   AfterChangeHook as GlobalAfterChangeHook,
   AfterReadHook as GlobalAfterReadHook,
@@ -828,7 +968,12 @@ export type {
   GlobalConfig,
   SanitizedGlobalConfig,
 } from './globals/config/types.js'
-
+export { docAccessOperation as docAccessOperationGlobal } from './globals/operations/docAccess.js'
+export { findOneOperation } from './globals/operations/findOne.js'
+export { findVersionByIDOperation as findVersionByIDOperationGlobal } from './globals/operations/findVersionByID.js'
+export { findVersionsOperation as findVersionsOperationGlobal } from './globals/operations/findVersions.js'
+export { restoreVersionOperation as restoreVersionOperationGlobal } from './globals/operations/restoreVersion.js'
+export { updateOperation as updateOperationGlobal } from './globals/operations/update.js'
 export type {
   CollapsedPreferences,
   DocumentPreferences,
@@ -838,210 +983,64 @@ export type {
   PreferenceUpdateRequest,
   TabsPreferences,
 } from './preferences/types.js'
-export { getLocalI18n } from './translations/getLocalI18n.js'
 
+export { getLocalI18n } from './translations/getLocalI18n.js'
+export * from './types/index.js'
+export { getFileByPath } from './uploads/getFileByPath.js'
+export type * from './uploads/types.js'
 export { combineMerge } from './utilities/combineMerge.js'
+export { commitTransaction } from './utilities/commitTransaction.js'
+
 export {
   configToJSONSchema,
   entityToJSONSchema,
   fieldsToJSONSchema,
   withNullableJSONSchemaType,
 } from './utilities/configToJSONSchema.js'
-
 export { createArrayFromCommaDelineated } from './utilities/createArrayFromCommaDelineated.js'
-
 export { createLocalReq } from './utilities/createLocalReq.js'
 export { deepCopyObject } from './utilities/deepCopyObject.js'
 export { deepMerge } from './utilities/deepMerge.js'
-
 export { default as flattenTopLevelFields } from './utilities/flattenTopLevelFields.js'
 
 export { formatLabels, formatNames, toWords } from './utilities/formatLabels.js'
 
 export { getCollectionIDFieldTypes } from './utilities/getCollectionIDFieldTypes.js'
+
 export { getObjectDotNotation } from './utilities/getObjectDotNotation.js'
-export { isEntityHidden } from './utilities/isEntityHidden.js'
-export { isPlainObject } from './utilities/isPlainObject.js'
-export { isValidID } from './utilities/isValidID.js'
-export { default as isolateObjectProperty } from './utilities/isolateObjectProperty.js'
-export { mapAsync } from './utilities/mapAsync.js'
-
-export { mergeListSearchAndWhere } from './utilities/mergeListSearchAndWhere.js'
-export { buildVersionCollectionFields } from './versions/buildCollectionFields.js'
-export { buildVersionGlobalFields } from './versions/buildGlobalFields.js'
-export { versionDefaults } from './versions/defaults.js'
-export { deleteCollectionVersions } from './versions/deleteCollectionVersions.js'
-export { enforceMaxVersions } from './versions/enforceMaxVersions.js'
-export { getLatestCollectionVersion } from './versions/getLatestCollectionVersion.js'
-export { getLatestGlobalVersion } from './versions/getLatestGlobalVersion.js'
-
-export { saveVersion } from './versions/saveVersion.js'
-export type { TypeWithVersion } from './versions/types.js'
-export * from './config/types.js'
-
-export type { FieldTypes } from './admin/forms/FieldTypes.js'
-export type {
-  AuthStrategyFunction,
-  AuthStrategyFunctionArgs,
-  CollectionPermission,
-  DocumentPermissions,
-  FieldPermissions,
-  GlobalPermission,
-  IncomingAuthType,
-  Permission,
-  Permissions,
-  User,
-  VerifyConfig,
-} from './auth/types.js'
-export { createClientCollectionConfig } from './collections/config/client.js'
-export { createClientConfig } from './config/client.js'
-
-export { defaults } from './config/defaults.js'
-export type {
-  BaseDatabaseAdapter,
-  BeginTransaction,
-  CommitTransaction,
-  Connect,
-  Count,
-  CountArgs,
-  Create,
-  CreateArgs,
-  CreateGlobal,
-  CreateGlobalArgs,
-  CreateGlobalVersion,
-  CreateGlobalVersionArgs,
-  CreateMigration,
-  CreateVersion,
-  CreateVersionArgs,
-  DBIdentifierName,
-  DatabaseAdapterResult as DatabaseAdapterObj,
-  DeleteMany,
-  DeleteManyArgs,
-  DeleteOne,
-  DeleteOneArgs,
-  DeleteVersions,
-  DeleteVersionsArgs,
-  Destroy,
-  Find,
-  FindArgs,
-  FindGlobal,
-  FindGlobalArgs,
-  FindGlobalVersions,
-  FindGlobalVersionsArgs,
-  FindOne,
-  FindOneArgs,
-  FindVersions,
-  FindVersionsArgs,
-  Init,
-  Migration,
-  MigrationData,
-  MigrationTemplateArgs,
-  PaginatedDocs,
-  QueryDrafts,
-  QueryDraftsArgs,
-  RollbackTransaction,
-  Transaction,
-  UpdateGlobal,
-  UpdateGlobalArgs,
-  UpdateGlobalVersion,
-  UpdateGlobalVersionArgs,
-  UpdateOne,
-  UpdateOneArgs,
-  UpdateVersion,
-  UpdateVersionArgs,
-} from './database/types.js'
-export { baseBlockFields } from './fields/baseFields/baseBlockFields.js'
-export { baseIDField } from './fields/baseFields/baseIDField.js'
-export { createClientFieldConfig } from './fields/config/client.js'
-export { sanitizeFields } from './fields/config/sanitize.js'
-
-export { createClientGlobalConfig } from './globals/config/client.js'
-
-export type * from './database/queryValidation/types.js'
-
-export { accessOperation } from './auth/operations/access.js'
-export { forgotPasswordOperation } from './auth/operations/forgotPassword.js'
-export { initOperation } from './auth/operations/init.js'
-export { loginOperation } from './auth/operations/login.js'
-
-export { logoutOperation } from './auth/operations/logout.js'
-export { meOperation } from './auth/operations/me.js'
-export { refreshOperation } from './auth/operations/refresh.js'
-export { registerFirstUserOperation } from './auth/operations/registerFirstUser.js'
-export { resetPasswordOperation } from './auth/operations/resetPassword.js'
-export { unlockOperation } from './auth/operations/unlock.js'
-export { verifyEmailOperation } from './auth/operations/verifyEmail.js'
-export { countOperation } from './collections/operations/count.js'
-export { createOperation } from './collections/operations/create.js'
-export { deleteOperation } from './collections/operations/delete.js'
-export { deleteByIDOperation } from './collections/operations/deleteByID.js'
-export { docAccessOperation } from './collections/operations/docAccess.js'
-
-export { duplicateOperation } from './collections/operations/duplicate.js'
-export { findOperation } from './collections/operations/find.js'
-export { findByIDOperation } from './collections/operations/findByID.js'
-export { findVersionByIDOperation } from './collections/operations/findVersionByID.js'
-export { findVersionsOperation } from './collections/operations/findVersions.js'
-export { restoreVersionOperation } from './collections/operations/restoreVersion.js'
-export { updateOperation } from './collections/operations/update.js'
-export { updateByIDOperation } from './collections/operations/updateByID.js'
-export { sanitizeConfig } from './config/sanitize.js'
-export type { EntityPolicies, PathToQuery } from './database/queryValidation/types.js'
-export { default as getDefaultValue } from './fields/getDefaultValue.js'
-export { default as sortableFieldTypes } from './fields/sortableFieldTypes.js'
-
-export { docAccessOperation as docAccessOperationGlobal } from './globals/operations/docAccess.js'
-export { findOneOperation } from './globals/operations/findOne.js'
-export { findVersionByIDOperation as findVersionByIDOperationGlobal } from './globals/operations/findVersionByID.js'
-export { findVersionsOperation as findVersionsOperationGlobal } from './globals/operations/findVersions.js'
-export { restoreVersionOperation as restoreVersionOperationGlobal } from './globals/operations/restoreVersion.js'
-export { updateOperation as updateOperationGlobal } from './globals/operations/update.js'
-
-export * from './auth/index.js'
-export { default as executeAccess } from './auth/executeAccess.js'
-export { executeAuthStrategies } from './auth/executeAuthStrategies.js'
-export { getAccessResults } from './auth/getAccessResults.js'
-export { getFieldsToSign } from './auth/getFieldsToSign.js'
-export { combineQueries } from './database/combineQueries.js'
-
-export { createDatabaseAdapter } from './database/createDatabaseAdapter.js'
-
-export { default as flattenWhereToOperators } from './database/flattenWhereToOperators.js'
-
-export { getLocalizedPaths } from './database/getLocalizedPaths.js'
-
-export { createMigration } from './database/migrations/createMigration.js'
-
-export { getMigrations } from './database/migrations/getMigrations.js'
-
-export { getPredefinedMigration } from './database/migrations/getPredefinedMigration.js'
-
-export { migrate } from './database/migrations/migrate.js'
-
-export { migrateDown } from './database/migrations/migrateDown.js'
-
-export { migrateRefresh } from './database/migrations/migrateRefresh.js'
-
-export { migrateReset } from './database/migrations/migrateReset.js'
-
-export { migrateStatus } from './database/migrations/migrateStatus.js'
-
-export { migrationTemplate } from './database/migrations/migrationTemplate.js'
-
-export { migrationsCollection } from './database/migrations/migrationsCollection.js'
-
-export { readMigrationFiles } from './database/migrations/readMigrationFiles.js'
-
-export { validateQueryPaths } from './database/queryValidation/validateQueryPaths.js'
-
-export { validateSearchParam } from './database/queryValidation/validateSearchParams.js'
-
-export { getFileByPath } from './uploads/getFileByPath.js'
-
-export { commitTransaction } from './utilities/commitTransaction.js'
-
-export { getDependencies }
 
 export { initTransaction } from './utilities/initTransaction.js'
 
+export { isEntityHidden } from './utilities/isEntityHidden.js'
+
+export { isPlainObject } from './utilities/isPlainObject.js'
+
+export { isValidID } from './utilities/isValidID.js'
+
+export { default as isolateObjectProperty } from './utilities/isolateObjectProperty.js'
+
 export { killTransaction } from './utilities/killTransaction.js'
+
+export { mapAsync } from './utilities/mapAsync.js'
+
+export { mergeListSearchAndWhere } from './utilities/mergeListSearchAndWhere.js'
+
+export { buildVersionCollectionFields } from './versions/buildCollectionFields.js'
+
+export { buildVersionGlobalFields } from './versions/buildGlobalFields.js'
+
+export { versionDefaults } from './versions/defaults.js'
+
+export { deleteCollectionVersions } from './versions/deleteCollectionVersions.js'
+
+export { enforceMaxVersions } from './versions/enforceMaxVersions.js'
+
+export { getLatestCollectionVersion } from './versions/getLatestCollectionVersion.js'
+
+export { getLatestGlobalVersion } from './versions/getLatestGlobalVersion.js'
+
+export { getDependencies }
+
+export { saveVersion } from './versions/saveVersion.js'
+
+export type { TypeWithVersion } from './versions/types.js'

packages/payload/src/preferences/types.ts

@@ -8,7 +8,7 @@ export type PreferenceRequest = {
   user: PayloadRequest['user']
 }
 
-export type PreferenceUpdateRequest = PreferenceRequest & { value: unknown }
+export type PreferenceUpdateRequest = { value: unknown } & PreferenceRequest
 
 export type CollapsedPreferences = string[]