@payloadcms/ui 4.0.0-internal.543da65 → 4.0.0-internal.567a487

package/dist/views/Branch/index.d.ts

@@ -0,0 +1,17 @@
+import type { DocumentViewServerProps } from 'payload';
+import React from 'react';
+import './index.css';
+/**
+ * The default view for a branch: what the branch has changed, ready to review and
+ * merge.
+ *
+ * This is the default rather than the branch's own form because the form is
+ * incidental — a name and a description — while the changes are the reason the
+ * branch exists. The form lives one click away at `/manage`.
+ *
+ * Only the change registry is read here. Each document's diff is fetched by the
+ * client as its row is opened or approached, because a branch can hold hundreds
+ * and rendering every field tree up front would dominate the page load.
+ */
+export declare function BranchChangesView(props: DocumentViewServerProps): Promise<React.JSX.Element>;
+//# sourceMappingURL=index.d.ts.map

package/dist/views/Branch/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Branch/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAA;AAOtD,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,aAAa,CAAA;AAKpB;;;;;;;;;;;GAWG;AACH,wBAAsB,iBAAiB,CAAC,KAAK,EAAE,uBAAuB,8BA4NrE"}

package/dist/views/Branch/index.js

@@ -0,0 +1,188 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { branchChangesCollectionSlug, branchesCollectionSlug, branchMergesCollectionSlug } from 'payload/shared';
+import React from 'react';
+// eslint-disable-next-line payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary
+import { BranchChanges } from '../../exports/client/index.js';
+import { buildUpcomingMergeWhere } from '../../utilities/scheduleMergeHandler.js';
+import { SetDocumentStepNav } from '../Edit/SetDocumentStepNav/index.js';
+import './index.css';
+/** Small: each event lists every document it merged, so pages grow with the events. */
+const MERGE_HISTORY_PAGE_SIZE = 5;
+/**
+ * The default view for a branch: what the branch has changed, ready to review and
+ * merge.
+ *
+ * This is the default rather than the branch's own form because the form is
+ * incidental — a name and a description — while the changes are the reason the
+ * branch exists. The form lives one click away at `/manage`.
+ *
+ * Only the change registry is read here. Each document's diff is fetched by the
+ * client as its row is opened or approached, because a branch can hold hundreds
+ * and rendering every field tree up front would dominate the page load.
+ */
+export async function BranchChangesView(props) {
+  const {
+    initPageResult: {
+      collectionConfig,
+      docID: branchID,
+      req,
+      req: {
+        i18n,
+        payload
+      }
+    }
+  } = props;
+  const branch = branchID ? await payload.findByID({
+    id: branchID,
+    collection: branchesCollectionSlug,
+    depth: 0,
+    overrideAccess: false,
+    req,
+    user: req.user
+  }) : null;
+  const slug = branch?.slug;
+  const changes = slug ? await payload.find({
+    collection: branchChangesCollectionSlug,
+    depth: 0,
+    overrideAccess: false,
+    pagination: false,
+    req,
+    sort: 'collectionSlug',
+    user: req.user,
+    where: {
+      branch: {
+        equals: slug
+      }
+    }
+  }) : null;
+  const documentChanges = (changes?.docs ?? []).reduce((acc, change) => {
+    const row = change;
+    // A global is listed alongside the documents rather than in a section of its own:
+    // it is one more thing this branch changed, and merging works on the same rows.
+    if (row.entityType === 'global' && row.globalSlug) {
+      acc.push({
+        id: String(row.id),
+        globalSlug: row.globalSlug,
+        operation: 'update'
+      });
+      return acc;
+    }
+    const docID = typeof row.doc === 'object' ? row.doc?.value : row.doc;
+    if (row.collectionSlug && docID !== undefined && docID !== null && row.operation) {
+      acc.push({
+        id: String(row.id),
+        collectionSlug: row.collectionSlug,
+        docID,
+        operation: row.operation
+      });
+    }
+    return acc;
+  }, []);
+  // Upcoming schedules, soonest first. A branch can carry several — schedule a merge,
+  // keep working, schedule another — so this is a list rather than a flag.
+  const scheduledJobs = slug ? await payload.find({
+    collection: 'payload-jobs',
+    depth: 0,
+    limit: 25,
+    overrideAccess: false,
+    pagination: false,
+    req,
+    sort: 'waitUntil',
+    user: req.user,
+    where: buildUpcomingMergeWhere({
+      branchSlug: slug
+    })
+  }) : null;
+  const scheduledMerges = (scheduledJobs?.docs ?? []).reduce((acc, job) => {
+    const row = job;
+    if (!row.waitUntil) {
+      return acc;
+    }
+    const selected = row.input?.changes?.length ? new Set(row.input.changes.map(String)) : null;
+    acc.push({
+      id: String(row.id),
+      // What a schedule will actually apply, resolved against what is pending *now*:
+      // a schedule with no selection takes whatever is on the branch when it fires,
+      // and a selection can name changes that have since been discarded.
+      changes: selected ? documentChanges.filter(change => selected.has(String(change.id))) : documentChanges,
+      closeBranch: Boolean(row.input?.closeBranch),
+      isEverything: !selected,
+      waitUntil: row.waitUntil
+    });
+    return acc;
+  }, []);
+  // The merge history, newest first and paginated: a long-lived branch accumulates
+  // one event per merge indefinitely, and each event carries a snapshot per document
+  // it merged, so this is the one read on this page that grows without bound.
+  const historyPage = Number(props.searchParams?.historyPage ?? 1);
+  const historyPageNumber = Number.isFinite(historyPage) && historyPage > 0 ? historyPage : 1;
+  const merges = slug ? await payload.find({
+    collection: branchMergesCollectionSlug,
+    depth: 0,
+    limit: MERGE_HISTORY_PAGE_SIZE,
+    overrideAccess: false,
+    page: historyPageNumber,
+    req,
+    // `changes.before` / `changes.after` are whole-document snapshots, so they
+    // are left out of the list read — a row's diff is fetched when it is opened.
+    select: {
+      branch: true,
+      changes: {
+        collectionSlug: true,
+        docID: true,
+        docTitle: true,
+        globalSlug: true,
+        operation: true
+      },
+      mergedAt: true,
+      mergedByLabel: true
+    },
+    sort: '-mergedAt',
+    user: req.user,
+    where: {
+      branch: {
+        equals: slug
+      }
+    }
+  }) : null;
+  const mergeEvents = (merges?.docs ?? []).map(event => {
+    const row = event;
+    return {
+      id: String(row.id),
+      changes: (row.changes ?? []).map(change => ({
+        collectionSlug: change.collectionSlug ?? '',
+        docID: change.docID ?? '',
+        docTitle: change.docTitle ?? change.docID ?? '',
+        globalSlug: change.globalSlug,
+        operation: change.operation ?? 'update'
+      })),
+      mergedAt: row.mergedAt ?? '',
+      mergedByLabel: row.mergedByLabel
+    };
+  });
+  // Resolved here rather than passed through: the label is a function on this
+  // collection, and `SetDocumentStepNav` is a client component.
+  const pluralLabel = typeof collectionConfig?.labels?.plural === 'function' ? collectionConfig.labels.plural({
+    i18n,
+    t: i18n.t
+  }) : collectionConfig?.labels?.plural;
+  return /*#__PURE__*/_jsxs(React.Fragment, {
+    children: [/*#__PURE__*/_jsx(SetDocumentStepNav, {
+      collectionSlug: branchesCollectionSlug,
+      id: branchID,
+      pluralLabel: pluralLabel,
+      useAsTitle: collectionConfig?.admin?.useAsTitle
+    }), branchID !== undefined && branchID !== null && /*#__PURE__*/_jsx(BranchChanges, {
+      branchID: branchID,
+      branchName: branch?.name ?? slug ?? '',
+      branchSlug: slug ?? '',
+      changes: documentChanges,
+      historyPage: historyPageNumber,
+      historyTotalPages: merges?.totalPages ?? 1,
+      isClosed: branch?.status === 'closed',
+      mergeEvents: mergeEvents,
+      scheduledMerges: scheduledMerges
+    })]
+  });
+}
+//# sourceMappingURL=index.js.map

