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

package/dist/utilities/scheduleMergeHandler.js

@@ -0,0 +1,299 @@
+import { assertBranchActionAccess, assertBranchUpdateAccess, canAccessAdmin, Forbidden } from 'payload';
+import { branchChangesCollectionSlug, branchesCollectionSlug } from 'payload/shared';
+import { buildUpcomingMergeWhere } from './buildUpcomingMergeWhere.js';
+/**
+ * Returns the safe summary used when the merge modal opens outside the branch view.
+ *
+ * The change registry denies direct API access. Resolve the branch through normal
+ * read access first, then read only the non-sensitive grouping fields internally.
+ */
+export const getBranchMergeSummaryHandler = async ({
+  branchID,
+  req,
+  sampleLimit
+}) => {
+  const {
+    payload,
+    user
+  } = req;
+  const requestedSampleLimit = Number.isFinite(sampleLimit) ? Math.floor(sampleLimit) : 200;
+  const sampleLimitToUse = Math.min(Math.max(requestedSampleLimit, 1), 200);
+  await canAccessAdmin({
+    req
+  });
+  const branch = await payload.findByID({
+    id: branchID,
+    collection: branchesCollectionSlug,
+    depth: 0,
+    disableErrors: true,
+    overrideAccess: false,
+    req,
+    user
+  });
+  if (!branch || typeof branch.slug !== 'string') {
+    throw new Forbidden(req.t);
+  }
+  const summary = await payload.find({
+    collection: branchChangesCollectionSlug,
+    depth: 0,
+    limit: sampleLimitToUse,
+    overrideAccess: true,
+    req,
+    select: {
+      collectionSlug: true,
+      globalSlug: true,
+      operation: true
+    },
+    where: {
+      branch: {
+        equals: branch.slug
+      }
+    }
+  });
+  const docs = summary.docs.reduce((summaries, change) => {
+    const collectionSlug = typeof change.collectionSlug === 'string' ? change.collectionSlug : undefined;
+    const globalSlug = typeof change.globalSlug === 'string' ? change.globalSlug : undefined;
+    const operation = change.operation === 'create' || change.operation === 'delete' || change.operation === 'update' ? change.operation : undefined;
+    if (!collectionSlug && !globalSlug || !operation) {
+      return summaries;
+    }
+    summaries.push({
+      collectionSlug,
+      globalSlug,
+      operation
+    });
+    return summaries;
+  }, []);
+  return {
+    docs,
+    totalDocs: summary.totalDocs
+  };
+};
+/** Returns upcoming merge jobs only after confirming that the caller can read the branch. */
+export const getUpcomingBranchMergesHandler = async ({
+  branchID,
+  req
+}) => {
+  const {
+    payload,
+    user
+  } = req;
+  await canAccessAdmin({
+    req
+  });
+  const branch = await payload.findByID({
+    id: branchID,
+    collection: branchesCollectionSlug,
+    depth: 0,
+    disableErrors: true,
+    overrideAccess: false,
+    req,
+    user
+  });
+  if (!branch || typeof branch.slug !== 'string') {
+    throw new Forbidden(req.t);
+  }
+  const jobs = await payload.find({
+    collection: 'payload-jobs',
+    depth: 0,
+    limit: 10,
+    overrideAccess: true,
+    req,
+    select: {
+      waitUntil: true
+    },
+    sort: 'waitUntil',
+    where: buildUpcomingMergeWhere({
+      branchSlug: branch.slug
+    })
+  });
+  return jobs.docs.reduce((upcomingMerges, job) => {
+    const hasValidID = typeof job.id === 'number' || typeof job.id === 'string';
+    const waitUntil = typeof job.waitUntil === 'string' ? job.waitUntil : job.waitUntil instanceof Date ? job.waitUntil.toISOString() : undefined;
+    if (hasValidID && waitUntil) {
+      upcomingMerges.push({
+        id: job.id,
+        waitUntil
+      });
+    }
+    return upcomingMerges;
+  }, []);
+};
+/**
+ * Queues — or cancels — a merge to run at an appointed time.
+ *
+ * The counterpart of `schedulePublishHandler`, and deliberately the same shape: a
+ * `payload-jobs` row with `waitUntil` and the user who formed the intent, fired by
+ * whatever runs the queue.
+ *
+ * Access is checked twice, in two different senses. Here, that the caller can reach
+ * the branch at all; and again when the job fires, where the per-document preflight
+ * runs as the stored user (§13). Queue-time permission is not evidence of fire-time
+ * permission, and the merge is the write that matters.
+ */
+export const scheduleMergeHandler = async ({
+  branchID,
+  changes,
+  closeBranch,
+  date,
+  deleteID,
+  req
+}) => {
+  const {
+    i18n,
+    payload,
+    user
+  } = req;
+  await canAccessAdmin({
+    req
+  });
+  try {
+    if (deleteID) {
+      const scheduledMergeJob = await payload.findByID({
+        id: deleteID,
+        collection: 'payload-jobs',
+        depth: 0,
+        disableErrors: true,
+        overrideAccess: true,
+        req
+      });
+      const scheduledBranchSlug = scheduledMergeJob?.taskSlug === 'scheduleMerge' && typeof scheduledMergeJob.input?.branch === 'string' ? scheduledMergeJob.input.branch : undefined;
+      if (!scheduledBranchSlug) {
+        throw new Forbidden(req.t);
+      }
+      const readableBranch = (await payload.find({
+        collection: branchesCollectionSlug,
+        depth: 0,
+        limit: 1,
+        overrideAccess: false,
+        pagination: false,
+        req,
+        user,
+        where: {
+          slug: {
+            equals: scheduledBranchSlug
+          }
+        }
+      })).docs[0];
+      if (!readableBranch) {
+        throw new Forbidden(req.t);
+      }
+      await assertBranchUpdateAccess({
+        branchDoc: readableBranch,
+        req
+      });
+      await assertBranchActionAccess({
+        action: 'mergeBranch',
+        branchDoc: readableBranch,
+        req
+      });
+      await payload.delete({
+        collection: 'payload-jobs',
+        overrideAccess: true,
+        req,
+        where: buildScheduledMergeCancellationWhere({
+          branchSlug: scheduledBranchSlug,
+          jobID: deleteID
+        })
+      });
+      return {
+        message: i18n.t('general:success')
+      };
+    }
+    if (!branchID || !date) {
+      return {
+        error: 'A branch and a date are both required to schedule a merge.'
+      };
+    }
+    const branchDoc = await payload.findByID({
+      id: branchID,
+      collection: branchesCollectionSlug,
+      depth: 0,
+      disableErrors: true,
+      overrideAccess: false,
+      req,
+      user
+    });
+    if (!branchDoc) {
+      return {
+        error: 'Branch not found.'
+      };
+    }
+    await assertBranchUpdateAccess({
+      branchDoc,
+      req
+    });
+    await assertBranchActionAccess({
+      action: 'mergeBranch',
+      branchDoc,
+      req
+    });
+    // A closed branch takes no further merges, so it must not take a promise of one
+    // either — the job would fail at fire time with nobody watching.
+    if (branchDoc.status === 'closed') {
+      return {
+        error: 'This branch is closed and cannot be merged.'
+      };
+    }
+    await payload.jobs.queue({
+      input: {
+        branch: branchDoc.slug,
+        changes: changes?.map(String),
+        closeBranch: Boolean(closeBranch),
+        user: user && user.collection ? {
+          relationTo: user.collection,
+          value: user.id
+        } : undefined
+      },
+      req,
+      task: 'scheduleMerge',
+      waitUntil: date instanceof Date ? date : new Date(date)
+    });
+    return {
+      message: i18n.t('general:success')
+    };
+  } catch (err) {
+    const error = deleteID ? `Error cancelling scheduled merge ${deleteID}` : `Error scheduling merge of branch ${branchID}`;
+    payload.logger.error({
+      err,
+      msg: error
+    });
+    return {
+      error
+    };
+  }
+};
+export const buildScheduledMergeCancellationWhere = ({
+  branchSlug,
+  jobID
+}) => ({
+  and: [{
+    id: {
+      equals: jobID
+    }
+  }, {
+    taskSlug: {
+      equals: 'scheduleMerge'
+    }
+  }, {
+    completedAt: {
+      exists: false
+    }
+  }, {
+    processingUntil: {
+      exists: false
+    }
+  }, {
+    'input.branch': {
+      equals: branchSlug
+    }
+  }]
+});
+/**
+ * The `where` for a branch's upcoming scheduled merges.
+ *
+ * Mirrors `buildUpcomingScheduleWhere`: same collection, same shape, filtered on the
+ * branch slug carried in the job's input.
+ */
+export { buildUpcomingMergeWhere };
+//# sourceMappingURL=scheduleMergeHandler.js.map

