@payloadcms/db-mongodb 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/deleteBranchGlobal.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/deleteBranchGlobal.ts"],"sourcesContent":["import type { DeleteBranchGlobal } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\n/**\n * Drops a branch's copy of a global.\n *\n * Every global lives in one discriminated collection here, so the branch's copy is a\n * sibling row identified by `globalType` and `_branch` — addressed directly rather than\n * through any generic delete, since no other part of Payload deletes a global.\n */\nexport const deleteBranchGlobal: DeleteBranchGlobal = async function deleteBranchGlobal(\n  this: MongooseAdapter,\n  { branch, globalSlug, req },\n) {\n  const { Model } = getGlobal({ adapter: this, globalSlug })\n\n  await Model.deleteOne(\n    { _branch: branch, globalType: globalSlug },\n    { session: await getSession(this, req) },\n  )\n}\n"],"names":["getGlobal","getSession","deleteBranchGlobal","branch","globalSlug","req","Model","adapter","deleteOne","_branch","globalType","session"],"mappings":"AAIA,SAASA,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD;;;;;;CAMC,GACD,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EAAEC,MAAM,EAAEC,UAAU,EAAEC,GAAG,EAAE;IAE3B,MAAM,EAAEC,KAAK,EAAE,GAAGN,UAAU;QAAEO,SAAS,IAAI;QAAEH;IAAW;IAExD,MAAME,MAAME,SAAS,CACnB;QAAEC,SAASN;QAAQO,YAAYN;IAAW,GAC1C;QAAEO,SAAS,MAAMV,WAAW,IAAI,EAAEI;IAAK;AAE3C,EAAC"}

package/dist/deleteMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../src/deleteMany.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAQzC,eAAO,MAAM,UAAU,EAAE,UAkBxB,CAAA"}
+{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../src/deleteMany.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAA;AAQzC,eAAO,MAAM,UAAU,EAAE,UAmBxB,CAAA"}

package/dist/deleteMany.js

@@ -10,6 +10,7 @@ export const deleteMany = async function deleteMany({ collection: collectionSlug
         adapter: this,
         collectionSlug,
         fields: collectionConfig.flattenedFields,
+        req,
         where
     });
     const options = {

package/dist/deleteMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteMany.ts"],"sourcesContent":["import type { DeleteOptions } from 'mongodb'\n\nimport { type DeleteMany } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteMany: DeleteMany = async function deleteMany(\n  this: MongooseAdapter,\n  { collection: collectionSlug, req, where },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    where,\n  })\n\n  const options: DeleteOptions = {\n    session: await getSession(this, req),\n  }\n\n  await Model.deleteMany(query, options)\n}\n"],"names":["buildQuery","getCollection","getSession","deleteMany","collection","collectionSlug","req","where","collectionConfig","Model","adapter","query","fields","flattenedFields","options","session"],"mappings":"AAMA,SAASA,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE1C,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGR,cAAc;QAAES,SAAS,IAAI;QAAEL;IAAe;IAElF,MAAMM,QAAQ,MAAMX,WAAW;QAC7BU,SAAS,IAAI;QACbL;QACAO,QAAQJ,iBAAiBK,eAAe;QACxCN;IACF;IAEA,MAAMO,UAAyB;QAC7BC,SAAS,MAAMb,WAAW,IAAI,EAAEI;IAClC;IAEA,MAAMG,MAAMN,UAAU,CAACQ,OAAOG;AAChC,EAAC"}
+{"version":3,"sources":["../src/deleteMany.ts"],"sourcesContent":["import type { DeleteOptions } from 'mongodb'\n\nimport { type DeleteMany } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteMany: DeleteMany = async function deleteMany(\n  this: MongooseAdapter,\n  { collection: collectionSlug, req, where },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    req,\n    where,\n  })\n\n  const options: DeleteOptions = {\n    session: await getSession(this, req),\n  }\n\n  await Model.deleteMany(query, options)\n}\n"],"names":["buildQuery","getCollection","getSession","deleteMany","collection","collectionSlug","req","where","collectionConfig","Model","adapter","query","fields","flattenedFields","options","session"],"mappings":"AAMA,SAASA,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE1C,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGR,cAAc;QAAES,SAAS,IAAI;QAAEL;IAAe;IAElF,MAAMM,QAAQ,MAAMX,WAAW;QAC7BU,SAAS,IAAI;QACbL;QACAO,QAAQJ,iBAAiBK,eAAe;QACxCP;QACAC;IACF;IAEA,MAAMO,UAAyB;QAC7BC,SAAS,MAAMb,WAAW,IAAI,EAAEI;IAClC;IAEA,MAAMG,MAAMN,UAAU,CAACQ,OAAOG;AAChC,EAAC"}