package/dist/views/Branch/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["branchChangesCollectionSlug","branchesCollectionSlug","branchMergesCollectionSlug","React","BranchChanges","buildUpcomingMergeWhere","SetDocumentStepNav","MERGE_HISTORY_PAGE_SIZE","BranchChangesView","props","initPageResult","collectionConfig","docID","branchID","req","i18n","payload","branch","findByID","id","collection","depth","overrideAccess","user","slug","changes","find","pagination","sort","where","equals","documentChanges","docs","reduce","acc","change","row","entityType","globalSlug","push","String","operation","doc","value","collectionSlug","undefined","scheduledJobs","limit","branchSlug","scheduledMerges","job","waitUntil","selected","input","length","Set","map","filter","has","closeBranch","Boolean","isEverything","historyPage","Number","searchParams","historyPageNumber","isFinite","merges","page","select","docTitle","mergedAt","mergedByLabel","mergeEvents","event","pluralLabel","labels","plural","t","_jsxs","Fragment","_jsx","useAsTitle","admin","branchName","name","historyTotalPages","totalPages","isClosed","status"],"sources":["../../../src/views/Branch/index.tsx"],"sourcesContent":["import type { DocumentViewServerProps } from 'payload'\n\nimport {\n  branchChangesCollectionSlug,\n  branchesCollectionSlug,\n  branchMergesCollectionSlug,\n} from 'payload/shared'\nimport React from 'react'\n\nimport type { BranchChange } from './ChangedDocuments/index.js'\nimport type { MergeEvent } from './MergeLedger/index.js'\nimport type { ScheduledMerge } from './ScheduledMerges/index.js'\n\n// eslint-disable-next-line payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary\nimport { BranchChanges } from '../../exports/client/index.js'\nimport { buildUpcomingMergeWhere } from '../../utilities/scheduleMergeHandler.js'\nimport { SetDocumentStepNav } from '../Edit/SetDocumentStepNav/index.js'\nimport './index.css'\n\n/** Small: each event lists every document it merged, so pages grow with the events. */\nconst MERGE_HISTORY_PAGE_SIZE = 5\n\n/**\n * The default view for a branch: what the branch has changed, ready to review and\n * merge.\n *\n * This is the default rather than the branch's own form because the form is\n * incidental — a name and a description — while the changes are the reason the\n * branch exists. The form lives one click away at `/manage`.\n *\n * Only the change registry is read here. Each document's diff is fetched by the\n * client as its row is opened or approached, because a branch can hold hundreds\n * and rendering every field tree up front would dominate the page load.\n */\nexport async function BranchChangesView(props: DocumentViewServerProps) {\n  const {\n    initPageResult: {\n      collectionConfig,\n      docID: branchID,\n      req,\n      req: { i18n, payload },\n    },\n  } = props\n\n  const branch = branchID\n    ? await payload.findByID({\n        id: branchID,\n        collection: branchesCollectionSlug,\n        depth: 0,\n        overrideAccess: false,\n        req,\n        user: req.user,\n      })\n    : null\n\n  const slug = (branch as { slug?: string } | null)?.slug\n\n  const changes = slug\n    ? await payload.find({\n        collection: branchChangesCollectionSlug,\n        depth: 0,\n        overrideAccess: false,\n        pagination: false,\n        req,\n        sort: 'collectionSlug',\n        user: req.user,\n        where: { branch: { equals: slug } },\n      })\n    : null\n\n  const documentChanges: BranchChange[] = (changes?.docs ?? []).reduce<BranchChange[]>(\n    (acc, change) => {\n      const row = change as {\n        collectionSlug?: string\n        doc?: { value?: number | string } | number | string\n        entityType?: string\n        globalSlug?: string\n        id: number | string\n        operation?: BranchChange['operation']\n      }\n\n      // A global is listed alongside the documents rather than in a section of its own:\n      // it is one more thing this branch changed, and merging works on the same rows.\n      if (row.entityType === 'global' && row.globalSlug) {\n        acc.push({\n          id: String(row.id),\n          globalSlug: row.globalSlug,\n          operation: 'update',\n        })\n\n        return acc\n      }\n\n      const docID = typeof row.doc === 'object' ? row.doc?.value : row.doc\n\n      if (row.collectionSlug && docID !== undefined && docID !== null && row.operation) {\n        acc.push({\n          id: String(row.id),\n          collectionSlug: row.collectionSlug,\n          docID,\n          operation: row.operation,\n        })\n      }\n\n      return acc\n    },\n    [],\n  )\n\n  // Upcoming schedules, soonest first. A branch can carry several — schedule a merge,\n  // keep working, schedule another — so this is a list rather than a flag.\n  const scheduledJobs = slug\n    ? await payload.find({\n        collection: 'payload-jobs',\n        depth: 0,\n        limit: 25,\n        overrideAccess: false,\n        pagination: false,\n        req,\n        sort: 'waitUntil',\n        user: req.user,\n        where: buildUpcomingMergeWhere({ branchSlug: slug }),\n      })\n    : null\n\n  const scheduledMerges: ScheduledMerge[] = (scheduledJobs?.docs ?? []).reduce<ScheduledMerge[]>(\n    (acc, job) => {\n      const row = job as {\n        id: number | string\n        input?: { changes?: string[]; closeBranch?: boolean }\n        waitUntil?: string\n      }\n\n      if (!row.waitUntil) {\n        return acc\n      }\n\n      const selected = row.input?.changes?.length ? new Set(row.input.changes.map(String)) : null\n\n      acc.push({\n        id: String(row.id),\n        // What a schedule will actually apply, resolved against what is pending *now*:\n        // a schedule with no selection takes whatever is on the branch when it fires,\n        // and a selection can name changes that have since been discarded.\n        changes: selected\n          ? documentChanges.filter((change) => selected.has(String(change.id)))\n          : documentChanges,\n        closeBranch: Boolean(row.input?.closeBranch),\n        isEverything: !selected,\n        waitUntil: row.waitUntil,\n      })\n\n      return acc\n    },\n    [],\n  )\n\n  // The merge history, newest first and paginated: a long-lived branch accumulates\n  // one event per merge indefinitely, and each event carries a snapshot per document\n  // it merged, so this is the one read on this page that grows without bound.\n  const historyPage = Number(\n    (props.searchParams as Record<string, string | undefined> | undefined)?.historyPage ?? 1,\n  )\n  const historyPageNumber = Number.isFinite(historyPage) && historyPage > 0 ? historyPage : 1\n\n  const merges = slug\n    ? await payload.find({\n        collection: branchMergesCollectionSlug,\n        depth: 0,\n        limit: MERGE_HISTORY_PAGE_SIZE,\n        overrideAccess: false,\n        page: historyPageNumber,\n        req,\n        // `changes.before` / `changes.after` are whole-document snapshots, so they\n        // are left out of the list read — a row's diff is fetched when it is opened.\n        select: {\n          branch: true,\n          changes: {\n            collectionSlug: true,\n            docID: true,\n            docTitle: true,\n            globalSlug: true,\n            operation: true,\n          },\n          mergedAt: true,\n          mergedByLabel: true,\n        },\n        sort: '-mergedAt',\n        user: req.user,\n        where: { branch: { equals: slug } },\n      })\n    : null\n\n  const mergeEvents: MergeEvent[] = (merges?.docs ?? []).map((event) => {\n    const row = event as {\n      changes?: {\n        collectionSlug?: string\n        docID?: string\n        docTitle?: string\n        globalSlug?: string\n        operation?: string\n      }[]\n      id: number | string\n      mergedAt?: string\n      mergedByLabel?: string\n    }\n\n    return {\n      id: String(row.id),\n      changes: (row.changes ?? []).map((change) => ({\n        collectionSlug: change.collectionSlug ?? '',\n        docID: change.docID ?? '',\n        docTitle: change.docTitle ?? change.docID ?? '',\n        globalSlug: change.globalSlug,\n        operation: (change.operation ?? 'update') as BranchChange['operation'],\n      })),\n      mergedAt: row.mergedAt ?? '',\n      mergedByLabel: row.mergedByLabel,\n    }\n  })\n\n  // Resolved here rather than passed through: the label is a function on this\n  // collection, and `SetDocumentStepNav` is a client component.\n  const pluralLabel =\n    typeof collectionConfig?.labels?.plural === 'function'\n      ? collectionConfig.labels.plural({ i18n, t: i18n.t })\n      : collectionConfig?.labels?.plural\n\n  return (\n    <React.Fragment>\n      {/* Without this the trail stops at the dashboard: the crumbs are set by the\n          view, and this one replaced the default edit view. No crumb of its own —\n          this is what a branch opens to, so naming it would repeat the branch. */}\n      <SetDocumentStepNav\n        collectionSlug={branchesCollectionSlug}\n        id={branchID}\n        pluralLabel={pluralLabel}\n        useAsTitle={collectionConfig?.admin?.useAsTitle}\n      />\n      {branchID !== undefined && branchID !== null && (\n        <BranchChanges\n          branchID={branchID}\n          branchName={(branch as { name?: string } | null)?.name ?? slug ?? ''}\n          branchSlug={slug ?? ''}\n          changes={documentChanges}\n          historyPage={historyPageNumber}\n          historyTotalPages={merges?.totalPages ?? 1}\n          isClosed={(branch as { status?: string } | null)?.status === 'closed'}\n          mergeEvents={mergeEvents}\n          scheduledMerges={scheduledMerges}\n        />\n      )}\n    </React.Fragment>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Branch/renderBranchDiff.d.ts

@@ -0,0 +1,29 @@
+import type { CollectionSlug, ServerFunction } from 'payload';
+import type React from 'react';
+export type RenderBranchDiffArgs = {
+    branch: string;
+    /** Absent for a global. */
+    collectionSlug?: CollectionSlug;
+    /** Absent for a global. */
+    docID?: number | string;
+    globalSlug?: string;
+    operation: 'create' | 'delete' | 'update';
+};
+export type RenderBranchDiffResult = {
+    diff: React.ReactNode;
+    title: string;
+};
+/**
+ * Renders one changed document's diff, on demand.
+ *
+ * Per document rather than per branch because a branch can hold hundreds of
+ * changes and each diff is a full field-tree render — building them all up front
+ * would be the slowest thing in the admin panel. The client asks for one at a
+ * time, as rows are opened or come into view.
+ *
+ * The diff itself is the version-comparison renderer, unmodified: the shape of
+ * the question is identical — two versions of one document, only the changed
+ * fields — so `main`'s copy stands in for "before" and the branch's for "after".
+ */
+export declare const renderBranchDiffHandler: ServerFunction<RenderBranchDiffArgs, Promise<RenderBranchDiffResult>>;
+//# sourceMappingURL=renderBranchDiff.d.ts.map

package/dist/views/Branch/renderBranchDiff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderBranchDiff.d.ts","sourceRoot":"","sources":["../../../src/views/Branch/renderBranchDiff.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAY9B,MAAM,MAAM,oBAAoB,GAAG;IACjC,MAAM,EAAE,MAAM,CAAA;IACd,2BAA2B;IAC3B,cAAc,CAAC,EAAE,cAAc,CAAA;IAC/B,2BAA2B;IAC3B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAA;CAC1C,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAID;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,uBAAuB,EAAE,cAAc,CAClD,oBAAoB,EACpB,OAAO,CAAC,sBAAsB,CAAC,CAiIhC,CAAA"}

package/dist/views/Branch/renderBranchDiff.js

@@ -0,0 +1,151 @@
+import { getTranslation } from '@payloadcms/translations';
+import { isolateBranchState } from 'payload';
+import { MAIN_BRANCH } from 'payload/shared';
+import { formatDocTitle } from '../../utilities/formatDocTitle/index.js';
+import { getClientConfig } from '../../utilities/getClientConfig.js';
+import { getClientSchemaMap } from '../../utilities/getClientSchemaMap.js';
+import { getSchemaMap } from '../../utilities/getSchemaMap.js';
+import { RenderDiff } from '../Version/RenderFieldsToDiff/index.js';
+const timestampFields = new Set(['createdAt', 'updatedAt']);
+/**
+ * Renders one changed document's diff, on demand.
+ *
+ * Per document rather than per branch because a branch can hold hundreds of
+ * changes and each diff is a full field-tree render — building them all up front
+ * would be the slowest thing in the admin panel. The client asks for one at a
+ * time, as rows are opened or come into view.
+ *
+ * The diff itself is the version-comparison renderer, unmodified: the shape of
+ * the question is identical — two versions of one document, only the changed
+ * fields — so `main`'s copy stands in for "before" and the branch's for "after".
+ */
+export const renderBranchDiffHandler = async ({
+  branch,
+  collectionSlug,
+  docID,
+  globalSlug,
+  operation,
+  req
+}) => {
+  if (!req.user) {
+    throw new Error('Unauthorized');
+  }
+  const {
+    i18n,
+    payload
+  } = req;
+  const {
+    config
+  } = payload;
+  // A global is the same question asked of a different entity: two copies of one thing,
+  // only the changed fields. Everything below is shared; only what is read differs.
+  const globalConfig = globalSlug ? config.globals.find(each => each.slug === globalSlug) : undefined;
+  const collectionConfig = collectionSlug ? payload.collections[collectionSlug]?.config : undefined;
+  const entityConfig = globalConfig ?? collectionConfig;
+  if (!entityConfig) {
+    throw new Error(`Unknown entity: ${globalSlug ?? collectionSlug}`);
+  }
+  // Drafts are the point of comparison on a versioned collection: a branch edit
+  // that was only ever saved as a draft never touches the document row, so reading
+  // published state returns main's own values on both sides and renders an empty
+  // diff for a change that is really there.
+  const draft = Boolean(entityConfig.versions?.drafts);
+  const read = async fromBranch => {
+    try {
+      if (globalSlug) {
+        return await payload.findGlobal({
+          slug: globalSlug,
+          branch: fromBranch,
+          depth: 0,
+          draft,
+          overrideAccess: false,
+          req: isolateBranchState(req),
+          user: req.user
+        });
+      }
+      return await payload.findByID({
+        id: docID,
+        branch: fromBranch,
+        collection: collectionSlug,
+        depth: 0,
+        disableErrors: true,
+        draft,
+        overrideAccess: false,
+        req: isolateBranchState(req),
+        user: req.user
+      });
+    } catch (_err) {
+      // A document that does not exist on one side is the normal case for a
+      // create or a delete — the diff renders it as wholly added or removed.
+      return null;
+    }
+  };
+  // A delete is a tombstone, so the branch read hides it: `before` is main's copy
+  // and `after` is nothing. A create is the mirror of that.
+  const [before, after] = await Promise.all([operation === 'create' ? Promise.resolve(null) : read(MAIN_BRANCH), operation === 'delete' ? Promise.resolve(null) : read(branch)]);
+  // Timestamps are bookkeeping, not content. A branched document is written when
+  // it is branched, so `updatedAt` differs on every single change — it would be
+  // the one row present in every diff, and never the one worth reading.
+  const contentFields = entityConfig.fields.filter(field => !('name' in field) || !timestampFields.has(field.name));
+  const schemaMap = getSchemaMap({
+    collectionSlug,
+    config,
+    globalSlug,
+    i18n
+  });
+  const clientConfig = getClientConfig({
+    config,
+    i18n,
+    importMap: payload.importMap,
+    user: req.user
+  });
+  const clientSchemaMap = getClientSchemaMap({
+    collectionSlug,
+    config: clientConfig,
+    globalSlug,
+    i18n,
+    payload,
+    schemaMap
+  });
+  const diff = RenderDiff({
+    clientSchemaMap,
+    customDiffComponents: {},
+    entitySlug: globalSlug ?? collectionSlug,
+    fields: contentFields,
+    i18n,
+    // Only what the branch changed. The unchanged remainder of a document is
+    // noise when the question is "what does merging this do?".
+    fieldsPermissions: true,
+    modifiedOnly: true,
+    parentIndexPath: '',
+    parentIsLocalized: false,
+    parentPath: '',
+    parentSchemaPath: '',
+    req,
+    selectedLocales: [],
+    versionFromSiblingData: before ?? {},
+    versionToSiblingData: after ?? {}
+  });
+  // A global has one of itself, so its label *is* its title — there is no document to name.
+  if (globalSlug) {
+    return {
+      diff,
+      title: getTranslation(globalConfig?.label ?? globalSlug, i18n)
+    };
+  }
+  return {
+    diff,
+    title: formatDocTitle({
+      collectionConfig: clientConfig.collections.find(({
+        slug
+      }) => slug === collectionSlug),
+      data: after ?? before ?? {
+        id: docID
+      },
+      dateFormat: config.admin.dateFormat,
+      fallback: String(docID),
+      i18n
+    })
+  };
+};
+//# sourceMappingURL=renderBranchDiff.js.map

package/dist/views/Branch/renderBranchDiff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderBranchDiff.js","names":["getTranslation","isolateBranchState","MAIN_BRANCH","formatDocTitle","getClientConfig","getClientSchemaMap","getSchemaMap","RenderDiff","timestampFields","Set","renderBranchDiffHandler","branch","collectionSlug","docID","globalSlug","operation","req","user","Error","i18n","payload","config","globalConfig","globals","find","each","slug","undefined","collectionConfig","collections","entityConfig","draft","Boolean","versions","drafts","read","fromBranch","findGlobal","depth","overrideAccess","findByID","id","collection","disableErrors","_err","before","after","Promise","all","resolve","contentFields","fields","filter","field","has","name","schemaMap","clientConfig","importMap","clientSchemaMap","diff","customDiffComponents","entitySlug","fieldsPermissions","modifiedOnly","parentIndexPath","parentIsLocalized","parentPath","parentSchemaPath","selectedLocales","versionFromSiblingData","versionToSiblingData","title","label","data","dateFormat","admin","fallback","String"],"sources":["../../../src/views/Branch/renderBranchDiff.tsx"],"sourcesContent":["import type { CollectionSlug, ServerFunction } from 'payload'\nimport type React from 'react'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport { isolateBranchState } from 'payload'\nimport { MAIN_BRANCH } from 'payload/shared'\n\nimport { formatDocTitle } from '../../utilities/formatDocTitle/index.js'\nimport { getClientConfig } from '../../utilities/getClientConfig.js'\nimport { getClientSchemaMap } from '../../utilities/getClientSchemaMap.js'\nimport { getSchemaMap } from '../../utilities/getSchemaMap.js'\nimport { RenderDiff } from '../Version/RenderFieldsToDiff/index.js'\n\nexport type RenderBranchDiffArgs = {\n  branch: string\n  /** Absent for a global. */\n  collectionSlug?: CollectionSlug\n  /** Absent for a global. */\n  docID?: number | string\n  globalSlug?: string\n  operation: 'create' | 'delete' | 'update'\n}\n\nexport type RenderBranchDiffResult = {\n  diff: React.ReactNode\n  title: string\n}\n\nconst timestampFields = new Set(['createdAt', 'updatedAt'])\n\n/**\n * Renders one changed document's diff, on demand.\n *\n * Per document rather than per branch because a branch can hold hundreds of\n * changes and each diff is a full field-tree render — building them all up front\n * would be the slowest thing in the admin panel. The client asks for one at a\n * time, as rows are opened or come into view.\n *\n * The diff itself is the version-comparison renderer, unmodified: the shape of\n * the question is identical — two versions of one document, only the changed\n * fields — so `main`'s copy stands in for \"before\" and the branch's for \"after\".\n */\nexport const renderBranchDiffHandler: ServerFunction<\n  RenderBranchDiffArgs,\n  Promise<RenderBranchDiffResult>\n> = async ({ branch, collectionSlug, docID, globalSlug, operation, req }) => {\n  if (!req.user) {\n    throw new Error('Unauthorized')\n  }\n\n  const { i18n, payload } = req\n  const { config } = payload\n\n  // A global is the same question asked of a different entity: two copies of one thing,\n  // only the changed fields. Everything below is shared; only what is read differs.\n  const globalConfig = globalSlug\n    ? config.globals.find((each) => each.slug === globalSlug)\n    : undefined\n  const collectionConfig = collectionSlug ? payload.collections[collectionSlug]?.config : undefined\n  const entityConfig = globalConfig ?? collectionConfig\n\n  if (!entityConfig) {\n    throw new Error(`Unknown entity: ${globalSlug ?? collectionSlug}`)\n  }\n\n  // Drafts are the point of comparison on a versioned collection: a branch edit\n  // that was only ever saved as a draft never touches the document row, so reading\n  // published state returns main's own values on both sides and renders an empty\n  // diff for a change that is really there.\n  const draft = Boolean(entityConfig.versions?.drafts)\n\n  const read = async (fromBranch: string) => {\n    try {\n      if (globalSlug) {\n        return await payload.findGlobal({\n          slug: globalSlug,\n          branch: fromBranch,\n          depth: 0,\n          draft,\n          overrideAccess: false,\n          req: isolateBranchState(req),\n          user: req.user,\n        })\n      }\n\n      return await payload.findByID({\n        id: docID,\n        branch: fromBranch,\n        collection: collectionSlug,\n        depth: 0,\n        disableErrors: true,\n        draft,\n        overrideAccess: false,\n        req: isolateBranchState(req),\n        user: req.user,\n      })\n    } catch (_err) {\n      // A document that does not exist on one side is the normal case for a\n      // create or a delete — the diff renders it as wholly added or removed.\n      return null\n    }\n  }\n\n  // A delete is a tombstone, so the branch read hides it: `before` is main's copy\n  // and `after` is nothing. A create is the mirror of that.\n  const [before, after] = await Promise.all([\n    operation === 'create' ? Promise.resolve(null) : read(MAIN_BRANCH),\n    operation === 'delete' ? Promise.resolve(null) : read(branch),\n  ])\n\n  // Timestamps are bookkeeping, not content. A branched document is written when\n  // it is branched, so `updatedAt` differs on every single change — it would be\n  // the one row present in every diff, and never the one worth reading.\n  const contentFields = entityConfig.fields.filter(\n    (field) => !('name' in field) || !timestampFields.has(field.name),\n  )\n\n  const schemaMap = getSchemaMap({ collectionSlug, config, globalSlug, i18n })\n\n  const clientConfig = getClientConfig({\n    config,\n    i18n,\n    importMap: payload.importMap,\n    user: req.user,\n  })\n\n  const clientSchemaMap = getClientSchemaMap({\n    collectionSlug,\n    config: clientConfig,\n    globalSlug,\n    i18n,\n    payload,\n    schemaMap,\n  })\n\n  const diff = RenderDiff({\n    clientSchemaMap,\n    customDiffComponents: {},\n    entitySlug: globalSlug ?? collectionSlug,\n    fields: contentFields,\n    i18n,\n    // Only what the branch changed. The unchanged remainder of a document is\n    // noise when the question is \"what does merging this do?\".\n    fieldsPermissions: true,\n    modifiedOnly: true,\n    parentIndexPath: '',\n    parentIsLocalized: false,\n    parentPath: '',\n    parentSchemaPath: '',\n    req,\n    selectedLocales: [],\n    versionFromSiblingData: before ?? {},\n    versionToSiblingData: after ?? {},\n  })\n\n  // A global has one of itself, so its label *is* its title — there is no document to name.\n  if (globalSlug) {\n    return {\n      diff,\n      title: getTranslation(globalConfig?.label ?? globalSlug, i18n),\n    }\n  }\n\n  return {\n    diff,\n    title: formatDocTitle({\n      collectionConfig: clientConfig.collections.find(({ slug }) => slug === collectionSlug),\n      data: (after ?? before ?? { id: docID }) as Parameters<typeof formatDocTitle>[0]['data'],\n      dateFormat: config.admin.dateFormat,\n      fallback: String(docID),\n      i18n,\n    }),\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/views/Branch/renderMergeDiff.d.ts

@@ -0,0 +1,24 @@
+import type { ServerFunction } from 'payload';
+import type React from 'react';
+export type RenderMergeDiffArgs = {
+    /** Position within the merge event's `changes` array. */
+    changeIndex: number;
+    mergeID: number | string;
+};
+export type RenderMergeDiffResult = {
+    diff: React.ReactNode;
+};
+/**
+ * Renders what one already-merged document changed, from the ledger.
+ *
+ * The live document is no longer a useful source here: main has moved on since, and
+ * the branch's copy is gone. So this reads the two snapshots taken either side of
+ * the merge write — the only record of that moment — and renders them through the
+ * same version-comparison renderer the pre-merge diff uses.
+ *
+ * Per change rather than with the page, for the reason `renderBranchDiff` is: a
+ * branch's history can hold hundreds of documents and each diff is a full field-tree
+ * render.
+ */
+export declare const renderMergeDiffHandler: ServerFunction<RenderMergeDiffArgs, Promise<RenderMergeDiffResult>>;
+//# sourceMappingURL=renderMergeDiff.d.ts.map

package/dist/views/Branch/renderMergeDiff.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderMergeDiff.d.ts","sourceRoot":"","sources":["../../../src/views/Branch/renderMergeDiff.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAS9B,MAAM,MAAM,mBAAmB,GAAG;IAChC,yDAAyD;IACzD,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,KAAK,CAAC,SAAS,CAAA;CACtB,CAAA;AAID;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,sBAAsB,EAAE,cAAc,CACjD,mBAAmB,EACnB,OAAO,CAAC,qBAAqB,CAAC,CAsF/B,CAAA"}

package/dist/views/Branch/renderMergeDiff.js

@@ -0,0 +1,94 @@
+import { branchMergesCollectionSlug } from 'payload/shared';
+import { getClientConfig } from '../../utilities/getClientConfig.js';
+import { getClientSchemaMap } from '../../utilities/getClientSchemaMap.js';
+import { getSchemaMap } from '../../utilities/getSchemaMap.js';
+import { RenderDiff } from '../Version/RenderFieldsToDiff/index.js';
+const timestampFields = new Set(['createdAt', 'updatedAt']);
+/**
+ * Renders what one already-merged document changed, from the ledger.
+ *
+ * The live document is no longer a useful source here: main has moved on since, and
+ * the branch's copy is gone. So this reads the two snapshots taken either side of
+ * the merge write — the only record of that moment — and renders them through the
+ * same version-comparison renderer the pre-merge diff uses.
+ *
+ * Per change rather than with the page, for the reason `renderBranchDiff` is: a
+ * branch's history can hold hundreds of documents and each diff is a full field-tree
+ * render.
+ */
+export const renderMergeDiffHandler = async ({
+  changeIndex,
+  mergeID,
+  req
+}) => {
+  if (!req.user) {
+    throw new Error('Unauthorized');
+  }
+  const {
+    i18n,
+    payload
+  } = req;
+  const {
+    config
+  } = payload;
+  const event = await payload.findByID({
+    id: mergeID,
+    collection: branchMergesCollectionSlug,
+    depth: 0,
+    overrideAccess: false,
+    req,
+    user: req.user
+  });
+  const change = event?.changes?.[changeIndex];
+  const collectionSlug = change?.collectionSlug;
+  const globalSlug = change?.globalSlug;
+  // A merged global's snapshots are the same pair of documents any other row holds; only
+  // the field set they are read against comes from somewhere else.
+  const entityConfig = globalSlug ? config.globals.find(each => each.slug === globalSlug) : collectionSlug ? payload.collections[collectionSlug]?.config : undefined;
+  if (!change || !entityConfig) {
+    throw new Error('Unknown merged change');
+  }
+  // Timestamps are bookkeeping, not content, and `updatedAt` differs on every
+  // merged document by definition — it would be the one row present in every diff.
+  const contentFields = entityConfig.fields.filter(field => !('name' in field) || !timestampFields.has(field.name));
+  const schemaMap = getSchemaMap({
+    collectionSlug,
+    config,
+    globalSlug,
+    i18n
+  });
+  const clientConfig = getClientConfig({
+    config,
+    i18n,
+    importMap: payload.importMap,
+    user: req.user
+  });
+  const clientSchemaMap = getClientSchemaMap({
+    collectionSlug,
+    config: clientConfig,
+    globalSlug,
+    i18n,
+    payload,
+    schemaMap
+  });
+  return {
+    diff: RenderDiff({
+      clientSchemaMap,
+      customDiffComponents: {},
+      entitySlug: globalSlug ?? collectionSlug,
+      fields: contentFields,
+      fieldsPermissions: true,
+      i18n,
+      modifiedOnly: true,
+      parentIndexPath: '',
+      parentIsLocalized: false,
+      parentPath: '',
+      parentSchemaPath: '',
+      req,
+      selectedLocales: [],
+      versionFromSiblingData: change.before ?? {},
+      versionToSiblingData: change.after ?? {}
+    })
+  };
+};
+//# sourceMappingURL=renderMergeDiff.js.map

package/dist/views/Branch/renderMergeDiff.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"renderMergeDiff.js","names":["branchMergesCollectionSlug","getClientConfig","getClientSchemaMap","getSchemaMap","RenderDiff","timestampFields","Set","renderMergeDiffHandler","changeIndex","mergeID","req","user","Error","i18n","payload","config","event","findByID","id","collection","depth","overrideAccess","change","changes","collectionSlug","globalSlug","entityConfig","globals","find","each","slug","collections","undefined","contentFields","fields","filter","field","has","name","schemaMap","clientConfig","importMap","clientSchemaMap","diff","customDiffComponents","entitySlug","fieldsPermissions","modifiedOnly","parentIndexPath","parentIsLocalized","parentPath","parentSchemaPath","selectedLocales","versionFromSiblingData","before","versionToSiblingData","after"],"sources":["../../../src/views/Branch/renderMergeDiff.tsx"],"sourcesContent":["import type { ServerFunction } from 'payload'\nimport type React from 'react'\n\nimport { branchMergesCollectionSlug } from 'payload/shared'\n\nimport { getClientConfig } from '../../utilities/getClientConfig.js'\nimport { getClientSchemaMap } from '../../utilities/getClientSchemaMap.js'\nimport { getSchemaMap } from '../../utilities/getSchemaMap.js'\nimport { RenderDiff } from '../Version/RenderFieldsToDiff/index.js'\n\nexport type RenderMergeDiffArgs = {\n  /** Position within the merge event's `changes` array. */\n  changeIndex: number\n  mergeID: number | string\n}\n\nexport type RenderMergeDiffResult = {\n  diff: React.ReactNode\n}\n\nconst timestampFields = new Set(['createdAt', 'updatedAt'])\n\n/**\n * Renders what one already-merged document changed, from the ledger.\n *\n * The live document is no longer a useful source here: main has moved on since, and\n * the branch's copy is gone. So this reads the two snapshots taken either side of\n * the merge write — the only record of that moment — and renders them through the\n * same version-comparison renderer the pre-merge diff uses.\n *\n * Per change rather than with the page, for the reason `renderBranchDiff` is: a\n * branch's history can hold hundreds of documents and each diff is a full field-tree\n * render.\n */\nexport const renderMergeDiffHandler: ServerFunction<\n  RenderMergeDiffArgs,\n  Promise<RenderMergeDiffResult>\n> = async ({ changeIndex, mergeID, req }) => {\n  if (!req.user) {\n    throw new Error('Unauthorized')\n  }\n\n  const { i18n, payload } = req\n  const { config } = payload\n\n  const event = await payload.findByID({\n    id: mergeID,\n    collection: branchMergesCollectionSlug,\n    depth: 0,\n    overrideAccess: false,\n    req,\n    user: req.user,\n  })\n\n  const change = (\n    event as {\n      changes?: {\n        after?: unknown\n        before?: unknown\n        collectionSlug?: string\n        globalSlug?: string\n      }[]\n    }\n  )?.changes?.[changeIndex]\n\n  const collectionSlug = change?.collectionSlug\n  const globalSlug = change?.globalSlug\n  // A merged global's snapshots are the same pair of documents any other row holds; only\n  // the field set they are read against comes from somewhere else.\n  const entityConfig = globalSlug\n    ? config.globals.find((each) => each.slug === globalSlug)\n    : collectionSlug\n      ? payload.collections[collectionSlug]?.config\n      : undefined\n\n  if (!change || !entityConfig) {\n    throw new Error('Unknown merged change')\n  }\n\n  // Timestamps are bookkeeping, not content, and `updatedAt` differs on every\n  // merged document by definition — it would be the one row present in every diff.\n  const contentFields = entityConfig.fields.filter(\n    (field) => !('name' in field) || !timestampFields.has(field.name),\n  )\n\n  const schemaMap = getSchemaMap({ collectionSlug, config, globalSlug, i18n })\n\n  const clientConfig = getClientConfig({\n    config,\n    i18n,\n    importMap: payload.importMap,\n    user: req.user,\n  })\n\n  const clientSchemaMap = getClientSchemaMap({\n    collectionSlug,\n    config: clientConfig,\n    globalSlug,\n    i18n,\n    payload,\n    schemaMap,\n  })\n\n  return {\n    diff: RenderDiff({\n      clientSchemaMap,\n      customDiffComponents: {},\n      entitySlug: globalSlug ?? collectionSlug,\n      fields: contentFields,\n      fieldsPermissions: true,\n      i18n,\n      modifiedOnly: true,\n      parentIndexPath: '',\n      parentIsLocalized: false,\n      parentPath: '',\n      parentSchemaPath: '',\n      req,\n      selectedLocales: [],\n      versionFromSiblingData: (change.before ?? {}) as Record<string, unknown>,\n      versionToSiblingData: (change.after ?? {}) as Record<string, unknown>,\n    }),\n  }\n}\n"],"mappings":"AAGA,SAASA,0BAA0B,QAAQ;AAE3C,SAASC,eAAe,QAAQ;AAChC,SAASC,kBAAkB,QAAQ;AACnC,SAASC,YAAY,QAAQ;AAC7B,SAASC,UAAU,QAAQ;AAY3B,MAAMC,eAAA,GAAkB,IAAIC,GAAA,CAAI,CAAC,aAAa,YAAY;AAE1D;;;;;;;;;;;;AAYA,OAAO,MAAMC,sBAAA,GAGT,MAAAA,CAAO;EAAEC,WAAW;EAAEC,OAAO;EAAEC;AAAG,CAAE;EACtC,IAAI,CAACA,GAAA,CAAIC,IAAI,EAAE;IACb,MAAM,IAAIC,KAAA,CAAM;EAClB;EAEA,MAAM;IAAEC,IAAI;IAAEC;EAAO,CAAE,GAAGJ,GAAA;EAC1B,MAAM;IAAEK;EAAM,CAAE,GAAGD,OAAA;EAEnB,MAAME,KAAA,GAAQ,MAAMF,OAAA,CAAQG,QAAQ,CAAC;IACnCC,EAAA,EAAIT,OAAA;IACJU,UAAA,EAAYnB,0BAAA;IACZoB,KAAA,EAAO;IACPC,cAAA,EAAgB;IAChBX,GAAA;IACAC,IAAA,EAAMD,GAAA,CAAIC;EACZ;EAEA,MAAMW,MAAA,GACJN,KAAA,EAQCO,OAAA,GAAUf,WAAA,CAAY;EAEzB,MAAMgB,cAAA,GAAiBF,MAAA,EAAQE,cAAA;EAC/B,MAAMC,UAAA,GAAaH,MAAA,EAAQG,UAAA;EAC3B;EACA;EACA,MAAMC,YAAA,GAAeD,UAAA,GACjBV,MAAA,CAAOY,OAAO,CAACC,IAAI,CAAEC,IAAA,IAASA,IAAA,CAAKC,IAAI,KAAKL,UAAA,IAC5CD,cAAA,GACEV,OAAA,CAAQiB,WAAW,CAACP,cAAA,CAAe,EAAET,MAAA,GACrCiB,SAAA;EAEN,IAAI,CAACV,MAAA,IAAU,CAACI,YAAA,EAAc;IAC5B,MAAM,IAAId,KAAA,CAAM;EAClB;EAEA;EACA;EACA,MAAMqB,aAAA,GAAgBP,YAAA,CAAaQ,MAAM,CAACC,MAAM,CAC7CC,KAAA,IAAU,EAAE,UAAUA,KAAI,KAAM,CAAC/B,eAAA,CAAgBgC,GAAG,CAACD,KAAA,CAAME,IAAI;EAGlE,MAAMC,SAAA,GAAYpC,YAAA,CAAa;IAAEqB,cAAA;IAAgBT,MAAA;IAAQU,UAAA;IAAYZ;EAAK;EAE1E,MAAM2B,YAAA,GAAevC,eAAA,CAAgB;IACnCc,MAAA;IACAF,IAAA;IACA4B,SAAA,EAAW3B,OAAA,CAAQ2B,SAAS;IAC5B9B,IAAA,EAAMD,GAAA,CAAIC;EACZ;EAEA,MAAM+B,eAAA,GAAkBxC,kBAAA,CAAmB;IACzCsB,cAAA;IACAT,MAAA,EAAQyB,YAAA;IACRf,UAAA;IACAZ,IAAA;IACAC,OAAA;IACAyB;EACF;EAEA,OAAO;IACLI,IAAA,EAAMvC,UAAA,CAAW;MACfsC,eAAA;MACAE,oBAAA,EAAsB,CAAC;MACvBC,UAAA,EAAYpB,UAAA,IAAcD,cAAA;MAC1BU,MAAA,EAAQD,aAAA;MACRa,iBAAA,EAAmB;MACnBjC,IAAA;MACAkC,YAAA,EAAc;MACdC,eAAA,EAAiB;MACjBC,iBAAA,EAAmB;MACnBC,UAAA,EAAY;MACZC,gBAAA,EAAkB;MAClBzC,GAAA;MACA0C,eAAA,EAAiB,EAAE;MACnBC,sBAAA,EAAyB/B,MAAA,CAAOgC,MAAM,IAAI,CAAC;MAC3CC,oBAAA,EAAuBjC,MAAA,CAAOkC,KAAK,IAAI,CAAC;IAC1C;EACF;AACF","ignoreList":[]}

package/dist/views/Branches/index.d.ts

@@ -0,0 +1,16 @@
+import type { AdminViewServerProps } from 'payload';
+import React from 'react';
+import type { RenderListViewArgs } from '../List/index.js';
+/**
+ * Routes for `payload-branches`.
+ *
+ * The collection is `admin.hidden`, which is what keeps it out of the nav, the
+ * dashboard and the command palette — branches are a scope control, not a content
+ * type, and the only way in is the switcher in the app header. But the generic
+ * list and document views treat a hidden collection as not-found, so its own
+ * routes need to opt back in. That is all these wrappers do; the views themselves
+ * are Payload's, unchanged.
+ */
+export declare const BranchesListView: React.FC<RenderListViewArgs>;
+export declare const BranchDocumentView: React.FC<AdminViewServerProps>;
+//# sourceMappingURL=index.d.ts.map

package/dist/views/Branches/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/views/Branches/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAmB,MAAM,SAAS,CAAA;AAGpE,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AAO1D;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAAE,CAAC,kBAAkB,CAIzD,CAAA;AAED,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAAE,CAAC,oBAAoB,CAI7D,CAAA"}