payload 4.0.0-internal.fa345ef → 4.0.0-internal.ff27d6e

package/dist/collections/operations/validate.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/collections/operations/validate.ts"],"sourcesContent":["import type { DeepPartial } from 'ts-essentials'\n\nimport type { FindOneArgs } from '../../database/types.js'\nimport type { CollectionSlug, JsonObject } from '../../index.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { ValidationResult } from '../../types/validation.js'\nimport type { ValidationSourceData } from '../../utilities/runValidationLifecycle.js'\nimport type { Collection, RequiredDataFromCollectionSlug, TypeWithID } from '../config/types.js'\n\nimport { ensureUsernameOrEmail } from '../../auth/ensureUsernameOrEmail.js'\nimport { executeAccess } from '../../auth/executeAccess.js'\nimport { hasWhereAccessResult } from '../../auth/types.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { Forbidden, NotFound } from '../../errors/index.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { appendNonTrashedFilter } from '../../utilities/appendNonTrashedFilter.js'\nimport { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js'\nimport { flattenDataByLocale } from '../../utilities/flattenDataByLocale.js'\nimport { runValidationLifecycle } from '../../utilities/runValidationLifecycle.js'\nimport { appendVersionToQueryKey } from '../../versions/drafts/appendVersionToQueryKey.js'\nimport { validateUniqueConstraints } from './utilities/validateUniqueConstraints.js'\n\nexport type Arguments<TSlug extends CollectionSlug> = {\n  collection: Collection\n  data?: DeepPartial<RequiredDataFromCollectionSlug<TSlug>>\n  draft: boolean\n  id?: number | string\n  onValidationData?: (data: JsonObject) => void\n  overrideAccess: boolean\n  req: PayloadRequest\n  skipAccessControl?: boolean\n  skipMutationHooks?: boolean\n  sourceData?: ValidationSourceData\n  trash?: boolean\n  validationOperation?: 'create' | 'update' | 'validate'\n}\n\nexport async function validateOperation<TSlug extends CollectionSlug>(\n  args: Arguments<TSlug>,\n): Promise<ValidationResult> {\n  const previousOperation = args.req.operation\n  args.req.operation = args.validationOperation ?? 'validate'\n\n  try {\n    return await validateOperationWithScopedRequest(args)\n  } finally {\n    args.req.operation = previousOperation\n  }\n}\n\nasync function validateOperationWithScopedRequest<TSlug extends CollectionSlug>({\n  id,\n  collection,\n  data: incomingData,\n  draft,\n  onValidationData,\n  overrideAccess,\n  req,\n  skipAccessControl = false,\n  skipMutationHooks = false,\n  sourceData,\n  trash = false,\n  validationOperation = 'validate',\n}: Arguments<TSlug>): Promise<ValidationResult> {\n  const collectionConfig = collection.config\n\n  const accessResult =\n    !skipAccessControl && !overrideAccess\n      ? await executeAccess(\n          { id, slug: collectionConfig.slug, data: incomingData, req },\n          collectionConfig.access.validate,\n        )\n      : true\n  const hasWherePolicy = hasWhereAccessResult(accessResult)\n\n  if (id === undefined && hasWherePolicy) {\n    throw new Forbidden(req.t)\n  }\n\n  let docWithLocales: JsonObject = sourceData ? deepCopyObjectSimple(sourceData.docWithLocales) : {}\n\n  if (id !== undefined && !sourceData) {\n    const idWhere = appendNonTrashedFilter({\n      enableTrash: collectionConfig.trash,\n      trash,\n      where: { id: { equals: id } },\n    })\n    const where = combineQueries(idWhere, accessResult)\n    const query: FindOneArgs = {\n      collection: collectionConfig.slug,\n      locale: req.locale!,\n      req,\n      where,\n    }\n\n    let storedDocument: (RequiredDataFromCollectionSlug<TSlug> & TypeWithID) | undefined\n\n    if (draft && collectionConfig.versions?.drafts) {\n      const { docs } = await req.payload.db.queryDrafts<\n        RequiredDataFromCollectionSlug<TSlug> & TypeWithID\n      >({\n        collection: collectionConfig.slug,\n        limit: 1,\n        locale: req.locale!,\n        pagination: false,\n        req,\n        where: appendVersionToQueryKey(where),\n      })\n\n      storedDocument = docs[0]\n\n      if (!storedDocument && hasWherePolicy) {\n        const { docs: existingVersions } = await req.payload.db.queryDrafts({\n          collection: collectionConfig.slug,\n          limit: 1,\n          locale: req.locale!,\n          pagination: false,\n          req,\n          select: { parent: true },\n          where: appendVersionToQueryKey(idWhere),\n        })\n\n        if (existingVersions[0]) {\n          throw new Forbidden(req.t)\n        }\n      }\n    }\n\n    if (!storedDocument) {\n      storedDocument =\n        (await req.payload.db.findOne<RequiredDataFromCollectionSlug<TSlug> & TypeWithID>({\n          ...query,\n          req,\n        })) ?? undefined\n    }\n\n    if (!storedDocument && hasWherePolicy) {\n      throw new Forbidden(req.t)\n    }\n    if (!storedDocument) {\n      throw new NotFound(req.t)\n    }\n\n    docWithLocales = deepCopyObjectSimple(storedDocument)\n  }\n\n  let originalDoc: JsonObject\n\n  if (id === undefined) {\n    originalDoc = docWithLocales\n  } else if (!sourceData) {\n    originalDoc = await afterRead({\n      collection: collectionConfig,\n      context: req.context,\n      depth: 0,\n      doc: deepCopyObjectSimple(docWithLocales),\n      draft,\n      fallbackLocale: null,\n      global: null,\n      locale: req.locale!,\n      overrideAccess: true,\n      req,\n      showHiddenFields: true,\n    })\n  } else if (req.locale === sourceData.originalLocale) {\n    originalDoc = deepCopyObjectSimple(sourceData.originalDoc)\n  } else {\n    originalDoc = flattenDataByLocale({\n      configBlockReferences: req.payload.config.blocks,\n      docWithLocales,\n      fields: collectionConfig.fields,\n      locale: req.locale!,\n    })\n  }\n\n  return runValidationLifecycle({\n    id,\n    beforeValidation: ({ data }) => {\n      if (!collectionConfig.auth) {\n        return\n      }\n\n      if (id === undefined) {\n        ensureUsernameOrEmail<TSlug>({\n          authOptions: collectionConfig.auth,\n          collectionSlug: collectionConfig.slug,\n          data,\n          operation: 'create',\n          req,\n        })\n      } else {\n        ensureUsernameOrEmail<TSlug>({\n          authOptions: collectionConfig.auth,\n          collectionSlug: collectionConfig.slug,\n          data,\n          operation: 'update',\n          originalDoc,\n          req,\n        })\n      }\n    },\n    collection: collectionConfig,\n    docWithLocales,\n    global: null,\n    incomingData,\n    onValidationData,\n    originalDoc,\n    overrideAccess,\n    req,\n    skipMutationHooks,\n    validateData: ({ data, dataWithLocales }) =>\n      validateUniqueConstraints({\n        id,\n        collection: collectionConfig,\n        data,\n        dataWithLocales,\n        req,\n      }),\n    validationOperation,\n  })\n}\n"],"names":["ensureUsernameOrEmail","executeAccess","hasWhereAccessResult","combineQueries","Forbidden","NotFound","afterRead","appendNonTrashedFilter","deepCopyObjectSimple","flattenDataByLocale","runValidationLifecycle","appendVersionToQueryKey","validateUniqueConstraints","validateOperation","args","previousOperation","req","operation","validationOperation","validateOperationWithScopedRequest","id","collection","data","incomingData","draft","onValidationData","overrideAccess","skipAccessControl","skipMutationHooks","sourceData","trash","collectionConfig","config","accessResult","slug","access","validate","hasWherePolicy","undefined","t","docWithLocales","idWhere","enableTrash","where","equals","query","locale","storedDocument","versions","drafts","docs","payload","db","queryDrafts","limit","pagination","existingVersions","select","parent","findOne","originalDoc","context","depth","doc","fallbackLocale","global","showHiddenFields","originalLocale","configBlockReferences","blocks","fields","beforeValidation","auth","authOptions","collectionSlug","validateData","dataWithLocales"],"mappings":"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"}