package/dist/deleteOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAUxC,eAAO,MAAM,SAAS,EAAE,SAyCvB,CAAA"}
+{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAYxC,eAAO,MAAM,SAAS,EAAE,SAqDvB,CAAA"}

package/dist/deleteOne.js

@@ -1,17 +1,36 @@
+import { resolveBranchDelete } from 'payload';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { transform } from './utilities/transform.js';
-export const deleteOne = async function deleteOne({ collection: collectionSlug, req, returning, select, where }) {
+export const deleteOne = async function deleteOne({ branch, collection: collectionSlug, req, returning, select, where }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug
     });
+    const branchDelete = await resolveBranchDelete({
+        branch,
+        collectionSlug,
+        req,
+        where
+    });
+    if (branchDelete.tombstoned) {
+        return returning === false ? null : branchDelete.doc;
+    }
+    if (branchDelete.deleteRowID !== undefined) {
+        where = {
+            id: {
+                equals: branchDelete.deleteRowID
+            }
+        };
+    }
     const query = await buildQuery({
         adapter: this,
+        branch,
         collectionSlug,
         fields: collectionConfig.flattenedFields,
+        req,
         where
     });
     const options = {

package/dist/deleteOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { DeleteOne } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: MongooseAdapter,\n  { collection: collectionSlug, req, returning, select, where },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    where,\n  })\n\n  const options = {\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select,\n    }),\n    session: await getSession(this, req),\n  } satisfies QueryOptions\n\n  if (returning === false) {\n    await Model.deleteOne(query, options)?.lean()\n    return null\n  }\n\n  const doc = await Model.findOneAndDelete(query, options)?.lean()\n\n  if (!doc) {\n    return null\n  }\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields: collectionConfig.fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["buildQuery","buildProjectionFromSelect","getCollection","getSession","transform","deleteOne","collection","collectionSlug","req","returning","select","where","collectionConfig","Model","adapter","query","fields","flattenedFields","options","projection","session","lean","doc","findOneAndDelete","data","operation"],"mappings":"AAKA,SAASA,UAAU,QAAQ,0BAAyB;AACpD,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAE7D,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGX,cAAc;QAAEY,SAAS,IAAI;QAAEP;IAAe;IAElF,MAAMQ,QAAQ,MAAMf,WAAW;QAC7Bc,SAAS,IAAI;QACbP;QACAS,QAAQJ,iBAAiBK,eAAe;QACxCN;IACF;IAEA,MAAMO,UAAU;QACdC,YAAYlB,0BAA0B;YACpCa,SAAS,IAAI;YACbE,QAAQJ,iBAAiBK,eAAe;YACxCP;QACF;QACAU,SAAS,MAAMjB,WAAW,IAAI,EAAEK;IAClC;IAEA,IAAIC,cAAc,OAAO;QACvB,MAAMI,MAAMR,SAAS,CAACU,OAAOG,UAAUG;QACvC,OAAO;IACT;IAEA,MAAMC,MAAM,MAAMT,MAAMU,gBAAgB,CAACR,OAAOG,UAAUG;IAE1D,IAAI,CAACC,KAAK;QACR,OAAO;IACT;IAEAlB,UAAU;QACRU,SAAS,IAAI;QACbU,MAAMF;QACNN,QAAQJ,iBAAiBI,MAAM;QAC/BS,WAAW;IACb;IAEA,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { DeleteOne } from 'payload'\n\nimport { resolveBranchDelete } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: MongooseAdapter,\n  { branch, collection: collectionSlug, req, returning, select, where },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  const branchDelete = await resolveBranchDelete({ branch, collectionSlug, req, where })\n\n  if (branchDelete.tombstoned) {\n    return returning === false ? null : (branchDelete.doc as any)\n  }\n\n  if (branchDelete.deleteRowID !== undefined) {\n    where = { id: { equals: branchDelete.deleteRowID } }\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    branch,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    req,\n    where,\n  })\n\n  const options = {\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select,\n    }),\n    session: await getSession(this, req),\n  } satisfies QueryOptions\n\n  if (returning === false) {\n    await Model.deleteOne(query, options)?.lean()\n    return null\n  }\n\n  const doc = await Model.findOneAndDelete(query, options)?.lean()\n\n  if (!doc) {\n    return null\n  }\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields: collectionConfig.fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["resolveBranchDelete","buildQuery","buildProjectionFromSelect","getCollection","getSession","transform","deleteOne","branch","collection","collectionSlug","req","returning","select","where","collectionConfig","Model","adapter","branchDelete","tombstoned","doc","deleteRowID","undefined","id","equals","query","fields","flattenedFields","options","projection","session","lean","findOneAndDelete","data","operation"],"mappings":"AAGA,SAASA,mBAAmB,QAAQ,UAAS;AAI7C,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,MAAM,EAAEC,YAAYC,cAAc,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAErE,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGZ,cAAc;QAAEa,SAAS,IAAI;QAAEP;IAAe;IAElF,MAAMQ,eAAe,MAAMjB,oBAAoB;QAAEO;QAAQE;QAAgBC;QAAKG;IAAM;IAEpF,IAAII,aAAaC,UAAU,EAAE;QAC3B,OAAOP,cAAc,QAAQ,OAAQM,aAAaE,GAAG;IACvD;IAEA,IAAIF,aAAaG,WAAW,KAAKC,WAAW;QAC1CR,QAAQ;YAAES,IAAI;gBAAEC,QAAQN,aAAaG,WAAW;YAAC;QAAE;IACrD;IAEA,MAAMI,QAAQ,MAAMvB,WAAW;QAC7Be,SAAS,IAAI;QACbT;QACAE;QACAgB,QAAQX,iBAAiBY,eAAe;QACxChB;QACAG;IACF;IAEA,MAAMc,UAAU;QACdC,YAAY1B,0BAA0B;YACpCc,SAAS,IAAI;YACbS,QAAQX,iBAAiBY,eAAe;YACxCd;QACF;QACAiB,SAAS,MAAMzB,WAAW,IAAI,EAAEM;IAClC;IAEA,IAAIC,cAAc,OAAO;QACvB,MAAMI,MAAMT,SAAS,CAACkB,OAAOG,UAAUG;QACvC,OAAO;IACT;IAEA,MAAMX,MAAM,MAAMJ,MAAMgB,gBAAgB,CAACP,OAAOG,UAAUG;IAE1D,IAAI,CAACX,KAAK;QACR,OAAO;IACT;IAEAd,UAAU;QACRW,SAAS,IAAI;QACbgB,MAAMb;QACNM,QAAQX,iBAAiBW,MAAM;QAC/BQ,WAAW;IACb;IAEA,OAAOd;AACT,EAAC"}