package/dist/utilities/scheduleMergeHandler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scheduleMergeHandler.js","names":["assertBranchActionAccess","assertBranchUpdateAccess","canAccessAdmin","Forbidden","branchChangesCollectionSlug","branchesCollectionSlug","buildUpcomingMergeWhere","getBranchMergeSummaryHandler","branchID","req","sampleLimit","payload","user","requestedSampleLimit","Number","isFinite","Math","floor","sampleLimitToUse","min","max","branch","findByID","id","collection","depth","disableErrors","overrideAccess","slug","t","summary","find","limit","select","collectionSlug","globalSlug","operation","where","equals","docs","reduce","summaries","change","undefined","push","totalDocs","getUpcomingBranchMergesHandler","jobs","waitUntil","sort","branchSlug","upcomingMerges","job","hasValidID","Date","toISOString","scheduleMergeHandler","changes","closeBranch","date","deleteID","i18n","scheduledMergeJob","scheduledBranchSlug","taskSlug","input","readableBranch","pagination","branchDoc","action","delete","buildScheduledMergeCancellationWhere","jobID","message","error","status","queue","map","String","Boolean","relationTo","value","task","err","logger","msg","and","completedAt","exists","processingUntil"],"sources":["../../src/utilities/scheduleMergeHandler.ts"],"sourcesContent":["import type { ServerFunction, Where } from 'payload'\n\nimport {\n  assertBranchActionAccess,\n  assertBranchUpdateAccess,\n  canAccessAdmin,\n  Forbidden,\n} from 'payload'\nimport { branchChangesCollectionSlug, branchesCollectionSlug } from 'payload/shared'\n\nimport type { SummarizableChange } from '../elements/ChangeSummary/index.js'\n\nimport { buildUpcomingMergeWhere } from './buildUpcomingMergeWhere.js'\n\nexport type ScheduleMergeHandlerArgs = {\n  /** `payload-branches` document ID, so read access can be checked before queueing. */\n  branchID?: number | string\n  changes?: (number | string)[]\n  closeBranch?: boolean\n  date?: Date | string\n  /** The job to cancel, instead of queueing one. */\n  deleteID?: number | string\n}\n\nexport type GetBranchMergeSummaryHandlerArgs = {\n  /** `payload-branches` document ID, so read access is checked before internal rows are read. */\n  branchID: number | string\n  sampleLimit: number\n}\n\nexport type BranchMergeSummary = {\n  docs: SummarizableChange[]\n  totalDocs: number\n}\n\nexport type UpcomingBranchMerge = {\n  id: number | string\n  waitUntil: string\n}\n\n/**\n * Returns the safe summary used when the merge modal opens outside the branch view.\n *\n * The change registry denies direct API access. Resolve the branch through normal\n * read access first, then read only the non-sensitive grouping fields internally.\n */\nexport const getBranchMergeSummaryHandler: ServerFunction<\n  GetBranchMergeSummaryHandlerArgs,\n  Promise<BranchMergeSummary>\n> = async ({ branchID, req, sampleLimit }) => {\n  const { payload, user } = req\n  const requestedSampleLimit = Number.isFinite(sampleLimit) ? Math.floor(sampleLimit) : 200\n  const sampleLimitToUse = Math.min(Math.max(requestedSampleLimit, 1), 200)\n\n  await canAccessAdmin({ req })\n\n  const branch = await payload.findByID({\n    id: branchID,\n    collection: branchesCollectionSlug,\n    depth: 0,\n    disableErrors: true,\n    overrideAccess: false,\n    req,\n    user,\n  })\n\n  if (!branch || typeof branch.slug !== 'string') {\n    throw new Forbidden(req.t)\n  }\n\n  const summary = await payload.find({\n    collection: branchChangesCollectionSlug,\n    depth: 0,\n    limit: sampleLimitToUse,\n    overrideAccess: true,\n    req,\n    select: {\n      collectionSlug: true,\n      globalSlug: true,\n      operation: true,\n    },\n    where: { branch: { equals: branch.slug } },\n  })\n\n  const docs = summary.docs.reduce<SummarizableChange[]>((summaries, change) => {\n    const collectionSlug =\n      typeof change.collectionSlug === 'string' ? change.collectionSlug : undefined\n    const globalSlug = typeof change.globalSlug === 'string' ? change.globalSlug : undefined\n    const operation =\n      change.operation === 'create' ||\n      change.operation === 'delete' ||\n      change.operation === 'update'\n        ? change.operation\n        : undefined\n\n    if ((!collectionSlug && !globalSlug) || !operation) {\n      return summaries\n    }\n\n    summaries.push({ collectionSlug, globalSlug, operation })\n\n    return summaries\n  }, [])\n\n  return {\n    docs,\n    totalDocs: summary.totalDocs,\n  }\n}\n\n/** Returns upcoming merge jobs only after confirming that the caller can read the branch. */\nexport const getUpcomingBranchMergesHandler: ServerFunction<\n  { branchID: number | string },\n  Promise<UpcomingBranchMerge[]>\n> = async ({ branchID, req }) => {\n  const { payload, user } = req\n\n  await canAccessAdmin({ req })\n\n  const branch = await payload.findByID({\n    id: branchID,\n    collection: branchesCollectionSlug,\n    depth: 0,\n    disableErrors: true,\n    overrideAccess: false,\n    req,\n    user,\n  })\n\n  if (!branch || typeof branch.slug !== 'string') {\n    throw new Forbidden(req.t)\n  }\n\n  const jobs = await payload.find({\n    collection: 'payload-jobs',\n    depth: 0,\n    limit: 10,\n    overrideAccess: true,\n    req,\n    select: { waitUntil: true },\n    sort: 'waitUntil',\n    where: buildUpcomingMergeWhere({ branchSlug: branch.slug }),\n  })\n\n  return jobs.docs.reduce<UpcomingBranchMerge[]>((upcomingMerges, job) => {\n    const hasValidID = typeof job.id === 'number' || typeof job.id === 'string'\n    const waitUntil =\n      typeof job.waitUntil === 'string'\n        ? job.waitUntil\n        : job.waitUntil instanceof Date\n          ? job.waitUntil.toISOString()\n          : undefined\n\n    if (hasValidID && waitUntil) {\n      upcomingMerges.push({ id: job.id, waitUntil })\n    }\n\n    return upcomingMerges\n  }, [])\n}\n\n/**\n * Queues — or cancels — a merge to run at an appointed time.\n *\n * The counterpart of `schedulePublishHandler`, and deliberately the same shape: a\n * `payload-jobs` row with `waitUntil` and the user who formed the intent, fired by\n * whatever runs the queue.\n *\n * Access is checked twice, in two different senses. Here, that the caller can reach\n * the branch at all; and again when the job fires, where the per-document preflight\n * runs as the stored user (§13). Queue-time permission is not evidence of fire-time\n * permission, and the merge is the write that matters.\n */\nexport const scheduleMergeHandler: ServerFunction<ScheduleMergeHandlerArgs> = async ({\n  branchID,\n  changes,\n  closeBranch,\n  date,\n  deleteID,\n  req,\n}) => {\n  const { i18n, payload, user } = req\n\n  await canAccessAdmin({ req })\n\n  try {\n    if (deleteID) {\n      const scheduledMergeJob = await payload.findByID({\n        id: deleteID,\n        collection: 'payload-jobs',\n        depth: 0,\n        disableErrors: true,\n        overrideAccess: true,\n        req,\n      })\n      const scheduledBranchSlug =\n        scheduledMergeJob?.taskSlug === 'scheduleMerge' &&\n        typeof scheduledMergeJob.input?.branch === 'string'\n          ? scheduledMergeJob.input.branch\n          : undefined\n\n      if (!scheduledBranchSlug) {\n        throw new Forbidden(req.t)\n      }\n\n      const readableBranch = (\n        await payload.find({\n          collection: branchesCollectionSlug,\n          depth: 0,\n          limit: 1,\n          overrideAccess: false,\n          pagination: false,\n          req,\n          user,\n          where: { slug: { equals: scheduledBranchSlug } },\n        })\n      ).docs[0]\n\n      if (!readableBranch) {\n        throw new Forbidden(req.t)\n      }\n\n      await assertBranchUpdateAccess({ branchDoc: readableBranch, req })\n      await assertBranchActionAccess({\n        action: 'mergeBranch',\n        branchDoc: readableBranch,\n        req,\n      })\n\n      await payload.delete({\n        collection: 'payload-jobs',\n        overrideAccess: true,\n        req,\n        where: buildScheduledMergeCancellationWhere({\n          branchSlug: scheduledBranchSlug,\n          jobID: deleteID,\n        }),\n      })\n\n      return { message: i18n.t('general:success') }\n    }\n\n    if (!branchID || !date) {\n      return { error: 'A branch and a date are both required to schedule a merge.' }\n    }\n\n    const branchDoc = await payload.findByID({\n      id: branchID,\n      collection: branchesCollectionSlug,\n      depth: 0,\n      disableErrors: true,\n      overrideAccess: false,\n      req,\n      user,\n    })\n\n    if (!branchDoc) {\n      return { error: 'Branch not found.' }\n    }\n\n    await assertBranchUpdateAccess({ branchDoc, req })\n    await assertBranchActionAccess({ action: 'mergeBranch', branchDoc, req })\n\n    // A closed branch takes no further merges, so it must not take a promise of one\n    // either — the job would fail at fire time with nobody watching.\n    if (branchDoc.status === 'closed') {\n      return { error: 'This branch is closed and cannot be merged.' }\n    }\n\n    await payload.jobs.queue({\n      input: {\n        branch: branchDoc.slug as string,\n        changes: changes?.map(String),\n        closeBranch: Boolean(closeBranch),\n        user:\n          user && user.collection\n            ? {\n                relationTo: user.collection,\n                value: user.id,\n              }\n            : undefined,\n      },\n      req,\n      task: 'scheduleMerge',\n      waitUntil: date instanceof Date ? date : new Date(date),\n    })\n\n    return { message: i18n.t('general:success') }\n  } catch (err) {\n    const error = deleteID\n      ? `Error cancelling scheduled merge ${deleteID}`\n      : `Error scheduling merge of branch ${branchID}`\n\n    payload.logger.error({ err, msg: error })\n\n    return { error }\n  }\n}\n\nexport const buildScheduledMergeCancellationWhere = ({\n  branchSlug,\n  jobID,\n}: {\n  branchSlug: string\n  jobID: number | string\n}): Where => ({\n  and: [\n    { id: { equals: jobID } },\n    { taskSlug: { equals: 'scheduleMerge' } },\n    { completedAt: { exists: false } },\n    { processingUntil: { exists: false } },\n    { 'input.branch': { equals: branchSlug } },\n  ],\n})\n\n/**\n * The `where` for a branch's upcoming scheduled merges.\n *\n * Mirrors `buildUpcomingScheduleWhere`: same collection, same shape, filtered on the\n * branch slug carried in the job's input.\n */\nexport { buildUpcomingMergeWhere }\n"],"mappings":"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","ignoreList":[]}

package/dist/utilities/schedulePublishHandler.d.ts

@@ -1,4 +1,5 @@
-import { type SchedulePublishTaskInput, type ServerFunction } from 'payload';
+import type { SchedulePublishTaskInput, ServerFunction } from 'payload';
+import type { UpcomingEvent } from '../elements/PublishButton/ScheduleDrawer/types.js';
 export type SchedulePublishHandlerArgs = {
     date?: Date;
     /**
@@ -8,5 +9,11 @@ export type SchedulePublishHandlerArgs = {
     localeToPublish?: string;
     timezone?: string;
 } & Pick<SchedulePublishTaskInput, 'doc' | 'global' | 'type'>;
+export type GetUpcomingScheduledPublishHandlerArgs = {
+    collectionSlug?: string;
+    globalSlug?: string;
+    id?: number | string;
+};
+export declare const getUpcomingScheduledPublishHandler: ServerFunction<GetUpcomingScheduledPublishHandlerArgs, Promise<UpcomingEvent[]>>;
 export declare const schedulePublishHandler: ServerFunction<SchedulePublishHandlerArgs>;
 //# sourceMappingURL=schedulePublishHandler.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schedulePublishHandler.d.ts","sourceRoot":"","sources":["../../src/utilities/schedulePublishHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,KAAK,wBAAwB,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAE5F,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,CAAC,EAAE,IAAI,CAAA;IACX;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,IAAI,CAAC,wBAAwB,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;AAE7D,eAAO,MAAM,sBAAsB,EAAE,cAAc,CAAC,0BAA0B,CAuD7E,CAAA"}
+{"version":3,"file":"schedulePublishHandler.d.ts","sourceRoot":"","sources":["../../src/utilities/schedulePublishHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAKvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAA;AAKtF,MAAM,MAAM,0BAA0B,GAAG;IACvC,IAAI,CAAC,EAAE,IAAI,CAAA;IACX;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IAC1B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,GAAG,IAAI,CAAC,wBAAwB,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAA;AAE7D,MAAM,MAAM,sCAAsC,GAAG;IACnD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kCAAkC,EAAE,cAAc,CAC7D,sCAAsC,EACtC,OAAO,CAAC,aAAa,EAAE,CAAC,CAiDzB,CAAA;AAED,eAAO,MAAM,sBAAsB,EAAE,cAAc,CAAC,0BAA0B,CA6E7E,CAAA"}

package/dist/utilities/schedulePublishHandler.js

@@ -1,4 +1,62 @@
-import { canAccessAdmin } from 'payload';
+import { canAccessAdmin, Forbidden } from 'payload';
+import { hasScheduledPublishEnabled, MAIN_BRANCH } from 'payload/shared';
+import { buildUpcomingScheduleWhere } from '../elements/PublishButton/ScheduleDrawer/buildUpcomingScheduleWhere.js';
+import { getDocumentPermissions } from './getDocumentPermissions.js';
+export const getUpcomingScheduledPublishHandler = async ({
+  id,
+  collectionSlug,
+  globalSlug,
+  req
+}) => {
+  const {
+    payload
+  } = req;
+  await canAccessAdmin({
+    req
+  });
+  const collectionConfig = collectionSlug ? payload.collections[collectionSlug]?.config : undefined;
+  const globalConfig = globalSlug ? payload.config.globals.find(({
+    slug
+  }) => slug === globalSlug) : undefined;
+  const entityConfig = collectionConfig || globalConfig;
+  const hasValidTarget = Boolean(entityConfig && hasScheduledPublishEnabled(entityConfig) && (collectionConfig && id !== undefined && !globalSlug || globalConfig && !collectionSlug));
+  if (!hasValidTarget) {
+    throw new Forbidden(req.t);
+  }
+  const {
+    hasPublishPermission
+  } = await getDocumentPermissions({
+    id,
+    collectionConfig,
+    data: {},
+    globalConfig,
+    req
+  });
+  if (!hasPublishPermission) {
+    throw new Forbidden(req.t);
+  }
+  const {
+    docs
+  } = await payload.db.find({
+    collection: 'payload-jobs',
+    limit: 0,
+    sort: 'waitUntil',
+    where: buildUpcomingScheduleWhere({
+      id,
+      collectionSlug,
+      globalSlug
+    })
+  });
+  return docs.map(job => ({
+    id: job.id,
+    input: {
+      type: job.input?.type === 'unpublish' ? 'unpublish' : 'publish',
+      locale: job.input?.locale,
+      timezone: job.input?.timezone
+    },
+    waitUntil: job.waitUntil
+  }));
+};
 export const schedulePublishHandler = async ({
   type,
   date,
@@ -17,17 +75,36 @@ export const schedulePublishHandler = async ({
   await canAccessAdmin({
     req
   });
+  // Scheduled publish operates on main (§18): the job runs later, with no branch
+  // on its request, so a job queued from a branch would publish main's copy of the
+  // document at the appointed time. Refused rather than silently retargeted —
+  // the UI hides the affordance, so reaching this means bypassing it.
+  if (req.branch && req.branch !== MAIN_BRANCH) {
+    return {
+      error: 'Scheduled publish is not available on a branch. Switch to main to schedule.'
+    };
+  }
   try {
     if (deleteID) {
       await payload.delete({
         collection: 'payload-jobs',
+        overrideAccess: true,
         req,
         where: {
-          id: {
-            equals: deleteID
-          }
+          and: [{
+            id: {
+              equals: deleteID
+            }
+          }, {
+            taskSlug: {
+              equals: 'schedulePublish'
+            }
+          }]
         }
       });
+      return {
+        message: i18n.t('general:success')
+      };
     }
     await payload.jobs.queue({
       input: {
@@ -36,8 +113,12 @@ export const schedulePublishHandler = async ({
         global,
         locale: localeToPublish,
         timezone,
-        user: user.id
+        user: user && user.collection ? {
+          relationTo: user.collection,
+          value: user.id
+        } : undefined
       },
+      overrideAccess: true,
       task: 'schedulePublish',
       waitUntil: date
     });

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.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;AAe7C;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,CAc1E,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,13 +1,17 @@
 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';
 /**
@@ -28,13 +32,20 @@ import { switchLanguageHandler } from './switchLanguageHandler.js';
 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,

package/dist/utilities/serverFunctionRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"serverFunctionRegistry.js","names":["renderTabHandler","_internal_renderFieldHandler","getDefaultLayoutHandler","renderWidgetHandler","renderDocumentHandler","renderDocumentSlotsHandler","renderListHandler","buildFormStateHandler","buildTableStateHandler","copyDataFromLocaleHandler","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 { 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 { buildFormStateHandler } from './buildFormState.js'\nimport { buildTableStateHandler } from './buildTableState.js'\nimport { copyDataFromLocaleHandler } from './copyDataFromLocale.js'\nimport { schedulePublishHandler } 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-default-layout': getDefaultLayoutHandler,\n  'render-document': renderDocumentHandler,\n  'render-document-slots': renderDocumentSlotsHandler,\n  'render-field': _internal_renderFieldHandler,\n  'render-list': renderListHandler,\n  'render-tab': renderTabHandler,\n  'render-widget': renderWidgetHandler,\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,EAAEC,mBAAmB,QAAQ;AAC7D,SAASC,qBAAqB,QAAQ;AACtC,SAASC,0BAA0B,QAAQ;AAC3C,SAASC,iBAAiB,QAAQ;AAClC,SAASC,qBAAqB,QAAQ;AACtC,SAASC,sBAAsB,QAAQ;AACvC,SAASC,yBAAyB,QAAQ;AAC1C,SAASC,sBAAsB,QAAQ;AACvC,SAASC,cAAc,QAAQ;AAC/B,SAASC,qBAAqB,QAAQ;AAEtC;;;;;;;;;;;;;;;AAeA,OAAO,MAAMC,qBAAA,GAAkE;EAC7E,yBAAyBJ,yBAAA;EACzB,cAAcF,qBAAA;EACd,sBAAsBL,uBAAA;EACtB,mBAAmBE,qBAAA;EACnB,yBAAyBC,0BAAA;EACzB,gBAAgBJ,4BAAA;EAChB,eAAeK,iBAAA;EACf,cAAcN,gBAAA;EACd,iBAAiBG,mBAAA;EACjB,oBAAoBO,sBAAA;EACpBI,OAAA,EAASH,cAAA;EACT,mBAAmBC,qBAAA;EACnB,eAAeJ;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"}