@payloadcms/ui 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/utilities/schedulePublishHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"schedulePublishHandler.js","names":["canAccessAdmin","schedulePublishHandler","type","date","deleteID","doc","global","localeToPublish","req","timezone","i18n","payload","user","delete","collection","where","id","equals","jobs","queue","input","locale","task","waitUntil","err","error","value","relationTo","logger","message","t"],"sources":["../../src/utilities/schedulePublishHandler.ts"],"sourcesContent":["import { canAccessAdmin, type SchedulePublishTaskInput, type ServerFunction } from 'payload'\n\nexport type SchedulePublishHandlerArgs = {\n  date?: Date\n  /**\n   * The job id to delete to remove a scheduled publish event\n   */\n  deleteID?: number | string\n  localeToPublish?: string\n  timezone?: string\n} & Pick<SchedulePublishTaskInput, 'doc' | 'global' | 'type'>\n\nexport const schedulePublishHandler: ServerFunction<SchedulePublishHandlerArgs> = async ({\n  type,\n  date,\n  deleteID,\n  doc,\n  global,\n  localeToPublish,\n  req,\n  timezone,\n}) => {\n  const { i18n, payload, user } = req\n\n  await canAccessAdmin({ req })\n\n  try {\n    if (deleteID) {\n      await payload.delete({\n        collection: 'payload-jobs',\n        req,\n        where: { id: { equals: deleteID } },\n      })\n    }\n\n    await payload.jobs.queue({\n      input: {\n        type,\n        doc,\n        global,\n        locale: localeToPublish,\n        timezone,\n        user: user.id,\n      },\n      task: 'schedulePublish',\n      waitUntil: date,\n    })\n  } catch (err) {\n    let error\n\n    if (deleteID) {\n      error = `Error deleting scheduled publish event with ID ${deleteID}`\n    } else {\n      error = `Error scheduling ${type} for `\n      if (doc) {\n        error += `document with ID ${doc.value} in collection ${doc.relationTo}`\n      }\n    }\n\n    payload.logger.error({ err }, error)\n\n    return {\n      error,\n    }\n  }\n\n  return { message: i18n.t('general:success') }\n}\n"],"mappings":"AAAA,SAASA,cAAc,QAA4D;AAYnF,OAAO,MAAMC,sBAAA,GAAqE,MAAAA,CAAO;EACvFC,IAAI;EACJC,IAAI;EACJC,QAAQ;EACRC,GAAG;EACHC,MAAM;EACNC,eAAe;EACfC,GAAG;EACHC;AAAQ,CACT;EACC,MAAM;IAAEC,IAAI;IAAEC,OAAO;IAAEC;EAAI,CAAE,GAAGJ,GAAA;EAEhC,MAAMR,cAAA,CAAe;IAAEQ;EAAI;EAE3B,IAAI;IACF,IAAIJ,QAAA,EAAU;MACZ,MAAMO,OAAA,CAAQE,MAAM,CAAC;QACnBC,UAAA,EAAY;QACZN,GAAA;QACAO,KAAA,EAAO;UAAEC,EAAA,EAAI;YAAEC,MAAA,EAAQb;UAAS;QAAE;MACpC;IACF;IAEA,MAAMO,OAAA,CAAQO,IAAI,CAACC,KAAK,CAAC;MACvBC,KAAA,EAAO;QACLlB,IAAA;QACAG,GAAA;QACAC,MAAA;QACAe,MAAA,EAAQd,eAAA;QACRE,QAAA;QACAG,IAAA,EAAMA,IAAA,CAAKI;MACb;MACAM,IAAA,EAAM;MACNC,SAAA,EAAWpB;IACb;EACF,EAAE,OAAOqB,GAAA,EAAK;IACZ,IAAIC,KAAA;IAEJ,IAAIrB,QAAA,EAAU;MACZqB,KAAA,GAAQ,kDAAkDrB,QAAA,EAAU;IACtE,OAAO;MACLqB,KAAA,GAAQ,oBAAoBvB,IAAA,OAAW;MACvC,IAAIG,GAAA,EAAK;QACPoB,KAAA,IAAS,oBAAoBpB,GAAA,CAAIqB,KAAK,kBAAkBrB,GAAA,CAAIsB,UAAU,EAAE;MAC1E;IACF;IAEAhB,OAAA,CAAQiB,MAAM,CAACH,KAAK,CAAC;MAAED;IAAI,GAAGC,KAAA;IAE9B,OAAO;MACLA;IACF;EACF;EAEA,OAAO;IAAEI,OAAA,EAASnB,IAAA,CAAKoB,CAAC,CAAC;EAAmB;AAC9C","ignoreList":[]}
+{"version":3,"file":"schedulePublishHandler.js","names":["canAccessAdmin","Forbidden","hasScheduledPublishEnabled","MAIN_BRANCH","buildUpcomingScheduleWhere","getDocumentPermissions","getUpcomingScheduledPublishHandler","id","collectionSlug","globalSlug","req","payload","collectionConfig","collections","config","undefined","globalConfig","globals","find","slug","entityConfig","hasValidTarget","Boolean","t","hasPublishPermission","data","docs","db","collection","limit","sort","where","map","job","input","type","locale","timezone","waitUntil","schedulePublishHandler","date","deleteID","doc","global","localeToPublish","i18n","user","branch","error","delete","overrideAccess","and","equals","taskSlug","message","jobs","queue","relationTo","value","task","err","logger"],"sources":["../../src/utilities/schedulePublishHandler.ts"],"sourcesContent":["import type { SchedulePublishTaskInput, ServerFunction } from 'payload'\n\nimport { canAccessAdmin, Forbidden } from 'payload'\nimport { hasScheduledPublishEnabled, MAIN_BRANCH } from 'payload/shared'\n\nimport type { UpcomingEvent } from '../elements/PublishButton/ScheduleDrawer/types.js'\n\nimport { buildUpcomingScheduleWhere } from '../elements/PublishButton/ScheduleDrawer/buildUpcomingScheduleWhere.js'\nimport { getDocumentPermissions } from './getDocumentPermissions.js'\n\nexport type SchedulePublishHandlerArgs = {\n  date?: Date\n  /**\n   * The job id to delete to remove a scheduled publish event\n   */\n  deleteID?: number | string\n  localeToPublish?: string\n  timezone?: string\n} & Pick<SchedulePublishTaskInput, 'doc' | 'global' | 'type'>\n\nexport type GetUpcomingScheduledPublishHandlerArgs = {\n  collectionSlug?: string\n  globalSlug?: string\n  id?: number | string\n}\n\nexport const getUpcomingScheduledPublishHandler: ServerFunction<\n  GetUpcomingScheduledPublishHandlerArgs,\n  Promise<UpcomingEvent[]>\n> = async ({ id, collectionSlug, globalSlug, req }) => {\n  const { payload } = req\n\n  await canAccessAdmin({ req })\n\n  const collectionConfig = collectionSlug ? payload.collections[collectionSlug]?.config : undefined\n  const globalConfig = globalSlug\n    ? payload.config.globals.find(({ slug }) => slug === globalSlug)\n    : undefined\n  const entityConfig = collectionConfig || globalConfig\n  const hasValidTarget = Boolean(\n    entityConfig &&\n      hasScheduledPublishEnabled(entityConfig) &&\n      ((collectionConfig && id !== undefined && !globalSlug) || (globalConfig && !collectionSlug)),\n  )\n\n  if (!hasValidTarget) {\n    throw new Forbidden(req.t)\n  }\n\n  const { hasPublishPermission } = await getDocumentPermissions({\n    id,\n    collectionConfig,\n    data: {},\n    globalConfig,\n    req,\n  })\n\n  if (!hasPublishPermission) {\n    throw new Forbidden(req.t)\n  }\n\n  const { docs } = await payload.db.find<UpcomingEvent>({\n    collection: 'payload-jobs',\n    limit: 0,\n    sort: 'waitUntil',\n    where: buildUpcomingScheduleWhere({ id, collectionSlug, globalSlug }),\n  })\n\n  return docs.map((job) => ({\n    id: job.id,\n    input: {\n      type: job.input?.type === 'unpublish' ? 'unpublish' : 'publish',\n      locale: job.input?.locale,\n      timezone: job.input?.timezone,\n    },\n    waitUntil: job.waitUntil,\n  }))\n}\n\nexport const schedulePublishHandler: ServerFunction<SchedulePublishHandlerArgs> = async ({\n  type,\n  date,\n  deleteID,\n  doc,\n  global,\n  localeToPublish,\n  req,\n  timezone,\n}) => {\n  const { i18n, payload, user } = req\n\n  await canAccessAdmin({ req })\n\n  // Scheduled publish operates on main (§18): the job runs later, with no branch\n  // on its request, so a job queued from a branch would publish main's copy of the\n  // document at the appointed time. Refused rather than silently retargeted —\n  // the UI hides the affordance, so reaching this means bypassing it.\n  if (req.branch && req.branch !== MAIN_BRANCH) {\n    return {\n      error: 'Scheduled publish is not available on a branch. Switch to main to schedule.',\n    }\n  }\n\n  try {\n    if (deleteID) {\n      await payload.delete({\n        collection: 'payload-jobs',\n        overrideAccess: true,\n        req,\n        where: {\n          and: [{ id: { equals: deleteID } }, { taskSlug: { equals: 'schedulePublish' } }],\n        },\n      })\n\n      return { message: i18n.t('general:success') }\n    }\n\n    await payload.jobs.queue({\n      input: {\n        type,\n        doc,\n        global,\n        locale: localeToPublish,\n        timezone,\n        user:\n          user && user.collection\n            ? {\n                relationTo: user.collection,\n                value: user.id,\n              }\n            : undefined,\n      },\n      overrideAccess: true,\n      task: 'schedulePublish',\n      waitUntil: date,\n    })\n  } catch (err) {\n    let error\n\n    if (deleteID) {\n      error = `Error deleting scheduled publish event with ID ${deleteID}`\n    } else {\n      error = `Error scheduling ${type} for `\n      if (doc) {\n        error += `document with ID ${doc.value} in collection ${doc.relationTo}`\n      }\n    }\n\n    payload.logger.error({ err }, error)\n\n    return {\n      error,\n    }\n  }\n\n  return { message: i18n.t('general:success') }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/serverFunctionRegistry.d.ts

@@ -1,13 +1,18 @@
 import type { ServerFunction } from 'payload';
 /**
- * Framework-agnostic server function handlers shared across all adapters.
+ * The complete, framework-agnostic set of Payload server functions.
  *
- * Each handler returns a value that may contain React elements (e.g.
- * `customComponents` inside form state, the `Document` / `List` nodes returned
- * by render-document / render-list). Adapters are expected to ship those over
- * the wire as RSC payloads — Next.js's runtime does this natively, while the
- * TanStack Start adapter pipes the result through `serializeForRsc` to convert
- * elements into `renderServerComponent` handles.
+ * Every adapter (`@payloadcms/next`, `@payloadcms/tanstack-start`) dispatches
+ * from this single registry via `createServerFunctionHandler`, so a handler
+ * added here reaches every framework and the adapter lists can't drift.
+ *
+ * Handlers may return values containing React elements (e.g. `customComponents`
+ * inside form state, the `Document` / `List` nodes from render-document /
+ * render-list, the render-field / render-widget output). Adapters ship those
+ * over the wire as RSC payloads: Next.js does this natively, while the TanStack
+ * Start adapter passes a `transformResult` (`serializeForRsc`) to
+ * `createServerFunctionHandler` that converts elements into
+ * `renderServerComponent` handles.
  */
 export declare const sharedServerFunctions: Record<string, ServerFunction<any, any>>;
 //# sourceMappingURL=serverFunctionRegistry.d.ts.map

package/dist/utilities/serverFunctionRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serverFunctionRegistry.d.ts","sourceRoot":"","sources":["../../src/utilities/serverFunctionRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAS7C;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAO1E,CAAA"}
+{"version":3,"file":"serverFunctionRegistry.d.ts","sourceRoot":"","sources":["../../src/utilities/serverFunctionRegistry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AA0B7C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAqB1E,CAAA"}

package/dist/utilities/serverFunctionRegistry.js

@@ -1,25 +1,54 @@
+import { renderTabHandler } from '../elements/Nav/SidebarTabs/renderTabServerFn.js';
+import { _internal_renderFieldHandler } from '../forms/fieldSchemasToFormState/serverFunctions/renderFieldServerFn.js';
+import { renderBranchDiffHandler } from '../views/Branch/renderBranchDiff.js';
+import { renderMergeDiffHandler } from '../views/Branch/renderMergeDiff.js';
+import { getDefaultLayoutHandler, renderWidgetHandler } from '../views/Dashboard/serverFunctions.js';
 import { renderDocumentHandler } from '../views/Document/handleServerFunction.js';
+import { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js';
 import { renderListHandler } from '../views/List/handleServerFunction.js';
+import { getDashboardDocumentsHandler } from '../widgets/RecentlyViewed/getDocuments.js';
 import { buildFormStateHandler } from './buildFormState.js';
 import { buildTableStateHandler } from './buildTableState.js';
 import { copyDataFromLocaleHandler } from './copyDataFromLocale.js';
-import { schedulePublishHandler } from './schedulePublishHandler.js';
+import { getBranchMergeSummaryHandler, getUpcomingBranchMergesHandler, scheduleMergeHandler } from './scheduleMergeHandler.js';
+import { getUpcomingScheduledPublishHandler, schedulePublishHandler } from './schedulePublishHandler.js';
+import { slugifyHandler } from './slugify.js';
+import { switchLanguageHandler } from './switchLanguageHandler.js';
 /**
- * Framework-agnostic server function handlers shared across all adapters.
+ * The complete, framework-agnostic set of Payload server functions.
  *
- * Each handler returns a value that may contain React elements (e.g.
- * `customComponents` inside form state, the `Document` / `List` nodes returned
- * by render-document / render-list). Adapters are expected to ship those over
- * the wire as RSC payloads — Next.js's runtime does this natively, while the
- * TanStack Start adapter pipes the result through `serializeForRsc` to convert
- * elements into `renderServerComponent` handles.
+ * Every adapter (`@payloadcms/next`, `@payloadcms/tanstack-start`) dispatches
+ * from this single registry via `createServerFunctionHandler`, so a handler
+ * added here reaches every framework and the adapter lists can't drift.
+ *
+ * Handlers may return values containing React elements (e.g. `customComponents`
+ * inside form state, the `Document` / `List` nodes from render-document /
+ * render-list, the render-field / render-widget output). Adapters ship those
+ * over the wire as RSC payloads: Next.js does this natively, while the TanStack
+ * Start adapter passes a `transformResult` (`serializeForRsc`) to
+ * `createServerFunctionHandler` that converts elements into
+ * `renderServerComponent` handles.
  */
 export const sharedServerFunctions = {
   'copy-data-from-locale': copyDataFromLocaleHandler,
   'form-state': buildFormStateHandler,
+  'get-branch-merge-summary': getBranchMergeSummaryHandler,
+  'get-dashboard-documents': getDashboardDocumentsHandler,
+  'get-default-layout': getDefaultLayoutHandler,
+  'get-upcoming-branch-merges': getUpcomingBranchMergesHandler,
+  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,
+  'render-branch-diff': renderBranchDiffHandler,
   'render-document': renderDocumentHandler,
+  'render-document-slots': renderDocumentSlotsHandler,
+  'render-field': _internal_renderFieldHandler,
   'render-list': renderListHandler,
+  'render-merge-diff': renderMergeDiffHandler,
+  'render-tab': renderTabHandler,
+  'render-widget': renderWidgetHandler,
+  'schedule-merge': scheduleMergeHandler,
   'schedule-publish': schedulePublishHandler,
+  slugify: slugifyHandler,
+  'switch-language': switchLanguageHandler,
   'table-state': buildTableStateHandler
 };
 //# sourceMappingURL=serverFunctionRegistry.js.map

package/dist/utilities/serverFunctionRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverFunctionRegistry.js","names":["renderDocumentHandler","renderListHandler","buildFormStateHandler","buildTableStateHandler","copyDataFromLocaleHandler","schedulePublishHandler","sharedServerFunctions"],"sources":["../../src/utilities/serverFunctionRegistry.ts"],"sourcesContent":["import type { ServerFunction } from 'payload'\n\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { buildFormStateHandler } from './buildFormState.js'\nimport { buildTableStateHandler } from './buildTableState.js'\nimport { copyDataFromLocaleHandler } from './copyDataFromLocale.js'\nimport { schedulePublishHandler } from './schedulePublishHandler.js'\n\n/**\n * Framework-agnostic server function handlers shared across all adapters.\n *\n * Each handler returns a value that may contain React elements (e.g.\n * `customComponents` inside form state, the `Document` / `List` nodes returned\n * by render-document / render-list). Adapters are expected to ship those over\n * the wire as RSC payloads — Next.js's runtime does this natively, while the\n * TanStack Start adapter pipes the result through `serializeForRsc` to convert\n * elements into `renderServerComponent` handles.\n */\nexport const sharedServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'render-document': renderDocumentHandler,\n  'render-list': renderListHandler,\n  'schedule-publish': schedulePublishHandler,\n  'table-state': buildTableStateHandler,\n}\n"],"mappings":"AAEA,SAASA,qBAAqB,QAAQ;AACtC,SAASC,iBAAiB,QAAQ;AAClC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,yBAAyB,QAAQ;AAC1C,SAASC,sBAAsB,QAAQ;AAEvC;;;;;;;;;;AAUA,OAAO,MAAMC,qBAAA,GAAkE;EAC7E,yBAAyBF,yBAAA;EACzB,cAAcF,qBAAA;EACd,mBAAmBF,qBAAA;EACnB,eAAeC,iBAAA;EACf,oBAAoBI,sBAAA;EACpB,eAAeF;AACjB","ignoreList":[]}
+{"version":3,"file":"serverFunctionRegistry.js","names":["renderTabHandler","_internal_renderFieldHandler","renderBranchDiffHandler","renderMergeDiffHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","getDashboardDocumentsHandler","buildFormStateHandler","buildTableStateHandler","copyDataFromLocaleHandler","getBranchMergeSummaryHandler","getUpcomingBranchMergesHandler","scheduleMergeHandler","getUpcomingScheduledPublishHandler","schedulePublishHandler","slugifyHandler","switchLanguageHandler","sharedServerFunctions","slugify"],"sources":["../../src/utilities/serverFunctionRegistry.ts"],"sourcesContent":["import type { ServerFunction } from 'payload'\n\nimport { renderTabHandler } from '../elements/Nav/SidebarTabs/renderTabServerFn.js'\nimport { _internal_renderFieldHandler } from '../forms/fieldSchemasToFormState/serverFunctions/renderFieldServerFn.js'\nimport { renderBranchDiffHandler } from '../views/Branch/renderBranchDiff.js'\nimport { renderMergeDiffHandler } from '../views/Branch/renderMergeDiff.js'\nimport { getDefaultLayoutHandler, renderWidgetHandler } from '../views/Dashboard/serverFunctions.js'\nimport { renderDocumentHandler } from '../views/Document/handleServerFunction.js'\nimport { renderDocumentSlotsHandler } from '../views/Document/renderDocumentSlots.js'\nimport { renderListHandler } from '../views/List/handleServerFunction.js'\nimport { getDashboardDocumentsHandler } from '../widgets/RecentlyViewed/getDocuments.js'\nimport { buildFormStateHandler } from './buildFormState.js'\nimport { buildTableStateHandler } from './buildTableState.js'\nimport { copyDataFromLocaleHandler } from './copyDataFromLocale.js'\nimport {\n  getBranchMergeSummaryHandler,\n  getUpcomingBranchMergesHandler,\n  scheduleMergeHandler,\n} from './scheduleMergeHandler.js'\nimport {\n  getUpcomingScheduledPublishHandler,\n  schedulePublishHandler,\n} from './schedulePublishHandler.js'\nimport { slugifyHandler } from './slugify.js'\nimport { switchLanguageHandler } from './switchLanguageHandler.js'\n\n/**\n * The complete, framework-agnostic set of Payload server functions.\n *\n * Every adapter (`@payloadcms/next`, `@payloadcms/tanstack-start`) dispatches\n * from this single registry via `createServerFunctionHandler`, so a handler\n * added here reaches every framework and the adapter lists can't drift.\n *\n * Handlers may return values containing React elements (e.g. `customComponents`\n * inside form state, the `Document` / `List` nodes from render-document /\n * render-list, the render-field / render-widget output). Adapters ship those\n * over the wire as RSC payloads: Next.js does this natively, while the TanStack\n * Start adapter passes a `transformResult` (`serializeForRsc`) to\n * `createServerFunctionHandler` that converts elements into\n * `renderServerComponent` handles.\n */\nexport const sharedServerFunctions: Record<string, ServerFunction<any, any>> = {\n  'copy-data-from-locale': copyDataFromLocaleHandler,\n  'form-state': buildFormStateHandler,\n  'get-branch-merge-summary': getBranchMergeSummaryHandler,\n  'get-dashboard-documents': getDashboardDocumentsHandler,\n  'get-default-layout': getDefaultLayoutHandler,\n  'get-upcoming-branch-merges': getUpcomingBranchMergesHandler,\n  'get-upcoming-scheduled-publish': getUpcomingScheduledPublishHandler,\n  'render-branch-diff': renderBranchDiffHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-merge-diff': renderMergeDiffHandler,\n  'render-tab': renderTabHandler,\n  'render-widget': renderWidgetHandler,\n  'schedule-merge': scheduleMergeHandler,\n  'schedule-publish': schedulePublishHandler,\n  slugify: slugifyHandler,\n  'switch-language': switchLanguageHandler,\n  'table-state': buildTableStateHandler,\n}\n"],"mappings":"AAEA,SAASA,gBAAgB,QAAQ;AACjC,SAASC,4BAA4B,QAAQ;AAC7C,SAASC,uBAAuB,QAAQ;AACxC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,uBAAuB,EAAEC,mBAAmB,QAAQ;AAC7D,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,4BAA4B,QAAQ;AAC7C,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,yBAAyB,QAAQ;AAC1C,SACEC,4BAA4B,EAC5BC,8BAA8B,EAC9BC,oBAAoB,QACf;AACP,SACEC,kCAAkC,EAClCC,sBAAsB,QACjB;AACP,SAASC,cAAc,QAAQ;AAC/B,SAASC,qBAAqB,QAAQ;AAEtC;;;;;;;;;;;;;;;AAeA,OAAO,MAAMC,qBAAA,GAAkE;EAC7E,yBAAyBR,yBAAA;EACzB,cAAcF,qBAAA;EACd,4BAA4BG,4BAAA;EAC5B,2BAA2BJ,4BAAA;EAC3B,sBAAsBL,uBAAA;EACtB,8BAA8BU,8BAAA;EAC9B,kCAAkCE,kCAAA;EAClC,sBAAsBd,uBAAA;EACtB,mBAAmBI,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBN,4BAAA;EAChB,eAAeO,iBAAA;EACf,qBAAqBL,sBAAA;EACrB,cAAcH,gBAAA;EACd,iBAAiBK,mBAAA;EACjB,kBAAkBU,oBAAA;EAClB,oBAAoBE,sBAAA;EACpBI,OAAA,EAASH,cAAA;EACT,mBAAmBC,qBAAA;EACnB,eAAeR;AACjB","ignoreList":[]}

package/dist/utilities/slugify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slugify.d.ts","sourceRoot":"","sources":["../../src/utilities/slugify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAGL,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAE/B,MAAM,SAAS,CAAA;AAGhB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,EAAE,cAAc,CACzC,yBAAyB,EACzB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAiC7B,CAAA"}
+{"version":3,"file":"slugify.d.ts","sourceRoot":"","sources":["../../src/utilities/slugify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AAE7C,OAAO,EAML,KAAK,cAAc,EACnB,KAAK,yBAAyB,EAE/B,MAAM,SAAS,CAAA;AAGhB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,cAAc,EAAE,cAAc,CACzC,yBAAyB,EACzB,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAuF7B,CAAA"}

package/dist/utilities/slugify.js

@@ -1,4 +1,4 @@
-import { flattenAllFields, getFieldByPath, UnauthorizedError } from 'payload';
+import { executeAccess, getFieldByPath, getSlugFallbackValue, getUniqueFieldValue, hasDraftsEnabled, UnauthorizedError } from 'payload';
 import { slugify as defaultSlugify } from 'payload/shared';
 /**
  * This server function is directly related to the {@link https://payloadcms.com/docs/fields/slug | Slug Field}.
@@ -13,9 +13,11 @@ import { slugify as defaultSlugify } from 'payload/shared';
  */
 export const slugifyHandler = async args => {
   const {
+    id,
     collectionSlug,
     data,
     globalSlug,
+    locale,
     path,
     req,
     valueToSlugify
@@ -31,17 +33,61 @@ export const slugifyHandler = async args => {
     field
   } = getFieldByPath({
     config: req.payload.config,
-    fields: flattenAllFields({
-      fields: docConfig.fields
-    }),
+    fields: docConfig.flattenedFields,
     path
   });
   const customSlugify = typeof field?.custom?.slugify === 'function' ? field.custom.slugify : undefined;
-  const result = customSlugify ? await customSlugify({
+  const slugify = valueToSlugify => customSlugify ? customSlugify({
     data,
     req,
     valueToSlugify
   }) : defaultSlugify(valueToSlugify);
-  return result;
+  const result = await slugify(valueToSlugify);
+  const collectionConfig = collectionSlug ? req.payload.collections[collectionSlug]?.config : null;
+  // Uniqueness dedupe only applies to a collection's slug field. Globals have no collection to
+  // dedupe against, so their result is returned as-is.
+  if (!collectionConfig || !field || field.type !== 'slug' || !('name' in field)) {
+    return result;
+  }
+  // Probing reads across the whole collection with the raw db, so require unrestricted read access —
+  // a row-filtered (`Where`) result is treated as not allowed, since scoping the probe to readable
+  // rows would break uniqueness.
+  const canRead = await executeAccess({
+    slug: collectionConfig.slug,
+    disableErrors: true,
+    req
+  }, collectionConfig.access.read);
+  if (canRead !== true) {
+    return result;
+  }
+  // A localized slug is unique per-locale, so scope the probe to the current locale — otherwise it
+  // dedupes against the default locale and can hand back a colliding value. The client passes the
+  // active admin locale; fall back to the request's own locale.
+  const localeToScope = field.localized ? locale ?? req.locale ?? undefined : undefined;
+  // The current doc is excluded so a regenerate can reuse its own value rather than bump past it.
+  const excludeId = typeof id === 'string' || typeof id === 'number' ? id : undefined;
+  // A source resolved to a value: dedupe it the same way the next save would, so the generate button
+  // can't hand back a slug that's already taken. With no source, return the `<singular>-N` fallback.
+  if (result) {
+    return getUniqueFieldValue({
+      id: excludeId,
+      collection: collectionConfig.slug,
+      draftsEnabled: hasDraftsEnabled(collectionConfig),
+      field: field.name,
+      locale: localeToScope,
+      overrideAccess: true,
+      req,
+      value: result
+    });
+  }
+  return getSlugFallbackValue({
+    id: excludeId,
+    collection: collectionConfig,
+    field: field.name,
+    locale: localeToScope,
+    overrideAccess: true,
+    req,
+    slugify
+  });
 };
 //# sourceMappingURL=slugify.js.map

package/dist/utilities/slugify.js.map

@@ -1 +1 @@
-{"version":3,"file":"slugify.js","names":["flattenAllFields","getFieldByPath","UnauthorizedError","slugify","defaultSlugify","slugifyHandler","args","collectionSlug","data","globalSlug","path","req","valueToSlugify","user","docConfig","payload","collections","config","globals","find","g","slug","Error","field","fields","customSlugify","custom","undefined","result"],"sources":["../../src/utilities/slugify.ts"],"sourcesContent":["import type { Slugify } from 'payload/shared'\n\nimport {\n  flattenAllFields,\n  getFieldByPath,\n  type ServerFunction,\n  type SlugifyServerFunctionArgs,\n  UnauthorizedError,\n} from 'payload'\nimport { slugify as defaultSlugify } from 'payload/shared'\n\n/**\n * This server function is directly related to the {@link https://payloadcms.com/docs/fields/slug | Slug Field}.\n * This is a server function that is used to invoke the user's custom slugify function from the client.\n * This pattern is required, as there is no other way for us to pass their function across the client-server boundary.\n *   - Not through props\n *   - Not from a server function defined within a server component (see below)\n * When a server function contains non-serializable data within its closure, it gets passed through the boundary (and breaks).\n * The only way to pass server functions to the client (that contain non-serializable data) is if it is globally defined.\n * But we also cannot define this function alongside the server component, as we will not have access to their custom slugify function.\n * See `ServerFunctionsProvider` for more details.\n */\nexport const slugifyHandler: ServerFunction<\n  SlugifyServerFunctionArgs,\n  Promise<ReturnType<Slugify>>\n> = async (args) => {\n  const { collectionSlug, data, globalSlug, path, req, valueToSlugify } = args\n\n  if (!req.user) {\n    throw new UnauthorizedError()\n  }\n\n  const docConfig = collectionSlug\n    ? req.payload.collections[collectionSlug]?.config\n    : globalSlug\n      ? req.payload.config.globals.find((g) => g.slug === globalSlug)\n      : null\n\n  if (!docConfig) {\n    throw new Error()\n  }\n\n  const { field } = getFieldByPath({\n    config: req.payload.config,\n    fields: flattenAllFields({ fields: docConfig.fields }),\n    path,\n  })\n\n  const customSlugify = (\n    typeof field?.custom?.slugify === 'function' ? field.custom.slugify : undefined\n  ) as Slugify\n\n  const result = customSlugify\n    ? await customSlugify({ data, req, valueToSlugify })\n    : defaultSlugify(valueToSlugify)\n\n  return result\n}\n"],"mappings":"AAEA,SACEA,gBAAgB,EAChBC,cAAc,EAGdC,iBAAiB,QACZ;AACP,SAASC,OAAA,IAAWC,cAAc,QAAQ;AAE1C;;;;;;;;;;;AAWA,OAAO,MAAMC,cAAA,GAGT,MAAOC,IAAA;EACT,MAAM;IAAEC,cAAc;IAAEC,IAAI;IAAEC,UAAU;IAAEC,IAAI;IAAEC,GAAG;IAAEC;EAAc,CAAE,GAAGN,IAAA;EAExE,IAAI,CAACK,GAAA,CAAIE,IAAI,EAAE;IACb,MAAM,IAAIX,iBAAA;EACZ;EAEA,MAAMY,SAAA,GAAYP,cAAA,GACdI,GAAA,CAAII,OAAO,CAACC,WAAW,CAACT,cAAA,CAAe,EAAEU,MAAA,GACzCR,UAAA,GACEE,GAAA,CAAII,OAAO,CAACE,MAAM,CAACC,OAAO,CAACC,IAAI,CAAEC,CAAA,IAAMA,CAAA,CAAEC,IAAI,KAAKZ,UAAA,IAClD;EAEN,IAAI,CAACK,SAAA,EAAW;IACd,MAAM,IAAIQ,KAAA;EACZ;EAEA,MAAM;IAAEC;EAAK,CAAE,GAAGtB,cAAA,CAAe;IAC/BgB,MAAA,EAAQN,GAAA,CAAII,OAAO,CAACE,MAAM;IAC1BO,MAAA,EAAQxB,gBAAA,CAAiB;MAAEwB,MAAA,EAAQV,SAAA,CAAUU;IAAO;IACpDd;EACF;EAEA,MAAMe,aAAA,GACJ,OAAOF,KAAA,EAAOG,MAAA,EAAQvB,OAAA,KAAY,aAAaoB,KAAA,CAAMG,MAAM,CAACvB,OAAO,GAAGwB,SAAA;EAGxE,MAAMC,MAAA,GAASH,aAAA,GACX,MAAMA,aAAA,CAAc;IAAEjB,IAAA;IAAMG,GAAA;IAAKC;EAAe,KAChDR,cAAA,CAAeQ,cAAA;EAEnB,OAAOgB,MAAA;AACT","ignoreList":[]}
+{"version":3,"file":"slugify.js","names":["executeAccess","getFieldByPath","getSlugFallbackValue","getUniqueFieldValue","hasDraftsEnabled","UnauthorizedError","slugify","defaultSlugify","slugifyHandler","args","id","collectionSlug","data","globalSlug","locale","path","req","valueToSlugify","user","docConfig","payload","collections","config","globals","find","g","slug","Error","field","fields","flattenedFields","customSlugify","custom","undefined","result","collectionConfig","type","canRead","disableErrors","access","read","localeToScope","localized","excludeId","collection","draftsEnabled","name","overrideAccess","value"],"sources":["../../src/utilities/slugify.ts"],"sourcesContent":["import type { Slugify } from 'payload/shared'\n\nimport {\n  executeAccess,\n  getFieldByPath,\n  getSlugFallbackValue,\n  getUniqueFieldValue,\n  hasDraftsEnabled,\n  type ServerFunction,\n  type SlugifyServerFunctionArgs,\n  UnauthorizedError,\n} from 'payload'\nimport { slugify as defaultSlugify } from 'payload/shared'\n\n/**\n * This server function is directly related to the {@link https://payloadcms.com/docs/fields/slug | Slug Field}.\n * This is a server function that is used to invoke the user's custom slugify function from the client.\n * This pattern is required, as there is no other way for us to pass their function across the client-server boundary.\n *   - Not through props\n *   - Not from a server function defined within a server component (see below)\n * When a server function contains non-serializable data within its closure, it gets passed through the boundary (and breaks).\n * The only way to pass server functions to the client (that contain non-serializable data) is if it is globally defined.\n * But we also cannot define this function alongside the server component, as we will not have access to their custom slugify function.\n * See `ServerFunctionsProvider` for more details.\n */\nexport const slugifyHandler: ServerFunction<\n  SlugifyServerFunctionArgs,\n  Promise<ReturnType<Slugify>>\n> = async (args) => {\n  const { id, collectionSlug, data, globalSlug, locale, path, req, valueToSlugify } = args\n\n  if (!req.user) {\n    throw new UnauthorizedError()\n  }\n\n  const docConfig = collectionSlug\n    ? req.payload.collections[collectionSlug]?.config\n    : globalSlug\n      ? req.payload.config.globals.find((g) => g.slug === globalSlug)\n      : null\n\n  if (!docConfig) {\n    throw new Error()\n  }\n\n  const { field } = getFieldByPath({\n    config: req.payload.config,\n    fields: docConfig.flattenedFields,\n    path,\n  })\n\n  const customSlugify = (\n    typeof field?.custom?.slugify === 'function' ? field.custom.slugify : undefined\n  ) as Slugify\n\n  const slugify = (valueToSlugify: unknown) =>\n    customSlugify\n      ? customSlugify({ data, req, valueToSlugify })\n      : defaultSlugify(valueToSlugify as string)\n\n  const result = await slugify(valueToSlugify)\n\n  const collectionConfig = collectionSlug ? req.payload.collections[collectionSlug]?.config : null\n\n  // Uniqueness dedupe only applies to a collection's slug field. Globals have no collection to\n  // dedupe against, so their result is returned as-is.\n  if (!collectionConfig || !field || field.type !== 'slug' || !('name' in field)) {\n    return result\n  }\n\n  // Probing reads across the whole collection with the raw db, so require unrestricted read access —\n  // a row-filtered (`Where`) result is treated as not allowed, since scoping the probe to readable\n  // rows would break uniqueness.\n  const canRead = await executeAccess(\n    { slug: collectionConfig.slug, disableErrors: true, req },\n    collectionConfig.access.read,\n  )\n\n  if (canRead !== true) {\n    return result\n  }\n\n  // A localized slug is unique per-locale, so scope the probe to the current locale — otherwise it\n  // dedupes against the default locale and can hand back a colliding value. The client passes the\n  // active admin locale; fall back to the request's own locale.\n  const localeToScope = field.localized ? (locale ?? req.locale ?? undefined) : undefined\n\n  // The current doc is excluded so a regenerate can reuse its own value rather than bump past it.\n  const excludeId = typeof id === 'string' || typeof id === 'number' ? id : undefined\n\n  // A source resolved to a value: dedupe it the same way the next save would, so the generate button\n  // can't hand back a slug that's already taken. With no source, return the `<singular>-N` fallback.\n  if (result) {\n    return getUniqueFieldValue({\n      id: excludeId,\n      collection: collectionConfig.slug,\n      draftsEnabled: hasDraftsEnabled(collectionConfig),\n      field: field.name,\n      locale: localeToScope,\n      overrideAccess: true,\n      req,\n      value: result,\n    })\n  }\n\n  return getSlugFallbackValue({\n    id: excludeId,\n    collection: collectionConfig,\n    field: field.name,\n    locale: localeToScope,\n    overrideAccess: true,\n    req,\n    slugify,\n  })\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/traverseForLocalizedFields.d.ts

@@ -1,3 +1,8 @@
-import type { ClientField, Field } from 'payload';
-export declare const traverseForLocalizedFields: (fields: ClientField[] | Field[]) => boolean;
+import type { ClientBlock, ClientField, Field } from 'payload';
+type TraverseForLocalizedFieldsArgs = {
+    blocksMap?: Record<string, ClientBlock>;
+    fields: ClientField[] | Field[];
+};
+export declare const traverseForLocalizedFields: (args: (ClientField | Field)[] | TraverseForLocalizedFieldsArgs) => boolean;
+export {};
 //# sourceMappingURL=traverseForLocalizedFields.d.ts.map

package/dist/utilities/traverseForLocalizedFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traverseForLocalizedFields.d.ts","sourceRoot":"","sources":["../../src/utilities/traverseForLocalizedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEjD,eAAO,MAAM,0BAA0B,WAAY,WAAW,EAAE,GAAG,KAAK,EAAE,KAAG,OA6C5E,CAAA"}
+{"version":3,"file":"traverseForLocalizedFields.d.ts","sourceRoot":"","sources":["../../src/utilities/traverseForLocalizedFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAE9D,KAAK,8BAA8B,GAAG;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;IACvC,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,0BAA0B,SAC/B,CAAC,WAAW,GAAG,KAAK,CAAC,EAAE,GAAG,8BAA8B,KAC7D,OAkDF,CAAA"}

package/dist/utilities/traverseForLocalizedFields.js

@@ -1,4 +1,11 @@
-export const traverseForLocalizedFields = fields => {
+export const traverseForLocalizedFields = args => {
+  const {
+    blocksMap,
+    fields
+  } = Array.isArray(args) ? {
+    blocksMap: undefined,
+    fields: args
+  } : args;
   for (const field of fields) {
     if ('localized' in field && field.localized) {
       return true;
@@ -8,17 +15,21 @@ export const traverseForLocalizedFields = fields => {
       case 'collapsible':
       case 'group':
       case 'row':
-        if (field.fields && traverseForLocalizedFields(field.fields)) {
+        if (field.fields && traverseForLocalizedFields({
+          blocksMap,
+          fields: field.fields
+        })) {
           return true;
         }
         break;
       case 'blocks':
         if (field.blocks) {
-          for (const block of field.blocks) {
-            if (typeof block === 'string') {
-              continue;
-            }
-            if (block.fields && traverseForLocalizedFields(block.fields)) {
+          for (const blockOrSlug of field.blocks) {
+            const block = typeof blockOrSlug === 'string' ? blocksMap?.[blockOrSlug] : blockOrSlug;
+            if (block?.fields && traverseForLocalizedFields({
+              blocksMap,
+              fields: block.fields
+            })) {
               return true;
             }
           }
@@ -30,7 +41,10 @@ export const traverseForLocalizedFields = fields => {
             if ('localized' in tab && tab.localized) {
               return true;
             }
-            if ('fields' in tab && tab.fields && traverseForLocalizedFields(tab.fields)) {
+            if ('fields' in tab && tab.fields && traverseForLocalizedFields({
+              blocksMap,
+              fields: tab.fields
+            })) {
               return true;
             }
           }

package/dist/utilities/traverseForLocalizedFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"traverseForLocalizedFields.js","names":["traverseForLocalizedFields","fields","field","localized","type","blocks","block","tabs","tab"],"sources":["../../src/utilities/traverseForLocalizedFields.ts"],"sourcesContent":["import type { ClientField, Field } from 'payload'\n\nexport const traverseForLocalizedFields = (fields: ClientField[] | Field[]): boolean => {\n  for (const field of fields) {\n    if ('localized' in field && field.localized) {\n      return true\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'collapsible':\n      case 'group':\n      case 'row':\n        if (field.fields && traverseForLocalizedFields(field.fields)) {\n          return true\n        }\n        break\n\n      case 'blocks':\n        if (field.blocks) {\n          for (const block of field.blocks) {\n            if (typeof block === 'string') {\n              continue\n            }\n            if (block.fields && traverseForLocalizedFields(block.fields)) {\n              return true\n            }\n          }\n        }\n        break\n\n      case 'tabs':\n        if (field.tabs) {\n          for (const tab of field.tabs) {\n            if ('localized' in tab && tab.localized) {\n              return true\n            }\n            if ('fields' in tab && tab.fields && traverseForLocalizedFields(tab.fields)) {\n              return true\n            }\n          }\n        }\n        break\n    }\n  }\n\n  return false\n}\n"],"mappings":"AAEA,OAAO,MAAMA,0BAAA,GAA8BC,MAAA;EACzC,KAAK,MAAMC,KAAA,IAASD,MAAA,EAAQ;IAC1B,IAAI,eAAeC,KAAA,IAASA,KAAA,CAAMC,SAAS,EAAE;MAC3C,OAAO;IACT;IAEA,QAAQD,KAAA,CAAME,IAAI;MAChB,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;QACH,IAAIF,KAAA,CAAMD,MAAM,IAAID,0BAAA,CAA2BE,KAAA,CAAMD,MAAM,GAAG;UAC5D,OAAO;QACT;QACA;MAEF,KAAK;QACH,IAAIC,KAAA,CAAMG,MAAM,EAAE;UAChB,KAAK,MAAMC,KAAA,IAASJ,KAAA,CAAMG,MAAM,EAAE;YAChC,IAAI,OAAOC,KAAA,KAAU,UAAU;cAC7B;YACF;YACA,IAAIA,KAAA,CAAML,MAAM,IAAID,0BAAA,CAA2BM,KAAA,CAAML,MAAM,GAAG;cAC5D,OAAO;YACT;UACF;QACF;QACA;MAEF,KAAK;QACH,IAAIC,KAAA,CAAMK,IAAI,EAAE;UACd,KAAK,MAAMC,GAAA,IAAON,KAAA,CAAMK,IAAI,EAAE;YAC5B,IAAI,eAAeC,GAAA,IAAOA,GAAA,CAAIL,SAAS,EAAE;cACvC,OAAO;YACT;YACA,IAAI,YAAYK,GAAA,IAAOA,GAAA,CAAIP,MAAM,IAAID,0BAAA,CAA2BQ,GAAA,CAAIP,MAAM,GAAG;cAC3E,OAAO;YACT;UACF;QACF;QACA;IACJ;EACF;EAEA,OAAO;AACT","ignoreList":[]}
+{"version":3,"file":"traverseForLocalizedFields.js","names":["traverseForLocalizedFields","args","blocksMap","fields","Array","isArray","undefined","field","localized","type","blocks","blockOrSlug","block","tabs","tab"],"sources":["../../src/utilities/traverseForLocalizedFields.ts"],"sourcesContent":["import type { ClientBlock, ClientField, Field } from 'payload'\n\ntype TraverseForLocalizedFieldsArgs = {\n  blocksMap?: Record<string, ClientBlock>\n  fields: ClientField[] | Field[]\n}\n\nexport const traverseForLocalizedFields = (\n  args: (ClientField | Field)[] | TraverseForLocalizedFieldsArgs,\n): boolean => {\n  const { blocksMap, fields } = Array.isArray(args) ? { blocksMap: undefined, fields: args } : args\n\n  for (const field of fields) {\n    if ('localized' in field && field.localized) {\n      return true\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'collapsible':\n      case 'group':\n      case 'row':\n        if (field.fields && traverseForLocalizedFields({ blocksMap, fields: field.fields })) {\n          return true\n        }\n        break\n\n      case 'blocks':\n        if (field.blocks) {\n          for (const blockOrSlug of field.blocks) {\n            const block = typeof blockOrSlug === 'string' ? blocksMap?.[blockOrSlug] : blockOrSlug\n\n            if (block?.fields && traverseForLocalizedFields({ blocksMap, fields: block.fields })) {\n              return true\n            }\n          }\n        }\n        break\n\n      case 'tabs':\n        if (field.tabs) {\n          for (const tab of field.tabs) {\n            if ('localized' in tab && tab.localized) {\n              return true\n            }\n            if (\n              'fields' in tab &&\n              tab.fields &&\n              traverseForLocalizedFields({ blocksMap, fields: tab.fields })\n            ) {\n              return true\n            }\n          }\n        }\n        break\n    }\n  }\n\n  return false\n}\n"],"mappings":"AAOA,OAAO,MAAMA,0BAAA,GACXC,IAAA;EAEA,MAAM;IAAEC,SAAS;IAAEC;EAAM,CAAE,GAAGC,KAAA,CAAMC,OAAO,CAACJ,IAAA,IAAQ;IAAEC,SAAA,EAAWI,SAAA;IAAWH,MAAA,EAAQF;EAAK,IAAIA,IAAA;EAE7F,KAAK,MAAMM,KAAA,IAASJ,MAAA,EAAQ;IAC1B,IAAI,eAAeI,KAAA,IAASA,KAAA,CAAMC,SAAS,EAAE;MAC3C,OAAO;IACT;IAEA,QAAQD,KAAA,CAAME,IAAI;MAChB,KAAK;MACL,KAAK;MACL,KAAK;MACL,KAAK;QACH,IAAIF,KAAA,CAAMJ,MAAM,IAAIH,0BAAA,CAA2B;UAAEE,SAAA;UAAWC,MAAA,EAAQI,KAAA,CAAMJ;QAAO,IAAI;UACnF,OAAO;QACT;QACA;MAEF,KAAK;QACH,IAAII,KAAA,CAAMG,MAAM,EAAE;UAChB,KAAK,MAAMC,WAAA,IAAeJ,KAAA,CAAMG,MAAM,EAAE;YACtC,MAAME,KAAA,GAAQ,OAAOD,WAAA,KAAgB,WAAWT,SAAA,GAAYS,WAAA,CAAY,GAAGA,WAAA;YAE3E,IAAIC,KAAA,EAAOT,MAAA,IAAUH,0BAAA,CAA2B;cAAEE,SAAA;cAAWC,MAAA,EAAQS,KAAA,CAAMT;YAAO,IAAI;cACpF,OAAO;YACT;UACF;QACF;QACA;MAEF,KAAK;QACH,IAAII,KAAA,CAAMM,IAAI,EAAE;UACd,KAAK,MAAMC,GAAA,IAAOP,KAAA,CAAMM,IAAI,EAAE;YAC5B,IAAI,eAAeC,GAAA,IAAOA,GAAA,CAAIN,SAAS,EAAE;cACvC,OAAO;YACT;YACA,IACE,YAAYM,GAAA,IACZA,GAAA,CAAIX,MAAM,IACVH,0BAAA,CAA2B;cAAEE,SAAA;cAAWC,MAAA,EAAQW,GAAA,CAAIX;YAAO,IAC3D;cACA,OAAO;YACT;UACF;QACF;QACA;IACJ;EACF;EAEA,OAAO;AACT","ignoreList":[]}

package/dist/utilities/upsertPreferences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upsertPreferences.d.ts","sourceRoot":"","sources":["../../src/utilities/upsertPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7E,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAA;IACrC,KAAK,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;CACtB,CAAA;AAED,KAAK,YAAY,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC,CAAA;AAQ5E,eAAO,MAAM,cAAc,GAClB,CAAC,OACD,MAAM,WACF,OAAO,UACR,qBAAqB,YACnB,MAAM,KACf,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CA+B5B,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,oDAK/E;IACD,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,KAAK,CAAC,CAAA;IACnF,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,CAAC,CAAA;CACT,KAAG,OAAO,CAAC,CAAC,CA0DZ,CAAA"}
+{"version":3,"file":"upsertPreferences.d.ts","sourceRoot":"","sources":["../../src/utilities/upsertPreferences.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAO7E,KAAK,aAAa,CAAC,CAAC,IAAI;IACtB,EAAE,EAAE,qBAAqB,GAAG,SAAS,CAAA;IACrC,KAAK,CAAC,EAAE,CAAC,GAAG,SAAS,CAAA;CACtB,CAAA;AAED,KAAK,YAAY,GAAG,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,GAAG,SAAS,KAAK,CAAC,CAAA;AAQ5E,eAAO,MAAM,cAAc,GAClB,CAAC,OACD,MAAM,WACF,OAAO,UACR,qBAAqB,YACnB,MAAM,KACf,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAgC5B,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,iBAAiB,GAAU,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,oDAK/E;IACD,WAAW,CAAC,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,YAAY,EAAE,YAAY,KAAK,CAAC,CAAA;IACnF,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,cAAc,CAAA;IACnB,KAAK,EAAE,CAAC,CAAA;CACT,KAAG,OAAO,CAAC,CAAC,CA4DZ,CAAA"}

package/dist/utilities/upsertPreferences.js

@@ -10,6 +10,7 @@ export const getPreferences = cache(async (key, payload, userID, userSlug) => {
     collection: 'payload-preferences',
     depth: 0,
     limit: 1,
+    overrideAccess: true,
     pagination: false,
     where: {
       and: [{
@@ -58,6 +59,7 @@ export const upsertPreferences = async ({
       },
       depth: 0,
       disableTransaction: true,
+      overrideAccess: true,
       user: req.user
     });
     return createdPrefs.value;
@@ -83,6 +85,7 @@ export const upsertPreferences = async ({
         },
         depth: 0,
         disableTransaction: true,
+        overrideAccess: true,
         user: req.user
       })?.then(res => res.value);
     }

package/dist/utilities/upsertPreferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"upsertPreferences.js","names":["dequal","cache","removeUndefined","defaultMerge","existingValue","incomingValue","getPreferences","key","payload","userID","userSlug","result","find","collection","depth","limit","pagination","where","and","equals","then","res","docs","upsertPreferences","customMerge","req","value","existingPrefs","user","id","newPrefs","createdPrefs","create","data","disableTransaction","mergedPrefs","update"],"sources":["../../src/utilities/upsertPreferences.ts"],"sourcesContent":["import type { DefaultDocumentIDType, Payload, PayloadRequest } from 'payload'\n\nimport { dequal } from 'dequal/lite'\nimport { cache } from 'react'\n\nimport { removeUndefined } from './removeUndefined.js'\n\ntype PreferenceDoc<T> = {\n  id: DefaultDocumentIDType | undefined\n  value?: T | undefined\n}\n\ntype DefaultMerge = <T>(existingValue: T, incomingValue: T | undefined) => T\n\nconst defaultMerge: DefaultMerge = <T>(existingValue: T, incomingValue: T | undefined) =>\n  ({\n    ...(typeof existingValue === 'object' ? existingValue : {}), // Shallow merge existing prefs to acquire any missing keys from incoming value\n    ...removeUndefined(incomingValue || {}),\n  }) as T\n\nexport const getPreferences = cache(\n  async <T>(\n    key: string,\n    payload: Payload,\n    userID: DefaultDocumentIDType,\n    userSlug: string,\n  ): Promise<PreferenceDoc<T>> => {\n    const result = (await payload\n      .find({\n        collection: 'payload-preferences',\n        depth: 0,\n        limit: 1,\n        pagination: false,\n        where: {\n          and: [\n            {\n              key: {\n                equals: key,\n              },\n            },\n            {\n              'user.relationTo': {\n                equals: userSlug,\n              },\n            },\n            {\n              'user.value': {\n                equals: userID,\n              },\n            },\n          ],\n        },\n      })\n      .then((res) => res.docs?.[0])) as { id: DefaultDocumentIDType; value: T }\n\n    return result\n  },\n)\n\n/**\n * Will update the given preferences by key, creating a new record if it doesn't already exist, or merging existing preferences with the new value.\n * This is not possible to do with the existing `db.upsert` operation because it stores on the `value` key and does not perform a deep merge beyond the first level.\n * I.e. if you have a preferences record with a `value` key, `db.upsert` will overwrite the existing value. In the future if this supported we should use that instead.\n * @param req - The PayloadRequest object\n * @param key - The key of the preferences to update\n * @param value - The new value to merge with the existing preferences\n */\nexport const upsertPreferences = async <T extends Record<string, unknown> | string>({\n  customMerge,\n  key,\n  req,\n  value: incomingValue,\n}: {\n  customMerge?: (existingValue: T, incomingValue: T, defaultMerge: DefaultMerge) => T\n  key: string\n  req: PayloadRequest\n  value: T\n}): Promise<T> => {\n  const existingPrefs: PreferenceDoc<T> = req.user\n    ? await getPreferences<T>(key, req.payload, req.user.id, req.user.collection)\n    : ({} as PreferenceDoc<T>)\n\n  let newPrefs = existingPrefs?.value\n\n  if (!existingPrefs?.id) {\n    const createdPrefs = await req.payload.create({\n      collection: 'payload-preferences',\n      data: {\n        key,\n        user: {\n          collection: req.user.collection,\n          value: req.user.id,\n        },\n        value: incomingValue,\n      },\n      depth: 0,\n      disableTransaction: true,\n      user: req.user,\n    })\n    return createdPrefs.value\n  } else {\n    let mergedPrefs: T\n\n    if (typeof customMerge === 'function') {\n      mergedPrefs = customMerge(existingPrefs.value, incomingValue, defaultMerge)\n    } else {\n      // Strings are valid JSON, i.e. `locale` saved as a string to the locale preferences\n      mergedPrefs =\n        typeof incomingValue === 'object'\n          ? defaultMerge<T>(existingPrefs.value, incomingValue)\n          : incomingValue\n    }\n\n    if (!dequal(mergedPrefs, existingPrefs.value)) {\n      newPrefs = await req.payload\n        .update({\n          id: existingPrefs.id,\n          collection: 'payload-preferences',\n          data: {\n            key,\n            user: {\n              collection: req.user.collection,\n              value: req.user.id,\n            },\n            value: mergedPrefs,\n          },\n          depth: 0,\n          disableTransaction: true,\n          user: req.user,\n        })\n        ?.then((res) => res.value)\n    }\n  }\n\n  return newPrefs\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"upsertPreferences.js","names":["dequal","cache","removeUndefined","defaultMerge","existingValue","incomingValue","getPreferences","key","payload","userID","userSlug","result","find","collection","depth","limit","overrideAccess","pagination","where","and","equals","then","res","docs","upsertPreferences","customMerge","req","value","existingPrefs","user","id","newPrefs","createdPrefs","create","data","disableTransaction","mergedPrefs","update"],"sources":["../../src/utilities/upsertPreferences.ts"],"sourcesContent":["import type { DefaultDocumentIDType, Payload, PayloadRequest } from 'payload'\n\nimport { dequal } from 'dequal/lite'\nimport { cache } from 'react'\n\nimport { removeUndefined } from './removeUndefined.js'\n\ntype PreferenceDoc<T> = {\n  id: DefaultDocumentIDType | undefined\n  value?: T | undefined\n}\n\ntype DefaultMerge = <T>(existingValue: T, incomingValue: T | undefined) => T\n\nconst defaultMerge: DefaultMerge = <T>(existingValue: T, incomingValue: T | undefined) =>\n  ({\n    ...(typeof existingValue === 'object' ? existingValue : {}), // Shallow merge existing prefs to acquire any missing keys from incoming value\n    ...removeUndefined(incomingValue || {}),\n  }) as T\n\nexport const getPreferences = cache(\n  async <T>(\n    key: string,\n    payload: Payload,\n    userID: DefaultDocumentIDType,\n    userSlug: string,\n  ): Promise<PreferenceDoc<T>> => {\n    const result = (await payload\n      .find({\n        collection: 'payload-preferences',\n        depth: 0,\n        limit: 1,\n        overrideAccess: true,\n        pagination: false,\n        where: {\n          and: [\n            {\n              key: {\n                equals: key,\n              },\n            },\n            {\n              'user.relationTo': {\n                equals: userSlug,\n              },\n            },\n            {\n              'user.value': {\n                equals: userID,\n              },\n            },\n          ],\n        },\n      })\n      .then((res) => res.docs?.[0])) as { id: DefaultDocumentIDType; value: T }\n\n    return result\n  },\n)\n\n/**\n * Will update the given preferences by key, creating a new record if it doesn't already exist, or merging existing preferences with the new value.\n * This is not possible to do with the existing `db.upsert` operation because it stores on the `value` key and does not perform a deep merge beyond the first level.\n * I.e. if you have a preferences record with a `value` key, `db.upsert` will overwrite the existing value. In the future if this supported we should use that instead.\n * @param req - The PayloadRequest object\n * @param key - The key of the preferences to update\n * @param value - The new value to merge with the existing preferences\n */\nexport const upsertPreferences = async <T extends Record<string, unknown> | string>({\n  customMerge,\n  key,\n  req,\n  value: incomingValue,\n}: {\n  customMerge?: (existingValue: T, incomingValue: T, defaultMerge: DefaultMerge) => T\n  key: string\n  req: PayloadRequest\n  value: T\n}): Promise<T> => {\n  const existingPrefs: PreferenceDoc<T> = req.user\n    ? await getPreferences<T>(key, req.payload, req.user.id, req.user.collection)\n    : ({} as PreferenceDoc<T>)\n\n  let newPrefs = existingPrefs?.value\n\n  if (!existingPrefs?.id) {\n    const createdPrefs = await req.payload.create({\n      collection: 'payload-preferences',\n      data: {\n        key,\n        user: {\n          collection: req.user.collection,\n          value: req.user.id,\n        },\n        value: incomingValue,\n      },\n      depth: 0,\n      disableTransaction: true,\n      overrideAccess: true,\n      user: req.user,\n    })\n    return createdPrefs.value\n  } else {\n    let mergedPrefs: T\n\n    if (typeof customMerge === 'function') {\n      mergedPrefs = customMerge(existingPrefs.value, incomingValue, defaultMerge)\n    } else {\n      // Strings are valid JSON, i.e. `locale` saved as a string to the locale preferences\n      mergedPrefs =\n        typeof incomingValue === 'object'\n          ? defaultMerge<T>(existingPrefs.value, incomingValue)\n          : incomingValue\n    }\n\n    if (!dequal(mergedPrefs, existingPrefs.value)) {\n      newPrefs = await req.payload\n        .update({\n          id: existingPrefs.id,\n          collection: 'payload-preferences',\n          data: {\n            key,\n            user: {\n              collection: req.user.collection,\n              value: req.user.id,\n            },\n            value: mergedPrefs,\n          },\n          depth: 0,\n          disableTransaction: true,\n          overrideAccess: true,\n          user: req.user,\n        })\n        ?.then((res) => res.value)\n    }\n  }\n\n  return newPrefs\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/API/index.client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/API/index.client.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAiB9B,OAAO,aAAa,CAAA;AAKpB,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EAkPjC,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/views/API/index.client.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAkB9B,OAAO,aAAa,CAAA;AAKpB,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,EA+QjC,CAAA"}

package/dist/views/API/index.client.js

@@ -12,6 +12,7 @@ import { TextInput } from '../../fields/Text/Input.js';
 import { Form } from '../../forms/Form/index.js';
 import { MinimizeMaximizeIcon } from '../../icons/MinimizeMaximize/index.js';
 import { NewTabIcon } from '../../icons/NewTab/index.js';
+import { useBranchParam } from '../../providers/Branch/index.js';
 import { useConfig } from '../../providers/Config/index.js';
 import { useDocumentInfo } from '../../providers/DocumentInfo/index.js';
 import { useLocale } from '../../providers/Locale/index.js';
@@ -34,9 +35,9 @@ export const APIViewClient = () => {
     i18n,
     t
   } = useTranslation();
-  const {
-    code
-  } = useLocale();
+  const currentLocale = useLocale();
+  const code = currentLocale?.code;
+  const branch = useBranchParam();
   const {
     config: {
       defaultDepth,
@@ -72,6 +73,18 @@ export const APIViewClient = () => {
   const [draft, setDraft] = React.useState(searchParams.get('draft') === 'true');
   const [locale_0, setLocale] = React.useState(searchParams?.get('locale') || code);
   const [depth, setDepth] = React.useState(searchParams.get('depth') || defaultDepth.toString());
+  const [depthAnnouncement, setDepthAnnouncement] = React.useState('');
+  const previousDepth = React.useRef(depth);
+  React.useEffect(() => {
+    if (previousDepth.current === depth) {
+      return;
+    }
+    previousDepth.current = depth;
+    const timeout = setTimeout(() => {
+      setDepthAnnouncement(`${t('general:depth')}: ${Number(depth || 0)}`);
+    }, 300);
+    return () => clearTimeout(timeout);
+  }, [depth, t]);
   const [authenticated, setAuthenticated] = React.useState(true);
   const [fullscreen, setFullscreen] = React.useState(false);
   const [origin, setOrigin] = React.useState(serverURL || '');
@@ -88,12 +101,18 @@ export const APIViewClient = () => {
     }
   }, [serverURL]);
   const trashParam = typeof initialData?.deletedAt === 'string';
-  const params = new URLSearchParams({
+  const searchParamsRecord = {
     depth,
     draft: String(draft),
     locale: locale_0,
     trash: trashParam ? 'true' : 'false'
-  }).toString();
+  };
+  // The view inspects the document being edited, which on a branch is the branch's
+  // copy. Without this it shows main's, contradicting every other view.
+  if (branch) {
+    searchParamsRecord.branch = branch;
+  }
+  const params = new URLSearchParams(searchParamsRecord).toString();
   const fetchURL = formatAdminURL({
     apiRoute,
     path: `${docEndpoint}?${params}`,
@@ -163,7 +182,12 @@ export const APIViewClient = () => {
           },
           children: /*#__PURE__*/_jsxs("div", {
             className: `${baseClass}__form-fields`,
-            children: [localeOptions && /*#__PURE__*/_jsx(LocaleSelector, {
+            children: [/*#__PURE__*/_jsx("span", {
+              "aria-atomic": "true",
+              className: "sr-only",
+              role: "status",
+              children: depthAnnouncement
+            }), localeOptions && /*#__PURE__*/_jsx(LocaleSelector, {
               localeOptions: localeOptions,
               onChange: setLocale
             }), /*#__PURE__*/_jsx(NumberField, {
@@ -227,6 +251,7 @@ export const APIViewClient = () => {
               url: fetchURL
             }), /*#__PURE__*/_jsx(Button, {
               "aria-label": "toggle fullscreen",
+              "aria-pressed": fullscreen,
               buttonStyle: "secondary",
               className: `${baseClass}__toggle-fullscreen-button`,
               icon: /*#__PURE__*/_jsx(MinimizeMaximizeIcon, {