payload 4.0.0-internal.2fddfc0 → 4.0.0-internal.31ba7ee

package/dist/config/defaults.js

@@ -1,168 +1,143 @@
 import { defaultAccess } from '../auth/defaultAccess.js';
 import { databaseKVAdapter } from '../kv/adapters/DatabaseKVAdapter.js';
-/**
- * @deprecated - remove in 4.0. This is error-prone, as mutating this object will affect any objects that use the defaults as a base.
- */ export const defaults = {
-    admin: {
-        avatar: 'gravatar',
-        components: {},
-        custom: {},
-        dateFormat: 'MMMM do yyyy, h:mm a',
-        dependencies: {},
-        importMap: {
-            baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`
-        },
-        meta: {
-            defaultOGImageType: 'dynamic',
-            robots: 'noindex, nofollow',
-            titleSuffix: '- Payload'
-        },
-        routes: {
-            account: '/account',
-            createFirstUser: '/create-first-user',
-            forgot: '/forgot',
-            inactivity: '/logout-inactivity',
-            login: '/login',
-            logout: '/logout',
-            reset: '/reset',
-            unauthorized: '/unauthorized'
-        },
-        theme: 'all'
-    },
-    auth: {
-        jwtOrder: [
-            'JWT',
-            'Bearer',
-            'cookie'
-        ]
-    },
-    bin: [],
-    collections: [],
-    cookiePrefix: 'payload',
-    cors: [],
-    csrf: [],
-    custom: {},
-    defaultDepth: 2,
-    defaultMaxTextLength: 40000,
-    endpoints: [],
-    globals: [],
-    graphQL: {
-        disablePlaygroundInProduction: true,
-        maxComplexity: 1000,
-        schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`
-    },
-    hooks: {},
-    i18n: {},
-    jobs: {
-        access: {
-            cancel: defaultAccess,
-            queue: defaultAccess,
-            run: defaultAccess
-        },
-        deleteJobOnComplete: true,
-        depth: 0
-    },
-    localization: false,
-    maxDepth: 10,
-    routes: {
-        admin: '/admin',
-        api: '/api',
-        graphQL: '/graphql',
-        graphQLPlayground: '/graphql-playground'
-    },
-    serverURL: '',
-    telemetry: true,
-    typescript: {
-        autoGenerate: true,
-        outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`
-    },
-    upload: {}
+const defaultCLICommands = {
+    build: 'payload/cli/builtin#createBuildCommand',
+    countDocuments: 'payload/cli/builtin#createCountDocumentsCommand',
+    countGlobalVersions: 'payload/cli/builtin#createCountGlobalVersionsCommand',
+    countVersions: 'payload/cli/builtin#createCountVersionsCommand',
+    createDocuments: 'payload/cli/builtin#createCreateDocumentsCommand',
+    deleteDocuments: 'payload/cli/builtin#createDeleteDocumentsCommand',
+    duplicateDocument: 'payload/cli/builtin#createDuplicateDocumentCommand',
+    findDistinct: 'payload/cli/builtin#createFindDistinctCommand',
+    findDocuments: 'payload/cli/builtin#createFindDocumentsCommand',
+    findGlobal: 'payload/cli/builtin#createFindGlobalCommand',
+    findGlobalVersionByID: 'payload/cli/builtin#createFindGlobalVersionByIDCommand',
+    findGlobalVersions: 'payload/cli/builtin#createFindGlobalVersionsCommand',
+    findVersionByID: 'payload/cli/builtin#createFindVersionByIDCommand',
+    findVersions: 'payload/cli/builtin#createFindVersionsCommand',
+    'generate:db-schema': 'payload/cli/builtin#createGenerateDBSchemaCommand',
+    'generate:importmap': 'payload/cli/builtin#createGenerateImportMapCommand',
+    'generate:types': 'payload/cli/builtin#createGenerateTypesCommand',
+    getCollectionSchema: 'payload/cli/builtin#createGetCollectionSchemaCommand',
+    getConfigInfo: 'payload/cli/builtin#createGetConfigInfoCommand',
+    getGlobalSchema: 'payload/cli/builtin#createGetGlobalSchemaCommand',
+    help: 'payload/cli/builtin#createHelpCommand',
+    info: 'payload/cli/builtin#createInfoCommand',
+    'jobs:handle-schedules': 'payload/cli/builtin#createJobsHandleSchedulesCommand',
+    'jobs:run': 'payload/cli/builtin#createJobsRunCommand',
+    migrate: 'payload/cli/builtin#createMigrateCommand',
+    'migrate:create': 'payload/cli/builtin#createMigrateCreateCommand',
+    'migrate:down': 'payload/cli/builtin#createMigrateDownCommand',
+    'migrate:fresh': 'payload/cli/builtin#createMigrateFreshCommand',
+    'migrate:refresh': 'payload/cli/builtin#createMigrateRefreshCommand',
+    'migrate:reset': 'payload/cli/builtin#createMigrateResetCommand',
+    'migrate:status': 'payload/cli/builtin#createMigrateStatusCommand',
+    restoreGlobalVersion: 'payload/cli/builtin#createRestoreGlobalVersionCommand',
+    restoreVersion: 'payload/cli/builtin#createRestoreVersionCommand',
+    run: 'payload/cli/builtin#createRunCommand',
+    updateDocument: 'payload/cli/builtin#createUpdateDocumentCommand',
+    updateGlobal: 'payload/cli/builtin#createUpdateGlobalCommand'
 };
 export const addDefaultsToConfig = (config)=>{
+    const admin = config.admin;
     config.admin = {
-        avatar: 'gravatar',
-        components: {},
-        custom: {},
-        dateFormat: 'MMMM do yyyy, h:mm a',
-        dependencies: {},
-        theme: 'all',
-        ...config.admin || {},
+        ...admin,
+        avatar: admin?.avatar ?? 'gravatar',
+        components: admin?.components ?? {},
+        custom: admin?.custom ?? {},
+        dateFormat: admin?.dateFormat ?? 'MMMM do yyyy, h:mm a',
+        dependencies: admin?.dependencies ?? {},
         importMap: {
-            baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`,
-            ...config?.admin?.importMap || {}
+            ...admin?.importMap,
+            baseDir: admin?.importMap?.baseDir ?? `${typeof process?.cwd === 'function' ? process.cwd() : ''}`
         },
         meta: {
-            defaultOGImageType: 'dynamic',
-            robots: 'noindex, nofollow',
-            titleSuffix: '- Payload',
-            ...config?.admin?.meta || {}
+            ...admin?.meta,
+            defaultOGImageType: admin?.meta?.defaultOGImageType ?? 'dynamic',
+            robots: admin?.meta?.robots === undefined ? 'noindex, nofollow' : admin.meta.robots,
+            titleSuffix: admin?.meta?.titleSuffix ?? '- Payload'
         },
         routes: {
-            account: '/account',
-            createFirstUser: '/create-first-user',
-            forgot: '/forgot',
-            inactivity: '/logout-inactivity',
-            login: '/login',
-            logout: '/logout',
-            reset: '/reset',
-            unauthorized: '/unauthorized',
-            ...config?.admin?.routes || {}
-        }
+            ...admin?.routes,
+            account: admin?.routes?.account ?? '/account',
+            createFirstUser: admin?.routes?.createFirstUser ?? '/create-first-user',
+            forgot: admin?.routes?.forgot ?? '/forgot',
+            inactivity: admin?.routes?.inactivity ?? '/logout-inactivity',
+            login: admin?.routes?.login ?? '/login',
+            logout: admin?.routes?.logout ?? '/logout',
+            reset: admin?.routes?.reset ?? '/reset',
+            unauthorized: admin?.routes?.unauthorized ?? '/unauthorized'
+        },
+        theme: admin?.theme ?? 'all'
     };