package/dist/deleteVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteVersions.d.ts","sourceRoot":"","sources":["../src/deleteVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,SAAS,CAAA;AAW7D,eAAO,MAAM,cAAc,EAAE,cAqC5B,CAAA"}
+{"version":3,"file":"deleteVersions.d.ts","sourceRoot":"","sources":["../src/deleteVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAkB,MAAM,SAAS,CAAA;AAW7D,eAAO,MAAM,cAAc,EAAE,cAsC5B,CAAA"}

package/dist/deleteVersions.js

@@ -28,6 +28,7 @@ export const deleteVersions = async function deleteVersions({ collection: collec
         adapter: this,
         fields,
         locale,
+        req,
         where
     });
     const session = await getSession(this, req);

package/dist/deleteVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteVersions.ts"],"sourcesContent":["import type { DeleteVersions, FlattenedField } from 'payload'\n\nimport { APIError, buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\nimport type { CollectionModel } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection, getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteVersions: DeleteVersions = async function deleteVersions(\n  this: MongooseAdapter,\n  { collection: collectionSlug, globalSlug, locale, req, where },\n) {\n  let fields: FlattenedField[]\n  let VersionsModel: CollectionModel\n\n  if (globalSlug) {\n    const { globalConfig, Model } = getGlobal({\n      adapter: this,\n      globalSlug,\n      versions: true,\n    })\n    fields = buildVersionGlobalFields(this.payload.config, globalConfig, true)\n    VersionsModel = Model\n  } else if (collectionSlug) {\n    const { collectionConfig, Model } = getCollection({\n      adapter: this,\n      collectionSlug,\n      versions: true,\n    })\n    fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n    VersionsModel = Model\n  } else {\n    throw new APIError('Either collection or globalSlug must be passed.')\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    where,\n  })\n\n  const session = await getSession(this, req)\n\n  await VersionsModel.deleteMany(query, { session })\n}\n"],"names":["APIError","buildVersionCollectionFields","buildVersionGlobalFields","buildQuery","getCollection","getGlobal","getSession","deleteVersions","collection","collectionSlug","globalSlug","locale","req","where","fields","VersionsModel","globalConfig","Model","adapter","versions","payload","config","collectionConfig","query","session","deleteMany"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,4BAA4B,EAAEC,wBAAwB,QAAQ,UAAS;AAK1F,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,EAAEC,SAAS,QAAQ,2BAA0B;AACnE,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,iBAAiC,eAAeA,eAE3D,EAAEC,YAAYC,cAAc,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE9D,IAAIC;IACJ,IAAIC;IAEJ,IAAIL,YAAY;QACd,MAAM,EAAEM,YAAY,EAAEC,KAAK,EAAE,GAAGZ,UAAU;YACxCa,SAAS,IAAI;YACbR;YACAS,UAAU;QACZ;QACAL,SAASZ,yBAAyB,IAAI,CAACkB,OAAO,CAACC,MAAM,EAAEL,cAAc;QACrED,gBAAgBE;IAClB,OAAO,IAAIR,gBAAgB;QACzB,MAAM,EAAEa,gBAAgB,EAAEL,KAAK,EAAE,GAAGb,cAAc;YAChDc,SAAS,IAAI;YACbT;YACAU,UAAU;QACZ;QACAL,SAASb,6BAA6B,IAAI,CAACmB,OAAO,CAACC,MAAM,EAAEC,kBAAkB;QAC7EP,gBAAgBE;IAClB,OAAO;QACL,MAAM,IAAIjB,SAAS;IACrB;IAEA,MAAMuB,QAAQ,MAAMpB,WAAW;QAC7Be,SAAS,IAAI;QACbJ;QACAH;QACAE;IACF;IAEA,MAAMW,UAAU,MAAMlB,WAAW,IAAI,EAAEM;IAEvC,MAAMG,cAAcU,UAAU,CAACF,OAAO;QAAEC;IAAQ;AAClD,EAAC"}
+{"version":3,"sources":["../src/deleteVersions.ts"],"sourcesContent":["import type { DeleteVersions, FlattenedField } from 'payload'\n\nimport { APIError, buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\nimport type { CollectionModel } from './types.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection, getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteVersions: DeleteVersions = async function deleteVersions(\n  this: MongooseAdapter,\n  { collection: collectionSlug, globalSlug, locale, req, where },\n) {\n  let fields: FlattenedField[]\n  let VersionsModel: CollectionModel\n\n  if (globalSlug) {\n    const { globalConfig, Model } = getGlobal({\n      adapter: this,\n      globalSlug,\n      versions: true,\n    })\n    fields = buildVersionGlobalFields(this.payload.config, globalConfig, true)\n    VersionsModel = Model\n  } else if (collectionSlug) {\n    const { collectionConfig, Model } = getCollection({\n      adapter: this,\n      collectionSlug,\n      versions: true,\n    })\n    fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n    VersionsModel = Model\n  } else {\n    throw new APIError('Either collection or globalSlug must be passed.')\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    req,\n    where,\n  })\n\n  const session = await getSession(this, req)\n\n  await VersionsModel.deleteMany(query, { session })\n}\n"],"names":["APIError","buildVersionCollectionFields","buildVersionGlobalFields","buildQuery","getCollection","getGlobal","getSession","deleteVersions","collection","collectionSlug","globalSlug","locale","req","where","fields","VersionsModel","globalConfig","Model","adapter","versions","payload","config","collectionConfig","query","session","deleteMany"],"mappings":"AAEA,SAASA,QAAQ,EAAEC,4BAA4B,EAAEC,wBAAwB,QAAQ,UAAS;AAK1F,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,EAAEC,SAAS,QAAQ,2BAA0B;AACnE,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,iBAAiC,eAAeA,eAE3D,EAAEC,YAAYC,cAAc,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE9D,IAAIC;IACJ,IAAIC;IAEJ,IAAIL,YAAY;QACd,MAAM,EAAEM,YAAY,EAAEC,KAAK,EAAE,GAAGZ,UAAU;YACxCa,SAAS,IAAI;YACbR;YACAS,UAAU;QACZ;QACAL,SAASZ,yBAAyB,IAAI,CAACkB,OAAO,CAACC,MAAM,EAAEL,cAAc;QACrED,gBAAgBE;IAClB,OAAO,IAAIR,gBAAgB;QACzB,MAAM,EAAEa,gBAAgB,EAAEL,KAAK,EAAE,GAAGb,cAAc;YAChDc,SAAS,IAAI;YACbT;YACAU,UAAU;QACZ;QACAL,SAASb,6BAA6B,IAAI,CAACmB,OAAO,CAACC,MAAM,EAAEC,kBAAkB;QAC7EP,gBAAgBE;IAClB,OAAO;QACL,MAAM,IAAIjB,SAAS;IACrB;IAEA,MAAMuB,QAAQ,MAAMpB,WAAW;QAC7Be,SAAS,IAAI;QACbJ;QACAH;QACAC;QACAC;IACF;IAEA,MAAMW,UAAU,MAAMlB,WAAW,IAAI,EAAEM;IAEvC,MAAMG,cAAcU,UAAU,CAACF,OAAO;QAAEC;IAAQ;AAClD,EAAC"}

