@payloadcms/db-mongodb 4.0.0-internal.183b315 → 4.0.0-internal.1a2a79e

package/dist/updateOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAWxC,eAAO,MAAM,SAAS,EAAE,SAsGvB,CAAA"}
+{"version":3,"file":"updateOne.d.ts","sourceRoot":"","sources":["../src/updateOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAaxC,eAAO,MAAM,SAAS,EAAE,SAuHvB,CAAA"}

package/dist/updateOne.js

@@ -1,14 +1,23 @@
+import { applyBranchIDProjection, resolveBranchRowID, withBranchIDSelect } 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 { handleError } from './utilities/handleError.js';
 import { transform } from './utilities/transform.js';
-export const updateOne = async function updateOne({ id, collection: collectionSlug, data, locale, options: optionsArgs = {}, req, returning, select, where: whereArg = {} }) {
+export const updateOne = async function updateOne({ id, branch, collection: collectionSlug, data, locale, options: optionsArgs = {}, req, returning, select, where: whereArg = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug
     });
+    if (id !== undefined && id !== null) {
+        id = await resolveBranchRowID({
+            id,
+            branch,
+            collectionSlug,
+            req
+        });
+    }
     const where = id ? {
         id: {
             equals: id
@@ -17,9 +26,11 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
     const fields = collectionConfig.fields;
     const query = await buildQuery({
         adapter: this,
+        branch,
         collectionSlug,
         fields: collectionConfig.flattenedFields,
         locale,
+        req,
         where
     });
     let result;
@@ -64,12 +75,17 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
     const findOptions = {
         ...baseOptions,
         lean: true,
-        new: true,
         projection: buildProjectionFromSelect({
             adapter: this,
             fields: collectionConfig.flattenedFields,
-            select
-        })
+            select: withBranchIDSelect({
+                branch,
+                collectionSlug,
+                req,
+                select
+            })
+        }),
+        returnDocument: 'after'
     };
     try {
         if (returning === false) {
@@ -100,6 +116,16 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
         fields,
         operation: 'read'
     });
+    // The row written on a branch is the shadow row, so the document it returns
+    // carries that row's primary key rather than the document's canonical ID.
+    applyBranchIDProjection({
+        branch,
+        collectionSlug,
+        docs: [
+            result
+        ],
+        req
+    });
     return result;
 };
 

package/dist/updateOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { QueryOptions, UpdateQuery } from 'mongoose'\nimport type { UpdateOne } 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 { handleError } from './utilities/handleError.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: MongooseAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    data,\n    locale,\n    options: optionsArgs = {},\n    req,\n    returning,\n    select,\n    where: whereArg = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n  const where = id ? { id: { equals: id } } : whereArg\n  const fields = collectionConfig.fields\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    where,\n  })\n\n  let result\n\n  let updateData: UpdateQuery<any> = data\n\n  const $inc: Record<string, number> = {}\n  const $push: Record<string, { $each: any[] } | any> = {}\n  const $addToSet: Record<string, { $each: any[] } | any> = {}\n  const $pull: Record<string, { $in: any[] } | any> = {}\n\n  transform({\n    $addToSet,\n    $inc,\n    $pull,\n    $push,\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const updateOps: UpdateQuery<any> = {}\n\n  if (Object.keys($inc).length) {\n    updateOps.$inc = $inc\n  }\n  if (Object.keys($push).length) {\n    updateOps.$push = $push\n  }\n  if (Object.keys($addToSet).length) {\n    updateOps.$addToSet = $addToSet\n  }\n  if (Object.keys($pull).length) {\n    updateOps.$pull = $pull\n  }\n  if (Object.keys(updateOps).length) {\n    updateOps.$set = updateData\n    updateData = updateOps\n  }\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    new: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select,\n    }),\n  }\n\n  try {\n    if (returning === false) {\n      await Model.updateOne(query, updateData, baseOptions)\n      transform({ adapter: this, data, fields, operation: 'read' })\n      return null\n    } else {\n      result = await Model.findOneAndUpdate(query, updateData, findOptions)\n    }\n  } catch (error) {\n    handleError({ collection: collectionSlug, error, req })\n  }\n\n  if (!result) {\n    return null\n  }\n\n  transform({ adapter: this, data: result, fields, operation: 'read' })\n\n  return result\n}\n"],"names":["buildQuery","buildProjectionFromSelect","getCollection","getSession","handleError","transform","updateOne","id","collection","collectionSlug","data","locale","options","optionsArgs","req","returning","select","where","whereArg","collectionConfig","Model","adapter","equals","fields","query","flattenedFields","result","updateData","$inc","$push","$addToSet","$pull","operation","updateOps","Object","keys","length","$set","baseOptions","session","timestamps","findOptions","lean","new","projection","findOneAndUpdate","error"],"mappings":"AAKA,SAASA,UAAU,QAAQ,0BAAyB;AACpD,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,WAAW,QAAQ,6BAA4B;AACxD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EACEC,EAAE,EACFC,YAAYC,cAAc,EAC1BC,IAAI,EACJC,MAAM,EACNC,SAASC,cAAc,CAAC,CAAC,EACzBC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,OAAOC,WAAW,CAAC,CAAC,EACrB;IAED,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGlB,cAAc;QAAEmB,SAAS,IAAI;QAAEZ;IAAe;IAClF,MAAMQ,QAAQV,KAAK;QAAEA,IAAI;YAAEe,QAAQf;QAAG;IAAE,IAAIW;IAC5C,MAAMK,SAASJ,iBAAiBI,MAAM;IAEtC,MAAMC,QAAQ,MAAMxB,WAAW;QAC7BqB,SAAS,IAAI;QACbZ;QACAc,QAAQJ,iBAAiBM,eAAe;QACxCd;QACAM;IACF;IAEA,IAAIS;IAEJ,IAAIC,aAA+BjB;IAEnC,MAAMkB,OAA+B,CAAC;IACtC,MAAMC,QAAgD,CAAC;IACvD,MAAMC,YAAoD,CAAC;IAC3D,MAAMC,QAA8C,CAAC;IAErD1B,UAAU;QACRyB;QACAF;QACAG;QACAF;QACAR,SAAS,IAAI;QACbX;QACAa;QACAS,WAAW;IACb;IAEA,MAAMC,YAA8B,CAAC;IAErC,IAAIC,OAAOC,IAAI,CAACP,MAAMQ,MAAM,EAAE;QAC5BH,UAAUL,IAAI,GAAGA;IACnB;IACA,IAAIM,OAAOC,IAAI,CAACN,OAAOO,MAAM,EAAE;QAC7BH,UAAUJ,KAAK,GAAGA;IACpB;IACA,IAAIK,OAAOC,IAAI,CAACL,WAAWM,MAAM,EAAE;QACjCH,UAAUH,SAAS,GAAGA;IACxB;IACA,IAAII,OAAOC,IAAI,CAACJ,OAAOK,MAAM,EAAE;QAC7BH,UAAUF,KAAK,GAAGA;IACpB;IACA,IAAIG,OAAOC,IAAI,CAACF,WAAWG,MAAM,EAAE;QACjCH,UAAUI,IAAI,GAAGV;QACjBA,aAAaM;IACf;IAEA,MAAMK,cAAc;QAClB,GAAGzB,WAAW;QACd0B,SAAS,MAAMpC,WAAW,IAAI,EAAEW;QAChC,uDAAuD;QACvD0B,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,KAAK;QACLC,YAAY3C,0BAA0B;YACpCoB,SAAS,IAAI;YACbE,QAAQJ,iBAAiBM,eAAe;YACxCT;QACF;IACF;IAEA,IAAI;QACF,IAAID,cAAc,OAAO;YACvB,MAAMK,MAAMd,SAAS,CAACkB,OAAOG,YAAYW;YACzCjC,UAAU;gBAAEgB,SAAS,IAAI;gBAAEX;gBAAMa;gBAAQS,WAAW;YAAO;YAC3D,OAAO;QACT,OAAO;YACLN,SAAS,MAAMN,MAAMyB,gBAAgB,CAACrB,OAAOG,YAAYc;QAC3D;IACF,EAAE,OAAOK,OAAO;QACd1C,YAAY;YAAEI,YAAYC;YAAgBqC;YAAOhC;QAAI;IACvD;IAEA,IAAI,CAACY,QAAQ;QACX,OAAO;IACT;IAEArB,UAAU;QAAEgB,SAAS,IAAI;QAAEX,MAAMgB;QAAQH;QAAQS,WAAW;IAAO;IAEnE,OAAON;AACT,EAAC"}
+{"version":3,"sources":["../src/updateOne.ts"],"sourcesContent":["import type { QueryOptions, UpdateQuery } from 'mongoose'\nimport type { UpdateOne } from 'payload'\n\nimport { applyBranchIDProjection, resolveBranchRowID, withBranchIDSelect } 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 { handleError } from './utilities/handleError.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateOne: UpdateOne = async function updateOne(\n  this: MongooseAdapter,\n  {\n    id,\n    branch,\n    collection: collectionSlug,\n    data,\n    locale,\n    options: optionsArgs = {},\n    req,\n    returning,\n    select,\n    where: whereArg = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  if (id !== undefined && id !== null) {\n    id = await resolveBranchRowID({ id, branch, collectionSlug, req })\n  }\n\n  const where = id ? { id: { equals: id } } : whereArg\n  const fields = collectionConfig.fields\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  let result\n\n  let updateData: UpdateQuery<any> = data\n\n  const $inc: Record<string, number> = {}\n  const $push: Record<string, { $each: any[] } | any> = {}\n  const $addToSet: Record<string, { $each: any[] } | any> = {}\n  const $pull: Record<string, { $in: any[] } | any> = {}\n\n  transform({\n    $addToSet,\n    $inc,\n    $pull,\n    $push,\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const updateOps: UpdateQuery<any> = {}\n\n  if (Object.keys($inc).length) {\n    updateOps.$inc = $inc\n  }\n  if (Object.keys($push).length) {\n    updateOps.$push = $push\n  }\n  if (Object.keys($addToSet).length) {\n    updateOps.$addToSet = $addToSet\n  }\n  if (Object.keys($pull).length) {\n    updateOps.$pull = $pull\n  }\n  if (Object.keys(updateOps).length) {\n    updateOps.$set = updateData\n    updateData = updateOps\n  }\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select: withBranchIDSelect({ branch, collectionSlug, req, select }),\n    }),\n    returnDocument: 'after',\n  }\n\n  try {\n    if (returning === false) {\n      await Model.updateOne(query, updateData, baseOptions)\n      transform({ adapter: this, data, fields, operation: 'read' })\n      return null\n    } else {\n      result = await Model.findOneAndUpdate(query, updateData, findOptions)\n    }\n  } catch (error) {\n    handleError({ collection: collectionSlug, error, req })\n  }\n\n  if (!result) {\n    return null\n  }\n\n  transform({ adapter: this, data: result, fields, operation: 'read' })\n\n  // The row written on a branch is the shadow row, so the document it returns\n  // carries that row's primary key rather than the document's canonical ID.\n  applyBranchIDProjection({\n    branch,\n    collectionSlug,\n    docs: [result as Record<string, unknown>],\n    req,\n  })\n\n  return result\n}\n"],"names":["applyBranchIDProjection","resolveBranchRowID","withBranchIDSelect","buildQuery","buildProjectionFromSelect","getCollection","getSession","handleError","transform","updateOne","id","branch","collection","collectionSlug","data","locale","options","optionsArgs","req","returning","select","where","whereArg","collectionConfig","Model","adapter","undefined","equals","fields","query","flattenedFields","result","updateData","$inc","$push","$addToSet","$pull","operation","updateOps","Object","keys","length","$set","baseOptions","session","timestamps","findOptions","lean","projection","returnDocument","findOneAndUpdate","error","docs"],"mappings":"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"}

package/dist/updateVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateVersion.d.ts","sourceRoot":"","sources":["../src/updateVersion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAU1E,eAAO,MAAM,aAAa,EAAE,aAkE3B,CAAA"}
+{"version":3,"file":"updateVersion.d.ts","sourceRoot":"","sources":["../src/updateVersion.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAU1E,eAAO,MAAM,aAAa,EAAE,aAmE3B,CAAA"}

package/dist/updateVersion.js

@@ -21,6 +21,7 @@ export const updateVersion = async function updateVersion({ id, collection: coll
         adapter: this,
         fields: flattenedFields,
         locale,
+        req,
         where: whereToUse
     });
     transform({
@@ -38,12 +39,12 @@ export const updateVersion = async function updateVersion({ id, collection: coll
     const findOptions = {
         ...baseOptions,
         lean: true,
-        new: true,
         projection: buildProjectionFromSelect({
             adapter: this,
             fields: flattenedFields,
             select
-        })
+        }),
+        returnDocument: 'after'
     };
     if (returning === false) {
         await Model.updateOne(query, versionData, baseOptions);

package/dist/updateVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\n\nimport { buildVersionCollectionFields, type UpdateVersion } 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 updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    locale,\n    options: optionsArgs = {},\n    req,\n    returning,\n    select,\n    versionData,\n    where,\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  const whereToUse = where || { id: { equals: id } }\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  const flattenedFields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  const query = await buildQuery({\n    adapter: this,\n    fields: flattenedFields,\n    locale,\n    where: whereToUse,\n  })\n\n  transform({ adapter: this, data: versionData, fields, operation: 'write' })\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    new: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: flattenedFields,\n      select,\n    }),\n  }\n\n  if (returning === false) {\n    await Model.updateOne(query, versionData, baseOptions)\n    return null\n  }\n\n  const doc = await Model.findOneAndUpdate(query, versionData, findOptions)\n\n  if (!doc) {\n    return null\n  }\n\n  transform({ adapter: this, data: doc, fields, operation: 'read' })\n\n  return doc\n}\n"],"names":["buildVersionCollectionFields","buildQuery","buildProjectionFromSelect","getCollection","getSession","transform","updateVersion","id","collection","collectionSlug","locale","options","optionsArgs","req","returning","select","versionData","where","collectionConfig","Model","adapter","versions","whereToUse","equals","fields","payload","config","flattenedFields","query","data","operation","baseOptions","session","timestamps","findOptions","lean","new","projection","updateOne","doc","findOneAndUpdate"],"mappings":"AAEA,SAASA,4BAA4B,QAA4B,UAAS;AAI1E,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,gBAA+B,eAAeA,cAEzD,EACEC,EAAE,EACFC,YAAYC,cAAc,EAC1BC,MAAM,EACNC,SAASC,cAAc,CAAC,CAAC,EACzBC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,WAAW,EACXC,KAAK,EACN;IAED,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGhB,cAAc;QAChDiB,SAAS,IAAI;QACbX;QACAY,UAAU;IACZ;IAEA,MAAMC,aAAaL,SAAS;QAAEV,IAAI;YAAEgB,QAAQhB;QAAG;IAAE;IACjD,MAAMiB,SAASxB,6BAA6B,IAAI,CAACyB,OAAO,CAACC,MAAM,EAAER;IAEjE,MAAMS,kBAAkB3B,6BAA6B,IAAI,CAACyB,OAAO,CAACC,MAAM,EAAER,kBAAkB;IAE5F,MAAMU,QAAQ,MAAM3B,WAAW;QAC7BmB,SAAS,IAAI;QACbI,QAAQG;QACRjB;QACAO,OAAOK;IACT;IAEAjB,UAAU;QAAEe,SAAS,IAAI;QAAES,MAAMb;QAAaQ;QAAQM,WAAW;IAAQ;IAEzE,MAAMC,cAAc;QAClB,GAAGnB,WAAW;QACdoB,SAAS,MAAM5B,WAAW,IAAI,EAAES;QAChC,uDAAuD;QACvDoB,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,KAAK;QACLC,YAAYnC,0BAA0B;YACpCkB,SAAS,IAAI;YACbI,QAAQG;YACRZ;QACF;IACF;IAEA,IAAID,cAAc,OAAO;QACvB,MAAMK,MAAMmB,SAAS,CAACV,OAAOZ,aAAae;QAC1C,OAAO;IACT;IAEA,MAAMQ,MAAM,MAAMpB,MAAMqB,gBAAgB,CAACZ,OAAOZ,aAAakB;IAE7D,IAAI,CAACK,KAAK;QACR,OAAO;IACT;IAEAlC,UAAU;QAAEe,SAAS,IAAI;QAAES,MAAMU;QAAKf;QAAQM,WAAW;IAAO;IAEhE,OAAOS;AACT,EAAC"}
+{"version":3,"sources":["../src/updateVersion.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\n\nimport { buildVersionCollectionFields, type UpdateVersion } 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 updateVersion: UpdateVersion = async function updateVersion(\n  this: MongooseAdapter,\n  {\n    id,\n    collection: collectionSlug,\n    locale,\n    options: optionsArgs = {},\n    req,\n    returning,\n    select,\n    versionData,\n    where,\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  const whereToUse = where || { id: { equals: id } }\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  const flattenedFields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  const query = await buildQuery({\n    adapter: this,\n    fields: flattenedFields,\n    locale,\n    req,\n    where: whereToUse,\n  })\n\n  transform({ adapter: this, data: versionData, fields, operation: 'write' })\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: flattenedFields,\n      select,\n    }),\n    returnDocument: 'after',\n  }\n\n  if (returning === false) {\n    await Model.updateOne(query, versionData, baseOptions)\n    return null\n  }\n\n  const doc = await Model.findOneAndUpdate(query, versionData, findOptions)\n\n  if (!doc) {\n    return null\n  }\n\n  transform({ adapter: this, data: doc, fields, operation: 'read' })\n\n  return doc\n}\n"],"names":["buildVersionCollectionFields","buildQuery","buildProjectionFromSelect","getCollection","getSession","transform","updateVersion","id","collection","collectionSlug","locale","options","optionsArgs","req","returning","select","versionData","where","collectionConfig","Model","adapter","versions","whereToUse","equals","fields","payload","config","flattenedFields","query","data","operation","baseOptions","session","timestamps","findOptions","lean","projection","returnDocument","updateOne","doc","findOneAndUpdate"],"mappings":"AAEA,SAASA,4BAA4B,QAA4B,UAAS;AAI1E,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,gBAA+B,eAAeA,cAEzD,EACEC,EAAE,EACFC,YAAYC,cAAc,EAC1BC,MAAM,EACNC,SAASC,cAAc,CAAC,CAAC,EACzBC,GAAG,EACHC,SAAS,EACTC,MAAM,EACNC,WAAW,EACXC,KAAK,EACN;IAED,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGhB,cAAc;QAChDiB,SAAS,IAAI;QACbX;QACAY,UAAU;IACZ;IAEA,MAAMC,aAAaL,SAAS;QAAEV,IAAI;YAAEgB,QAAQhB;QAAG;IAAE;IACjD,MAAMiB,SAASxB,6BAA6B,IAAI,CAACyB,OAAO,CAACC,MAAM,EAAER;IAEjE,MAAMS,kBAAkB3B,6BAA6B,IAAI,CAACyB,OAAO,CAACC,MAAM,EAAER,kBAAkB;IAE5F,MAAMU,QAAQ,MAAM3B,WAAW;QAC7BmB,SAAS,IAAI;QACbI,QAAQG;QACRjB;QACAG;QACAI,OAAOK;IACT;IAEAjB,UAAU;QAAEe,SAAS,IAAI;QAAES,MAAMb;QAAaQ;QAAQM,WAAW;IAAQ;IAEzE,MAAMC,cAAc;QAClB,GAAGnB,WAAW;QACdoB,SAAS,MAAM5B,WAAW,IAAI,EAAES;QAChC,uDAAuD;QACvDoB,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,YAAYlC,0BAA0B;YACpCkB,SAAS,IAAI;YACbI,QAAQG;YACRZ;QACF;QACAsB,gBAAgB;IAClB;IAEA,IAAIvB,cAAc,OAAO;QACvB,MAAMK,MAAMmB,SAAS,CAACV,OAAOZ,aAAae;QAC1C,OAAO;IACT;IAEA,MAAMQ,MAAM,MAAMpB,MAAMqB,gBAAgB,CAACZ,OAAOZ,aAAakB;IAE7D,IAAI,CAACK,KAAK;QACR,OAAO;IACT;IAEAlC,UAAU;QAAEe,SAAS,IAAI;QAAES,MAAMU;QAAKf;QAAQM,WAAW;IAAO;IAEhE,OAAOS;AACT,EAAC"}

package/dist/upsertBranchGlobalChange.d.ts

@@ -0,0 +1,3 @@
+import type { UpsertBranchGlobalChange } from 'payload';
+export declare const upsertBranchGlobalChange: UpsertBranchGlobalChange;
+//# sourceMappingURL=upsertBranchGlobalChange.d.ts.map

package/dist/upsertBranchGlobalChange.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"upsertBranchGlobalChange.d.ts","sourceRoot":"","sources":["../src/upsertBranchGlobalChange.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAQvD,eAAO,MAAM,wBAAwB,EAAE,wBAuBpC,CAAA"}

package/dist/upsertBranchGlobalChange.js

@@ -0,0 +1,28 @@
+import { branchChangesCollectionSlug } from 'payload';
+import { getSession } from './utilities/getSession.js';
+export const upsertBranchGlobalChange = async function upsertBranchGlobalChange({ branch, globalSlug, req }) {
+    const Model = this.collections[branchChangesCollectionSlug];
+    const now = new Date().toISOString();
+    if (!Model) {
+        throw new Error(`Collection model "${branchChangesCollectionSlug}" is not initialized.`);
+    }
+    await Model.updateOne({
+        branch,
+        globalSlug
+    }, {
+        $setOnInsert: {
+            branch,
+            createdAt: now,
+            entityType: 'global',
+            globalSlug,
+            operation: 'update',
+            updatedAt: now
+        }
+    }, {
+        session: await getSession(this, req),
+        timestamps: false,
+        upsert: true
+    });
+};
+
+//# sourceMappingURL=upsertBranchGlobalChange.js.map

package/dist/upsertBranchGlobalChange.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/upsertBranchGlobalChange.ts"],"sourcesContent":["import type { UpsertBranchGlobalChange } from 'payload'\n\nimport { branchChangesCollectionSlug } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\n\nexport const upsertBranchGlobalChange: UpsertBranchGlobalChange =\n  async function upsertBranchGlobalChange(this: MongooseAdapter, { branch, globalSlug, req }) {\n    const Model = this.collections[branchChangesCollectionSlug]\n    const now = new Date().toISOString()\n\n    if (!Model) {\n      throw new Error(`Collection model \"${branchChangesCollectionSlug}\" is not initialized.`)\n    }\n\n    await Model.updateOne(\n      { branch, globalSlug },\n      {\n        $setOnInsert: {\n          branch,\n          createdAt: now,\n          entityType: 'global',\n          globalSlug,\n          operation: 'update',\n          updatedAt: now,\n        },\n      },\n      { session: await getSession(this, req), timestamps: false, upsert: true },\n    )\n  }\n"],"names":["branchChangesCollectionSlug","getSession","upsertBranchGlobalChange","branch","globalSlug","req","Model","collections","now","Date","toISOString","Error","updateOne","$setOnInsert","createdAt","entityType","operation","updatedAt","session","timestamps","upsert"],"mappings":"AAEA,SAASA,2BAA2B,QAAQ,UAAS;AAIrD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,2BACX,eAAeA,yBAAgD,EAAEC,MAAM,EAAEC,UAAU,EAAEC,GAAG,EAAE;IACxF,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACP,4BAA4B;IAC3D,MAAMQ,MAAM,IAAIC,OAAOC,WAAW;IAElC,IAAI,CAACJ,OAAO;QACV,MAAM,IAAIK,MAAM,CAAC,kBAAkB,EAAEX,4BAA4B,qBAAqB,CAAC;IACzF;IAEA,MAAMM,MAAMM,SAAS,CACnB;QAAET;QAAQC;IAAW,GACrB;QACES,cAAc;YACZV;YACAW,WAAWN;YACXO,YAAY;YACZX;YACAY,WAAW;YACXC,WAAWT;QACb;IACF,GACA;QAAEU,SAAS,MAAMjB,WAAW,IAAI,EAAEI;QAAMc,YAAY;QAAOC,QAAQ;IAAK;AAE5E,EAAC"}

package/dist/utilities/aggregatePaginate.d.ts

@@ -2,8 +2,9 @@ import type { CollationOptions } from 'mongodb';
 import type { ClientSession, Model, PipelineStage } from 'mongoose';
 import type { PaginatedDocs } from 'payload';
 import type { MongooseAdapter } from '../index.js';
-export declare const aggregatePaginate: ({ adapter, collation, joinAggregation, limit, Model, page, pagination, projection, query, session, sort, sortAggregation, useEstimatedCount, }: {
+export declare const aggregatePaginate: ({ adapter, branchVisibility, collation, joinAggregation, limit, Model, page, pagination, projection, query, session, sort, sortAggregation, useEstimatedCount, }: {
     adapter: MongooseAdapter;
+    branchVisibility?: PipelineStage[];
     collation?: CollationOptions;
     joinAggregation?: PipelineStage[];
     limit?: number;

package/dist/utilities/aggregatePaginate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"aggregatePaginate.d.ts","sourceRoot":"","sources":["../../src/utilities/aggregatePaginate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,eAAO,MAAM,iBAAiB,GAAU,gJAcrC;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,KAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAmF7B,CAAA"}
+{"version":3,"file":"aggregatePaginate.d.ts","sourceRoot":"","sources":["../../src/utilities/aggregatePaginate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACnE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAE5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAElD,eAAO,MAAM,iBAAiB,qKAe3B;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,gBAAgB,CAAC,EAAE,aAAa,EAAE,CAAA;IAClC,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACpC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAC5B,KAAG,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CA+F7B,CAAA"}

package/dist/utilities/aggregatePaginate.js

@@ -1,8 +1,9 @@
-export const aggregatePaginate = async ({ adapter, collation, joinAggregation, limit, Model, page, pagination, projection, query, session, sort, sortAggregation, useEstimatedCount })=>{
+export const aggregatePaginate = async ({ adapter, branchVisibility, collation, joinAggregation, limit, Model, page, pagination, projection, query, session, sort, sortAggregation, useEstimatedCount })=>{
     const aggregation = [
         {
             $match: query
-        }
+        },
+        ...branchVisibility ?? []
     ];
     if (sortAggregation && sortAggregation.length > 0) {
         for (const stage of sortAggregation){
@@ -40,10 +41,25 @@ export const aggregatePaginate = async ({ adapter, collation, joinAggregation, l
     }
     let countPromise = Promise.resolve(null);
     if (pagination !== false && limit) {
-        if (useEstimatedCount) {
+        if (branchVisibility?.length) {
+            countPromise = Model.aggregate([
+                {
+                    $match: query
+                },
+                ...branchVisibility,
+                {
+                    $count: 'count'
+                }
+            ], {
+                collation,
+                session
+            }).then((result)=>result[0]?.count ?? 0);
+        } else if (useEstimatedCount) {
             countPromise = Model.estimatedDocumentCount(query);
         } else {
-            const hint = adapter.disableIndexHints !== true ? {
+            // Only hint the _id index for unfiltered counts. With a filter, MongoDB picks the matching index on its own,
+            // while forcing _id would make it scan the whole collection.
+            const hint = adapter.disableIndexHints !== true && Object.keys(query).length === 0 ? {
                 _id: 1
             } : undefined;
             countPromise = Model.countDocuments(query, {
@@ -63,7 +79,7 @@ export const aggregatePaginate = async ({ adapter, collation, joinAggregation, l
         countPromise
     ]);
     const count = countResult === null ? docs.length : countResult;
-    const totalPages = pagination !== false && typeof limit === 'number' && limit !== 0 ? Math.ceil(count / limit) : 1;
+    const totalPages = pagination !== false && typeof limit === 'number' && limit !== 0 ? Math.max(1, Math.ceil(count / limit)) : 1;
     const hasPrevPage = typeof page === 'number' && pagination !== false && page > 1;
     const hasNextPage = typeof page === 'number' && pagination !== false && totalPages > page;
     const pagingCounter = typeof page === 'number' && pagination !== false && typeof limit === 'number' ? (page - 1) * limit + 1 : 1;

package/dist/utilities/aggregatePaginate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/aggregatePaginate.ts"],"sourcesContent":["import type { CollationOptions } from 'mongodb'\nimport type { ClientSession, Model, PipelineStage } from 'mongoose'\nimport type { PaginatedDocs } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const aggregatePaginate = async ({\n  adapter,\n  collation,\n  joinAggregation,\n  limit,\n  Model,\n  page,\n  pagination,\n  projection,\n  query,\n  session,\n  sort,\n  sortAggregation,\n  useEstimatedCount,\n}: {\n  adapter: MongooseAdapter\n  collation?: CollationOptions\n  joinAggregation?: PipelineStage[]\n  limit?: number\n  Model: Model<any>\n  page?: number\n  pagination?: boolean\n  projection?: Record<string, boolean>\n  query: Record<string, unknown>\n  session?: ClientSession\n  sort?: object\n  sortAggregation?: PipelineStage[]\n  useEstimatedCount?: boolean\n}): Promise<PaginatedDocs<any>> => {\n  const aggregation: PipelineStage[] = [{ $match: query }]\n\n  if (sortAggregation && sortAggregation.length > 0) {\n    for (const stage of sortAggregation) {\n      aggregation.push(stage)\n    }\n  }\n\n  if (sort) {\n    const $sort: Record<string, -1 | 1> = {}\n\n    Object.entries(sort).forEach(([key, value]) => {\n      $sort[key] = value === 'desc' ? -1 : 1\n    })\n\n    aggregation.push({ $sort })\n  }\n\n  if (page) {\n    aggregation.push({ $skip: (page - 1) * (limit ?? 0) })\n  }\n\n  if (limit) {\n    aggregation.push({ $limit: limit })\n  }\n\n  if (joinAggregation) {\n    for (const stage of joinAggregation) {\n      aggregation.push(stage)\n    }\n  }\n\n  if (projection) {\n    aggregation.push({ $project: projection })\n  }\n\n  let countPromise: Promise<null | number> = Promise.resolve(null)\n\n  if (pagination !== false && limit) {\n    if (useEstimatedCount) {\n      countPromise = Model.estimatedDocumentCount(query)\n    } else {\n      const hint = adapter.disableIndexHints !== true ? { _id: 1 } : undefined\n      countPromise = Model.countDocuments(query, {\n        collation,\n        session,\n        ...(hint ? { hint } : {}),\n      })\n    }\n  }\n\n  const [docs, countResult] = await Promise.all([\n    Model.aggregate(aggregation, { collation, session }),\n    countPromise,\n  ])\n\n  const count = countResult === null ? docs.length : countResult\n\n  const totalPages =\n    pagination !== false && typeof limit === 'number' && limit !== 0 ? Math.ceil(count / limit) : 1\n\n  const hasPrevPage = typeof page === 'number' && pagination !== false && page > 1\n  const hasNextPage = typeof page === 'number' && pagination !== false && totalPages > page\n  const pagingCounter =\n    typeof page === 'number' && pagination !== false && typeof limit === 'number'\n      ? (page - 1) * limit + 1\n      : 1\n\n  const result: PaginatedDocs = {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limit ?? 0,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs: count,\n    totalPages,\n  }\n\n  return result\n}\n"],"names":["aggregatePaginate","adapter","collation","joinAggregation","limit","Model","page","pagination","projection","query","session","sort","sortAggregation","useEstimatedCount","aggregation","$match","length","stage","push","$sort","Object","entries","forEach","key","value","$skip","$limit","$project","countPromise","Promise","resolve","estimatedDocumentCount","hint","disableIndexHints","_id","undefined","countDocuments","docs","countResult","all","aggregate","count","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","result","nextPage","prevPage","totalDocs"],"mappings":"AAMA,OAAO,MAAMA,oBAAoB,OAAO,EACtCC,OAAO,EACPC,SAAS,EACTC,eAAe,EACfC,KAAK,EACLC,KAAK,EACLC,IAAI,EACJC,UAAU,EACVC,UAAU,EACVC,KAAK,EACLC,OAAO,EACPC,IAAI,EACJC,eAAe,EACfC,iBAAiB,EAelB;IACC,MAAMC,cAA+B;QAAC;YAAEC,QAAQN;QAAM;KAAE;IAExD,IAAIG,mBAAmBA,gBAAgBI,MAAM,GAAG,GAAG;QACjD,KAAK,MAAMC,SAASL,gBAAiB;YACnCE,YAAYI,IAAI,CAACD;QACnB;IACF;IAEA,IAAIN,MAAM;QACR,MAAMQ,QAAgC,CAAC;QAEvCC,OAAOC,OAAO,CAACV,MAAMW,OAAO,CAAC,CAAC,CAACC,KAAKC,MAAM;YACxCL,KAAK,CAACI,IAAI,GAAGC,UAAU,SAAS,CAAC,IAAI;QACvC;QAEAV,YAAYI,IAAI,CAAC;YAAEC;QAAM;IAC3B;IAEA,IAAIb,MAAM;QACRQ,YAAYI,IAAI,CAAC;YAAEO,OAAO,AAACnB,CAAAA,OAAO,CAAA,IAAMF,CAAAA,SAAS,CAAA;QAAG;IACtD;IAEA,IAAIA,OAAO;QACTU,YAAYI,IAAI,CAAC;YAAEQ,QAAQtB;QAAM;IACnC;IAEA,IAAID,iBAAiB;QACnB,KAAK,MAAMc,SAASd,gBAAiB;YACnCW,YAAYI,IAAI,CAACD;QACnB;IACF;IAEA,IAAIT,YAAY;QACdM,YAAYI,IAAI,CAAC;YAAES,UAAUnB;QAAW;IAC1C;IAEA,IAAIoB,eAAuCC,QAAQC,OAAO,CAAC;IAE3D,IAAIvB,eAAe,SAASH,OAAO;QACjC,IAAIS,mBAAmB;YACrBe,eAAevB,MAAM0B,sBAAsB,CAACtB;QAC9C,OAAO;YACL,MAAMuB,OAAO/B,QAAQgC,iBAAiB,KAAK,OAAO;gBAAEC,KAAK;YAAE,IAAIC;YAC/DP,eAAevB,MAAM+B,cAAc,CAAC3B,OAAO;gBACzCP;gBACAQ;gBACA,GAAIsB,OAAO;oBAAEA;gBAAK,IAAI,CAAC,CAAC;YAC1B;QACF;IACF;IAEA,MAAM,CAACK,MAAMC,YAAY,GAAG,MAAMT,QAAQU,GAAG,CAAC;QAC5ClC,MAAMmC,SAAS,CAAC1B,aAAa;YAAEZ;YAAWQ;QAAQ;QAClDkB;KACD;IAED,MAAMa,QAAQH,gBAAgB,OAAOD,KAAKrB,MAAM,GAAGsB;IAEnD,MAAMI,aACJnC,eAAe,SAAS,OAAOH,UAAU,YAAYA,UAAU,IAAIuC,KAAKC,IAAI,CAACH,QAAQrC,SAAS;IAEhG,MAAMyC,cAAc,OAAOvC,SAAS,YAAYC,eAAe,SAASD,OAAO;IAC/E,MAAMwC,cAAc,OAAOxC,SAAS,YAAYC,eAAe,SAASmC,aAAapC;IACrF,MAAMyC,gBACJ,OAAOzC,SAAS,YAAYC,eAAe,SAAS,OAAOH,UAAU,WACjE,AAACE,CAAAA,OAAO,CAAA,IAAKF,QAAQ,IACrB;IAEN,MAAM4C,SAAwB;QAC5BX;QACAS;QACAD;QACAzC,OAAOA,SAAS;QAChB6C,UAAUH,cAAcxC,OAAO,IAAI;QACnCA;QACAyC;QACAG,UAAUL,cAAcvC,OAAO,IAAI;QACnC6C,WAAWV;QACXC;IACF;IAEA,OAAOM;AACT,EAAC"}
+{"version":3,"sources":["../../src/utilities/aggregatePaginate.ts"],"sourcesContent":["import type { CollationOptions } from 'mongodb'\nimport type { ClientSession, Model, PipelineStage } from 'mongoose'\nimport type { PaginatedDocs } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const aggregatePaginate = async ({\n  adapter,\n  branchVisibility,\n  collation,\n  joinAggregation,\n  limit,\n  Model,\n  page,\n  pagination,\n  projection,\n  query,\n  session,\n  sort,\n  sortAggregation,\n  useEstimatedCount,\n}: {\n  adapter: MongooseAdapter\n  branchVisibility?: PipelineStage[]\n  collation?: CollationOptions\n  joinAggregation?: PipelineStage[]\n  limit?: number\n  Model: Model<any>\n  page?: number\n  pagination?: boolean\n  projection?: Record<string, boolean>\n  query: Record<string, unknown>\n  session?: ClientSession\n  sort?: object\n  sortAggregation?: PipelineStage[]\n  useEstimatedCount?: boolean\n}): Promise<PaginatedDocs<any>> => {\n  const aggregation: PipelineStage[] = [{ $match: query }, ...(branchVisibility ?? [])]\n\n  if (sortAggregation && sortAggregation.length > 0) {\n    for (const stage of sortAggregation) {\n      aggregation.push(stage)\n    }\n  }\n\n  if (sort) {\n    const $sort: Record<string, -1 | 1> = {}\n\n    Object.entries(sort).forEach(([key, value]) => {\n      $sort[key] = value === 'desc' ? -1 : 1\n    })\n\n    aggregation.push({ $sort })\n  }\n\n  if (page) {\n    aggregation.push({ $skip: (page - 1) * (limit ?? 0) })\n  }\n\n  if (limit) {\n    aggregation.push({ $limit: limit })\n  }\n\n  if (joinAggregation) {\n    for (const stage of joinAggregation) {\n      aggregation.push(stage)\n    }\n  }\n\n  if (projection) {\n    aggregation.push({ $project: projection })\n  }\n\n  let countPromise: Promise<null | number> = Promise.resolve(null)\n\n  if (pagination !== false && limit) {\n    if (branchVisibility?.length) {\n      countPromise = Model.aggregate(\n        [{ $match: query }, ...branchVisibility, { $count: 'count' }],\n        { collation, session },\n      ).then((result) => result[0]?.count ?? 0)\n    } else if (useEstimatedCount) {\n      countPromise = Model.estimatedDocumentCount(query)\n    } else {\n      // Only hint the _id index for unfiltered counts. With a filter, MongoDB picks the matching index on its own,\n      // while forcing _id would make it scan the whole collection.\n      const hint =\n        adapter.disableIndexHints !== true && Object.keys(query).length === 0\n          ? { _id: 1 }\n          : undefined\n      countPromise = Model.countDocuments(query, {\n        collation,\n        session,\n        ...(hint ? { hint } : {}),\n      })\n    }\n  }\n\n  const [docs, countResult] = await Promise.all([\n    Model.aggregate(aggregation, { collation, session }),\n    countPromise,\n  ])\n\n  const count = countResult === null ? docs.length : countResult\n\n  const totalPages =\n    pagination !== false && typeof limit === 'number' && limit !== 0\n      ? Math.max(1, Math.ceil(count / limit))\n      : 1\n\n  const hasPrevPage = typeof page === 'number' && pagination !== false && page > 1\n  const hasNextPage = typeof page === 'number' && pagination !== false && totalPages > page\n  const pagingCounter =\n    typeof page === 'number' && pagination !== false && typeof limit === 'number'\n      ? (page - 1) * limit + 1\n      : 1\n\n  const result: PaginatedDocs = {\n    docs,\n    hasNextPage,\n    hasPrevPage,\n    limit: limit ?? 0,\n    nextPage: hasNextPage ? page + 1 : null,\n    page,\n    pagingCounter,\n    prevPage: hasPrevPage ? page - 1 : null,\n    totalDocs: count,\n    totalPages,\n  }\n\n  return result\n}\n"],"names":["aggregatePaginate","adapter","branchVisibility","collation","joinAggregation","limit","Model","page","pagination","projection","query","session","sort","sortAggregation","useEstimatedCount","aggregation","$match","length","stage","push","$sort","Object","entries","forEach","key","value","$skip","$limit","$project","countPromise","Promise","resolve","aggregate","$count","then","result","count","estimatedDocumentCount","hint","disableIndexHints","keys","_id","undefined","countDocuments","docs","countResult","all","totalPages","Math","max","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage","totalDocs"],"mappings":"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"}

package/dist/utilities/buildJoinAggregation.d.ts

@@ -1,8 +1,9 @@
 import type { PipelineStage } from 'mongoose';
-import { type CollectionSlug, type JoinQuery, type SanitizedCollectionConfig } from 'payload';
+import { type CollectionSlug, type JoinQuery, type PayloadRequest, type SanitizedCollectionConfig } from 'payload';
 import type { MongooseAdapter } from '../index.js';
 type BuildJoinAggregationArgs = {
     adapter: MongooseAdapter;
+    branch?: false | string;
     collection: CollectionSlug;
     collectionConfig: SanitizedCollectionConfig;
     draftsEnabled?: boolean;
@@ -10,9 +11,10 @@ type BuildJoinAggregationArgs = {
     locale?: string;
     projection?: Record<string, true>;
     query?: Record<string, unknown>;
+    req?: Partial<PayloadRequest>;
     /** whether the query is from drafts */
     versions?: boolean;
 };
-export declare const buildJoinAggregation: ({ adapter, collection, collectionConfig, draftsEnabled, joins, locale, projection, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
+export declare const buildJoinAggregation: ({ adapter, branch, collection, collectionConfig, draftsEnabled, joins, locale, projection, req, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[]>;
 export {};
 //# sourceMappingURL=buildJoinAggregation.d.ts.map

package/dist/utilities/buildJoinAggregation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildJoinAggregation.d.ts","sourceRoot":"","sources":["../../src/utilities/buildJoinAggregation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAIL,KAAK,cAAc,EAInB,KAAK,SAAS,EACd,KAAK,yBAAyB,EAC/B,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAOlD,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,cAAc,CAAA;IAC1B,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAU,gGASxC,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CA0chE,CAAA"}
+{"version":3,"file":"buildJoinAggregation.d.ts","sourceRoot":"","sources":["../../src/utilities/buildJoinAggregation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAIL,KAAK,cAAc,EAKnB,KAAK,SAAS,EACd,KAAK,cAAc,EAKnB,KAAK,yBAAyB,EAE/B,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAQlD,KAAK,wBAAwB,GAAG;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,UAAU,EAAE,cAAc,CAAA;IAC1B,gBAAgB,EAAE,yBAAyB,CAAA;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,gHAW9B,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,CAuiBpD,CAAA"}

package/dist/utilities/buildJoinAggregation.js

@@ -1,14 +1,15 @@
-import { APIError, appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getQueryDraftsSort } from 'payload';
+import { APIError, appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getBranchPredicateSync, getQueryDraftsSort, resolveBranchReadState, resolveBranchVersionQuery, rewriteBranchIDs, rewriteBranchVersionParents } from 'payload';
 import { fieldShouldBeLocalized, hasDraftsEnabled } from 'payload/shared';
+import { buildBranchVisibilityStages } from '../queries/buildBranchVisibility.js';
 import { buildQuery } from '../queries/buildQuery.js';
 import { buildSortParam } from '../queries/buildSortParam.js';
 import { getCollection } from './getEntity.js';
-export const buildJoinAggregation = async ({ adapter, collection, collectionConfig, draftsEnabled, joins, locale, projection, versions })=>{
+export const buildJoinAggregation = async ({ adapter, branch, collection, collectionConfig, draftsEnabled, joins, locale, projection, req, versions })=>{
     if (!adapter.useJoinAggregations) {
-        return;
+        return [];
     }
     if (Object.keys(collectionConfig.joins).length === 0 && collectionConfig.polymorphicJoins.length == 0 || joins === false) {
-        return;
+        return [];
     }
     const joinConfig = adapter.payload.collections[collection]?.config?.joins;
     if (!joinConfig) {
@@ -49,8 +50,10 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
         });
         const $match = await buildQuery({
             adapter,
+            branch,
             fields: aggregatedFields,
             locale,
+            req,
             where: whereJoin
         });
         const sortProperty = Object.keys(sort)[0]// assert because buildSortParam always returns at least 1 key.
@@ -62,6 +65,29 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
         for (const collectionSlug of join.field.collection){
             const alias = `${as}.docs.${collectionSlug}`;
             aliases.push(alias);
+            const joinBranchPredicate = getBranchPredicateSync({
+                branch,
+                collectionSlug,
+                req
+            });
+            const joinBranchReadState = resolveBranchReadState({
+                branch,
+                collectionSlug,
+                req
+            });
+            const branchMatch = joinBranchPredicate ? await buildQuery({
+                adapter,
+                branch,
+                fields: adapter.payload.collections[collectionSlug].config.flattenedFields,
+                locale,
+                req,
+                where: joinBranchPredicate
+            }) : undefined;
+            const branchVisibility = joinBranchReadState.useBranching ? buildBranchVisibilityStages({
+                adapter,
+                branch: joinBranchReadState.branch,
+                collectionSlug
+            }) : [];
             const basePipeline = [
                 {
                     $addFields: {
@@ -81,10 +107,26 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                                     ]
                                 }
                             },
-                            $match
+                            $match,
+                            ...branchMatch ? [
+                                branchMatch
+                            ] : []
                         ]
                     }
-                }
+                },
+                ...branchVisibility,
+                ...joinBranchPredicate || branchVisibility.length ? [
+                    {
+                        $set: {
+                            _id: {
+                                $ifNull: [
+                                    '$_branchDocID',
+                                    '$_id'
+                                ]
+                            }
+                        }
+                    }
+                ] : []
             ];
             const { Model: JoinModel } = getCollection({
                 adapter,
@@ -104,10 +146,12 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                                 [sortProperty]: sortDirection
                             }
                         },
-                        {
-                            // Unfortunately, we can't use $skip here because we can lose data, instead we do $slice then
-                            $limit: page ? page * limitJoin : limitJoin
-                        },
+                        ...limitJoin > 0 ? [
+                            {
+                                // Unfortunately, we can't use $skip here because we can lose data, instead we do $slice then
+                                $limit: page ? page * limitJoin : limitJoin
+                            }
+                        ] : [],
                         {
                             $project: {
                                 value: '$_id',
@@ -191,16 +235,18 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                 }
             }
         });
-        aggregate.push({
-            $set: {
-                [`${as}.docs`]: {
-                    $slice: [
-                        `$${as}.docs`,
-                        ...sliceValue
-                    ]
+        if (limitJoin > 0) {
+            aggregate.push({
+                $set: {
+                    [`${as}.docs`]: {
+                        $slice: [
+                            `$${as}.docs`,
+                            ...sliceValue
+                        ]
+                    }
                 }
-            }
-        });
+            });
+        }
     }
     for (const slug of Object.keys(joinConfig)){
         const joinsList = joinConfig[slug];
@@ -247,19 +293,75 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
             });
             const sortProperty = Object.keys(sort)[0];
             const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1;
+            // A join subquery must carry the same branch predicate as the top-level
+            // read, or a branch would see main's related documents.
+            const joinBranchPredicate = getBranchPredicateSync({
+                branch,
+                collectionSlug: collectionConfig.slug,
+                req
+            });
+            const joinBranchReadState = resolveBranchReadState({
+                branch,
+                collectionSlug: collectionConfig.slug,
+                req
+            });
+            const resolvedWhereJoin = useDrafts ? joinBranchReadState.useBranching ? rewriteBranchVersionParents(appendVersionToQueryKey(whereJoin)) ?? {} : await resolveBranchVersionQuery({
+                branch,
+                collectionSlug: collectionConfig.slug,
+                req,
+                where: appendVersionToQueryKey(whereJoin)
+            }) ?? {} : joinBranchReadState.useBranching ? rewriteBranchIDs(whereJoin) ?? {} : joinBranchPredicate ? {
+                and: [
+                    whereJoin,
+                    joinBranchPredicate
+                ]
+            } : whereJoin;
             const $match = await JoinModel.buildQuery({
+                branch,
                 locale,
                 payload: adapter.payload,
-                where: useDrafts ? combineQueries(appendVersionToQueryKey(whereJoin), {
+                req,
+                where: useDrafts ? combineQueries(resolvedWhereJoin, {
                     latest: {
                         equals: true
                     }
-                }) : whereJoin
+                }) : resolvedWhereJoin
             });
+            const branchVisibility = joinBranchReadState.useBranching ? buildBranchVisibilityStages({
+                adapter,
+                branch: joinBranchReadState.branch,
+                collectionSlug: collectionConfig.slug,
+                mode: useDrafts ? 'drafts' : 'documents'
+            }) : [];
             const pipeline = [
                 {
                     $match
                 },
+                ...branchVisibility,
+                // Surface the canonical document ID rather than the shadow row's own
+                // primary key, so join results address documents the same way every
+                // other read does.
+                ...joinBranchPredicate || branchVisibility.length ? [
+                    useDrafts ? {
+                        $set: {
+                            parent: {
+                                $ifNull: [
+                                    '$_branchParent',
+                                    '$parent'
+                                ]
+                            }
+                        }
+                    } : {
+                        $set: {
+                            _id: {
+                                $ifNull: [
+                                    '$_branchDocID',
+                                    '$_id'
+                                ]
+                            }
+                        }
+                    }
+                ] : [],
                 {
                     $sort: {
                         [sortProperty]: sortDirection
@@ -290,6 +392,7 @@ export const buildJoinAggregation = async ({ adapter, collection, collectionConf
                             {
                                 $match
                             },
+                            ...branchVisibility,
                             {
                                 $count: 'result'
                             }