@payloadcms/db-mongodb 4.0.0-internal.532221d → 4.0.0-internal.567a487

package/dist/updateGlobal.js

@@ -1,8 +1,9 @@
+import { recordBranchGlobalChange, resolveBranchGlobalWrite } from 'payload';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getGlobal } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { transform } from './utilities/transform.js';
-export const updateGlobal = async function updateGlobal({ slug: globalSlug, data, options: optionsArgs = {}, req, returning, select }) {
+export const updateGlobal = async function updateGlobal({ slug: globalSlug, branch, data, options: optionsArgs = {}, req, returning, select }) {
     const { globalConfig, Model } = getGlobal({
         adapter: this,
         globalSlug
@@ -31,15 +32,75 @@ export const updateGlobal = async function updateGlobal({ slug: globalSlug, data
             select
         })
     };
+    const writeBranch = resolveBranchGlobalWrite({
+        branch,
+        globalSlug,
+        req
+    });
+    // On a branch the write targets that branch's own row, upserting it from
+    // main's current content the first time the global is touched.
+    const filter = writeBranch ? {
+        _branch: {
+            $eq: writeBranch
+        },
+        globalType: globalSlug
+    } : {
+        globalType: globalSlug
+    };
+    if (writeBranch) {
+        const existing = await Model.findOne(filter, {}, baseOptions).lean();
+        if (!existing) {
+            const mainDoc = await Model.findOne({
+                _branch: {
+                    $eq: 'main'
+                },
+                globalType: globalSlug
+            }, {}, baseOptions).lean();
+            const { _id, __v, ...mainData } = mainDoc ?? {};
+            await Model.create([
+                {
+                    ...mainData,
+                    ...data,
+                    _branch: writeBranch
+                }
+            ], baseOptions, req);
+            await recordBranchGlobalChange({
+                branch: writeBranch,
+                globalSlug,
+                req
+            });
+            if (returning === false) {
+                return null;
+            }
+            const created = await Model.findOne(filter, findOptions.projection, findOptions);
+            transform({
+                adapter: this,
+                data: created,
+                fields,
+                globalSlug,
+                operation: 'read'
+            });
+            return created;
+        }
+        await recordBranchGlobalChange({
+            branch: writeBranch,
+            globalSlug,
+            req
+        });
+    }
+    // `_branch` is forced rather than taken from `data`. The incoming document is a
+    // round-trip of a read, and `_branch` is stripped from reads — so the field's
+    // `main` default silently refills it, and writing that back would flip the
+    // branch's row onto main and leave two rows claiming to be production.
+    const writeData = writeBranch ? {
+        ...data,
+        _branch: writeBranch
+    } : data;
     if (returning === false) {
-        await Model.updateOne({
-            globalType: globalSlug
-        }, data, baseOptions);
+        await Model.updateOne(filter, writeData, baseOptions);
         return null;
     }
-    const result = await Model.findOneAndUpdate({
-        globalType: globalSlug
-    }, data, findOptions);
+    const result = await Model.findOneAndUpdate(filter, writeData, findOptions);
     transform({
         adapter: this,
         data: result,

package/dist/updateGlobal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateGlobal.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { UpdateGlobal } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateGlobal: UpdateGlobal = async function updateGlobal(\n  this: MongooseAdapter,\n  { slug: globalSlug, data, options: optionsArgs = {}, req, returning, select },\n) {\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug })\n\n  const fields = globalConfig.fields\n\n  transform({ adapter: this, data, fields, globalSlug, 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: globalConfig.flattenedFields,\n      select,\n    }),\n  }\n\n  if (returning === false) {\n    await Model.updateOne({ globalType: globalSlug }, data, baseOptions)\n    return null\n  }\n\n  const result: any = await Model.findOneAndUpdate({ globalType: globalSlug }, data, findOptions)\n\n  transform({ adapter: this, data: result, fields, globalSlug, operation: 'read' })\n\n  return result\n}\n"],"names":["buildProjectionFromSelect","getGlobal","getSession","transform","updateGlobal","slug","globalSlug","data","options","optionsArgs","req","returning","select","globalConfig","Model","adapter","fields","operation","baseOptions","session","timestamps","findOptions","lean","new","projection","flattenedFields","updateOne","globalType","result","findOneAndUpdate"],"mappings":"AAKA,SAASA,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EAAEC,MAAMC,UAAU,EAAEC,IAAI,EAAEC,SAASC,cAAc,CAAC,CAAC,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAE;IAE7E,MAAM,EAAEC,YAAY,EAAEC,KAAK,EAAE,GAAGb,UAAU;QAAEc,SAAS,IAAI;QAAET;IAAW;IAEtE,MAAMU,SAASH,aAAaG,MAAM;IAElCb,UAAU;QAAEY,SAAS,IAAI;QAAER;QAAMS;QAAQV;QAAYW,WAAW;IAAQ;IAExE,MAAMC,cAAc;QAClB,GAAGT,WAAW;QACdU,SAAS,MAAMjB,WAAW,IAAI,EAAEQ;QAChC,uDAAuD;QACvDU,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,KAAK;QACLC,YAAYxB,0BAA0B;YACpCe,SAAS,IAAI;YACbC,QAAQH,aAAaY,eAAe;YACpCb;QACF;IACF;IAEA,IAAID,cAAc,OAAO;QACvB,MAAMG,MAAMY,SAAS,CAAC;YAAEC,YAAYrB;QAAW,GAAGC,MAAMW;QACxD,OAAO;IACT;IAEA,MAAMU,SAAc,MAAMd,MAAMe,gBAAgB,CAAC;QAAEF,YAAYrB;IAAW,GAAGC,MAAMc;IAEnFlB,UAAU;QAAEY,SAAS,IAAI;QAAER,MAAMqB;QAAQZ;QAAQV;QAAYW,WAAW;IAAO;IAE/E,OAAOW;AACT,EAAC"}
+{"version":3,"sources":["../src/updateGlobal.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { UpdateGlobal } from 'payload'\n\nimport { recordBranchGlobalChange, resolveBranchGlobalWrite } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateGlobal: UpdateGlobal = async function updateGlobal(\n  this: MongooseAdapter,\n  { slug: globalSlug, branch, data, options: optionsArgs = {}, req, returning, select },\n) {\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug })\n\n  const fields = globalConfig.fields\n\n  transform({ adapter: this, data, fields, globalSlug, 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: globalConfig.flattenedFields,\n      select,\n    }),\n  }\n\n  const writeBranch = resolveBranchGlobalWrite({ branch, globalSlug, req })\n\n  // On a branch the write targets that branch's own row, upserting it from\n  // main's current content the first time the global is touched.\n  const filter = writeBranch\n    ? { _branch: { $eq: writeBranch }, globalType: globalSlug }\n    : { globalType: globalSlug }\n\n  if (writeBranch) {\n    const existing = await Model.findOne(filter, {}, baseOptions).lean()\n\n    if (!existing) {\n      const mainDoc: any = await Model.findOne(\n        { _branch: { $eq: 'main' }, globalType: globalSlug },\n        {},\n        baseOptions,\n      ).lean()\n      const { _id, __v, ...mainData } = (mainDoc ?? {}) as Record<string, unknown>\n\n      await Model.create([{ ...mainData, ...data, _branch: writeBranch }], baseOptions, req)\n      await recordBranchGlobalChange({ branch: writeBranch, globalSlug, req })\n\n      if (returning === false) {\n        return null\n      }\n\n      const created: any = await Model.findOne(filter, findOptions.projection, findOptions)\n\n      transform({ adapter: this, data: created, fields, globalSlug, operation: 'read' })\n\n      return created\n    }\n\n    await recordBranchGlobalChange({ branch: writeBranch, globalSlug, req })\n  }\n\n  // `_branch` is forced rather than taken from `data`. The incoming document is a\n  // round-trip of a read, and `_branch` is stripped from reads — so the field's\n  // `main` default silently refills it, and writing that back would flip the\n  // branch's row onto main and leave two rows claiming to be production.\n  const writeData = writeBranch ? { ...(data as object), _branch: writeBranch } : data\n\n  if (returning === false) {\n    await Model.updateOne(filter, writeData, baseOptions)\n    return null\n  }\n\n  const result: any = await Model.findOneAndUpdate(filter, writeData, findOptions)\n\n  transform({ adapter: this, data: result, fields, globalSlug, operation: 'read' })\n\n  return result\n}\n"],"names":["recordBranchGlobalChange","resolveBranchGlobalWrite","buildProjectionFromSelect","getGlobal","getSession","transform","updateGlobal","slug","globalSlug","branch","data","options","optionsArgs","req","returning","select","globalConfig","Model","adapter","fields","operation","baseOptions","session","timestamps","findOptions","lean","new","projection","flattenedFields","writeBranch","filter","_branch","$eq","globalType","existing","findOne","mainDoc","_id","__v","mainData","create","created","writeData","updateOne","result","findOneAndUpdate"],"mappings":"AAGA,SAASA,wBAAwB,EAAEC,wBAAwB,QAAQ,UAAS;AAI5E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EAAEC,MAAMC,UAAU,EAAEC,MAAM,EAAEC,IAAI,EAAEC,SAASC,cAAc,CAAC,CAAC,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAE;IAErF,MAAM,EAAEC,YAAY,EAAEC,KAAK,EAAE,GAAGd,UAAU;QAAEe,SAAS,IAAI;QAAEV;IAAW;IAEtE,MAAMW,SAASH,aAAaG,MAAM;IAElCd,UAAU;QAAEa,SAAS,IAAI;QAAER;QAAMS;QAAQX;QAAYY,WAAW;IAAQ;IAExE,MAAMC,cAAc;QAClB,GAAGT,WAAW;QACdU,SAAS,MAAMlB,WAAW,IAAI,EAAES;QAChC,uDAAuD;QACvDU,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,KAAK;QACLC,YAAYzB,0BAA0B;YACpCgB,SAAS,IAAI;YACbC,QAAQH,aAAaY,eAAe;YACpCb;QACF;IACF;IAEA,MAAMc,cAAc5B,yBAAyB;QAAEQ;QAAQD;QAAYK;IAAI;IAEvE,yEAAyE;IACzE,+DAA+D;IAC/D,MAAMiB,SAASD,cACX;QAAEE,SAAS;YAAEC,KAAKH;QAAY;QAAGI,YAAYzB;IAAW,IACxD;QAAEyB,YAAYzB;IAAW;IAE7B,IAAIqB,aAAa;QACf,MAAMK,WAAW,MAAMjB,MAAMkB,OAAO,CAACL,QAAQ,CAAC,GAAGT,aAAaI,IAAI;QAElE,IAAI,CAACS,UAAU;YACb,MAAME,UAAe,MAAMnB,MAAMkB,OAAO,CACtC;gBAAEJ,SAAS;oBAAEC,KAAK;gBAAO;gBAAGC,YAAYzB;YAAW,GACnD,CAAC,GACDa,aACAI,IAAI;YACN,MAAM,EAAEY,GAAG,EAAEC,GAAG,EAAE,GAAGC,UAAU,GAAIH,WAAW,CAAC;YAE/C,MAAMnB,MAAMuB,MAAM,CAAC;gBAAC;oBAAE,GAAGD,QAAQ;oBAAE,GAAG7B,IAAI;oBAAEqB,SAASF;gBAAY;aAAE,EAAER,aAAaR;YAClF,MAAMb,yBAAyB;gBAAES,QAAQoB;gBAAarB;gBAAYK;YAAI;YAEtE,IAAIC,cAAc,OAAO;gBACvB,OAAO;YACT;YAEA,MAAM2B,UAAe,MAAMxB,MAAMkB,OAAO,CAACL,QAAQN,YAAYG,UAAU,EAAEH;YAEzEnB,UAAU;gBAAEa,SAAS,IAAI;gBAAER,MAAM+B;gBAAStB;gBAAQX;gBAAYY,WAAW;YAAO;YAEhF,OAAOqB;QACT;QAEA,MAAMzC,yBAAyB;YAAES,QAAQoB;YAAarB;YAAYK;QAAI;IACxE;IAEA,gFAAgF;IAChF,8EAA8E;IAC9E,2EAA2E;IAC3E,uEAAuE;IACvE,MAAM6B,YAAYb,cAAc;QAAE,GAAInB,IAAI;QAAaqB,SAASF;IAAY,IAAInB;IAEhF,IAAII,cAAc,OAAO;QACvB,MAAMG,MAAM0B,SAAS,CAACb,QAAQY,WAAWrB;QACzC,OAAO;IACT;IAEA,MAAMuB,SAAc,MAAM3B,MAAM4B,gBAAgB,CAACf,QAAQY,WAAWlB;IAEpEnB,UAAU;QAAEa,SAAS,IAAI;QAAER,MAAMkC;QAAQzB;QAAQX;QAAYY,WAAW;IAAO;IAE/E,OAAOwB;AACT,EAAC"}

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,SAqHvB,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
@@ -68,7 +77,12 @@ export const updateOne = async function updateOne({ id, collection: collectionSl
         projection: buildProjectionFromSelect({
             adapter: this,
             fields: collectionConfig.flattenedFields,
-            select
+            select: withBranchIDSelect({
+                branch,
+                collectionSlug,
+                req,
+                select
+            })
         })
     };
     try {
@@ -100,6 +114,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    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: withBranchIDSelect({ branch, collectionSlug, req, 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  // 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","new","projection","findOneAndUpdate","error","docs"],"mappings":"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"}

package/dist/utilities/buildJoinAggregation.d.ts

@@ -1,5 +1,5 @@
 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;
@@ -10,9 +10,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, collection, collectionConfig, draftsEnabled, joins, locale, projection, req, versions, }: BuildJoinAggregationArgs) => Promise<PipelineStage[] | undefined>;
 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,mGAS9B,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,EACnB,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,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,uCAAuC;IACvC,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,oBAAoB,wGAU9B,wBAAwB,KAAG,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CA8dhE,CAAA"}

package/dist/utilities/buildJoinAggregation.js

@@ -1,9 +1,9 @@
-import { APIError, appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getQueryDraftsSort } from 'payload';
+import { APIError, appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getBranchPredicateSync, getQueryDraftsSort } from 'payload';
 import { fieldShouldBeLocalized, hasDraftsEnabled } from 'payload/shared';
 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, collection, collectionConfig, draftsEnabled, joins, locale, projection, req, versions })=>{
     if (!adapter.useJoinAggregations) {
         return;
     }
@@ -247,19 +247,46 @@ 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({
+                collectionSlug: collectionConfig.slug,
+                req
+            });
+            const branchedWhereJoin = joinBranchPredicate ? {
+                and: [
+                    whereJoin,
+                    joinBranchPredicate
+                ]
+            } : whereJoin;
             const $match = await JoinModel.buildQuery({
                 locale,
                 payload: adapter.payload,
-                where: useDrafts ? combineQueries(appendVersionToQueryKey(whereJoin), {
+                where: useDrafts ? combineQueries(appendVersionToQueryKey(branchedWhereJoin), {
                     latest: {
                         equals: true
                     }
-                }) : whereJoin
+                }) : branchedWhereJoin
             });
             const pipeline = [
                 {
                     $match
                 },
+                // 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 ? [
+                    {
+                        $set: {
+                            _id: {
+                                $ifNull: [
+                                    '$_branchDocID',
+                                    '$_id'
+                                ]
+                            }
+                        }
+                    }
+                ] : [],
                 {
                     $sort: {
                         [sortProperty]: sortDirection

package/dist/utilities/buildJoinAggregation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/buildJoinAggregation.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport {\n  APIError,\n  appendVersionToQueryKey,\n  buildVersionCollectionFields,\n  type CollectionSlug,\n  combineQueries,\n  type FlattenedField,\n  getQueryDraftsSort,\n  type JoinQuery,\n  type SanitizedCollectionConfig,\n} from 'payload'\nimport { fieldShouldBeLocalized, hasDraftsEnabled } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\nimport type { CollectionModel } from '../types.js'\n\nimport { buildQuery } from '../queries/buildQuery.js'\nimport { buildSortParam } from '../queries/buildSortParam.js'\nimport { getCollection } from './getEntity.js'\n\ntype BuildJoinAggregationArgs = {\n  adapter: MongooseAdapter\n  collection: CollectionSlug\n  collectionConfig: SanitizedCollectionConfig\n  draftsEnabled?: boolean\n  joins?: JoinQuery\n  locale?: string\n  projection?: Record<string, true>\n  // the where clause for the top collection\n  query?: Record<string, unknown>\n  /** whether the query is from drafts */\n  versions?: boolean\n}\n\nexport const buildJoinAggregation = async ({\n  adapter,\n  collection,\n  collectionConfig,\n  draftsEnabled,\n  joins,\n  locale,\n  projection,\n  versions,\n}: BuildJoinAggregationArgs): Promise<PipelineStage[] | undefined> => {\n  if (!adapter.useJoinAggregations) {\n    return\n  }\n  if (\n    (Object.keys(collectionConfig.joins).length === 0 &&\n      collectionConfig.polymorphicJoins.length == 0) ||\n    joins === false\n  ) {\n    return\n  }\n\n  const joinConfig = adapter.payload.collections[collection]?.config?.joins\n\n  if (!joinConfig) {\n    throw new APIError(`Could not retrieve sanitized join config for ${collection}.`)\n  }\n\n  const aggregate: PipelineStage[] = []\n  const polymorphicJoinsConfig = adapter.payload.collections[collection]?.config?.polymorphicJoins\n\n  if (!polymorphicJoinsConfig) {\n    throw new APIError(`Could not retrieve sanitized polymorphic joins config for ${collection}.`)\n  }\n\n  for (const join of polymorphicJoinsConfig) {\n    if (projection && !projection[join.joinPath]) {\n      continue\n    }\n\n    if (joins?.[join.joinPath] === false) {\n      continue\n    }\n\n    const {\n      count = false,\n      limit: limitJoin = join.field.defaultLimit ?? 10,\n      page,\n      sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n      where: whereJoin = {},\n    } = joins?.[join.joinPath] || {}\n\n    const aggregatedFields: FlattenedField[] = []\n    for (const collectionSlug of join.field.collection) {\n      const { collectionConfig } = getCollection({ adapter, collectionSlug })\n\n      for (const field of collectionConfig.flattenedFields) {\n        if (!aggregatedFields.some((eachField) => eachField.name === field.name)) {\n          aggregatedFields.push(field)\n        }\n      }\n    }\n\n    const sort = buildSortParam({\n      adapter,\n      config: adapter.payload.config,\n      fields: aggregatedFields,\n      locale,\n      sort: sortJoin,\n      timestamps: true,\n    })\n\n    const $match = await buildQuery({\n      adapter,\n      fields: aggregatedFields,\n      locale,\n      where: whereJoin,\n    })\n\n    const sortProperty = Object.keys(sort)[0]! // assert because buildSortParam always returns at least 1 key.\n    const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n    const projectSort = sortProperty !== '_id' && sortProperty !== 'relationTo'\n\n    const aliases: string[] = []\n\n    const as = join.joinPath\n\n    for (const collectionSlug of join.field.collection) {\n      const alias = `${as}.docs.${collectionSlug}`\n      aliases.push(alias)\n\n      const basePipeline = [\n        {\n          $addFields: {\n            relationTo: {\n              $literal: collectionSlug,\n            },\n          },\n        },\n        {\n          $match: {\n            $and: [\n              {\n                $expr: {\n                  $eq: [`$${join.field.on}`, '$$root_id_'],\n                },\n              },\n              $match,\n            ],\n          },\n        },\n      ]\n\n      const { Model: JoinModel } = getCollection({ adapter, collectionSlug })\n\n      aggregate.push({\n        $lookup: {\n          as: alias,\n          from: JoinModel.collection.name,\n          let: {\n            root_id_: '$_id',\n          },\n          pipeline: [\n            ...basePipeline,\n            {\n              $sort: {\n                [sortProperty]: sortDirection,\n              },\n            },\n            {\n              // Unfortunately, we can't use $skip here because we can lose data, instead we do $slice then\n              $limit: page ? page * limitJoin : limitJoin,\n            },\n            {\n              $project: {\n                value: '$_id',\n                ...(projectSort && {\n                  [sortProperty]: 1,\n                }),\n                relationTo: 1,\n              },\n            },\n          ],\n        },\n      })\n\n      if (count) {\n        aggregate.push({\n          $lookup: {\n            as: `${as}.totalDocs.${alias}`,\n            from: JoinModel.collection.name,\n            let: {\n              root_id_: '$_id',\n            },\n            pipeline: [\n              ...basePipeline,\n              {\n                $count: 'result',\n              },\n            ],\n          },\n        })\n      }\n    }\n\n    aggregate.push({\n      $addFields: {\n        [`${as}.docs`]: {\n          $concatArrays: aliases.map((alias) => `$${alias}`),\n        },\n      },\n    })\n\n    if (count) {\n      aggregate.push({\n        $addFields: {\n          [`${as}.totalDocs`]: {\n            $add: aliases.map((alias) => ({\n              $ifNull: [\n                {\n                  $first: `$${as}.totalDocs.${alias}.result`,\n                },\n                0,\n              ],\n            })),\n          },\n        },\n      })\n    }\n\n    aggregate.push({\n      $set: {\n        [`${as}.docs`]: {\n          $sortArray: {\n            input: `$${as}.docs`,\n            sortBy: {\n              [sortProperty]: sortDirection,\n            },\n          },\n        },\n      },\n    })\n\n    const sliceValue = page ? [(page - 1) * limitJoin, limitJoin] : [limitJoin]\n\n    aggregate.push({\n      $addFields: {\n        [`${as}.hasNextPage`]: {\n          $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n        },\n      },\n    })\n\n    aggregate.push({\n      $set: {\n        [`${as}.docs`]: {\n          $slice: [`$${as}.docs`, ...sliceValue],\n        },\n      },\n    })\n  }\n\n  for (const slug of Object.keys(joinConfig)) {\n    const joinsList = joinConfig[slug]\n\n    if (!joinsList) {\n      throw new APIError(`Failed to retrieve array of joins for ${slug} in collectio ${collection}`)\n    }\n\n    for (const join of joinsList) {\n      const projectionPath = versions ? `version.${join.joinPath}` : join.joinPath\n      if (projection && !projection[projectionPath]) {\n        continue\n      }\n\n      if (joins?.[join.joinPath] === false) {\n        continue\n      }\n\n      const collectionConfig = adapter.payload.collections[join.field.collection as string]?.config\n\n      if (!collectionConfig) {\n        throw new APIError(\n          `Collection config for ${join.field.collection.toString()} was not found`,\n        )\n      }\n\n      let JoinModel: CollectionModel | undefined\n\n      const useDrafts = (draftsEnabled || versions) && hasDraftsEnabled(collectionConfig)\n\n      if (useDrafts) {\n        JoinModel = adapter.versions[collectionConfig.slug]\n      } else {\n        JoinModel = adapter.collections[collectionConfig.slug]\n      }\n\n      if (!JoinModel) {\n        throw new APIError(`Join Model was not found for ${collectionConfig.slug}`)\n      }\n\n      const {\n        count,\n        limit: limitJoin = join.field.defaultLimit ?? 10,\n        page,\n        sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n        where: whereJoin = {},\n      } = joins?.[join.joinPath] || {}\n\n      if (Array.isArray(join.field.collection)) {\n        throw new Error('Unreachable')\n      }\n\n      const fields = useDrafts\n        ? buildVersionCollectionFields(adapter.payload.config, collectionConfig, true)\n        : collectionConfig.flattenedFields\n\n      const sort = buildSortParam({\n        adapter,\n        config: adapter.payload.config,\n        fields,\n        locale,\n        sort: useDrafts ? getQueryDraftsSort({ collectionConfig, sort: sortJoin }) : sortJoin,\n        timestamps: true,\n      })\n      const sortProperty = Object.keys(sort)[0]!\n      const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n      const $match = await JoinModel.buildQuery({\n        locale,\n        payload: adapter.payload,\n        where: useDrafts\n          ? combineQueries(appendVersionToQueryKey(whereJoin), {\n              latest: {\n                equals: true,\n              },\n            })\n          : whereJoin,\n      })\n\n      const pipeline: Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>[] = [\n        { $match },\n        {\n          $sort: { [sortProperty]: sortDirection },\n        },\n      ]\n\n      if (page) {\n        pipeline.push({\n          $skip: (page - 1) * limitJoin,\n        })\n      }\n\n      if (limitJoin > 0) {\n        pipeline.push({\n          $limit: limitJoin + 1,\n        })\n      }\n\n      let polymorphicSuffix = ''\n      if (Array.isArray(join.targetField.relationTo)) {\n        polymorphicSuffix = '.value'\n      }\n\n      const addTotalDocsAggregation = (as: string, foreignField: string) =>\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.totalDocs`,\n              foreignField,\n              from: JoinModel.collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline: [\n                {\n                  $match,\n                },\n                {\n                  $count: 'result',\n                },\n              ],\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.totalDocs`]: { $ifNull: [{ $first: `$${as}.totalDocs.result` }, 0] },\n            },\n          },\n        )\n\n      let foreignFieldPrefix = ''\n\n      if (useDrafts) {\n        foreignFieldPrefix = 'version.'\n      }\n\n      if (adapter.payload.config.localization && locale === 'all') {\n        adapter.payload.config.localization.localeCodes.forEach((code) => {\n          const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${code}`\n\n          aggregate.push(\n            {\n              $lookup: {\n                as: `${as}.docs`,\n                foreignField: `${foreignFieldPrefix}${join.field.on}${code}${polymorphicSuffix}`,\n                from: JoinModel.collection.name,\n                localField: versions ? 'parent' : '_id',\n                pipeline,\n              },\n            },\n            {\n              $addFields: {\n                [`${as}.docs`]: {\n                  $map: {\n                    as: 'doc',\n                    in: useDrafts ? `$$doc.parent` : '$$doc._id',\n                    input: `$${as}.docs`,\n                  },\n                }, // Slicing the docs to match the limit\n                [`${as}.hasNextPage`]: limitJoin\n                  ? { $gt: [{ $size: `$${as}.docs` }, limitJoin] }\n                  : false,\n                // Boolean indicating if more docs than limit\n              },\n            },\n          )\n\n          if (limitJoin > 0) {\n            aggregate.push({\n              $addFields: {\n                [`${as}.docs`]: {\n                  $slice: [`$${as}.docs`, limitJoin],\n                },\n              },\n            })\n          }\n\n          if (count) {\n            addTotalDocsAggregation(\n              as,\n              `${foreignFieldPrefix}${join.field.on}${code}${polymorphicSuffix}`,\n            )\n          }\n        })\n      } else {\n        const localeSuffix =\n          fieldShouldBeLocalized({\n            field: join.field,\n            parentIsLocalized: join.parentIsLocalized,\n          }) &&\n          adapter.payload.config.localization &&\n          locale\n            ? `.${locale}`\n            : ''\n        const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${localeSuffix}`\n\n        let foreignField: string\n\n        if (join.getForeignPath) {\n          foreignField = `${join.getForeignPath({ locale })}${polymorphicSuffix}`\n        } else {\n          foreignField = `${join.field.on}${polymorphicSuffix}`\n        }\n\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.docs`,\n              foreignField: `${foreignFieldPrefix}${foreignField}`,\n              from: JoinModel.collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline,\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.docs`]: {\n                $map: {\n                  as: 'doc',\n                  in: useDrafts ? `$$doc.parent` : '$$doc._id',\n                  input: `$${as}.docs`,\n                },\n              }, // Slicing the docs to match the limit\n              [`${as}.hasNextPage`]: {\n                $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n              }, // Boolean indicating if more docs than limit\n            },\n          },\n        )\n\n        if (count) {\n          addTotalDocsAggregation(as, `${foreignFieldPrefix}${foreignField}`)\n        }\n\n        if (limitJoin > 0) {\n          aggregate.push({\n            $addFields: {\n              [`${as}.docs`]: {\n                $slice: [`$${as}.docs`, limitJoin],\n              },\n            },\n          })\n        }\n      }\n    }\n  }\n\n  return aggregate\n}\n"],"names":["APIError","appendVersionToQueryKey","buildVersionCollectionFields","combineQueries","getQueryDraftsSort","fieldShouldBeLocalized","hasDraftsEnabled","buildQuery","buildSortParam","getCollection","buildJoinAggregation","adapter","collection","collectionConfig","draftsEnabled","joins","locale","projection","versions","useJoinAggregations","Object","keys","length","polymorphicJoins","joinConfig","payload","collections","config","aggregate","polymorphicJoinsConfig","join","joinPath","count","limit","limitJoin","field","defaultLimit","page","sort","sortJoin","defaultSort","where","whereJoin","aggregatedFields","collectionSlug","flattenedFields","some","eachField","name","push","fields","timestamps","$match","sortProperty","sortDirection","projectSort","aliases","as","alias","basePipeline","$addFields","relationTo","$literal","$and","$expr","$eq","on","Model","JoinModel","$lookup","from","let","root_id_","pipeline","$sort","$limit","$project","value","$count","$concatArrays","map","$add","$ifNull","$first","$set","$sortArray","input","sortBy","sliceValue","$gt","$size","Number","MAX_VALUE","$slice","slug","joinsList","projectionPath","toString","useDrafts","Array","isArray","Error","latest","equals","$skip","polymorphicSuffix","targetField","addTotalDocsAggregation","foreignField","localField","foreignFieldPrefix","localization","localeCodes","forEach","code","$map","in","localeSuffix","parentIsLocalized","getForeignPath"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/buildJoinAggregation.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport {\n  APIError,\n  appendVersionToQueryKey,\n  buildVersionCollectionFields,\n  type CollectionSlug,\n  combineQueries,\n  type FlattenedField,\n  getBranchPredicateSync,\n  getQueryDraftsSort,\n  type JoinQuery,\n  type PayloadRequest,\n  type SanitizedCollectionConfig,\n} from 'payload'\nimport { fieldShouldBeLocalized, hasDraftsEnabled } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\nimport type { CollectionModel } from '../types.js'\n\nimport { buildQuery } from '../queries/buildQuery.js'\nimport { buildSortParam } from '../queries/buildSortParam.js'\nimport { getCollection } from './getEntity.js'\n\ntype BuildJoinAggregationArgs = {\n  adapter: MongooseAdapter\n  collection: CollectionSlug\n  collectionConfig: SanitizedCollectionConfig\n  draftsEnabled?: boolean\n  joins?: JoinQuery\n  locale?: string\n  projection?: Record<string, true>\n  // the where clause for the top collection\n  query?: Record<string, unknown>\n  req?: Partial<PayloadRequest>\n  /** whether the query is from drafts */\n  versions?: boolean\n}\n\nexport const buildJoinAggregation = async ({\n  adapter,\n  collection,\n  collectionConfig,\n  draftsEnabled,\n  joins,\n  locale,\n  projection,\n  req,\n  versions,\n}: BuildJoinAggregationArgs): Promise<PipelineStage[] | undefined> => {\n  if (!adapter.useJoinAggregations) {\n    return\n  }\n  if (\n    (Object.keys(collectionConfig.joins).length === 0 &&\n      collectionConfig.polymorphicJoins.length == 0) ||\n    joins === false\n  ) {\n    return\n  }\n\n  const joinConfig = adapter.payload.collections[collection]?.config?.joins\n\n  if (!joinConfig) {\n    throw new APIError(`Could not retrieve sanitized join config for ${collection}.`)\n  }\n\n  const aggregate: PipelineStage[] = []\n  const polymorphicJoinsConfig = adapter.payload.collections[collection]?.config?.polymorphicJoins\n\n  if (!polymorphicJoinsConfig) {\n    throw new APIError(`Could not retrieve sanitized polymorphic joins config for ${collection}.`)\n  }\n\n  for (const join of polymorphicJoinsConfig) {\n    if (projection && !projection[join.joinPath]) {\n      continue\n    }\n\n    if (joins?.[join.joinPath] === false) {\n      continue\n    }\n\n    const {\n      count = false,\n      limit: limitJoin = join.field.defaultLimit ?? 10,\n      page,\n      sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n      where: whereJoin = {},\n    } = joins?.[join.joinPath] || {}\n\n    const aggregatedFields: FlattenedField[] = []\n    for (const collectionSlug of join.field.collection) {\n      const { collectionConfig } = getCollection({ adapter, collectionSlug })\n\n      for (const field of collectionConfig.flattenedFields) {\n        if (!aggregatedFields.some((eachField) => eachField.name === field.name)) {\n          aggregatedFields.push(field)\n        }\n      }\n    }\n\n    const sort = buildSortParam({\n      adapter,\n      config: adapter.payload.config,\n      fields: aggregatedFields,\n      locale,\n      sort: sortJoin,\n      timestamps: true,\n    })\n\n    const $match = await buildQuery({\n      adapter,\n      fields: aggregatedFields,\n      locale,\n      where: whereJoin,\n    })\n\n    const sortProperty = Object.keys(sort)[0]! // assert because buildSortParam always returns at least 1 key.\n    const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n    const projectSort = sortProperty !== '_id' && sortProperty !== 'relationTo'\n\n    const aliases: string[] = []\n\n    const as = join.joinPath\n\n    for (const collectionSlug of join.field.collection) {\n      const alias = `${as}.docs.${collectionSlug}`\n      aliases.push(alias)\n\n      const basePipeline = [\n        {\n          $addFields: {\n            relationTo: {\n              $literal: collectionSlug,\n            },\n          },\n        },\n        {\n          $match: {\n            $and: [\n              {\n                $expr: {\n                  $eq: [`$${join.field.on}`, '$$root_id_'],\n                },\n              },\n              $match,\n            ],\n          },\n        },\n      ]\n\n      const { Model: JoinModel } = getCollection({ adapter, collectionSlug })\n\n      aggregate.push({\n        $lookup: {\n          as: alias,\n          from: JoinModel.collection.name,\n          let: {\n            root_id_: '$_id',\n          },\n          pipeline: [\n            ...basePipeline,\n            {\n              $sort: {\n                [sortProperty]: sortDirection,\n              },\n            },\n            {\n              // Unfortunately, we can't use $skip here because we can lose data, instead we do $slice then\n              $limit: page ? page * limitJoin : limitJoin,\n            },\n            {\n              $project: {\n                value: '$_id',\n                ...(projectSort && {\n                  [sortProperty]: 1,\n                }),\n                relationTo: 1,\n              },\n            },\n          ],\n        },\n      })\n\n      if (count) {\n        aggregate.push({\n          $lookup: {\n            as: `${as}.totalDocs.${alias}`,\n            from: JoinModel.collection.name,\n            let: {\n              root_id_: '$_id',\n            },\n            pipeline: [\n              ...basePipeline,\n              {\n                $count: 'result',\n              },\n            ],\n          },\n        })\n      }\n    }\n\n    aggregate.push({\n      $addFields: {\n        [`${as}.docs`]: {\n          $concatArrays: aliases.map((alias) => `$${alias}`),\n        },\n      },\n    })\n\n    if (count) {\n      aggregate.push({\n        $addFields: {\n          [`${as}.totalDocs`]: {\n            $add: aliases.map((alias) => ({\n              $ifNull: [\n                {\n                  $first: `$${as}.totalDocs.${alias}.result`,\n                },\n                0,\n              ],\n            })),\n          },\n        },\n      })\n    }\n\n    aggregate.push({\n      $set: {\n        [`${as}.docs`]: {\n          $sortArray: {\n            input: `$${as}.docs`,\n            sortBy: {\n              [sortProperty]: sortDirection,\n            },\n          },\n        },\n      },\n    })\n\n    const sliceValue = page ? [(page - 1) * limitJoin, limitJoin] : [limitJoin]\n\n    aggregate.push({\n      $addFields: {\n        [`${as}.hasNextPage`]: {\n          $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n        },\n      },\n    })\n\n    aggregate.push({\n      $set: {\n        [`${as}.docs`]: {\n          $slice: [`$${as}.docs`, ...sliceValue],\n        },\n      },\n    })\n  }\n\n  for (const slug of Object.keys(joinConfig)) {\n    const joinsList = joinConfig[slug]\n\n    if (!joinsList) {\n      throw new APIError(`Failed to retrieve array of joins for ${slug} in collectio ${collection}`)\n    }\n\n    for (const join of joinsList) {\n      const projectionPath = versions ? `version.${join.joinPath}` : join.joinPath\n      if (projection && !projection[projectionPath]) {\n        continue\n      }\n\n      if (joins?.[join.joinPath] === false) {\n        continue\n      }\n\n      const collectionConfig = adapter.payload.collections[join.field.collection as string]?.config\n\n      if (!collectionConfig) {\n        throw new APIError(\n          `Collection config for ${join.field.collection.toString()} was not found`,\n        )\n      }\n\n      let JoinModel: CollectionModel | undefined\n\n      const useDrafts = (draftsEnabled || versions) && hasDraftsEnabled(collectionConfig)\n\n      if (useDrafts) {\n        JoinModel = adapter.versions[collectionConfig.slug]\n      } else {\n        JoinModel = adapter.collections[collectionConfig.slug]\n      }\n\n      if (!JoinModel) {\n        throw new APIError(`Join Model was not found for ${collectionConfig.slug}`)\n      }\n\n      const {\n        count,\n        limit: limitJoin = join.field.defaultLimit ?? 10,\n        page,\n        sort: sortJoin = join.field.defaultSort || collectionConfig.defaultSort,\n        where: whereJoin = {},\n      } = joins?.[join.joinPath] || {}\n\n      if (Array.isArray(join.field.collection)) {\n        throw new Error('Unreachable')\n      }\n\n      const fields = useDrafts\n        ? buildVersionCollectionFields(adapter.payload.config, collectionConfig, true)\n        : collectionConfig.flattenedFields\n\n      const sort = buildSortParam({\n        adapter,\n        config: adapter.payload.config,\n        fields,\n        locale,\n        sort: useDrafts ? getQueryDraftsSort({ collectionConfig, sort: sortJoin }) : sortJoin,\n        timestamps: true,\n      })\n      const sortProperty = Object.keys(sort)[0]!\n      const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n      // A join subquery must carry the same branch predicate as the top-level\n      // read, or a branch would see main's related documents.\n      const joinBranchPredicate = getBranchPredicateSync({\n        collectionSlug: collectionConfig.slug,\n        req,\n      })\n\n      const branchedWhereJoin = joinBranchPredicate\n        ? ({ and: [whereJoin, joinBranchPredicate] } as typeof whereJoin)\n        : whereJoin\n\n      const $match = await JoinModel.buildQuery({\n        locale,\n        payload: adapter.payload,\n        where: useDrafts\n          ? combineQueries(appendVersionToQueryKey(branchedWhereJoin), {\n              latest: {\n                equals: true,\n              },\n            })\n          : branchedWhereJoin,\n      })\n\n      const pipeline: Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>[] = [\n        { $match },\n        // Surface the canonical document ID rather than the shadow row's own\n        // primary key, so join results address documents the same way every\n        // other read does.\n        ...(joinBranchPredicate\n          ? ([{ $set: { _id: { $ifNull: ['$_branchDocID', '$_id'] } } }] as Exclude<\n              PipelineStage,\n              PipelineStage.Merge | PipelineStage.Out\n            >[])\n          : []),\n        {\n          $sort: { [sortProperty]: sortDirection },\n        },\n      ]\n\n      if (page) {\n        pipeline.push({\n          $skip: (page - 1) * limitJoin,\n        })\n      }\n\n      if (limitJoin > 0) {\n        pipeline.push({\n          $limit: limitJoin + 1,\n        })\n      }\n\n      let polymorphicSuffix = ''\n      if (Array.isArray(join.targetField.relationTo)) {\n        polymorphicSuffix = '.value'\n      }\n\n      const addTotalDocsAggregation = (as: string, foreignField: string) =>\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.totalDocs`,\n              foreignField,\n              from: JoinModel.collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline: [\n                {\n                  $match,\n                },\n                {\n                  $count: 'result',\n                },\n              ],\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.totalDocs`]: { $ifNull: [{ $first: `$${as}.totalDocs.result` }, 0] },\n            },\n          },\n        )\n\n      let foreignFieldPrefix = ''\n\n      if (useDrafts) {\n        foreignFieldPrefix = 'version.'\n      }\n\n      if (adapter.payload.config.localization && locale === 'all') {\n        adapter.payload.config.localization.localeCodes.forEach((code) => {\n          const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${code}`\n\n          aggregate.push(\n            {\n              $lookup: {\n                as: `${as}.docs`,\n                foreignField: `${foreignFieldPrefix}${join.field.on}${code}${polymorphicSuffix}`,\n                from: JoinModel.collection.name,\n                localField: versions ? 'parent' : '_id',\n                pipeline,\n              },\n            },\n            {\n              $addFields: {\n                [`${as}.docs`]: {\n                  $map: {\n                    as: 'doc',\n                    in: useDrafts ? `$$doc.parent` : '$$doc._id',\n                    input: `$${as}.docs`,\n                  },\n                }, // Slicing the docs to match the limit\n                [`${as}.hasNextPage`]: limitJoin\n                  ? { $gt: [{ $size: `$${as}.docs` }, limitJoin] }\n                  : false,\n                // Boolean indicating if more docs than limit\n              },\n            },\n          )\n\n          if (limitJoin > 0) {\n            aggregate.push({\n              $addFields: {\n                [`${as}.docs`]: {\n                  $slice: [`$${as}.docs`, limitJoin],\n                },\n              },\n            })\n          }\n\n          if (count) {\n            addTotalDocsAggregation(\n              as,\n              `${foreignFieldPrefix}${join.field.on}${code}${polymorphicSuffix}`,\n            )\n          }\n        })\n      } else {\n        const localeSuffix =\n          fieldShouldBeLocalized({\n            field: join.field,\n            parentIsLocalized: join.parentIsLocalized,\n          }) &&\n          adapter.payload.config.localization &&\n          locale\n            ? `.${locale}`\n            : ''\n        const as = `${versions ? `version.${join.joinPath}` : join.joinPath}${localeSuffix}`\n\n        let foreignField: string\n\n        if (join.getForeignPath) {\n          foreignField = `${join.getForeignPath({ locale })}${polymorphicSuffix}`\n        } else {\n          foreignField = `${join.field.on}${polymorphicSuffix}`\n        }\n\n        aggregate.push(\n          {\n            $lookup: {\n              as: `${as}.docs`,\n              foreignField: `${foreignFieldPrefix}${foreignField}`,\n              from: JoinModel.collection.name,\n              localField: versions ? 'parent' : '_id',\n              pipeline,\n            },\n          },\n          {\n            $addFields: {\n              [`${as}.docs`]: {\n                $map: {\n                  as: 'doc',\n                  in: useDrafts ? `$$doc.parent` : '$$doc._id',\n                  input: `$${as}.docs`,\n                },\n              }, // Slicing the docs to match the limit\n              [`${as}.hasNextPage`]: {\n                $gt: [{ $size: `$${as}.docs` }, limitJoin || Number.MAX_VALUE],\n              }, // Boolean indicating if more docs than limit\n            },\n          },\n        )\n\n        if (count) {\n          addTotalDocsAggregation(as, `${foreignFieldPrefix}${foreignField}`)\n        }\n\n        if (limitJoin > 0) {\n          aggregate.push({\n            $addFields: {\n              [`${as}.docs`]: {\n                $slice: [`$${as}.docs`, limitJoin],\n              },\n            },\n          })\n        }\n      }\n    }\n  }\n\n  return aggregate\n}\n"],"names":["APIError","appendVersionToQueryKey","buildVersionCollectionFields","combineQueries","getBranchPredicateSync","getQueryDraftsSort","fieldShouldBeLocalized","hasDraftsEnabled","buildQuery","buildSortParam","getCollection","buildJoinAggregation","adapter","collection","collectionConfig","draftsEnabled","joins","locale","projection","req","versions","useJoinAggregations","Object","keys","length","polymorphicJoins","joinConfig","payload","collections","config","aggregate","polymorphicJoinsConfig","join","joinPath","count","limit","limitJoin","field","defaultLimit","page","sort","sortJoin","defaultSort","where","whereJoin","aggregatedFields","collectionSlug","flattenedFields","some","eachField","name","push","fields","timestamps","$match","sortProperty","sortDirection","projectSort","aliases","as","alias","basePipeline","$addFields","relationTo","$literal","$and","$expr","$eq","on","Model","JoinModel","$lookup","from","let","root_id_","pipeline","$sort","$limit","$project","value","$count","$concatArrays","map","$add","$ifNull","$first","$set","$sortArray","input","sortBy","sliceValue","$gt","$size","Number","MAX_VALUE","$slice","slug","joinsList","projectionPath","toString","useDrafts","Array","isArray","Error","joinBranchPredicate","branchedWhereJoin","and","latest","equals","_id","$skip","polymorphicSuffix","targetField","addTotalDocsAggregation","foreignField","localField","foreignFieldPrefix","localization","localeCodes","forEach","code","$map","in","localeSuffix","parentIsLocalized","getForeignPath"],"mappings":"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"}

package/dist/utilities/resolveJoins.d.ts

@@ -1,4 +1,4 @@
-import type { JoinQuery } from 'payload';
+import type { JoinQuery, PayloadRequest } from 'payload';
 import type { MongooseAdapter } from '../index.js';
 export type ResolveJoinsArgs = {
     /** The MongoDB adapter instance */
@@ -13,6 +13,8 @@ export type ResolveJoinsArgs = {
     locale?: string;
     /** Optional projection for the join query */
     projection?: Record<string, true>;
+    /** Request, for resolving the active branch */
+    req?: Partial<PayloadRequest>;
     /** Whether to resolve versions instead of published documents */
     versions?: boolean;
 };
@@ -21,5 +23,5 @@ export type ResolveJoinsArgs = {
  * This function fetches related documents based on join configurations and
  * attaches them to the original documents with pagination support.
  */
-export declare function resolveJoins({ adapter, collectionSlug, docs, joins, locale, projection, versions, }: ResolveJoinsArgs): Promise<void>;
+export declare function resolveJoins({ adapter, collectionSlug, docs, joins, locale, projection, req, versions, }: ResolveJoinsArgs): Promise<void>;
 //# sourceMappingURL=resolveJoins.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"resolveJoins.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveJoins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAyB,MAAM,SAAS,CAAA;AAU/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAMlD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,mCAAmC;IACnC,OAAO,EAAE,eAAe,CAAA;IACxB,+CAA+C;IAC/C,cAAc,EAAE,MAAM,CAAA;IACtB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,iEAAiE;IACjE,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACjC,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,EACjC,OAAO,EACP,cAAc,EACd,IAAI,EACJ,KAAK,EACL,MAAM,EACN,UAAU,EACV,QAAgB,GACjB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CA6YlC"}
+{"version":3,"file":"resolveJoins.d.ts","sourceRoot":"","sources":["../../src/utilities/resolveJoins.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,cAAc,EAAyB,MAAM,SAAS,CAAA;AAW/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAMlD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,mCAAmC;IACnC,OAAO,EAAE,eAAe,CAAA;IACxB,+CAA+C;IAC/C,cAAc,EAAE,MAAM,CAAA;IACtB,8CAA8C;IAC9C,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IAC/B,iEAAiE;IACjE,KAAK,CAAC,EAAE,SAAS,CAAA;IACjB,4CAA4C;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACjC,+CAA+C;IAC/C,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,iEAAiE;IACjE,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;;GAIG;AACH,wBAAsB,YAAY,CAAC,EACjC,OAAO,EACP,cAAc,EACd,IAAI,EACJ,KAAK,EACL,MAAM,EACN,UAAU,EACV,GAAG,EACH,QAAgB,GACjB,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAwZlC"}

package/dist/utilities/resolveJoins.js

@@ -1,4 +1,4 @@
-import { appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getQueryDraftsSort } from 'payload';
+import { appendVersionToQueryKey, buildVersionCollectionFields, combineQueries, getBranchPredicateSync, getQueryDraftsSort } from 'payload';
 import { fieldShouldBeLocalized } from 'payload/shared';
 import { buildQuery } from '../queries/buildQuery.js';
 import { buildSortParam } from '../queries/buildSortParam.js';
@@ -7,7 +7,7 @@ import { transform } from './transform.js';
  * Resolves join relationships for a collection of documents.
  * This function fetches related documents based on join configurations and
  * attaches them to the original documents with pagination support.
- */ export async function resolveJoins({ adapter, collectionSlug, docs, joins, locale, projection, versions = false }) {
+ */ export async function resolveJoins({ adapter, collectionSlug, docs, joins, locale, projection, req, versions = false }) {
     // Early return if no joins are specified or no documents to process
     if (!joins || docs.length === 0) {
         return;
@@ -93,6 +93,20 @@ import { transform } from './transform.js';
             if (whereQuery === null) {
                 return null;
             }
+            // 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({
+                collectionSlug: joinCollectionSlug,
+                req
+            });
+            if (joinBranchPredicate) {
+                whereQuery = {
+                    and: [
+                        whereQuery,
+                        joinBranchPredicate
+                    ]
+                };
+            }
             whereQuery = useDrafts ? await JoinModel.buildQuery({
                 locale,
                 payload: adapter.payload,