package/dist/config/assertNoLegacySharpConfig.d.ts

@@ -0,0 +1,21 @@
+import type { Config } from './types.js';
+/**
+ * Payload 4.0 removed the top-level `sharp` config option and the Sharp-specific
+ * per-collection `upload` options in favor of `@payloadcms/transformer-sharp`
+ * registered under `upload.transformers`. Neither removal is caught by the type
+ * system for JavaScript configs or configs built from untyped data, so without
+ * this check an app upgrading from 3.x would boot with no indication that image
+ * resizing had stopped.
+ *
+ * `upload.imageSizes` is included, and `upload.variants` is rejected too: image sizes are
+ * authored as `sharpTransformer({ collections: { <slug>: { variants } } })`, which writes
+ * `upload.variants` onto the sanitized config. A size declared on the collection itself would
+ * otherwise build without error while every upload skips it.
+ *
+ * Every violation is collected and reported together, since a config can have
+ * more than one and fixing them one at a time would take multiple build attempts.
+ */
+export declare function assertNoLegacySharpConfig({ config }: {
+    config: Config;
+}): void;
+//# sourceMappingURL=assertNoLegacySharpConfig.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"assertNoLegacySharpConfig.d.ts","sourceRoot":"","sources":["../../src/config/assertNoLegacySharpConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAgBxC;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CAAC,EAAE,MAAM,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CA6B9E"}

package/dist/config/assertNoLegacySharpConfig.js

@@ -0,0 +1,50 @@
+import { InvalidConfiguration } from '../errors/index.js';
+const REMOVED_UPLOAD_FIELDS = [
+    'constructorOptions',
+    'formatOptions',
+    'imageSizes',
+    'resizeOptions',
+    'trimOptions',
+    'withMetadata'
+];
+const MIGRATION_HINT = 'Run `npx @payloadcms/codemod --transform migrate-sharp-to-transformer` to migrate automatically, or see https://payloadcms.com/docs/upload/transformers.';
+/**
+ * Payload 4.0 removed the top-level `sharp` config option and the Sharp-specific
+ * per-collection `upload` options in favor of `@payloadcms/transformer-sharp`
+ * registered under `upload.transformers`. Neither removal is caught by the type
+ * system for JavaScript configs or configs built from untyped data, so without
+ * this check an app upgrading from 3.x would boot with no indication that image
+ * resizing had stopped.
+ *
+ * `upload.imageSizes` is included, and `upload.variants` is rejected too: image sizes are
+ * authored as `sharpTransformer({ collections: { <slug>: { variants } } })`, which writes
+ * `upload.variants` onto the sanitized config. A size declared on the collection itself would
+ * otherwise build without error while every upload skips it.
+ *
+ * Every violation is collected and reported together, since a config can have
+ * more than one and fixing them one at a time would take multiple build attempts.
+ */ export function assertNoLegacySharpConfig({ config }) {
+    const errors = [];
+    if ('sharp' in config) {
+        errors.push('The top-level `sharp` config option was removed in Payload 4.0.');
+    }
+    for (const collection of config.collections ?? []){
+        const upload = collection.upload;
+        if (typeof upload !== 'object' || !upload) {
+            continue;
+        }
+        for (const field of REMOVED_UPLOAD_FIELDS){
+            if (field in upload) {
+                errors.push(`Collection "${collection.slug}" uses the removed \`upload.${field}\` option.`);
+            }
+        }
+        if ('variants' in upload) {
+            errors.push(`Collection "${collection.slug}" sets \`upload.variants\`, which only a file transformer writes. Declare variants on the transformer instead, e.g. \`sharpTransformer({ collections: { "${collection.slug}": { variants } } })\`.`);
+        }
+    }
+    if (errors.length > 0) {
+        throw new InvalidConfiguration(`${errors.join(' ')} ${MIGRATION_HINT}`);
+    }
+}
+
+//# sourceMappingURL=assertNoLegacySharpConfig.js.map

