payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ec73d44

package/dist/versions/buildCollectionFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/buildCollectionFields.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { Field, FlattenedField } from '../fields/config/types.js'\n\nimport { hasAutosaveEnabled, hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\n\nexport const buildVersionCollectionFields = <T extends boolean = false>(\n  config: SanitizedConfig,\n  collection: SanitizedCollectionConfig,\n  flatten?: T,\n): true extends T ? FlattenedField[] : Field[] => {\n  const fields: FlattenedField[] = [\n    {\n      name: 'parent',\n      type: 'relationship',\n      index: true,\n      relationTo: collection.slug,\n    },\n    {\n      name: 'version',\n      type: 'group',\n      fields: collection.fields.filter((field) => !('name' in field) || field.name !== 'id'),\n      ...(flatten && {\n        flattenedFields: collection.flattenedFields.filter((each) => each.name !== 'id'),\n      })!,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (hasDraftsEnabled(collection)) {\n    if (config.localization) {\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (hasAutosaveEnabled(collection)) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields as true extends T ? FlattenedField[] : Field[]\n}\n"],"names":["hasAutosaveEnabled","hasDraftsEnabled","buildVersionCollectionFields","config","collection","flatten","fields","name","type","index","relationTo","slug","filter","field","flattenedFields","each","admin","disabled","localization","push","options","locales","map","locale","code"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,gBAAgB,QAAQ,oCAAmC;AAExF,OAAO,MAAMC,+BAA+B,CAC1CC,QACAC,YACAC;IAEA,MAAMC,SAA2B;QAC/B;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;YACPC,YAAYN,WAAWO,IAAI;QAC7B;QACA;YACEJ,MAAM;YACNC,MAAM;YACNF,QAAQF,WAAWE,MAAM,CAACM,MAAM,CAAC,CAACC,QAAU,CAAE,CAAA,UAAUA,KAAI,KAAMA,MAAMN,IAAI,KAAK;YACjF,GAAIF,WAAW;gBACbS,iBAAiBV,WAAWU,eAAe,CAACF,MAAM,CAAC,CAACG,OAASA,KAAKR,IAAI,KAAK;YAC7E,CAAC;QACH;QACA;YACEA,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;QACA;YACEF,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;KACD;IAED,IAAIR,iBAAiBG,aAAa;QAChC,IAAID,OAAOe,YAAY,EAAE;YACvBZ,OAAOa,IAAI,CAAC;gBACVZ,MAAM;gBACNC,MAAM;gBACNQ,OAAO;oBACLC,UAAU;gBACZ;gBACAR,OAAO;gBACPW,SAASjB,OAAOe,YAAY,CAACG,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAlB,OAAOa,IAAI,CAAC;YACVZ,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;QAEA,IAAIT,mBAAmBI,aAAa;YAClCE,OAAOa,IAAI,CAAC;gBACVZ,MAAM;gBACNC,MAAM;gBACNC,OAAO;YACT;QACF;IACF;IAEA,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../../src/versions/buildCollectionFields.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedConfig } from '../config/types.js'\nimport type { Field, FlattenedField } from '../fields/config/types.js'\n\nimport { hasAutosaveEnabled, hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\n\nexport const buildVersionCollectionFields = <T extends boolean = false>(\n  config: SanitizedConfig,\n  collection: SanitizedCollectionConfig,\n  flatten?: T,\n): true extends T ? FlattenedField[] : Field[] => {\n  const fields: FlattenedField[] = [\n    {\n      name: 'parent',\n      type: 'relationship',\n      index: true,\n      relationTo: collection.slug,\n    },\n    {\n      name: 'version',\n      type: 'group',\n      fields: collection.fields.filter((field) => !('name' in field) || field.name !== 'id'),\n      ...(flatten && {\n        flattenedFields: collection.flattenedFields.filter((each) => each.name !== 'id'),\n      })!,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (config.branching?.branchableCollections?.has(collection.slug)) {\n    // Mirrors the discriminator on the collection itself. `_branchParent` holds\n    // the canonical parent document, since a branch version's `parent` points\n    // at the shadow row rather than at the document the editor knows about.\n    fields.push(\n      {\n        name: '_branch',\n        type: 'text',\n        admin: { disabled: true },\n        defaultValue: 'main',\n        index: true,\n      },\n      {\n        name: '_branchParent',\n        type: 'relationship',\n        admin: { disabled: true },\n        index: true,\n        maxDepth: 0,\n        relationTo: collection.slug,\n      },\n    )\n  }\n\n  if (hasDraftsEnabled(collection)) {\n    if (config.localization) {\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (hasAutosaveEnabled(collection)) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields as true extends T ? FlattenedField[] : Field[]\n}\n"],"names":["hasAutosaveEnabled","hasDraftsEnabled","buildVersionCollectionFields","config","collection","flatten","fields","name","type","index","relationTo","slug","filter","field","flattenedFields","each","admin","disabled","branching","branchableCollections","has","push","defaultValue","maxDepth","localization","options","locales","map","locale","code"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,gBAAgB,QAAQ,oCAAmC;AAExF,OAAO,MAAMC,+BAA+B,CAC1CC,QACAC,YACAC;IAEA,MAAMC,SAA2B;QAC/B;YACEC,MAAM;YACNC,MAAM;YACNC,OAAO;YACPC,YAAYN,WAAWO,IAAI;QAC7B;QACA;YACEJ,MAAM;YACNC,MAAM;YACNF,QAAQF,WAAWE,MAAM,CAACM,MAAM,CAAC,CAACC,QAAU,CAAE,CAAA,UAAUA,KAAI,KAAMA,MAAMN,IAAI,KAAK;YACjF,GAAIF,WAAW;gBACbS,iBAAiBV,WAAWU,eAAe,CAACF,MAAM,CAAC,CAACG,OAASA,KAAKR,IAAI,KAAK;YAC7E,CAAC;QACH;QACA;YACEA,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;QACA;YACEF,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;KACD;IAED,IAAIN,OAAOe,SAAS,EAAEC,uBAAuBC,IAAIhB,WAAWO,IAAI,GAAG;QACjE,4EAA4E;QAC5E,0EAA0E;QAC1E,wEAAwE;QACxEL,OAAOe,IAAI,CACT;YACEd,MAAM;YACNC,MAAM;YACNQ,OAAO;gBAAEC,UAAU;YAAK;YACxBK,cAAc;YACdb,OAAO;QACT,GACA;YACEF,MAAM;YACNC,MAAM;YACNQ,OAAO;gBAAEC,UAAU;YAAK;YACxBR,OAAO;YACPc,UAAU;YACVb,YAAYN,WAAWO,IAAI;QAC7B;IAEJ;IAEA,IAAIV,iBAAiBG,aAAa;QAChC,IAAID,OAAOqB,YAAY,EAAE;YACvBlB,OAAOe,IAAI,CAAC;gBACVd,MAAM;gBACNC,MAAM;gBACNQ,OAAO;oBACLC,UAAU;gBACZ;gBACAR,OAAO;gBACPgB,SAAStB,OAAOqB,YAAY,CAACE,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAvB,OAAOe,IAAI,CAAC;YACVd,MAAM;YACNC,MAAM;YACNQ,OAAO;gBACLC,UAAU;YACZ;YACAR,OAAO;QACT;QAEA,IAAIT,mBAAmBI,aAAa;YAClCE,OAAOe,IAAI,CAAC;gBACVd,MAAM;gBACNC,MAAM;gBACNC,OAAO;YACT;QACF;IACF;IAEA,OAAOH;AACT,EAAC"}

package/dist/versions/buildGlobalFields.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildGlobalFields.d.ts","sourceRoot":"","sources":["../../src/versions/buildGlobalFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAIvE,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,OAAO,GAAG,KAAK,UACxD,eAAe,UACf,qBAAqB,YACnB,CAAC,KACV,IAAI,SAAS,CAAC,GAAG,cAAc,EAAE,GAAG,KAAK,EAkE3C,CAAA"}
+{"version":3,"file":"buildGlobalFields.d.ts","sourceRoot":"","sources":["../../src/versions/buildGlobalFields.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AACtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAIvE,eAAO,MAAM,wBAAwB,GAAI,CAAC,SAAS,OAAO,GAAG,KAAK,UACxD,eAAe,UACf,qBAAqB,YACnB,CAAC,KACV,IAAI,SAAS,CAAC,GAAG,cAAc,EAAE,GAAG,KAAK,EAgF3C,CAAA"}

package/dist/versions/buildGlobalFields.js

@@ -1,6 +1,20 @@
 import { hasAutosaveEnabled, hasDraftsEnabled } from '../utilities/getVersionsConfig.js';
 export const buildVersionGlobalFields = (config, global, flatten)=>{
     const fields = [
+        // Unlike collection versions, global versions have no `parent` to scope
+        // `latest` by — every version of a global shares one stream. `_branch` is
+        // what keeps a branch's chain from clearing main's latest flag.
+        ...config.branching?.branchableGlobals?.has(global.slug) ? [
+            {
+                name: '_branch',
+                type: 'text',
+                admin: {
+                    disabled: true
+                },
+                defaultValue: 'main',
+                index: true
+            }
+        ] : [],
         {
             name: 'version',
             type: 'group',

package/dist/versions/buildGlobalFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/buildGlobalFields.ts"],"sourcesContent":["import type { SanitizedConfig } from '../config/types.js'\nimport type { Field, FlattenedField } from '../fields/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\n\nimport { hasAutosaveEnabled, hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\n\nexport const buildVersionGlobalFields = <T extends boolean = false>(\n  config: SanitizedConfig,\n  global: SanitizedGlobalConfig,\n  flatten?: T,\n): true extends T ? FlattenedField[] : Field[] => {\n  const fields: FlattenedField[] = [\n    {\n      name: 'version',\n      type: 'group',\n      fields: global.fields,\n      ...(flatten && {\n        flattenedFields: global.flattenedFields,\n      })!,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (hasDraftsEnabled(global)) {\n    if (config.localization) {\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (hasAutosaveEnabled(global)) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields as true extends T ? FlattenedField[] : Field[]\n}\n"],"names":["hasAutosaveEnabled","hasDraftsEnabled","buildVersionGlobalFields","config","global","flatten","fields","name","type","flattenedFields","admin","disabled","index","localization","push","options","locales","map","locale","code"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,gBAAgB,QAAQ,oCAAmC;AAExF,OAAO,MAAMC,2BAA2B,CACtCC,QACAC,QACAC;IAEA,MAAMC,SAA2B;QAC/B;YACEC,MAAM;YACNC,MAAM;YACNF,QAAQF,OAAOE,MAAM;YACrB,GAAID,WAAW;gBACbI,iBAAiBL,OAAOK,eAAe;YACzC,CAAC;QACH;QACA;YACEF,MAAM;YACNC,MAAM;YACNE,OAAO;gBACLC,UAAU;YACZ;YACAC,OAAO;QACT;QACA;YACEL,MAAM;YACNC,MAAM;YACNE,OAAO;gBACLC,UAAU;YACZ;YACAC,OAAO;QACT;KACD;IAED,IAAIX,iBAAiBG,SAAS;QAC5B,IAAID,OAAOU,YAAY,EAAE;YACvBP,OAAOQ,IAAI,CAAC;gBACVP,MAAM;gBACNC,MAAM;gBACNE,OAAO;oBACLC,UAAU;gBACZ;gBACAC,OAAO;gBACPG,SAASZ,OAAOU,YAAY,CAACG,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAb,OAAOQ,IAAI,CAAC;YACVP,MAAM;YACNC,MAAM;YACNE,OAAO;gBACLC,UAAU;YACZ;YACAC,OAAO;QACT;QAEA,IAAIZ,mBAAmBI,SAAS;YAC9BE,OAAOQ,IAAI,CAAC;gBACVP,MAAM;gBACNC,MAAM;gBACNI,OAAO;YACT;QACF;IACF;IAEA,OAAON;AACT,EAAC"}
+{"version":3,"sources":["../../src/versions/buildGlobalFields.ts"],"sourcesContent":["import type { SanitizedConfig } from '../config/types.js'\nimport type { Field, FlattenedField } from '../fields/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\n\nimport { hasAutosaveEnabled, hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\n\nexport const buildVersionGlobalFields = <T extends boolean = false>(\n  config: SanitizedConfig,\n  global: SanitizedGlobalConfig,\n  flatten?: T,\n): true extends T ? FlattenedField[] : Field[] => {\n  const fields: FlattenedField[] = [\n    // Unlike collection versions, global versions have no `parent` to scope\n    // `latest` by — every version of a global shares one stream. `_branch` is\n    // what keeps a branch's chain from clearing main's latest flag.\n    ...(config.branching?.branchableGlobals?.has(global.slug)\n      ? ([\n          {\n            name: '_branch',\n            type: 'text',\n            admin: { disabled: true },\n            defaultValue: 'main',\n            index: true,\n          },\n        ] as FlattenedField[])\n      : []),\n    {\n      name: 'version',\n      type: 'group',\n      fields: global.fields,\n      ...(flatten && {\n        flattenedFields: global.flattenedFields,\n      })!,\n    },\n    {\n      name: 'createdAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n    {\n      name: 'updatedAt',\n      type: 'date',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    },\n  ]\n\n  if (hasDraftsEnabled(global)) {\n    if (config.localization) {\n      fields.push({\n        name: 'publishedLocale',\n        type: 'select',\n        admin: {\n          disabled: true,\n        },\n        index: true,\n        options: config.localization.locales.map((locale) => {\n          if (typeof locale === 'string') {\n            return locale\n          }\n\n          return locale.code\n        }),\n      })\n    }\n\n    fields.push({\n      name: 'latest',\n      type: 'checkbox',\n      admin: {\n        disabled: true,\n      },\n      index: true,\n    })\n\n    if (hasAutosaveEnabled(global)) {\n      fields.push({\n        name: 'autosave',\n        type: 'checkbox',\n        index: true,\n      })\n    }\n  }\n\n  return fields as true extends T ? FlattenedField[] : Field[]\n}\n"],"names":["hasAutosaveEnabled","hasDraftsEnabled","buildVersionGlobalFields","config","global","flatten","fields","branching","branchableGlobals","has","slug","name","type","admin","disabled","defaultValue","index","flattenedFields","localization","push","options","locales","map","locale","code"],"mappings":"AAIA,SAASA,kBAAkB,EAAEC,gBAAgB,QAAQ,oCAAmC;AAExF,OAAO,MAAMC,2BAA2B,CACtCC,QACAC,QACAC;IAEA,MAAMC,SAA2B;QAC/B,wEAAwE;QACxE,0EAA0E;QAC1E,gEAAgE;WAC5DH,OAAOI,SAAS,EAAEC,mBAAmBC,IAAIL,OAAOM,IAAI,IACnD;YACC;gBACEC,MAAM;gBACNC,MAAM;gBACNC,OAAO;oBAAEC,UAAU;gBAAK;gBACxBC,cAAc;gBACdC,OAAO;YACT;SACD,GACD,EAAE;QACN;YACEL,MAAM;YACNC,MAAM;YACNN,QAAQF,OAAOE,MAAM;YACrB,GAAID,WAAW;gBACbY,iBAAiBb,OAAOa,eAAe;YACzC,CAAC;QACH;QACA;YACEN,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;YACAE,OAAO;QACT;QACA;YACEL,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;YACAE,OAAO;QACT;KACD;IAED,IAAIf,iBAAiBG,SAAS;QAC5B,IAAID,OAAOe,YAAY,EAAE;YACvBZ,OAAOa,IAAI,CAAC;gBACVR,MAAM;gBACNC,MAAM;gBACNC,OAAO;oBACLC,UAAU;gBACZ;gBACAE,OAAO;gBACPI,SAASjB,OAAOe,YAAY,CAACG,OAAO,CAACC,GAAG,CAAC,CAACC;oBACxC,IAAI,OAAOA,WAAW,UAAU;wBAC9B,OAAOA;oBACT;oBAEA,OAAOA,OAAOC,IAAI;gBACpB;YACF;QACF;QAEAlB,OAAOa,IAAI,CAAC;YACVR,MAAM;YACNC,MAAM;YACNC,OAAO;gBACLC,UAAU;YACZ;YACAE,OAAO;QACT;QAEA,IAAIhB,mBAAmBI,SAAS;YAC9BE,OAAOa,IAAI,CAAC;gBACVR,MAAM;gBACNC,MAAM;gBACNI,OAAO;YACT;QACF;IACF;IAEA,OAAOV;AACT,EAAC"}

package/dist/versions/buildVersionCompoundIndexes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildVersionCompoundIndexes.d.ts","sourceRoot":"","sources":["../../src/versions/buildVersionCompoundIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAE5E,eAAO,MAAM,2BAA2B,iBAErC;IACD,OAAO,EAAE,sBAAsB,EAAE,CAAA;CAClC,KAAG,sBAAsB,EAUzB,CAAA"}
+{"version":3,"file":"buildVersionCompoundIndexes.d.ts","sourceRoot":"","sources":["../../src/versions/buildVersionCompoundIndexes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAA;AAI5E,eAAO,MAAM,2BAA2B,iBAErC;IACD,OAAO,EAAE,sBAAsB,EAAE,CAAA;CAClC,KAAG,sBAAsB,EAczB,CAAA"}

package/dist/versions/buildVersionCompoundIndexes.js

@@ -1,11 +1,17 @@
+import { branchField } from '../branching/types.js';
 export const buildVersionCompoundIndexes = ({ indexes })=>{
     return indexes.map((each)=>({
-            fields: each.fields.map(({ field, localizedPath, path, pathHasLocalized })=>({
+            fields: each.fields.map(({ field, localizedPath, path, pathHasLocalized })=>path === branchField ? {
+                    field,
+                    localizedPath,
+                    path,
+                    pathHasLocalized
+                } : {
                     field,
                     localizedPath: `version.${localizedPath}`,
                     path: `version.${path}`,
                     pathHasLocalized
-                })),
+                }),
             unique: false
         }));
 };

package/dist/versions/buildVersionCompoundIndexes.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/buildVersionCompoundIndexes.ts"],"sourcesContent":["import type { SanitizedCompoundIndex } from '../collections/config/types.js'\n\nexport const buildVersionCompoundIndexes = ({\n  indexes,\n}: {\n  indexes: SanitizedCompoundIndex[]\n}): SanitizedCompoundIndex[] => {\n  return indexes.map((each) => ({\n    fields: each.fields.map(({ field, localizedPath, path, pathHasLocalized }) => ({\n      field,\n      localizedPath: `version.${localizedPath}`,\n      path: `version.${path}`,\n      pathHasLocalized,\n    })),\n    unique: false,\n  }))\n}\n"],"names":["buildVersionCompoundIndexes","indexes","map","each","fields","field","localizedPath","path","pathHasLocalized","unique"],"mappings":"AAEA,OAAO,MAAMA,8BAA8B,CAAC,EAC1CC,OAAO,EAGR;IACC,OAAOA,QAAQC,GAAG,CAAC,CAACC,OAAU,CAAA;YAC5BC,QAAQD,KAAKC,MAAM,CAACF,GAAG,CAAC,CAAC,EAAEG,KAAK,EAAEC,aAAa,EAAEC,IAAI,EAAEC,gBAAgB,EAAE,GAAM,CAAA;oBAC7EH;oBACAC,eAAe,CAAC,QAAQ,EAAEA,eAAe;oBACzCC,MAAM,CAAC,QAAQ,EAAEA,MAAM;oBACvBC;gBACF,CAAA;YACAC,QAAQ;QACV,CAAA;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/buildVersionCompoundIndexes.ts"],"sourcesContent":["import type { SanitizedCompoundIndex } from '../collections/config/types.js'\n\nimport { branchField } from '../branching/types.js'\n\nexport const buildVersionCompoundIndexes = ({\n  indexes,\n}: {\n  indexes: SanitizedCompoundIndex[]\n}): SanitizedCompoundIndex[] => {\n  return indexes.map((each) => ({\n    fields: each.fields.map(({ field, localizedPath, path, pathHasLocalized }) =>\n      path === branchField\n        ? { field, localizedPath, path, pathHasLocalized }\n        : {\n            field,\n            localizedPath: `version.${localizedPath}`,\n            path: `version.${path}`,\n            pathHasLocalized,\n          },\n    ),\n    unique: false,\n  }))\n}\n"],"names":["branchField","buildVersionCompoundIndexes","indexes","map","each","fields","field","localizedPath","path","pathHasLocalized","unique"],"mappings":"AAEA,SAASA,WAAW,QAAQ,wBAAuB;AAEnD,OAAO,MAAMC,8BAA8B,CAAC,EAC1CC,OAAO,EAGR;IACC,OAAOA,QAAQC,GAAG,CAAC,CAACC,OAAU,CAAA;YAC5BC,QAAQD,KAAKC,MAAM,CAACF,GAAG,CAAC,CAAC,EAAEG,KAAK,EAAEC,aAAa,EAAEC,IAAI,EAAEC,gBAAgB,EAAE,GACvED,SAASR,cACL;oBAAEM;oBAAOC;oBAAeC;oBAAMC;gBAAiB,IAC/C;oBACEH;oBACAC,eAAe,CAAC,QAAQ,EAAEA,eAAe;oBACzCC,MAAM,CAAC,QAAQ,EAAEA,MAAM;oBACvBC;gBACF;YAENC,QAAQ;QACV,CAAA;AACF,EAAC"}

package/dist/versions/deleteCollectionVersions.d.ts

@@ -2,10 +2,21 @@ import type { PayloadRequest } from '../types/index.js';
 import { type Payload } from '../index.js';
 type Args = {
     id?: number | string;
+    /**
+     * Delete the versions of many parent documents at once. Takes precedence over `id`.
+     */
+    ids?: (number | string)[];
     payload: Payload;
     req?: PayloadRequest;
     slug: string;
+    versionIDs?: (number | string)[];
 };
-export declare const deleteCollectionVersions: ({ id, slug, payload, req }: Args) => Promise<void>;
+/**
+ * Deletes every version belonging to one parent document, or to many at once via `ids`.
+ *
+ * @internal - this may break or be removed at any time. It is exported from the package root only
+ * so that Payload 2.x `payload/versions` imports keep resolving, not as an API to build on.
+ */
+export declare const deleteCollectionVersions: ({ id, slug, ids, payload, req, versionIDs, }: Args) => Promise<void>;
 export {};
 //# sourceMappingURL=deleteCollectionVersions.d.ts.map

package/dist/versions/deleteCollectionVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteCollectionVersions.d.ts","sourceRoot":"","sources":["../../src/versions/deleteCollectionVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,wBAAwB,+BAAsC,IAAI,KAAG,OAAO,CAAC,IAAI,CAiB7F,CAAA"}
+{"version":3,"file":"deleteCollectionVersions.d.ts","sourceRoot":"","sources":["../../src/versions/deleteCollectionVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAG9D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAA;AAG1C,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;CACjC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,wBAAwB,iDAOlC,IAAI,KAAG,OAAO,CAAC,IAAI,CA2CrB,CAAA"}

package/dist/versions/deleteCollectionVersions.js

@@ -1,18 +1,54 @@
-export const deleteCollectionVersions = async ({ id, slug, payload, req })=>{
+import { resolveBranchOwnVersions } from '../branching/versions.js';
+import { markTransactionWrite } from '../utilities/transactionMutationTracker.js';
+/**
+ * Deletes every version belonging to one parent document, or to many at once via `ids`.
+ *
+ * @internal - this may break or be removed at any time. It is exported from the package root only
+ * so that Payload 2.x `payload/versions` imports keep resolving, not as an API to build on.
+ */ export const deleteCollectionVersions = async ({ id, slug, ids, payload, req, versionIDs })=>{
     try {
+        const parentIDs = ids ?? (typeof id === 'undefined' ? [] : [
+            id
+        ]);
+        if (!parentIDs.length || versionIDs && !versionIDs.length) {
+            return;
+        }
+        let where;
+        if (versionIDs) {
+            where = {
+                id: {
+                    in: versionIDs
+                }
+            };
+        } else {
+            const branchScopedVersionQueries = await Promise.all(parentIDs.map((parentID)=>resolveBranchOwnVersions({
+                    id: parentID,
+                    collectionSlug: slug,
+                    req
+                })));
+            if (branchScopedVersionQueries.length === 1) {
+                where = branchScopedVersionQueries[0];
+            } else {
+                where = {
+                    or: branchScopedVersionQueries
+                };
+            }
+        }
         await payload.db.deleteVersions({
             collection: slug,
             req,
-            where: {
-                parent: {
-                    equals: id
-                }
-            }
+            // Scoped to the branch performing the delete. A delete on a branch is a
+            // tombstone rather than a real delete, so cascading by canonical ID alone
+            // would strip main's version chain while leaving its row in place.
+            where
+        });
+        markTransactionWrite({
+            req
         });
     } catch (err) {
         payload.logger.error({
             err,
-            msg: `There was an error removing versions for the deleted ${slug} document with ID ${id}.`
+            msg: ids ? `There was an error removing versions for ${ids.length} deleted ${slug} documents.` : `There was an error removing versions for the deleted ${slug} document with ID ${id}.`
         });
     }
 };

package/dist/versions/deleteCollectionVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/deleteCollectionVersions.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { type Payload } from '../index.js'\n\ntype Args = {\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n}\n\nexport const deleteCollectionVersions = async ({ id, slug, payload, req }: Args): Promise<void> => {\n  try {\n    await payload.db.deleteVersions({\n      collection: slug,\n      req,\n      where: {\n        parent: {\n          equals: id,\n        },\n      },\n    })\n  } catch (err) {\n    payload.logger.error({\n      err,\n      msg: `There was an error removing versions for the deleted ${slug} document with ID ${id}.`,\n    })\n  }\n}\n"],"names":["deleteCollectionVersions","id","slug","payload","req","db","deleteVersions","collection","where","parent","equals","err","logger","error","msg"],"mappings":"AAWA,OAAO,MAAMA,2BAA2B,OAAO,EAAEC,EAAE,EAAEC,IAAI,EAAEC,OAAO,EAAEC,GAAG,EAAQ;IAC7E,IAAI;QACF,MAAMD,QAAQE,EAAE,CAACC,cAAc,CAAC;YAC9BC,YAAYL;YACZE;YACAI,OAAO;gBACLC,QAAQ;oBACNC,QAAQT;gBACV;YACF;QACF;IACF,EAAE,OAAOU,KAAK;QACZR,QAAQS,MAAM,CAACC,KAAK,CAAC;YACnBF;YACAG,KAAK,CAAC,qDAAqD,EAAEZ,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;QAC7F;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/deleteCollectionVersions.ts"],"sourcesContent":["import type { PayloadRequest, Where } from '../types/index.js'\n\nimport { resolveBranchOwnVersions } from '../branching/versions.js'\nimport { type Payload } from '../index.js'\nimport { markTransactionWrite } from '../utilities/transactionMutationTracker.js'\n\ntype Args = {\n  id?: number | string\n  /**\n   * Delete the versions of many parent documents at once. Takes precedence over `id`.\n   */\n  ids?: (number | string)[]\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n  versionIDs?: (number | string)[]\n}\n\n/**\n * Deletes every version belonging to one parent document, or to many at once via `ids`.\n *\n * @internal - this may break or be removed at any time. It is exported from the package root only\n * so that Payload 2.x `payload/versions` imports keep resolving, not as an API to build on.\n */\nexport const deleteCollectionVersions = async ({\n  id,\n  slug,\n  ids,\n  payload,\n  req,\n  versionIDs,\n}: Args): Promise<void> => {\n  try {\n    const parentIDs = ids ?? (typeof id === 'undefined' ? [] : [id])\n\n    if (!parentIDs.length || (versionIDs && !versionIDs.length)) {\n      return\n    }\n\n    let where: Where\n\n    if (versionIDs) {\n      where = { id: { in: versionIDs } }\n    } else {\n      const branchScopedVersionQueries = await Promise.all(\n        parentIDs.map((parentID) =>\n          resolveBranchOwnVersions({ id: parentID, collectionSlug: slug, req }),\n        ),\n      )\n\n      if (branchScopedVersionQueries.length === 1) {\n        where = branchScopedVersionQueries[0]!\n      } else {\n        where = { or: branchScopedVersionQueries }\n      }\n    }\n\n    await payload.db.deleteVersions({\n      collection: slug,\n      req,\n      // Scoped to the branch performing the delete. A delete on a branch is a\n      // tombstone rather than a real delete, so cascading by canonical ID alone\n      // would strip main's version chain while leaving its row in place.\n      where,\n    })\n    markTransactionWrite({ req })\n  } catch (err) {\n    payload.logger.error({\n      err,\n      msg: ids\n        ? `There was an error removing versions for ${ids.length} deleted ${slug} documents.`\n        : `There was an error removing versions for the deleted ${slug} document with ID ${id}.`,\n    })\n  }\n}\n"],"names":["resolveBranchOwnVersions","markTransactionWrite","deleteCollectionVersions","id","slug","ids","payload","req","versionIDs","parentIDs","length","where","in","branchScopedVersionQueries","Promise","all","map","parentID","collectionSlug","or","db","deleteVersions","collection","err","logger","error","msg"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,2BAA0B;AAEnE,SAASC,oBAAoB,QAAQ,6CAA4C;AAcjF;;;;;CAKC,GACD,OAAO,MAAMC,2BAA2B,OAAO,EAC7CC,EAAE,EACFC,IAAI,EACJC,GAAG,EACHC,OAAO,EACPC,GAAG,EACHC,UAAU,EACL;IACL,IAAI;QACF,MAAMC,YAAYJ,OAAQ,CAAA,OAAOF,OAAO,cAAc,EAAE,GAAG;YAACA;SAAG,AAAD;QAE9D,IAAI,CAACM,UAAUC,MAAM,IAAKF,cAAc,CAACA,WAAWE,MAAM,EAAG;YAC3D;QACF;QAEA,IAAIC;QAEJ,IAAIH,YAAY;YACdG,QAAQ;gBAAER,IAAI;oBAAES,IAAIJ;gBAAW;YAAE;QACnC,OAAO;YACL,MAAMK,6BAA6B,MAAMC,QAAQC,GAAG,CAClDN,UAAUO,GAAG,CAAC,CAACC,WACbjB,yBAAyB;oBAAEG,IAAIc;oBAAUC,gBAAgBd;oBAAMG;gBAAI;YAIvE,IAAIM,2BAA2BH,MAAM,KAAK,GAAG;gBAC3CC,QAAQE,0BAA0B,CAAC,EAAE;YACvC,OAAO;gBACLF,QAAQ;oBAAEQ,IAAIN;gBAA2B;YAC3C;QACF;QAEA,MAAMP,QAAQc,EAAE,CAACC,cAAc,CAAC;YAC9BC,YAAYlB;YACZG;YACA,wEAAwE;YACxE,0EAA0E;YAC1E,mEAAmE;YACnEI;QACF;QACAV,qBAAqB;YAAEM;QAAI;IAC7B,EAAE,OAAOgB,KAAK;QACZjB,QAAQkB,MAAM,CAACC,KAAK,CAAC;YACnBF;YACAG,KAAKrB,MACD,CAAC,yCAAyC,EAAEA,IAAIK,MAAM,CAAC,SAAS,EAAEN,KAAK,WAAW,CAAC,GACnF,CAAC,qDAAqD,EAAEA,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;QAC5F;IACF;AACF,EAAC"}

package/dist/versions/deleteScheduledPublishJobs.d.ts

@@ -2,10 +2,14 @@ import type { PayloadRequest } from '../types/index.js';
 import { type Payload } from '../index.js';
 type Args = {
     id?: number | string;
+    /**
+     * Delete the scheduled publish jobs of many documents at once. Takes precedence over `id`.
+     */
+    ids?: (number | string)[];
     payload: Payload;
     req?: PayloadRequest;
     slug: string;
 };
-export declare const deleteScheduledPublishJobs: ({ id, slug, payload, req, }: Args) => Promise<void>;
+export declare const deleteScheduledPublishJobs: ({ id, slug, ids, payload, req, }: Args) => Promise<void>;
 export {};
 //# sourceMappingURL=deleteScheduledPublishJobs.d.ts.map

package/dist/versions/deleteScheduledPublishJobs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteScheduledPublishJobs.d.ts","sourceRoot":"","sources":["../../src/versions/deleteScheduledPublishJobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAA;AAG1C,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,0BAA0B,gCAKpC,IAAI,KAAG,OAAO,CAAC,IAAI,CA2CrB,CAAA"}
+{"version":3,"file":"deleteScheduledPublishJobs.d.ts","sourceRoot":"","sources":["../../src/versions/deleteScheduledPublishJobs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEvD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,aAAa,CAAA;AAI1C,KAAK,IAAI,GAAG;IACV,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB;;OAEG;IACH,GAAG,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,eAAO,MAAM,0BAA0B,qCAMpC,IAAI,KAAG,OAAO,CAAC,IAAI,CAsDrB,CAAA"}

package/dist/versions/deleteScheduledPublishJobs.js

@@ -1,5 +1,6 @@
 import { jobsCollectionSlug } from '../queues/config/collection.js';
-export const deleteScheduledPublishJobs = async ({ id, slug, payload, req })=>{
+import { markTransactionWrite } from '../utilities/transactionMutationTracker.js';
+export const deleteScheduledPublishJobs = async ({ id, slug, ids, payload, req })=>{
     try {
         await payload.db.deleteMany({
             collection: jobsCollectionSlug,
@@ -13,11 +14,17 @@ export const deleteScheduledPublishJobs = async ({ id, slug, payload, req })=>{
                         }
                     },
                     {
-                        processing: {
-                            equals: false
+                        processingUntil: {
+                            exists: false
                         }
                     },
-                    {
+                    ids ? {
+                        or: ids.map((id)=>({
+                                'input.doc.value': {
+                                    equals: id
+                                }
+                            }))
+                    } : {
                         'input.doc.value': {
                             equals: id
                         }
@@ -36,10 +43,13 @@ export const deleteScheduledPublishJobs = async ({ id, slug, payload, req })=>{
                 ]
             }
         });
+        markTransactionWrite({
+            req
+        });
     } catch (err) {
         payload.logger.error({
             err,
-            msg: `There was an error deleting scheduled publish jobs from the queue for ${slug} document with ID ${id}.`
+            msg: ids ? `There was an error deleting scheduled publish jobs from the queue for ${ids.length} ${slug} documents.` : `There was an error deleting scheduled publish jobs from the queue for ${slug} document with ID ${id}.`
         });
     }
 };

package/dist/versions/deleteScheduledPublishJobs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/deleteScheduledPublishJobs.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { type Payload } from '../index.js'\nimport { jobsCollectionSlug } from '../queues/config/collection.js'\n\ntype Args = {\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n}\n\nexport const deleteScheduledPublishJobs = async ({\n  id,\n  slug,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  try {\n    await payload.db.deleteMany({\n      collection: jobsCollectionSlug,\n      req,\n      where: {\n        and: [\n          // only want to delete jobs have not run yet\n          {\n            completedAt: {\n              exists: false,\n            },\n          },\n          {\n            processing: {\n              equals: false,\n            },\n          },\n          {\n            'input.doc.value': {\n              equals: id,\n            },\n          },\n          {\n            'input.doc.relationTo': {\n              equals: slug,\n            },\n          },\n          // data.type narrows scheduled publish jobs in case of another job having input.doc.value\n          {\n            taskSlug: {\n              equals: 'schedulePublish',\n            },\n          },\n        ],\n      },\n    })\n  } catch (err) {\n    payload.logger.error({\n      err,\n      msg: `There was an error deleting scheduled publish jobs from the queue for ${slug} document with ID ${id}.`,\n    })\n  }\n}\n"],"names":["jobsCollectionSlug","deleteScheduledPublishJobs","id","slug","payload","req","db","deleteMany","collection","where","and","completedAt","exists","processing","equals","taskSlug","err","logger","error","msg"],"mappings":"AAGA,SAASA,kBAAkB,QAAQ,iCAAgC;AASnE,OAAO,MAAMC,6BAA6B,OAAO,EAC/CC,EAAE,EACFC,IAAI,EACJC,OAAO,EACPC,GAAG,EACE;IACL,IAAI;QACF,MAAMD,QAAQE,EAAE,CAACC,UAAU,CAAC;YAC1BC,YAAYR;YACZK;YACAI,OAAO;gBACLC,KAAK;oBACH,4CAA4C;oBAC5C;wBACEC,aAAa;4BACXC,QAAQ;wBACV;oBACF;oBACA;wBACEC,YAAY;4BACVC,QAAQ;wBACV;oBACF;oBACA;wBACE,mBAAmB;4BACjBA,QAAQZ;wBACV;oBACF;oBACA;wBACE,wBAAwB;4BACtBY,QAAQX;wBACV;oBACF;oBACA,yFAAyF;oBACzF;wBACEY,UAAU;4BACRD,QAAQ;wBACV;oBACF;iBACD;YACH;QACF;IACF,EAAE,OAAOE,KAAK;QACZZ,QAAQa,MAAM,CAACC,KAAK,CAAC;YACnBF;YACAG,KAAK,CAAC,sEAAsE,EAAEhB,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;QAC9G;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/deleteScheduledPublishJobs.ts"],"sourcesContent":["import type { PayloadRequest } from '../types/index.js'\n\nimport { type Payload } from '../index.js'\nimport { jobsCollectionSlug } from '../queues/config/collection.js'\nimport { markTransactionWrite } from '../utilities/transactionMutationTracker.js'\n\ntype Args = {\n  id?: number | string\n  /**\n   * Delete the scheduled publish jobs of many documents at once. Takes precedence over `id`.\n   */\n  ids?: (number | string)[]\n  payload: Payload\n  req?: PayloadRequest\n  slug: string\n}\n\nexport const deleteScheduledPublishJobs = async ({\n  id,\n  slug,\n  ids,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  try {\n    await payload.db.deleteMany({\n      collection: jobsCollectionSlug,\n      req,\n      where: {\n        and: [\n          // only want to delete jobs have not run yet\n          {\n            completedAt: {\n              exists: false,\n            },\n          },\n          {\n            processingUntil: {\n              exists: false,\n            },\n          },\n          ids\n            ? {\n                or: ids.map((id) => ({\n                  'input.doc.value': {\n                    equals: id,\n                  },\n                })),\n              }\n            : {\n                'input.doc.value': {\n                  equals: id,\n                },\n              },\n          {\n            'input.doc.relationTo': {\n              equals: slug,\n            },\n          },\n          // data.type narrows scheduled publish jobs in case of another job having input.doc.value\n          {\n            taskSlug: {\n              equals: 'schedulePublish',\n            },\n          },\n        ],\n      },\n    })\n    markTransactionWrite({ req })\n  } catch (err) {\n    payload.logger.error({\n      err,\n      msg: ids\n        ? `There was an error deleting scheduled publish jobs from the queue for ${ids.length} ${slug} documents.`\n        : `There was an error deleting scheduled publish jobs from the queue for ${slug} document with ID ${id}.`,\n    })\n  }\n}\n"],"names":["jobsCollectionSlug","markTransactionWrite","deleteScheduledPublishJobs","id","slug","ids","payload","req","db","deleteMany","collection","where","and","completedAt","exists","processingUntil","or","map","equals","taskSlug","err","logger","error","msg","length"],"mappings":"AAGA,SAASA,kBAAkB,QAAQ,iCAAgC;AACnE,SAASC,oBAAoB,QAAQ,6CAA4C;AAajF,OAAO,MAAMC,6BAA6B,OAAO,EAC/CC,EAAE,EACFC,IAAI,EACJC,GAAG,EACHC,OAAO,EACPC,GAAG,EACE;IACL,IAAI;QACF,MAAMD,QAAQE,EAAE,CAACC,UAAU,CAAC;YAC1BC,YAAYV;YACZO;YACAI,OAAO;gBACLC,KAAK;oBACH,4CAA4C;oBAC5C;wBACEC,aAAa;4BACXC,QAAQ;wBACV;oBACF;oBACA;wBACEC,iBAAiB;4BACfD,QAAQ;wBACV;oBACF;oBACAT,MACI;wBACEW,IAAIX,IAAIY,GAAG,CAAC,CAACd,KAAQ,CAAA;gCACnB,mBAAmB;oCACjBe,QAAQf;gCACV;4BACF,CAAA;oBACF,IACA;wBACE,mBAAmB;4BACjBe,QAAQf;wBACV;oBACF;oBACJ;wBACE,wBAAwB;4BACtBe,QAAQd;wBACV;oBACF;oBACA,yFAAyF;oBACzF;wBACEe,UAAU;4BACRD,QAAQ;wBACV;oBACF;iBACD;YACH;QACF;QACAjB,qBAAqB;YAAEM;QAAI;IAC7B,EAAE,OAAOa,KAAK;QACZd,QAAQe,MAAM,CAACC,KAAK,CAAC;YACnBF;YACAG,KAAKlB,MACD,CAAC,sEAAsE,EAAEA,IAAImB,MAAM,CAAC,CAAC,EAAEpB,KAAK,WAAW,CAAC,GACxG,CAAC,sEAAsE,EAAEA,KAAK,kBAAkB,EAAED,GAAG,CAAC,CAAC;QAC7G;IACF;AACF,EAAC"}

package/dist/versions/drafts/appendVersionToQueryKey.d.ts

@@ -1,3 +1,4 @@
 import type { Where } from '../../types/index.js';
+export declare const appendGlobalVersionToQueryKey: (query?: Where) => Where;
 export declare const appendVersionToQueryKey: (query?: Where) => Where;
 //# sourceMappingURL=appendVersionToQueryKey.d.ts.map

package/dist/versions/drafts/appendVersionToQueryKey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"appendVersionToQueryKey.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AAEjD,eAAO,MAAM,uBAAuB,WAAW,KAAK,KAAQ,KAqB3D,CAAA"}
+{"version":3,"file":"appendVersionToQueryKey.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AA2BjD,eAAO,MAAM,6BAA6B,WAAW,KAAK,KAAQ,KACjB,CAAA;AAEjD,eAAO,MAAM,uBAAuB,WAAW,KAAK,KAAQ,KACR,CAAA"}

package/dist/versions/drafts/appendVersionToQueryKey.js

@@ -1,27 +1,29 @@
-export const appendVersionToQueryKey = (query = {})=>{
+const appendVersionToQueryKeyWithIDPath = (query, idPath)=>{
     return Object.entries(query).reduce((res, [key, val])=>{
         if ([
-            'AND',
             'and',
-            'OR',
             'or'
-        ].includes(key) && Array.isArray(val)) {
+        ].includes(key.toLowerCase()) && Array.isArray(val)) {
             return {
                 ...res,
-                [key.toLowerCase()]: val.map((subQuery)=>appendVersionToQueryKey(subQuery))
+                [key.toLowerCase()]: val.map((subQuery)=>appendVersionToQueryKeyWithIDPath(subQuery, idPath))
             };
         }
-        if (key !== 'id') {
+        if (key === 'id' && idPath === false) {
             return {
                 ...res,
-                [`version.${key}`]: val
+                id: {
+                    exists: false
+                }
             };
         }
         return {
             ...res,
-            parent: val
+            [key === 'id' && idPath ? idPath : `version.${key}`]: val
         };
     }, {});
 };
+export const appendGlobalVersionToQueryKey = (query = {})=>appendVersionToQueryKeyWithIDPath(query, false);
+export const appendVersionToQueryKey = (query = {})=>appendVersionToQueryKeyWithIDPath(query, 'parent');
 
 //# sourceMappingURL=appendVersionToQueryKey.js.map

package/dist/versions/drafts/appendVersionToQueryKey.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"sourcesContent":["import type { Where } from '../../types/index.js'\n\nexport const appendVersionToQueryKey = (query: Where = {}): Where => {\n  return Object.entries(query).reduce((res, [key, val]) => {\n    if (['AND', 'and', 'OR', 'or'].includes(key) && Array.isArray(val)) {\n      return {\n        ...res,\n        [key.toLowerCase()]: val.map((subQuery) => appendVersionToQueryKey(subQuery)),\n      }\n    }\n\n    if (key !== 'id') {\n      return {\n        ...res,\n        [`version.${key}`]: val,\n      }\n    }\n\n    return {\n      ...res,\n      parent: val,\n    }\n  }, {})\n}\n"],"names":["appendVersionToQueryKey","query","Object","entries","reduce","res","key","val","includes","Array","isArray","toLowerCase","map","subQuery","parent"],"mappings":"AAEA,OAAO,MAAMA,0BAA0B,CAACC,QAAe,CAAC,CAAC;IACvD,OAAOC,OAAOC,OAAO,CAACF,OAAOG,MAAM,CAAC,CAACC,KAAK,CAACC,KAAKC,IAAI;QAClD,IAAI;YAAC;YAAO;YAAO;YAAM;SAAK,CAACC,QAAQ,CAACF,QAAQG,MAAMC,OAAO,CAACH,MAAM;YAClE,OAAO;gBACL,GAAGF,GAAG;gBACN,CAACC,IAAIK,WAAW,GAAG,EAAEJ,IAAIK,GAAG,CAAC,CAACC,WAAab,wBAAwBa;YACrE;QACF;QAEA,IAAIP,QAAQ,MAAM;YAChB,OAAO;gBACL,GAAGD,GAAG;gBACN,CAAC,CAAC,QAAQ,EAAEC,KAAK,CAAC,EAAEC;YACtB;QACF;QAEA,OAAO;YACL,GAAGF,GAAG;YACNS,QAAQP;QACV;IACF,GAAG,CAAC;AACN,EAAC"}
+{"version":3,"sources":["../../../src/versions/drafts/appendVersionToQueryKey.ts"],"sourcesContent":["import type { Where } from '../../types/index.js'\n\nconst appendVersionToQueryKeyWithIDPath = (query: Where, idPath?: false | string): Where => {\n  return Object.entries(query).reduce((res, [key, val]) => {\n    if (['and', 'or'].includes(key.toLowerCase()) && Array.isArray(val)) {\n      return {\n        ...res,\n        [key.toLowerCase()]: val.map((subQuery) =>\n          appendVersionToQueryKeyWithIDPath(subQuery, idPath),\n        ),\n      }\n    }\n\n    if (key === 'id' && idPath === false) {\n      return {\n        ...res,\n        id: { exists: false },\n      }\n    }\n\n    return {\n      ...res,\n      [key === 'id' && idPath ? idPath : `version.${key}`]: val,\n    }\n  }, {})\n}\n\nexport const appendGlobalVersionToQueryKey = (query: Where = {}): Where =>\n  appendVersionToQueryKeyWithIDPath(query, false)\n\nexport const appendVersionToQueryKey = (query: Where = {}): Where =>\n  appendVersionToQueryKeyWithIDPath(query, 'parent')\n"],"names":["appendVersionToQueryKeyWithIDPath","query","idPath","Object","entries","reduce","res","key","val","includes","toLowerCase","Array","isArray","map","subQuery","id","exists","appendGlobalVersionToQueryKey","appendVersionToQueryKey"],"mappings":"AAEA,MAAMA,oCAAoC,CAACC,OAAcC;IACvD,OAAOC,OAAOC,OAAO,CAACH,OAAOI,MAAM,CAAC,CAACC,KAAK,CAACC,KAAKC,IAAI;QAClD,IAAI;YAAC;YAAO;SAAK,CAACC,QAAQ,CAACF,IAAIG,WAAW,OAAOC,MAAMC,OAAO,CAACJ,MAAM;YACnE,OAAO;gBACL,GAAGF,GAAG;gBACN,CAACC,IAAIG,WAAW,GAAG,EAAEF,IAAIK,GAAG,CAAC,CAACC,WAC5Bd,kCAAkCc,UAAUZ;YAEhD;QACF;QAEA,IAAIK,QAAQ,QAAQL,WAAW,OAAO;YACpC,OAAO;gBACL,GAAGI,GAAG;gBACNS,IAAI;oBAAEC,QAAQ;gBAAM;YACtB;QACF;QAEA,OAAO;YACL,GAAGV,GAAG;YACN,CAACC,QAAQ,QAAQL,SAASA,SAAS,CAAC,QAAQ,EAAEK,KAAK,CAAC,EAAEC;QACxD;IACF,GAAG,CAAC;AACN;AAEA,OAAO,MAAMS,gCAAgC,CAAChB,QAAe,CAAC,CAAC,GAC7DD,kCAAkCC,OAAO,OAAM;AAEjD,OAAO,MAAMiB,0BAA0B,CAACjB,QAAe,CAAC,CAAC,GACvDD,kCAAkCC,OAAO,UAAS"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts

@@ -2,6 +2,7 @@ import type { SanitizedCollectionConfig, TypeWithID } from '../../collections/co
 import type { AccessResult } from '../../config/types.js';
 import type { SanitizedGlobalConfig } from '../../globals/config/types.js';
 import type { PayloadRequest, SelectType } from '../../types/index.js';
+import type { TypeWithVersion } from '../types.js';
 type Arguments<T> = {
     accessResult: AccessResult;
     doc: T;
@@ -11,6 +12,15 @@ type Arguments<T> = {
     req: PayloadRequest;
     select?: SelectType;
 };
-export declare const replaceWithDraftIfAvailable: <T extends TypeWithID>({ accessResult, doc, entity, entityType, req, select, }: Arguments<T>) => Promise<T>;
+type FindDraftVersionArguments<T> = {
+    draftVersionID?: number | string;
+} & Arguments<T>;
+export declare const replaceWithDraftIfAvailable: <T extends TypeWithID>({ accessResult, doc, entity, entityType, overrideAccess, req, select, }: Arguments<T>) => Promise<T>;
+export declare const findDraftVersion: <T extends TypeWithID>({ accessResult, doc, draftVersionID, entity, entityType, req, select, }: FindDraftVersionArguments<T>) => Promise<TypeWithVersion<T> | undefined>;
+export declare const getDocumentFromDraftVersion: <T extends TypeWithID>({ doc, draftVersion, entityType, }: {
+    doc: T;
+    draftVersion: TypeWithVersion<T>;
+    entityType: 'collection' | 'global';
+}) => T;
 export {};
 //# sourceMappingURL=replaceWithDraftIfAvailable.d.ts.map

package/dist/versions/drafts/replaceWithDraftIfAvailable.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replaceWithDraftIfAvailable.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAS,MAAM,sBAAsB,CAAA;AAU7E,KAAK,SAAS,CAAC,CAAC,IAAI;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,yBAAyB,GAAG,qBAAqB,CAAA;IACzD,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;IACnC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAU,CAAC,SAAS,UAAU,2DAOnE,SAAS,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAsH1B,CAAA"}
+{"version":3,"file":"replaceWithDraftIfAvailable.d.ts","sourceRoot":"","sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAA;AAC9F,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,UAAU,EAAS,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAWlD,KAAK,SAAS,CAAC,CAAC,IAAI;IAClB,YAAY,EAAE,YAAY,CAAA;IAC1B,GAAG,EAAE,CAAC,CAAA;IACN,MAAM,EAAE,yBAAyB,GAAG,qBAAqB,CAAA;IACzD,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;IACnC,cAAc,EAAE,OAAO,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,CAAA;AAED,KAAK,yBAAyB,CAAC,CAAC,IAAI;IAClC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CACjC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;AAEhB,eAAO,MAAM,2BAA2B,GAAU,CAAC,SAAS,UAAU,2EAQnE,SAAS,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,CAAC,CAY1B,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAU,CAAC,SAAS,UAAU,2EAQxD,yBAAyB,CAAC,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,CA2GvE,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,CAAC,SAAS,UAAU,sCAI7D;IACD,GAAG,EAAE,CAAC,CAAA;IACN,YAAY,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAChC,UAAU,EAAE,YAAY,GAAG,QAAQ,CAAA;CACpC,KAAG,CAqBH,CAAA"}

package/dist/versions/drafts/replaceWithDraftIfAvailable.js

@@ -1,12 +1,29 @@
 // @ts-strict-ignore
 import { hasWhereAccessResult } from '../../auth/index.js';
+import { resolveBranchRowID } from '../../branching/resolveBranchRowID.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { docHasTimestamps } from '../../types/index.js';
 import { hasLocalizeStatusEnabled } from '../../utilities/getVersionsConfig.js';
 import { sanitizeInternalFields } from '../../utilities/sanitizeInternalFields.js';
 import { appendVersionToQueryKey } from './appendVersionToQueryKey.js';
 import { getQueryDraftsSelect } from './getQueryDraftsSelect.js';
-export const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, entityType, req, select })=>{
+export const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, entityType, overrideAccess, req, select })=>{
+    const draftVersion = await findDraftVersion({
+        accessResult,
+        doc,
+        entity,
+        entityType,
+        overrideAccess,
+        req,
+        select
+    });
+    return draftVersion ? getDocumentFromDraftVersion({
+        doc,
+        draftVersion,
+        entityType
+    }) : doc;
+};
+export const findDraftVersion = async ({ accessResult, doc, draftVersionID, entity, entityType, req, select })=>{
     const { locale, payload } = req;
     let queryToBuild = {
         and: [
@@ -43,9 +60,22 @@ export const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, e
         }
     }
     if (entityType === 'collection') {
+        // On a branch, versions hang off the branch's own copy of the document, so
+        // `parent` is that row's primary key rather than the canonical ID.
         queryToBuild.and.push({
             parent: {
-                equals: doc.id
+                equals: await resolveBranchRowID({
+                    id: doc.id,
+                    collectionSlug: entity.slug,
+                    req
+                })
+            }
+        });
+    }
+    if (draftVersionID !== undefined) {
+        queryToBuild.and.push({
+            id: {
+                equals: draftVersionID
             }
         });
     }
@@ -88,11 +118,10 @@ export const replaceWithDraftIfAvailable = async ({ accessResult, doc, entity, e
     } else {
         versionDocs = (await req.payload.db.findVersions(findVersionsArgs)).docs;
     }
-    let draft = versionDocs[0];
-    if (!draft) {
-        return doc;
-    }
-    draft = sanitizeInternalFields(draft);
+    return versionDocs[0];
+};
+export const getDocumentFromDraftVersion = ({ doc, draftVersion, entityType })=>{
+    const draft = sanitizeInternalFields(draftVersion);
     // Patch globalType onto version doc
     if (entityType === 'global' && 'globalType' in doc) {
         // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve

package/dist/versions/drafts/replaceWithDraftIfAvailable.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"sourcesContent":["// @ts-strict-ignore\nimport type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js'\nimport type { AccessResult } from '../../config/types.js'\nimport type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.js'\nimport type { SanitizedGlobalConfig } from '../../globals/config/types.js'\nimport type { PayloadRequest, SelectType, Where } from '../../types/index.js'\n\nimport { hasWhereAccessResult } from '../../auth/index.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { docHasTimestamps } from '../../types/index.js'\nimport { hasLocalizeStatusEnabled } from '../../utilities/getVersionsConfig.js'\nimport { sanitizeInternalFields } from '../../utilities/sanitizeInternalFields.js'\nimport { appendVersionToQueryKey } from './appendVersionToQueryKey.js'\nimport { getQueryDraftsSelect } from './getQueryDraftsSelect.js'\n\ntype Arguments<T> = {\n  accessResult: AccessResult\n  doc: T\n  entity: SanitizedCollectionConfig | SanitizedGlobalConfig\n  entityType: 'collection' | 'global'\n  overrideAccess: boolean\n  req: PayloadRequest\n  select?: SelectType\n}\n\nexport const replaceWithDraftIfAvailable = async <T extends TypeWithID>({\n  accessResult,\n  doc,\n  entity,\n  entityType,\n  req,\n  select,\n}: Arguments<T>): Promise<T> => {\n  const { locale, payload } = req\n\n  let queryToBuild: Where = {\n    and: [\n      {\n        'version._status': {\n          equals: 'draft',\n        },\n      },\n    ],\n  }\n\n  if (hasLocalizeStatusEnabled(entity)) {\n    if (locale === 'all') {\n      queryToBuild = {\n        and: [\n          {\n            or: (\n              (payload.config.localization && payload.config.localization.localeCodes) ||\n              []\n            ).map((localeCode) => ({\n              [`version._status.${localeCode}`]: {\n                equals: 'draft',\n              },\n            })),\n          },\n        ],\n      }\n    } else if (locale) {\n      queryToBuild = {\n        and: [\n          {\n            [`version._status.${locale}`]: {\n              equals: 'draft',\n            },\n          },\n        ],\n      }\n    }\n  }\n\n  if (entityType === 'collection') {\n    queryToBuild.and!.push({\n      parent: {\n        equals: doc.id,\n      },\n    })\n  }\n\n  if (docHasTimestamps(doc)) {\n    queryToBuild.and!.push({\n      or: [\n        {\n          updatedAt: {\n            greater_than: doc.updatedAt,\n          },\n        },\n        {\n          latest: {\n            equals: true,\n          },\n        },\n      ],\n    })\n  }\n\n  let versionAccessResult: undefined | Where\n\n  if (hasWhereAccessResult(accessResult)) {\n    versionAccessResult = appendVersionToQueryKey(accessResult)\n  }\n\n  const findVersionsArgs: FindGlobalVersionsArgs & FindVersionsArgs = {\n    collection: entity.slug,\n    global: entity.slug,\n    limit: 1,\n    locale: locale!,\n    pagination: false,\n    req,\n    select: getQueryDraftsSelect({ select }),\n    sort: '-updatedAt',\n    where: combineQueries(queryToBuild, versionAccessResult!),\n  }\n\n  let versionDocs\n  if (entityType === 'global') {\n    versionDocs = (await req.payload.db.findGlobalVersions<T>(findVersionsArgs)).docs\n  } else {\n    versionDocs = (await req.payload.db.findVersions<T>(findVersionsArgs)).docs\n  }\n\n  let draft = versionDocs[0]\n\n  if (!draft) {\n    return doc\n  }\n\n  draft = sanitizeInternalFields(draft)\n\n  // Patch globalType onto version doc\n  if (entityType === 'global' && 'globalType' in doc) {\n    // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve\n    draft.version.globalType = doc.globalType\n  }\n\n  // handle when .version wasn't selected due to projection\n  if (!draft.version) {\n    draft.version = {} as T\n  }\n\n  // Disregard all other draft content at this point,\n  // Only interested in the version itself.\n  // Operations will handle firing hooks, etc.\n\n  draft.version.id = doc.id\n\n  return draft.version\n}\n"],"names":["hasWhereAccessResult","combineQueries","docHasTimestamps","hasLocalizeStatusEnabled","sanitizeInternalFields","appendVersionToQueryKey","getQueryDraftsSelect","replaceWithDraftIfAvailable","accessResult","doc","entity","entityType","req","select","locale","payload","queryToBuild","and","equals","or","config","localization","localeCodes","map","localeCode","push","parent","id","updatedAt","greater_than","latest","versionAccessResult","findVersionsArgs","collection","slug","global","limit","pagination","sort","where","versionDocs","db","findGlobalVersions","docs","findVersions","draft","version","globalType"],"mappings":"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"}
+{"version":3,"sources":["../../../src/versions/drafts/replaceWithDraftIfAvailable.ts"],"sourcesContent":["// @ts-strict-ignore\nimport type { SanitizedCollectionConfig, TypeWithID } from '../../collections/config/types.js'\nimport type { AccessResult } from '../../config/types.js'\nimport type { FindGlobalVersionsArgs, FindVersionsArgs } from '../../database/types.js'\nimport type { SanitizedGlobalConfig } from '../../globals/config/types.js'\nimport type { PayloadRequest, SelectType, Where } from '../../types/index.js'\nimport type { TypeWithVersion } from '../types.js'\n\nimport { hasWhereAccessResult } from '../../auth/index.js'\nimport { resolveBranchRowID } from '../../branching/resolveBranchRowID.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { docHasTimestamps } from '../../types/index.js'\nimport { hasLocalizeStatusEnabled } from '../../utilities/getVersionsConfig.js'\nimport { sanitizeInternalFields } from '../../utilities/sanitizeInternalFields.js'\nimport { appendVersionToQueryKey } from './appendVersionToQueryKey.js'\nimport { getQueryDraftsSelect } from './getQueryDraftsSelect.js'\n\ntype Arguments<T> = {\n  accessResult: AccessResult\n  doc: T\n  entity: SanitizedCollectionConfig | SanitizedGlobalConfig\n  entityType: 'collection' | 'global'\n  overrideAccess: boolean\n  req: PayloadRequest\n  select?: SelectType\n}\n\ntype FindDraftVersionArguments<T> = {\n  draftVersionID?: number | string\n} & Arguments<T>\n\nexport const replaceWithDraftIfAvailable = async <T extends TypeWithID>({\n  accessResult,\n  doc,\n  entity,\n  entityType,\n  overrideAccess,\n  req,\n  select,\n}: Arguments<T>): Promise<T> => {\n  const draftVersion = await findDraftVersion({\n    accessResult,\n    doc,\n    entity,\n    entityType,\n    overrideAccess,\n    req,\n    select,\n  })\n\n  return draftVersion ? getDocumentFromDraftVersion({ doc, draftVersion, entityType }) : doc\n}\n\nexport const findDraftVersion = async <T extends TypeWithID>({\n  accessResult,\n  doc,\n  draftVersionID,\n  entity,\n  entityType,\n  req,\n  select,\n}: FindDraftVersionArguments<T>): Promise<TypeWithVersion<T> | undefined> => {\n  const { locale, payload } = req\n\n  let queryToBuild: Where = {\n    and: [\n      {\n        'version._status': {\n          equals: 'draft',\n        },\n      },\n    ],\n  }\n\n  if (hasLocalizeStatusEnabled(entity)) {\n    if (locale === 'all') {\n      queryToBuild = {\n        and: [\n          {\n            or: (\n              (payload.config.localization && payload.config.localization.localeCodes) ||\n              []\n            ).map((localeCode) => ({\n              [`version._status.${localeCode}`]: {\n                equals: 'draft',\n              },\n            })),\n          },\n        ],\n      }\n    } else if (locale) {\n      queryToBuild = {\n        and: [\n          {\n            [`version._status.${locale}`]: {\n              equals: 'draft',\n            },\n          },\n        ],\n      }\n    }\n  }\n\n  if (entityType === 'collection') {\n    // On a branch, versions hang off the branch's own copy of the document, so\n    // `parent` is that row's primary key rather than the canonical ID.\n    queryToBuild.and!.push({\n      parent: {\n        equals: await resolveBranchRowID({\n          id: doc.id,\n          collectionSlug: entity.slug,\n          req,\n        }),\n      },\n    })\n  }\n\n  if (draftVersionID !== undefined) {\n    queryToBuild.and!.push({\n      id: {\n        equals: draftVersionID,\n      },\n    })\n  }\n\n  if (docHasTimestamps(doc)) {\n    queryToBuild.and!.push({\n      or: [\n        {\n          updatedAt: {\n            greater_than: doc.updatedAt,\n          },\n        },\n        {\n          latest: {\n            equals: true,\n          },\n        },\n      ],\n    })\n  }\n\n  let versionAccessResult: undefined | Where\n\n  if (hasWhereAccessResult(accessResult)) {\n    versionAccessResult = appendVersionToQueryKey(accessResult)\n  }\n\n  const findVersionsArgs: FindGlobalVersionsArgs & FindVersionsArgs = {\n    collection: entity.slug,\n    global: entity.slug,\n    limit: 1,\n    locale: locale!,\n    pagination: false,\n    req,\n    select: getQueryDraftsSelect({ select }),\n    sort: '-updatedAt',\n    where: combineQueries(queryToBuild, versionAccessResult!),\n  }\n\n  let versionDocs\n  if (entityType === 'global') {\n    versionDocs = (await req.payload.db.findGlobalVersions<T>(findVersionsArgs)).docs\n  } else {\n    versionDocs = (await req.payload.db.findVersions<T>(findVersionsArgs)).docs\n  }\n\n  return versionDocs[0]\n}\n\nexport const getDocumentFromDraftVersion = <T extends TypeWithID>({\n  doc,\n  draftVersion,\n  entityType,\n}: {\n  doc: T\n  draftVersion: TypeWithVersion<T>\n  entityType: 'collection' | 'global'\n}): T => {\n  const draft = sanitizeInternalFields(draftVersion)\n\n  // Patch globalType onto version doc\n  if (entityType === 'global' && 'globalType' in doc) {\n    // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve\n    draft.version.globalType = doc.globalType\n  }\n\n  // handle when .version wasn't selected due to projection\n  if (!draft.version) {\n    draft.version = {} as T\n  }\n\n  // Disregard all other draft content at this point,\n  // Only interested in the version itself.\n  // Operations will handle firing hooks, etc.\n\n  draft.version.id = doc.id\n\n  return draft.version\n}\n"],"names":["hasWhereAccessResult","resolveBranchRowID","combineQueries","docHasTimestamps","hasLocalizeStatusEnabled","sanitizeInternalFields","appendVersionToQueryKey","getQueryDraftsSelect","replaceWithDraftIfAvailable","accessResult","doc","entity","entityType","overrideAccess","req","select","draftVersion","findDraftVersion","getDocumentFromDraftVersion","draftVersionID","locale","payload","queryToBuild","and","equals","or","config","localization","localeCodes","map","localeCode","push","parent","id","collectionSlug","slug","undefined","updatedAt","greater_than","latest","versionAccessResult","findVersionsArgs","collection","global","limit","pagination","sort","where","versionDocs","db","findGlobalVersions","docs","findVersions","draft","version","globalType"],"mappings":"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"}

package/dist/versions/enforceMaxVersions.d.ts

@@ -9,6 +9,7 @@ type Args = {
     payload: Payload;
     req?: PayloadRequest;
 };
+export declare const skipEnforceMaxVersionsContextKey: unique symbol;
 export declare const enforceMaxVersions: ({ id, collection, global: globalConfig, max, payload, req, }: Args) => Promise<void>;
 export {};
 //# sourceMappingURL=enforceMaxVersions.d.ts.map

package/dist/versions/enforceMaxVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforceMaxVersions.d.ts","sourceRoot":"","sources":["../../src/versions/enforceMaxVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAE/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAEvE,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,iEAO5B,IAAI,KAAG,OAAO,CAAC,IAAI,CAmErB,CAAA"}
+{"version":3,"file":"enforceMaxVersions.d.ts","sourceRoot":"","sources":["../../src/versions/enforceMaxVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAE/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAQvE,KAAK,IAAI,GAAG;IACV,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,gCAAgC,eAAmC,CAAA;AAOhF,eAAO,MAAM,kBAAkB,iEAO5B,IAAI,KAAG,OAAO,CAAC,IAAI,CAqGrB,CAAA"}

package/dist/versions/enforceMaxVersions.js

@@ -1,13 +1,30 @@
+import { resolveBranchOwnVersions } from '../branching/versions.js';
+import { collectVersionFiles, scheduleUnreferencedFileCleanup } from '../uploads/fileVersioning/cleanup.js';
+export const skipEnforceMaxVersionsContextKey = Symbol('skipEnforceMaxVersions');
 export const enforceMaxVersions = async ({ id, collection, global: globalConfig, max, payload, req })=>{
+    const skipEnforceMaxVersions = req?.context?.[skipEnforceMaxVersionsContextKey];
+    if (collection && skipEnforceMaxVersions?.collectionSlug === collection.slug && String(skipEnforceMaxVersions.id) === String(id)) {
+        return;
+    }
     const entityType = collection ? 'collection' : 'global';
     const slug = collection ? collection.slug : globalConfig?.slug;
     try {
         const where = {};
         let oldestAllowedDoc;
         if (collection) {
-            where.parent = {
-                equals: id
-            };
+            // Scoped to the chain being pruned, which on a branch is the branch's own —
+            // hanging off its shadow row, not the canonical ID.
+            //
+            // Both halves need it. Unscoped, the probe counted main's versions as part of the
+            // branch's ancestry (a branch reads main's history as its own past, §12), and then
+            // the delete addressed `parent: <canonical id>` with no `_branch` filter, which on
+            // a branch matches *only main's rows*. Saving on a branch therefore deleted
+            // production version history and never pruned the branch at all.
+            Object.assign(where, await resolveBranchOwnVersions({
+                id: id,
+                collectionSlug: collection.slug,
+                req
+            }));
             const query = await payload.db.findVersions({
                 collection: collection.slug,
                 limit: 1,
@@ -37,9 +54,9 @@ export const enforceMaxVersions = async ({ id, collection, global: globalConfig,
                 }
             };
             if (collection) {
-                deleteQuery.parent = {
-                    equals: id
-                };
+                // The same scoped predicate the probe used, so what is counted and what is
+                // deleted are the same set of rows.
+                Object.assign(deleteQuery, where);
             }
             const deleteVersionsArgs = {
                 req,
@@ -50,7 +67,20 @@ export const enforceMaxVersions = async ({ id, collection, global: globalConfig,
             } else {
                 deleteVersionsArgs.collection = slug;
             }
+            const removedFiles = collection?.upload && id !== undefined && req ? await collectVersionFiles({
+                collection,
+                parentID: id,
+                req,
+                where: deleteQuery
+            }) : [];
             await payload.db.deleteVersions(deleteVersionsArgs);
+            if (collection?.upload && req) {
+                await scheduleUnreferencedFileCleanup({
+                    candidates: removedFiles,
+                    collection,
+                    req
+                });
+            }
         }
     } catch (err) {
         payload.logger.error(err);