payload 4.0.0-internal.cd69eef → 4.0.0-internal.ce66a41

package/dist/collections/config/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/collections/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\n\nimport type { StaticDescription } from '../../admin/types.js'\nimport type { ImportMap } from '../../bin/generateImportMap/index.js'\nimport type {\n  LivePreviewConfig,\n  ServerOnlyLivePreviewProperties,\n  StaticLabel,\n} from '../../config/types.js'\nimport type { ClientField } from '../../fields/config/client.js'\nimport type { ClientHierarchyConfig } from '../../hierarchy/types.js'\nimport type { Payload } from '../../types/index.js'\nimport type { SanitizedUploadConfig } from '../../uploads/types.js'\nimport type { SanitizedCollectionConfig } from './types.js'\n\nimport { createClientFields } from '../../fields/config/client.js'\n\nexport type ServerOnlyCollectionProperties = keyof Pick<\n  SanitizedCollectionConfig,\n  | 'access'\n  | 'custom'\n  | 'endpoints'\n  | 'flattenedFields'\n  | 'hooks'\n  | 'indexes'\n  | 'joins'\n  | 'polymorphicJoins'\n  | 'sanitizedIndexes'\n  | 'select'\n>\n\nexport type ServerOnlyCollectionAdminProperties = keyof Pick<\n  SanitizedCollectionConfig['admin'],\n  'baseFilter' | 'baseListFilter' | 'components' | 'formatDocURL' | 'hidden'\n>\n\nexport type ServerOnlyUploadProperties = keyof Pick<\n  SanitizedCollectionConfig['upload'],\n  | 'admin'\n  | 'adminThumbnail'\n  | 'externalFileHeaderFilter'\n  | 'handlers'\n  | 'modifyResponseHeaders'\n  | 'uploadInstructions'\n  | 'withMetadata'\n>\n\ntype ClientUploadConfig = {\n  /** Whether this collection provides separate upload instructions. */\n  uploadInstructions?: true\n} & Omit<SanitizedUploadConfig, 'uploadInstructions'>\n\nexport type ClientCollectionConfig = {\n  admin: {\n    description?: StaticDescription\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n    preview?: boolean\n  } & Omit<\n    SanitizedCollectionConfig['admin'],\n    | 'components'\n    | 'description'\n    | 'formatDocURL'\n    | 'joins'\n    | 'livePreview'\n    | 'preview'\n    | ServerOnlyCollectionAdminProperties\n  >\n  auth?: { verify?: true } & Omit<\n    SanitizedCollectionConfig['auth'],\n    'forgotPassword' | 'strategies' | 'verify'\n  >\n  fields: ClientField[]\n  hierarchy?: ClientHierarchyConfig | false\n  labels: {\n    plural: StaticLabel\n    singular: StaticLabel\n  }\n  upload: ClientUploadConfig\n} & Omit<\n  SanitizedCollectionConfig,\n  'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | 'upload' | ServerOnlyCollectionProperties\n>\n\nconst serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [\n  'hooks',\n  'access',\n  'endpoints',\n  'custom',\n  'joins',\n  'polymorphicJoins',\n  'flattenedFields',\n  'indexes',\n  'sanitizedIndexes',\n  'select',\n  // `upload`\n  // `admin`\n  // are all handled separately\n]\n\nconst serverOnlyUploadProperties: Partial<ServerOnlyUploadProperties>[] = [\n  'admin',\n  'adminThumbnail',\n  'externalFileHeaderFilter',\n  'handlers',\n  'modifyResponseHeaders',\n  'uploadInstructions',\n  'withMetadata',\n]\n\nconst serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [\n  'hidden',\n  'baseFilter',\n  'baseListFilter',\n  'components',\n  'formatDocURL',\n  // 'preview' is handled separately\n  // `livePreview` is handled separately\n]\n\nexport const createClientCollectionConfig = ({\n  collection,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collection: SanitizedCollectionConfig\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig => {\n  const clientCollection = {} as Partial<ClientCollectionConfig>\n\n  for (const key in collection) {\n    if (serverOnlyCollectionProperties.includes(key as any)) {\n      continue\n    }\n    switch (key) {\n      case 'admin':\n        if (!collection.admin) {\n          break\n        }\n\n        clientCollection.admin = {} as ClientCollectionConfig['admin']\n\n        for (const adminKey in collection.admin) {\n          if (serverOnlyCollectionAdminProperties.includes(adminKey as any)) {\n            continue\n          }\n\n          switch (adminKey) {\n            case 'description':\n              if (\n                typeof collection.admin.description === 'string' ||\n                typeof collection.admin.description === 'object'\n              ) {\n                if (collection.admin.description) {\n                  clientCollection.admin.description = collection.admin.description\n                }\n              } else if (typeof collection.admin.description === 'function') {\n                const description = collection.admin.description({ t: i18n.t as TFunction })\n\n                if (description) {\n                  clientCollection.admin.description = description\n                }\n              }\n              break\n\n            case 'livePreview':\n              clientCollection.admin.livePreview = {}\n\n              if (collection.admin.livePreview?.breakpoints) {\n                clientCollection.admin.livePreview.breakpoints =\n                  collection.admin.livePreview.breakpoints\n              }\n\n              break\n\n            case 'preview':\n              if (collection.admin.preview) {\n                clientCollection.admin.preview = true\n              }\n\n              break\n\n            default:\n              ;(clientCollection as any).admin[adminKey] =\n                collection.admin[adminKey as keyof SanitizedCollectionConfig['admin']]\n          }\n        }\n\n        break\n\n      case 'auth':\n        if (!collection.auth) {\n          break\n        }\n\n        clientCollection.auth = {} as { verify?: true } & SanitizedCollectionConfig['auth']\n\n        if (collection.auth.cookies) {\n          clientCollection.auth.cookies = collection.auth.cookies\n        }\n\n        if (collection.auth.depth !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.depth = collection.auth.depth\n        }\n\n        if (collection.auth.disableLocalStrategy) {\n          clientCollection.auth.disableLocalStrategy = collection.auth.disableLocalStrategy\n        }\n\n        if (collection.auth.lockTime !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.lockTime = collection.auth.lockTime\n        }\n\n        if (collection.auth.loginWithUsername) {\n          clientCollection.auth.loginWithUsername = collection.auth.loginWithUsername\n        }\n\n        if (collection.auth.maxLoginAttempts !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.maxLoginAttempts = collection.auth.maxLoginAttempts\n        }\n\n        if (collection.auth.removeTokenFromResponses) {\n          clientCollection.auth.removeTokenFromResponses = collection.auth.removeTokenFromResponses\n        }\n\n        if (collection.auth.useAPIKey) {\n          clientCollection.auth.useAPIKey = collection.auth.useAPIKey\n        }\n\n        if (collection.auth.tokenExpiration) {\n          clientCollection.auth.tokenExpiration = collection.auth.tokenExpiration\n        }\n\n        if (collection.auth.verify) {\n          clientCollection.auth.verify = true\n        }\n\n        break\n\n      case 'fields':\n        clientCollection.fields = createClientFields({\n          defaultIDType,\n          fields: collection.fields,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'hierarchy': {\n        if (!collection.hierarchy || typeof collection.hierarchy !== 'object') {\n          clientCollection.hierarchy = false\n          break\n        }\n\n        // Strip slugify function as it can't cross server-client boundary\n        const { slugify: _slugify, ...clientHierarchy } = collection.hierarchy\n        clientCollection.hierarchy = clientHierarchy as ClientHierarchyConfig\n\n        break\n      }\n\n      case 'labels':\n        clientCollection.labels = {\n          plural:\n            typeof collection.labels.plural === 'function'\n              ? collection.labels.plural({ i18n, t: i18n.t as TFunction })\n              : collection.labels.plural,\n          singular:\n            typeof collection.labels.singular === 'function'\n              ? collection.labels.singular({ i18n, t: i18n.t as TFunction })\n              : collection.labels.singular,\n        }\n\n        break\n\n      case 'upload':\n        if (!collection.upload) {\n          break\n        }\n\n        clientCollection.upload = {} as ClientUploadConfig\n\n        for (const uploadKey in collection.upload) {\n          if (uploadKey === 'uploadInstructions') {\n            if (collection.upload.uploadInstructions) {\n              clientCollection.upload.uploadInstructions = true\n            }\n            continue\n          }\n\n          if (serverOnlyUploadProperties.includes(uploadKey as any)) {\n            continue\n          }\n\n          if (uploadKey === 'imageSizes') {\n            clientCollection.upload.imageSizes = collection.upload.imageSizes?.map((size) => {\n              const sanitizedSize = { ...size }\n              if ('generateImageName' in sanitizedSize) {\n                delete sanitizedSize.generateImageName\n              }\n              return sanitizedSize\n            })\n          } else {\n            ;(clientCollection.upload as any)[uploadKey] =\n              collection.upload[uploadKey as keyof SanitizedUploadConfig]\n          }\n        }\n\n        break\n\n      default:\n        ;(clientCollection as any)[key] = collection[key as keyof SanitizedCollectionConfig]\n    }\n  }\n\n  return clientCollection as ClientCollectionConfig\n}\n\nexport const createClientCollectionConfigs = ({\n  collections,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collections: SanitizedCollectionConfig[]\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig[] => {\n  const clientCollections = new Array(collections.length)\n\n  for (let i = 0; i < collections.length; i++) {\n    const collection = collections[i]!\n\n    clientCollections[i] = createClientCollectionConfig({\n      collection,\n      defaultIDType,\n      i18n,\n      importMap,\n    })\n  }\n\n  return clientCollections\n}\n"],"names":["createClientFields","serverOnlyCollectionProperties","serverOnlyUploadProperties","serverOnlyCollectionAdminProperties","createClientCollectionConfig","collection","defaultIDType","i18n","importMap","clientCollection","key","includes","admin","adminKey","description","t","livePreview","breakpoints","preview","auth","cookies","depth","undefined","disableLocalStrategy","lockTime","loginWithUsername","maxLoginAttempts","removeTokenFromResponses","useAPIKey","tokenExpiration","verify","fields","hierarchy","slugify","_slugify","clientHierarchy","labels","plural","singular","upload","uploadKey","uploadInstructions","imageSizes","map","size","sanitizedSize","generateImageName","createClientCollectionConfigs","collections","clientCollections","Array","length","i"],"mappings":"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"}
+{"version":3,"sources":["../../../src/collections/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\n\nimport type { StaticDescription } from '../../admin/types.js'\nimport type { ImportMap } from '../../cli/commands/generateImportMap/generateImportMap.js'\nimport type {\n  LivePreviewConfig,\n  ServerOnlyLivePreviewProperties,\n  StaticLabel,\n} from '../../config/types.js'\nimport type { ClientField } from '../../fields/config/client.js'\nimport type { ClientHierarchyConfig } from '../../hierarchy/types.js'\nimport type { Payload } from '../../types/index.js'\nimport type { SanitizedUploadConfig, UploadInstructionsCapability } from '../../uploads/types.js'\nimport type { SanitizedCollectionConfig } from './types.js'\n\nimport { createClientFields } from '../../fields/config/client.js'\n\nexport type ServerOnlyCollectionProperties = keyof Pick<\n  SanitizedCollectionConfig,\n  | 'access'\n  | 'custom'\n  | 'endpoints'\n  | 'flattenedFields'\n  | 'hooks'\n  | 'indexes'\n  | 'joins'\n  | 'llmInstructions'\n  | 'polymorphicJoins'\n  | 'sanitizedIndexes'\n  | 'select'\n>\n\nexport type ServerOnlyCollectionAdminProperties = keyof Pick<\n  SanitizedCollectionConfig['admin'],\n  'baseFilter' | 'baseListFilter' | 'components' | 'formatDocURL' | 'hidden'\n>\n\nexport type ServerOnlyUploadProperties = keyof Pick<\n  SanitizedCollectionConfig['upload'],\n  | 'admin'\n  | 'adminThumbnail'\n  | 'externalFileHeaderFilter'\n  | 'handlers'\n  | 'modifyResponseHeaders'\n  | 'uploadInstructions'\n>\n\ntype ClientUploadConfig = {\n  uploadInstructions: Pick<UploadInstructionsCapability, 'useInAdmin'>\n} & Omit<SanitizedUploadConfig, 'uploadInstructions'>\n\nexport type ClientCollectionConfig = {\n  admin: {\n    description?: StaticDescription\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n    preview?: boolean\n  } & Omit<\n    SanitizedCollectionConfig['admin'],\n    | 'components'\n    | 'description'\n    | 'formatDocURL'\n    | 'joins'\n    | 'livePreview'\n    | 'preview'\n    | ServerOnlyCollectionAdminProperties\n  >\n  auth?: {\n    forgotPassword: Pick<SanitizedCollectionConfig['auth']['forgotPassword'], 'minRequestInterval'>\n    verify?: true\n  } & Omit<SanitizedCollectionConfig['auth'], 'forgotPassword' | 'strategies' | 'verify'>\n  fields: ClientField[]\n  hierarchy?: ClientHierarchyConfig | false\n  labels: {\n    plural: StaticLabel\n    singular: StaticLabel\n  }\n  upload: ClientUploadConfig\n} & Omit<\n  SanitizedCollectionConfig,\n  'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | 'upload' | ServerOnlyCollectionProperties\n>\n\nconst serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [\n  'hooks',\n  'access',\n  'endpoints',\n  'custom',\n  'joins',\n  'llmInstructions',\n  'polymorphicJoins',\n  'flattenedFields',\n  'indexes',\n  'sanitizedIndexes',\n  'select',\n  // `upload`\n  // `admin`\n  // are all handled separately\n]\n\nconst serverOnlyUploadProperties: Partial<ServerOnlyUploadProperties>[] = [\n  'admin',\n  'adminThumbnail',\n  'externalFileHeaderFilter',\n  'handlers',\n  'modifyResponseHeaders',\n  'uploadInstructions',\n]\n\nconst serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [\n  'hidden',\n  'baseFilter',\n  'baseListFilter',\n  'components',\n  'formatDocURL',\n  // 'preview' is handled separately\n  // `livePreview` is handled separately\n]\n\nexport const createClientCollectionConfig = ({\n  collection,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collection: SanitizedCollectionConfig\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig => {\n  const clientCollection = {} as Partial<ClientCollectionConfig>\n\n  for (const key in collection) {\n    if (serverOnlyCollectionProperties.includes(key as any)) {\n      continue\n    }\n    switch (key) {\n      case 'admin':\n        if (!collection.admin) {\n          break\n        }\n\n        clientCollection.admin = {} as ClientCollectionConfig['admin']\n\n        for (const adminKey in collection.admin) {\n          if (serverOnlyCollectionAdminProperties.includes(adminKey as any)) {\n            continue\n          }\n\n          switch (adminKey) {\n            case 'description':\n              if (\n                typeof collection.admin.description === 'string' ||\n                typeof collection.admin.description === 'object'\n              ) {\n                if (collection.admin.description) {\n                  clientCollection.admin.description = collection.admin.description\n                }\n              } else if (typeof collection.admin.description === 'function') {\n                const description = collection.admin.description({ t: i18n.t as TFunction })\n\n                if (description) {\n                  clientCollection.admin.description = description\n                }\n              }\n              break\n\n            case 'livePreview':\n              clientCollection.admin.livePreview = {}\n\n              if (collection.admin.livePreview?.breakpoints) {\n                clientCollection.admin.livePreview.breakpoints =\n                  collection.admin.livePreview.breakpoints\n              }\n\n              break\n\n            case 'preview':\n              if (collection.admin.preview) {\n                clientCollection.admin.preview = true\n              }\n\n              break\n\n            default:\n              ;(clientCollection as any).admin[adminKey] =\n                collection.admin[adminKey as keyof SanitizedCollectionConfig['admin']]\n          }\n        }\n\n        break\n\n      case 'auth':\n        if (!collection.auth) {\n          break\n        }\n\n        clientCollection.auth = {} as { verify?: true } & SanitizedCollectionConfig['auth']\n\n        clientCollection.auth.forgotPassword = {\n          minRequestInterval: collection.auth.forgotPassword.minRequestInterval,\n        }\n\n        if (collection.auth.cookies) {\n          clientCollection.auth.cookies = collection.auth.cookies\n        }\n\n        if (collection.auth.depth !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.depth = collection.auth.depth\n        }\n\n        if (collection.auth.disableLocalStrategy) {\n          clientCollection.auth.disableLocalStrategy = collection.auth.disableLocalStrategy\n        }\n\n        if (collection.auth.lockTime !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.lockTime = collection.auth.lockTime\n        }\n\n        if (collection.auth.loginWithUsername) {\n          clientCollection.auth.loginWithUsername = collection.auth.loginWithUsername\n        }\n\n        if (collection.auth.maxLoginAttempts !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.maxLoginAttempts = collection.auth.maxLoginAttempts\n        }\n\n        if (collection.auth.removeTokenFromResponses) {\n          clientCollection.auth.removeTokenFromResponses = collection.auth.removeTokenFromResponses\n        }\n\n        if (collection.auth.useAPIKey) {\n          clientCollection.auth.useAPIKey = collection.auth.useAPIKey\n        }\n\n        if (collection.auth.tokenExpiration) {\n          clientCollection.auth.tokenExpiration = collection.auth.tokenExpiration\n        }\n\n        if (collection.auth.verify) {\n          clientCollection.auth.verify = true\n        }\n\n        break\n\n      case 'fields':\n        clientCollection.fields = createClientFields({\n          defaultIDType,\n          fields: collection.fields,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'hierarchy': {\n        if (!collection.hierarchy || typeof collection.hierarchy !== 'object') {\n          clientCollection.hierarchy = false\n          break\n        }\n\n        // Strip slugify function as it can't cross server-client boundary\n        const { slugify: _slugify, ...clientHierarchy } = collection.hierarchy\n        clientCollection.hierarchy = clientHierarchy as ClientHierarchyConfig\n\n        break\n      }\n\n      case 'labels':\n        clientCollection.labels = {\n          plural:\n            typeof collection.labels.plural === 'function'\n              ? collection.labels.plural({ i18n, t: i18n.t as TFunction })\n              : collection.labels.plural,\n          singular:\n            typeof collection.labels.singular === 'function'\n              ? collection.labels.singular({ i18n, t: i18n.t as TFunction })\n              : collection.labels.singular,\n        }\n\n        break\n\n      case 'upload':\n        if (!collection.upload) {\n          break\n        }\n\n        clientCollection.upload = {\n          uploadInstructions: {\n            useInAdmin: collection.upload.uploadInstructions?.useInAdmin ?? false,\n          },\n        } as ClientUploadConfig\n\n        for (const uploadKey in collection.upload) {\n          if (serverOnlyUploadProperties.includes(uploadKey as any)) {\n            continue\n          }\n\n          if (uploadKey === 'variants') {\n            clientCollection.upload.variants = collection.upload.variants?.map((size) => {\n              const sanitizedSize = { ...size }\n              if ('generateImageName' in sanitizedSize) {\n                delete sanitizedSize.generateImageName\n              }\n              return sanitizedSize\n            })\n          } else {\n            ;(clientCollection.upload as any)[uploadKey] =\n              collection.upload[uploadKey as keyof SanitizedUploadConfig]\n          }\n        }\n\n        break\n\n      default:\n        ;(clientCollection as any)[key] = collection[key as keyof SanitizedCollectionConfig]\n    }\n  }\n\n  return clientCollection as ClientCollectionConfig\n}\n\nexport const createClientCollectionConfigs = ({\n  collections,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collections: SanitizedCollectionConfig[]\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig[] => {\n  const clientCollections = new Array(collections.length)\n\n  for (let i = 0; i < collections.length; i++) {\n    const collection = collections[i]!\n\n    clientCollections[i] = createClientCollectionConfig({\n      collection,\n      defaultIDType,\n      i18n,\n      importMap,\n    })\n  }\n\n  return clientCollections\n}\n"],"names":["createClientFields","serverOnlyCollectionProperties","serverOnlyUploadProperties","serverOnlyCollectionAdminProperties","createClientCollectionConfig","collection","defaultIDType","i18n","importMap","clientCollection","key","includes","admin","adminKey","description","t","livePreview","breakpoints","preview","auth","forgotPassword","minRequestInterval","cookies","depth","undefined","disableLocalStrategy","lockTime","loginWithUsername","maxLoginAttempts","removeTokenFromResponses","useAPIKey","tokenExpiration","verify","fields","hierarchy","slugify","_slugify","clientHierarchy","labels","plural","singular","upload","uploadInstructions","useInAdmin","uploadKey","variants","map","size","sanitizedSize","generateImageName","createClientCollectionConfigs","collections","clientCollections","Array","length","i"],"mappings":"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"}

package/dist/collections/config/defaults.d.ts

@@ -1,14 +1,16 @@
-import type { IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js';
+import type { Auth, IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js';
+import type { Access } from '../../config/types.js';
 import type { CollectionConfig } from './types.js';
+export declare const createInheritedReadVersionsAccess: (read: Access) => Access;
 /**
  * @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 declare const defaults: Partial<CollectionConfig>;
 export declare const addDefaultsToCollectionConfig: (collection: CollectionConfig) => CollectionConfig;
-export declare const addDefaultsToAuthConfig: (auth: IncomingAuthType) => IncomingAuthType;
+export declare const addDefaultsToAuthConfig: (auth: IncomingAuthType) => Auth;
 /**
  * @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 declare const loginWithUsernameDefaults: LoginWithUsernameOptions;
-export declare const addDefaultsToLoginWithUsernameConfig: (loginWithUsername: LoginWithUsernameOptions) => LoginWithUsernameOptions;
+export declare const loginWithUsernameDefaults: Required<LoginWithUsernameOptions>;
+export declare const addDefaultsToLoginWithUsernameConfig: (loginWithUsername: LoginWithUsernameOptions) => Required<LoginWithUsernameOptions>;
 //# sourceMappingURL=defaults.d.ts.map

package/dist/collections/config/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/collections/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAIlD;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CA8C9C,CAAA;AAED,eAAO,MAAM,6BAA6B,eAAgB,gBAAgB,KAAG,gBA0D5E,CAAA;AAED,eAAO,MAAM,uBAAuB,SAAU,gBAAgB,KAAG,gBAqBhE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,wBAIvC,CAAA;AAED,eAAO,MAAM,oCAAoC,sBAC5B,wBAAwB,KAC1C,wBAM6B,CAAA"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/collections/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAA6B,MAAM,YAAY,CAAA;AAW7E,eAAO,MAAM,iCAAiC,SAAU,MAAM,KAAG,MAK7D,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CA+C9C,CAAA;AAED,eAAO,MAAM,6BAA6B,eAAgB,gBAAgB,KAAG,gBAiE5E,CAAA;AAED,eAAO,MAAM,uBAAuB,SAAU,gBAAgB,KAAG,IA2BhE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,wBAAwB,CAIxE,CAAA;AAED,eAAO,MAAM,oCAAoC,sBAC5B,wBAAwB,KAC1C,QAAQ,CAAC,wBAAwB,CAQM,CAAA"}

package/dist/collections/config/defaults.js

@@ -1,4 +1,12 @@
 import { defaultAccess } from '../../auth/defaultAccess.js';
+import { defaultUnlockAccess } from '../../auth/defaultUnlockAccess.js';
+import { hasWhereAccessResult } from '../../auth/types.js';
+import { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js';
+import { markInheritedReadVersionsAccess, resolveInheritedReadVersionsAccessArgs } from '../../versions/isInheritedReadVersionsAccess.js';
+export const createInheritedReadVersionsAccess = (read)=>markInheritedReadVersionsAccess(async (args)=>{
+        const result = await read(resolveInheritedReadVersionsAccessArgs(args));
+        return hasWhereAccessResult(result) ? appendVersionToQueryKey(result) : result;
+    });
 /**
  * @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 = {
@@ -6,7 +14,7 @@ import { defaultAccess } from '../../auth/defaultAccess.js';
         create: defaultAccess,
         delete: defaultAccess,
         read: defaultAccess,
-        unlock: defaultAccess,
+        unlock: defaultUnlockAccess,
         update: defaultAccess
     },
     admin: {
@@ -33,6 +41,7 @@ import { defaultAccess } from '../../auth/defaultAccess.js';
     hooks: {
         afterChange: [],
         afterDelete: [],
+        afterError: [],
         afterForgotPassword: [],
         afterLogin: [],
         afterLogout: [],
@@ -55,13 +64,16 @@ import { defaultAccess } from '../../auth/defaultAccess.js';
     versions: true
 };
 export const addDefaultsToCollectionConfig = (collection)=>{
+    const access = collection.access;
+    const read = access?.read ?? defaultAccess;
     collection.access = {
-        create: defaultAccess,
-        delete: defaultAccess,
-        read: defaultAccess,
-        unlock: defaultAccess,
-        update: defaultAccess,
-        ...collection.access || {}
+        ...access,
+        create: access?.create ?? defaultAccess,
+        delete: access?.delete ?? defaultAccess,
+        read,
+        readVersions: access?.readVersions ?? createInheritedReadVersionsAccess(read),
+        unlock: access?.unlock ?? defaultUnlockAccess,
+        update: access?.update ?? defaultAccess
     };
     collection.admin = {
         components: {},
@@ -87,25 +99,27 @@ export const addDefaultsToCollectionConfig = (collection)=>{
     collection.endpoints = collection.endpoints ?? [];
     collection.fields = collection.fields ?? [];
     collection.hierarchy = collection.hierarchy ?? false;
+    const hooks = collection.hooks;
     collection.hooks = {
-        afterChange: [],
-        afterDelete: [],
-        afterForgotPassword: [],
-        afterLogin: [],
-        afterLogout: [],
-        afterMe: [],
-        afterOperation: [],
-        afterRead: [],
-        afterRefresh: [],
-        beforeChange: [],
-        beforeDelete: [],
-        beforeLogin: [],
-        beforeOperation: [],
-        beforeRead: [],
-        beforeValidate: [],
-        me: [],
-        refresh: [],
-        ...collection.hooks || {}
+        ...hooks,
+        afterChange: hooks?.afterChange ?? [],
+        afterDelete: hooks?.afterDelete ?? [],
+        afterError: hooks?.afterError ?? [],
+        afterForgotPassword: hooks?.afterForgotPassword ?? [],
+        afterLogin: hooks?.afterLogin ?? [],
+        afterLogout: hooks?.afterLogout ?? [],
+        afterMe: hooks?.afterMe ?? [],
+        afterOperation: hooks?.afterOperation ?? [],
+        afterRead: hooks?.afterRead ?? [],
+        afterRefresh: hooks?.afterRefresh ?? [],
+        beforeChange: hooks?.beforeChange ?? [],
+        beforeDelete: hooks?.beforeDelete ?? [],
+        beforeLogin: hooks?.beforeLogin ?? [],
+        beforeOperation: hooks?.beforeOperation ?? [],
+        beforeRead: hooks?.beforeRead ?? [],
+        beforeValidate: hooks?.beforeValidate ?? [],
+        me: hooks?.me ?? [],
+        refresh: hooks?.refresh ?? []
     };
     collection.timestamps = collection.timestamps ?? true;
     collection.upload = collection.upload ?? false;
@@ -115,13 +129,15 @@ export const addDefaultsToCollectionConfig = (collection)=>{
 };
 export const addDefaultsToAuthConfig = (auth)=>{
     auth.cookies = {
-        sameSite: 'Lax',
-        secure: false,
-        ...auth.cookies || {}
+        ...auth.cookies || {},
+        sameSite: auth.cookies?.sameSite ?? 'Lax',
+        secure: auth.cookies?.secure ?? false
     };
+    auth.depth = auth.depth ?? 0;
     auth.forgotPassword = auth.forgotPassword ?? {};
+    auth.forgotPassword.minRequestInterval = auth.forgotPassword.minRequestInterval ?? 15000;
     auth.lockTime = auth.lockTime ?? 600000; // 10 minutes
-    auth.loginWithUsername = auth.loginWithUsername ?? false;
+    auth.loginWithUsername = auth.loginWithUsername ? addDefaultsToLoginWithUsernameConfig(auth.loginWithUsername === true ? {} : auth.loginWithUsername) : false;
     auth.maxLoginAttempts = auth.maxLoginAttempts ?? 5;
     auth.tokenExpiration = auth.tokenExpiration ?? 7200;
     auth.useSessions = auth.useSessions ?? true;
@@ -140,10 +156,10 @@ export const addDefaultsToAuthConfig = (auth)=>{
     requireUsername: true
 };
 export const addDefaultsToLoginWithUsernameConfig = (loginWithUsername)=>({
-        allowEmailLogin: false,
-        requireEmail: false,
-        requireUsername: true,
-        ...loginWithUsername || {}
+        ...loginWithUsername,
+        allowEmailLogin: loginWithUsername.allowEmailLogin ?? false,
+        requireEmail: loginWithUsername.requireEmail ?? false,
+        requireUsername: loginWithUsername.allowEmailLogin ? loginWithUsername.requireUsername ?? true : true
     });
 
 //# sourceMappingURL=defaults.js.map

package/dist/collections/config/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/collections/config/defaults.ts"],"sourcesContent":["import type { IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js'\nimport type { CollectionConfig } from './types.js'\n\nimport { defaultAccess } from '../../auth/defaultAccess.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: Partial<CollectionConfig> = {\n  access: {\n    create: defaultAccess,\n    delete: defaultAccess,\n    read: defaultAccess,\n    unlock: defaultAccess,\n    update: defaultAccess,\n  },\n  admin: {\n    components: {},\n    custom: {},\n    enableRichTextLink: true,\n    enableRichTextRelationship: true,\n    pagination: {\n      defaultLimit: 10,\n      limits: [5, 10, 25, 50, 100],\n    },\n    useAsTitle: 'id',\n  },\n  auth: false,\n  custom: {},\n  endpoints: [],\n  fields: [],\n  hooks: {\n    afterChange: [],\n    afterDelete: [],\n    afterForgotPassword: [],\n    afterLogin: [],\n    afterLogout: [],\n    afterMe: [],\n    afterOperation: [],\n    afterRead: [],\n    afterRefresh: [],\n    beforeChange: [],\n    beforeDelete: [],\n    beforeLogin: [],\n    beforeOperation: [],\n    beforeRead: [],\n    beforeValidate: [],\n    me: [],\n    refresh: [],\n  },\n  indexes: [],\n  timestamps: true,\n  upload: false,\n  versions: true,\n}\n\nexport const addDefaultsToCollectionConfig = (collection: CollectionConfig): CollectionConfig => {\n  collection.access = {\n    create: defaultAccess,\n    delete: defaultAccess,\n    read: defaultAccess,\n    unlock: defaultAccess,\n    update: defaultAccess,\n    ...(collection.access || {}),\n  }\n\n  collection.admin = {\n    components: {},\n    custom: {},\n    enableRichTextLink: true,\n    enableRichTextRelationship: true,\n    useAsTitle: 'id',\n    ...(collection.admin || {}),\n    pagination: {\n      defaultLimit: 10,\n      limits: [5, 10, 25, 50, 100],\n      ...(collection.admin?.pagination || {}),\n    },\n  }\n\n  collection.auth = collection.auth ?? false\n  collection.custom = collection.custom ?? {}\n  collection.endpoints = collection.endpoints ?? []\n  collection.fields = collection.fields ?? []\n  collection.hierarchy = collection.hierarchy ?? false\n\n  collection.hooks = {\n    afterChange: [],\n    afterDelete: [],\n    afterForgotPassword: [],\n    afterLogin: [],\n    afterLogout: [],\n    afterMe: [],\n    afterOperation: [],\n    afterRead: [],\n    afterRefresh: [],\n    beforeChange: [],\n    beforeDelete: [],\n    beforeLogin: [],\n    beforeOperation: [],\n    beforeRead: [],\n    beforeValidate: [],\n    me: [],\n    refresh: [],\n    ...(collection.hooks || {}),\n  }\n\n  collection.timestamps = collection.timestamps ?? true\n  collection.upload = collection.upload ?? false\n  collection.versions = collection.versions ?? true\n\n  collection.indexes = collection.indexes ?? []\n\n  return collection\n}\n\nexport const addDefaultsToAuthConfig = (auth: IncomingAuthType): IncomingAuthType => {\n  auth.cookies = {\n    sameSite: 'Lax',\n    secure: false,\n    ...(auth.cookies || {}),\n  }\n\n  auth.forgotPassword = auth.forgotPassword ?? {}\n  auth.lockTime = auth.lockTime ?? 600000 // 10 minutes\n  auth.loginWithUsername = auth.loginWithUsername ?? false\n  auth.maxLoginAttempts = auth.maxLoginAttempts ?? 5\n  auth.tokenExpiration = auth.tokenExpiration ?? 7200\n  auth.useSessions = auth.useSessions ?? true\n  auth.verify = auth.verify ?? false\n  auth.strategies = auth.strategies ?? []\n\n  if (!auth.disableLocalStrategy && auth.verify === true) {\n    auth.verify = {}\n  }\n\n  return auth\n}\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 loginWithUsernameDefaults: LoginWithUsernameOptions = {\n  allowEmailLogin: false,\n  requireEmail: false,\n  requireUsername: true,\n}\n\nexport const addDefaultsToLoginWithUsernameConfig = (\n  loginWithUsername: LoginWithUsernameOptions,\n): LoginWithUsernameOptions =>\n  ({\n    allowEmailLogin: false,\n    requireEmail: false,\n    requireUsername: true,\n    ...(loginWithUsername || {}),\n  }) as LoginWithUsernameOptions\n"],"names":["defaultAccess","defaults","access","create","delete","read","unlock","update","admin","components","custom","enableRichTextLink","enableRichTextRelationship","pagination","defaultLimit","limits","useAsTitle","auth","endpoints","fields","hooks","afterChange","afterDelete","afterForgotPassword","afterLogin","afterLogout","afterMe","afterOperation","afterRead","afterRefresh","beforeChange","beforeDelete","beforeLogin","beforeOperation","beforeRead","beforeValidate","me","refresh","indexes","timestamps","upload","versions","addDefaultsToCollectionConfig","collection","hierarchy","addDefaultsToAuthConfig","cookies","sameSite","secure","forgotPassword","lockTime","loginWithUsername","maxLoginAttempts","tokenExpiration","useSessions","verify","strategies","disableLocalStrategy","loginWithUsernameDefaults","allowEmailLogin","requireEmail","requireUsername","addDefaultsToLoginWithUsernameConfig"],"mappings":"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"}
+{"version":3,"sources":["../../../src/collections/config/defaults.ts"],"sourcesContent":["import type { Auth, IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js'\nimport type { Access } from '../../config/types.js'\nimport type { CollectionConfig, SanitizedCollectionConfig } from './types.js'\n\nimport { defaultAccess } from '../../auth/defaultAccess.js'\nimport { defaultUnlockAccess } from '../../auth/defaultUnlockAccess.js'\nimport { hasWhereAccessResult } from '../../auth/types.js'\nimport { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js'\nimport {\n  markInheritedReadVersionsAccess,\n  resolveInheritedReadVersionsAccessArgs,\n} from '../../versions/isInheritedReadVersionsAccess.js'\n\nexport const createInheritedReadVersionsAccess = (read: Access): Access =>\n  markInheritedReadVersionsAccess(async (args) => {\n    const result = await read(resolveInheritedReadVersionsAccessArgs(args))\n\n    return hasWhereAccessResult(result) ? appendVersionToQueryKey(result) : result\n  })\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: Partial<CollectionConfig> = {\n  access: {\n    create: defaultAccess,\n    delete: defaultAccess,\n    read: defaultAccess,\n    unlock: defaultUnlockAccess,\n    update: defaultAccess,\n  },\n  admin: {\n    components: {},\n    custom: {},\n    enableRichTextLink: true,\n    enableRichTextRelationship: true,\n    pagination: {\n      defaultLimit: 10,\n      limits: [5, 10, 25, 50, 100],\n    },\n    useAsTitle: 'id',\n  },\n  auth: false,\n  custom: {},\n  endpoints: [],\n  fields: [],\n  hooks: {\n    afterChange: [],\n    afterDelete: [],\n    afterError: [],\n    afterForgotPassword: [],\n    afterLogin: [],\n    afterLogout: [],\n    afterMe: [],\n    afterOperation: [],\n    afterRead: [],\n    afterRefresh: [],\n    beforeChange: [],\n    beforeDelete: [],\n    beforeLogin: [],\n    beforeOperation: [],\n    beforeRead: [],\n    beforeValidate: [],\n    me: [],\n    refresh: [],\n  },\n  indexes: [],\n  timestamps: true,\n  upload: false,\n  versions: true,\n}\n\nexport const addDefaultsToCollectionConfig = (collection: CollectionConfig): CollectionConfig => {\n  const access = collection.access\n  const read = access?.read ?? defaultAccess\n\n  collection.access = {\n    ...access,\n    create: access?.create ?? defaultAccess,\n    delete: access?.delete ?? defaultAccess,\n    read,\n    readVersions: access?.readVersions ?? createInheritedReadVersionsAccess(read),\n    unlock: access?.unlock ?? defaultUnlockAccess,\n    update: access?.update ?? defaultAccess,\n  } satisfies SanitizedCollectionConfig['access']\n\n  collection.admin = {\n    components: {},\n    custom: {},\n    enableRichTextLink: true,\n    enableRichTextRelationship: true,\n    useAsTitle: 'id',\n    ...(collection.admin || {}),\n    pagination: {\n      defaultLimit: 10,\n      limits: [5, 10, 25, 50, 100],\n      ...(collection.admin?.pagination || {}),\n    },\n  }\n\n  collection.auth = collection.auth ?? false\n  collection.custom = collection.custom ?? {}\n  collection.endpoints = collection.endpoints ?? []\n  collection.fields = collection.fields ?? []\n  collection.hierarchy = collection.hierarchy ?? false\n\n  const hooks = collection.hooks\n\n  collection.hooks = {\n    ...hooks,\n    afterChange: hooks?.afterChange ?? [],\n    afterDelete: hooks?.afterDelete ?? [],\n    afterError: hooks?.afterError ?? [],\n    afterForgotPassword: hooks?.afterForgotPassword ?? [],\n    afterLogin: hooks?.afterLogin ?? [],\n    afterLogout: hooks?.afterLogout ?? [],\n    afterMe: hooks?.afterMe ?? [],\n    afterOperation: hooks?.afterOperation ?? [],\n    afterRead: hooks?.afterRead ?? [],\n    afterRefresh: hooks?.afterRefresh ?? [],\n    beforeChange: hooks?.beforeChange ?? [],\n    beforeDelete: hooks?.beforeDelete ?? [],\n    beforeLogin: hooks?.beforeLogin ?? [],\n    beforeOperation: hooks?.beforeOperation ?? [],\n    beforeRead: hooks?.beforeRead ?? [],\n    beforeValidate: hooks?.beforeValidate ?? [],\n    me: hooks?.me ?? [],\n    refresh: hooks?.refresh ?? [],\n  } satisfies SanitizedCollectionConfig['hooks']\n\n  collection.timestamps = collection.timestamps ?? true\n  collection.upload = collection.upload ?? false\n  collection.versions = collection.versions ?? true\n\n  collection.indexes = collection.indexes ?? []\n\n  return collection\n}\n\nexport const addDefaultsToAuthConfig = (auth: IncomingAuthType): Auth => {\n  auth.cookies = {\n    ...(auth.cookies || {}),\n    sameSite: auth.cookies?.sameSite ?? 'Lax',\n    secure: auth.cookies?.secure ?? false,\n  } satisfies Auth['cookies']\n\n  auth.depth = auth.depth ?? 0\n  auth.forgotPassword = auth.forgotPassword ?? {}\n  auth.forgotPassword.minRequestInterval = auth.forgotPassword.minRequestInterval ?? 15000\n  auth.lockTime = auth.lockTime ?? 600000 // 10 minutes\n  auth.loginWithUsername = auth.loginWithUsername\n    ? addDefaultsToLoginWithUsernameConfig(\n        auth.loginWithUsername === true ? {} : auth.loginWithUsername,\n      )\n    : false\n  auth.maxLoginAttempts = auth.maxLoginAttempts ?? 5\n  auth.tokenExpiration = auth.tokenExpiration ?? 7200\n  auth.useSessions = auth.useSessions ?? true\n  auth.verify = auth.verify ?? false\n  auth.strategies = auth.strategies ?? []\n\n  if (!auth.disableLocalStrategy && auth.verify === true) {\n    auth.verify = {}\n  }\n\n  return auth as Auth\n}\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 loginWithUsernameDefaults: Required<LoginWithUsernameOptions> = {\n  allowEmailLogin: false,\n  requireEmail: false,\n  requireUsername: true,\n}\n\nexport const addDefaultsToLoginWithUsernameConfig = (\n  loginWithUsername: LoginWithUsernameOptions,\n): Required<LoginWithUsernameOptions> =>\n  ({\n    ...loginWithUsername,\n    allowEmailLogin: loginWithUsername.allowEmailLogin ?? false,\n    requireEmail: loginWithUsername.requireEmail ?? false,\n    requireUsername: loginWithUsername.allowEmailLogin\n      ? (loginWithUsername.requireUsername ?? true)\n      : true,\n  }) as Required<LoginWithUsernameOptions>\n"],"names":["defaultAccess","defaultUnlockAccess","hasWhereAccessResult","appendVersionToQueryKey","markInheritedReadVersionsAccess","resolveInheritedReadVersionsAccessArgs","createInheritedReadVersionsAccess","read","args","result","defaults","access","create","delete","unlock","update","admin","components","custom","enableRichTextLink","enableRichTextRelationship","pagination","defaultLimit","limits","useAsTitle","auth","endpoints","fields","hooks","afterChange","afterDelete","afterError","afterForgotPassword","afterLogin","afterLogout","afterMe","afterOperation","afterRead","afterRefresh","beforeChange","beforeDelete","beforeLogin","beforeOperation","beforeRead","beforeValidate","me","refresh","indexes","timestamps","upload","versions","addDefaultsToCollectionConfig","collection","readVersions","hierarchy","addDefaultsToAuthConfig","cookies","sameSite","secure","depth","forgotPassword","minRequestInterval","lockTime","loginWithUsername","addDefaultsToLoginWithUsernameConfig","maxLoginAttempts","tokenExpiration","useSessions","verify","strategies","disableLocalStrategy","loginWithUsernameDefaults","allowEmailLogin","requireEmail","requireUsername"],"mappings":"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"}

package/dist/collections/config/sanitize.d.ts

@@ -1,4 +1,5 @@
-import type { Config, SanitizedConfig } from '../../config/types.js';
+import type { Config } from '../../config/types.js';
+import type { RichTextSanitizer } from '../../fields/config/sanitize.js';
 import type { OrderableJoinInfo } from '../../fields/config/sanitizeJoinField.js';
 import type { CollectionConfig, SanitizedCollectionConfig } from './types.js';
 /**
@@ -6,14 +7,9 @@ import type { CollectionConfig, SanitizedCollectionConfig } from './types.js';
  * Views without `path` will never be matched by the router and are silently ignored.
  */
 export declare const warnOnInvalidCustomViews: (collection: CollectionConfig) => void;
-export declare const sanitizeCollection: (config: Config, collection: CollectionConfig, 
-/**
- * If this property is set, RichText fields won't be sanitized immediately. Instead, they will be added to this array as promises
- * so that you can sanitize them together, after the config has been sanitized.
- */
-richTextSanitizationPromises?: Array<(config: SanitizedConfig) => Promise<void>>, _validRelationships?: string[], 
+export declare const sanitizeCollection: (config: Config, collection: CollectionConfig, richTextSanitizers?: RichTextSanitizer[], _validRelationships?: string[], 
 /**
  * Tracker for orderable join fields - populated during sanitization
  */
-orderableJoins?: OrderableJoinInfo[]) => Promise<SanitizedCollectionConfig>;
+orderableJoins?: OrderableJoinInfo[]) => SanitizedCollectionConfig;
 //# sourceMappingURL=sanitize.d.ts.map

package/dist/collections/config/sanitize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../../src/collections/config/sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AACpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAEjF,OAAO,KAAK,EACV,gBAAgB,EAChB,yBAAyB,EAG1B,MAAM,YAAY,CAAA;AA0BnB;;;GAGG;AACH,eAAO,MAAM,wBAAwB,eAAgB,gBAAgB,KAAG,IAuBvE,CAAA;AAED,eAAO,MAAM,kBAAkB,WACrB,MAAM,cACF,gBAAgB;AAC5B;;;GAGG;+BAC4B,KAAK,CAAC,CAAC,MAAM,EAAE,eAAe,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC,wBAC1D,MAAM,EAAE;AAC9B;;GAEG;iBACc,iBAAiB,EAAE,KACnC,OAAO,CAAC,yBAAyB,CA+SnC,CAAA"}
+{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../../src/collections/config/sanitize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAA;AACxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAA;AAEjF,OAAO,KAAK,EACV,gBAAgB,EAChB,yBAAyB,EAG1B,MAAM,YAAY,CAAA;AAsCnB;;;GAGG;AACH,eAAO,MAAM,wBAAwB,eAAgB,gBAAgB,KAAG,IAuBvE,CAAA;AAED,eAAO,MAAM,kBAAkB,WACrB,MAAM,cACF,gBAAgB,uBACP,iBAAiB,EAAE,wBAClB,MAAM,EAAE;AAC9B;;GAEG;iBACc,iBAAiB,EAAE,KACnC,yBAyYF,CAAA"}

package/dist/collections/config/sanitize.js

@@ -1,6 +1,9 @@
-import { authCollectionEndpoints } from '../../auth/endpoints/index.js';
+import { omitAPIKey } from '../../auth/baseFields/apiKey.js';
+import { apiKeyRevealEndpoint, authCollectionEndpoints } from '../../auth/endpoints/index.js';
 import { getBaseAuthFields } from '../../auth/getAuthFields.js';
+import { withBaseAccess, withBaseAdminAccess } from '../../auth/withBaseAccess.js';
 import { TimestampsRequired } from '../../errors/TimestampsRequired.js';
+import { createCreatedByField, createUpdatedByField, sanitizeAuthorship } from '../../fields/baseFields/authorship/index.js';
 import { sanitizeFields } from '../../fields/config/sanitize.js';
 import { fieldAffectsData } from '../../fields/config/types.js';
 import { mergeBaseFields } from '../../fields/mergeBaseFields.js';
@@ -13,9 +16,11 @@ import { formatLabels } from '../../utilities/formatLabels.js';
 import { traverseForLocalizedFields } from '../../utilities/traverseForLocalizedFields.js';
 import { baseVersionFields } from '../../versions/baseFields.js';
 import { versionDefaults } from '../../versions/defaults.js';
-import { defaultCollectionEndpoints } from '../endpoints/index.js';
-import { addDefaultsToAuthConfig, addDefaultsToCollectionConfig, addDefaultsToLoginWithUsernameConfig } from './defaults.js';
+import { isInheritedReadVersionsAccess, markInheritedReadVersionsAccess } from '../../versions/isInheritedReadVersionsAccess.js';
+import { defaultCollectionEndpoints, duplicateEndpoint } from '../endpoints/index.js';
+import { addDefaultsToAuthConfig, addDefaultsToCollectionConfig, createInheritedReadVersionsAccess } from './defaults.js';
 import { sanitizeCompoundIndexes } from './sanitizeCompoundIndexes.js';
+import { validateUseAsThumbnail } from './useAsThumbnail.js';
 import { validateUseAsTitle } from './useAsTitle.js';
 /**
  * Warns at startup when custom collection views are misconfigured with a missing `path`.
@@ -37,10 +42,7 @@ import { validateUseAsTitle } from './useAsTitle.js';
         }
     }
 };
-export const sanitizeCollection = async (config, collection, /**
-   * If this property is set, RichText fields won't be sanitized immediately. Instead, they will be added to this array as promises
-   * so that you can sanitize them together, after the config has been sanitized.
-   */ richTextSanitizationPromises, _validRelationships, /**
+export const sanitizeCollection = (config, collection, richTextSanitizers, _validRelationships, /**
    * Tracker for orderable join fields - populated during sanitization
    */ orderableJoins)=>{
     if (collection._sanitized) {
@@ -96,7 +98,43 @@ export const sanitizeCollection = async (config, collection, /**
     const validRelationships = _validRelationships ?? config.collections.map((c)=>c.slug) ?? [];
     const joins = {};
     const polymorphicJoins = [];
-    sanitized.fields = await sanitizeFields({
+    // Inject createdBy / updatedBy (unless already defined) before sanitizing fields.
+    const authorship = sanitizeAuthorship(sanitized.authorship);
+    sanitized.authorship = authorship;
+    if (authorship.createdBy || authorship.updatedBy) {
+        const authCollections = config.collections.filter((collectionConfig)=>collectionConfig.auth).map((collectionConfig)=>collectionConfig.slug);
+        let hasCreatedBy = false;
+        let hasUpdatedBy = false;
+        sanitized.fields.some((field)=>{
+            if (fieldAffectsData(field)) {
+                if (field.name === 'createdBy') {
+                    hasCreatedBy = true;
+                }
+                if (field.name === 'updatedBy') {
+                    hasUpdatedBy = true;
+                }
+                // A user may spread `getAuthorshipFields` into their `fields` to customize these
+                // without knowing the auth collections; backfill the polymorphic relationTo here.
+                if ((field.name === 'createdBy' || field.name === 'updatedBy') && field.type === 'relationship' && (!field.relationTo || Array.isArray(field.relationTo) && field.relationTo.length === 0)) {
+                    field.relationTo = authCollections;
+                }
+            }
+            return hasCreatedBy && hasUpdatedBy;
+        });
+        if (authCollections.length > 0) {
+            if (authorship.createdBy && !hasCreatedBy) {
+                sanitized.fields.push(createCreatedByField({
+                    authCollections
+                }));
+            }
+            if (authorship.updatedBy && !hasUpdatedBy) {
+                sanitized.fields.push(createUpdatedByField({
+                    authCollections
+                }));
+            }
+        }
+    }
+    sanitized.fields = sanitizeFields({
         collectionConfig: sanitized,
         config,
         fields: sanitized.fields,
@@ -105,9 +143,13 @@ export const sanitizeCollection = async (config, collection, /**
         orderableJoins,
         parentIsLocalized: false,
         polymorphicJoins,
-        richTextSanitizationPromises,
+        richTextSanitizers,
         validRelationships
     });
+    if (sanitized.auth) {
+        // disable duplicate for auth enabled collections by default
+        sanitized.disableDuplicate = sanitized.disableDuplicate ?? true;
+    }
     if (sanitized.endpoints !== false) {
         if (!sanitized.endpoints) {
             sanitized.endpoints = [];
@@ -116,6 +158,9 @@ export const sanitizeCollection = async (config, collection, /**
             for (const endpoint of authCollectionEndpoints){
                 sanitized.endpoints.push(endpoint);
             }
+            if (typeof sanitized.auth === 'object' && typeof sanitized.auth.useAPIKey === 'object' && sanitized.auth.useAPIKey.reveal === true) {
+                sanitized.endpoints.push(apiKeyRevealEndpoint);
+            }
         }
         if (sanitized.upload) {
             for (const endpoint of uploadCollectionEndpoints){
@@ -123,7 +168,9 @@ export const sanitizeCollection = async (config, collection, /**
             }
         }
         for (const endpoint of defaultCollectionEndpoints){
-            sanitized.endpoints.push(endpoint);
+            if (endpoint !== duplicateEndpoint || sanitized.disableDuplicate !== true) {
+                sanitized.endpoints.push(endpoint);
+            }
         }
     }
     if (sanitized.timestamps !== false) {
@@ -247,37 +294,62 @@ export const sanitizeCollection = async (config, collection, /**
     }
     if (sanitized.auth) {
         sanitized.auth = addDefaultsToAuthConfig(typeof sanitized.auth === 'boolean' ? {} : sanitized.auth);
-        // disable duplicate for auth enabled collections by default
-        sanitized.disableDuplicate = sanitized.disableDuplicate ?? true;
-        if (sanitized.auth.loginWithUsername) {
-            if (sanitized.auth.loginWithUsername === true) {
-                sanitized.auth.loginWithUsername = addDefaultsToLoginWithUsernameConfig({});
-            } else {
-                const loginWithUsernameWithDefaults = addDefaultsToLoginWithUsernameConfig(sanitized.auth.loginWithUsername);
-                // if allowEmailLogin is false, requireUsername must be true
-                if (loginWithUsernameWithDefaults.allowEmailLogin === false) {
-                    loginWithUsernameWithDefaults.requireUsername = true;
-                }
-                sanitized.auth.loginWithUsername = loginWithUsernameWithDefaults;
-            }
-        } else {
-            sanitized.auth.loginWithUsername = false;
-        }
         if (!collection?.admin?.useAsTitle) {
             sanitized.admin.useAsTitle = sanitized.auth.loginWithUsername ? 'username' : 'email';
         }
-        sanitized.fields = mergeBaseFields(sanitized.fields, getBaseAuthFields(sanitized.auth));
+        if (sanitized.auth.useAPIKey) {
+            sanitized.hooks.beforeRead.unshift(omitAPIKey);
+        }
+        sanitized.fields = mergeBaseFields(sanitized.fields, getBaseAuthFields(sanitized.auth, sanitized.fields));
     }
     if (collection?.admin?.pagination?.limits?.length) {
         sanitized.admin.pagination.limits = collection.admin.pagination.limits;
     }
-    validateUseAsTitle(sanitized);
+    for (const operation of [
+        'create',
+        'delete',
+        'read',
+        'unlock',
+        'update'
+    ]){
+        sanitized.access[operation] = withBaseAccess({
+            slug: sanitized.slug,
+            access: sanitized.access?.[operation],
+            entityType: 'collection',
+            operation
+        });
+    }
+    sanitized.access.admin = withBaseAdminAccess({
+        slug: sanitized.slug,
+        access: sanitized.access?.admin
+    });
+    if (sanitized.versions) {
+        const inheritsReadAccess = isInheritedReadVersionsAccess(sanitized.access.readVersions);
+        const readVersions = inheritsReadAccess ? createInheritedReadVersionsAccess(sanitized.access.read) : sanitized.access.readVersions;
+        const readVersionsWithBaseAccess = withBaseAccess({
+            slug: sanitized.slug,
+            access: readVersions,
+            entityType: 'collection',
+            operation: 'readVersions'
+        });
+        sanitized.access.readVersions = inheritsReadAccess ? markInheritedReadVersionsAccess(readVersionsWithBaseAccess) : readVersionsWithBaseAccess;
+    }
     const sanitizedConfig = sanitized;
     sanitizedConfig.joins = joins;
     sanitizedConfig.polymorphicJoins = polymorphicJoins;
     sanitizedConfig.flattenedFields = flattenAllFields({
         fields: sanitizedConfig.fields
     });
+    validateUseAsTitle(sanitized);
+    validateUseAsThumbnail({
+        config: sanitizedConfig
+    });
+    if (!sanitizedConfig.admin.useAsThumbnail) {
+        const uploadField = sanitizedConfig.flattenedFields.find((field)=>fieldAffectsData(field) && field.type === 'upload');
+        if (uploadField && fieldAffectsData(uploadField)) {
+            sanitizedConfig.admin.useAsThumbnail = uploadField.name;
+        }
+    }
     sanitizedConfig.sanitizedIndexes = sanitizeCompoundIndexes({
         fields: sanitizedConfig.flattenedFields,
         indexes: sanitizedConfig.indexes