@payloadcms/db-mongodb 4.0.0-internal.a6582c6 → 4.0.0-internal.a9d2e4e

package/dist/queries/parseParams.d.ts

@@ -1,11 +1,13 @@
-import type { FlattenedField, Payload, Where } from 'payload';
-export declare function parseParams({ collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, where, }: {
+import type { FlattenedField, Payload, PayloadRequest, Where } from 'payload';
+export declare function parseParams({ branch, collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, req, where, }: {
+    branch?: false | string;
     collectionSlug?: string;
     fields: FlattenedField[];
     globalSlug?: string;
     locale?: string;
     parentIsLocalized: boolean;
     payload: Payload;
+    req?: Partial<PayloadRequest>;
     where: Where;
 }): Promise<Record<string, unknown>>;
 //# sourceMappingURL=parseParams.d.ts.map

package/dist/queries/parseParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseParams.d.ts","sourceRoot":"","sources":["../../src/queries/parseParams.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAY,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAQvE,wBAAsB,WAAW,CAAC,EAChC,cAAc,EACd,MAAM,EACN,UAAU,EACV,MAAM,EACN,iBAAiB,EACjB,OAAO,EACP,KAAK,GACN,EAAE;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAqFnC"}
+{"version":3,"file":"parseParams.d.ts","sourceRoot":"","sources":["../../src/queries/parseParams.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAY,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAQvF,wBAAsB,WAAW,CAAC,EAChC,MAAM,EACN,cAAc,EACd,MAAM,EACN,UAAU,EACV,MAAM,EACN,iBAAiB,EACjB,OAAO,EACP,GAAG,EACH,KAAK,GACN,EAAE;IACD,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,KAAK,EAAE,KAAK,CAAA;CACb,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAyFnC"}

package/dist/queries/parseParams.js

@@ -2,7 +2,7 @@ import { deepMergeWithCombinedArrays } from 'payload';
 import { validOperatorSet } from 'payload/shared';
 import { buildAndOrConditions } from './buildAndOrConditions.js';
 import { buildSearchParam } from './buildSearchParams.js';
-export async function parseParams({ collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, where }) {
+export async function parseParams({ branch, collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, req, where }) {
     let result = {};
     if (typeof where === 'object') {
         // We need to determine if the whereKey is an AND, OR, or a schema path
@@ -16,12 +16,14 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
             }
             if (Array.isArray(condition)) {
                 const builtConditions = await buildAndOrConditions({
+                    branch,
                     collectionSlug,
                     fields,
                     globalSlug,
                     locale,
                     parentIsLocalized,
                     payload,
+                    req,
                     where: condition
                 });
                 if (builtConditions.length > 0 && conditionOperator !== null) {
@@ -36,6 +38,7 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
                     const validOperators = Object.keys(pathOperators).filter((operator)=>validOperatorSet.has(operator));
                     for (const operator of validOperators){
                         const searchParam = await buildSearchParam({
+                            branch,
                             collectionSlug,
                             fields,
                             globalSlug,
@@ -44,6 +47,7 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
                             operator,
                             parentIsLocalized,
                             payload,
+                            req,
                             val: pathOperators[operator]
                         });
                         if (searchParam?.value && searchParam?.path) {

package/dist/queries/parseParams.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/parseParams.ts"],"sourcesContent":["import type { FilterQuery } from 'mongoose'\nimport type { FlattenedField, Operator, Payload, Where } from 'payload'\n\nimport { deepMergeWithCombinedArrays } from 'payload'\nimport { validOperatorSet } from 'payload/shared'\n\nimport { buildAndOrConditions } from './buildAndOrConditions.js'\nimport { buildSearchParam } from './buildSearchParams.js'\n\nexport async function parseParams({\n  collectionSlug,\n  fields,\n  globalSlug,\n  locale,\n  parentIsLocalized,\n  payload,\n  where,\n}: {\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  locale?: string\n  parentIsLocalized: boolean\n  payload: Payload\n  where: Where\n}): Promise<Record<string, unknown>> {\n  let result = {} as FilterQuery<any>\n\n  if (typeof where === 'object') {\n    // We need to determine if the whereKey is an AND, OR, or a schema path\n    for (const relationOrPath of Object.keys(where)) {\n      const condition = where[relationOrPath]\n      let conditionOperator: '$and' | '$or' | null = null\n      if (relationOrPath.toLowerCase() === 'and') {\n        conditionOperator = '$and'\n      } else if (relationOrPath.toLowerCase() === 'or') {\n        conditionOperator = '$or'\n      }\n      if (Array.isArray(condition)) {\n        const builtConditions = await buildAndOrConditions({\n          collectionSlug,\n          fields,\n          globalSlug,\n          locale,\n          parentIsLocalized,\n          payload,\n          where: condition,\n        })\n        if (builtConditions.length > 0 && conditionOperator !== null) {\n          result[conditionOperator] = builtConditions\n        }\n      } else {\n        // It's a path - and there can be multiple comparisons on a single path.\n        // For example - title like 'test' and title not equal to 'tester'\n        // So we need to loop on keys again here to handle each operator independently\n        const pathOperators = where[relationOrPath]\n        if (typeof pathOperators === 'object') {\n          const validOperators: Operator[] = Object.keys(pathOperators).filter((operator) =>\n            validOperatorSet.has(operator as Operator),\n          ) as Operator[]\n\n          for (const operator of validOperators) {\n            const searchParam = await buildSearchParam({\n              collectionSlug,\n              fields,\n              globalSlug,\n              incomingPath: relationOrPath,\n              locale,\n              operator,\n              parentIsLocalized,\n              payload,\n              val: (pathOperators as Record<string, Where>)[operator],\n            })\n\n            if (searchParam?.value && searchParam?.path) {\n              if (validOperators.length > 1) {\n                if (!result.$and) {\n                  result.$and = []\n                }\n                result.$and.push({\n                  [searchParam.path]: searchParam.value,\n                })\n              } else {\n                if (result[searchParam.path]) {\n                  if (!result.$and) {\n                    result.$and = []\n                  }\n\n                  result.$and.push({ [searchParam.path]: result[searchParam.path] })\n                  result.$and.push({\n                    [searchParam.path]: searchParam.value,\n                  })\n                  delete result[searchParam.path]\n                } else {\n                  result[searchParam.path] = searchParam.value\n                }\n              }\n            } else if (typeof searchParam?.value === 'object') {\n              result = deepMergeWithCombinedArrays(result, searchParam.value ?? {}, {\n                // dont clone Types.ObjectIDs\n                clone: false,\n              })\n            }\n          }\n        }\n      }\n    }\n  }\n\n  return result\n}\n"],"names":["deepMergeWithCombinedArrays","validOperatorSet","buildAndOrConditions","buildSearchParam","parseParams","collectionSlug","fields","globalSlug","locale","parentIsLocalized","payload","where","result","relationOrPath","Object","keys","condition","conditionOperator","toLowerCase","Array","isArray","builtConditions","length","pathOperators","validOperators","filter","operator","has","searchParam","incomingPath","val","value","path","$and","push","clone"],"mappings":"AAGA,SAASA,2BAA2B,QAAQ,UAAS;AACrD,SAASC,gBAAgB,QAAQ,iBAAgB;AAEjD,SAASC,oBAAoB,QAAQ,4BAA2B;AAChE,SAASC,gBAAgB,QAAQ,yBAAwB;AAEzD,OAAO,eAAeC,YAAY,EAChCC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,KAAK,EASN;IACC,IAAIC,SAAS,CAAC;IAEd,IAAI,OAAOD,UAAU,UAAU;QAC7B,uEAAuE;QACvE,KAAK,MAAME,kBAAkBC,OAAOC,IAAI,CAACJ,OAAQ;YAC/C,MAAMK,YAAYL,KAAK,CAACE,eAAe;YACvC,IAAII,oBAA2C;YAC/C,IAAIJ,eAAeK,WAAW,OAAO,OAAO;gBAC1CD,oBAAoB;YACtB,OAAO,IAAIJ,eAAeK,WAAW,OAAO,MAAM;gBAChDD,oBAAoB;YACtB;YACA,IAAIE,MAAMC,OAAO,CAACJ,YAAY;gBAC5B,MAAMK,kBAAkB,MAAMnB,qBAAqB;oBACjDG;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC,OAAOK;gBACT;gBACA,IAAIK,gBAAgBC,MAAM,GAAG,KAAKL,sBAAsB,MAAM;oBAC5DL,MAAM,CAACK,kBAAkB,GAAGI;gBAC9B;YACF,OAAO;gBACL,wEAAwE;gBACxE,kEAAkE;gBAClE,8EAA8E;gBAC9E,MAAME,gBAAgBZ,KAAK,CAACE,eAAe;gBAC3C,IAAI,OAAOU,kBAAkB,UAAU;oBACrC,MAAMC,iBAA6BV,OAAOC,IAAI,CAACQ,eAAeE,MAAM,CAAC,CAACC,WACpEzB,iBAAiB0B,GAAG,CAACD;oBAGvB,KAAK,MAAMA,YAAYF,eAAgB;wBACrC,MAAMI,cAAc,MAAMzB,iBAAiB;4BACzCE;4BACAC;4BACAC;4BACAsB,cAAchB;4BACdL;4BACAkB;4BACAjB;4BACAC;4BACAoB,KAAK,AAACP,aAAuC,CAACG,SAAS;wBACzD;wBAEA,IAAIE,aAAaG,SAASH,aAAaI,MAAM;4BAC3C,IAAIR,eAAeF,MAAM,GAAG,GAAG;gCAC7B,IAAI,CAACV,OAAOqB,IAAI,EAAE;oCAChBrB,OAAOqB,IAAI,GAAG,EAAE;gCAClB;gCACArB,OAAOqB,IAAI,CAACC,IAAI,CAAC;oCACf,CAACN,YAAYI,IAAI,CAAC,EAAEJ,YAAYG,KAAK;gCACvC;4BACF,OAAO;gCACL,IAAInB,MAAM,CAACgB,YAAYI,IAAI,CAAC,EAAE;oCAC5B,IAAI,CAACpB,OAAOqB,IAAI,EAAE;wCAChBrB,OAAOqB,IAAI,GAAG,EAAE;oCAClB;oCAEArB,OAAOqB,IAAI,CAACC,IAAI,CAAC;wCAAE,CAACN,YAAYI,IAAI,CAAC,EAAEpB,MAAM,CAACgB,YAAYI,IAAI,CAAC;oCAAC;oCAChEpB,OAAOqB,IAAI,CAACC,IAAI,CAAC;wCACf,CAACN,YAAYI,IAAI,CAAC,EAAEJ,YAAYG,KAAK;oCACvC;oCACA,OAAOnB,MAAM,CAACgB,YAAYI,IAAI,CAAC;gCACjC,OAAO;oCACLpB,MAAM,CAACgB,YAAYI,IAAI,CAAC,GAAGJ,YAAYG,KAAK;gCAC9C;4BACF;wBACF,OAAO,IAAI,OAAOH,aAAaG,UAAU,UAAU;4BACjDnB,SAASZ,4BAA4BY,QAAQgB,YAAYG,KAAK,IAAI,CAAC,GAAG;gCACpE,6BAA6B;gCAC7BI,OAAO;4BACT;wBACF;oBACF;gBACF;YACF;QACF;IACF;IAEA,OAAOvB;AACT"}
+{"version":3,"sources":["../../src/queries/parseParams.ts"],"sourcesContent":["import type { QueryFilter } from 'mongoose'\nimport type { FlattenedField, Operator, Payload, PayloadRequest, Where } from 'payload'\n\nimport { deepMergeWithCombinedArrays } from 'payload'\nimport { validOperatorSet } from 'payload/shared'\n\nimport { buildAndOrConditions } from './buildAndOrConditions.js'\nimport { buildSearchParam } from './buildSearchParams.js'\n\nexport async function parseParams({\n  branch,\n  collectionSlug,\n  fields,\n  globalSlug,\n  locale,\n  parentIsLocalized,\n  payload,\n  req,\n  where,\n}: {\n  branch?: false | string\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  locale?: string\n  parentIsLocalized: boolean\n  payload: Payload\n  req?: Partial<PayloadRequest>\n  where: Where\n}): Promise<Record<string, unknown>> {\n  let result = {} as QueryFilter<any>\n\n  if (typeof where === 'object') {\n    // We need to determine if the whereKey is an AND, OR, or a schema path\n    for (const relationOrPath of Object.keys(where)) {\n      const condition = where[relationOrPath]\n      let conditionOperator: '$and' | '$or' | null = null\n      if (relationOrPath.toLowerCase() === 'and') {\n        conditionOperator = '$and'\n      } else if (relationOrPath.toLowerCase() === 'or') {\n        conditionOperator = '$or'\n      }\n      if (Array.isArray(condition)) {\n        const builtConditions = await buildAndOrConditions({\n          branch,\n          collectionSlug,\n          fields,\n          globalSlug,\n          locale,\n          parentIsLocalized,\n          payload,\n          req,\n          where: condition,\n        })\n        if (builtConditions.length > 0 && conditionOperator !== null) {\n          result[conditionOperator] = builtConditions\n        }\n      } else {\n        // It's a path - and there can be multiple comparisons on a single path.\n        // For example - title like 'test' and title not equal to 'tester'\n        // So we need to loop on keys again here to handle each operator independently\n        const pathOperators = where[relationOrPath]\n        if (typeof pathOperators === 'object') {\n          const validOperators: Operator[] = Object.keys(pathOperators).filter((operator) =>\n            validOperatorSet.has(operator as Operator),\n          ) as Operator[]\n\n          for (const operator of validOperators) {\n            const searchParam = await buildSearchParam({\n              branch,\n              collectionSlug,\n              fields,\n              globalSlug,\n              incomingPath: relationOrPath,\n              locale,\n              operator,\n              parentIsLocalized,\n              payload,\n              req,\n              val: (pathOperators as Record<string, Where>)[operator],\n            })\n\n            if (searchParam?.value && searchParam?.path) {\n              if (validOperators.length > 1) {\n                if (!result.$and) {\n                  result.$and = []\n                }\n                result.$and.push({\n                  [searchParam.path]: searchParam.value,\n                })\n              } else {\n                if (result[searchParam.path]) {\n                  if (!result.$and) {\n                    result.$and = []\n                  }\n\n                  result.$and.push({ [searchParam.path]: result[searchParam.path] })\n                  result.$and.push({\n                    [searchParam.path]: searchParam.value,\n                  })\n                  delete result[searchParam.path]\n                } else {\n                  result[searchParam.path] = searchParam.value\n                }\n              }\n            } else if (typeof searchParam?.value === 'object') {\n              result = deepMergeWithCombinedArrays(result, searchParam.value ?? {}, {\n                // dont clone Types.ObjectIDs\n                clone: false,\n              })\n            }\n          }\n        }\n      }\n    }\n  }\n\n  return result\n}\n"],"names":["deepMergeWithCombinedArrays","validOperatorSet","buildAndOrConditions","buildSearchParam","parseParams","branch","collectionSlug","fields","globalSlug","locale","parentIsLocalized","payload","req","where","result","relationOrPath","Object","keys","condition","conditionOperator","toLowerCase","Array","isArray","builtConditions","length","pathOperators","validOperators","filter","operator","has","searchParam","incomingPath","val","value","path","$and","push","clone"],"mappings":"AAGA,SAASA,2BAA2B,QAAQ,UAAS;AACrD,SAASC,gBAAgB,QAAQ,iBAAgB;AAEjD,SAASC,oBAAoB,QAAQ,4BAA2B;AAChE,SAASC,gBAAgB,QAAQ,yBAAwB;AAEzD,OAAO,eAAeC,YAAY,EAChCC,MAAM,EACNC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,GAAG,EACHC,KAAK,EAWN;IACC,IAAIC,SAAS,CAAC;IAEd,IAAI,OAAOD,UAAU,UAAU;QAC7B,uEAAuE;QACvE,KAAK,MAAME,kBAAkBC,OAAOC,IAAI,CAACJ,OAAQ;YAC/C,MAAMK,YAAYL,KAAK,CAACE,eAAe;YACvC,IAAII,oBAA2C;YAC/C,IAAIJ,eAAeK,WAAW,OAAO,OAAO;gBAC1CD,oBAAoB;YACtB,OAAO,IAAIJ,eAAeK,WAAW,OAAO,MAAM;gBAChDD,oBAAoB;YACtB;YACA,IAAIE,MAAMC,OAAO,CAACJ,YAAY;gBAC5B,MAAMK,kBAAkB,MAAMrB,qBAAqB;oBACjDG;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC;oBACAC,OAAOK;gBACT;gBACA,IAAIK,gBAAgBC,MAAM,GAAG,KAAKL,sBAAsB,MAAM;oBAC5DL,MAAM,CAACK,kBAAkB,GAAGI;gBAC9B;YACF,OAAO;gBACL,wEAAwE;gBACxE,kEAAkE;gBAClE,8EAA8E;gBAC9E,MAAME,gBAAgBZ,KAAK,CAACE,eAAe;gBAC3C,IAAI,OAAOU,kBAAkB,UAAU;oBACrC,MAAMC,iBAA6BV,OAAOC,IAAI,CAACQ,eAAeE,MAAM,CAAC,CAACC,WACpE3B,iBAAiB4B,GAAG,CAACD;oBAGvB,KAAK,MAAMA,YAAYF,eAAgB;wBACrC,MAAMI,cAAc,MAAM3B,iBAAiB;4BACzCE;4BACAC;4BACAC;4BACAC;4BACAuB,cAAchB;4BACdN;4BACAmB;4BACAlB;4BACAC;4BACAC;4BACAoB,KAAK,AAACP,aAAuC,CAACG,SAAS;wBACzD;wBAEA,IAAIE,aAAaG,SAASH,aAAaI,MAAM;4BAC3C,IAAIR,eAAeF,MAAM,GAAG,GAAG;gCAC7B,IAAI,CAACV,OAAOqB,IAAI,EAAE;oCAChBrB,OAAOqB,IAAI,GAAG,EAAE;gCAClB;gCACArB,OAAOqB,IAAI,CAACC,IAAI,CAAC;oCACf,CAACN,YAAYI,IAAI,CAAC,EAAEJ,YAAYG,KAAK;gCACvC;4BACF,OAAO;gCACL,IAAInB,MAAM,CAACgB,YAAYI,IAAI,CAAC,EAAE;oCAC5B,IAAI,CAACpB,OAAOqB,IAAI,EAAE;wCAChBrB,OAAOqB,IAAI,GAAG,EAAE;oCAClB;oCAEArB,OAAOqB,IAAI,CAACC,IAAI,CAAC;wCAAE,CAACN,YAAYI,IAAI,CAAC,EAAEpB,MAAM,CAACgB,YAAYI,IAAI,CAAC;oCAAC;oCAChEpB,OAAOqB,IAAI,CAACC,IAAI,CAAC;wCACf,CAACN,YAAYI,IAAI,CAAC,EAAEJ,YAAYG,KAAK;oCACvC;oCACA,OAAOnB,MAAM,CAACgB,YAAYI,IAAI,CAAC;gCACjC,OAAO;oCACLpB,MAAM,CAACgB,YAAYI,IAAI,CAAC,GAAGJ,YAAYG,KAAK;gCAC9C;4BACF;wBACF,OAAO,IAAI,OAAOH,aAAaG,UAAU,UAAU;4BACjDnB,SAASd,4BAA4Bc,QAAQgB,YAAYG,KAAK,IAAI,CAAC,GAAG;gCACpE,6BAA6B;gCAC7BI,OAAO;4BACT;wBACF;oBACF;gBACF;YACF;QACF;IACF;IAEA,OAAOvB;AACT"}

package/dist/queryDrafts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryDrafts.d.ts","sourceRoot":"","sources":["../src/queryDrafts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAgB1C,eAAO,MAAM,WAAW,EAAE,WA+KzB,CAAA"}
+{"version":3,"file":"queryDrafts.d.ts","sourceRoot":"","sources":["../src/queryDrafts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AA0B1C,eAAO,MAAM,WAAW,EAAE,WA4MzB,CAAA"}

package/dist/queryDrafts.js

@@ -1,4 +1,5 @@
-import { buildVersionCollectionFields, combineQueries, flattenWhereToOperators } from 'payload';
+import { buildVersionCollectionFields, combineQueries, flattenWhereToOperators, projectBranchVersionParent, resolveBranchReadState, resolveBranchVersionQuery, rewriteBranchVersionParents, withBranchVersionSelect } from 'payload';
+import { buildBranchVisibilityStages } from './queries/buildBranchVisibility.js';
 import { buildQuery } from './queries/buildQuery.js';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { aggregatePaginate } from './utilities/aggregatePaginate.js';
@@ -8,12 +9,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 queryDrafts = async function queryDrafts({ collection: collectionSlug, joins, limit, locale, page, pagination, req, select, sort: sortArg, where = {} }) {
+export const queryDrafts = async function queryDrafts({ branch, collection: collectionSlug, joins, limit, locale, page, pagination, req, select, sort: sortArg, where = {} }) {
     const { collectionConfig, Model } = getCollection({
         adapter: this,
         collectionSlug,
         versions: true
     });
+    const branchReadState = resolveBranchReadState({
+        branch,
+        collectionSlug,
+        req
+    });
     let hasNearConstraint;
     let sort;
     if (where) {
@@ -34,28 +40,47 @@ export const queryDrafts = async function queryDrafts({ collection: collectionSl
             versions: true
         });
     }
+    const branchedWhere = branchReadState.useBranching ? rewriteBranchVersionParents(where) : await resolveBranchVersionQuery({
+        branch,
+        collectionSlug,
+        req,
+        where
+    });
+    const branchVisibility = branchReadState.useBranching ? buildBranchVisibilityStages({
+        adapter: this,
+        branch: branchReadState.branch,
+        collectionSlug,
+        mode: 'drafts'
+    }) : [];
     const combinedWhere = combineQueries({
         latest: {
             equals: true
         }
-    }, where);
+    }, branchedWhere ?? {});
     const versionQuery = await buildQuery({
         adapter: this,
+        branch,
         fields,
         locale,
+        req,
         where: combinedWhere
     });
     const projection = buildProjectionFromSelect({
         adapter: this,
         fields,
-        select
+        select: withBranchVersionSelect({
+            branch,
+            collectionSlug,
+            req,
+            select
+        })
     });
     const session = await getSession(this, req);
     const options = {
         session
     };
     // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.
-    const useEstimatedCount = hasNearConstraint || !versionQuery || Object.keys(versionQuery).length === 0;
+    const useEstimatedCount = !branchVisibility.length && (hasNearConstraint || !versionQuery || Object.keys(versionQuery).length === 0);
     const paginationOptions = {
         lean: true,
         leanWithId: true,
@@ -97,17 +122,20 @@ export const queryDrafts = async function queryDrafts({ collection: collectionSl
     let result;
     const aggregate = await buildJoinAggregation({
         adapter: this,
+        branch,
         collection: collectionSlug,
         collectionConfig,
         joins,
         locale,
         projection,
         query: versionQuery,
+        req,
         versions: true
     });
-    if (aggregate || sortAggregation.length > 0) {
+    if (aggregate.length > 0 || branchVisibility.length > 0 || sortAggregation.length > 0) {
         result = await aggregatePaginate({
             adapter: this,
+            branchVisibility,
             collation: paginationOptions.collation,
             joinAggregation: aggregate,
             limit: paginationOptions.limit,
@@ -127,10 +155,12 @@ export const queryDrafts = async function queryDrafts({ collection: collectionSl
     if (!this.useJoinAggregations) {
         await resolveJoins({
             adapter: this,
+            branch,
             collectionSlug,
             docs: result.docs,
             joins,
             locale,
+            req,
             versions: true
         });
     }
@@ -141,7 +171,9 @@ export const queryDrafts = async function queryDrafts({ collection: collectionSl
         operation: 'read'
     });
     for(let i = 0; i < result.docs.length; i++){
-        const id = result.docs[i].parent;
+        // A branch version's `parent` is the shadow row's primary key, so the
+        // canonical document ID comes from `_branchParent` when present.
+        const id = projectBranchVersionParent(result.docs[i]);
         result.docs[i] = result.docs[i].version ?? {};
         result.docs[i].id = id;
     }

package/dist/queryDrafts.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/queryDrafts.ts"],"sourcesContent":["import type { PaginateOptions, PipelineStage, QueryOptions } from 'mongoose'\nimport type { QueryDrafts } from 'payload'\n\nimport { buildVersionCollectionFields, combineQueries, 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 queryDrafts: QueryDrafts = async function queryDrafts(\n  this: MongooseAdapter,\n  {\n    collection: collectionSlug,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort: sortArg,\n    where = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n\n  let hasNearConstraint\n  let sort\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 fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  const sortAggregation: PipelineStage[] = []\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      adapter: this,\n      config: this.payload.config,\n      fields,\n      locale,\n      sort: sortArg || collectionConfig.defaultSort,\n      sortAggregation,\n      timestamps: true,\n      versions: true,\n    })\n  }\n\n  const combinedWhere = combineQueries({ latest: { equals: true } }, where)\n\n  const versionQuery = await buildQuery({\n    adapter: this,\n    fields,\n    locale,\n    where: combinedWhere,\n  })\n\n  const projection = buildProjectionFromSelect({\n    adapter: this,\n    fields,\n    select,\n  })\n\n  const session = await getSession(this, req)\n  const options: QueryOptions = {\n    session,\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 =\n    hasNearConstraint || !versionQuery || Object.keys(versionQuery).length === 0\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    options,\n    page,\n    pagination,\n    projection,\n    sort,\n    useEstimatedCount,\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 (\n    !useEstimatedCount &&\n    Object.keys(versionQuery).length === 0 &&\n    this.disableIndexHints !== true\n  ) {\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(versionQuery, {\n          collation: paginationOptions.collation,\n          hint: { _id: 1 },\n          session,\n        }),\n      )\n    }\n  }\n\n  if (limit && 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\n  let result\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    collection: collectionSlug,\n    collectionConfig,\n    joins,\n    locale,\n    projection,\n    query: versionQuery,\n    versions: true,\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: versionQuery,\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(versionQuery, 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      versions: true,\n    })\n  }\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: buildVersionCollectionFields(this.payload.config, collectionConfig),\n    operation: 'read',\n  })\n\n  for (let i = 0; i < result.docs.length; i++) {\n    const id = result.docs[i].parent\n    result.docs[i] = result.docs[i].version ?? {}\n    result.docs[i].id = id\n  }\n\n  return result\n}\n"],"names":["buildVersionCollectionFields","combineQueries","flattenWhereToOperators","buildQuery","buildSortParam","aggregatePaginate","buildJoinAggregation","buildProjectionFromSelect","getCollection","getSession","resolveJoins","transform","queryDrafts","collection","collectionSlug","joins","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","Model","adapter","versions","hasNearConstraint","constraints","some","prop","Object","keys","key","fields","payload","config","sortAggregation","defaultSort","timestamps","combinedWhere","latest","equals","versionQuery","projection","session","options","useEstimatedCount","length","paginationOptions","lean","leanWithId","collation","localizationConfig","localization","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","aggregate","query","joinAggregation","undefined","paginate","useJoinAggregations","docs","data","operation","i","id","parent","version"],"mappings":"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"}
+{"version":3,"sources":["../src/queryDrafts.ts"],"sourcesContent":["import type { PaginateOptions, PipelineStage, QueryOptions } from 'mongoose'\nimport type { QueryDrafts } from 'payload'\n\nimport {\n  buildVersionCollectionFields,\n  combineQueries,\n  flattenWhereToOperators,\n  projectBranchVersionParent,\n  resolveBranchReadState,\n  resolveBranchVersionQuery,\n  rewriteBranchVersionParents,\n  withBranchVersionSelect,\n} from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildBranchVisibilityStages } from './queries/buildBranchVisibility.js'\nimport { buildQuery } from './queries/buildQuery.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { aggregatePaginate } from './utilities/aggregatePaginate.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getCollection } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { resolveJoins } from './utilities/resolveJoins.js'\nimport { transform } from './utilities/transform.js'\n\nexport const queryDrafts: QueryDrafts = async function queryDrafts(\n  this: MongooseAdapter,\n  {\n    branch,\n    collection: collectionSlug,\n    joins,\n    limit,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort: sortArg,\n    where = {},\n  },\n) {\n  const { collectionConfig, Model } = getCollection({\n    adapter: this,\n    collectionSlug,\n    versions: true,\n  })\n  const branchReadState = resolveBranchReadState({ branch, collectionSlug, req })\n\n  let hasNearConstraint\n  let sort\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 fields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n\n  const sortAggregation: PipelineStage[] = []\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      adapter: this,\n      config: this.payload.config,\n      fields,\n      locale,\n      sort: sortArg || collectionConfig.defaultSort,\n      sortAggregation,\n      timestamps: true,\n      versions: true,\n    })\n  }\n\n  const branchedWhere = branchReadState.useBranching\n    ? rewriteBranchVersionParents(where)\n    : await resolveBranchVersionQuery({\n        branch,\n        collectionSlug,\n        req,\n        where,\n      })\n  const branchVisibility = branchReadState.useBranching\n    ? buildBranchVisibilityStages({\n        adapter: this,\n        branch: branchReadState.branch,\n        collectionSlug,\n        mode: 'drafts',\n      })\n    : []\n\n  const combinedWhere = combineQueries({ latest: { equals: true } }, branchedWhere ?? {})\n\n  const versionQuery = await buildQuery({\n    adapter: this,\n    branch,\n    fields,\n    locale,\n    req,\n    where: combinedWhere,\n  })\n\n  const projection = buildProjectionFromSelect({\n    adapter: this,\n    fields,\n    select: withBranchVersionSelect({ branch, collectionSlug, req, select }),\n  })\n\n  const session = await getSession(this, req)\n  const options: QueryOptions = {\n    session,\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 =\n    !branchVisibility.length &&\n    (hasNearConstraint || !versionQuery || Object.keys(versionQuery).length === 0)\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    options,\n    page,\n    pagination,\n    projection,\n    sort,\n    useEstimatedCount,\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 (\n    !useEstimatedCount &&\n    Object.keys(versionQuery).length === 0 &&\n    this.disableIndexHints !== true\n  ) {\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(versionQuery, {\n          collation: paginationOptions.collation,\n          hint: { _id: 1 },\n          session,\n        }),\n      )\n    }\n  }\n\n  if (limit && 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\n  let result\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    branch,\n    collection: collectionSlug,\n    collectionConfig,\n    joins,\n    locale,\n    projection,\n    query: versionQuery,\n    req,\n    versions: true,\n  })\n\n  if (aggregate.length > 0 || branchVisibility.length > 0 || sortAggregation.length > 0) {\n    result = await aggregatePaginate({\n      adapter: this,\n      branchVisibility,\n      collation: paginationOptions.collation,\n      joinAggregation: aggregate,\n      limit: paginationOptions.limit,\n      Model,\n      page: paginationOptions.page,\n      pagination: paginationOptions.pagination,\n      projection: paginationOptions.projection,\n      query: versionQuery,\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(versionQuery, paginationOptions)\n  }\n\n  if (!this.useJoinAggregations) {\n    await resolveJoins({\n      adapter: this,\n      branch,\n      collectionSlug,\n      docs: result.docs as Record<string, unknown>[],\n      joins,\n      locale,\n      req,\n      versions: true,\n    })\n  }\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: buildVersionCollectionFields(this.payload.config, collectionConfig),\n    operation: 'read',\n  })\n\n  for (let i = 0; i < result.docs.length; i++) {\n    // A branch version's `parent` is the shadow row's primary key, so the\n    // canonical document ID comes from `_branchParent` when present.\n    const id = projectBranchVersionParent(result.docs[i] as Record<string, unknown>)\n    result.docs[i] = result.docs[i].version ?? {}\n    result.docs[i].id = id\n  }\n\n  return result\n}\n"],"names":["buildVersionCollectionFields","combineQueries","flattenWhereToOperators","projectBranchVersionParent","resolveBranchReadState","resolveBranchVersionQuery","rewriteBranchVersionParents","withBranchVersionSelect","buildBranchVisibilityStages","buildQuery","buildSortParam","aggregatePaginate","buildJoinAggregation","buildProjectionFromSelect","getCollection","getSession","resolveJoins","transform","queryDrafts","branch","collection","collectionSlug","joins","limit","locale","page","pagination","req","select","sort","sortArg","where","collectionConfig","Model","adapter","versions","branchReadState","hasNearConstraint","constraints","some","prop","Object","keys","key","fields","payload","config","sortAggregation","defaultSort","timestamps","branchedWhere","useBranching","branchVisibility","mode","combinedWhere","latest","equals","versionQuery","projection","session","options","useEstimatedCount","length","paginationOptions","lean","leanWithId","collation","localizationConfig","localization","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","aggregate","query","joinAggregation","undefined","paginate","useJoinAggregations","docs","data","operation","i","id","version"],"mappings":"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"}

package/dist/transactions/commitTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/commitTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAIhD,eAAO,MAAM,iBAAiB,EAAE,iBA4B/B,CAAA"}
+{"version":3,"file":"commitTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/commitTransaction.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAA;AAShD,eAAO,MAAM,iBAAiB,EAAE,iBA8D/B,CAAA"}

package/dist/transactions/commitTransaction.js

@@ -1,23 +1,84 @@
+const unknownCommitRetryTimeoutMilliseconds = 120_000;
+const unknownCommitRetryInitialDelayMilliseconds = 5;
+const unknownCommitRetryMaximumDelayMilliseconds = 500;
+const unknownCommitRetryGrowth = 1.5;
 export const commitTransaction = async function commitTransaction(incomingID = '') {
     const transactionID = incomingID instanceof Promise ? await incomingID : incomingID;
     if (!this.sessions[transactionID]) {
         return;
     }
     if (!this.sessions[transactionID]?.inTransaction()) {
-        // Clean up the orphaned session reference
-        delete this.sessions[transactionID];
+        await endRegisteredSession({
+            adapter: this,
+            session: this.sessions[transactionID],
+            transactionID
+        });
         return;
     }
     const session = this.sessions[transactionID];
-    // Delete from registry FIRST to prevent race conditions
-    // This ensures other operations can't retrieve this session while we're ending it
-    delete this.sessions[transactionID];
-    await session.commitTransaction();
+    const retryDeadline = Date.now() + unknownCommitRetryTimeoutMilliseconds;
+    let retryIndex = 0;
+    while(true){
+        try {
+            const remainingMilliseconds = Math.max(retryDeadline - Date.now(), 1);
+            const timeoutMS = session.timeoutMS && session.timeoutMS > 0 ? Math.min(session.timeoutMS, remainingMilliseconds) : remainingMilliseconds;
+            await session.commitTransaction({
+                timeoutMS
+            });
+            await endRegisteredSession({
+                adapter: this,
+                session,
+                transactionID
+            });
+            return;
+        } catch (error) {
+            if (!isUnknownTransactionCommitResult(error)) {
+                throw error;
+            }
+            const retryDelayMilliseconds = Math.random() * Math.min(unknownCommitRetryInitialDelayMilliseconds * unknownCommitRetryGrowth ** retryIndex, unknownCommitRetryMaximumDelayMilliseconds);
+            if (isMaxTimeExpiredError(error) || Date.now() + retryDelayMilliseconds >= retryDeadline) {
+                await endRegisteredSession({
+                    adapter: this,
+                    session,
+                    transactionID
+                });
+                throw error;
+            }
+            await new Promise((resolve)=>setTimeout(resolve, retryDelayMilliseconds));
+            // The retry delay can resume late if the event loop is busy.
+            if (Date.now() >= retryDeadline) {
+                await endRegisteredSession({
+                    adapter: this,
+                    session,
+                    transactionID
+                });
+                throw error;
+            }
+            retryIndex += 1;
+        }
+    }
+};
+const endRegisteredSession = async ({ adapter, session, transactionID })=>{
+    delete adapter.sessions[transactionID];
     try {
         await session.endSession();
     } catch (_) {
-    // ending sessions is only best effort and won't impact anything if it fails since the transaction was committed
+    // Ending the session is best effort after commit succeeds or its result remains unknown.
+    }
+};
+const isMaxTimeExpiredError = (error)=>{
+    if (!error || typeof error !== 'object') {
+        return false;
+    }
+    const mongoError = error;
+    return mongoError.code === 50 || mongoError.codeName === 'MaxTimeMSExpired';
+};
+const isUnknownTransactionCommitResult = (error)=>{
+    if (!error || typeof error !== 'object') {
+        return false;
     }
+    const labeledError = error;
+    return labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true || labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true;
 };
 
 //# sourceMappingURL=commitTransaction.js.map

package/dist/transactions/commitTransaction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/transactions/commitTransaction.ts"],"sourcesContent":["import type { CommitTransaction } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const commitTransaction: CommitTransaction = async function commitTransaction(\n  this: MongooseAdapter,\n  incomingID = '',\n) {\n  const transactionID = incomingID instanceof Promise ? await incomingID : incomingID\n\n  if (!this.sessions[transactionID]) {\n    return\n  }\n\n  if (!this.sessions[transactionID]?.inTransaction()) {\n    // Clean up the orphaned session reference\n    delete this.sessions[transactionID]\n    return\n  }\n\n  const session = this.sessions[transactionID]\n\n  // Delete from registry FIRST to prevent race conditions\n  // This ensures other operations can't retrieve this session while we're ending it\n  delete this.sessions[transactionID]\n\n  await session.commitTransaction()\n  try {\n    await session.endSession()\n  } catch (_) {\n    // ending sessions is only best effort and won't impact anything if it fails since the transaction was committed\n  }\n}\n"],"names":["commitTransaction","incomingID","transactionID","Promise","sessions","inTransaction","session","endSession","_"],"mappings":"AAIA,OAAO,MAAMA,oBAAuC,eAAeA,kBAEjEC,aAAa,EAAE;IAEf,MAAMC,gBAAgBD,sBAAsBE,UAAU,MAAMF,aAAaA;IAEzE,IAAI,CAAC,IAAI,CAACG,QAAQ,CAACF,cAAc,EAAE;QACjC;IACF;IAEA,IAAI,CAAC,IAAI,CAACE,QAAQ,CAACF,cAAc,EAAEG,iBAAiB;QAClD,0CAA0C;QAC1C,OAAO,IAAI,CAACD,QAAQ,CAACF,cAAc;QACnC;IACF;IAEA,MAAMI,UAAU,IAAI,CAACF,QAAQ,CAACF,cAAc;IAE5C,wDAAwD;IACxD,kFAAkF;IAClF,OAAO,IAAI,CAACE,QAAQ,CAACF,cAAc;IAEnC,MAAMI,QAAQN,iBAAiB;IAC/B,IAAI;QACF,MAAMM,QAAQC,UAAU;IAC1B,EAAE,OAAOC,GAAG;IACV,gHAAgH;IAClH;AACF,EAAC"}
+{"version":3,"sources":["../../src/transactions/commitTransaction.ts"],"sourcesContent":["import type { ClientSession } from 'mongodb'\nimport type { CommitTransaction } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst unknownCommitRetryTimeoutMilliseconds = 120_000\nconst unknownCommitRetryInitialDelayMilliseconds = 5\nconst unknownCommitRetryMaximumDelayMilliseconds = 500\nconst unknownCommitRetryGrowth = 1.5\n\nexport const commitTransaction: CommitTransaction = async function commitTransaction(\n  this: MongooseAdapter,\n  incomingID = '',\n) {\n  const transactionID = incomingID instanceof Promise ? await incomingID : incomingID\n\n  if (!this.sessions[transactionID]) {\n    return\n  }\n\n  if (!this.sessions[transactionID]?.inTransaction()) {\n    await endRegisteredSession({\n      adapter: this,\n      session: this.sessions[transactionID],\n      transactionID,\n    })\n    return\n  }\n\n  const session = this.sessions[transactionID]\n  const retryDeadline = Date.now() + unknownCommitRetryTimeoutMilliseconds\n  let retryIndex = 0\n\n  while (true) {\n    try {\n      const remainingMilliseconds = Math.max(retryDeadline - Date.now(), 1)\n      const timeoutMS =\n        session.timeoutMS && session.timeoutMS > 0\n          ? Math.min(session.timeoutMS, remainingMilliseconds)\n          : remainingMilliseconds\n\n      await session.commitTransaction({ timeoutMS })\n      await endRegisteredSession({ adapter: this, session, transactionID })\n      return\n    } catch (error) {\n      if (!isUnknownTransactionCommitResult(error)) {\n        throw error\n      }\n\n      const retryDelayMilliseconds =\n        Math.random() *\n        Math.min(\n          unknownCommitRetryInitialDelayMilliseconds * unknownCommitRetryGrowth ** retryIndex,\n          unknownCommitRetryMaximumDelayMilliseconds,\n        )\n\n      if (isMaxTimeExpiredError(error) || Date.now() + retryDelayMilliseconds >= retryDeadline) {\n        await endRegisteredSession({ adapter: this, session, transactionID })\n        throw error\n      }\n\n      await new Promise((resolve) => setTimeout(resolve, retryDelayMilliseconds))\n\n      // The retry delay can resume late if the event loop is busy.\n      if (Date.now() >= retryDeadline) {\n        await endRegisteredSession({ adapter: this, session, transactionID })\n        throw error\n      }\n\n      retryIndex += 1\n    }\n  }\n}\n\nconst endRegisteredSession = async ({\n  adapter,\n  session,\n  transactionID,\n}: {\n  adapter: MongooseAdapter\n  session: ClientSession\n  transactionID: number | string\n}): Promise<void> => {\n  delete adapter.sessions[transactionID]\n\n  try {\n    await session.endSession()\n  } catch (_) {\n    // Ending the session is best effort after commit succeeds or its result remains unknown.\n  }\n}\n\nconst isMaxTimeExpiredError = (error: unknown): boolean => {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n\n  const mongoError = error as { code?: number; codeName?: string }\n\n  return mongoError.code === 50 || mongoError.codeName === 'MaxTimeMSExpired'\n}\n\nconst isUnknownTransactionCommitResult = (error: unknown): boolean => {\n  if (!error || typeof error !== 'object') {\n    return false\n  }\n\n  const labeledError = error as {\n    errorLabels?: string[]\n    hasErrorLabel?: (label: string) => boolean\n  }\n\n  return (\n    labeledError.hasErrorLabel?.('UnknownTransactionCommitResult') === true ||\n    labeledError.errorLabels?.includes('UnknownTransactionCommitResult') === true\n  )\n}\n"],"names":["unknownCommitRetryTimeoutMilliseconds","unknownCommitRetryInitialDelayMilliseconds","unknownCommitRetryMaximumDelayMilliseconds","unknownCommitRetryGrowth","commitTransaction","incomingID","transactionID","Promise","sessions","inTransaction","endRegisteredSession","adapter","session","retryDeadline","Date","now","retryIndex","remainingMilliseconds","Math","max","timeoutMS","min","error","isUnknownTransactionCommitResult","retryDelayMilliseconds","random","isMaxTimeExpiredError","resolve","setTimeout","endSession","_","mongoError","code","codeName","labeledError","hasErrorLabel","errorLabels","includes"],"mappings":"AAKA,MAAMA,wCAAwC;AAC9C,MAAMC,6CAA6C;AACnD,MAAMC,6CAA6C;AACnD,MAAMC,2BAA2B;AAEjC,OAAO,MAAMC,oBAAuC,eAAeA,kBAEjEC,aAAa,EAAE;IAEf,MAAMC,gBAAgBD,sBAAsBE,UAAU,MAAMF,aAAaA;IAEzE,IAAI,CAAC,IAAI,CAACG,QAAQ,CAACF,cAAc,EAAE;QACjC;IACF;IAEA,IAAI,CAAC,IAAI,CAACE,QAAQ,CAACF,cAAc,EAAEG,iBAAiB;QAClD,MAAMC,qBAAqB;YACzBC,SAAS,IAAI;YACbC,SAAS,IAAI,CAACJ,QAAQ,CAACF,cAAc;YACrCA;QACF;QACA;IACF;IAEA,MAAMM,UAAU,IAAI,CAACJ,QAAQ,CAACF,cAAc;IAC5C,MAAMO,gBAAgBC,KAAKC,GAAG,KAAKf;IACnC,IAAIgB,aAAa;IAEjB,MAAO,KAAM;QACX,IAAI;YACF,MAAMC,wBAAwBC,KAAKC,GAAG,CAACN,gBAAgBC,KAAKC,GAAG,IAAI;YACnE,MAAMK,YACJR,QAAQQ,SAAS,IAAIR,QAAQQ,SAAS,GAAG,IACrCF,KAAKG,GAAG,CAACT,QAAQQ,SAAS,EAAEH,yBAC5BA;YAEN,MAAML,QAAQR,iBAAiB,CAAC;gBAAEgB;YAAU;YAC5C,MAAMV,qBAAqB;gBAAEC,SAAS,IAAI;gBAAEC;gBAASN;YAAc;YACnE;QACF,EAAE,OAAOgB,OAAO;YACd,IAAI,CAACC,iCAAiCD,QAAQ;gBAC5C,MAAMA;YACR;YAEA,MAAME,yBACJN,KAAKO,MAAM,KACXP,KAAKG,GAAG,CACNpB,6CAA6CE,4BAA4Ba,YACzEd;YAGJ,IAAIwB,sBAAsBJ,UAAUR,KAAKC,GAAG,KAAKS,0BAA0BX,eAAe;gBACxF,MAAMH,qBAAqB;oBAAEC,SAAS,IAAI;oBAAEC;oBAASN;gBAAc;gBACnE,MAAMgB;YACR;YAEA,MAAM,IAAIf,QAAQ,CAACoB,UAAYC,WAAWD,SAASH;YAEnD,6DAA6D;YAC7D,IAAIV,KAAKC,GAAG,MAAMF,eAAe;gBAC/B,MAAMH,qBAAqB;oBAAEC,SAAS,IAAI;oBAAEC;oBAASN;gBAAc;gBACnE,MAAMgB;YACR;YAEAN,cAAc;QAChB;IACF;AACF,EAAC;AAED,MAAMN,uBAAuB,OAAO,EAClCC,OAAO,EACPC,OAAO,EACPN,aAAa,EAKd;IACC,OAAOK,QAAQH,QAAQ,CAACF,cAAc;IAEtC,IAAI;QACF,MAAMM,QAAQiB,UAAU;IAC1B,EAAE,OAAOC,GAAG;IACV,yFAAyF;IAC3F;AACF;AAEA,MAAMJ,wBAAwB,CAACJ;IAC7B,IAAI,CAACA,SAAS,OAAOA,UAAU,UAAU;QACvC,OAAO;IACT;IAEA,MAAMS,aAAaT;IAEnB,OAAOS,WAAWC,IAAI,KAAK,MAAMD,WAAWE,QAAQ,KAAK;AAC3D;AAEA,MAAMV,mCAAmC,CAACD;IACxC,IAAI,CAACA,SAAS,OAAOA,UAAU,UAAU;QACvC,OAAO;IACT;IAEA,MAAMY,eAAeZ;IAKrB,OACEY,aAAaC,aAAa,GAAG,sCAAsC,QACnED,aAAaE,WAAW,EAAEC,SAAS,sCAAsC;AAE7E"}

package/dist/transactions/rollbackTransaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rollbackTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/rollbackTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAIlD,eAAO,MAAM,mBAAmB,EAAE,mBAgCjC,CAAA"}
+{"version":3,"file":"rollbackTransaction.d.ts","sourceRoot":"","sources":["../../src/transactions/rollbackTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAIlD,eAAO,MAAM,mBAAmB,EAAE,mBAiCjC,CAAA"}

package/dist/transactions/rollbackTransaction.js

@@ -5,22 +5,23 @@ export const rollbackTransaction = async function rollbackTransaction(incomingID
     if (!this.sessions[transactionID]) {
         return;
     }
-    // when session exists but is not inTransaction something unexpected is happening to the session
-    if (!this.sessions[transactionID]?.inTransaction()) {
-        this.payload.logger.warn('rollbackTransaction called when no transaction exists');
-        delete this.sessions[transactionID];
-        return;
-    }
     const session = this.sessions[transactionID];
     // Delete from registry FIRST to prevent race conditions
     // This ensures other operations can't retrieve this session while we're aborting it
     delete this.sessions[transactionID];
-    // the first call for rollback should be aborted and deleted causing any other operations with the same transaction to fail
+    if (session.inTransaction()) {
+        try {
+            await session.abortTransaction();
+        } catch (_error) {
+        // ignore the error as it is likely a race condition from multiple errors
+        }
+    } else {
+        this.payload.logger.warn('rollbackTransaction called when no transaction exists');
+    }
     try {
-        await session.abortTransaction();
         await session.endSession();
     } catch (_error) {
-    // ignore the error as it is likely a race condition from multiple errors
+    // ending a session is best effort after its transaction has failed or been aborted
     }
 };
 

package/dist/transactions/rollbackTransaction.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/transactions/rollbackTransaction.ts"],"sourcesContent":["import type { RollbackTransaction } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(\n  this: MongooseAdapter,\n  incomingID = '',\n) {\n  const transactionID = incomingID instanceof Promise ? await incomingID : incomingID\n\n  // if multiple operations are using the same transaction, the first will flow through and delete the session.\n  // subsequent calls should be ignored.\n  if (!this.sessions[transactionID]) {\n    return\n  }\n\n  // when session exists but is not inTransaction something unexpected is happening to the session\n  if (!this.sessions[transactionID]?.inTransaction()) {\n    this.payload.logger.warn('rollbackTransaction called when no transaction exists')\n    delete this.sessions[transactionID]\n    return\n  }\n\n  const session = this.sessions[transactionID]\n\n  // Delete from registry FIRST to prevent race conditions\n  // This ensures other operations can't retrieve this session while we're aborting it\n  delete this.sessions[transactionID]\n\n  // the first call for rollback should be aborted and deleted causing any other operations with the same transaction to fail\n  try {\n    await session.abortTransaction()\n    await session.endSession()\n  } catch (_error) {\n    // ignore the error as it is likely a race condition from multiple errors\n  }\n}\n"],"names":["rollbackTransaction","incomingID","transactionID","Promise","sessions","inTransaction","payload","logger","warn","session","abortTransaction","endSession","_error"],"mappings":"AAIA,OAAO,MAAMA,sBAA2C,eAAeA,oBAErEC,aAAa,EAAE;IAEf,MAAMC,gBAAgBD,sBAAsBE,UAAU,MAAMF,aAAaA;IAEzE,6GAA6G;IAC7G,sCAAsC;IACtC,IAAI,CAAC,IAAI,CAACG,QAAQ,CAACF,cAAc,EAAE;QACjC;IACF;IAEA,gGAAgG;IAChG,IAAI,CAAC,IAAI,CAACE,QAAQ,CAACF,cAAc,EAAEG,iBAAiB;QAClD,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC;QACzB,OAAO,IAAI,CAACJ,QAAQ,CAACF,cAAc;QACnC;IACF;IAEA,MAAMO,UAAU,IAAI,CAACL,QAAQ,CAACF,cAAc;IAE5C,wDAAwD;IACxD,oFAAoF;IACpF,OAAO,IAAI,CAACE,QAAQ,CAACF,cAAc;IAEnC,2HAA2H;IAC3H,IAAI;QACF,MAAMO,QAAQC,gBAAgB;QAC9B,MAAMD,QAAQE,UAAU;IAC1B,EAAE,OAAOC,QAAQ;IACf,yEAAyE;IAC3E;AACF,EAAC"}
+{"version":3,"sources":["../../src/transactions/rollbackTransaction.ts"],"sourcesContent":["import type { RollbackTransaction } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nexport const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(\n  this: MongooseAdapter,\n  incomingID = '',\n) {\n  const transactionID = incomingID instanceof Promise ? await incomingID : incomingID\n\n  // if multiple operations are using the same transaction, the first will flow through and delete the session.\n  // subsequent calls should be ignored.\n  if (!this.sessions[transactionID]) {\n    return\n  }\n\n  const session = this.sessions[transactionID]\n\n  // Delete from registry FIRST to prevent race conditions\n  // This ensures other operations can't retrieve this session while we're aborting it\n  delete this.sessions[transactionID]\n\n  if (session.inTransaction()) {\n    try {\n      await session.abortTransaction()\n    } catch (_error) {\n      // ignore the error as it is likely a race condition from multiple errors\n    }\n  } else {\n    this.payload.logger.warn('rollbackTransaction called when no transaction exists')\n  }\n\n  try {\n    await session.endSession()\n  } catch (_error) {\n    // ending a session is best effort after its transaction has failed or been aborted\n  }\n}\n"],"names":["rollbackTransaction","incomingID","transactionID","Promise","sessions","session","inTransaction","abortTransaction","_error","payload","logger","warn","endSession"],"mappings":"AAIA,OAAO,MAAMA,sBAA2C,eAAeA,oBAErEC,aAAa,EAAE;IAEf,MAAMC,gBAAgBD,sBAAsBE,UAAU,MAAMF,aAAaA;IAEzE,6GAA6G;IAC7G,sCAAsC;IACtC,IAAI,CAAC,IAAI,CAACG,QAAQ,CAACF,cAAc,EAAE;QACjC;IACF;IAEA,MAAMG,UAAU,IAAI,CAACD,QAAQ,CAACF,cAAc;IAE5C,wDAAwD;IACxD,oFAAoF;IACpF,OAAO,IAAI,CAACE,QAAQ,CAACF,cAAc;IAEnC,IAAIG,QAAQC,aAAa,IAAI;QAC3B,IAAI;YACF,MAAMD,QAAQE,gBAAgB;QAChC,EAAE,OAAOC,QAAQ;QACf,yEAAyE;QAC3E;IACF,OAAO;QACL,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC;IAC3B;IAEA,IAAI;QACF,MAAMN,QAAQO,UAAU;IAC1B,EAAE,OAAOJ,QAAQ;IACf,mFAAmF;IACrF;AACF,EAAC"}

package/dist/updateGlobal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateGlobal.d.ts","sourceRoot":"","sources":["../src/updateGlobal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAS3C,eAAO,MAAM,YAAY,EAAE,YAsC1B,CAAA"}
+{"version":3,"file":"updateGlobal.d.ts","sourceRoot":"","sources":["../src/updateGlobal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAoB,MAAM,SAAS,CAAA;AAe7D,eAAO,MAAM,YAAY,EAAE,YA6F1B,CAAA"}

package/dist/updateGlobal.js

@@ -1,8 +1,10 @@
+import { resolveBranchGlobalWrite } from 'payload';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getGlobal } from './utilities/getEntity.js';
 import { getSession } from './utilities/getSession.js';
 import { transform } from './utilities/transform.js';
-export const updateGlobal = async function updateGlobal({ slug: globalSlug, data, options: optionsArgs = {}, req, returning, select }) {
+export const updateGlobal = async function updateGlobal(args) {
+    const { slug: globalSlug, branch, branchConflictData, data, options: optionsArgs = {}, req, returning, select } = args;
     const { globalConfig, Model } = getGlobal({
         adapter: this,
         globalSlug
@@ -15,6 +17,15 @@ export const updateGlobal = async function updateGlobal({ slug: globalSlug, data
         globalSlug,
         operation: 'write'
     });
+    if (branchConflictData) {
+        transform({
+            adapter: this,
+            data: branchConflictData,
+            fields,
+            globalSlug,
+            operation: 'write'
+        });
+    }
     const baseOptions = {
         ...optionsArgs,
         session: await getSession(this, req),
@@ -24,22 +35,93 @@ export const updateGlobal = async function updateGlobal({ slug: globalSlug, data
     const findOptions = {
         ...baseOptions,
         lean: true,
-        new: true,
         projection: buildProjectionFromSelect({
             adapter: this,
             fields: globalConfig.flattenedFields,
             select
-        })
+        }),
+        returnDocument: 'after'
     };
-    if (returning === false) {
-        await Model.updateOne({
+    const writeBranch = resolveBranchGlobalWrite({
+        branch,
+        globalSlug,
+        req
+    });
+    const isBranchableGlobal = this.payload.config.branching?.branchableGlobals.has(globalSlug);
+    // On a branch the write targets that branch's own row, upserting it from
+    // main's current content the first time the global is touched.
+    const filter = writeBranch ? {
+        _branch: {
+            $eq: writeBranch
+        },
+        globalType: globalSlug
+    } : isBranchableGlobal ? {
+        $or: [
+            {
+                _branch: 'main'
+            },
+            {
+                _branch: {
+                    $exists: false
+                }
+            },
+            {
+                _branch: null
+            }
+        ],
+        globalType: globalSlug
+    } : {
+        globalType: globalSlug
+    };
+    if (writeBranch) {
+        const mainDoc = await Model.findOne({
+            _branch: {
+                $eq: 'main'
+            },
             globalType: globalSlug
-        }, data, baseOptions);
+        }, {}, baseOptions).lean();
+        const { _id, __v, ...mainData } = mainDoc ?? {};
+        const writeData = {
+            ...branchConflictData ?? data,
+            _branch: writeBranch
+        };
+        const insertData = {
+            ...mainData,
+            globalType: globalSlug
+        };
+        for (const key of Object.keys(writeData)){
+            delete insertData[key];
+        }
+        const upsertOptions = {
+            ...findOptions,
+            upsert: true
+        };
+        const update = {
+            $set: writeData,
+            $setOnInsert: insertData
+        };
+        if (returning === false) {
+            await Model.findOneAndUpdate(filter, update, {
+                ...baseOptions,
+                upsert: true
+            });
+            return null;
+        }
+        const result = await Model.findOneAndUpdate(filter, update, upsertOptions);
+        transform({
+            adapter: this,
+            data: result,
+            fields,
+            globalSlug,
+            operation: 'read'
+        });
+        return result;
+    }
+    if (returning === false) {
+        await Model.updateOne(filter, data, baseOptions);
         return null;
     }
-    const result = await Model.findOneAndUpdate({
-        globalType: globalSlug
-    }, data, findOptions);
+    const result = await Model.findOneAndUpdate(filter, data, findOptions);
     transform({
         adapter: this,
         data: result,

package/dist/updateGlobal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/updateGlobal.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { UpdateGlobal } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const updateGlobal: UpdateGlobal = async function updateGlobal(\n  this: MongooseAdapter,\n  { slug: globalSlug, data, options: optionsArgs = {}, req, returning, select },\n) {\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug })\n\n  const fields = globalConfig.fields\n\n  transform({ adapter: this, data, fields, globalSlug, operation: 'write' })\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    new: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: globalConfig.flattenedFields,\n      select,\n    }),\n  }\n\n  if (returning === false) {\n    await Model.updateOne({ globalType: globalSlug }, data, baseOptions)\n    return null\n  }\n\n  const result: any = await Model.findOneAndUpdate({ globalType: globalSlug }, data, findOptions)\n\n  transform({ adapter: this, data: result, fields, globalSlug, operation: 'read' })\n\n  return result\n}\n"],"names":["buildProjectionFromSelect","getGlobal","getSession","transform","updateGlobal","slug","globalSlug","data","options","optionsArgs","req","returning","select","globalConfig","Model","adapter","fields","operation","baseOptions","session","timestamps","findOptions","lean","new","projection","flattenedFields","updateOne","globalType","result","findOneAndUpdate"],"mappings":"AAKA,SAASA,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,SAAS,QAAQ,2BAA0B;AACpD,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EAAEC,MAAMC,UAAU,EAAEC,IAAI,EAAEC,SAASC,cAAc,CAAC,CAAC,EAAEC,GAAG,EAAEC,SAAS,EAAEC,MAAM,EAAE;IAE7E,MAAM,EAAEC,YAAY,EAAEC,KAAK,EAAE,GAAGb,UAAU;QAAEc,SAAS,IAAI;QAAET;IAAW;IAEtE,MAAMU,SAASH,aAAaG,MAAM;IAElCb,UAAU;QAAEY,SAAS,IAAI;QAAER;QAAMS;QAAQV;QAAYW,WAAW;IAAQ;IAExE,MAAMC,cAAc;QAClB,GAAGT,WAAW;QACdU,SAAS,MAAMjB,WAAW,IAAI,EAAEQ;QAChC,uDAAuD;QACvDU,YAAY;IACd;IAEA,MAAMC,cAA4B;QAChC,GAAGH,WAAW;QACdI,MAAM;QACNC,KAAK;QACLC,YAAYxB,0BAA0B;YACpCe,SAAS,IAAI;YACbC,QAAQH,aAAaY,eAAe;YACpCb;QACF;IACF;IAEA,IAAID,cAAc,OAAO;QACvB,MAAMG,MAAMY,SAAS,CAAC;YAAEC,YAAYrB;QAAW,GAAGC,MAAMW;QACxD,OAAO;IACT;IAEA,MAAMU,SAAc,MAAMd,MAAMe,gBAAgB,CAAC;QAAEF,YAAYrB;IAAW,GAAGC,MAAMc;IAEnFlB,UAAU;QAAEY,SAAS,IAAI;QAAER,MAAMqB;QAAQZ;QAAQV;QAAYW,WAAW;IAAO;IAE/E,OAAOW;AACT,EAAC"}
+{"version":3,"sources":["../src/updateGlobal.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { UpdateGlobal, UpdateGlobalArgs } from 'payload'\n\nimport { resolveBranchGlobalWrite } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getGlobal } from './utilities/getEntity.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\ntype BranchUpdateGlobalArgs<T extends Record<string, unknown>> = {\n  branchConflictData?: Record<string, unknown>\n} & UpdateGlobalArgs<T>\n\nexport const updateGlobal: UpdateGlobal = async function updateGlobal<\n  T extends Record<string, unknown>,\n>(this: MongooseAdapter, args: UpdateGlobalArgs<T>) {\n  const {\n    slug: globalSlug,\n    branch,\n    branchConflictData,\n    data,\n    options: optionsArgs = {},\n    req,\n    returning,\n    select,\n  } = args as BranchUpdateGlobalArgs<T>\n  const { globalConfig, Model } = getGlobal({ adapter: this, globalSlug })\n\n  const fields = globalConfig.fields\n\n  transform({ adapter: this, data, fields, globalSlug, operation: 'write' })\n  if (branchConflictData) {\n    transform({ adapter: this, data: branchConflictData, fields, globalSlug, operation: 'write' })\n  }\n\n  const baseOptions = {\n    ...optionsArgs,\n    session: await getSession(this, req),\n    // Timestamps are manually added by the write transform\n    timestamps: false,\n  } satisfies QueryOptions\n\n  const findOptions: QueryOptions = {\n    ...baseOptions,\n    lean: true,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: globalConfig.flattenedFields,\n      select,\n    }),\n    returnDocument: 'after',\n  }\n\n  const writeBranch = resolveBranchGlobalWrite({ branch, globalSlug, req })\n  const isBranchableGlobal = this.payload.config.branching?.branchableGlobals.has(globalSlug)\n\n  // On a branch the write targets that branch's own row, upserting it from\n  // main's current content the first time the global is touched.\n  const filter = writeBranch\n    ? { _branch: { $eq: writeBranch }, globalType: globalSlug }\n    : isBranchableGlobal\n      ? {\n          $or: [{ _branch: 'main' }, { _branch: { $exists: false } }, { _branch: null }],\n          globalType: globalSlug,\n        }\n      : { globalType: globalSlug }\n\n  if (writeBranch) {\n    const mainDoc = await Model.findOne(\n      { _branch: { $eq: 'main' }, globalType: globalSlug },\n      {},\n      baseOptions,\n    ).lean()\n    const { _id, __v, ...mainData } = (mainDoc ?? {}) as Record<string, unknown>\n    const writeData = { ...((branchConflictData ?? data) as object), _branch: writeBranch }\n    const insertData: Record<string, unknown> = { ...mainData, globalType: globalSlug }\n\n    for (const key of Object.keys(writeData)) {\n      delete insertData[key]\n    }\n\n    const upsertOptions = { ...findOptions, upsert: true }\n    const update = { $set: writeData, $setOnInsert: insertData }\n\n    if (returning === false) {\n      await Model.findOneAndUpdate(filter, update, { ...baseOptions, upsert: true })\n      return null as unknown as T\n    }\n\n    const result = (await Model.findOneAndUpdate(filter, update, upsertOptions)) as unknown as T\n\n    transform({ adapter: this, data: result, fields, globalSlug, operation: 'read' })\n\n    return result\n  }\n\n  if (returning === false) {\n    await Model.updateOne(filter, data, baseOptions)\n    return null as unknown as T\n  }\n\n  const result = (await Model.findOneAndUpdate(filter, data, findOptions)) as unknown as T\n\n  transform({ adapter: this, data: result, fields, globalSlug, operation: 'read' })\n\n  return result\n}\n"],"names":["resolveBranchGlobalWrite","buildProjectionFromSelect","getGlobal","getSession","transform","updateGlobal","args","slug","globalSlug","branch","branchConflictData","data","options","optionsArgs","req","returning","select","globalConfig","Model","adapter","fields","operation","baseOptions","session","timestamps","findOptions","lean","projection","flattenedFields","returnDocument","writeBranch","isBranchableGlobal","payload","config","branching","branchableGlobals","has","filter","_branch","$eq","globalType","$or","$exists","mainDoc","findOne","_id","__v","mainData","writeData","insertData","key","Object","keys","upsertOptions","upsert","update","$set","$setOnInsert","findOneAndUpdate","result","updateOne"],"mappings":"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"}