payload 4.0.0-internal.e55ccef → 4.0.0-internal.ea6e8f8

package/dist/branching/types.d.ts

@@ -0,0 +1,158 @@
+import type { CollectionSlug } 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. */
+        mergeBranch?: Access;
+        readBranch?: Access;
+        updateBranch?: Access;
+    };
+    /**
+     * Collections to exclude from branching, in addition to the defaults.
+     */
+    exclude?: CollectionSlug[];
+    /**
+     * 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;
+    };
+    /**
+     * Ceiling on the number of shadowed document IDs injected into a single read
+     * predicate by database adapters that use the legacy branch visibility fallback.
+     * Official adapters use database-native branch visibility instead.
+     *
+     * @deprecated Retained for adapters that use the legacy branch visibility fallback.
+     * @default 2000
+     */
+    maxShadowedIDs?: number;
+    /**
+     * 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;
+    maxShadowedIDs: number;
+    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 } 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    /** Controls whether a caller can merge pending changes from a readable branch. */\n    mergeBranch?: Access\n    readBranch?: Access\n    updateBranch?: Access\n  }\n  /**\n   * Collections to exclude from branching, in addition to the defaults.\n   */\n  exclude?: CollectionSlug[]\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   * Ceiling on the number of shadowed document IDs injected into a single read\n   * predicate by database adapters that use the legacy branch visibility fallback.\n   * Official adapters use database-native branch visibility instead.\n   *\n   * @deprecated Retained for adapters that use the legacy branch visibility fallback.\n   * @default 2000\n   */\n  maxShadowedIDs?: number\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  maxShadowedIDs: number\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;AAmBlF,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,CAmG3C,CAAA;AAED,oFAAoF;AACpF,eAAO,MAAM,4BAA4B,EAAE,mBAiD1C,CAAA"}

package/dist/branching/validation.js