package/dist/config/assertNoLegacySharpConfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/config/assertNoLegacySharpConfig.ts"],"sourcesContent":["import type { Config } from './types.js'\n\nimport { InvalidConfiguration } from '../errors/index.js'\n\nconst REMOVED_UPLOAD_FIELDS = [\n  'constructorOptions',\n  'formatOptions',\n  'imageSizes',\n  'resizeOptions',\n  'trimOptions',\n  'withMetadata',\n]\n\nconst MIGRATION_HINT =\n  'Run `npx @payloadcms/codemod --transform migrate-sharp-to-transformer` to migrate automatically, or see https://payloadcms.com/docs/upload/transformers.'\n\n/**\n * Payload 4.0 removed the top-level `sharp` config option and the Sharp-specific\n * per-collection `upload` options in favor of `@payloadcms/transformer-sharp`\n * registered under `upload.transformers`. Neither removal is caught by the type\n * system for JavaScript configs or configs built from untyped data, so without\n * this check an app upgrading from 3.x would boot with no indication that image\n * resizing had stopped.\n *\n * `upload.imageSizes` is included, and `upload.variants` is rejected too: image sizes are\n * authored as `sharpTransformer({ collections: { <slug>: { variants } } })`, which writes\n * `upload.variants` onto the sanitized config. A size declared on the collection itself would\n * otherwise build without error while every upload skips it.\n *\n * Every violation is collected and reported together, since a config can have\n * more than one and fixing them one at a time would take multiple build attempts.\n */\nexport function assertNoLegacySharpConfig({ config }: { config: Config }): void {\n  const errors: string[] = []\n\n  if ('sharp' in config) {\n    errors.push('The top-level `sharp` config option was removed in Payload 4.0.')\n  }\n\n  for (const collection of config.collections ?? []) {\n    const upload = collection.upload\n    if (typeof upload !== 'object' || !upload) {\n      continue\n    }\n\n    for (const field of REMOVED_UPLOAD_FIELDS) {\n      if (field in upload) {\n        errors.push(`Collection \"${collection.slug}\" uses the removed \\`upload.${field}\\` option.`)\n      }\n    }\n\n    if ('variants' in upload) {\n      errors.push(\n        `Collection \"${collection.slug}\" sets \\`upload.variants\\`, which only a file transformer writes. Declare variants on the transformer instead, e.g. \\`sharpTransformer({ collections: { \"${collection.slug}\": { variants } } })\\`.`,\n      )\n    }\n  }\n\n  if (errors.length > 0) {\n    throw new InvalidConfiguration(`${errors.join(' ')} ${MIGRATION_HINT}`)\n  }\n}\n"],"names":["InvalidConfiguration","REMOVED_UPLOAD_FIELDS","MIGRATION_HINT","assertNoLegacySharpConfig","config","errors","push","collection","collections","upload","field","slug","length","join"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ,qBAAoB;AAEzD,MAAMC,wBAAwB;IAC5B;IACA;IACA;IACA;IACA;IACA;CACD;AAED,MAAMC,iBACJ;AAEF;;;;;;;;;;;;;;;CAeC,GACD,OAAO,SAASC,0BAA0B,EAAEC,MAAM,EAAsB;IACtE,MAAMC,SAAmB,EAAE;IAE3B,IAAI,WAAWD,QAAQ;QACrBC,OAAOC,IAAI,CAAC;IACd;IAEA,KAAK,MAAMC,cAAcH,OAAOI,WAAW,IAAI,EAAE,CAAE;QACjD,MAAMC,SAASF,WAAWE,MAAM;QAChC,IAAI,OAAOA,WAAW,YAAY,CAACA,QAAQ;YACzC;QACF;QAEA,KAAK,MAAMC,SAAST,sBAAuB;YACzC,IAAIS,SAASD,QAAQ;gBACnBJ,OAAOC,IAAI,CAAC,CAAC,YAAY,EAAEC,WAAWI,IAAI,CAAC,4BAA4B,EAAED,MAAM,UAAU,CAAC;YAC5F;QACF;QAEA,IAAI,cAAcD,QAAQ;YACxBJ,OAAOC,IAAI,CACT,CAAC,YAAY,EAAEC,WAAWI,IAAI,CAAC,yJAAyJ,EAAEJ,WAAWI,IAAI,CAAC,uBAAuB,CAAC;QAEtO;IACF;IAEA,IAAIN,OAAOO,MAAM,GAAG,GAAG;QACrB,MAAM,IAAIZ,qBAAqB,GAAGK,OAAOQ,IAAI,CAAC,KAAK,CAAC,EAAEX,gBAAgB;IACxE;AACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/config/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAIzD;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAuB1E"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/config/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAMzD;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,CAwC1E"}

package/dist/config/build.js

@@ -1,3 +1,5 @@
+import { validateTransformers } from '../uploads/transformers/validateTransformers.js';
+import { assertNoLegacySharpConfig } from './assertNoLegacySharpConfig.js';
 import { sanitizeConfig } from './sanitize.js';
 /**
  * @description Builds and validates Payload configuration
@@ -12,6 +14,25 @@ import { sanitizeConfig } from './sanitize.js';
             config = await plugin(config);
         }
     }
+    // Runs after plugins so removed Sharp settings a plugin adds are caught too.
+    assertNoLegacySharpConfig({
+        config
+    });
+    if (Array.isArray(config.upload?.transformers) && config.upload.transformers.length > 0) {
+        validateTransformers({
+            transformers: config.upload.transformers
+        });
+        for (const transformer of config.upload.transformers){
+            if (typeof transformer.init === 'function') {
+                config = await transformer.init(config);
+            }
+        }
+        if (Array.isArray(config.upload?.transformers) && config.upload.transformers.length > 0) {
+            validateTransformers({
+                transformers: config.upload.transformers
+            });
+        }
+    }
     if (Array.isArray(config.storage)) {
         for (const adapter of config.storage){
             if (typeof adapter?.init !== 'function') {
@@ -20,7 +41,7 @@ import { sanitizeConfig } from './sanitize.js';
             config = await adapter.init(config);
         }
     }
-    return await sanitizeConfig(config);
+    return sanitizeConfig(config);
 }
 
 //# sourceMappingURL=build.js.map

package/dist/config/build.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/build.ts"],"sourcesContent":["import type { Config, SanitizedConfig } from './types.js'\n\nimport { sanitizeConfig } from './sanitize.js'\n\n/**\n * @description Builds and validates Payload configuration\n * @param config Payload Config\n * @returns Built and sanitized Payload Config\n */\nexport async function buildConfig(config: Config): Promise<SanitizedConfig> {\n  if (Array.isArray(config.plugins)) {\n    const sorted = [...config.plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0))\n\n    for (const plugin of sorted) {\n      config = await plugin(config)\n    }\n  }\n\n  if (Array.isArray(config.storage)) {\n    for (const adapter of config.storage) {\n      if (typeof adapter?.init !== 'function') {\n        throw new Error(\n          `storage contains an invalid entry: expected an object with an \\`init\\` function. ` +\n            `Ensure you are passing the result of a storage adapter factory (e.g. s3Storage({…})) ` +\n            `to \\`storage\\`, not to \\`plugins\\`.`,\n        )\n      }\n      config = await adapter.init(config)\n    }\n  }\n\n  return await sanitizeConfig(config)\n}\n"],"names":["sanitizeConfig","buildConfig","config","Array","isArray","plugins","sorted","sort","a","b","order","plugin","storage","adapter","init","Error"],"mappings":"AAEA,SAASA,cAAc,QAAQ,gBAAe;AAE9C;;;;CAIC,GACD,OAAO,eAAeC,YAAYC,MAAc;IAC9C,IAAIC,MAAMC,OAAO,CAACF,OAAOG,OAAO,GAAG;QACjC,MAAMC,SAAS;eAAIJ,OAAOG,OAAO;SAAC,CAACE,IAAI,CAAC,CAACC,GAAGC,IAAM,AAACD,CAAAA,EAAEE,KAAK,IAAI,CAAA,IAAMD,CAAAA,EAAEC,KAAK,IAAI,CAAA;QAE/E,KAAK,MAAMC,UAAUL,OAAQ;YAC3BJ,SAAS,MAAMS,OAAOT;QACxB;IACF;IAEA,IAAIC,MAAMC,OAAO,CAACF,OAAOU,OAAO,GAAG;QACjC,KAAK,MAAMC,WAAWX,OAAOU,OAAO,CAAE;YACpC,IAAI,OAAOC,SAASC,SAAS,YAAY;gBACvC,MAAM,IAAIC,MACR,CAAC,iFAAiF,CAAC,GACjF,CAAC,qFAAqF,CAAC,GACvF,CAAC,mCAAmC,CAAC;YAE3C;YACAb,SAAS,MAAMW,QAAQC,IAAI,CAACZ;QAC9B;IACF;IAEA,OAAO,MAAMF,eAAeE;AAC9B"}
+{"version":3,"sources":["../../src/config/build.ts"],"sourcesContent":["import type { Config, SanitizedConfig } from './types.js'\n\nimport { validateTransformers } from '../uploads/transformers/validateTransformers.js'\nimport { assertNoLegacySharpConfig } from './assertNoLegacySharpConfig.js'\nimport { sanitizeConfig } from './sanitize.js'\n\n/**\n * @description Builds and validates Payload configuration\n * @param config Payload Config\n * @returns Built and sanitized Payload Config\n */\nexport async function buildConfig(config: Config): Promise<SanitizedConfig> {\n  if (Array.isArray(config.plugins)) {\n    const sorted = [...config.plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0))\n\n    for (const plugin of sorted) {\n      config = await plugin(config)\n    }\n  }\n\n  // Runs after plugins so removed Sharp settings a plugin adds are caught too.\n  assertNoLegacySharpConfig({ config })\n\n  if (Array.isArray(config.upload?.transformers) && config.upload.transformers.length > 0) {\n    validateTransformers({ transformers: config.upload.transformers })\n\n    for (const transformer of config.upload.transformers) {\n      if (typeof transformer.init === 'function') {\n        config = await transformer.init(config)\n      }\n    }\n\n    if (Array.isArray(config.upload?.transformers) && config.upload.transformers.length > 0) {\n      validateTransformers({ transformers: config.upload.transformers })\n    }\n  }\n\n  if (Array.isArray(config.storage)) {\n    for (const adapter of config.storage) {\n      if (typeof adapter?.init !== 'function') {\n        throw new Error(\n          `storage contains an invalid entry: expected an object with an \\`init\\` function. ` +\n            `Ensure you are passing the result of a storage adapter factory (e.g. s3Storage({…})) ` +\n            `to \\`storage\\`, not to \\`plugins\\`.`,\n        )\n      }\n      config = await adapter.init(config)\n    }\n  }\n\n  return sanitizeConfig(config)\n}\n"],"names":["validateTransformers","assertNoLegacySharpConfig","sanitizeConfig","buildConfig","config","Array","isArray","plugins","sorted","sort","a","b","order","plugin","upload","transformers","length","transformer","init","storage","adapter","Error"],"mappings":"AAEA,SAASA,oBAAoB,QAAQ,kDAAiD;AACtF,SAASC,yBAAyB,QAAQ,iCAAgC;AAC1E,SAASC,cAAc,QAAQ,gBAAe;AAE9C;;;;CAIC,GACD,OAAO,eAAeC,YAAYC,MAAc;IAC9C,IAAIC,MAAMC,OAAO,CAACF,OAAOG,OAAO,GAAG;QACjC,MAAMC,SAAS;eAAIJ,OAAOG,OAAO;SAAC,CAACE,IAAI,CAAC,CAACC,GAAGC,IAAM,AAACD,CAAAA,EAAEE,KAAK,IAAI,CAAA,IAAMD,CAAAA,EAAEC,KAAK,IAAI,CAAA;QAE/E,KAAK,MAAMC,UAAUL,OAAQ;YAC3BJ,SAAS,MAAMS,OAAOT;QACxB;IACF;IAEA,6EAA6E;IAC7EH,0BAA0B;QAAEG;IAAO;IAEnC,IAAIC,MAAMC,OAAO,CAACF,OAAOU,MAAM,EAAEC,iBAAiBX,OAAOU,MAAM,CAACC,YAAY,CAACC,MAAM,GAAG,GAAG;QACvFhB,qBAAqB;YAAEe,cAAcX,OAAOU,MAAM,CAACC,YAAY;QAAC;QAEhE,KAAK,MAAME,eAAeb,OAAOU,MAAM,CAACC,YAAY,CAAE;YACpD,IAAI,OAAOE,YAAYC,IAAI,KAAK,YAAY;gBAC1Cd,SAAS,MAAMa,YAAYC,IAAI,CAACd;YAClC;QACF;QAEA,IAAIC,MAAMC,OAAO,CAACF,OAAOU,MAAM,EAAEC,iBAAiBX,OAAOU,MAAM,CAACC,YAAY,CAACC,MAAM,GAAG,GAAG;YACvFhB,qBAAqB;gBAAEe,cAAcX,OAAOU,MAAM,CAACC,YAAY;YAAC;QAClE;IACF;IAEA,IAAIV,MAAMC,OAAO,CAACF,OAAOe,OAAO,GAAG;QACjC,KAAK,MAAMC,WAAWhB,OAAOe,OAAO,CAAE;YACpC,IAAI,OAAOC,SAASF,SAAS,YAAY;gBACvC,MAAM,IAAIG,MACR,CAAC,iFAAiF,CAAC,GACjF,CAAC,qFAAqF,CAAC,GACvF,CAAC,mCAAmC,CAAC;YAE3C;YACAjB,SAAS,MAAMgB,QAAQF,IAAI,CAACd;QAC9B;IACF;IAEA,OAAOF,eAAeE;AACxB"}

package/dist/config/client.d.ts

@@ -1,11 +1,12 @@
 import type { I18nClient } from '@payloadcms/translations';
-import type { ImportMap } from '../bin/generateImportMap/index.js';
+import type { ClientBranchingConfig } from '../branching/types.js';
+import type { ImportMap } from '../cli/commands/generateImportMap/generateImportMap.js';
 import type { ClientBlock } from '../fields/config/types.js';
 import type { BlockSlug, User } from '../index.js';
 import type { ClientWidget, RootLivePreviewConfig, SanitizedConfig, ServerOnlyLivePreviewProperties } from './types.js';
 import { type ClientCollectionConfig } from '../collections/config/client.js';
 import { type ClientGlobalConfig } from '../globals/config/client.js';
-export type ServerOnlyRootProperties = keyof Pick<SanitizedConfig, 'bin' | 'cors' | 'csrf' | 'custom' | 'db' | 'editor' | 'email' | 'endpoints' | 'graphQL' | 'hooks' | 'i18n' | 'jobs' | 'kv' | 'logger' | 'onInit' | 'plugins' | 'queryPresets' | 'secret' | 'sharp' | 'storage' | 'typescript'>;
+export type ServerOnlyRootProperties = keyof Pick<SanitizedConfig, 'baseAccess' | 'cli' | 'cors' | 'csrf' | 'custom' | 'db' | 'editor' | 'email' | 'endpoints' | 'graphQL' | 'hooks' | 'i18n' | 'jobs' | 'kv' | 'llmInstructions' | 'logger' | 'onInit' | 'plugins' | 'queryPresets' | 'secret' | 'storage' | 'typescript' | 'upload'>;
 export type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>;
 export type ClientConfig = {
     admin: {
@@ -16,11 +17,12 @@ export type ClientConfig = {
     } & Omit<SanitizedConfig['admin'], 'components' | 'dashboard' | 'dependencies' | 'livePreview'>;
     blocks: ClientBlock[];
     blocksMap: Record<BlockSlug, ClientBlock>;
+    branching: ClientBranchingConfig;
     collections: ClientCollectionConfig[];
     custom?: Record<string, any>;
     globals: ClientGlobalConfig[];
     unauthenticated?: boolean;
-} & Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | 'i18n' | ServerOnlyRootProperties>;
+} & Omit<SanitizedConfig, 'admin' | 'branching' | 'collections' | 'globals' | 'i18n' | ServerOnlyRootProperties>;
 export type UnauthenticatedClientConfig = {
     admin: {
         routes: ClientConfig['admin']['routes'];

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

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/config/client.ts"],"names":[],"mappings":"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"}

package/dist/config/client.js

@@ -3,15 +3,15 @@ import { createClientBlocks, createClientFields } from '../fields/config/client.
 import { createClientGlobalConfigs } from '../globals/config/client.js';
 export const serverOnlyAdminConfigProperties = [];
 export const serverOnlyConfigProperties = [
+    'baseAccess',
     'endpoints',
     'db',
     'editor',
     'plugins',
-    'sharp',
     'onInit',
     'secret',
     'hooks',
-    'bin',
+    'cli',
     'i18n',
     'typescript',
     'cors',
@@ -22,8 +22,10 @@ export const serverOnlyConfigProperties = [
     'jobs',
     'logger',
     'kv',
+    'llmInstructions',
     'queryPresets',
-    'storage'
+    'storage',
+    'upload'
 ];
 export const createUnauthenticatedClientConfig = ({ clientConfig })=>{
     /**
@@ -58,6 +60,7 @@ export const createClientConfig = ({ config, i18n, importMap })=>{
                     autoLogin: config.admin.autoLogin,
                     autoRefresh: config.admin.autoRefresh,
                     avatar: config.admin.avatar,
+                    constrainWidth: config.admin.constrainWidth,
                     custom: config.admin.custom,
                     dateFormat: config.admin.dateFormat,
                     importMap: config.admin.importMap,
@@ -123,6 +126,15 @@ export const createClientConfig = ({ config, i18n, importMap })=>{
                     }
                     break;
                 }
+            // Only which entities branch — access functions, merge hooks and the
+            // shadowed-ID ceiling are server concerns and aren't serializable.
+            case 'branching':
+                clientConfig.branching = {
+                    branchableCollections: Array.from(config.branching.branchableCollections),
+                    branchableGlobals: Array.from(config.branching.branchableGlobals),
+                    enabled: config.branching.enabled
+                };
+                break;
             case 'collections':
                 ;
                 clientConfig.collections = createClientCollectionConfigs({
@@ -147,9 +159,6 @@ export const createClientConfig = ({ config, i18n, importMap })=>{
                     if (config.localization.defaultLocale) {
                         clientConfig.localization.defaultLocale = config.localization.defaultLocale;
                     }
-                    if (config.localization.defaultLocalePublishOption) {
-                        clientConfig.localization.defaultLocalePublishOption = config.localization.defaultLocalePublishOption;
-                    }
                     if (config.localization.fallback) {
                         clientConfig.localization.fallback = config.localization.fallback;
                     }

package/dist/config/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\nimport type { DeepPartial } from 'ts-essentials'\n\nimport type { ImportMap } from '../bin/generateImportMap/index.js'\nimport type { ClientBlock } from '../fields/config/types.js'\nimport type { BlockSlug, User } from '../index.js'\nimport type {\n  ClientWidget,\n  RootLivePreviewConfig,\n  SanitizedConfig,\n  ServerOnlyLivePreviewProperties,\n} from './types.js'\n\nimport {\n  type ClientCollectionConfig,\n  createClientCollectionConfigs,\n} from '../collections/config/client.js'\nimport { createClientBlocks, createClientFields } from '../fields/config/client.js'\nimport { type ClientGlobalConfig, createClientGlobalConfigs } from '../globals/config/client.js'\n\nexport type ServerOnlyRootProperties = keyof Pick<\n  SanitizedConfig,\n  | 'bin'\n  | 'cors'\n  | 'csrf'\n  | 'custom'\n  | 'db'\n  | 'editor'\n  | 'email'\n  | 'endpoints'\n  | 'graphQL'\n  | 'hooks'\n  | 'i18n'\n  | 'jobs'\n  | 'kv'\n  | 'logger'\n  | 'onInit'\n  | 'plugins'\n  | 'queryPresets'\n  | 'secret'\n  | 'sharp'\n  | 'storage'\n  | 'typescript'\n>\n\nexport type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>\n\nexport type ClientConfig = {\n  admin: {\n    dashboard?: {\n      widgets: ClientWidget[]\n    }\n    livePreview?: Omit<RootLivePreviewConfig, ServerOnlyLivePreviewProperties>\n  } & Omit<SanitizedConfig['admin'], 'components' | 'dashboard' | 'dependencies' | 'livePreview'>\n  blocks: ClientBlock[]\n  blocksMap: Record<BlockSlug, ClientBlock>\n  collections: ClientCollectionConfig[]\n  custom?: Record<string, any>\n  globals: ClientGlobalConfig[]\n  unauthenticated?: boolean\n} & Omit<SanitizedConfig, 'admin' | 'collections' | 'globals' | 'i18n' | ServerOnlyRootProperties>\n\nexport type UnauthenticatedClientConfig = {\n  admin: {\n    routes: ClientConfig['admin']['routes']\n    user: ClientConfig['admin']['user']\n  }\n  collections: [\n    {\n      auth: ClientCollectionConfig['auth']\n      slug: string\n    },\n  ]\n  globals: []\n  routes: ClientConfig['routes']\n  serverURL: ClientConfig['serverURL']\n  unauthenticated: true\n}\n\nexport const serverOnlyAdminConfigProperties: readonly Partial<ServerOnlyRootAdminProperties>[] = []\n\nexport const serverOnlyConfigProperties: readonly Partial<ServerOnlyRootProperties>[] = [\n  'endpoints',\n  'db',\n  'editor',\n  'plugins',\n  'sharp',\n  'onInit',\n  'secret',\n  'hooks',\n  'bin',\n  'i18n',\n  'typescript',\n  'cors',\n  'csrf',\n  'email',\n  'custom',\n  'graphQL',\n  'jobs',\n  'logger',\n  'kv',\n  'queryPresets',\n  'storage',\n  // `admin`, `onInit`, `localization`, `collections`, and `globals` are all handled separately\n]\n\nexport type CreateClientConfigArgs = {\n  config: SanitizedConfig\n  i18n: I18nClient\n  importMap: ImportMap\n  /**\n   * If unauthenticated, the client config will omit some sensitive properties\n   * such as field schemas, etc. This is useful for login and error pages where\n   * the page source should not contain this information.\n   *\n   * For example, allow `true` to generate a client config for the \"create first user\" page\n   * where there is no user yet, but the config should still be complete.\n   */\n  user: true | User\n}\n\nexport const createUnauthenticatedClientConfig = ({\n  clientConfig,\n}: {\n  /**\n   * Send the previously generated client config to share memory when applicable.\n   * E.g. the admin-enabled collection config can reference the existing collection rather than creating a new object.\n   */\n  clientConfig: ClientConfig\n}): UnauthenticatedClientConfig => {\n  /**\n   * To share memory, find the admin user collection from the existing client config.\n   */\n  const adminUserCollection = clientConfig.collections.find(\n    ({ slug }) => slug === clientConfig.admin.user,\n  )!\n\n  return {\n    admin: {\n      routes: clientConfig.admin.routes,\n      user: clientConfig.admin.user,\n    },\n    collections: [\n      {\n        slug: adminUserCollection.slug,\n        auth: adminUserCollection.auth,\n      },\n    ],\n    globals: [],\n    routes: clientConfig.routes,\n    serverURL: clientConfig.serverURL,\n    unauthenticated: true,\n  }\n}\n\nexport const createClientConfig = ({\n  config,\n  i18n,\n  importMap,\n}: CreateClientConfigArgs): ClientConfig => {\n  const clientConfig = {} as DeepPartial<ClientConfig>\n\n  for (const key in config) {\n    if (serverOnlyConfigProperties.includes(key as any)) {\n      continue\n    }\n\n    switch (key) {\n      case 'admin':\n        clientConfig.admin = {\n          autoLogin: config.admin.autoLogin,\n          autoRefresh: config.admin.autoRefresh,\n          avatar: config.admin.avatar,\n          custom: config.admin.custom,\n          dateFormat: config.admin.dateFormat,\n          importMap: config.admin.importMap,\n          meta: config.admin.meta,\n          routes: config.admin.routes,\n          theme: config.admin.theme,\n          timezones: config.admin.timezones,\n          toast: config.admin.toast,\n          user: config.admin.user,\n        }\n\n        if (config.admin.dashboard?.widgets) {\n          ;(clientConfig.admin.dashboard ??= {}).widgets = config.admin.dashboard.widgets.map(\n            (widget) => {\n              const { Component: _, fields, label, ...rest } = widget\n              return {\n                ...rest,\n                ...(fields?.length\n                  ? {\n                      fields: createClientFields({\n                        defaultIDType: config.db.defaultIDType,\n                        fields,\n                        i18n,\n                        importMap,\n                      }),\n                    }\n                  : {}),\n                // Resolve label function to string for client\n                label:\n                  typeof label === 'function' ? label({ i18n, t: i18n.t as TFunction }) : label,\n              }\n            },\n          )\n        }\n\n        if (config.admin.livePreview) {\n          clientConfig.admin.livePreview = {}\n\n          if (config.admin.livePreview.breakpoints) {\n            clientConfig.admin.livePreview.breakpoints = config.admin.livePreview.breakpoints\n          }\n\n          if (config.admin.livePreview.collections) {\n            clientConfig.admin.livePreview.collections = config.admin.livePreview.collections\n          }\n\n          if (config.admin.livePreview.globals) {\n            clientConfig.admin.livePreview.globals = config.admin.livePreview.globals\n          }\n        }\n\n        break\n\n      case 'blocks': {\n        ;(clientConfig.blocks as ClientBlock[]) = createClientBlocks({\n          blocks: config.blocks!,\n          defaultIDType: config.db.defaultIDType,\n          i18n,\n          importMap,\n        }).filter((block) => typeof block !== 'string')\n\n        clientConfig.blocksMap = {}\n        if (clientConfig.blocks?.length) {\n          for (const block of clientConfig.blocks) {\n            if (!block?.slug) {\n              continue\n            }\n\n            clientConfig.blocksMap[block.slug] = block as ClientBlock\n          }\n        }\n\n        break\n      }\n\n      case 'collections':\n        ;(clientConfig.collections as ClientCollectionConfig[]) = createClientCollectionConfigs({\n          collections: config.collections,\n          defaultIDType: config.db.defaultIDType,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'globals':\n        ;(clientConfig.globals as ClientGlobalConfig[]) = createClientGlobalConfigs({\n          defaultIDType: config.db.defaultIDType,\n          globals: config.globals,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'localization':\n        if (typeof config.localization === 'object' && config.localization) {\n          clientConfig.localization = {}\n\n          if (config.localization.defaultLocale) {\n            clientConfig.localization.defaultLocale = config.localization.defaultLocale\n          }\n\n          if (config.localization.defaultLocalePublishOption) {\n            clientConfig.localization.defaultLocalePublishOption =\n              config.localization.defaultLocalePublishOption\n          }\n\n          if (config.localization.fallback) {\n            clientConfig.localization.fallback = config.localization.fallback\n          }\n\n          if (config.localization.localeCodes) {\n            clientConfig.localization.localeCodes = config.localization.localeCodes\n          }\n\n          if (config.localization.locales) {\n            clientConfig.localization.locales = []\n\n            for (const locale of config.localization.locales) {\n              if (locale) {\n                const clientLocale: Partial<(typeof config.localization.locales)[0]> = {}\n\n                if (locale.code) {\n                  clientLocale.code = locale.code\n                }\n\n                if (locale.fallbackLocale) {\n                  clientLocale.fallbackLocale = locale.fallbackLocale\n                }\n\n                if (locale.label) {\n                  clientLocale.label = locale.label\n                }\n\n                if (locale.rtl) {\n                  clientLocale.rtl = locale.rtl\n                }\n\n                clientConfig.localization.locales.push(clientLocale)\n              }\n            }\n          }\n        }\n\n        break\n\n      default:\n        ;(clientConfig as any)[key] = config[key as keyof SanitizedConfig]\n    }\n  }\n\n  return clientConfig as ClientConfig\n}\n"],"names":["createClientCollectionConfigs","createClientBlocks","createClientFields","createClientGlobalConfigs","serverOnlyAdminConfigProperties","serverOnlyConfigProperties","createUnauthenticatedClientConfig","clientConfig","adminUserCollection","collections","find","slug","admin","user","routes","auth","globals","serverURL","unauthenticated","createClientConfig","config","i18n","importMap","key","includes","autoLogin","autoRefresh","avatar","custom","dateFormat","meta","theme","timezones","toast","dashboard","widgets","map","widget","Component","_","fields","label","rest","length","defaultIDType","db","t","livePreview","breakpoints","blocks","filter","block","blocksMap","localization","defaultLocale","defaultLocalePublishOption","fallback","localeCodes","locales","locale","clientLocale","code","fallbackLocale","rtl","push"],"mappings":"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"}
+{"version":3,"sources":["../../src/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\nimport type { DeepPartial } from 'ts-essentials'\n\nimport type { ClientBranchingConfig } from '../branching/types.js'\nimport type { ImportMap } from '../cli/commands/generateImportMap/generateImportMap.js'\nimport type { ClientBlock } from '../fields/config/types.js'\nimport type { BlockSlug, User } from '../index.js'\nimport type {\n  ClientWidget,\n  RootLivePreviewConfig,\n  SanitizedConfig,\n  ServerOnlyLivePreviewProperties,\n} from './types.js'\n\nimport {\n  type ClientCollectionConfig,\n  createClientCollectionConfigs,\n} from '../collections/config/client.js'\nimport { createClientBlocks, createClientFields } from '../fields/config/client.js'\nimport { type ClientGlobalConfig, createClientGlobalConfigs } from '../globals/config/client.js'\n\nexport type ServerOnlyRootProperties = keyof Pick<\n  SanitizedConfig,\n  | 'baseAccess'\n  | 'cli'\n  | 'cors'\n  | 'csrf'\n  | 'custom'\n  | 'db'\n  | 'editor'\n  | 'email'\n  | 'endpoints'\n  | 'graphQL'\n  | 'hooks'\n  | 'i18n'\n  | 'jobs'\n  | 'kv'\n  | 'llmInstructions'\n  | 'logger'\n  | 'onInit'\n  | 'plugins'\n  | 'queryPresets'\n  | 'secret'\n  | 'storage'\n  | 'typescript'\n  | 'upload'\n>\n\nexport type ServerOnlyRootAdminProperties = keyof Pick<SanitizedConfig['admin'], 'components'>\n\nexport type ClientConfig = {\n  admin: {\n    dashboard?: {\n      widgets: ClientWidget[]\n    }\n    livePreview?: Omit<RootLivePreviewConfig, ServerOnlyLivePreviewProperties>\n  } & Omit<SanitizedConfig['admin'], 'components' | 'dashboard' | 'dependencies' | 'livePreview'>\n  blocks: ClientBlock[]\n  blocksMap: Record<BlockSlug, ClientBlock>\n  branching: ClientBranchingConfig\n  collections: ClientCollectionConfig[]\n  custom?: Record<string, any>\n  globals: ClientGlobalConfig[]\n  unauthenticated?: boolean\n} & Omit<\n  SanitizedConfig,\n  'admin' | 'branching' | 'collections' | 'globals' | 'i18n' | ServerOnlyRootProperties\n>\n\nexport type UnauthenticatedClientConfig = {\n  admin: {\n    routes: ClientConfig['admin']['routes']\n    user: ClientConfig['admin']['user']\n  }\n  collections: [\n    {\n      auth: ClientCollectionConfig['auth']\n      slug: string\n    },\n  ]\n  globals: []\n  routes: ClientConfig['routes']\n  serverURL: ClientConfig['serverURL']\n  unauthenticated: true\n}\n\nexport const serverOnlyAdminConfigProperties: readonly Partial<ServerOnlyRootAdminProperties>[] = []\n\nexport const serverOnlyConfigProperties: readonly Partial<ServerOnlyRootProperties>[] = [\n  'baseAccess',\n  'endpoints',\n  'db',\n  'editor',\n  'plugins',\n  'onInit',\n  'secret',\n  'hooks',\n  'cli',\n  'i18n',\n  'typescript',\n  'cors',\n  'csrf',\n  'email',\n  'custom',\n  'graphQL',\n  'jobs',\n  'logger',\n  'kv',\n  'llmInstructions',\n  'queryPresets',\n  'storage',\n  'upload',\n  // `admin`, `onInit`, `localization`, `collections`, and `globals` are all handled separately\n]\n\nexport type CreateClientConfigArgs = {\n  config: SanitizedConfig\n  i18n: I18nClient\n  importMap: ImportMap\n  /**\n   * If unauthenticated, the client config will omit some sensitive properties\n   * such as field schemas, etc. This is useful for login and error pages where\n   * the page source should not contain this information.\n   *\n   * For example, allow `true` to generate a client config for the \"create first user\" page\n   * where there is no user yet, but the config should still be complete.\n   */\n  user: true | User\n}\n\nexport const createUnauthenticatedClientConfig = ({\n  clientConfig,\n}: {\n  /**\n   * Send the previously generated client config to share memory when applicable.\n   * E.g. the admin-enabled collection config can reference the existing collection rather than creating a new object.\n   */\n  clientConfig: ClientConfig\n}): UnauthenticatedClientConfig => {\n  /**\n   * To share memory, find the admin user collection from the existing client config.\n   */\n  const adminUserCollection = clientConfig.collections.find(\n    ({ slug }) => slug === clientConfig.admin.user,\n  )!\n\n  return {\n    admin: {\n      routes: clientConfig.admin.routes,\n      user: clientConfig.admin.user,\n    },\n    collections: [\n      {\n        slug: adminUserCollection.slug,\n        auth: adminUserCollection.auth,\n      },\n    ],\n    globals: [],\n    routes: clientConfig.routes,\n    serverURL: clientConfig.serverURL,\n    unauthenticated: true,\n  }\n}\n\nexport const createClientConfig = ({\n  config,\n  i18n,\n  importMap,\n}: CreateClientConfigArgs): ClientConfig => {\n  const clientConfig = {} as DeepPartial<ClientConfig>\n\n  for (const key in config) {\n    if (serverOnlyConfigProperties.includes(key as any)) {\n      continue\n    }\n\n    switch (key) {\n      case 'admin':\n        clientConfig.admin = {\n          autoLogin: config.admin.autoLogin,\n          autoRefresh: config.admin.autoRefresh,\n          avatar: config.admin.avatar,\n          constrainWidth: config.admin.constrainWidth,\n          custom: config.admin.custom,\n          dateFormat: config.admin.dateFormat,\n          importMap: config.admin.importMap,\n          meta: config.admin.meta,\n          routes: config.admin.routes,\n          theme: config.admin.theme,\n          timezones: config.admin.timezones,\n          toast: config.admin.toast,\n          user: config.admin.user,\n        }\n\n        if (config.admin.dashboard?.widgets) {\n          ;(clientConfig.admin.dashboard ??= {}).widgets = config.admin.dashboard.widgets.map(\n            (widget) => {\n              const { Component: _, fields, label, ...rest } = widget\n              return {\n                ...rest,\n                ...(fields?.length\n                  ? {\n                      fields: createClientFields({\n                        defaultIDType: config.db.defaultIDType,\n                        fields,\n                        i18n,\n                        importMap,\n                      }),\n                    }\n                  : {}),\n                // Resolve label function to string for client\n                label:\n                  typeof label === 'function' ? label({ i18n, t: i18n.t as TFunction }) : label,\n              }\n            },\n          )\n        }\n\n        if (config.admin.livePreview) {\n          clientConfig.admin.livePreview = {}\n\n          if (config.admin.livePreview.breakpoints) {\n            clientConfig.admin.livePreview.breakpoints = config.admin.livePreview.breakpoints\n          }\n\n          if (config.admin.livePreview.collections) {\n            clientConfig.admin.livePreview.collections = config.admin.livePreview.collections\n          }\n\n          if (config.admin.livePreview.globals) {\n            clientConfig.admin.livePreview.globals = config.admin.livePreview.globals\n          }\n        }\n\n        break\n\n      case 'blocks': {\n        ;(clientConfig.blocks as ClientBlock[]) = createClientBlocks({\n          blocks: config.blocks,\n          defaultIDType: config.db.defaultIDType,\n          i18n,\n          importMap,\n        }).filter((block) => typeof block !== 'string')\n\n        clientConfig.blocksMap = {}\n        if (clientConfig.blocks?.length) {\n          for (const block of clientConfig.blocks) {\n            if (!block?.slug) {\n              continue\n            }\n\n            clientConfig.blocksMap[block.slug] = block as ClientBlock\n          }\n        }\n\n        break\n      }\n\n      // Only which entities branch — access functions, merge hooks and the\n      // shadowed-ID ceiling are server concerns and aren't serializable.\n      case 'branching':\n        clientConfig.branching = {\n          branchableCollections: Array.from(config.branching.branchableCollections),\n          branchableGlobals: Array.from(config.branching.branchableGlobals),\n          enabled: config.branching.enabled,\n        }\n\n        break\n\n      case 'collections':\n        ;(clientConfig.collections as ClientCollectionConfig[]) = createClientCollectionConfigs({\n          collections: config.collections,\n          defaultIDType: config.db.defaultIDType,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'globals':\n        ;(clientConfig.globals as ClientGlobalConfig[]) = createClientGlobalConfigs({\n          defaultIDType: config.db.defaultIDType,\n          globals: config.globals,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'localization':\n        if (typeof config.localization === 'object' && config.localization) {\n          clientConfig.localization = {}\n\n          if (config.localization.defaultLocale) {\n            clientConfig.localization.defaultLocale = config.localization.defaultLocale\n          }\n\n          if (config.localization.fallback) {\n            clientConfig.localization.fallback = config.localization.fallback\n          }\n\n          if (config.localization.localeCodes) {\n            clientConfig.localization.localeCodes = config.localization.localeCodes\n          }\n\n          if (config.localization.locales) {\n            clientConfig.localization.locales = []\n\n            for (const locale of config.localization.locales) {\n              if (locale) {\n                const clientLocale: Partial<(typeof config.localization.locales)[0]> = {}\n\n                if (locale.code) {\n                  clientLocale.code = locale.code\n                }\n\n                if (locale.fallbackLocale) {\n                  clientLocale.fallbackLocale = locale.fallbackLocale\n                }\n\n                if (locale.label) {\n                  clientLocale.label = locale.label\n                }\n\n                if (locale.rtl) {\n                  clientLocale.rtl = locale.rtl\n                }\n\n                clientConfig.localization.locales.push(clientLocale)\n              }\n            }\n          }\n        }\n\n        break\n\n      default:\n        ;(clientConfig as any)[key] = config[key as keyof SanitizedConfig]\n    }\n  }\n\n  return clientConfig as ClientConfig\n}\n"],"names":["createClientCollectionConfigs","createClientBlocks","createClientFields","createClientGlobalConfigs","serverOnlyAdminConfigProperties","serverOnlyConfigProperties","createUnauthenticatedClientConfig","clientConfig","adminUserCollection","collections","find","slug","admin","user","routes","auth","globals","serverURL","unauthenticated","createClientConfig","config","i18n","importMap","key","includes","autoLogin","autoRefresh","avatar","constrainWidth","custom","dateFormat","meta","theme","timezones","toast","dashboard","widgets","map","widget","Component","_","fields","label","rest","length","defaultIDType","db","t","livePreview","breakpoints","blocks","filter","block","blocksMap","branching","branchableCollections","Array","from","branchableGlobals","enabled","localization","defaultLocale","fallback","localeCodes","locales","locale","clientLocale","code","fallbackLocale","rtl","push"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAKxC,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,MA4FpD,CAAA"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../src/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,YAAY,CAAA;AA4CrD,eAAO,MAAM,mBAAmB,WAAY,MAAM,KAAG,MAsHpD,CAAA"}

package/dist/config/defaults.js

@@ -1,90 +1,147 @@
 import { defaultAccess } from '../auth/defaultAccess.js';
 import { databaseKVAdapter } from '../kv/adapters/DatabaseKVAdapter.js';
+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 ?? {},
+        constrainWidth: admin?.constrainWidth ?? false,
+        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 ?? {
+        transformers: []
     };
-    config.upload = config.upload ?? {};
     config.auth = {
-        jwtOrder: [
+        ...config.auth || {},
+        jwtOrder: config.auth?.jwtOrder ?? [
             'JWT',
             'Bearer',
             'cookie'
         ],
-        ...config.auth || {}
+        passwordHashIterations: config.auth?.passwordHashIterations ?? 600000
     };
     config.kv = config.kv ?? databaseKVAdapter();
     if (config.kv?.kvCollection) {