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

package/dist/branching/tombstone.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/branching/tombstone.ts"],"sourcesContent":["import type { PayloadRequest, Where } from '../types/index.js'\n\nimport { APIError } from '../errors/index.js'\nimport { extractRelationshipID } from '../utilities/extractRelationshipID.js'\nimport { httpStatus } from '../utilities/httpStatus.js'\nimport { isolateObjectProperty } from '../utilities/isolateObjectProperty.js'\nimport { assertBranchCreatedDocumentsUnreferenced } from './assertBranchCreatedDocumentsUnreferenced.js'\nimport { assertBranchWritable } from './assertBranchWritable.js'\nimport { copyUploadFilesToBranch } from './copyUploadFilesToBranch.js'\nimport { createShadowRow } from './createShadowRow.js'\nimport {\n  loadBranchOperation,\n  peekBranchOperation,\n  resetBranchState,\n  resolveBranch,\n} from './resolveBranch.js'\nimport { resolveBranchQuery } from './resolveBranchQuery.js'\nimport { branchChangesCollectionSlug, branchDocIDField, branchField, MAIN_BRANCH } from './types.js'\nimport { findBranchVersionForkBoundary } from './versions.js'\n\ntype Args = {\n  branch?: false | string\n  collectionSlug: string\n  req?: Partial<PayloadRequest>\n  where: undefined | Where\n}\n\ntype ConcurrentBranchDelete = {\n  branch: string\n  collectionSlug: string\n  doc: Record<string, unknown>\n  docID: number | string\n  retryError: unknown\n  winnerID: number | string\n}\n\nexport type BranchDeleteOutcome = {\n  doc: Record<string, unknown>\n  tombstoned: boolean\n}\n\ntype BranchDeleteOperation = {\n  branch: string\n  collectionSlug: string\n  docID: number | string\n  isTombstoneExpected: boolean\n  onResolved: (outcome: BranchDeleteOutcome) => void\n  useAmbientTransaction: boolean\n}\n\nconst concurrentBranchDeleteContextKey = Symbol.for('payload.branching.concurrentBranchDelete')\nconst branchDeleteOperationContextKey = Symbol.for('payload.branching.branchDeleteOperation')\n\ntype Result = {\n  /** Narrows the caller's delete to this row's primary key. */\n  deleteRowID?: number | string\n  /** The document to report as deleted, when the delete was absorbed. */\n  doc?: Record<string, unknown>\n  /** True when the delete became a tombstone and must not proceed. */\n  tombstoned: boolean\n}\n\nexport const setConcurrentBranchDelete = ({\n  branch,\n  collectionSlug,\n  doc,\n  docID,\n  req,\n  retryError,\n  winnerID,\n}: { req: PayloadRequest } & ConcurrentBranchDelete): void => {\n  req.context ??= {}\n  ;(req.context as Record<PropertyKey, unknown>)[concurrentBranchDeleteContextKey] = {\n    branch,\n    collectionSlug,\n    doc,\n    docID,\n    retryError,\n    winnerID,\n  }\n}\n\nexport const setBranchDeleteOperation = ({\n  branch,\n  collectionSlug,\n  docID,\n  isTombstoneExpected,\n  onResolved,\n  req,\n  useAmbientTransaction,\n}: { req: PayloadRequest } & BranchDeleteOperation): void => {\n  req.context ??= {}\n  ;(req.context as Record<PropertyKey, unknown>)[branchDeleteOperationContextKey] = {\n    branch,\n    collectionSlug,\n    docID,\n    isTombstoneExpected,\n    onResolved,\n    useAmbientTransaction,\n  }\n}\n\nconst createBranchDeleteChangedError = (): APIError =>\n  new APIError(\n    'The branch document changed while it was being deleted. Retry the operation.',\n    httpStatus.CONFLICT,\n  )\n\nexport const requireBranchDeleteOutcome = ({\n  outcome,\n}: {\n  outcome: BranchDeleteOutcome | undefined\n}): BranchDeleteOutcome => {\n  if (!outcome) {\n    throw createBranchDeleteChangedError()\n  }\n\n  return outcome\n}\n\nexport const assertBranchDeleteCanUseCallerTransaction = async ({\n  branch,\n  collectionSlug,\n  docID,\n  req,\n}: {\n  branch: string\n  collectionSlug: string\n  docID: number | string\n  req: PayloadRequest\n}): Promise<void> => {\n  const branchDocument = await req.payload.db.findOne({\n    branch: false,\n    collection: collectionSlug,\n    req,\n    where: {\n      and: [\n        { [branchField]: { equals: branch } },\n        { or: [{ id: { equals: docID } }, { [branchDocIDField]: { equals: docID } }] },\n      ],\n    },\n  })\n\n  if (!branchDocument) {\n    throw new APIError(\n      'Cannot delete an untouched branch document within an existing transaction.',\n      httpStatus.CONFLICT,\n    )\n  }\n}\n\n/**\n * Checks a branch-created document before delete hooks and cascades can cause\n * effects that a database rollback cannot restore.\n */\nexport const assertBranchCreatedDeleteUnreferenced = async ({\n  branch: branchOverride,\n  collectionSlug,\n  doc,\n  req,\n}: {\n  branch?: false | string\n  collectionSlug: string\n  doc: null | Record<string, unknown> | undefined\n  req?: Partial<PayloadRequest>\n}): Promise<null | Record<string, unknown>> => {\n  if (!doc) {\n    return null\n  }\n\n  if (branchOverride === false || !req?.payload) {\n    return doc\n  }\n\n  if ((req.context as Record<string, unknown> | undefined)?._branchBypass) {\n    return doc\n  }\n\n  const branching = req.payload.config?.branching\n\n  if (!branching?.enabled || !branching.branchableCollections.has(collectionSlug)) {\n    return doc\n  }\n\n  const branch = branchOverride ?? resolveBranch({ req: req as PayloadRequest })\n\n  if (branch === MAIN_BRANCH) {\n    return doc\n  }\n\n  const branchDocument = (await req.payload.db.findOne({\n    branch: false,\n    collection: collectionSlug,\n    req,\n    where: {\n      and: [{ id: { equals: doc.id as number | string } }, { [branchField]: { equals: branch } }],\n    },\n  })) as null | Record<string, unknown>\n\n  if (\n    !branchDocument ||\n    (await loadBranchOperation({\n      collectionSlug,\n      docID: branchDocument.id as number | string,\n      req: req as PayloadRequest,\n    })) !== 'create'\n  ) {\n    return doc\n  }\n\n  const targetID = branchDocument.id as number | string\n\n  await assertBranchCreatedDocumentsUnreferenced({\n    ignoredOwnerRowIDs: new Map([[collectionSlug, new Set([targetID])]]),\n    req: req as PayloadRequest,\n    targets: [{ collectionSlug, docID: targetID }],\n  })\n\n  return branchDocument\n}\n\n/**\n * Whether a delete will be absorbed into a tombstone rather than removing a row.\n *\n * `deleteByID` runs its cascades — associated files, scheduled publish jobs —\n * before `db.deleteOne` decides this, and each of them addresses the canonical\n * document. On a branch that means reaching into main: deleting an upload on a\n * branch unlinks main's file while main keeps the row that points at it.\n *\n * Answered from the document already fetched for the delete, so it costs no extra\n * read. A document created on the branch is exempt — nothing of main's stands\n * behind it, so its side effects are its own to clean up.\n */\nexport const willBranchAbsorbDelete = async ({\n  collectionSlug,\n  doc,\n  req,\n}: {\n  branch?: false | string\n  collectionSlug: string\n  doc: null | Record<string, unknown> | undefined\n  req?: Partial<PayloadRequest>\n}): Promise<boolean> => {\n  if (!doc || !req?.payload) {\n    return false\n  }\n\n  if ((req.context as Record<string, unknown> | undefined)?._branchBypass) {\n    return false\n  }\n\n  const branching = req.payload.config?.branching\n\n  if (!branching?.enabled || !branching.branchableCollections.has(collectionSlug)) {\n    return false\n  }\n\n  const branch = resolveBranch({ req: req as PayloadRequest })\n\n  if (branch === MAIN_BRANCH) {\n    return false\n  }\n\n  if (doc[branchField] !== branch) {\n    return true\n  }\n\n  const operation = await loadBranchOperation({\n    collectionSlug,\n    docID: doc.id as number | string,\n    req: req as PayloadRequest,\n  })\n\n  return operation !== 'create'\n}\n\n/**\n * Turns a delete on a branch into a tombstone against main.\n *\n * A branch cannot delete production content, so deleting a main document from\n * a branch records the intent in its authoritative change record. The read\n * predicate hides the matching canonical ID on that branch and nowhere else.\n *\n * A document created on the branch has no main row behind it, so it is deleted\n * outright — nothing is left to hide.\n */\nexport const resolveBranchDelete = async ({\n  branch: branchOverride,\n  collectionSlug,\n  req,\n  where,\n}: Args): Promise<Result> => {\n  if (branchOverride === false || !req?.payload) {\n    return { tombstoned: false }\n  }\n\n  if ((req.context as Record<string, unknown> | undefined)?._branchBypass) {\n    return { tombstoned: false }\n  }\n\n  const branching = req.payload.config?.branching\n\n  if (!branching?.enabled || !branching.branchableCollections.has(collectionSlug)) {\n    return { tombstoned: false }\n  }\n\n  const branch = branchOverride ?? resolveBranch({ req: req as PayloadRequest })\n\n  if (branch === MAIN_BRANCH) {\n    return { tombstoned: false }\n  }\n\n  const requestContext = req.context as Record<PropertyKey, unknown> | undefined\n  const branchDeleteOperation = requestContext?.[branchDeleteOperationContextKey] as\n    | BranchDeleteOperation\n    | undefined\n  const requestedDocID = (where?.id as { equals?: unknown })?.equals\n  const matchingBranchDeleteOperation =\n    branchDeleteOperation?.branch === branch &&\n    branchDeleteOperation.collectionSlug === collectionSlug &&\n    String(branchDeleteOperation.docID) === String(requestedDocID)\n      ? branchDeleteOperation\n      : undefined\n  const useAmbientTransaction = matchingBranchDeleteOperation?.useAmbientTransaction === true\n\n  delete requestContext?.[branchDeleteOperationContextKey]\n\n  // A delete is a write like any other, and a closed branch takes none. Consume the operation\n  // markers first so a failed validation cannot affect another delete on the same request.\n  await assertBranchWritable({ branch, req: req as PayloadRequest })\n\n  const concurrentDelete = requestContext?.[concurrentBranchDeleteContextKey] as\n    | ConcurrentBranchDelete\n    | undefined\n\n  if (\n    concurrentDelete?.branch === branch &&\n    concurrentDelete.collectionSlug === collectionSlug &&\n    String(concurrentDelete.docID) === String((where?.id as { equals?: unknown })?.equals)\n  ) {\n    delete requestContext?.[concurrentBranchDeleteContextKey]\n\n    const latestCommittedReq = isolateObjectProperty(req as PayloadRequest, ['transactionID'])\n\n    delete latestCommittedReq.transactionID\n\n    const matchingWinner = await req.payload.db.findOne({\n      branch: false,\n      collection: collectionSlug,\n      req: latestCommittedReq,\n      where: {\n        and: [\n          { id: { equals: concurrentDelete.winnerID } },\n          { [branchField]: { equals: branch } },\n          { [branchDocIDField]: { equals: concurrentDelete.docID } },\n        ],\n      },\n    })\n    const matchingWinnerChange = matchingWinner\n      ? await req.payload.db.findOne({\n          collection: branchChangesCollectionSlug,\n          req: latestCommittedReq,\n          where: {\n            and: [\n              { branch: { equals: branch } },\n              { collectionSlug: { equals: collectionSlug } },\n              { documentID: { equals: String(concurrentDelete.docID) } },\n              { operation: { equals: 'delete' } },\n            ],\n          },\n        })\n      : null\n\n    if (matchingWinner && matchingWinnerChange) {\n      const outcome = {\n        doc: { ...matchingWinner, id: concurrentDelete.docID },\n        tombstoned: true,\n      }\n\n      if (matchingBranchDeleteOperation) {\n        if (!matchingBranchDeleteOperation.isTombstoneExpected) {\n          resetBranchState({ req: req as PayloadRequest })\n          throw createBranchDeleteChangedError()\n        }\n\n        matchingBranchDeleteOperation.onResolved(outcome)\n      }\n\n      resetBranchState({ req: req as PayloadRequest })\n\n      return outcome\n    }\n\n    throw concurrentDelete.retryError\n  }\n\n  // Resolve which row the caller means *on this branch* — the branch's own copy\n  // if it has one, otherwise the main row.\n  const branchedWhere = await resolveBranchQuery({ collectionSlug, req, where })\n\n  const target = (await req.payload.db.findOne({\n    branch: false,\n    collection: collectionSlug,\n    req,\n    where: branchedWhere,\n  })) as null | Record<string, unknown>\n\n  if (!target) {\n    resetBranchState({ req: req as PayloadRequest })\n    throw createBranchDeleteChangedError()\n  }\n\n  const targetID = target.id as number | string\n  const isOnThisBranch = target[branchField] === branch\n  const canonicalID = extractRelationshipID({ relationship: target[branchDocIDField] }) ?? targetID\n  const operation = peekBranchOperation({ collectionSlug, docID: canonicalID, req })\n  const isTombstoneExpectedForTarget = !(isOnThisBranch && operation === 'create')\n\n  if (\n    matchingBranchDeleteOperation &&\n    matchingBranchDeleteOperation.isTombstoneExpected !== isTombstoneExpectedForTarget\n  ) {\n    resetBranchState({ req: req as PayloadRequest })\n    throw createBranchDeleteChangedError()\n  }\n\n  if (req.transactionID && !useAmbientTransaction && !isOnThisBranch) {\n    resetBranchState({ req: req as PayloadRequest })\n    throw new APIError(\n      'Cannot delete an untouched branch document within an existing transaction.',\n      httpStatus.CONFLICT,\n    )\n  }\n\n  if (isOnThisBranch && !operation) {\n    throw new APIError(\n      `The ${collectionSlug} branch row for document ${String(canonicalID)} has no change record.`,\n      409,\n    )\n  }\n\n  // Created on this branch: no main row stands behind it, so a real delete\n  // leaves nothing to hide.\n  if (isOnThisBranch && operation === 'create') {\n    await assertBranchCreatedDeleteUnreferenced({\n      branch,\n      collectionSlug,\n      doc: target,\n      req: req as PayloadRequest,\n    })\n\n    if (req.transactionID) {\n      const latestCommittedReq = isolateObjectProperty(req as PayloadRequest, ['transactionID'])\n\n      delete latestCommittedReq.transactionID\n\n      await assertBranchCreatedDocumentsUnreferenced({\n        ignoredOwnerRowIDs: new Map([[collectionSlug, new Set([targetID])]]),\n        req: latestCommittedReq,\n        targets: [{ collectionSlug, docID: targetID }],\n      })\n    }\n\n    await req.payload.db.deleteMany({\n      collection: branchChangesCollectionSlug,\n      req,\n      where: {\n        and: [\n          { branch: { equals: branch } },\n          { 'doc.relationTo': { equals: collectionSlug } },\n          { 'doc.value': { equals: targetID } },\n        ],\n      },\n    })\n\n    matchingBranchDeleteOperation?.onResolved({ doc: target, tombstoned: false })\n\n    resetBranchState({ req: req as PayloadRequest })\n\n    return { deleteRowID: targetID, tombstoned: false }\n  }\n\n  let deletedDocument = target\n\n  if (isOnThisBranch) {\n    const previousBranchChange = (await req.payload.db.findOne({\n      collection: branchChangesCollectionSlug,\n      req,\n      where: {\n        and: [\n          { branch: { equals: branch } },\n          { collectionSlug: { equals: collectionSlug } },\n          { documentID: { equals: String(canonicalID) } },\n        ],\n      },\n    })) as null | Record<string, unknown>\n\n    await req.payload.db.deleteMany({\n      collection: branchChangesCollectionSlug,\n      req,\n      where: {\n        and: [\n          { branch: { equals: branch } },\n          { 'doc.relationTo': { equals: collectionSlug } },\n          { 'doc.value': { equals: canonicalID } },\n        ],\n      },\n    })\n\n    await req.payload.create({\n      collection: branchChangesCollectionSlug,\n      data: {\n        baseUpdatedAt: previousBranchChange?.baseUpdatedAt,\n        baseVersionID: previousBranchChange?.baseVersionID,\n        baseVersionUpdatedAt: previousBranchChange?.baseVersionUpdatedAt,\n        branch,\n        collectionSlug,\n        doc: { relationTo: collectionSlug, value: canonicalID },\n        documentID: String(canonicalID),\n        entityType: 'collection',\n        operation: 'delete',\n      },\n      overrideAccess: true,\n      req,\n    })\n  } else {\n    const { id: _discardedID, ...data } = target\n    let copiedShadow: Record<string, unknown> | undefined\n\n    const shadow = await createShadowRow({\n      branch,\n      collectionSlug,\n      data: {\n        ...data,\n        [branchDocIDField]: canonicalID,\n        [branchField]: branch,\n      },\n      docID: canonicalID,\n      onCreated: async (createReq, createdShadow) => {\n        const collection = createReq.payload.collections[collectionSlug]\n\n        copiedShadow = collection?.config.upload\n          ? await copyUploadFilesToBranch({\n              branch,\n              collection: collection.config,\n              doc: createdShadow,\n              req: createReq,\n            })\n          : createdShadow\n\n        const versionBoundary = await findBranchVersionForkBoundary({\n          collectionSlug,\n          docID: canonicalID,\n          req: createReq,\n        })\n\n        await createReq.payload.db.deleteMany({\n          collection: branchChangesCollectionSlug,\n          req: createReq,\n          where: {\n            and: [\n              { branch: { equals: branch } },\n              { 'doc.relationTo': { equals: collectionSlug } },\n              { 'doc.value': { equals: canonicalID } },\n            ],\n          },\n        })\n\n        await createReq.payload.create({\n          collection: branchChangesCollectionSlug,\n          data: {\n            baseUpdatedAt: target.updatedAt,\n            ...versionBoundary,\n            branch,\n            collectionSlug,\n            doc: { relationTo: collectionSlug, value: canonicalID },\n            documentID: String(canonicalID),\n            entityType: 'collection',\n            operation: 'delete',\n          },\n          overrideAccess: true,\n          req: createReq,\n        })\n      },\n      operation: 'delete',\n      req: req as PayloadRequest,\n      useAmbientTransaction,\n    })\n\n    deletedDocument = copiedShadow ?? shadow\n  }\n\n  matchingBranchDeleteOperation?.onResolved({\n    doc: isTombstoneExpectedForTarget ? { ...deletedDocument, id: canonicalID } : deletedDocument,\n    tombstoned: isTombstoneExpectedForTarget,\n  })\n\n  resetBranchState({ req: req as PayloadRequest })\n  ;(req as PayloadRequest).branch = branch\n\n  return { doc: { ...target, id: canonicalID }, tombstoned: true }\n}\n"],"names":["APIError","extractRelationshipID","httpStatus","isolateObjectProperty","assertBranchCreatedDocumentsUnreferenced","assertBranchWritable","copyUploadFilesToBranch","createShadowRow","loadBranchOperation","peekBranchOperation","resetBranchState","resolveBranch","resolveBranchQuery","branchChangesCollectionSlug","branchDocIDField","branchField","MAIN_BRANCH","findBranchVersionForkBoundary","concurrentBranchDeleteContextKey","Symbol","for","branchDeleteOperationContextKey","setConcurrentBranchDelete","branch","collectionSlug","doc","docID","req","retryError","winnerID","context","setBranchDeleteOperation","isTombstoneExpected","onResolved","useAmbientTransaction","createBranchDeleteChangedError","CONFLICT","requireBranchDeleteOutcome","outcome","assertBranchDeleteCanUseCallerTransaction","branchDocument","payload","db","findOne","collection","where","and","equals","or","id","assertBranchCreatedDeleteUnreferenced","branchOverride","_branchBypass","branching","config","enabled","branchableCollections","has","targetID","ignoredOwnerRowIDs","Map","Set","targets","willBranchAbsorbDelete","operation","resolveBranchDelete","tombstoned","requestContext","branchDeleteOperation","requestedDocID","matchingBranchDeleteOperation","String","undefined","concurrentDelete","latestCommittedReq","transactionID","matchingWinner","matchingWinnerChange","documentID","branchedWhere","target","isOnThisBranch","canonicalID","relationship","isTombstoneExpectedForTarget","deleteMany","deleteRowID","deletedDocument","previousBranchChange","create","data","baseUpdatedAt","baseVersionID","baseVersionUpdatedAt","relationTo","value","entityType","overrideAccess","_discardedID","copiedShadow","shadow","onCreated","createReq","createdShadow","collections","upload","versionBoundary","updatedAt"],"mappings":"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"}

package/dist/branching/types.d.ts

@@ -0,0 +1,153 @@
+import type { CollectionSlug, GlobalSlug } from '../index.js';
+import type { PayloadRequest } from '../types/index.js';
+import type { Access } from './../config/types.js';
+import type { BranchMergeValidate } from './validation.js';
+/**
+ * The reserved `_branch` value for production content.
+ *
+ * A non-null sentinel rather than NULL: Postgres treats NULLs as distinct in
+ * unique indexes, so a compound `(field, _branch)` unique index would stop
+ * enforcing uniqueness among main rows if this were null.
+ */
+export declare const MAIN_BRANCH = "main";
+export declare const branchesCollectionSlug = "payload-branches";
+export declare const branchChangesCollectionSlug = "payload-branch-changes";
+/**
+ * One row per merge event, append-only.
+ *
+ * Merging consumes the change rows it applies and drops the shadow rows behind
+ * them, so without this a merged branch has no record of what it did. It is a
+ * separate collection rather than a flag on `payload-branch-changes` because a
+ * branch can be merged more than once (§16) — a change row belongs to exactly one
+ * merge, so the event, not the change, is what needs its own identity.
+ */
+export declare const branchMergesCollectionSlug = "payload-branch-merges";
+/** Field injected onto every branch-enabled collection and its version collection. */
+export declare const branchField = "_branch";
+export declare const branchDocIDField = "_branchDocID";
+export declare const branchParentField = "_branchParent";
+export declare const branchOperations: readonly ['create', 'update', 'delete'];
+export declare const mergeApplicationOutcomes: readonly ['unattempted', 'attempted', 'applied', 'committed', 'failed', 'rolledBack', 'unknown'];
+export declare const mergeCleanupOutcomes: readonly ['pending', 'completed', 'failed', 'notNeeded', 'superseded', 'unknown'];
+export declare const mergeRecoveryOutcomes: readonly ['notNeeded', 'pending', 'restored', 'deleted', 'unavailable', 'failed', 'unknown'];
+export type BranchOperation = (typeof branchOperations)[number];
+export type MergeApplicationOutcome = (typeof mergeApplicationOutcomes)[number];
+export type MergeCleanupOutcome = (typeof mergeCleanupOutcomes)[number];
+export type MergeRecoveryOutcome = (typeof mergeRecoveryOutcomes)[number];
+export type MergeableChange = {
+    changeID: number | string;
+    /** Absent for a global, which is identified by `globalSlug` instead. */
+    collectionSlug?: string;
+    /** Absent for a global: there is one of it, so there is nothing to identify. */
+    docID?: number | string;
+    entityType: 'collection' | 'global';
+    globalSlug?: string;
+    operation: BranchOperation;
+};
+export type MergeEventChange = {
+    after?: unknown;
+    afterVersionID?: string;
+    applicationOutcome: MergeApplicationOutcome;
+    before?: unknown;
+    beforeVersionID?: string;
+    changeID: string;
+    cleanupError?: string;
+    cleanupOutcome: MergeCleanupOutcome;
+    collectionSlug?: string;
+    docID?: string;
+    docTitle: string;
+    error?: string;
+    globalSlug?: string;
+    operation: BranchOperation;
+    recoveryError?: string;
+    recoveryOutcome: MergeRecoveryOutcome;
+    sourceID?: string;
+    sourceRevision?: string;
+    sourceUpdatedAt?: string;
+    sourceVersionIDs?: (number | string)[];
+    targetID?: string;
+};
+export type MergeProgress = {
+    collectionSlug: string;
+    /** 1-based position of the change being applied. */
+    current: number;
+    docID: number | string;
+    operation: BranchOperation;
+    /** Total changes this merge will apply. */
+    total: number;
+};
+export type MergeWarning = {
+    changeID: number | string;
+    collectionSlug: string;
+    docID: number | string;
+    message: string;
+    reason: 'main-moved';
+};
+export type BranchingConfig = {
+    /**
+     * Access control for branch lifecycle operations. Document-level access is
+     * unchanged — `req.branch` is in scope inside existing access functions.
+     */
+    access?: {
+        createBranch?: Access;
+        deleteBranch?: Access;
+        /** Controls whether a caller can discard pending changes from a readable branch. */
+        discardBranch?: Access;
+        /**
+         * Controls whether a caller can merge pending changes from a readable branch.
+         * Defaults to `readBranch` when provided, otherwise to the authenticated-user
+         * default access rule. Set this explicitly when readers must not merge to main.
+         */
+        mergeBranch?: Access;
+        readBranch?: Access;
+        updateBranch?: Access;
+    };
+    /**
+     * Collection and global slugs to exclude from branching, in addition to the defaults.
+     * Exclusions take precedence over an entity's `branching: true` setting.
+     */
+    exclude?: (CollectionSlug | GlobalSlug)[];
+    /**
+     * Branch lifecycle hooks. Document hooks are unaffected — every one of them
+     * runs on merge, since merge is a genuine write to main.
+     */
+    hooks?: {
+        /** Fires after commit, so a failing webhook cannot undo a merge. */
+        afterMerge?: (args: {
+            branch: string;
+            req: PayloadRequest;
+            results: MergeableChange[];
+        }) => Promise<void> | void;
+        /** Throw to block a merge. */
+        beforeMerge?: (args: {
+            branch: string;
+            changes: MergeableChange[];
+            req: PayloadRequest;
+            warnings: MergeWarning[];
+        }) => Promise<void> | void;
+    };
+    /**
+     * Replaces the default best-effort pre-merge content validation policy.
+     * Ordinary write validation, hooks, access control, and database constraints still apply.
+     */
+    validate?: BranchMergeValidate;
+};
+export type SanitizedBranchingConfig = {
+    /** Slugs of every collection branching is active for. */
+    branchableCollections: Set<string>;
+    /** Slugs of every global branching is active for. */
+    branchableGlobals: Set<string>;
+    enabled: boolean;
+    validate: BranchMergeValidate;
+} & Omit<BranchingConfig, 'exclude' | 'validate'>;
+/**
+ * The branching config as it reaches the browser: which entities branch, and
+ * nothing else. Access functions and merge hooks stay on the server, and the
+ * `Set`s become arrays so the config remains plain JSON.
+ */
+export type ClientBranchingConfig = {
+    branchableCollections: string[];
+    branchableGlobals: string[];
+    enabled: boolean;
+};
+//# sourceMappingURL=types.d.ts.map

package/dist/branching/types.d.ts.map

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

package/dist/branching/types.js

@@ -0,0 +1,54 @@
+/**
+ * The reserved `_branch` value for production content.
+ *
+ * A non-null sentinel rather than NULL: Postgres treats NULLs as distinct in
+ * unique indexes, so a compound `(field, _branch)` unique index would stop
+ * enforcing uniqueness among main rows if this were null.
+ */ export const MAIN_BRANCH = 'main';
+export const branchesCollectionSlug = 'payload-branches';
+export const branchChangesCollectionSlug = 'payload-branch-changes';
+/**
+ * One row per merge event, append-only.
+ *
+ * Merging consumes the change rows it applies and drops the shadow rows behind
+ * them, so without this a merged branch has no record of what it did. It is a
+ * separate collection rather than a flag on `payload-branch-changes` because a
+ * branch can be merged more than once (§16) — a change row belongs to exactly one
+ * merge, so the event, not the change, is what needs its own identity.
+ */ export const branchMergesCollectionSlug = 'payload-branch-merges';
+/** Field injected onto every branch-enabled collection and its version collection. */ export const branchField = '_branch';
+export const branchDocIDField = '_branchDocID';
+export const branchParentField = '_branchParent';
+export const branchOperations = [
+    'create',
+    'update',
+    'delete'
+];
+export const mergeApplicationOutcomes = [
+    'unattempted',
+    'attempted',
+    'applied',
+    'committed',
+    'failed',
+    'rolledBack',
+    'unknown'
+];
+export const mergeCleanupOutcomes = [
+    'pending',
+    'completed',
+    'failed',
+    'notNeeded',
+    'superseded',
+    'unknown'
+];
+export const mergeRecoveryOutcomes = [
+    'notNeeded',
+    'pending',
+    'restored',
+    'deleted',
+    'unavailable',
+    'failed',
+    'unknown'
+];
+
+//# sourceMappingURL=types.js.map

package/dist/branching/types.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/branching/types.ts"],"sourcesContent":["import type { CollectionSlug, GlobalSlug } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\nimport type { Access } from './../config/types.js'\nimport type { BranchMergeValidate } from './validation.js'\n\n/**\n * The reserved `_branch` value for production content.\n *\n * A non-null sentinel rather than NULL: Postgres treats NULLs as distinct in\n * unique indexes, so a compound `(field, _branch)` unique index would stop\n * enforcing uniqueness among main rows if this were null.\n */\nexport const MAIN_BRANCH = 'main'\n\nexport const branchesCollectionSlug = 'payload-branches'\nexport const branchChangesCollectionSlug = 'payload-branch-changes'\n/**\n * One row per merge event, append-only.\n *\n * Merging consumes the change rows it applies and drops the shadow rows behind\n * them, so without this a merged branch has no record of what it did. It is a\n * separate collection rather than a flag on `payload-branch-changes` because a\n * branch can be merged more than once (§16) — a change row belongs to exactly one\n * merge, so the event, not the change, is what needs its own identity.\n */\nexport const branchMergesCollectionSlug = 'payload-branch-merges'\n\n/** Field injected onto every branch-enabled collection and its version collection. */\nexport const branchField = '_branch'\nexport const branchDocIDField = '_branchDocID'\nexport const branchParentField = '_branchParent'\n\nexport const branchOperations = ['create', 'update', 'delete'] as const\nexport const mergeApplicationOutcomes = [\n  'unattempted',\n  'attempted',\n  'applied',\n  'committed',\n  'failed',\n  'rolledBack',\n  'unknown',\n] as const\nexport const mergeCleanupOutcomes = [\n  'pending',\n  'completed',\n  'failed',\n  'notNeeded',\n  'superseded',\n  'unknown',\n] as const\nexport const mergeRecoveryOutcomes = [\n  'notNeeded',\n  'pending',\n  'restored',\n  'deleted',\n  'unavailable',\n  'failed',\n  'unknown',\n] as const\n\nexport type BranchOperation = (typeof branchOperations)[number]\nexport type MergeApplicationOutcome = (typeof mergeApplicationOutcomes)[number]\nexport type MergeCleanupOutcome = (typeof mergeCleanupOutcomes)[number]\nexport type MergeRecoveryOutcome = (typeof mergeRecoveryOutcomes)[number]\n\nexport type MergeableChange = {\n  changeID: number | string\n  /** Absent for a global, which is identified by `globalSlug` instead. */\n  collectionSlug?: string\n  /** Absent for a global: there is one of it, so there is nothing to identify. */\n  docID?: number | string\n  entityType: 'collection' | 'global'\n  globalSlug?: string\n  operation: BranchOperation\n}\n\nexport type MergeEventChange = {\n  after?: unknown\n  afterVersionID?: string\n  applicationOutcome: MergeApplicationOutcome\n  before?: unknown\n  beforeVersionID?: string\n  changeID: string\n  cleanupError?: string\n  cleanupOutcome: MergeCleanupOutcome\n  collectionSlug?: string\n  docID?: string\n  docTitle: string\n  error?: string\n  globalSlug?: string\n  operation: BranchOperation\n  recoveryError?: string\n  recoveryOutcome: MergeRecoveryOutcome\n  sourceID?: string\n  sourceRevision?: string\n  sourceUpdatedAt?: string\n  sourceVersionIDs?: (number | string)[]\n  targetID?: string\n}\n\nexport type MergeProgress = {\n  collectionSlug: string\n  /** 1-based position of the change being applied. */\n  current: number\n  docID: number | string\n  operation: BranchOperation\n  /** Total changes this merge will apply. */\n  total: number\n}\n\nexport type MergeWarning = {\n  changeID: number | string\n  collectionSlug: string\n  docID: number | string\n  message: string\n  reason: 'main-moved'\n}\n\nexport type BranchingConfig = {\n  /**\n   * Access control for branch lifecycle operations. Document-level access is\n   * unchanged — `req.branch` is in scope inside existing access functions.\n   */\n  access?: {\n    createBranch?: Access\n    deleteBranch?: Access\n    /** Controls whether a caller can discard pending changes from a readable branch. */\n    discardBranch?: Access\n    /**\n     * Controls whether a caller can merge pending changes from a readable branch.\n     * Defaults to `readBranch` when provided, otherwise to the authenticated-user\n     * default access rule. Set this explicitly when readers must not merge to main.\n     */\n    mergeBranch?: Access\n    readBranch?: Access\n    updateBranch?: Access\n  }\n  /**\n   * Collection and global slugs to exclude from branching, in addition to the defaults.\n   * Exclusions take precedence over an entity's `branching: true` setting.\n   */\n  // Both slug types fall back to string without generated types.\n  // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents\n  exclude?: (CollectionSlug | GlobalSlug)[]\n  /**\n   * Branch lifecycle hooks. Document hooks are unaffected — every one of them\n   * runs on merge, since merge is a genuine write to main.\n   */\n  hooks?: {\n    /** Fires after commit, so a failing webhook cannot undo a merge. */\n    afterMerge?: (args: {\n      branch: string\n      req: PayloadRequest\n      results: MergeableChange[]\n    }) => Promise<void> | void\n    /** Throw to block a merge. */\n    beforeMerge?: (args: {\n      branch: string\n      changes: MergeableChange[]\n      req: PayloadRequest\n      warnings: MergeWarning[]\n    }) => Promise<void> | void\n  }\n  /**\n   * Replaces the default best-effort pre-merge content validation policy.\n   * Ordinary write validation, hooks, access control, and database constraints still apply.\n   */\n  validate?: BranchMergeValidate\n}\n\nexport type SanitizedBranchingConfig = {\n  /** Slugs of every collection branching is active for. */\n  branchableCollections: Set<string>\n  /** Slugs of every global branching is active for. */\n  branchableGlobals: Set<string>\n  enabled: boolean\n  validate: BranchMergeValidate\n} & Omit<BranchingConfig, 'exclude' | 'validate'>\n\n/**\n * The branching config as it reaches the browser: which entities branch, and\n * nothing else. Access functions and merge hooks stay on the server, and the\n * `Set`s become arrays so the config remains plain JSON.\n */\nexport type ClientBranchingConfig = {\n  branchableCollections: string[]\n  branchableGlobals: string[]\n  enabled: boolean\n}\n"],"names":["MAIN_BRANCH","branchesCollectionSlug","branchChangesCollectionSlug","branchMergesCollectionSlug","branchField","branchDocIDField","branchParentField","branchOperations","mergeApplicationOutcomes","mergeCleanupOutcomes","mergeRecoveryOutcomes"],"mappings":"AAKA;;;;;;CAMC,GACD,OAAO,MAAMA,cAAc,OAAM;AAEjC,OAAO,MAAMC,yBAAyB,mBAAkB;AACxD,OAAO,MAAMC,8BAA8B,yBAAwB;AACnE;;;;;;;;CAQC,GACD,OAAO,MAAMC,6BAA6B,wBAAuB;AAEjE,oFAAoF,GACpF,OAAO,MAAMC,cAAc,UAAS;AACpC,OAAO,MAAMC,mBAAmB,eAAc;AAC9C,OAAO,MAAMC,oBAAoB,gBAAe;AAEhD,OAAO,MAAMC,mBAAmB;IAAC;IAAU;IAAU;CAAS,CAAS;AACvE,OAAO,MAAMC,2BAA2B;IACtC;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAS;AACV,OAAO,MAAMC,uBAAuB;IAClC;IACA;IACA;IACA;IACA;IACA;CACD,CAAS;AACV,OAAO,MAAMC,wBAAwB;IACnC;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAS"}

package/dist/branching/validation.d.ts

@@ -0,0 +1,47 @@
+import type { Payload, PayloadRequest } from '../types/index.js';
+import type { EffectiveOperation, ResolvedChange } from './effectiveOperations.js';
+export type BranchMergeValidationCandidate = {
+    changeID: number | string;
+    collectionSlug?: string;
+    data?: Record<string, unknown>;
+    docID?: number | string;
+    draft: boolean;
+    entityType: 'collection' | 'global';
+    globalSlug?: string;
+    locale?: string;
+    operation: EffectiveOperation;
+};
+export type BranchMergeValidationError = {
+    changeID: number | string;
+    collectionSlug?: string;
+    docID?: number | string;
+    globalSlug?: string;
+    locale?: string;
+    message: string;
+    path?: string;
+};
+export type BranchMergeValidationResult = {
+    errors: BranchMergeValidationError[];
+    valid: boolean;
+};
+export type BranchMergeValidate = (args: {
+    branch: string;
+    candidates: BranchMergeValidationCandidate[];
+    req: PayloadRequest;
+    target: 'main';
+}) => BranchMergeValidationResult | Promise<BranchMergeValidationResult>;
+export declare const createMainBranchRequest: ({ req }: {
+    req: PayloadRequest;
+}) => PayloadRequest;
+export declare const createBranchMergeValidationRequest: ({ req, }: {
+    req: PayloadRequest;
+}) => PayloadRequest;
+export declare const prepareBranchMergeValidationCandidates: ({ payload, pending, pendingGlobals, req, }: {
+    payload: Payload;
+    pending: ResolvedChange[];
+    pendingGlobals: Record<string, unknown>[];
+    req: PayloadRequest;
+}) => Promise<BranchMergeValidationCandidate[]>;
+/** Best-effort structural validation for the exact candidates selected by merge. */
+export declare const defaultBranchMergeValidation: BranchMergeValidate;
+//# sourceMappingURL=validation.d.ts.map

package/dist/branching/validation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"validation.d.ts","sourceRoot":"","sources":["../../src/branching/validation.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAoBlF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,KAAK,EAAE,OAAO,CAAA;IACd,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;IACnC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,EAAE,kBAAkB,CAAA;CAC9B,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,0BAA0B,EAAE,CAAA;IACpC,KAAK,EAAE,OAAO,CAAA;CACf,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,CAAC,IAAI,EAAE;IACvC,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,8BAA8B,EAAE,CAAA;IAC5C,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf,KAAK,2BAA2B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAA;AAExE,eAAO,MAAM,uBAAuB,YAAa;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,KAAG,cAS1E,CAAA;AAED,eAAO,MAAM,kCAAkC,aAE5C;IACD,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,cAQH,CAAA;AAED,eAAO,MAAM,sCAAsC,+CAKhD;IACD,OAAO,EAAE,OAAO,CAAA;IAChB,OAAO,EAAE,cAAc,EAAE,CAAA;IACzB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACzC,GAAG,EAAE,cAAc,CAAA;CACpB,KAAG,OAAO,CAAC,8BAA8B,EAAE,CAsG3C,CAAA;AAED,oFAAoF;AACpF,eAAO,MAAM,4BAA4B,EAAE,mBAiD1C,CAAA"}

package/dist/branching/validation.js

@@ -0,0 +1,275 @@
+import { ValidationError } from '../errors/ValidationError.js';
+import { fieldIsVirtual, tabHasName } from '../fields/config/types.js';
+import { validateCollectionData, validateGlobalData } from '../utilities/entityInputSchema/validateEntityData.js';
+import { traverseForLocalizedFields } from '../utilities/traverseForLocalizedFields.js';
+import { getGlobalMergeLocales, readBranchGlobalWrite, resolveGlobalMergeWrites } from './globalMergeWrites.js';
+import { branchMergeValidationContextKey } from './mergeWriteGuard.js';
+import { readLocalizedBranchWrite } from './readLocalizedBranchWrite.js';
+import { isolateBranchState } from './resolveBranch.js';
+import { stripBranchMergeData, stripBranchMergeGlobalData } from './stripBranchMergeData.js';
+import { MAIN_BRANCH } from './types.js';
+export const createMainBranchRequest = ({ req })=>{
+    const targetReq = isolateBranchState({
+        req: req
+    });
+    targetReq.branch = MAIN_BRANCH;
+    targetReq.query = {
+        ...targetReq.query
+    };
+    delete targetReq.query.branch;
+    delete targetReq.context._branchBypass;
+    return targetReq;
+};
+export const createBranchMergeValidationRequest = ({ req })=>{
+    const validationReq = createMainBranchRequest({
+        req
+    });
+    const validationContext = validationReq.context;
+    validationContext[branchMergeValidationContextKey] = true;
+    validationReq.operation = 'validate';
+    return validationReq;
+};
+export const prepareBranchMergeValidationCandidates = async ({ payload, pending, pendingGlobals, req })=>{
+    const candidates = [];
+    for (const resolved of pending){
+        const collectionConfig = payload.collections[resolved.collectionSlug].config;
+        const localization = payload.config.localization;
+        const locales = localization && traverseForLocalizedFields(collectionConfig.fields) ? localization.localeCodes : undefined;
+        for (const write of resolved.writes){
+            const baseCandidate = {
+                changeID: resolved.change.id,
+                collectionSlug: resolved.collectionSlug,
+                docID: resolved.docID,
+                draft: write.draft,
+                entityType: 'collection',
+                operation: write.operation
+            };
+            if (write.operation === 'delete' || !locales?.length) {
+                candidates.push({
+                    ...baseCandidate,
+                    data: write.operation === 'delete' ? undefined : prepareCollectionCandidate({
+                        collectionSlug: resolved.collectionSlug,
+                        data: write.data,
+                        payload
+                    })
+                });
+                continue;
+            }
+            for (const locale of locales){
+                const data = await readLocalizedBranchWrite({
+                    branch: resolved.change.branch,
+                    collectionSlug: resolved.collectionSlug,
+                    docID: resolved.docID,
+                    draft: write.draft,
+                    locale,
+                    payload,
+                    req
+                });
+                if (data) {
+                    candidates.push({
+                        ...baseCandidate,
+                        data: prepareCollectionCandidate({
+                            collectionSlug: resolved.collectionSlug,
+                            data,
+                            payload
+                        }),
+                        locale
+                    });
+                }
+            }
+        }
+    }
+    for (const change of pendingGlobals){
+        const branch = change.branch;
+        const globalSlug = change.globalSlug;
+        const writes = await resolveGlobalMergeWrites({
+            branch,
+            globalSlug,
+            payload,
+            req
+        });
+        const locales = getGlobalMergeLocales({
+            globalSlug,
+            payload,
+            req
+        });
+        for (const write of writes){
+            for (const locale of locales){
+                const data = await readBranchGlobalWrite({
+                    branch,
+                    draft: write.draft,
+                    globalSlug,
+                    locale,
+                    payload,
+                    req
+                });
+                if (data) {
+                    candidates.push({
+                        changeID: change.id,
+                        data: stripNonWritableFields({
+                            data: stripBranchMergeGlobalData({
+                                data,
+                                fields: payload.globals.config.find(({ slug })=>slug === globalSlug).fields
+                            }),
+                            fields: payload.globals.config.find(({ slug })=>slug === globalSlug).fields,
+                            payload
+                        }),
+                        draft: write.draft,
+                        entityType: 'global',
+                        globalSlug,
+                        locale,
+                        operation: 'update'
+                    });
+                }
+            }
+        }
+    }
+    return candidates;
+};
+/** Best-effort structural validation for the exact candidates selected by merge. */ export const defaultBranchMergeValidation = ({ candidates, req })=>{
+    const errors = [];
+    for (const candidate of candidates){
+        if (!candidate.data || candidate.operation === 'delete') {
+            continue;
+        }
+        const candidateReq = isolateBranchState({
+            req: req
+        });
+        if (candidate.locale) {
+            candidateReq.locale = candidate.locale;
+        }
+        try {
+            if (candidate.entityType === 'collection' && candidate.collectionSlug) {
+                validateCollectionData({
+                    slug: candidate.collectionSlug,
+                    data: candidate.data,
+                    partial: candidate.operation !== 'create',
+                    req: candidateReq
+                });
+            } else if (candidate.entityType === 'global' && candidate.globalSlug) {
+                validateGlobalData({
+                    slug: candidate.globalSlug,
+                    data: candidate.data,
+                    req: candidateReq
+                });
+            }
+        } catch (error) {
+            if (!(error instanceof ValidationError)) {
+                throw error;
+            }
+            for (const fieldError of error.data.errors){
+                errors.push({
+                    changeID: candidate.changeID,
+                    collectionSlug: candidate.collectionSlug,
+                    docID: candidate.docID,
+                    globalSlug: candidate.globalSlug,
+                    locale: candidate.locale,
+                    message: fieldError.message,
+                    path: fieldError.path
+                });
+            }
+        }
+    }
+    return {
+        errors,
+        valid: errors.length === 0
+    };
+};
+const prepareCollectionCandidate = ({ collectionSlug, data, payload })=>stripNonWritableFields({
+        data: stripBranchMergeData({
+            data,
+            fields: payload.collections[collectionSlug].config.fields
+        }),
+        fields: payload.collections[collectionSlug].config.fields,
+        payload
+    });
+const stripNonWritableFields = ({ data, fields, payload })=>{
+    let writableData = {
+        ...data
+    };
+    for (const field of fields){
+        if ('name' in field && field.name && (field.type === 'join' || fieldIsVirtual(field))) {
+            delete writableData[field.name];
+            continue;
+        }
+        if (field.type === 'row' || field.type === 'collapsible') {
+            writableData = stripNonWritableFields({
+                data: writableData,
+                fields: field.fields,
+                payload
+            });
+            continue;
+        }
+        if (field.type === 'tabs') {
+            for (const tab of field.tabs){
+                if (!tabHasName(tab)) {
+                    writableData = stripNonWritableFields({
+                        data: writableData,
+                        fields: tab.fields,
+                        payload
+                    });
+                    continue;
+                }
+                const tabData = writableData[tab.name];
+                if (isRecord(tabData)) {
+                    writableData[tab.name] = stripNonWritableFields({
+                        data: tabData,
+                        fields: tab.fields,
+                        payload
+                    });
+                }
+            }
+            continue;
+        }
+        if (field.type === 'group') {
+            if (!('name' in field) || !field.name) {
+                writableData = stripNonWritableFields({
+                    data: writableData,
+                    fields: field.fields,
+                    payload
+                });
+                continue;
+            }
+            const groupData = writableData[field.name];
+            if (isRecord(groupData)) {
+                writableData[field.name] = stripNonWritableFields({
+                    data: groupData,
+                    fields: field.fields,
+                    payload
+                });
+            }
+            continue;
+        }
+        if (field.type === 'array' && field.name) {
+            const rows = writableData[field.name];
+            if (Array.isArray(rows)) {
+                writableData[field.name] = rows.map((row)=>isRecord(row) ? stripNonWritableFields({
+                        data: row,
+                        fields: field.fields,
+                        payload
+                    }) : row);
+            }
+            continue;
+        }
+        if (field.type === 'blocks' && field.name) {
+            const rows = writableData[field.name];
+            if (Array.isArray(rows)) {
+                writableData[field.name] = rows.map((row)=>{
+                    if (!isRecord(row) || typeof row.blockType !== 'string') {
+                        return row;
+                    }
+                    const block = payload.config.blocks?.find(({ slug })=>slug === row.blockType) ?? field.blocks.find((candidate)=>typeof candidate !== 'string' && candidate.slug === row.blockType);
+                    return !block || typeof block === 'string' ? row : stripNonWritableFields({
+                        data: row,
+                        fields: block.fields,
+                        payload
+                    });
+                });
+            }
+        }
+    }
+    return writableData;
+};
+const isRecord = (value)=>Boolean(value && typeof value === 'object' && !Array.isArray(value));
+
+//# sourceMappingURL=validation.js.map