package/dist/exports/migration-utils.d.ts

@@ -1,4 +1,6 @@
+export { migrateBranching } from '../predefinedMigrations/migrateBranching.js';
 export { localizeStatus, migrateLocalizeStatus, } from '../predefinedMigrations/migrateLocalizeStatus.js';
 export { migrateRelationshipsV2_V3 } from '../predefinedMigrations/migrateRelationshipsV2_V3.js';
+export { migrateSizesToVariants } from '../predefinedMigrations/migrateSizesToVariants.js';
 export { migrateVersionsV1_V2 } from '../predefinedMigrations/migrateVersionsV1_V2.js';
 //# sourceMappingURL=migration-utils.d.ts.map

package/dist/exports/migration-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migration-utils.d.ts","sourceRoot":"","sources":["../../src/exports/migration-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,qBAAqB,GACtB,MAAM,kDAAkD,CAAA;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAA;AAChG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAA"}
+{"version":3,"file":"migration-utils.d.ts","sourceRoot":"","sources":["../../src/exports/migration-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAA;AAC9E,OAAO,EACL,cAAc,EACd,qBAAqB,GACtB,MAAM,kDAAkD,CAAA;AACzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAA;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAA;AAC1F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAA"}

package/dist/exports/migration-utils.js

@@ -1,5 +1,7 @@
+export { migrateBranching } from '../predefinedMigrations/migrateBranching.js';
 export { localizeStatus, migrateLocalizeStatus } from '../predefinedMigrations/migrateLocalizeStatus.js';
 export { migrateRelationshipsV2_V3 } from '../predefinedMigrations/migrateRelationshipsV2_V3.js';
+export { migrateSizesToVariants } from '../predefinedMigrations/migrateSizesToVariants.js';
 export { migrateVersionsV1_V2 } from '../predefinedMigrations/migrateVersionsV1_V2.js';
 
 //# sourceMappingURL=migration-utils.js.map

package/dist/exports/migration-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/exports/migration-utils.ts"],"sourcesContent":["export {\n  localizeStatus,\n  migrateLocalizeStatus,\n} from '../predefinedMigrations/migrateLocalizeStatus.js'\nexport { migrateRelationshipsV2_V3 } from '../predefinedMigrations/migrateRelationshipsV2_V3.js'\nexport { migrateVersionsV1_V2 } from '../predefinedMigrations/migrateVersionsV1_V2.js'\n"],"names":["localizeStatus","migrateLocalizeStatus","migrateRelationshipsV2_V3","migrateVersionsV1_V2"],"mappings":"AAAA,SACEA,cAAc,EACdC,qBAAqB,QAChB,mDAAkD;AACzD,SAASC,yBAAyB,QAAQ,uDAAsD;AAChG,SAASC,oBAAoB,QAAQ,kDAAiD"}
+{"version":3,"sources":["../../src/exports/migration-utils.ts"],"sourcesContent":["export { migrateBranching } from '../predefinedMigrations/migrateBranching.js'\nexport {\n  localizeStatus,\n  migrateLocalizeStatus,\n} from '../predefinedMigrations/migrateLocalizeStatus.js'\nexport { migrateRelationshipsV2_V3 } from '../predefinedMigrations/migrateRelationshipsV2_V3.js'\nexport { migrateSizesToVariants } from '../predefinedMigrations/migrateSizesToVariants.js'\nexport { migrateVersionsV1_V2 } from '../predefinedMigrations/migrateVersionsV1_V2.js'\n"],"names":["migrateBranching","localizeStatus","migrateLocalizeStatus","migrateRelationshipsV2_V3","migrateSizesToVariants","migrateVersionsV1_V2"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,8CAA6C;AAC9E,SACEC,cAAc,EACdC,qBAAqB,QAChB,mDAAkD;AACzD,SAASC,yBAAyB,QAAQ,uDAAsD;AAChG,SAASC,sBAAsB,QAAQ,oDAAmD;AAC1F,SAASC,oBAAoB,QAAQ,kDAAiD"}

package/dist/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAgBnC,eAAO,MAAM,IAAI,EAAE,IAiLlB,CAAA"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAwBnC,eAAO,MAAM,IAAI,EAAE,IA+MlB,CAAA"}

package/dist/find.js

@@ -1,4 +1,5 @@
-import { flattenWhereToOperators } from 'payload';
+import { applyBranchIDProjection, flattenWhereToOperators, resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs, withBranchIDSelect } from 'payload';
+import { buildBranchVisibilityStages } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { aggregatePaginate } from './utilities/aggregatePaginate.js';
@@ -8,11 +9,27 @@ import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { resolveJoins } from './utilities/resolveJoins.js';
 import { transform } from './utilities/transform.js';
-export const find = async function find({ collection: collectionSlug, draftsEnabled, joins = {}, limit = 0, locale, page, pagination, projection, req, select, sort: sortArg, where = {} }) {
+export const find = async function find({ branch, collection: collectionSlug, draftsEnabled, joins = {}, limit = 0, locale, page, pagination, projection, req, select, sort: sortArg, where = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug
     });
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug,
+        req
+    });
+    where = branchReadState.useBranching ? rewriteBranchIDs(where) ?? {} : await resolveBranchQuery({
+        branch,
+        collectionSlug,
+        req,
+        where
+    }) ?? {};
+    const branchVisibility = branchReadState.useBranching ? buildBranchVisibilityStages({
+        adapter: this,
+        branch: branchReadState.branch,
+        collectionSlug
+    }) : [];
     let hasNearConstraint = false;
     if (where) {
         const constraints = flattenWhereToOperators(where);
@@ -33,14 +50,16 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
     }
     const query = await buildQuery({
         adapter: this,
+        branch,
         collectionSlug,
         fields: collectionConfig.flattenedFields,
         locale,
+        req,
         where
     });
     const session = await getSession(this, req);
     // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.
-    const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0;
+    const useEstimatedCount = !branchVisibility.length && (hasNearConstraint || !query || Object.keys(query).length === 0);
     const paginationOptions = {
         lean: true,
         leanWithId: true,
@@ -53,11 +72,17 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
         sort,
         useEstimatedCount
     };
-    if (select) {
+    const selectWithBranchID = withBranchIDSelect({
+        branch,
+        collectionSlug,
+        req,
+        select
+    });
+    if (selectWithBranchID) {
         paginationOptions.projection = buildProjectionFromSelect({
             adapter: this,
             fields: collectionConfig.flattenedFields,
-            select
+            select: selectWithBranchID
         });
     }
     if (this.collation) {
@@ -106,17 +131,20 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
     let result;
     const aggregate = await buildJoinAggregation({
         adapter: this,
+        branch,
         collection: collectionSlug,
         collectionConfig,
         draftsEnabled,
         joins,
         locale,
         projection: paginationOptions.projection,
-        query
+        query,
+        req
     });
-    if (aggregate || sortAggregation.length > 0) {
+    if (aggregate.length > 0 || branchVisibility.length > 0 || sortAggregation.length > 0) {
         result = await aggregatePaginate({
             adapter: this,
+            branchVisibility,
             collation: paginationOptions.collation,
             joinAggregation: aggregate,
             limit: paginationOptions.limit,
@@ -136,10 +164,12 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
     if (!this.useJoinAggregations) {
         await resolveJoins({
             adapter: this,
+            branch,
             collectionSlug,
             docs: result.docs,
             joins,
-            locale
+            locale,
+            req
         });
     }
     transform({
@@ -148,6 +178,12 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
         fields: collectionConfig.fields,
         operation: 'read'
     });
+    applyBranchIDProjection({
+        branch,
+        collectionSlug,
+        docs: result.docs,
+        req
+    });
     return result;
 };
 

package/dist/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { PaginateOptions, PipelineStage } from 'mongoose'\nimport type { Find } from 'payload'\n\nimport { flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { aggregatePaginate } from './utilities/aggregatePaginate.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { resolveJoins } from './utilities/resolveJoins.js'\nimport { transform } from './utilities/transform.js'\n\nexport const find: Find = async function find(\n  this: MongooseAdapter,\n  {\n    collection: collectionSlug,\n    draftsEnabled,\n    joins = {},\n    limit = 0,\n    locale,\n    page,\n    pagination,\n    projection,\n    req,\n    select,\n    sort: sortArg,\n    where = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const sortAggregation: PipelineStage[] = []\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      adapter: this,\n      config: this.payload.config,\n      fields: collectionConfig.flattenedFields,\n      locale,\n      sort: sortArg || collectionConfig.defaultSort,\n      sortAggregation,\n      timestamps: collectionConfig.timestamps || false,\n    })\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    where,\n  })\n\n  const session = await getSession(this, req)\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    options: {\n      session,\n    },\n    page,\n    pagination,\n    projection,\n    sort,\n    useEstimatedCount,\n  }\n\n  if (select) {\n    paginationOptions.projection = buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select,\n    })\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    paginationOptions.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          collation: paginationOptions.collation,\n          hint: { _id: 1 },\n          session,\n        }),\n      )\n    }\n  } else if (!useEstimatedCount && this.collation) {\n    // Workaround for mongoose-paginate-v2 bug: chaining .collation() on countDocuments breaks\n    // session context in transactions (mongoose 8.x). Provide custom count function that passes\n    // collation as an option instead. See: https://github.com/aravindnc/mongoose-paginate-v2/pull/240\n    // TODO: Remove this workaround once mongoose-paginate-v2 is updated with the fix.\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          collation: paginationOptions.collation,\n          session,\n        }),\n      )\n    }\n  }\n\n  if (limit >= 0) {\n    paginationOptions.limit = limit\n    // limit must also be set here, it's ignored when pagination is false\n\n    paginationOptions.options!.limit = limit\n\n    // Disable pagination if limit is 0\n    if (limit === 0) {\n      paginationOptions.pagination = false\n    }\n  }\n\n  let result\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    collection: collectionSlug,\n    collectionConfig,\n    draftsEnabled,\n    joins,\n    locale,\n    projection: paginationOptions.projection,\n    query,\n  })\n\n  if (aggregate || sortAggregation.length > 0) {\n    result = await aggregatePaginate({\n      adapter: this,\n      collation: paginationOptions.collation,\n      joinAggregation: aggregate,\n      limit: paginationOptions.limit,\n      Model,\n      page: paginationOptions.page,\n      pagination: paginationOptions.pagination,\n      projection: paginationOptions.projection,\n      query,\n      session: paginationOptions.options?.session ?? undefined,\n      sort: paginationOptions.sort as object,\n      sortAggregation,\n      useEstimatedCount: paginationOptions.useEstimatedCount,\n    })\n  } else {\n    result = await Model.paginate(query, paginationOptions)\n  }\n\n  if (!this.useJoinAggregations) {\n    await resolveJoins({\n      adapter: this,\n      collectionSlug,\n      docs: result.docs as Record<string, unknown>[],\n      joins,\n      locale,\n    })\n  }\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: collectionConfig.fields,\n    operation: 'read',\n  })\n\n  return result\n}\n"],"names":["flattenWhereToOperators","buildQuery","buildSortParam","aggregatePaginate","buildJoinAggregation","buildProjectionFromSelect","getCollection","getSession","resolveJoins","transform","find","collection","collectionSlug","draftsEnabled","joins","limit","locale","page","pagination","projection","req","select","sort","sortArg","where","collectionConfig","Model","adapter","hasNearConstraint","constraints","some","prop","Object","keys","key","sortAggregation","config","payload","fields","flattenedFields","defaultSort","timestamps","query","session","useEstimatedCount","length","paginationOptions","lean","leanWithId","options","collation","localizationConfig","localization","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","aggregate","joinAggregation","undefined","paginate","useJoinAggregations","docs","data","operation"],"mappings":"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"}
+{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { PaginateOptions, PipelineStage } from 'mongoose'\nimport type { Find } from 'payload'\n\nimport {\n  applyBranchIDProjection,\n  flattenWhereToOperators,\n  resolveBranchQuery,\n  resolveBranchReadState,\n  rewriteBranchIDs,\n  withBranchIDSelect,\n} from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildBranchVisibilityStages } from './queries/buildBranchVisibility.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { aggregatePaginate } from './utilities/aggregatePaginate.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { resolveJoins } from './utilities/resolveJoins.js'\nimport { transform } from './utilities/transform.js'\n\nexport const find: Find = async function find(\n  this: MongooseAdapter,\n  {\n    branch,\n    collection: collectionSlug,\n    draftsEnabled,\n    joins = {},\n    limit = 0,\n    locale,\n    page,\n    pagination,\n    projection,\n    req,\n    select,\n    sort: sortArg,\n    where = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n  const branchReadState = resolveBranchReadState({ branch, collectionSlug, req })\n\n  where = branchReadState.useBranching\n    ? (rewriteBranchIDs(where) ?? {})\n    : ((await resolveBranchQuery({ branch, collectionSlug, req, where })) ?? {})\n  const branchVisibility = branchReadState.useBranching\n    ? buildBranchVisibilityStages({\n        adapter: this,\n        branch: branchReadState.branch,\n        collectionSlug,\n      })\n    : []\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const sortAggregation: PipelineStage[] = []\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      adapter: this,\n      config: this.payload.config,\n      fields: collectionConfig.flattenedFields,\n      locale,\n      sort: sortArg || collectionConfig.defaultSort,\n      sortAggregation,\n      timestamps: collectionConfig.timestamps || false,\n    })\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    branch,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    req,\n    where,\n  })\n\n  const session = await getSession(this, req)\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount =\n    !branchVisibility.length && (hasNearConstraint || !query || Object.keys(query).length === 0)\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    options: {\n      session,\n    },\n    page,\n    pagination,\n    projection,\n    sort,\n    useEstimatedCount,\n  }\n\n  const selectWithBranchID = withBranchIDSelect({ branch, collectionSlug, req, select })\n\n  if (selectWithBranchID) {\n    paginationOptions.projection = buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select: selectWithBranchID,\n    })\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    paginationOptions.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          collation: paginationOptions.collation,\n          hint: { _id: 1 },\n          session,\n        }),\n      )\n    }\n  } else if (!useEstimatedCount && this.collation) {\n    // Workaround for mongoose-paginate-v2 bug: chaining .collation() on countDocuments breaks\n    // session context in transactions (mongoose 8.x). Provide custom count function that passes\n    // collation as an option instead. See: https://github.com/aravindnc/mongoose-paginate-v2/pull/240\n    // TODO: Remove this workaround once mongoose-paginate-v2 is updated with the fix.\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          collation: paginationOptions.collation,\n          session,\n        }),\n      )\n    }\n  }\n\n  if (limit >= 0) {\n    paginationOptions.limit = limit\n    // limit must also be set here, it's ignored when pagination is false\n\n    paginationOptions.options!.limit = limit\n\n    // Disable pagination if limit is 0\n    if (limit === 0) {\n      paginationOptions.pagination = false\n    }\n  }\n\n  let result\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    branch,\n    collection: collectionSlug,\n    collectionConfig,\n    draftsEnabled,\n    joins,\n    locale,\n    projection: paginationOptions.projection,\n    query,\n    req,\n  })\n\n  if (aggregate.length > 0 || branchVisibility.length > 0 || sortAggregation.length > 0) {\n    result = await aggregatePaginate({\n      adapter: this,\n      branchVisibility,\n      collation: paginationOptions.collation,\n      joinAggregation: aggregate,\n      limit: paginationOptions.limit,\n      Model,\n      page: paginationOptions.page,\n      pagination: paginationOptions.pagination,\n      projection: paginationOptions.projection,\n      query,\n      session: paginationOptions.options?.session ?? undefined,\n      sort: paginationOptions.sort as object,\n      sortAggregation,\n      useEstimatedCount: paginationOptions.useEstimatedCount,\n    })\n  } else {\n    result = await Model.paginate(query, paginationOptions)\n  }\n\n  if (!this.useJoinAggregations) {\n    await resolveJoins({\n      adapter: this,\n      branch,\n      collectionSlug,\n      docs: result.docs as Record<string, unknown>[],\n      joins,\n      locale,\n      req,\n    })\n  }\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: collectionConfig.fields,\n    operation: 'read',\n  })\n\n  applyBranchIDProjection({\n    branch,\n    collectionSlug,\n    docs: result.docs as Record<string, unknown>[],\n    req,\n  })\n\n  return result\n}\n"],"names":["applyBranchIDProjection","flattenWhereToOperators","resolveBranchQuery","resolveBranchReadState","rewriteBranchIDs","withBranchIDSelect","buildBranchVisibilityStages","buildQuery","buildSortParam","aggregatePaginate","buildJoinAggregation","buildProjectionFromSelect","getCollection","getSession","resolveJoins","transform","find","branch","collection","collectionSlug","draftsEnabled","joins","limit","locale","page","pagination","projection","req","select","sort","sortArg","where","collectionConfig","Model","adapter","branchReadState","useBranching","branchVisibility","hasNearConstraint","constraints","some","prop","Object","keys","key","sortAggregation","config","payload","fields","flattenedFields","defaultSort","timestamps","query","session","useEstimatedCount","length","paginationOptions","lean","leanWithId","options","selectWithBranchID","collation","localizationConfig","localization","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","aggregate","joinAggregation","undefined","paginate","useJoinAggregations","docs","data","operation"],"mappings":"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"}

package/dist/findDistinct.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAA;AA6C3D,eAAO,MAAM,YAAY,EAAE,YAsQ1B,CAAA"}
+{"version":3,"file":"findDistinct.d.ts","sourceRoot":"","sources":["../src/findDistinct.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAA;AAmD3D,eAAO,MAAM,YAAY,EAAE,YAqW1B,CAAA"}

package/dist/findDistinct.js

@@ -1,4 +1,5 @@
-import { getFieldByPath } from 'payload';
+import { getFieldByPath, resolveBranchQuery, resolveBranchReadState, rewriteBranchIDs } from 'payload';
+import { buildBranchVisibilityStages } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { getCollection } from './utilities/getEntity.js';
@@ -29,7 +30,25 @@ export const findDistinct = async function(args) {
         adapter: this,
         collectionSlug: args.collection
     });
-    const { where = {} } = args;
+    const branchReadState = resolveBranchReadState({
+        branch: args.branch,
+        collectionSlug: args.collection,
+        req: args.req
+    });
+    // Distinct values describe the documents the caller can see, so they are subject to
+    // the same branch predicate as a list read. Without it a branch's shadow rows fed
+    // main's distinct values and the branch's own edits were invisible in its own.
+    const where = branchReadState.useBranching ? rewriteBranchIDs(args.where) ?? {} : await resolveBranchQuery({
+        branch: args.branch,
+        collectionSlug: args.collection,
+        req: args.req,
+        where: args.where
+    }) ?? {};
+    const branchVisibility = branchReadState.useBranching ? buildBranchVisibilityStages({
+        adapter: this,
+        branch: branchReadState.branch,
+        collectionSlug: args.collection
+    }) : [];
     let sortAggregation = [];
     const sort = buildSortParam({
         adapter: this,
@@ -42,9 +61,11 @@ export const findDistinct = async function(args) {
     });
     const query = await buildQuery({
         adapter: this,
+        branch: args.branch,
         collectionSlug: args.collection,
         fields: collectionConfig.flattenedFields,
         locale: args.locale,
+        req: args.req,
         where
     });
     const fieldPathResult = getFieldByPath({
@@ -53,7 +74,7 @@ export const findDistinct = async function(args) {
         includeRelationships: true,
         path: args.field
     });
-    let fieldPath = args.field;
+    let fieldPath = args.field === 'id' ? '_id' : args.field;
     if (fieldPathResult?.pathHasLocalized && args.locale) {
         fieldPath = fieldPathResult.localizedPath.replace('<locale>', args.locale);
     }
@@ -114,30 +135,105 @@ export const findDistinct = async function(args) {
                 sortProperty = sortWithoutRelationPrefix;
             }
         }
-        relationLookup = rels.reduce((acc, { fieldPath, relationTo })=>{
+        relationLookup = [];
+        for (const { fieldPath, relationTo } of rels){
             sortAggregation = sortAggregation.filter((each)=>{
                 if ('$lookup' in each && each.$lookup.as.replace(/^_+/, '') === fieldPath) {
                     return false;
                 }
                 return true;
             });
-            const { Model: foreignModel } = getCollection({
+            const { collectionConfig: foreignCollectionConfig, Model: foreignModel } = getCollection({
                 adapter: this,
                 collectionSlug: relationTo
             });
-            acc.push({
+            const relatedAccess = args.relatedAccess?.[fieldPath];
+            const relatedBranchReadState = resolveBranchReadState({
+                branch: args.branch,
+                collectionSlug: relationTo,
+                req: args.req
+            });
+            const relatedWhere = relatedBranchReadState.useBranching ? rewriteBranchIDs(relatedAccess) : await resolveBranchQuery({
+                branch: args.branch,
+                collectionSlug: relationTo,
+                req: args.req,
+                where: relatedAccess
+            });
+            const relatedQuery = relatedWhere && Object.keys(relatedWhere).length ? await buildQuery({
+                adapter: this,
+                branch: args.branch,
+                collectionSlug: relationTo,
+                fields: foreignCollectionConfig.flattenedFields,
+                locale: args.locale,
+                req: args.req,
+                where: relatedWhere
+            }) : null;
+            const relatedBranchVisibility = relatedBranchReadState.useBranching ? buildBranchVisibilityStages({
+                adapter: this,
+                branch: relatedBranchReadState.branch,
+                collectionSlug: relationTo
+            }) : [];
+            relationLookup.push({
                 $lookup: {
                     as: fieldPath,
-                    foreignField: '_id',
                     from: foreignModel.collection.name,
-                    localField: fieldPath
+                    ...relatedQuery || relatedBranchVisibility.length ? {
+                        let: {
+                            relatedIDs: `$${fieldPath}`
+                        },
+                        pipeline: [
+                            {
+                                $match: {
+                                    $and: [
+                                        {
+                                            $expr: {
+                                                $cond: {
+                                                    else: {
+                                                        $eq: [
+                                                            {
+                                                                $ifNull: [
+                                                                    '$_branchDocID',
+                                                                    '$_id'
+                                                                ]
+                                                            },
+                                                            '$$relatedIDs'
+                                                        ]
+                                                    },
+                                                    if: {
+                                                        $isArray: '$$relatedIDs'
+                                                    },
+                                                    then: {
+                                                        $in: [
+                                                            {
+                                                                $ifNull: [
+                                                                    '$_branchDocID',
+                                                                    '$_id'
+                                                                ]
+                                                            },
+                                                            '$$relatedIDs'
+                                                        ]
+                                                    }
+                                                }
+                                            }
+                                        },
+                                        ...relatedQuery ? [
+                                            relatedQuery
+                                        ] : []
+                                    ]
+                                }
+                            },
+                            ...relatedBranchVisibility
+                        ]
+                    } : {
+                        foreignField: '_id',
+                        localField: fieldPath
+                    }
                 }
             });
-            acc.push({
+            relationLookup.push({
                 $unwind: `$${fieldPath}`
             });
-            return acc;
-        }, []);
+        }
     }
     let $unwind = '';
     let $group = null;
@@ -160,7 +256,12 @@ export const findDistinct = async function(args) {
     }
     if (!$group) {
         $group = {
-            _id: `$${fieldPath}`,
+            _id: args.field === 'id' && branchReadState.useBranching ? {
+                $ifNull: [
+                    '$_branchDocID',
+                    '$_id'
+                ]
+            } : `$${fieldPath}`,
             ...sortProperty === fieldPath ? {} : {
                 _sort: {
                     $max: `$${sortProperty}`
@@ -172,6 +273,7 @@ export const findDistinct = async function(args) {
         {
             $match: query
         },
+        ...branchVisibility,
         ...sortAggregation.length > 0 ? sortAggregation : [],
         ...relationLookup?.length ? relationLookup : [],
         ...$unwind ? [
@@ -212,6 +314,7 @@ export const findDistinct = async function(args) {
             {
                 $match: query
             },
+            ...branchVisibility,
             ...sortAggregation.length > 0 ? sortAggregation : [],
             ...relationLookup?.length ? relationLookup : [],
             ...$unwind ? [