@@ -0,0 +1,272 @@
+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 { branchDocIDField, branchField, MAIN_BRANCH } from './types.js';
+export const createMainBranchRequest = ({ req })=>{
+    const targetReq = isolateBranchState(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: stripGlobalInternal(data),
+                            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);
+        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 stripInternal = (data)=>{
+    const { id: _id, [branchDocIDField]: _docID, [branchField]: _branch, createdAt: _createdAt, updatedAt: _updatedAt, ...rest } = data;
+    return rest;
+};
+const stripGlobalInternal = (data)=>{
+    const { globalType: _globalType, ...globalData } = data;
+    return stripInternal(globalData);
+};
+const prepareCollectionCandidate = ({ collectionSlug, data, payload })=>stripNonWritableFields({
+        data: stripInternal(data),
+        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

package/dist/branching/validation.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/branching/validation.ts"],"sourcesContent":["import type { Field } from '../fields/config/types.js'\nimport type { Payload, PayloadRequest } from '../types/index.js'\nimport type { EffectiveOperation, ResolvedChange } from './effectiveOperations.js'\n\nimport { ValidationError } from '../errors/ValidationError.js'\nimport { fieldIsVirtual, tabHasName } from '../fields/config/types.js'\nimport {\n  validateCollectionData,\n  validateGlobalData,\n} from '../utilities/entityInputSchema/validateEntityData.js'\nimport { traverseForLocalizedFields } from '../utilities/traverseForLocalizedFields.js'\nimport {\n  getGlobalMergeLocales,\n  readBranchGlobalWrite,\n  resolveGlobalMergeWrites,\n} from './globalMergeWrites.js'\nimport { branchMergeValidationContextKey } from './mergeWriteGuard.js'\nimport { readLocalizedBranchWrite } from './readLocalizedBranchWrite.js'\nimport { isolateBranchState } from './resolveBranch.js'\nimport { branchDocIDField, branchField, MAIN_BRANCH } from './types.js'\n\nexport type BranchMergeValidationCandidate = {\n  changeID: number | string\n  collectionSlug?: string\n  data?: Record<string, unknown>\n  docID?: number | string\n  draft: boolean\n  entityType: 'collection' | 'global'\n  globalSlug?: string\n  locale?: string\n  operation: EffectiveOperation\n}\n\nexport type BranchMergeValidationError = {\n  changeID: number | string\n  collectionSlug?: string\n  docID?: number | string\n  globalSlug?: string\n  locale?: string\n  message: string\n  path?: string\n}\n\nexport type BranchMergeValidationResult = {\n  errors: BranchMergeValidationError[]\n  valid: boolean\n}\n\nexport type BranchMergeValidate = (args: {\n  branch: string\n  candidates: BranchMergeValidationCandidate[]\n  req: PayloadRequest\n  target: 'main'\n}) => BranchMergeValidationResult | Promise<BranchMergeValidationResult>\n\nexport const createMainBranchRequest = ({ req }: { req: PayloadRequest }): PayloadRequest => {\n  const targetReq = isolateBranchState(req)\n\n  targetReq.branch = MAIN_BRANCH\n  targetReq.query = { ...targetReq.query }\n  delete targetReq.query.branch\n  delete (targetReq.context as Record<string, unknown>)._branchBypass\n\n  return targetReq\n}\n\nexport const createBranchMergeValidationRequest = ({\n  req,\n}: {\n  req: PayloadRequest\n}): PayloadRequest => {\n  const validationReq = createMainBranchRequest({ req })\n  const validationContext = validationReq.context as Record<PropertyKey, unknown>\n\n  validationContext[branchMergeValidationContextKey] = true\n  validationReq.operation = 'validate'\n\n  return validationReq\n}\n\nexport const prepareBranchMergeValidationCandidates = async ({\n  payload,\n  pending,\n  pendingGlobals,\n  req,\n}: {\n  payload: Payload\n  pending: ResolvedChange[]\n  pendingGlobals: Record<string, unknown>[]\n  req: PayloadRequest\n}): Promise<BranchMergeValidationCandidate[]> => {\n  const candidates: BranchMergeValidationCandidate[] = []\n\n  for (const resolved of pending) {\n    const collectionConfig = payload.collections[resolved.collectionSlug]!.config\n    const localization = payload.config.localization\n    const locales =\n      localization && traverseForLocalizedFields(collectionConfig.fields)\n        ? localization.localeCodes\n        : undefined\n\n    for (const write of resolved.writes) {\n      const baseCandidate = {\n        changeID: resolved.change.id as number | string,\n        collectionSlug: resolved.collectionSlug,\n        docID: resolved.docID,\n        draft: write.draft,\n        entityType: 'collection' as const,\n        operation: write.operation,\n      }\n\n      if (write.operation === 'delete' || !locales?.length) {\n        candidates.push({\n          ...baseCandidate,\n          data:\n            write.operation === 'delete'\n              ? undefined\n              : prepareCollectionCandidate({\n                  collectionSlug: resolved.collectionSlug,\n                  data: write.data,\n                  payload,\n                }),\n        })\n        continue\n      }\n\n      for (const locale of locales) {\n        const data = await readLocalizedBranchWrite({\n          branch: resolved.change.branch as string,\n          collectionSlug: resolved.collectionSlug,\n          docID: resolved.docID,\n          draft: write.draft,\n          locale,\n          payload,\n          req,\n        })\n\n        if (data) {\n          candidates.push({\n            ...baseCandidate,\n            data: prepareCollectionCandidate({\n              collectionSlug: resolved.collectionSlug,\n              data,\n              payload,\n            }),\n            locale,\n          })\n        }\n      }\n    }\n  }\n\n  for (const change of pendingGlobals) {\n    const branch = change.branch as string\n    const globalSlug = change.globalSlug as string\n    const writes = await resolveGlobalMergeWrites({ branch, globalSlug, payload, req })\n    const locales = getGlobalMergeLocales({ globalSlug, payload, req })\n\n    for (const write of writes) {\n      for (const locale of locales) {\n        const data = await readBranchGlobalWrite({\n          branch,\n          draft: write.draft,\n          globalSlug,\n          locale,\n          payload,\n          req,\n        })\n\n        if (data) {\n          candidates.push({\n            changeID: change.id as number | string,\n            data: stripNonWritableFields({\n              data: stripGlobalInternal(data),\n              fields: payload.globals.config.find(({ slug }) => slug === globalSlug)!.fields,\n              payload,\n            }),\n            draft: write.draft,\n            entityType: 'global',\n            globalSlug,\n            locale,\n            operation: 'update',\n          })\n        }\n      }\n    }\n  }\n\n  return candidates\n}\n\n/** Best-effort structural validation for the exact candidates selected by merge. */\nexport const defaultBranchMergeValidation: BranchMergeValidate = ({ candidates, req }) => {\n  const errors: BranchMergeValidationError[] = []\n\n  for (const candidate of candidates) {\n    if (!candidate.data || candidate.operation === 'delete') {\n      continue\n    }\n\n    const candidateReq = isolateBranchState(req)\n\n    if (candidate.locale) {\n      candidateReq.locale = candidate.locale\n    }\n\n    try {\n      if (candidate.entityType === 'collection' && candidate.collectionSlug) {\n        validateCollectionData({\n          slug: candidate.collectionSlug as never,\n          data: candidate.data,\n          partial: candidate.operation !== 'create',\n          req: candidateReq,\n        })\n      } else if (candidate.entityType === 'global' && candidate.globalSlug) {\n        validateGlobalData({\n          slug: candidate.globalSlug as never,\n          data: candidate.data,\n          req: candidateReq,\n        })\n      }\n    } catch (error) {\n      if (!(error instanceof ValidationError)) {\n        throw error\n      }\n\n      for (const fieldError of error.data.errors) {\n        errors.push({\n          changeID: candidate.changeID,\n          collectionSlug: candidate.collectionSlug,\n          docID: candidate.docID,\n          globalSlug: candidate.globalSlug,\n          locale: candidate.locale,\n          message: fieldError.message,\n          path: fieldError.path,\n        })\n      }\n    }\n  }\n\n  return { errors, valid: errors.length === 0 }\n}\n\nconst stripInternal = (data: Record<string, unknown>): Record<string, unknown> => {\n  const {\n    id: _id,\n    [branchDocIDField]: _docID,\n    [branchField]: _branch,\n    createdAt: _createdAt,\n    updatedAt: _updatedAt,\n    ...rest\n  } = data\n\n  return rest\n}\n\nconst stripGlobalInternal = (data: Record<string, unknown>): Record<string, unknown> => {\n  const { globalType: _globalType, ...globalData } = data\n\n  return stripInternal(globalData)\n}\n\nconst prepareCollectionCandidate = ({\n  collectionSlug,\n  data,\n  payload,\n}: {\n  collectionSlug: string\n  data: Record<string, unknown>\n  payload: Payload\n}): Record<string, unknown> =>\n  stripNonWritableFields({\n    data: stripInternal(data),\n    fields: payload.collections[collectionSlug]!.config.fields,\n    payload,\n  })\n\nconst stripNonWritableFields = ({\n  data,\n  fields,\n  payload,\n}: {\n  data: Record<string, unknown>\n  fields: Field[]\n  payload: Payload\n}): Record<string, unknown> => {\n  let writableData = { ...data }\n\n  for (const field of fields) {\n    if ('name' in field && field.name && (field.type === 'join' || fieldIsVirtual(field))) {\n      delete writableData[field.name]\n      continue\n    }\n\n    if (field.type === 'row' || field.type === 'collapsible') {\n      writableData = stripNonWritableFields({ data: writableData, fields: field.fields, payload })\n      continue\n    }\n\n    if (field.type === 'tabs') {\n      for (const tab of field.tabs) {\n        if (!tabHasName(tab)) {\n          writableData = stripNonWritableFields({ data: writableData, fields: tab.fields, payload })\n          continue\n        }\n\n        const tabData = writableData[tab.name]\n\n        if (isRecord(tabData)) {\n          writableData[tab.name] = stripNonWritableFields({\n            data: tabData,\n            fields: tab.fields,\n            payload,\n          })\n        }\n      }\n\n      continue\n    }\n\n    if (field.type === 'group') {\n      if (!('name' in field) || !field.name) {\n        writableData = stripNonWritableFields({ data: writableData, fields: field.fields, payload })\n        continue\n      }\n\n      const groupData = writableData[field.name]\n\n      if (isRecord(groupData)) {\n        writableData[field.name] = stripNonWritableFields({\n          data: groupData,\n          fields: field.fields,\n          payload,\n        })\n      }\n\n      continue\n    }\n\n    if (field.type === 'array' && field.name) {\n      const rows = writableData[field.name]\n\n      if (Array.isArray(rows)) {\n        writableData[field.name] = rows.map((row) =>\n          isRecord(row)\n            ? stripNonWritableFields({ data: row, fields: field.fields, payload })\n            : row,\n        )\n      }\n\n      continue\n    }\n\n    if (field.type === 'blocks' && field.name) {\n      const rows = writableData[field.name]\n\n      if (Array.isArray(rows)) {\n        writableData[field.name] = rows.map((row) => {\n          if (!isRecord(row) || typeof row.blockType !== 'string') {\n            return row\n          }\n\n          const block =\n            payload.config.blocks?.find(({ slug }) => slug === row.blockType) ??\n            field.blocks.find(\n              (candidate) => typeof candidate !== 'string' && candidate.slug === row.blockType,\n            )\n\n          return !block || typeof block === 'string'\n            ? row\n            : stripNonWritableFields({ data: row, fields: block.fields, payload })\n        })\n      }\n    }\n  }\n\n  return writableData\n}\n\nconst isRecord = (value: unknown): value is Record<string, unknown> =>\n  Boolean(value && typeof value === 'object' && !Array.isArray(value))\n"],"names":["ValidationError","fieldIsVirtual","tabHasName","validateCollectionData","validateGlobalData","traverseForLocalizedFields","getGlobalMergeLocales","readBranchGlobalWrite","resolveGlobalMergeWrites","branchMergeValidationContextKey","readLocalizedBranchWrite","isolateBranchState","branchDocIDField","branchField","MAIN_BRANCH","createMainBranchRequest","req","targetReq","branch","query","context","_branchBypass","createBranchMergeValidationRequest","validationReq","validationContext","operation","prepareBranchMergeValidationCandidates","payload","pending","pendingGlobals","candidates","resolved","collectionConfig","collections","collectionSlug","config","localization","locales","fields","localeCodes","undefined","write","writes","baseCandidate","changeID","change","id","docID","draft","entityType","length","push","data","prepareCollectionCandidate","locale","globalSlug","stripNonWritableFields","stripGlobalInternal","globals","find","slug","defaultBranchMergeValidation","errors","candidate","candidateReq","partial","error","fieldError","message","path","valid","stripInternal","_id","_docID","_branch","createdAt","_createdAt","updatedAt","_updatedAt","rest","globalType","_globalType","globalData","writableData","field","name","type","tab","tabs","tabData","isRecord","groupData","rows","Array","isArray","map","row","blockType","block","blocks","value","Boolean"],"mappings":"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"}