-    config.bin = config.bin ?? [];
+    if (config.cli !== false) {
+        config.cli = {
+            ...config.cli,
+            commands: {
+                ...defaultCLICommands,
+                ...config.cli?.commands
+            }
+        };
+    }
     config.collections = config.collections ?? [];
     config.cookiePrefix = config.cookiePrefix ?? 'payload';
     config.cors = config.cors ?? [];
     config.csrf = config.csrf ?? [];
     config.custom = config.custom ?? {};
-    config.defaultDepth = config.defaultDepth ?? 2;
+    config.defaultDepth = config.defaultDepth ?? 1;
     config.defaultMaxTextLength = config.defaultMaxTextLength ?? 40000;
     config.endpoints = config.endpoints ?? [];
     config.globals = config.globals ?? [];
+    const graphQL = config.graphQL;
     config.graphQL = {
-        disableIntrospectionInProduction: true,
-        disablePlaygroundInProduction: true,
-        maxComplexity: 1000,
-        schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`,
-        ...config.graphQL || {}
+        ...graphQL,
+        disableIntrospectionInProduction: graphQL?.disableIntrospectionInProduction ?? true,
+        disablePlaygroundInProduction: graphQL?.disablePlaygroundInProduction ?? true,
+        maxComplexity: graphQL?.maxComplexity ?? 1000,
+        schemaOutputFile: graphQL?.schemaOutputFile ?? `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`
     };
     config.hooks = config.hooks ?? {};
     config.i18n = config.i18n ?? {};
     config.jobs = {
         deleteJobOnComplete: true,
-        depth: 0,
         ...config.jobs || {},
         access: {
             cancel: defaultAccess,
             queue: defaultAccess,
             run: defaultAccess,
             ...config.jobs?.access || {}
+        },
+        processingLease: {
+            duration: config.jobs?.processingLease?.duration ?? 20 * 60 * 1000,
+            safetyBuffer: config.jobs?.processingLease?.safetyBuffer ?? 30 * 1000
         }
     };
     config.localization = config.localization ?? false;
     config.maxDepth = config.maxDepth ?? 10;
+    const routes = config.routes;
     config.routes = {
-        admin: '/admin',
-        api: '/api',
-        graphQL: '/graphql',
-        graphQLPlayground: '/graphql-playground',
-        ...config.routes || {}
+        ...routes,
+        admin: routes?.admin ?? '/admin',
+        api: routes?.api ?? '/api',
+        graphQL: routes?.graphQL ?? '/graphql',
+        graphQLPlayground: routes?.graphQLPlayground ?? '/graphql-playground'
     };
     config.serverURL = config.serverURL ?? '';
     config.telemetry = config.telemetry ?? true;
+    const typescript = config.typescript;
     config.typescript = {
-        autoGenerate: true,
-        outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,
-        ...config.typescript || {}
+        ...typescript,
+        autoGenerate: typescript?.autoGenerate ?? true,
+        outputFile: typescript?.outputFile ?? `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`
     };
     config.upload = config.upload ?? {};
     config.auth = {
-        jwtOrder: [
+        ...config.auth || {},
+        jwtOrder: config.auth?.jwtOrder ?? [
             'JWT',
             'Bearer',
             'cookie'
-        ],
-        ...config.auth || {}
+        ]
     };
     config.kv = config.kv ?? databaseKVAdapter();
     if (config.kv?.kvCollection) {

package/dist/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/defaults.ts"],"sourcesContent":["import type { JobsConfig } from '../queues/config/types/index.js'\nimport type { Config } from './types.js'\n\nimport { defaultAccess } from '../auth/defaultAccess.js'\nimport { databaseKVAdapter } from '../kv/adapters/DatabaseKVAdapter.js'\n\n/**\n * @deprecated - remove in 4.0. This is error-prone, as mutating this object will affect any objects that use the defaults as a base.\n */\nexport const defaults: Omit<Config, 'db' | 'editor' | 'secret'> = {\n  admin: {\n    avatar: 'gravatar',\n    components: {},\n    custom: {},\n    dateFormat: 'MMMM do yyyy, h:mm a',\n    dependencies: {},\n    importMap: {\n      baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`,\n    },\n    meta: {\n      defaultOGImageType: 'dynamic',\n      robots: 'noindex, nofollow',\n      titleSuffix: '- Payload',\n    },\n    routes: {\n      account: '/account',\n      createFirstUser: '/create-first-user',\n      forgot: '/forgot',\n      inactivity: '/logout-inactivity',\n      login: '/login',\n      logout: '/logout',\n      reset: '/reset',\n      unauthorized: '/unauthorized',\n    },\n    theme: 'all',\n  },\n  auth: {\n    jwtOrder: ['JWT', 'Bearer', 'cookie'],\n  },\n  bin: [],\n  collections: [],\n  cookiePrefix: 'payload',\n  cors: [],\n  csrf: [],\n  custom: {},\n  defaultDepth: 2,\n  defaultMaxTextLength: 40000,\n  endpoints: [],\n  globals: [],\n  graphQL: {\n    disablePlaygroundInProduction: true,\n    maxComplexity: 1000,\n    schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`,\n  },\n  hooks: {},\n  i18n: {},\n  jobs: {\n    access: {\n      cancel: defaultAccess,\n      queue: defaultAccess,\n      run: defaultAccess,\n    },\n    deleteJobOnComplete: true,\n    depth: 0,\n  } as JobsConfig,\n\n  localization: false,\n  maxDepth: 10,\n  routes: {\n    admin: '/admin',\n    api: '/api',\n    graphQL: '/graphql',\n    graphQLPlayground: '/graphql-playground',\n  },\n  serverURL: '',\n  telemetry: true,\n  typescript: {\n    autoGenerate: true,\n    outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,\n  },\n  upload: {},\n}\n\nexport const addDefaultsToConfig = (config: Config): Config => {\n  config.admin = {\n    avatar: 'gravatar',\n    components: {},\n    custom: {},\n    dateFormat: 'MMMM do yyyy, h:mm a',\n    dependencies: {},\n    theme: 'all',\n    ...(config.admin || {}),\n    importMap: {\n      baseDir: `${typeof process?.cwd === 'function' ? process.cwd() : ''}`,\n      ...(config?.admin?.importMap || {}),\n    },\n    meta: {\n      defaultOGImageType: 'dynamic',\n      robots: 'noindex, nofollow',\n      titleSuffix: '- Payload',\n      ...(config?.admin?.meta || {}),\n    },\n    routes: {\n      account: '/account',\n      createFirstUser: '/create-first-user',\n      forgot: '/forgot',\n      inactivity: '/logout-inactivity',\n      login: '/login',\n      logout: '/logout',\n      reset: '/reset',\n      unauthorized: '/unauthorized',\n      ...(config?.admin?.routes || {}),\n    },\n  }\n\n  config.bin = config.bin ?? []\n  config.collections = config.collections ?? []\n  config.cookiePrefix = config.cookiePrefix ?? 'payload'\n  config.cors = config.cors ?? []\n  config.csrf = config.csrf ?? []\n  config.custom = config.custom ?? {}\n  config.defaultDepth = config.defaultDepth ?? 2\n  config.defaultMaxTextLength = config.defaultMaxTextLength ?? 40000\n  config.endpoints = config.endpoints ?? []\n  config.globals = config.globals ?? []\n  config.graphQL = {\n    disableIntrospectionInProduction: true,\n    disablePlaygroundInProduction: true,\n    maxComplexity: 1000,\n    schemaOutputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`,\n    ...(config.graphQL || {}),\n  }\n  config.hooks = config.hooks ?? {}\n  config.i18n = config.i18n ?? {}\n  config.jobs = {\n    deleteJobOnComplete: true,\n    depth: 0,\n    ...(config.jobs || {}),\n    access: {\n      cancel: defaultAccess,\n      queue: defaultAccess,\n      run: defaultAccess,\n      ...(config.jobs?.access || {}),\n    },\n  } as JobsConfig\n  config.localization = config.localization ?? false\n  config.maxDepth = config.maxDepth ?? 10\n  config.routes = {\n    admin: '/admin',\n    api: '/api',\n    graphQL: '/graphql',\n    graphQLPlayground: '/graphql-playground',\n    ...(config.routes || {}),\n  }\n  config.serverURL = config.serverURL ?? ''\n  config.telemetry = config.telemetry ?? true\n  config.typescript = {\n    autoGenerate: true,\n    outputFile: `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,\n    ...(config.typescript || {}),\n  }\n  config.upload = config.upload ?? {}\n\n  config.auth = {\n    jwtOrder: ['JWT', 'Bearer', 'cookie'],\n    ...(config.auth || {}),\n  }\n\n  config.kv = config.kv ?? databaseKVAdapter()\n\n  if (config.kv?.kvCollection) {\n    config.collections.push(config.kv.kvCollection)\n  }\n\n  return config\n}\n"],"names":["defaultAccess","databaseKVAdapter","defaults","admin","avatar","components","custom","dateFormat","dependencies","importMap","baseDir","process","cwd","meta","defaultOGImageType","robots","titleSuffix","routes","account","createFirstUser","forgot","inactivity","login","logout","reset","unauthorized","theme","auth","jwtOrder","bin","collections","cookiePrefix","cors","csrf","defaultDepth","defaultMaxTextLength","endpoints","globals","graphQL","disablePlaygroundInProduction","maxComplexity","schemaOutputFile","hooks","i18n","jobs","access","cancel","queue","run","deleteJobOnComplete","depth","localization","maxDepth","api","graphQLPlayground","serverURL","telemetry","typescript","autoGenerate","outputFile","upload","addDefaultsToConfig","config","disableIntrospectionInProduction","kv","kvCollection","push"],"mappings":"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"}
+{"version":3,"sources":["../../src/config/defaults.ts"],"sourcesContent":["import type { CLICommands, Config } from './types.js'\n\nimport { defaultAccess } from '../auth/defaultAccess.js'\nimport { databaseKVAdapter } from '../kv/adapters/DatabaseKVAdapter.js'\n\nconst defaultCLICommands: CLICommands = {\n  build: 'payload/cli/builtin#createBuildCommand',\n  countDocuments: 'payload/cli/builtin#createCountDocumentsCommand',\n  countGlobalVersions: 'payload/cli/builtin#createCountGlobalVersionsCommand',\n  countVersions: 'payload/cli/builtin#createCountVersionsCommand',\n  createDocuments: 'payload/cli/builtin#createCreateDocumentsCommand',\n  deleteDocuments: 'payload/cli/builtin#createDeleteDocumentsCommand',\n  duplicateDocument: 'payload/cli/builtin#createDuplicateDocumentCommand',\n  findDistinct: 'payload/cli/builtin#createFindDistinctCommand',\n  findDocuments: 'payload/cli/builtin#createFindDocumentsCommand',\n  findGlobal: 'payload/cli/builtin#createFindGlobalCommand',\n  findGlobalVersionByID: 'payload/cli/builtin#createFindGlobalVersionByIDCommand',\n  findGlobalVersions: 'payload/cli/builtin#createFindGlobalVersionsCommand',\n  findVersionByID: 'payload/cli/builtin#createFindVersionByIDCommand',\n  findVersions: 'payload/cli/builtin#createFindVersionsCommand',\n  'generate:db-schema': 'payload/cli/builtin#createGenerateDBSchemaCommand',\n  'generate:importmap': 'payload/cli/builtin#createGenerateImportMapCommand',\n  'generate:types': 'payload/cli/builtin#createGenerateTypesCommand',\n  getCollectionSchema: 'payload/cli/builtin#createGetCollectionSchemaCommand',\n  getConfigInfo: 'payload/cli/builtin#createGetConfigInfoCommand',\n  getGlobalSchema: 'payload/cli/builtin#createGetGlobalSchemaCommand',\n  help: 'payload/cli/builtin#createHelpCommand',\n  info: 'payload/cli/builtin#createInfoCommand',\n  'jobs:handle-schedules': 'payload/cli/builtin#createJobsHandleSchedulesCommand',\n  'jobs:run': 'payload/cli/builtin#createJobsRunCommand',\n  migrate: 'payload/cli/builtin#createMigrateCommand',\n  'migrate:create': 'payload/cli/builtin#createMigrateCreateCommand',\n  'migrate:down': 'payload/cli/builtin#createMigrateDownCommand',\n  'migrate:fresh': 'payload/cli/builtin#createMigrateFreshCommand',\n  'migrate:refresh': 'payload/cli/builtin#createMigrateRefreshCommand',\n  'migrate:reset': 'payload/cli/builtin#createMigrateResetCommand',\n  'migrate:status': 'payload/cli/builtin#createMigrateStatusCommand',\n  restoreGlobalVersion: 'payload/cli/builtin#createRestoreGlobalVersionCommand',\n  restoreVersion: 'payload/cli/builtin#createRestoreVersionCommand',\n  run: 'payload/cli/builtin#createRunCommand',\n  updateDocument: 'payload/cli/builtin#createUpdateDocumentCommand',\n  updateGlobal: 'payload/cli/builtin#createUpdateGlobalCommand',\n}\n\nexport const addDefaultsToConfig = (config: Config): Config => {\n  const admin = config.admin\n\n  config.admin = {\n    ...admin,\n    avatar: admin?.avatar ?? 'gravatar',\n    components: admin?.components ?? {},\n    custom: admin?.custom ?? {},\n    dateFormat: admin?.dateFormat ?? 'MMMM do yyyy, h:mm a',\n    dependencies: admin?.dependencies ?? {},\n    importMap: {\n      ...admin?.importMap,\n      baseDir:\n        admin?.importMap?.baseDir ?? `${typeof process?.cwd === 'function' ? process.cwd() : ''}`,\n    },\n    meta: {\n      ...admin?.meta,\n      defaultOGImageType: admin?.meta?.defaultOGImageType ?? 'dynamic',\n      robots: admin?.meta?.robots === undefined ? 'noindex, nofollow' : admin.meta.robots,\n      titleSuffix: admin?.meta?.titleSuffix ?? '- Payload',\n    },\n    routes: {\n      ...admin?.routes,\n      account: admin?.routes?.account ?? '/account',\n      createFirstUser: admin?.routes?.createFirstUser ?? '/create-first-user',\n      forgot: admin?.routes?.forgot ?? '/forgot',\n      inactivity: admin?.routes?.inactivity ?? '/logout-inactivity',\n      login: admin?.routes?.login ?? '/login',\n      logout: admin?.routes?.logout ?? '/logout',\n      reset: admin?.routes?.reset ?? '/reset',\n      unauthorized: admin?.routes?.unauthorized ?? '/unauthorized',\n    },\n    theme: admin?.theme ?? 'all',\n  }\n\n  if (config.cli !== false) {\n    config.cli = {\n      ...config.cli,\n      commands: {\n        ...defaultCLICommands,\n        ...config.cli?.commands,\n      },\n    }\n  }\n  config.collections = config.collections ?? []\n  config.cookiePrefix = config.cookiePrefix ?? 'payload'\n  config.cors = config.cors ?? []\n  config.csrf = config.csrf ?? []\n  config.custom = config.custom ?? {}\n  config.defaultDepth = config.defaultDepth ?? 1\n  config.defaultMaxTextLength = config.defaultMaxTextLength ?? 40000\n  config.endpoints = config.endpoints ?? []\n  config.globals = config.globals ?? []\n  const graphQL = config.graphQL\n\n  config.graphQL = {\n    ...graphQL,\n    disableIntrospectionInProduction: graphQL?.disableIntrospectionInProduction ?? true,\n    disablePlaygroundInProduction: graphQL?.disablePlaygroundInProduction ?? true,\n    maxComplexity: graphQL?.maxComplexity ?? 1000,\n    schemaOutputFile:\n      graphQL?.schemaOutputFile ??\n      `${typeof process?.cwd === 'function' ? process.cwd() : ''}/schema.graphql`,\n  }\n  config.hooks = config.hooks ?? {}\n  config.i18n = config.i18n ?? {}\n  config.jobs = {\n    deleteJobOnComplete: true,\n    ...(config.jobs || {}),\n    access: {\n      cancel: defaultAccess,\n      queue: defaultAccess,\n      run: defaultAccess,\n      ...(config.jobs?.access || {}),\n    },\n    processingLease: {\n      duration: config.jobs?.processingLease?.duration ?? 20 * 60 * 1000,\n      safetyBuffer: config.jobs?.processingLease?.safetyBuffer ?? 30 * 1000,\n    },\n  }\n  config.localization = config.localization ?? false\n  config.maxDepth = config.maxDepth ?? 10\n  const routes = config.routes\n\n  config.routes = {\n    ...routes,\n    admin: routes?.admin ?? '/admin',\n    api: routes?.api ?? '/api',\n    graphQL: routes?.graphQL ?? '/graphql',\n    graphQLPlayground: routes?.graphQLPlayground ?? '/graphql-playground',\n  }\n  config.serverURL = config.serverURL ?? ''\n  config.telemetry = config.telemetry ?? true\n  const typescript = config.typescript\n\n  config.typescript = {\n    ...typescript,\n    autoGenerate: typescript?.autoGenerate ?? true,\n    outputFile:\n      typescript?.outputFile ??\n      `${typeof process?.cwd === 'function' ? process.cwd() : ''}/payload-types.ts`,\n  }\n  config.upload = config.upload ?? {}\n\n  config.auth = {\n    ...(config.auth || {}),\n    jwtOrder: config.auth?.jwtOrder ?? ['JWT', 'Bearer', 'cookie'],\n  }\n\n  config.kv = config.kv ?? databaseKVAdapter()\n\n  if (config.kv?.kvCollection) {\n    config.collections.push(config.kv.kvCollection)\n  }\n\n  return config\n}\n"],"names":["defaultAccess","databaseKVAdapter","defaultCLICommands","build","countDocuments","countGlobalVersions","countVersions","createDocuments","deleteDocuments","duplicateDocument","findDistinct","findDocuments","findGlobal","findGlobalVersionByID","findGlobalVersions","findVersionByID","findVersions","getCollectionSchema","getConfigInfo","getGlobalSchema","help","info","migrate","restoreGlobalVersion","restoreVersion","run","updateDocument","updateGlobal","addDefaultsToConfig","config","admin","avatar","components","custom","dateFormat","dependencies","importMap","baseDir","process","cwd","meta","defaultOGImageType","robots","undefined","titleSuffix","routes","account","createFirstUser","forgot","inactivity","login","logout","reset","unauthorized","theme","cli","commands","collections","cookiePrefix","cors","csrf","defaultDepth","defaultMaxTextLength","endpoints","globals","graphQL","disableIntrospectionInProduction","disablePlaygroundInProduction","maxComplexity","schemaOutputFile","hooks","i18n","jobs","deleteJobOnComplete","access","cancel","queue","processingLease","duration","safetyBuffer","localization","maxDepth","api","graphQLPlayground","serverURL","telemetry","typescript","autoGenerate","outputFile","upload","auth","jwtOrder","kv","kvCollection","push"],"mappings":"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"}

package/dist/config/definePlugin.d.ts

@@ -3,17 +3,16 @@ import type { Config, Plugin, PluginsMap } from './types.js';
  * Helper for authoring plugins with order, slug, and typed options.
  * Eliminates boilerplate and ensures metadata is always set consistently.
  *
- * The `plugin` function receives a single object containing `config`, `plugins`
- * (a slug-keyed map of other plugins), and any user-provided options spread in.
+ * The `plugin` function receives `config`, `plugins` (a slug-keyed map of other
+ * plugins), and the user-provided `options`.
  *
  * @experimental
  *
  * @example
  * // With options:
- * export const seoPlugin = definePlugin<SEOPluginOptions>({
+ * export const seoPlugin = definePlugin<SEOPluginConfig>({
  *   slug: 'plugin-seo',
- *   order: 10,
- *   plugin: ({ config, plugins, collections }) => ({ ...config }),
+ *   plugin: ({ config, options }) => ({ ...config }),
  * })
  *
  * // Without options:
@@ -28,14 +27,15 @@ export declare function definePlugin(descriptor: {
         config: Config;
         plugins: PluginsMap;
     }) => Config | Promise<Config>;
-    slug?: string;
+    slug: string;
 }): () => Plugin;
-export declare function definePlugin<TOptions extends Record<string, unknown>>(descriptor: {
+export declare function definePlugin<TOptions>(descriptor: {
     order?: number;
     plugin: (args: {
         config: Config;
+        options: TOptions;
         plugins: PluginsMap;
-    } & TOptions) => Config | Promise<Config>;
-    slug?: string;
-}): (options: TOptions) => Plugin;
+    }) => Config | Promise<Config>;
+    slug: string;
+}): undefined extends TOptions ? (options?: TOptions) => Plugin : (options: TOptions) => Plugin;
 //# sourceMappingURL=definePlugin.d.ts.map

package/dist/config/definePlugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"definePlugin.d.ts","sourceRoot":"","sources":["../../src/config/definePlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAc5D;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACnF,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,GAAG,MAAM,MAAM,CAAA;AAChB,wBAAgB,YAAY,CAAC,QAAQ,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,UAAU,EAAE;IACjF,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,GAAG,QAAQ,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9F,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,GAAG,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAA"}
+{"version":3,"file":"definePlugin.d.ts","sourceRoot":"","sources":["../../src/config/definePlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAc5D;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,YAAY,CAAC,UAAU,EAAE;IACvC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,IAAI,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,UAAU,CAAA;KAAE,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IACnF,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,MAAM,MAAM,CAAA;AAChB,wBAAgB,YAAY,CAAC,QAAQ,EAAE,UAAU,EAAE;IACjD,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,CAAC,IAAI,EAAE;QACb,MAAM,EAAE,MAAM,CAAA;QACd,OAAO,EAAE,QAAQ,CAAA;QACjB,OAAO,EAAE,UAAU,CAAA;KACpB,KAAK,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAA;IAC9B,IAAI,EAAE,MAAM,CAAA;CACb,GAAG,SAAS,SAAS,QAAQ,GAAG,CAAC,OAAO,CAAC,EAAE,QAAQ,KAAK,MAAM,GAAG,CAAC,OAAO,EAAE,QAAQ,KAAK,MAAM,CAAA"}

package/dist/config/definePlugin.js

@@ -11,19 +11,15 @@ function buildPluginsMap(plugins) {
 }
 export function definePlugin(descriptor) {
     return (options)=>{
-        const pluginFn = (config)=>{
-            const plugins = buildPluginsMap(config.plugins);
-            const args = {
-                ...options,
+        const pluginFn = (config)=>descriptor.plugin({
                 config,
-                plugins
-            };
-            return descriptor.plugin(args);
-        };
-        pluginFn.options = options;
-        if (descriptor.slug !== undefined) {
-            pluginFn.slug = descriptor.slug;
+                options: options,
+                plugins: buildPluginsMap(config.plugins)
+            });
+        if (options !== undefined) {
+            pluginFn.options = options;
         }
+        pluginFn.slug = descriptor.slug;
         if (descriptor.order !== undefined) {
             pluginFn.order = descriptor.order;
         }

package/dist/config/definePlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/definePlugin.ts"],"sourcesContent":["import type { Config, Plugin, PluginsMap } from './types.js'\n\nfunction buildPluginsMap(plugins: Plugin[] | undefined): PluginsMap {\n  const map: Record<string, Plugin | undefined> = {}\n  if (plugins) {\n    for (const p of plugins) {\n      if (p.slug) {\n        map[p.slug] = p\n      }\n    }\n  }\n  return map as PluginsMap\n}\n\n/**\n * Helper for authoring plugins with order, slug, and typed options.\n * Eliminates boilerplate and ensures metadata is always set consistently.\n *\n * The `plugin` function receives a single object containing `config`, `plugins`\n * (a slug-keyed map of other plugins), and any user-provided options spread in.\n *\n * @experimental\n *\n * @example\n * // With options:\n * export const seoPlugin = definePlugin<SEOPluginOptions>({\n *   slug: 'plugin-seo',\n *   order: 10,\n *   plugin: ({ config, plugins, collections }) => ({ ...config }),\n * })\n *\n * // Without options:\n * export const myPlugin = definePlugin({\n *   slug: 'my-plugin',\n *   plugin: ({ config }) => ({ ...config }),\n * })\n */\nexport function definePlugin(descriptor: {\n  order?: number\n  plugin: (args: { config: Config; plugins: PluginsMap }) => Config | Promise<Config>\n  slug?: string\n}): () => Plugin\nexport function definePlugin<TOptions extends Record<string, unknown>>(descriptor: {\n  order?: number\n  plugin: (args: { config: Config; plugins: PluginsMap } & TOptions) => Config | Promise<Config>\n  slug?: string\n}): (options: TOptions) => Plugin\nexport function definePlugin<TOptions extends Record<string, unknown>>(descriptor: {\n  order?: number\n  plugin: (args: { config: Config; plugins: PluginsMap } & TOptions) => Config | Promise<Config>\n  slug?: string\n}): (options?: TOptions) => Plugin {\n  return (options?: TOptions): Plugin => {\n    const pluginFn: Plugin = (config) => {\n      const plugins = buildPluginsMap(config.plugins)\n\n      const args = {\n        ...options,\n        config,\n        plugins,\n      } as { config: Config; plugins: PluginsMap } & TOptions\n\n      return descriptor.plugin(args)\n    }\n\n    pluginFn.options = options as Record<string, unknown>\n\n    if (descriptor.slug !== undefined) {\n      pluginFn.slug = descriptor.slug\n    }\n    if (descriptor.order !== undefined) {\n      pluginFn.order = descriptor.order\n    }\n\n    return pluginFn\n  }\n}\n"],"names":["buildPluginsMap","plugins","map","p","slug","definePlugin","descriptor","options","pluginFn","config","args","plugin","undefined","order"],"mappings":"AAEA,SAASA,gBAAgBC,OAA6B;IACpD,MAAMC,MAA0C,CAAC;IACjD,IAAID,SAAS;QACX,KAAK,MAAME,KAAKF,QAAS;YACvB,IAAIE,EAAEC,IAAI,EAAE;gBACVF,GAAG,CAACC,EAAEC,IAAI,CAAC,GAAGD;YAChB;QACF;IACF;IACA,OAAOD;AACT;AAmCA,OAAO,SAASG,aAAuDC,UAItE;IACC,OAAO,CAACC;QACN,MAAMC,WAAmB,CAACC;YACxB,MAAMR,UAAUD,gBAAgBS,OAAOR,OAAO;YAE9C,MAAMS,OAAO;gBACX,GAAGH,OAAO;gBACVE;gBACAR;YACF;YAEA,OAAOK,WAAWK,MAAM,CAACD;QAC3B;QAEAF,SAASD,OAAO,GAAGA;QAEnB,IAAID,WAAWF,IAAI,KAAKQ,WAAW;YACjCJ,SAASJ,IAAI,GAAGE,WAAWF,IAAI;QACjC;QACA,IAAIE,WAAWO,KAAK,KAAKD,WAAW;YAClCJ,SAASK,KAAK,GAAGP,WAAWO,KAAK;QACnC;QAEA,OAAOL;IACT;AACF"}
+{"version":3,"sources":["../../src/config/definePlugin.ts"],"sourcesContent":["import type { Config, Plugin, PluginsMap } from './types.js'\n\nfunction buildPluginsMap(plugins: Plugin[] | undefined): PluginsMap {\n  const map: Record<string, Plugin | undefined> = {}\n  if (plugins) {\n    for (const p of plugins) {\n      if (p.slug) {\n        map[p.slug] = p\n      }\n    }\n  }\n  return map as PluginsMap\n}\n\n/**\n * Helper for authoring plugins with order, slug, and typed options.\n * Eliminates boilerplate and ensures metadata is always set consistently.\n *\n * The `plugin` function receives `config`, `plugins` (a slug-keyed map of other\n * plugins), and the user-provided `options`.\n *\n * @experimental\n *\n * @example\n * // With options:\n * export const seoPlugin = definePlugin<SEOPluginConfig>({\n *   slug: 'plugin-seo',\n *   plugin: ({ config, options }) => ({ ...config }),\n * })\n *\n * // Without options:\n * export const myPlugin = definePlugin({\n *   slug: 'my-plugin',\n *   plugin: ({ config }) => ({ ...config }),\n * })\n */\nexport function definePlugin(descriptor: {\n  order?: number\n  plugin: (args: { config: Config; plugins: PluginsMap }) => Config | Promise<Config>\n  slug: string\n}): () => Plugin\nexport function definePlugin<TOptions>(descriptor: {\n  order?: number\n  plugin: (args: {\n    config: Config\n    options: TOptions\n    plugins: PluginsMap\n  }) => Config | Promise<Config>\n  slug: string\n}): undefined extends TOptions ? (options?: TOptions) => Plugin : (options: TOptions) => Plugin\nexport function definePlugin<TOptions>(descriptor: {\n  order?: number\n  plugin: (args: {\n    config: Config\n    options: TOptions\n    plugins: PluginsMap\n  }) => Config | Promise<Config>\n  slug: string\n}): (options: TOptions) => Plugin {\n  return (options?: TOptions): Plugin => {\n    const pluginFn: Plugin = (config) =>\n      descriptor.plugin({\n        config,\n        options: options as TOptions,\n        plugins: buildPluginsMap(config.plugins),\n      })\n\n    if (options !== undefined) {\n      pluginFn.options = options as Record<string, unknown>\n    }\n    pluginFn.slug = descriptor.slug\n    if (descriptor.order !== undefined) {\n      pluginFn.order = descriptor.order\n    }\n\n    return pluginFn\n  }\n}\n"],"names":["buildPluginsMap","plugins","map","p","slug","definePlugin","descriptor","options","pluginFn","config","plugin","undefined","order"],"mappings":"AAEA,SAASA,gBAAgBC,OAA6B;IACpD,MAAMC,MAA0C,CAAC;IACjD,IAAID,SAAS;QACX,KAAK,MAAME,KAAKF,QAAS;YACvB,IAAIE,EAAEC,IAAI,EAAE;gBACVF,GAAG,CAACC,EAAEC,IAAI,CAAC,GAAGD;YAChB;QACF;IACF;IACA,OAAOD;AACT;AAsCA,OAAO,SAASG,aAAuBC,UAQtC;IACC,OAAO,CAACC;QACN,MAAMC,WAAmB,CAACC,SACxBH,WAAWI,MAAM,CAAC;gBAChBD;gBACAF,SAASA;gBACTN,SAASD,gBAAgBS,OAAOR,OAAO;YACzC;QAEF,IAAIM,YAAYI,WAAW;YACzBH,SAASD,OAAO,GAAGA;QACrB;QACAC,SAASJ,IAAI,GAAGE,WAAWF,IAAI;QAC/B,IAAIE,WAAWM,KAAK,KAAKD,WAAW;YAClCH,SAASI,KAAK,GAAGN,WAAWM,KAAK;QACnC;QAEA,OAAOJ;IACT;AACF"}

package/dist/config/orderable/fractional-indexing.d.ts

@@ -1,25 +1,3 @@
-/**
- * @param {string | null | undefined} a
- * @param {string | null | undefined} b
- * @param {string=} digits
- * @return {string}
- */
-export function generateKeyBetween(a: string | null | undefined, b: string | null | undefined, digits?: string | undefined): string;
-/**
- * same preconditions as generateKeysBetween.
- * n >= 0.
- * Returns an array of n distinct keys in sorted order.
- * If a and b are both null, returns [a0, a1, ...]
- * If one or the other is null, returns consecutive "integer"
- * keys.  Otherwise, returns relatively short keys between
- * a and b.
- * @param {string | null | undefined} a
- * @param {string | null | undefined} b
- * @param {number} n
- * @param {string} digits
- * @return {string[]}
- */
-export function generateNKeysBetween(a: string | null | undefined, b: string | null | undefined, n: number, digits?: string): string[];
 /**
  * THIS FILE IS BASED ON:
  * https://github.com/rocicorp/fractional-indexing/blob/main/src/index.js
@@ -48,5 +26,27 @@ export function generateNKeysBetween(a: string | null | undefined, b: string | n
  *   parsed for backward compatibility, but they may sort incorrectly in
  *   case-insensitive databases. Consider running a migration to convert them.
  */
-export const BASE_36_DIGITS: "0123456789abcdefghijklmnopqrstuvwxyz";
+export declare const BASE_36_DIGITS = "0123456789abcdefghijklmnopqrstuvwxyz";
+/**
+ * @param {string | null | undefined} a
+ * @param {string | null | undefined} b
+ * @param {string=} digits
+ * @return {string}
+ */
+export declare function generateKeyBetween(a: string | null | undefined, b: string | null | undefined, digits?: string | undefined): string;
+/**
+ * same preconditions as generateKeysBetween.
+ * n >= 0.
+ * Returns an array of n distinct keys in sorted order.
+ * If a and b are both null, returns [a0, a1, ...]
+ * If one or the other is null, returns consecutive "integer"
+ * keys.  Otherwise, returns relatively short keys between
+ * a and b.
+ * @param {string | null | undefined} a
+ * @param {string | null | undefined} b
+ * @param {number} n
+ * @param {string} digits
+ * @return {string[]}
+ */
+export declare function generateNKeysBetween(a: string | null | undefined, b: string | null | undefined, n: number, digits?: string): string[];
 //# sourceMappingURL=fractional-indexing.d.ts.map

package/dist/config/orderable/fractional-indexing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fractional-indexing.d.ts","sourceRoot":"","sources":["../../../src/config/orderable/fractional-indexing.js"],"names":[],"mappings":"AAqRA;;;;;GAKG;AACH,sCALW,MAAM,GAAG,IAAI,GAAG,SAAS,KACzB,MAAM,GAAG,IAAI,GAAG,SAAS,WACzB,MAAM,YAAC,GACN,MAAM,CA0DjB;AAED;;;;;;;;;;;;;GAaG;AACH,wCANW,MAAM,GAAG,IAAI,GAAG,SAAS,KACzB,MAAM,GAAG,IAAI,GAAG,SAAS,KACzB,MAAM,WACN,MAAM,GACL,MAAM,EAAE,CAmCnB;AAlYD;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAMH,6BAA8B,sCAAsC,CAAA"}
+{"version":3,"file":"fractional-indexing.d.ts","sourceRoot":"","sources":["../../../src/config/orderable/fractional-indexing.js"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAMH,eAAO,MAAM,cAAc,yCAAyC,CAAA;AAkPpE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EALzB,MAAM,GAAG,IAAI,GAAG,SAKS,EAAE,CAAC,EAJ5B,MAAM,GAAG,IAAI,GAAG,SAIY,EAAE,MAAM,AAH5C,CACA,EADQ,MAAM,YAG+C,GAFpD,MAAM,CA0DjB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAN3B,MAAM,GAAG,IAAI,GAAG,SAMW,EAAE,CAAC,EAL9B,MAAM,GAAG,IAAI,GAAG,SAKc,EAAE,CAAC,EAJjC,MAIiC,EAAE,MAAM,GAHzC,MAG0D,GAFzD,MAAM,EAAE,CAmCnB"}

package/dist/config/orderable/index.d.ts

@@ -1,7 +1,7 @@
 import type { CollectionConfig } from '../../collections/config/types.js';
 import type { Config } from '../../config/types.js';
 import type { SanitizedConfig } from '../types.js';
-export declare const addOrderableFieldsAndHook: (collection: CollectionConfig, config: Config, orderableFieldNames: string[], joinFieldPathsByCollection?: Map<string, Map<string, string>>) => Promise<void>;
+export declare const addOrderableFieldsAndHook: (collection: CollectionConfig, config: Config, orderableFieldNames: string[], joinFieldPathsByCollection?: Map<string, Map<string, string>>) => void;
 /**
  * The body of the reorder endpoint.
  * @internal

package/dist/config/orderable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/config/orderable/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,KAAK,EAA4B,eAAe,EAAE,MAAM,aAAa,CAAA;AAgB5E,eAAO,MAAM,yBAAyB,GACpC,YAAY,gBAAgB,EAC5B,QAAQ,MAAM,EACd,qBAAqB,MAAM,EAAE,EAC7B,6BAA6B,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,kBAuF9D,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,EAAE,SAAS,GAAG,MAAM,CAAA;IAChC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAA;QACV,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;CACF,CAAA;AAED,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,eAAe,EACvB,4BAA4B,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,SAiN7D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/config/orderable/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,mCAAmC,CAAA;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAEnD,OAAO,KAAK,EAA4B,eAAe,EAAE,MAAM,aAAa,CAAA;AAkB5E,eAAO,MAAM,yBAAyB,eACxB,gBAAgB,UACpB,MAAM,uBACO,MAAM,EAAE,+BACA,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC5D,IAuFF,CAAA;AAED;;;GAGG;AACH,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE,MAAM,CAAA;IACtB,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,EAAE,SAAS,GAAG,MAAM,CAAA;IAChC,kBAAkB,EAAE,MAAM,CAAA;IAC1B,MAAM,EAAE;QACN,EAAE,EAAE,MAAM,CAAA;QACV,GAAG,EAAE,MAAM,CAAA;KACZ,CAAA;CACF,CAAA;AAED,eAAO,MAAM,oBAAoB,WACvB,eAAe,8BACK,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,SAsQ7D,CAAA"}