@payloadcms/db-mongodb 4.0.0-internal.543da65 → 4.0.0-internal.567a487

package/dist/count.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../src/count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAUpC,eAAO,MAAM,KAAK,EAAE,KA2DnB,CAAA"}
+{"version":3,"file":"count.d.ts","sourceRoot":"","sources":["../src/count.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAUpC,eAAO,MAAM,KAAK,EAAE,KA6DnB,CAAA"}

package/dist/count.js

@@ -1,12 +1,18 @@
-import { flattenWhereToOperators } from 'payload';
+import { flattenWhereToOperators, resolveBranchQuery } from 'payload';
 import { buildQuery } from './queries/buildQuery.js';
 import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
-export const count = async function count({ collection: collectionSlug, locale, req, where = {} }) {
+export const count = async function count({ branch, collection: collectionSlug, locale, req, where = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug
     });
+    where = await resolveBranchQuery({
+        branch,
+        collectionSlug,
+        req,
+        where
+    }) ?? {};
     let hasNearConstraint = false;
     if (where) {
         const constraints = flattenWhereToOperators(where);

package/dist/count.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/count.ts"],"sourcesContent":["import type { CountOptions } from 'mongodb'\nimport type { Count } from 'payload'\n\nimport { flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const count: Count = async function count(\n  this: MongooseAdapter,\n  { collection: collectionSlug, locale, req, where = {} },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const options: CountOptions = {\n    session: await getSession(this, req),\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    options.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    options.hint = {\n      _id: 1,\n    }\n  }\n\n  let result: number\n  if (useEstimatedCount) {\n    result = await Model.estimatedDocumentCount({ session: options.session })\n  } else {\n    result = await Model.countDocuments(query, options)\n  }\n\n  return {\n    totalDocs: result,\n  }\n}\n"],"names":["flattenWhereToOperators","buildQuery","getCollection","getSession","count","collection","collectionSlug","locale","req","where","collectionConfig","Model","adapter","hasNearConstraint","constraints","some","prop","Object","keys","key","query","fields","flattenedFields","useEstimatedCount","length","options","session","collation","localizationConfig","payload","config","localization","defaultLocale","disableIndexHints","hint","_id","result","estimatedDocumentCount","countDocuments","totalDocs"],"mappings":"AAGA,SAASA,uBAAuB,QAAQ,UAAS;AAIjD,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,QAAe,eAAeA,MAEzC,EAAEC,YAAYC,cAAc,EAAEC,MAAM,EAAEC,GAAG,EAAEC,QAAQ,CAAC,CAAC,EAAE;IAEvD,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGT,cAAc;QAAEU,SAAS,IAAI;QAAEN;IAAe;IAElF,IAAIO,oBAAoB;IAExB,IAAIJ,OAAO;QACT,MAAMK,cAAcd,wBAAwBS;QAC5CI,oBAAoBC,YAAYC,IAAI,CAAC,CAACC,OAASC,OAAOC,IAAI,CAACF,MAAMD,IAAI,CAAC,CAACI,MAAQA,QAAQ;IACzF;IAEA,MAAMC,QAAQ,MAAMnB,WAAW;QAC7BW,SAAS,IAAI;QACbN;QACAe,QAAQX,iBAAiBY,eAAe;QACxCf;QACAE;IACF;IAEA,4HAA4H;IAC5H,MAAMc,oBAAoBV,qBAAqB,CAACO,SAASH,OAAOC,IAAI,CAACE,OAAOI,MAAM,KAAK;IAEvF,MAAMC,UAAwB;QAC5BC,SAAS,MAAMvB,WAAW,IAAI,EAAEK;IAClC;IAEA,IAAI,IAAI,CAACmB,SAAS,EAAE;QAClB,MAAMC,qBAAqB,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,YAAY;QAC3D,MAAMC,gBACJ,AAAC,OAAOJ,uBAAuB,YAAYA,oBAAoBI,iBAAkB;QAEnFP,QAAQE,SAAS,GAAG;YAClBpB,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAASyB;YAChE,GAAG,IAAI,CAACL,SAAS;QACnB;IACF;IAEA,IAAI,CAACJ,qBAAqBN,OAAOC,IAAI,CAACE,OAAOI,MAAM,KAAK,KAAK,IAAI,CAACS,iBAAiB,KAAK,MAAM;QAC5F,mHAAmH;QACnH,qHAAqH;QACrH,mHAAmH;QACnH,4BAA4B;QAC5BR,QAAQS,IAAI,GAAG;YACbC,KAAK;QACP;IACF;IAEA,IAAIC;IACJ,IAAIb,mBAAmB;QACrBa,SAAS,MAAMzB,MAAM0B,sBAAsB,CAAC;YAAEX,SAASD,QAAQC,OAAO;QAAC;IACzE,OAAO;QACLU,SAAS,MAAMzB,MAAM2B,cAAc,CAAClB,OAAOK;IAC7C;IAEA,OAAO;QACLc,WAAWH;IACb;AACF,EAAC"}
+{"version":3,"sources":["../src/count.ts"],"sourcesContent":["import type { CountOptions } from 'mongodb'\nimport type { Count } from 'payload'\n\nimport { flattenWhereToOperators, resolveBranchQuery } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const count: Count = async function count(\n  this: MongooseAdapter,\n  { branch, collection: collectionSlug, locale, req, where = {} },\n) {\n  const { collectionConfig, Model } = getCollection({ adapter: this, collectionSlug })\n\n  where = (await resolveBranchQuery({ branch, collectionSlug, req, where })) ?? {}\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug,\n    fields: collectionConfig.flattenedFields,\n    locale,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const options: CountOptions = {\n    session: await getSession(this, req),\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    options.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    options.hint = {\n      _id: 1,\n    }\n  }\n\n  let result: number\n  if (useEstimatedCount) {\n    result = await Model.estimatedDocumentCount({ session: options.session })\n  } else {\n    result = await Model.countDocuments(query, options)\n  }\n\n  return {\n    totalDocs: result,\n  }\n}\n"],"names":["flattenWhereToOperators","resolveBranchQuery","buildQuery","getCollection","getSession","count","branch","collection","collectionSlug","locale","req","where","collectionConfig","Model","adapter","hasNearConstraint","constraints","some","prop","Object","keys","key","query","fields","flattenedFields","useEstimatedCount","length","options","session","collation","localizationConfig","payload","config","localization","defaultLocale","disableIndexHints","hint","_id","result","estimatedDocumentCount","countDocuments","totalDocs"],"mappings":"AAGA,SAASA,uBAAuB,EAAEC,kBAAkB,QAAQ,UAAS;AAIrE,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,QAAe,eAAeA,MAEzC,EAAEC,MAAM,EAAEC,YAAYC,cAAc,EAAEC,MAAM,EAAEC,GAAG,EAAEC,QAAQ,CAAC,CAAC,EAAE;IAE/D,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGV,cAAc;QAAEW,SAAS,IAAI;QAAEN;IAAe;IAElFG,QAAQ,AAAC,MAAMV,mBAAmB;QAAEK;QAAQE;QAAgBE;QAAKC;IAAM,MAAO,CAAC;IAE/E,IAAII,oBAAoB;IAExB,IAAIJ,OAAO;QACT,MAAMK,cAAchB,wBAAwBW;QAC5CI,oBAAoBC,YAAYC,IAAI,CAAC,CAACC,OAASC,OAAOC,IAAI,CAACF,MAAMD,IAAI,CAAC,CAACI,MAAQA,QAAQ;IACzF;IAEA,MAAMC,QAAQ,MAAMpB,WAAW;QAC7BY,SAAS,IAAI;QACbN;QACAe,QAAQX,iBAAiBY,eAAe;QACxCf;QACAE;IACF;IAEA,4HAA4H;IAC5H,MAAMc,oBAAoBV,qBAAqB,CAACO,SAASH,OAAOC,IAAI,CAACE,OAAOI,MAAM,KAAK;IAEvF,MAAMC,UAAwB;QAC5BC,SAAS,MAAMxB,WAAW,IAAI,EAAEM;IAClC;IAEA,IAAI,IAAI,CAACmB,SAAS,EAAE;QAClB,MAAMC,qBAAqB,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,YAAY;QAC3D,MAAMC,gBACJ,AAAC,OAAOJ,uBAAuB,YAAYA,oBAAoBI,iBAAkB;QAEnFP,QAAQE,SAAS,GAAG;YAClBpB,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAASyB;YAChE,GAAG,IAAI,CAACL,SAAS;QACnB;IACF;IAEA,IAAI,CAACJ,qBAAqBN,OAAOC,IAAI,CAACE,OAAOI,MAAM,KAAK,KAAK,IAAI,CAACS,iBAAiB,KAAK,MAAM;QAC5F,mHAAmH;QACnH,qHAAqH;QACrH,mHAAmH;QACnH,4BAA4B;QAC5BR,QAAQS,IAAI,GAAG;YACbC,KAAK;QACP;IACF;IAEA,IAAIC;IACJ,IAAIb,mBAAmB;QACrBa,SAAS,MAAMzB,MAAM0B,sBAAsB,CAAC;YAAEX,SAASD,QAAQC,OAAO;QAAC;IACzE,OAAO;QACLU,SAAS,MAAMzB,MAAM2B,cAAc,CAAClB,OAAOK;IAC7C;IAEA,OAAO;QACLc,WAAWH;IACb;AACF,EAAC"}

package/dist/countVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countVersions.d.ts","sourceRoot":"","sources":["../src/countVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAU5C,eAAO,MAAM,aAAa,EAAE,aA8D3B,CAAA"}
+{"version":3,"file":"countVersions.d.ts","sourceRoot":"","sources":["../src/countVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAA;AAc5C,eAAO,MAAM,aAAa,EAAE,aAkE3B,CAAA"}

package/dist/countVersions.js

@@ -1,13 +1,21 @@
-import { buildVersionCollectionFields, flattenWhereToOperators } from 'payload';
+import { buildVersionCollectionFields, flattenWhereToOperators, resolveBranchVersionHistoryQuery } from 'payload';
 import { buildQuery } from './queries/buildQuery.js';
 import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
-export const countVersions = async function countVersions({ collection: collectionSlug, locale, req, where = {} }) {
+export const countVersions = async function countVersions({ branch, collection: collectionSlug, locale, req, where = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug,
         versions: true
     });
+    // Shares the list's predicate so the count in the Versions tab can never
+    // disagree with the rows the Versions view actually renders.
+    where = resolveBranchVersionHistoryQuery({
+        branch,
+        collectionSlug,
+        req,
+        where
+    }) ?? {};
     let hasNearConstraint = false;
     if (where) {
         const constraints = flattenWhereToOperators(where);

package/dist/countVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/countVersions.ts"],"sourcesContent":["import type { CountOptions } from 'mongodb'\nimport type { CountVersions } from 'payload'\n\nimport { buildVersionCollectionFields, flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const countVersions: CountVersions = async function countVersions(\n  this: MongooseAdapter,\n  { collection: collectionSlug, locale, req, where = {} },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    fields: buildVersionCollectionFields(this.payload.config, collectionConfig, true),\n    locale,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const options: CountOptions = {\n    session: await getSession(this, req),\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    options.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    options.hint = {\n      _id: 1,\n    }\n  }\n\n  let result: number\n  if (useEstimatedCount) {\n    result = await Model.estimatedDocumentCount({ session: options.session })\n  } else {\n    result = await Model.countDocuments(query, options)\n  }\n\n  return {\n    totalDocs: result,\n  }\n}\n"],"names":["buildVersionCollectionFields","flattenWhereToOperators","buildQuery","getCollection","getSession","countVersions","collection","collectionSlug","locale","req","where","collectionConfig","Model","adapter","versions","hasNearConstraint","constraints","some","prop","Object","keys","key","query","fields","payload","config","useEstimatedCount","length","options","session","collation","localizationConfig","localization","defaultLocale","disableIndexHints","hint","_id","result","estimatedDocumentCount","countDocuments","totalDocs"],"mappings":"AAGA,SAASA,4BAA4B,EAAEC,uBAAuB,QAAQ,UAAS;AAI/E,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,YAAYC,cAAc,EAAEC,MAAM,EAAEC,GAAG,EAAEC,QAAQ,CAAC,CAAC,EAAE;IAEvD,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGT,cAAc;QAChDU,SAAS,IAAI;QACbN;QACAO,UAAU;IACZ;IAEA,IAAIC,oBAAoB;IAExB,IAAIL,OAAO;QACT,MAAMM,cAAcf,wBAAwBS;QAC5CK,oBAAoBC,YAAYC,IAAI,CAAC,CAACC,OAASC,OAAOC,IAAI,CAACF,MAAMD,IAAI,CAAC,CAACI,MAAQA,QAAQ;IACzF;IAEA,MAAMC,QAAQ,MAAMpB,WAAW;QAC7BW,SAAS,IAAI;QACbU,QAAQvB,6BAA6B,IAAI,CAACwB,OAAO,CAACC,MAAM,EAAEd,kBAAkB;QAC5EH;QACAE;IACF;IAEA,4HAA4H;IAC5H,MAAMgB,oBAAoBX,qBAAqB,CAACO,SAASH,OAAOC,IAAI,CAACE,OAAOK,MAAM,KAAK;IAEvF,MAAMC,UAAwB;QAC5BC,SAAS,MAAMzB,WAAW,IAAI,EAAEK;IAClC;IAEA,IAAI,IAAI,CAACqB,SAAS,EAAE;QAClB,MAAMC,qBAAqB,IAAI,CAACP,OAAO,CAACC,MAAM,CAACO,YAAY;QAC3D,MAAMC,gBACJ,AAAC,OAAOF,uBAAuB,YAAYA,oBAAoBE,iBAAkB;QAEnFL,QAAQE,SAAS,GAAG;YAClBtB,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAASyB;YAChE,GAAG,IAAI,CAACH,SAAS;QACnB;IACF;IAEA,IAAI,CAACJ,qBAAqBP,OAAOC,IAAI,CAACE,OAAOK,MAAM,KAAK,KAAK,IAAI,CAACO,iBAAiB,KAAK,MAAM;QAC5F,mHAAmH;QACnH,qHAAqH;QACrH,mHAAmH;QACnH,4BAA4B;QAC5BN,QAAQO,IAAI,GAAG;YACbC,KAAK;QACP;IACF;IAEA,IAAIC;IACJ,IAAIX,mBAAmB;QACrBW,SAAS,MAAMzB,MAAM0B,sBAAsB,CAAC;YAAET,SAASD,QAAQC,OAAO;QAAC;IACzE,OAAO;QACLQ,SAAS,MAAMzB,MAAM2B,cAAc,CAACjB,OAAOM;IAC7C;IAEA,OAAO;QACLY,WAAWH;IACb;AACF,EAAC"}
+{"version":3,"sources":["../src/countVersions.ts"],"sourcesContent":["import type { CountOptions } from 'mongodb'\nimport type { CountVersions } from 'payload'\n\nimport {\n  buildVersionCollectionFields,\n  flattenWhereToOperators,\n  resolveBranchVersionHistoryQuery,\n} from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nexport const countVersions: CountVersions = async function countVersions(\n  this: MongooseAdapter,\n  { branch, collection: collectionSlug, locale, req, where = {} },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  // Shares the list's predicate so the count in the Versions tab can never\n  // disagree with the rows the Versions view actually renders.\n  where = resolveBranchVersionHistoryQuery({ branch, collectionSlug, req, where }) ?? {}\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  const query = await buildQuery({\n    adapter: this,\n    fields: buildVersionCollectionFields(this.payload.config, collectionConfig, true),\n    locale,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const options: CountOptions = {\n    session: await getSession(this, req),\n  }\n\n  if (this.collation) {\n    const localizationConfig = this.payload.config.localization\n    const defaultLocale =\n      (typeof localizationConfig === 'object' && localizationConfig?.defaultLocale) || 'en'\n\n    options.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    options.hint = {\n      _id: 1,\n    }\n  }\n\n  let result: number\n  if (useEstimatedCount) {\n    result = await Model.estimatedDocumentCount({ session: options.session })\n  } else {\n    result = await Model.countDocuments(query, options)\n  }\n\n  return {\n    totalDocs: result,\n  }\n}\n"],"names":["buildVersionCollectionFields","flattenWhereToOperators","resolveBranchVersionHistoryQuery","buildQuery","getCollection","getSession","countVersions","branch","collection","collectionSlug","locale","req","where","collectionConfig","Model","adapter","versions","hasNearConstraint","constraints","some","prop","Object","keys","key","query","fields","payload","config","useEstimatedCount","length","options","session","collation","localizationConfig","localization","defaultLocale","disableIndexHints","hint","_id","result","estimatedDocumentCount","countDocuments","totalDocs"],"mappings":"AAGA,SACEA,4BAA4B,EAC5BC,uBAAuB,EACvBC,gCAAgC,QAC3B,UAAS;AAIhB,SAASC,UAAU,QAAQ,0BAAyB;AACpD,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EAAEC,MAAM,EAAEC,YAAYC,cAAc,EAAEC,MAAM,EAAEC,GAAG,EAAEC,QAAQ,CAAC,CAAC,EAAE;IAE/D,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGV,cAAc;QAChDW,SAAS,IAAI;QACbN;QACAO,UAAU;IACZ;IAEA,yEAAyE;IACzE,6DAA6D;IAC7DJ,QAAQV,iCAAiC;QAAEK;QAAQE;QAAgBE;QAAKC;IAAM,MAAM,CAAC;IAErF,IAAIK,oBAAoB;IAExB,IAAIL,OAAO;QACT,MAAMM,cAAcjB,wBAAwBW;QAC5CK,oBAAoBC,YAAYC,IAAI,CAAC,CAACC,OAASC,OAAOC,IAAI,CAACF,MAAMD,IAAI,CAAC,CAACI,MAAQA,QAAQ;IACzF;IAEA,MAAMC,QAAQ,MAAMrB,WAAW;QAC7BY,SAAS,IAAI;QACbU,QAAQzB,6BAA6B,IAAI,CAAC0B,OAAO,CAACC,MAAM,EAAEd,kBAAkB;QAC5EH;QACAE;IACF;IAEA,4HAA4H;IAC5H,MAAMgB,oBAAoBX,qBAAqB,CAACO,SAASH,OAAOC,IAAI,CAACE,OAAOK,MAAM,KAAK;IAEvF,MAAMC,UAAwB;QAC5BC,SAAS,MAAM1B,WAAW,IAAI,EAAEM;IAClC;IAEA,IAAI,IAAI,CAACqB,SAAS,EAAE;QAClB,MAAMC,qBAAqB,IAAI,CAACP,OAAO,CAACC,MAAM,CAACO,YAAY;QAC3D,MAAMC,gBACJ,AAAC,OAAOF,uBAAuB,YAAYA,oBAAoBE,iBAAkB;QAEnFL,QAAQE,SAAS,GAAG;YAClBtB,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAASyB;YAChE,GAAG,IAAI,CAACH,SAAS;QACnB;IACF;IAEA,IAAI,CAACJ,qBAAqBP,OAAOC,IAAI,CAACE,OAAOK,MAAM,KAAK,KAAK,IAAI,CAACO,iBAAiB,KAAK,MAAM;QAC5F,mHAAmH;QACnH,qHAAqH;QACrH,mHAAmH;QACnH,4BAA4B;QAC5BN,QAAQO,IAAI,GAAG;YACbC,KAAK;QACP;IACF;IAEA,IAAIC;IACJ,IAAIX,mBAAmB;QACrBW,SAAS,MAAMzB,MAAM0B,sBAAsB,CAAC;YAAET,SAASD,QAAQC,OAAO;QAAC;IACzE,OAAO;QACLQ,SAAS,MAAMzB,MAAM2B,cAAc,CAACjB,OAAOM;IAC7C;IAEA,OAAO;QACLY,WAAWH;IACb;AACF,EAAC"}

package/dist/createGlobalVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAQ5E,eAAO,MAAM,mBAAmB,EAAE,mBA+EjC,CAAA"}
+{"version":3,"file":"createGlobalVersion.d.ts","sourceRoot":"","sources":["../src/createGlobalVersion.ts"],"names":[],"mappings":"AACA,OAAO,EAA4B,KAAK,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAQ5E,eAAO,MAAM,mBAAmB,EAAE,mBA6FjC,CAAA"}

package/dist/createGlobalVersion.js

@@ -1,3 +1,4 @@
+import { MAIN_BRANCH, resolveBranch } from 'payload';
 import { buildVersionGlobalFields } from 'payload';
 import { getGlobal } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
@@ -8,7 +9,9 @@ export const createGlobalVersion = async function createGlobalVersion({ autosave
         globalSlug,
         versions: true
     });
+    const versionBranch = req?.payload?.config?.branching?.branchableGlobals?.has(globalSlug) ? resolveBranch(req) : MAIN_BRANCH;
     const data = {
+        _branch: versionBranch,
         autosave,
         createdAt,
         latest: true,
@@ -35,6 +38,9 @@ export const createGlobalVersion = async function createGlobalVersion({ autosave
     let [doc] = await Model.create([
         data
     ], options, req);
+    // Scoped by `_branch`. Unlike collection versions, global versions have no
+    // `parent` to separate streams by — every version of a global shares one — so
+    // without this an unscoped clear would wipe main's latest flag from a branch.
     await Model.updateMany({
         $and: [
             {
@@ -46,6 +52,22 @@ export const createGlobalVersion = async function createGlobalVersion({ autosave
                 latest: {
                     $eq: true
                 }
+            },
+            {
+                $or: [
+                    {
+                        _branch: {
+                            $eq: versionBranch
+                        }
+                    },
+                    ...versionBranch === MAIN_BRANCH ? [
+                        {
+                            _branch: {
+                                $exists: false
+                            }
+                        }
+                    ] : []
+                ]
             }
         ]
     }, {

package/dist/createGlobalVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import { buildVersionGlobalFields, type CreateGlobalVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const createGlobalVersion: CreateGlobalVersion = async function createGlobalVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    createdAt,\n    globalSlug,\n    publishedLocale,\n    req,\n    returning,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug, versions: true })\n\n  const data = {\n    autosave,\n    createdAt,\n    latest: true,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version: versionData,\n  }\n  if (!data.createdAt) {\n    data.createdAt = new Date().toISOString()\n  }\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig)\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const options = {\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  }\n\n  let [doc] = await Model.create([data], options, req)\n\n  await Model.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: doc._id,\n          },\n        },\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    options,\n  )\n\n  if (returning === false) {\n    return null\n  }\n\n  doc = doc.toObject()\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["buildVersionGlobalFields","getGlobal","getSession","transform","createGlobalVersion","autosave","createdAt","globalSlug","publishedLocale","req","returning","snapshot","updatedAt","versionData","globalConfig","Model","adapter","versions","data","latest","version","Date","toISOString","fields","payload","config","operation","options","session","timestamps","doc","create","updateMany","$and","_id","$ne","$eq","$unset","toObject"],"mappings":"AAAA,SAASA,wBAAwB,QAAkC,UAAS;AAI5E,SAASC,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,sBAA2C,eAAeA,oBAErE,EACEC,QAAQ,EACRC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAM,EAAEC,YAAY,EAAEC,KAAK,EAAE,GAAGd,UAAU;QAAEe,SAAS,IAAI;QAAET;QAAYU,UAAU;IAAK;IAEtF,MAAMC,OAAO;QACXb;QACAC;QACAa,QAAQ;QACRX;QACAG;QACAC;QACAQ,SAASP;IACX;IACA,IAAI,CAACK,KAAKZ,SAAS,EAAE;QACnBY,KAAKZ,SAAS,GAAG,IAAIe,OAAOC,WAAW;IACzC;IAEA,MAAMC,SAASvB,yBAAyB,IAAI,CAACwB,OAAO,CAACC,MAAM,EAAEX;IAE7DX,UAAU;QACRa,SAAS,IAAI;QACbE;QACAK;QACAG,WAAW;IACb;IAEA,MAAMC,UAAU;QACdC,SAAS,MAAM1B,WAAW,IAAI,EAAEO;QAChC,uDAAuD;QACvDoB,YAAY;IACd;IAEA,IAAI,CAACC,IAAI,GAAG,MAAMf,MAAMgB,MAAM,CAAC;QAACb;KAAK,EAAES,SAASlB;IAEhD,MAAMM,MAAMiB,UAAU,CACpB;QACEC,MAAM;YACJ;gBACEC,KAAK;oBACHC,KAAKL,IAAII,GAAG;gBACd;YACF;YACA;gBACEf,QAAQ;oBACNiB,KAAK;gBACP;YACF;SACD;IACH,GACA;QAAEC,QAAQ;YAAElB,QAAQ;QAAE;IAAE,GACxBQ;IAGF,IAAIjB,cAAc,OAAO;QACvB,OAAO;IACT;IAEAoB,MAAMA,IAAIQ,QAAQ;IAElBnC,UAAU;QACRa,SAAS,IAAI;QACbE,MAAMY;QACNP;QACAG,WAAW;IACb;IAEA,OAAOI;AACT,EAAC"}
+{"version":3,"sources":["../src/createGlobalVersion.ts"],"sourcesContent":["import { MAIN_BRANCH, resolveBranch } from 'payload'\nimport { buildVersionGlobalFields, type CreateGlobalVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const createGlobalVersion: CreateGlobalVersion = async function createGlobalVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    createdAt,\n    globalSlug,\n    publishedLocale,\n    req,\n    returning,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug, versions: true })\n\n  const versionBranch = req?.payload?.config?.branching?.branchableGlobals?.has(globalSlug)\n    ? resolveBranch(req as never)\n    : MAIN_BRANCH\n\n  const data = {\n    _branch: versionBranch,\n    autosave,\n    createdAt,\n    latest: true,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version: versionData,\n  }\n  if (!data.createdAt) {\n    data.createdAt = new Date().toISOString()\n  }\n\n  const fields = buildVersionGlobalFields(this.payload.config, globalConfig)\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const options = {\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  }\n\n  let [doc] = await Model.create([data], options, req)\n\n  // Scoped by `_branch`. Unlike collection versions, global versions have no\n  // `parent` to separate streams by — every version of a global shares one — so\n  // without this an unscoped clear would wipe main's latest flag from a branch.\n  await Model.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: doc._id,\n          },\n        },\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n        {\n          $or: [\n            { _branch: { $eq: versionBranch } },\n            ...(versionBranch === MAIN_BRANCH ? [{ _branch: { $exists: false } }] : []),\n          ],\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    options,\n  )\n\n  if (returning === false) {\n    return null\n  }\n\n  doc = doc.toObject()\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["MAIN_BRANCH","resolveBranch","buildVersionGlobalFields","getGlobal","getSession","transform","createGlobalVersion","autosave","createdAt","globalSlug","publishedLocale","req","returning","snapshot","updatedAt","versionData","globalConfig","Model","adapter","versions","versionBranch","payload","config","branching","branchableGlobals","has","data","_branch","latest","version","Date","toISOString","fields","operation","options","session","timestamps","doc","create","updateMany","$and","_id","$ne","$eq","$or","$exists","$unset","toObject"],"mappings":"AAAA,SAASA,WAAW,EAAEC,aAAa,QAAQ,UAAS;AACpD,SAASC,wBAAwB,QAAkC,UAAS;AAI5E,SAASC,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,sBAA2C,eAAeA,oBAErE,EACEC,QAAQ,EACRC,SAAS,EACTC,UAAU,EACVC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAM,EAAEC,YAAY,EAAEC,KAAK,EAAE,GAAGd,UAAU;QAAEe,SAAS,IAAI;QAAET;QAAYU,UAAU;IAAK;IAEtF,MAAMC,gBAAgBT,KAAKU,SAASC,QAAQC,WAAWC,mBAAmBC,IAAIhB,cAC1ER,cAAcU,OACdX;IAEJ,MAAM0B,OAAO;QACXC,SAASP;QACTb;QACAC;QACAoB,QAAQ;QACRlB;QACAG;QACAC;QACAe,SAASd;IACX;IACA,IAAI,CAACW,KAAKlB,SAAS,EAAE;QACnBkB,KAAKlB,SAAS,GAAG,IAAIsB,OAAOC,WAAW;IACzC;IAEA,MAAMC,SAAS9B,yBAAyB,IAAI,CAACmB,OAAO,CAACC,MAAM,EAAEN;IAE7DX,UAAU;QACRa,SAAS,IAAI;QACbQ;QACAM;QACAC,WAAW;IACb;IAEA,MAAMC,UAAU;QACdC,SAAS,MAAM/B,WAAW,IAAI,EAAEO;QAChC,uDAAuD;QACvDyB,YAAY;IACd;IAEA,IAAI,CAACC,IAAI,GAAG,MAAMpB,MAAMqB,MAAM,CAAC;QAACZ;KAAK,EAAEQ,SAASvB;IAEhD,2EAA2E;IAC3E,8EAA8E;IAC9E,8EAA8E;IAC9E,MAAMM,MAAMsB,UAAU,CACpB;QACEC,MAAM;YACJ;gBACEC,KAAK;oBACHC,KAAKL,IAAII,GAAG;gBACd;YACF;YACA;gBACEb,QAAQ;oBACNe,KAAK;gBACP;YACF;YACA;gBACEC,KAAK;oBACH;wBAAEjB,SAAS;4BAAEgB,KAAKvB;wBAAc;oBAAE;uBAC9BA,kBAAkBpB,cAAc;wBAAC;4BAAE2B,SAAS;gCAAEkB,SAAS;4BAAM;wBAAE;qBAAE,GAAG,EAAE;iBAC3E;YACH;SACD;IACH,GACA;QAAEC,QAAQ;YAAElB,QAAQ;QAAE;IAAE,GACxBM;IAGF,IAAItB,cAAc,OAAO;QACvB,OAAO;IACT;IAEAyB,MAAMA,IAAIU,QAAQ;IAElB1C,UAAU;QACRa,SAAS,IAAI;QACbQ,MAAMW;QACNL;QACAC,WAAW;IACb;IAEA,OAAOI;AACT,EAAC"}

package/dist/createVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AAQ1E,eAAO,MAAM,aAAa,EAAE,aAqG3B,CAAA"}
+{"version":3,"file":"createVersion.d.ts","sourceRoot":"","sources":["../src/createVersion.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,aAAa,EAEnB,MAAM,SAAS,CAAA;AAQhB,eAAO,MAAM,aAAa,EAAE,aAkH3B,CAAA"}

package/dist/createVersion.js

@@ -1,4 +1,4 @@
-import { buildVersionCollectionFields } from 'payload';
+import { buildVersionCollectionFields, resolveBranchVersionParent } from 'payload';
 import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { transform } from './utilities/transform.js';
@@ -8,15 +8,25 @@ export const createVersion = async function createVersion({ autosave, collection
         collectionSlug,
         versions: true
     });
+    const branched = await resolveBranchVersionParent({
+        collectionSlug,
+        parent,
+        req,
+        versionData: versionData
+    });
     const data = {
         autosave,
         createdAt,
         latest: true,
-        parent,
+        parent: branched.parent,
         publishedLocale,
         snapshot,
         updatedAt,
-        version: versionData
+        version: versionData,
+        ...branched.versionData._branch ? {
+            _branch: branched.versionData._branch,
+            _branchParent: branched.versionData._branchParent
+        } : {}
     };
     if (!data.createdAt) {
         data.createdAt = new Date().toISOString();
@@ -36,6 +46,9 @@ export const createVersion = async function createVersion({ autosave, collection
     let [doc] = await Model.create([
         data
     ], options, req);
+    // No branch scoping needed here: a branch version's `parent` is the shadow
+    // row's own primary key, so main's chain and the branch's chain are already
+    // disjoint and `latest` clearing cannot cross between them.
     const parentQuery = {
         $or: [
             {

package/dist/createVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import { buildVersionCollectionFields, type CreateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const createVersion: CreateVersion = async function createVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    returning,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  const data = {\n    autosave,\n    createdAt,\n    latest: true,\n    parent,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version: versionData,\n  }\n  if (!data.createdAt) {\n    data.createdAt = new Date().toISOString()\n  }\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const options = {\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  }\n\n  let [doc] = await Model.create([data], options, req)\n\n  const parentQuery = {\n    $or: [\n      {\n        parent: {\n          $eq: data.parent,\n        },\n      },\n    ],\n  }\n\n  await Model.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: doc._id,\n          },\n        },\n        parentQuery,\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n        {\n          updatedAt: {\n            $lt: new Date(doc.updatedAt),\n          },\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    options,\n  )\n\n  if (returning === false) {\n    return null\n  }\n\n  doc = doc.toObject()\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["buildVersionCollectionFields","getCollection","getSession","transform","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","returning","snapshot","updatedAt","versionData","collectionConfig","Model","adapter","versions","data","latest","version","Date","toISOString","fields","payload","config","operation","options","session","timestamps","doc","create","parentQuery","$or","$eq","updateMany","$and","_id","$ne","$lt","$unset","toObject"],"mappings":"AAAA,SAASA,4BAA4B,QAA4B,UAAS;AAI1E,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGf,cAAc;QAChDgB,SAAS,IAAI;QACbX;QACAY,UAAU;IACZ;IAEA,MAAMC,OAAO;QACXd;QACAE;QACAa,QAAQ;QACRZ;QACAC;QACAG;QACAC;QACAQ,SAASP;IACX;IACA,IAAI,CAACK,KAAKZ,SAAS,EAAE;QACnBY,KAAKZ,SAAS,GAAG,IAAIe,OAAOC,WAAW;IACzC;IAEA,MAAMC,SAASxB,6BAA6B,IAAI,CAACyB,OAAO,CAACC,MAAM,EAAEX;IAEjEZ,UAAU;QACRc,SAAS,IAAI;QACbE;QACAK;QACAG,WAAW;IACb;IAEA,MAAMC,UAAU;QACdC,SAAS,MAAM3B,WAAW,IAAI,EAAEQ;QAChC,uDAAuD;QACvDoB,YAAY;IACd;IAEA,IAAI,CAACC,IAAI,GAAG,MAAMf,MAAMgB,MAAM,CAAC;QAACb;KAAK,EAAES,SAASlB;IAEhD,MAAMuB,cAAc;QAClBC,KAAK;YACH;gBACE1B,QAAQ;oBACN2B,KAAKhB,KAAKX,MAAM;gBAClB;YACF;SACD;IACH;IAEA,MAAMQ,MAAMoB,UAAU,CACpB;QACEC,MAAM;YACJ;gBACEC,KAAK;oBACHC,KAAKR,IAAIO,GAAG;gBACd;YACF;YACAL;YACA;gBACEb,QAAQ;oBACNe,KAAK;gBACP;YACF;YACA;gBACEtB,WAAW;oBACT2B,KAAK,IAAIlB,KAAKS,IAAIlB,SAAS;gBAC7B;YACF;SACD;IACH,GACA;QAAE4B,QAAQ;YAAErB,QAAQ;QAAE;IAAE,GACxBQ;IAGF,IAAIjB,cAAc,OAAO;QACvB,OAAO;IACT;IAEAoB,MAAMA,IAAIW,QAAQ;IAElBvC,UAAU;QACRc,SAAS,IAAI;QACbE,MAAMY;QACNP;QACAG,WAAW;IACb;IAEA,OAAOI;AACT,EAAC"}
+{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import {\n  buildVersionCollectionFields,\n  type CreateVersion,\n  resolveBranchVersionParent,\n} from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const createVersion: CreateVersion = async function createVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    returning,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  const branched = await resolveBranchVersionParent({\n    collectionSlug,\n    parent,\n    req,\n    versionData: versionData as Record<string, unknown>,\n  })\n\n  const data = {\n    autosave,\n    createdAt,\n    latest: true,\n    parent: branched.parent,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version: versionData,\n    ...(branched.versionData._branch\n      ? { _branch: branched.versionData._branch, _branchParent: branched.versionData._branchParent }\n      : {}),\n  }\n  if (!data.createdAt) {\n    data.createdAt = new Date().toISOString()\n  }\n\n  const fields = buildVersionCollectionFields(this.payload.config, collectionConfig)\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'write',\n  })\n\n  const options = {\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  }\n\n  let [doc] = await Model.create([data], options, req)\n\n  // No branch scoping needed here: a branch version's `parent` is the shadow\n  // row's own primary key, so main's chain and the branch's chain are already\n  // disjoint and `latest` clearing cannot cross between them.\n  const parentQuery = {\n    $or: [\n      {\n        parent: {\n          $eq: data.parent,\n        },\n      },\n    ],\n  }\n\n  await Model.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: doc._id,\n          },\n        },\n        parentQuery,\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n        {\n          updatedAt: {\n            $lt: new Date(doc.updatedAt),\n          },\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    options,\n  )\n\n  if (returning === false) {\n    return null\n  }\n\n  doc = doc.toObject()\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["buildVersionCollectionFields","resolveBranchVersionParent","getCollection","getSession","transform","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","returning","snapshot","updatedAt","versionData","collectionConfig","Model","adapter","versions","branched","data","latest","version","_branch","_branchParent","Date","toISOString","fields","payload","config","operation","options","session","timestamps","doc","create","parentQuery","$or","$eq","updateMany","$and","_id","$ne","$lt","$unset","toObject"],"mappings":"AAAA,SACEA,4BAA4B,EAE5BC,0BAA0B,QACrB,UAAS;AAIhB,SAASC,aAAa,QAAQ,2BAA0B;AACxD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,SAAS,EACTC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAGf,cAAc;QAChDgB,SAAS,IAAI;QACbX;QACAY,UAAU;IACZ;IAEA,MAAMC,WAAW,MAAMnB,2BAA2B;QAChDM;QACAE;QACAE;QACAI,aAAaA;IACf;IAEA,MAAMM,OAAO;QACXf;QACAE;QACAc,QAAQ;QACRb,QAAQW,SAASX,MAAM;QACvBC;QACAG;QACAC;QACAS,SAASR;QACT,GAAIK,SAASL,WAAW,CAACS,OAAO,GAC5B;YAAEA,SAASJ,SAASL,WAAW,CAACS,OAAO;YAAEC,eAAeL,SAASL,WAAW,CAACU,aAAa;QAAC,IAC3F,CAAC,CAAC;IACR;IACA,IAAI,CAACJ,KAAKb,SAAS,EAAE;QACnBa,KAAKb,SAAS,GAAG,IAAIkB,OAAOC,WAAW;IACzC;IAEA,MAAMC,SAAS5B,6BAA6B,IAAI,CAAC6B,OAAO,CAACC,MAAM,EAAEd;IAEjEZ,UAAU;QACRc,SAAS,IAAI;QACbG;QACAO;QACAG,WAAW;IACb;IAEA,MAAMC,UAAU;QACdC,SAAS,MAAM9B,WAAW,IAAI,EAAEQ;QAChC,uDAAuD;QACvDuB,YAAY;IACd;IAEA,IAAI,CAACC,IAAI,GAAG,MAAMlB,MAAMmB,MAAM,CAAC;QAACf;KAAK,EAAEW,SAASrB;IAEhD,2EAA2E;IAC3E,4EAA4E;IAC5E,4DAA4D;IAC5D,MAAM0B,cAAc;QAClBC,KAAK;YACH;gBACE7B,QAAQ;oBACN8B,KAAKlB,KAAKZ,MAAM;gBAClB;YACF;SACD;IACH;IAEA,MAAMQ,MAAMuB,UAAU,CACpB;QACEC,MAAM;YACJ;gBACEC,KAAK;oBACHC,KAAKR,IAAIO,GAAG;gBACd;YACF;YACAL;YACA;gBACEf,QAAQ;oBACNiB,KAAK;gBACP;YACF;YACA;gBACEzB,WAAW;oBACT8B,KAAK,IAAIlB,KAAKS,IAAIrB,SAAS;gBAC7B;YACF;SACD;IACH,GACA;QAAE+B,QAAQ;YAAEvB,QAAQ;QAAE;IAAE,GACxBU;IAGF,IAAIpB,cAAc,OAAO;QACvB,OAAO;IACT;IAEAuB,MAAMA,IAAIW,QAAQ;IAElB1C,UAAU;QACRc,SAAS,IAAI;QACbG,MAAMc;QACNP;QACAG,WAAW;IACb;IAEA,OAAOI;AACT,EAAC"}

package/dist/deleteBranchGlobal.d.ts

@@ -0,0 +1,10 @@
+import type { DeleteBranchGlobal } from 'payload';
+/**
+ * Drops a branch's copy of a global.
+ *
+ * Every global lives in one discriminated collection here, so the branch's copy is a
+ * sibling row identified by `globalType` and `_branch` — addressed directly rather than
+ * through any generic delete, since no other part of Payload deletes a global.
+ */
+export declare const deleteBranchGlobal: DeleteBranchGlobal;
+//# sourceMappingURL=deleteBranchGlobal.d.ts.map

package/dist/deleteBranchGlobal.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deleteBranchGlobal.d.ts","sourceRoot":"","sources":["../src/deleteBranchGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAOjD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,EAAE,kBAUhC,CAAA"}

package/dist/deleteBranchGlobal.js

@@ -0,0 +1,22 @@
+import { getGlobal } from './utilities/getEntity.js';
+import { getSession } from './utilities/getSession.js';
+/**
+ * Drops a branch's copy of a global.
+ *
+ * Every global lives in one discriminated collection here, so the branch's copy is a
+ * sibling row identified by `globalType` and `_branch` — addressed directly rather than
+ * through any generic delete, since no other part of Payload deletes a global.
+ */ export const deleteBranchGlobal = async function deleteBranchGlobal({ branch, globalSlug, req }) {
+    const { Model } = getGlobal({
+        adapter: this,
+        globalSlug
+    });
+    await Model.deleteOne({
+        _branch: branch,
+        globalType: globalSlug
+    }, {
+        session: await getSession(this, req)
+    });
+};
+
+//# sourceMappingURL=deleteBranchGlobal.js.map

package/dist/deleteBranchGlobal.js.map

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

package/dist/deleteOne.d.ts.map

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

package/dist/deleteOne.js

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

package/dist/deleteOne.js.map

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

package/dist/find.d.ts.map

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

package/dist/find.js

@@ -1,4 +1,4 @@
-import { flattenWhereToOperators } from 'payload';
+import { applyBranchIDProjection, flattenWhereToOperators, resolveBranchQuery, withBranchIDSelect } from 'payload';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { aggregatePaginate } from './utilities/aggregatePaginate.js';
@@ -8,11 +8,17 @@ import { getCollection } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { resolveJoins } from './utilities/resolveJoins.js';
 import { transform } from './utilities/transform.js';
-export const find = async function find({ collection: collectionSlug, draftsEnabled, joins = {}, limit = 0, locale, page, pagination, projection, req, select, sort: sortArg, where = {} }) {
+export const find = async function find({ branch, collection: collectionSlug, draftsEnabled, joins = {}, limit = 0, locale, page, pagination, projection, req, select, sort: sortArg, where = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug
     });
+    where = await resolveBranchQuery({
+        branch,
+        collectionSlug,
+        req,
+        where
+    }) ?? {};
     let hasNearConstraint = false;
     if (where) {
         const constraints = flattenWhereToOperators(where);
@@ -53,11 +59,17 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
         sort,
         useEstimatedCount
     };
-    if (select) {
+    const selectWithBranchID = withBranchIDSelect({
+        branch,
+        collectionSlug,
+        req,
+        select
+    });
+    if (selectWithBranchID) {
         paginationOptions.projection = buildProjectionFromSelect({
             adapter: this,
             fields: collectionConfig.flattenedFields,
-            select
+            select: selectWithBranchID
         });
     }
     if (this.collation) {
@@ -112,7 +124,8 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
         joins,
         locale,
         projection: paginationOptions.projection,
-        query
+        query,
+        req
     });
     if (aggregate || sortAggregation.length > 0) {
         result = await aggregatePaginate({
@@ -148,6 +161,12 @@ export const find = async function find({ collection: collectionSlug, draftsEnab
         fields: collectionConfig.fields,
         operation: 'read'
     });
+    applyBranchIDProjection({
+        branch,
+        collectionSlug,
+        docs: result.docs,
+        req
+    });
     return result;
 };
 

package/dist/find.js.map

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

package/dist/findDistinct.d.ts.map

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

package/dist/findDistinct.js

@@ -1,4 +1,4 @@
-import { getFieldByPath } from 'payload';
+import { getFieldByPath, resolveBranchQuery } from 'payload';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { getCollection } from './utilities/getEntity.js';
@@ -29,7 +29,15 @@ export const findDistinct = async function(args) {
         adapter: this,
         collectionSlug: args.collection
     });
-    const { where = {} } = args;
+    // Distinct values describe the documents the caller can see, so they are subject to
+    // the same branch predicate as a list read. Without it a branch's shadow rows fed
+    // main's distinct values and the branch's own edits were invisible in its own.
+    const where = await resolveBranchQuery({
+        branch: args.branch,
+        collectionSlug: args.collection,
+        req: args.req,
+        where: args.where
+    }) ?? {};
     let sortAggregation = [];
     const sort = buildSortParam({
         adapter: this,

package/dist/findDistinct.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\nimport type { FindDistinct, FlattenedField } from 'payload'\n\nimport { getFieldByPath } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nconst sanitizeGroupID = (id: any) => {\n  if (id && typeof id === 'object' && '_field' in id) {\n    return id._field\n  }\n\n  return id\n}\n\nconst getSortAggregation = ({\n  fieldPath,\n  hasSortAggregationAndHasMany,\n  sortDirection,\n  sortProperty,\n}: {\n  fieldPath: string\n  hasSortAggregationAndHasMany: boolean\n  sortDirection: -1 | 1\n  sortProperty: string\n}): Record<string, -1 | 1> => {\n  let resolvedSortProperty: string\n\n  if (hasSortAggregationAndHasMany) {\n    if (sortProperty === fieldPath) {\n      resolvedSortProperty = `_id._field`\n    } else {\n      resolvedSortProperty = `_id._sort`\n    }\n  } else {\n    resolvedSortProperty = sortProperty === fieldPath ? '_id' : '_sort'\n  }\n\n  return { [`${resolvedSortProperty}`]: sortDirection }\n}\n\nexport const findDistinct: FindDistinct = async function (this: MongooseAdapter, args) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug: args.collection,\n  })\n\n  const { where = {} } = args\n\n  let sortAggregation: PipelineStage[] = []\n\n  const sort = buildSortParam({\n    adapter: this,\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    sortAggregation,\n    timestamps: true,\n  })\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug: args.collection,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    where,\n  })\n\n  const fieldPathResult = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })\n  let fieldPath = args.field\n  if (fieldPathResult?.pathHasLocalized && args.locale) {\n    fieldPath = fieldPathResult.localizedPath.replace('<locale>', args.locale)\n  }\n\n  const page = args.page || 1\n\n  let sortProperty = Object.keys(sort)[0]! // assert because buildSortParam always returns at least 1 key.\n  const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n  let currentFields = collectionConfig.flattenedFields\n  let foundField: FlattenedField | null = null\n\n  let rels: {\n    fieldPath: string\n    relationTo: string\n  }[] = []\n\n  let tempPath = ''\n  let insideRelation = false\n\n  const segments = args.field.split('.')\n\n  for (let i = 0; i < segments.length; i++) {\n    const segment = segments[i]\n    const field = currentFields.find((e) => e.name === segment)\n    if (rels.length) {\n      insideRelation = true\n    }\n\n    if (!field) {\n      break\n    }\n\n    if (tempPath) {\n      tempPath = `${tempPath}.${field.name}`\n    } else {\n      tempPath = field.name\n    }\n\n    if ('flattenedFields' in field) {\n      currentFields = field.flattenedFields\n      continue\n    }\n\n    if (\n      (field.type === 'relationship' || field.type === 'upload') &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (i === segments.length - 2 && segments[i + 1] === 'id') {\n        foundField = field\n        fieldPath = tempPath\n        break\n      }\n      rels.push({ fieldPath: tempPath, relationTo: field.relationTo })\n      currentFields = this.payload.collections[field.relationTo]?.config\n        .flattenedFields as FlattenedField[]\n      continue\n    }\n    foundField = field\n  }\n\n  const resolvedField = foundField || fieldPathResult?.field\n  const isHasManyValue = resolvedField && 'hasMany' in resolvedField && resolvedField\n\n  let relationLookup: null | PipelineStage[] = null\n\n  if (!insideRelation) {\n    rels = []\n  }\n\n  if (rels.length) {\n    if (sortProperty.startsWith('_')) {\n      const sortWithoutRelationPrefix = sortProperty.replace(/^_+/, '')\n      const lastFieldPath = rels.at(-1)?.fieldPath as string\n      if (sortWithoutRelationPrefix.startsWith(lastFieldPath)) {\n        sortProperty = sortWithoutRelationPrefix\n      }\n    }\n    relationLookup = rels.reduce<PipelineStage[]>((acc, { fieldPath, relationTo }) => {\n      sortAggregation = sortAggregation.filter((each) => {\n        if ('$lookup' in each && each.$lookup.as.replace(/^_+/, '') === fieldPath) {\n          return false\n        }\n\n        return true\n      })\n      const { Model: foreignModel } = getCollection({ adapter: this, collectionSlug: relationTo })\n      acc.push({\n        $lookup: {\n          as: fieldPath,\n          foreignField: '_id',\n          from: foreignModel.collection.name,\n          localField: fieldPath,\n        },\n      })\n      acc.push({ $unwind: `$${fieldPath}` })\n      return acc\n    }, [])\n  }\n\n  let $unwind: any = ''\n  let $group: any = null\n  if (\n    isHasManyValue &&\n    sortAggregation.length &&\n    sortAggregation[0] &&\n    '$lookup' in sortAggregation[0]\n  ) {\n    $unwind = { path: `$${sortAggregation[0].$lookup.as}`, preserveNullAndEmptyArrays: true }\n    $group = {\n      _id: {\n        _field: `$${sortAggregation[0].$lookup.as}._id`,\n        _sort: `$${sortProperty}`,\n      },\n    }\n  } else if (isHasManyValue) {\n    $unwind = { path: `$${args.field}`, preserveNullAndEmptyArrays: true }\n  }\n\n  if (!$group) {\n    $group = {\n      _id: `$${fieldPath}`,\n      ...(sortProperty === fieldPath\n        ? {}\n        : {\n            _sort: { $max: `$${sortProperty}` },\n          }),\n    }\n  }\n\n  const pipeline: PipelineStage[] = [\n    {\n      $match: query,\n    },\n    ...(sortAggregation.length > 0 ? sortAggregation : []),\n    ...(relationLookup?.length ? relationLookup : []),\n    ...($unwind\n      ? [\n          {\n            $unwind,\n          },\n        ]\n      : []),\n    {\n      $group,\n    },\n    {\n      $sort: getSortAggregation({\n        fieldPath,\n        hasSortAggregationAndHasMany: Boolean(isHasManyValue) && Boolean(sortAggregation.length),\n        sortDirection,\n        sortProperty,\n      }),\n    },\n  ]\n\n  const session = await getSession(this, args.req)\n\n  const getValues = async () => {\n    return Model.aggregate(pipeline, { session }).then((res) =>\n      res.map((each) => ({\n        [args.field]: JSON.parse(JSON.stringify(sanitizeGroupID(each._id))),\n      })),\n    )\n  }\n\n  if (args.limit) {\n    pipeline.push({\n      $skip: (page - 1) * args.limit,\n    })\n    pipeline.push({ $limit: args.limit })\n\n    // Build count pipeline with the same structure as the main pipeline\n    // to ensure relationship lookups are included\n    const countPipeline: PipelineStage[] = [\n      {\n        $match: query,\n      },\n      ...(sortAggregation.length > 0 ? sortAggregation : []),\n      ...(relationLookup?.length ? relationLookup : []),\n      ...($unwind\n        ? [\n            {\n              $unwind,\n            },\n          ]\n        : []),\n      {\n        $group,\n      },\n      { $count: 'count' },\n    ]\n\n    const totalDocs = await Model.aggregate(countPipeline, {\n      session,\n    }).then((res) => res[0]?.count ?? 0)\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values: await getValues(),\n    }\n  }\n\n  const values = await getValues()\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["getFieldByPath","buildQuery","buildSortParam","getCollection","getSession","sanitizeGroupID","id","_field","getSortAggregation","fieldPath","hasSortAggregationAndHasMany","sortDirection","sortProperty","resolvedSortProperty","findDistinct","args","collectionConfig","Model","adapter","collectionSlug","collection","where","sortAggregation","sort","config","payload","fields","flattenedFields","locale","field","timestamps","query","fieldPathResult","includeRelationships","path","pathHasLocalized","localizedPath","replace","page","Object","keys","currentFields","foundField","rels","tempPath","insideRelation","segments","split","i","length","segment","find","e","name","type","relationTo","push","collections","resolvedField","isHasManyValue","relationLookup","startsWith","sortWithoutRelationPrefix","lastFieldPath","at","reduce","acc","filter","each","$lookup","as","foreignModel","foreignField","from","localField","$unwind","$group","preserveNullAndEmptyArrays","_id","_sort","$max","pipeline","$match","$sort","Boolean","session","req","getValues","aggregate","then","res","map","JSON","parse","stringify","limit","$skip","$limit","countPipeline","$count","totalDocs","count","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage","values"],"mappings":"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"}
+{"version":3,"sources":["../src/findDistinct.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\nimport type { FindDistinct, FlattenedField } from 'payload'\n\nimport { getFieldByPath, resolveBranchQuery } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\n\nconst sanitizeGroupID = (id: any) => {\n  if (id && typeof id === 'object' && '_field' in id) {\n    return id._field\n  }\n\n  return id\n}\n\nconst getSortAggregation = ({\n  fieldPath,\n  hasSortAggregationAndHasMany,\n  sortDirection,\n  sortProperty,\n}: {\n  fieldPath: string\n  hasSortAggregationAndHasMany: boolean\n  sortDirection: -1 | 1\n  sortProperty: string\n}): Record<string, -1 | 1> => {\n  let resolvedSortProperty: string\n\n  if (hasSortAggregationAndHasMany) {\n    if (sortProperty === fieldPath) {\n      resolvedSortProperty = `_id._field`\n    } else {\n      resolvedSortProperty = `_id._sort`\n    }\n  } else {\n    resolvedSortProperty = sortProperty === fieldPath ? '_id' : '_sort'\n  }\n\n  return { [`${resolvedSortProperty}`]: sortDirection }\n}\n\nexport const findDistinct: FindDistinct = async function (this: MongooseAdapter, args) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug: args.collection,\n  })\n\n  // Distinct values describe the documents the caller can see, so they are subject to\n  // the same branch predicate as a list read. Without it a branch's shadow rows fed\n  // main's distinct values and the branch's own edits were invisible in its own.\n  const where =\n    (await resolveBranchQuery({\n      branch: args.branch,\n      collectionSlug: args.collection,\n      req: args.req,\n      where: args.where,\n    })) ?? {}\n\n  let sortAggregation: PipelineStage[] = []\n\n  const sort = buildSortParam({\n    adapter: this,\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    sort: args.sort ?? args.field,\n    sortAggregation,\n    timestamps: true,\n  })\n\n  const query = await buildQuery({\n    adapter: this,\n    collectionSlug: args.collection,\n    fields: collectionConfig.flattenedFields,\n    locale: args.locale,\n    where,\n  })\n\n  const fieldPathResult = getFieldByPath({\n    config: this.payload.config,\n    fields: collectionConfig.flattenedFields,\n    includeRelationships: true,\n    path: args.field,\n  })\n  let fieldPath = args.field\n  if (fieldPathResult?.pathHasLocalized && args.locale) {\n    fieldPath = fieldPathResult.localizedPath.replace('<locale>', args.locale)\n  }\n\n  const page = args.page || 1\n\n  let sortProperty = Object.keys(sort)[0]! // assert because buildSortParam always returns at least 1 key.\n  const sortDirection = sort[sortProperty] === 'asc' ? 1 : -1\n\n  let currentFields = collectionConfig.flattenedFields\n  let foundField: FlattenedField | null = null\n\n  let rels: {\n    fieldPath: string\n    relationTo: string\n  }[] = []\n\n  let tempPath = ''\n  let insideRelation = false\n\n  const segments = args.field.split('.')\n\n  for (let i = 0; i < segments.length; i++) {\n    const segment = segments[i]\n    const field = currentFields.find((e) => e.name === segment)\n    if (rels.length) {\n      insideRelation = true\n    }\n\n    if (!field) {\n      break\n    }\n\n    if (tempPath) {\n      tempPath = `${tempPath}.${field.name}`\n    } else {\n      tempPath = field.name\n    }\n\n    if ('flattenedFields' in field) {\n      currentFields = field.flattenedFields\n      continue\n    }\n\n    if (\n      (field.type === 'relationship' || field.type === 'upload') &&\n      typeof field.relationTo === 'string'\n    ) {\n      if (i === segments.length - 2 && segments[i + 1] === 'id') {\n        foundField = field\n        fieldPath = tempPath\n        break\n      }\n      rels.push({ fieldPath: tempPath, relationTo: field.relationTo })\n      currentFields = this.payload.collections[field.relationTo]?.config\n        .flattenedFields as FlattenedField[]\n      continue\n    }\n    foundField = field\n  }\n\n  const resolvedField = foundField || fieldPathResult?.field\n  const isHasManyValue = resolvedField && 'hasMany' in resolvedField && resolvedField\n\n  let relationLookup: null | PipelineStage[] = null\n\n  if (!insideRelation) {\n    rels = []\n  }\n\n  if (rels.length) {\n    if (sortProperty.startsWith('_')) {\n      const sortWithoutRelationPrefix = sortProperty.replace(/^_+/, '')\n      const lastFieldPath = rels.at(-1)?.fieldPath as string\n      if (sortWithoutRelationPrefix.startsWith(lastFieldPath)) {\n        sortProperty = sortWithoutRelationPrefix\n      }\n    }\n    relationLookup = rels.reduce<PipelineStage[]>((acc, { fieldPath, relationTo }) => {\n      sortAggregation = sortAggregation.filter((each) => {\n        if ('$lookup' in each && each.$lookup.as.replace(/^_+/, '') === fieldPath) {\n          return false\n        }\n\n        return true\n      })\n      const { Model: foreignModel } = getCollection({ adapter: this, collectionSlug: relationTo })\n      acc.push({\n        $lookup: {\n          as: fieldPath,\n          foreignField: '_id',\n          from: foreignModel.collection.name,\n          localField: fieldPath,\n        },\n      })\n      acc.push({ $unwind: `$${fieldPath}` })\n      return acc\n    }, [])\n  }\n\n  let $unwind: any = ''\n  let $group: any = null\n  if (\n    isHasManyValue &&\n    sortAggregation.length &&\n    sortAggregation[0] &&\n    '$lookup' in sortAggregation[0]\n  ) {\n    $unwind = { path: `$${sortAggregation[0].$lookup.as}`, preserveNullAndEmptyArrays: true }\n    $group = {\n      _id: {\n        _field: `$${sortAggregation[0].$lookup.as}._id`,\n        _sort: `$${sortProperty}`,\n      },\n    }\n  } else if (isHasManyValue) {\n    $unwind = { path: `$${args.field}`, preserveNullAndEmptyArrays: true }\n  }\n\n  if (!$group) {\n    $group = {\n      _id: `$${fieldPath}`,\n      ...(sortProperty === fieldPath\n        ? {}\n        : {\n            _sort: { $max: `$${sortProperty}` },\n          }),\n    }\n  }\n\n  const pipeline: PipelineStage[] = [\n    {\n      $match: query,\n    },\n    ...(sortAggregation.length > 0 ? sortAggregation : []),\n    ...(relationLookup?.length ? relationLookup : []),\n    ...($unwind\n      ? [\n          {\n            $unwind,\n          },\n        ]\n      : []),\n    {\n      $group,\n    },\n    {\n      $sort: getSortAggregation({\n        fieldPath,\n        hasSortAggregationAndHasMany: Boolean(isHasManyValue) && Boolean(sortAggregation.length),\n        sortDirection,\n        sortProperty,\n      }),\n    },\n  ]\n\n  const session = await getSession(this, args.req)\n\n  const getValues = async () => {\n    return Model.aggregate(pipeline, { session }).then((res) =>\n      res.map((each) => ({\n        [args.field]: JSON.parse(JSON.stringify(sanitizeGroupID(each._id))),\n      })),\n    )\n  }\n\n  if (args.limit) {\n    pipeline.push({\n      $skip: (page - 1) * args.limit,\n    })\n    pipeline.push({ $limit: args.limit })\n\n    // Build count pipeline with the same structure as the main pipeline\n    // to ensure relationship lookups are included\n    const countPipeline: PipelineStage[] = [\n      {\n        $match: query,\n      },\n      ...(sortAggregation.length > 0 ? sortAggregation : []),\n      ...(relationLookup?.length ? relationLookup : []),\n      ...($unwind\n        ? [\n            {\n              $unwind,\n            },\n          ]\n        : []),\n      {\n        $group,\n      },\n      { $count: 'count' },\n    ]\n\n    const totalDocs = await Model.aggregate(countPipeline, {\n      session,\n    }).then((res) => res[0]?.count ?? 0)\n    const totalPages = Math.ceil(totalDocs / args.limit)\n    const hasPrevPage = page > 1\n    const hasNextPage = totalPages > page\n    const pagingCounter = (page - 1) * args.limit + 1\n\n    return {\n      hasNextPage,\n      hasPrevPage,\n      limit: args.limit,\n      nextPage: hasNextPage ? page + 1 : null,\n      page,\n      pagingCounter,\n      prevPage: hasPrevPage ? page - 1 : null,\n      totalDocs,\n      totalPages,\n      values: await getValues(),\n    }\n  }\n\n  const values = await getValues()\n\n  return {\n    hasNextPage: false,\n    hasPrevPage: false,\n    limit: 0,\n    page: 1,\n    pagingCounter: 1,\n    totalDocs: values.length,\n    totalPages: 1,\n    values,\n  }\n}\n"],"names":["getFieldByPath","resolveBranchQuery","buildQuery","buildSortParam","getCollection","getSession","sanitizeGroupID","id","_field","getSortAggregation","fieldPath","hasSortAggregationAndHasMany","sortDirection","sortProperty","resolvedSortProperty","findDistinct","args","collectionConfig","Model","adapter","collectionSlug","collection","where","branch","req","sortAggregation","sort","config","payload","fields","flattenedFields","locale","field","timestamps","query","fieldPathResult","includeRelationships","path","pathHasLocalized","localizedPath","replace","page","Object","keys","currentFields","foundField","rels","tempPath","insideRelation","segments","split","i","length","segment","find","e","name","type","relationTo","push","collections","resolvedField","isHasManyValue","relationLookup","startsWith","sortWithoutRelationPrefix","lastFieldPath","at","reduce","acc","filter","each","$lookup","as","foreignModel","foreignField","from","localField","$unwind","$group","preserveNullAndEmptyArrays","_id","_sort","$max","pipeline","$match","$sort","Boolean","session","getValues","aggregate","then","res","map","JSON","parse","stringify","limit","$skip","$limit","countPipeline","$count","totalDocs","count","totalPages","Math","ceil","hasPrevPage","hasNextPage","pagingCounter","nextPage","prevPage","values"],"mappings":"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"}