payload 4.0.0-internal.ea6e8f8 → 4.0.0-internal.ee5d8bd

package/dist/versions/enforceMaxVersions.js

@@ -1,30 +1,14 @@
-import { resolveBranchOwnVersions } from '../branching/versions.js';
 import { collectVersionFiles, scheduleUnreferencedFileCleanup } from '../uploads/fileVersioning/cleanup.js';
-export const skipEnforceMaxVersionsContextKey = Symbol('skipEnforceMaxVersions');
 export const enforceMaxVersions = async ({ id, collection, global: globalConfig, max, payload, req })=>{
-    const skipEnforceMaxVersions = req?.context?.[skipEnforceMaxVersionsContextKey];
-    if (collection && skipEnforceMaxVersions?.collectionSlug === collection.slug && String(skipEnforceMaxVersions.id) === String(id)) {
-        return;
-    }
     const entityType = collection ? 'collection' : 'global';
     const slug = collection ? collection.slug : globalConfig?.slug;
     try {
         const where = {};
         let oldestAllowedDoc;
         if (collection) {
-            // Scoped to the chain being pruned, which on a branch is the branch's own —
-            // hanging off its shadow row, not the canonical ID.
-            //
-            // Both halves need it. Unscoped, the probe counted main's versions as part of the
-            // branch's ancestry (a branch reads main's history as its own past, §12), and then
-            // the delete addressed `parent: <canonical id>` with no `_branch` filter, which on
-            // a branch matches *only main's rows*. Saving on a branch therefore deleted
-            // production version history and never pruned the branch at all.
-            Object.assign(where, await resolveBranchOwnVersions({
-                id: id,
-                collectionSlug: collection.slug,
-                req
-            }));
+            where.parent = {
+                equals: id
+            };
             const query = await payload.db.findVersions({
                 collection: collection.slug,
                 limit: 1,
@@ -54,9 +38,9 @@ export const enforceMaxVersions = async ({ id, collection, global: globalConfig,
                 }
             };
             if (collection) {
-                // The same scoped predicate the probe used, so what is counted and what is
-                // deleted are the same set of rows.
-                Object.assign(deleteQuery, where);
+                deleteQuery.parent = {
+                    equals: id
+                };
             }
             const deleteVersionsArgs = {
                 req,

package/dist/versions/enforceMaxVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/enforceMaxVersions.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { DeleteVersionsArgs } from '../database/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload, PayloadRequest, Where } from '../types/index.js'\n\nimport { resolveBranchOwnVersions } from '../branching/versions.js'\nimport {\n  collectVersionFiles,\n  scheduleUnreferencedFileCleanup,\n} from '../uploads/fileVersioning/cleanup.js'\n\ntype Args = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  max: number\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const skipEnforceMaxVersionsContextKey = Symbol('skipEnforceMaxVersions')\n\ntype SkipEnforceMaxVersions = {\n  collectionSlug: string\n  id: number | string\n}\n\nexport const enforceMaxVersions = async ({\n  id,\n  collection,\n  global: globalConfig,\n  max,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  const skipEnforceMaxVersions = (req?.context as Record<PropertyKey, unknown> | undefined)?.[\n    skipEnforceMaxVersionsContextKey\n  ] as SkipEnforceMaxVersions | undefined\n\n  if (\n    collection &&\n    skipEnforceMaxVersions?.collectionSlug === collection.slug &&\n    String(skipEnforceMaxVersions.id) === String(id)\n  ) {\n    return\n  }\n\n  const entityType = collection ? 'collection' : 'global'\n  const slug = collection ? collection.slug : globalConfig?.slug\n\n  try {\n    const where: Where = {}\n    let oldestAllowedDoc\n\n    if (collection) {\n      // Scoped to the chain being pruned, which on a branch is the branch's own —\n      // hanging off its shadow row, not the canonical ID.\n      //\n      // Both halves need it. Unscoped, the probe counted main's versions as part of the\n      // branch's ancestry (a branch reads main's history as its own past, §12), and then\n      // the delete addressed `parent: <canonical id>` with no `_branch` filter, which on\n      // a branch matches *only main's rows*. Saving on a branch therefore deleted\n      // production version history and never pruned the branch at all.\n      Object.assign(\n        where,\n        await resolveBranchOwnVersions({ id: id!, collectionSlug: collection.slug, req }),\n      )\n\n      const query = await payload.db.findVersions({\n        collection: collection.slug,\n        limit: 1,\n        page: max + 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    } else if (globalConfig) {\n      const query = await payload.db.findGlobalVersions({\n        global: globalConfig.slug,\n        limit: 1,\n        page: max + 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    }\n\n    if (oldestAllowedDoc?.updatedAt) {\n      const deleteQuery: Where = {\n        updatedAt: {\n          less_than_equal: oldestAllowedDoc.updatedAt,\n        },\n      }\n\n      if (collection) {\n        // The same scoped predicate the probe used, so what is counted and what is\n        // deleted are the same set of rows.\n        Object.assign(deleteQuery, where)\n      }\n\n      const deleteVersionsArgs: DeleteVersionsArgs = { req, where: deleteQuery }\n\n      if (globalConfig) {\n        deleteVersionsArgs.globalSlug = slug\n      } else {\n        deleteVersionsArgs.collection = slug\n      }\n\n      const removedFiles =\n        collection?.upload && id !== undefined && req\n          ? await collectVersionFiles({ collection, parentID: id, req, where: deleteQuery })\n          : []\n\n      await payload.db.deleteVersions(deleteVersionsArgs)\n\n      if (collection?.upload && req) {\n        await scheduleUnreferencedFileCleanup({\n          candidates: removedFiles,\n          collection,\n          req,\n        })\n      }\n    }\n  } catch (err) {\n    payload.logger.error(err)\n    payload.logger.error(\n      `There was an error cleaning up old versions for the ${entityType} ${slug}`,\n    )\n  }\n}\n"],"names":["resolveBranchOwnVersions","collectVersionFiles","scheduleUnreferencedFileCleanup","skipEnforceMaxVersionsContextKey","Symbol","enforceMaxVersions","id","collection","global","globalConfig","max","payload","req","skipEnforceMaxVersions","context","collectionSlug","slug","String","entityType","where","oldestAllowedDoc","Object","assign","query","db","findVersions","limit","page","pagination","sort","docs","findGlobalVersions","updatedAt","deleteQuery","less_than_equal","deleteVersionsArgs","globalSlug","removedFiles","upload","undefined","parentID","deleteVersions","candidates","err","logger","error"],"mappings":"AAKA,SAASA,wBAAwB,QAAQ,2BAA0B;AACnE,SACEC,mBAAmB,EACnBC,+BAA+B,QAC1B,uCAAsC;AAW7C,OAAO,MAAMC,mCAAmCC,OAAO,0BAAyB;AAOhF,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,EAAE,EACFC,UAAU,EACVC,QAAQC,YAAY,EACpBC,GAAG,EACHC,OAAO,EACPC,GAAG,EACE;IACL,MAAMC,yBAA0BD,KAAKE,SAAsD,CACzFX,iCACD;IAED,IACEI,cACAM,wBAAwBE,mBAAmBR,WAAWS,IAAI,IAC1DC,OAAOJ,uBAAuBP,EAAE,MAAMW,OAAOX,KAC7C;QACA;IACF;IAEA,MAAMY,aAAaX,aAAa,eAAe;IAC/C,MAAMS,OAAOT,aAAaA,WAAWS,IAAI,GAAGP,cAAcO;IAE1D,IAAI;QACF,MAAMG,QAAe,CAAC;QACtB,IAAIC;QAEJ,IAAIb,YAAY;YACd,4EAA4E;YAC5E,oDAAoD;YACpD,EAAE;YACF,kFAAkF;YAClF,mFAAmF;YACnF,mFAAmF;YACnF,4EAA4E;YAC5E,iEAAiE;YACjEc,OAAOC,MAAM,CACXH,OACA,MAAMnB,yBAAyB;gBAAEM,IAAIA;gBAAKS,gBAAgBR,WAAWS,IAAI;gBAAEJ;YAAI;YAGjF,MAAMW,QAAQ,MAAMZ,QAAQa,EAAE,CAACC,YAAY,CAAC;gBAC1ClB,YAAYA,WAAWS,IAAI;gBAC3BU,OAAO;gBACPC,MAAMjB,MAAM;gBACZkB,YAAY;gBACZhB;gBACAiB,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC,OAAO,IAAIrB,cAAc;YACvB,MAAMc,QAAQ,MAAMZ,QAAQa,EAAE,CAACO,kBAAkB,CAAC;gBAChDvB,QAAQC,aAAaO,IAAI;gBACzBU,OAAO;gBACPC,MAAMjB,MAAM;gBACZkB,YAAY;gBACZhB;gBACAiB,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC;QAEA,IAAIV,kBAAkBY,WAAW;YAC/B,MAAMC,cAAqB;gBACzBD,WAAW;oBACTE,iBAAiBd,iBAAiBY,SAAS;gBAC7C;YACF;YAEA,IAAIzB,YAAY;gBACd,2EAA2E;gBAC3E,oCAAoC;gBACpCc,OAAOC,MAAM,CAACW,aAAad;YAC7B;YAEA,MAAMgB,qBAAyC;gBAAEvB;gBAAKO,OAAOc;YAAY;YAEzE,IAAIxB,cAAc;gBAChB0B,mBAAmBC,UAAU,GAAGpB;YAClC,OAAO;gBACLmB,mBAAmB5B,UAAU,GAAGS;YAClC;YAEA,MAAMqB,eACJ9B,YAAY+B,UAAUhC,OAAOiC,aAAa3B,MACtC,MAAMX,oBAAoB;gBAAEM;gBAAYiC,UAAUlC;gBAAIM;gBAAKO,OAAOc;YAAY,KAC9E,EAAE;YAER,MAAMtB,QAAQa,EAAE,CAACiB,cAAc,CAACN;YAEhC,IAAI5B,YAAY+B,UAAU1B,KAAK;gBAC7B,MAAMV,gCAAgC;oBACpCwC,YAAYL;oBACZ9B;oBACAK;gBACF;YACF;QACF;IACF,EAAE,OAAO+B,KAAK;QACZhC,QAAQiC,MAAM,CAACC,KAAK,CAACF;QACrBhC,QAAQiC,MAAM,CAACC,KAAK,CAClB,CAAC,oDAAoD,EAAE3B,WAAW,CAAC,EAAEF,MAAM;IAE/E;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/enforceMaxVersions.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { DeleteVersionsArgs } from '../database/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload, PayloadRequest, Where } from '../types/index.js'\n\nimport {\n  collectVersionFiles,\n  scheduleUnreferencedFileCleanup,\n} from '../uploads/fileVersioning/cleanup.js'\n\ntype Args = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  max: number\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const enforceMaxVersions = async ({\n  id,\n  collection,\n  global: globalConfig,\n  max,\n  payload,\n  req,\n}: Args): Promise<void> => {\n  const entityType = collection ? 'collection' : 'global'\n  const slug = collection ? collection.slug : globalConfig?.slug\n\n  try {\n    const where: Where = {}\n    let oldestAllowedDoc\n\n    if (collection) {\n      where.parent = {\n        equals: id,\n      }\n\n      const query = await payload.db.findVersions({\n        collection: collection.slug,\n        limit: 1,\n        page: max + 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    } else if (globalConfig) {\n      const query = await payload.db.findGlobalVersions({\n        global: globalConfig.slug,\n        limit: 1,\n        page: max + 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n        where,\n      })\n\n      ;[oldestAllowedDoc] = query.docs\n    }\n\n    if (oldestAllowedDoc?.updatedAt) {\n      const deleteQuery: Where = {\n        updatedAt: {\n          less_than_equal: oldestAllowedDoc.updatedAt,\n        },\n      }\n\n      if (collection) {\n        deleteQuery.parent = {\n          equals: id,\n        }\n      }\n\n      const deleteVersionsArgs: DeleteVersionsArgs = { req, where: deleteQuery }\n\n      if (globalConfig) {\n        deleteVersionsArgs.globalSlug = slug\n      } else {\n        deleteVersionsArgs.collection = slug\n      }\n\n      const removedFiles =\n        collection?.upload && id !== undefined && req\n          ? await collectVersionFiles({ collection, parentID: id, req, where: deleteQuery })\n          : []\n\n      await payload.db.deleteVersions(deleteVersionsArgs)\n\n      if (collection?.upload && req) {\n        await scheduleUnreferencedFileCleanup({\n          candidates: removedFiles,\n          collection,\n          req,\n        })\n      }\n    }\n  } catch (err) {\n    payload.logger.error(err)\n    payload.logger.error(\n      `There was an error cleaning up old versions for the ${entityType} ${slug}`,\n    )\n  }\n}\n"],"names":["collectVersionFiles","scheduleUnreferencedFileCleanup","enforceMaxVersions","id","collection","global","globalConfig","max","payload","req","entityType","slug","where","oldestAllowedDoc","parent","equals","query","db","findVersions","limit","page","pagination","sort","docs","findGlobalVersions","updatedAt","deleteQuery","less_than_equal","deleteVersionsArgs","globalSlug","removedFiles","upload","undefined","parentID","deleteVersions","candidates","err","logger","error"],"mappings":"AAKA,SACEA,mBAAmB,EACnBC,+BAA+B,QAC1B,uCAAsC;AAW7C,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,EAAE,EACFC,UAAU,EACVC,QAAQC,YAAY,EACpBC,GAAG,EACHC,OAAO,EACPC,GAAG,EACE;IACL,MAAMC,aAAaN,aAAa,eAAe;IAC/C,MAAMO,OAAOP,aAAaA,WAAWO,IAAI,GAAGL,cAAcK;IAE1D,IAAI;QACF,MAAMC,QAAe,CAAC;QACtB,IAAIC;QAEJ,IAAIT,YAAY;YACdQ,MAAME,MAAM,GAAG;gBACbC,QAAQZ;YACV;YAEA,MAAMa,QAAQ,MAAMR,QAAQS,EAAE,CAACC,YAAY,CAAC;gBAC1Cd,YAAYA,WAAWO,IAAI;gBAC3BQ,OAAO;gBACPC,MAAMb,MAAM;gBACZc,YAAY;gBACZZ;gBACAa,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC,OAAO,IAAIjB,cAAc;YACvB,MAAMU,QAAQ,MAAMR,QAAQS,EAAE,CAACO,kBAAkB,CAAC;gBAChDnB,QAAQC,aAAaK,IAAI;gBACzBQ,OAAO;gBACPC,MAAMb,MAAM;gBACZc,YAAY;gBACZZ;gBACAa,MAAM;gBACNV;YACF;YAEC,CAACC,iBAAiB,GAAGG,MAAMO,IAAI;QAClC;QAEA,IAAIV,kBAAkBY,WAAW;YAC/B,MAAMC,cAAqB;gBACzBD,WAAW;oBACTE,iBAAiBd,iBAAiBY,SAAS;gBAC7C;YACF;YAEA,IAAIrB,YAAY;gBACdsB,YAAYZ,MAAM,GAAG;oBACnBC,QAAQZ;gBACV;YACF;YAEA,MAAMyB,qBAAyC;gBAAEnB;gBAAKG,OAAOc;YAAY;YAEzE,IAAIpB,cAAc;gBAChBsB,mBAAmBC,UAAU,GAAGlB;YAClC,OAAO;gBACLiB,mBAAmBxB,UAAU,GAAGO;YAClC;YAEA,MAAMmB,eACJ1B,YAAY2B,UAAU5B,OAAO6B,aAAavB,MACtC,MAAMT,oBAAoB;gBAAEI;gBAAY6B,UAAU9B;gBAAIM;gBAAKG,OAAOc;YAAY,KAC9E,EAAE;YAER,MAAMlB,QAAQS,EAAE,CAACiB,cAAc,CAACN;YAEhC,IAAIxB,YAAY2B,UAAUtB,KAAK;gBAC7B,MAAMR,gCAAgC;oBACpCkC,YAAYL;oBACZ1B;oBACAK;gBACF;YACF;QACF;IACF,EAAE,OAAO2B,KAAK;QACZ5B,QAAQ6B,MAAM,CAACC,KAAK,CAACF;QACrB5B,QAAQ6B,MAAM,CAACC,KAAK,CAClB,CAAC,oDAAoD,EAAE5B,WAAW,CAAC,EAAEC,MAAM;IAE/E;AACF,EAAC"}

package/dist/versions/getLatestCollectionVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestCollectionVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAQvE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,yBAAyB,CAAA;IACjC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAU,CAAC,SAAS,UAAU,GAAG,GAAG,mDAOxE,IAAI,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAqC9B,CAAA"}
+{"version":3,"file":"getLatestCollectionVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestCollectionVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAA;AAC3F,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAS,MAAM,mBAAmB,CAAA;AAOvE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,yBAAyB,CAAA;IACjC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,KAAK,EAAE,WAAW,CAAA;IAClB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,0BAA0B,GAAU,CAAC,SAAS,UAAU,GAAG,GAAG,mDAOxE,IAAI,KAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAiC9B,CAAA"}

package/dist/versions/getLatestCollectionVersion.js

@@ -1,21 +1,13 @@
-import { resolveBranchRowID } from '../branching/resolveBranchRowID.js';
 import { combineQueries } from '../database/combineQueries.js';
 import { hasDraftsEnabled } from '../utilities/getVersionsConfig.js';
 import { appendVersionToQueryKey } from './drafts/appendVersionToQueryKey.js';
 export const getLatestCollectionVersion = async ({ id, config, payload, published, query, req })=>{
     let latestVersion;
-    // Version rows on a branch hang off the shadow row, so `parent` is that row's
-    // primary key rather than the canonical document ID the caller passed.
-    const parentID = await resolveBranchRowID({
-        id,
-        collectionSlug: config.slug,
-        req
-    });
     const whereQuery = published ? {
         and: [
             {
                 parent: {
-                    equals: parentID
+                    equals: id
                 }
             },
             {
@@ -28,7 +20,7 @@ export const getLatestCollectionVersion = async ({ id, config, payload, publishe
         and: [
             {
                 parent: {
-                    equals: parentID
+                    equals: id
                 }
             },
             {

package/dist/versions/getLatestCollectionVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/getLatestCollectionVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { FindOneArgs } from '../database/types.js'\nimport type { Payload, PayloadRequest, Where } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { resolveBranchRowID } from '../branching/resolveBranchRowID.js'\nimport { combineQueries } from '../database/combineQueries.js'\nimport { hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\nimport { appendVersionToQueryKey } from './drafts/appendVersionToQueryKey.js'\n\ntype Args = {\n  config: SanitizedCollectionConfig\n  id: number | string\n  payload: Payload\n  published?: boolean\n  query: FindOneArgs\n  req?: PayloadRequest\n}\n\nexport const getLatestCollectionVersion = async <T extends TypeWithID = any>({\n  id,\n  config,\n  payload,\n  published,\n  query,\n  req,\n}: Args): Promise<T | undefined> => {\n  let latestVersion!: TypeWithVersion<T>\n\n  // Version rows on a branch hang off the shadow row, so `parent` is that row's\n  // primary key rather than the canonical document ID the caller passed.\n  const parentID = await resolveBranchRowID({ id, collectionSlug: config.slug, req })\n\n  const whereQuery = published\n    ? { and: [{ parent: { equals: parentID } }, { 'version._status': { equals: 'published' } }] }\n    : { and: [{ parent: { equals: parentID } }, { latest: { equals: true } }] }\n\n  if (hasDraftsEnabled(config)) {\n    const { docs } = await payload.db.findVersions<T>({\n      collection: config.slug,\n      limit: 1,\n      locale: req?.locale || query.locale,\n      pagination: false,\n      req,\n      sort: '-updatedAt',\n      where: combineQueries(appendVersionToQueryKey(query.where), whereQuery as unknown as Where),\n    })\n    latestVersion = docs[0]!\n  }\n\n  if (!latestVersion) {\n    if (!published) {\n      const doc = await payload.db.findOne<T>({ ...query, req })\n\n      return doc ?? undefined\n    }\n\n    return undefined\n  }\n\n  latestVersion.version.id = id\n\n  return latestVersion.version\n}\n"],"names":["resolveBranchRowID","combineQueries","hasDraftsEnabled","appendVersionToQueryKey","getLatestCollectionVersion","id","config","payload","published","query","req","latestVersion","parentID","collectionSlug","slug","whereQuery","and","parent","equals","latest","docs","db","findVersions","collection","limit","locale","pagination","sort","where","doc","findOne","undefined","version"],"mappings":"AAKA,SAASA,kBAAkB,QAAQ,qCAAoC;AACvE,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,oCAAmC;AACpE,SAASC,uBAAuB,QAAQ,sCAAqC;AAW7E,OAAO,MAAMC,6BAA6B,OAAmC,EAC3EC,EAAE,EACFC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,KAAK,EACLC,GAAG,EACE;IACL,IAAIC;IAEJ,8EAA8E;IAC9E,uEAAuE;IACvE,MAAMC,WAAW,MAAMZ,mBAAmB;QAAEK;QAAIQ,gBAAgBP,OAAOQ,IAAI;QAAEJ;IAAI;IAEjF,MAAMK,aAAaP,YACf;QAAEQ,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQN;gBAAS;YAAE;YAAG;gBAAE,mBAAmB;oBAAEM,QAAQ;gBAAY;YAAE;SAAE;IAAC,IAC1F;QAAEF,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQN;gBAAS;YAAE;YAAG;gBAAEO,QAAQ;oBAAED,QAAQ;gBAAK;YAAE;SAAE;IAAC;IAE5E,IAAIhB,iBAAiBI,SAAS;QAC5B,MAAM,EAAEc,IAAI,EAAE,GAAG,MAAMb,QAAQc,EAAE,CAACC,YAAY,CAAI;YAChDC,YAAYjB,OAAOQ,IAAI;YACvBU,OAAO;YACPC,QAAQf,KAAKe,UAAUhB,MAAMgB,MAAM;YACnCC,YAAY;YACZhB;YACAiB,MAAM;YACNC,OAAO3B,eAAeE,wBAAwBM,MAAMmB,KAAK,GAAGb;QAC9D;QACAJ,gBAAgBS,IAAI,CAAC,EAAE;IACzB;IAEA,IAAI,CAACT,eAAe;QAClB,IAAI,CAACH,WAAW;YACd,MAAMqB,MAAM,MAAMtB,QAAQc,EAAE,CAACS,OAAO,CAAI;gBAAE,GAAGrB,KAAK;gBAAEC;YAAI;YAExD,OAAOmB,OAAOE;QAChB;QAEA,OAAOA;IACT;IAEApB,cAAcqB,OAAO,CAAC3B,EAAE,GAAGA;IAE3B,OAAOM,cAAcqB,OAAO;AAC9B,EAAC"}
+{"version":3,"sources":["../../src/versions/getLatestCollectionVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { FindOneArgs } from '../database/types.js'\nimport type { Payload, PayloadRequest, Where } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { combineQueries } from '../database/combineQueries.js'\nimport { hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\nimport { appendVersionToQueryKey } from './drafts/appendVersionToQueryKey.js'\n\ntype Args = {\n  config: SanitizedCollectionConfig\n  id: number | string\n  payload: Payload\n  published?: boolean\n  query: FindOneArgs\n  req?: PayloadRequest\n}\n\nexport const getLatestCollectionVersion = async <T extends TypeWithID = any>({\n  id,\n  config,\n  payload,\n  published,\n  query,\n  req,\n}: Args): Promise<T | undefined> => {\n  let latestVersion!: TypeWithVersion<T>\n\n  const whereQuery = published\n    ? { and: [{ parent: { equals: id } }, { 'version._status': { equals: 'published' } }] }\n    : { and: [{ parent: { equals: id } }, { latest: { equals: true } }] }\n\n  if (hasDraftsEnabled(config)) {\n    const { docs } = await payload.db.findVersions<T>({\n      collection: config.slug,\n      limit: 1,\n      locale: req?.locale || query.locale,\n      pagination: false,\n      req,\n      sort: '-updatedAt',\n      where: combineQueries(appendVersionToQueryKey(query.where), whereQuery as unknown as Where),\n    })\n    latestVersion = docs[0]!\n  }\n\n  if (!latestVersion) {\n    if (!published) {\n      const doc = await payload.db.findOne<T>({ ...query, req })\n\n      return doc ?? undefined\n    }\n\n    return undefined\n  }\n\n  latestVersion.version.id = id\n\n  return latestVersion.version\n}\n"],"names":["combineQueries","hasDraftsEnabled","appendVersionToQueryKey","getLatestCollectionVersion","id","config","payload","published","query","req","latestVersion","whereQuery","and","parent","equals","latest","docs","db","findVersions","collection","slug","limit","locale","pagination","sort","where","doc","findOne","undefined","version"],"mappings":"AAKA,SAASA,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,oCAAmC;AACpE,SAASC,uBAAuB,QAAQ,sCAAqC;AAW7E,OAAO,MAAMC,6BAA6B,OAAmC,EAC3EC,EAAE,EACFC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,KAAK,EACLC,GAAG,EACE;IACL,IAAIC;IAEJ,MAAMC,aAAaJ,YACf;QAAEK,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQV;gBAAG;YAAE;YAAG;gBAAE,mBAAmB;oBAAEU,QAAQ;gBAAY;YAAE;SAAE;IAAC,IACpF;QAAEF,KAAK;YAAC;gBAAEC,QAAQ;oBAAEC,QAAQV;gBAAG;YAAE;YAAG;gBAAEW,QAAQ;oBAAED,QAAQ;gBAAK;YAAE;SAAE;IAAC;IAEtE,IAAIb,iBAAiBI,SAAS;QAC5B,MAAM,EAAEW,IAAI,EAAE,GAAG,MAAMV,QAAQW,EAAE,CAACC,YAAY,CAAI;YAChDC,YAAYd,OAAOe,IAAI;YACvBC,OAAO;YACPC,QAAQb,KAAKa,UAAUd,MAAMc,MAAM;YACnCC,YAAY;YACZd;YACAe,MAAM;YACNC,OAAOzB,eAAeE,wBAAwBM,MAAMiB,KAAK,GAAGd;QAC9D;QACAD,gBAAgBM,IAAI,CAAC,EAAE;IACzB;IAEA,IAAI,CAACN,eAAe;QAClB,IAAI,CAACH,WAAW;YACd,MAAMmB,MAAM,MAAMpB,QAAQW,EAAE,CAACU,OAAO,CAAI;gBAAE,GAAGnB,KAAK;gBAAEC;YAAI;YAExD,OAAOiB,OAAOE;QAChB;QAEA,OAAOA;IACT;IAEAlB,cAAcmB,OAAO,CAACzB,EAAE,GAAGA;IAE3B,OAAOM,cAAcmB,OAAO;AAC9B,EAAC"}

package/dist/versions/getLatestGlobalVersion.d.ts

@@ -7,15 +7,11 @@ type Args = {
     published?: boolean;
     req?: PayloadRequest;
     slug: string;
-    /** Filters stored global and global-version rows without changing access-query field paths. */
-    storageWhere?: Where;
     where: Where;
 };
-type Result = {
+export declare const getLatestGlobalVersion: ({ slug, config, locale, payload, published, req, where, }: Args) => Promise<{
     global: Document;
     globalExists: boolean;
-    hasLiveGlobal: boolean;
-};
-export declare const getLatestGlobalVersion: ({ slug, config, locale, payload, published, req, storageWhere, where, }: Args) => Promise<Result>;
+}>;
 export {};
 //# sourceMappingURL=getLatestGlobalVersion.d.ts.map

package/dist/versions/getLatestGlobalVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getLatestGlobalVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AASjF,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,+FAA+F;IAC/F,YAAY,CAAC,EAAE,KAAK,CAAA;IACpB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,KAAK,MAAM,GAAG;IACZ,MAAM,EAAE,QAAQ,CAAA;IAChB,YAAY,EAAE,OAAO,CAAA;IACrB,aAAa,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,sBAAsB,4EAShC,IAAI,KAAG,OAAO,CAAC,MAAM,CA0GvB,CAAA"}
+{"version":3,"file":"getLatestGlobalVersion.d.ts","sourceRoot":"","sources":["../../src/versions/getLatestGlobalVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAQjF,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,qBAAqB,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAED,eAAO,MAAM,sBAAsB,8DAQhC,IAAI,KAAG,OAAO,CAAC;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,YAAY,EAAE,OAAO,CAAA;CAAE,CAsD5D,CAAA"}

package/dist/versions/getLatestGlobalVersion.js

@@ -1,9 +1,8 @@
 import { hasWhereAccessResult } from '../auth/types.js';
-import { branchField } from '../branching/types.js';
 import { combineQueries } from '../database/combineQueries.js';
 import { hasDraftsEnabled } from '../utilities/getVersionsConfig.js';
-import { appendGlobalVersionToQueryKey } from './drafts/appendVersionToQueryKey.js';
-export const getLatestGlobalVersion = async ({ slug, config, locale, payload, published, req, storageWhere, where })=>{
+import { appendVersionToQueryKey } from './drafts/appendVersionToQueryKey.js';
+export const getLatestGlobalVersion = async ({ slug, config, locale, payload, published, req, where })=>{
     let latestVersion;
     const whereQuery = published ? {
         'version._status': {
@@ -14,7 +13,6 @@ export const getLatestGlobalVersion = async ({ slug, config, locale, payload, pu
             equals: true
         }
     };
-    const scopedVersionQuery = storageWhere ? combineQueries(whereQuery, storageWhere) : whereQuery;
     if (hasDraftsEnabled(config)) {
         latestVersion = (await payload.db.findGlobalVersions({
             global: slug,
@@ -22,78 +20,36 @@ export const getLatestGlobalVersion = async ({ slug, config, locale, payload, pu
             locale: locale || req?.locale || undefined,
             pagination: false,
             req,
-            where: scopedVersionQuery
+            where: combineQueries(appendVersionToQueryKey(where), whereQuery)
         })).docs[0];
     }
-    const scopedLiveGlobal = await payload.db.findGlobal({
+    const global = await payload.db.findGlobal({
         slug,
         locale,
         req,
-        where: storageWhere
+        where
     });
-    const hasLiveGlobal = Boolean(scopedLiveGlobal && Object.keys(scopedLiveGlobal).length > 0);
-    const globalExists = Boolean(latestVersion) || hasLiveGlobal;
-    if (latestVersion) {
-        let accessibleLatestVersion = latestVersion;
-        if (hasWhereAccessResult(where)) {
-            const versionAccessQuery = combineQueries(appendGlobalVersionToQueryKey(where), {
-                id: {
-                    equals: latestVersion.id
-                }
-            });
-            const scopedVersionAccessQuery = storageWhere ? combineQueries(versionAccessQuery, storageWhere) : versionAccessQuery;
-            accessibleLatestVersion = (await payload.db.findGlobalVersions({
-                global: slug,
-                limit: 1,
-                locale: locale || req?.locale || undefined,
-                pagination: false,
-                req,
-                where: scopedVersionAccessQuery
-            })).docs[0];
-        }
-        if (!accessibleLatestVersion) {
-            return {
-                global: {},
-                globalExists,
-                hasLiveGlobal
-            };
-        }
-        if (!accessibleLatestVersion.version.createdAt) {
-            accessibleLatestVersion.version.createdAt = accessibleLatestVersion.createdAt;
-        }
-        if (!accessibleLatestVersion.version.updatedAt) {
-            accessibleLatestVersion.version.updatedAt = accessibleLatestVersion.updatedAt;
-        }
+    const existingGlobal = hasWhereAccessResult(where) ? await payload.db.findGlobal({
+        slug,
+        locale,
+        req
+    }) : global;
+    const globalExists = Boolean(existingGlobal && Object.keys(existingGlobal).length > 0);
+    if (!latestVersion) {
         return {
-            global: accessibleLatestVersion.version,
-            globalExists,
-            hasLiveGlobal
+            global,
+            globalExists
         };
     }
-    if (!hasWhereAccessResult(where) || !hasLiveGlobal) {
-        return {
-            global: scopedLiveGlobal,
-            globalExists,
-            hasLiveGlobal
-        };
+    if (!latestVersion.version.createdAt) {
+        latestVersion.version.createdAt = latestVersion.createdAt;
+    }
+    if (!latestVersion.version.updatedAt) {
+        latestVersion.version.updatedAt = latestVersion.updatedAt;
     }
-    const liveGlobalBranch = scopedLiveGlobal[branchField];
-    const exactLiveStorageWhere = typeof liveGlobalBranch === 'string' ? combineQueries(storageWhere ?? {}, {
-        [branchField]: {
-            equals: liveGlobalBranch
-        }
-    }) : storageWhere;
-    const liveAccessQuery = exactLiveStorageWhere ? combineQueries(where, exactLiveStorageWhere) : where;
-    const accessibleLiveGlobal = await payload.db.findGlobal({
-        slug,
-        locale,
-        req,
-        where: liveAccessQuery
-    });
     return {
-        global: accessibleLiveGlobal,
-        globalExists,
-        hasLiveGlobal
+        global: latestVersion.version,
+        globalExists
     };
 };
 

package/dist/versions/getLatestGlobalVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/getLatestGlobalVersion.ts"],"sourcesContent":["import type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Document, Payload, PayloadRequest, Where } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { hasWhereAccessResult } from '../auth/types.js'\nimport { branchField } from '../branching/types.js'\nimport { combineQueries } from '../database/combineQueries.js'\nimport { hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\nimport { appendGlobalVersionToQueryKey } from './drafts/appendVersionToQueryKey.js'\n\ntype Args = {\n  config: SanitizedGlobalConfig\n  locale?: string\n  payload: Payload\n  published?: boolean\n  req?: PayloadRequest\n  slug: string\n  /** Filters stored global and global-version rows without changing access-query field paths. */\n  storageWhere?: Where\n  where: Where\n}\n\ntype Result = {\n  global: Document\n  globalExists: boolean\n  hasLiveGlobal: boolean\n}\n\nexport const getLatestGlobalVersion = async ({\n  slug,\n  config,\n  locale,\n  payload,\n  published,\n  req,\n  storageWhere,\n  where,\n}: Args): Promise<Result> => {\n  let latestVersion: TypeWithVersion<Document> | undefined\n\n  const whereQuery = published\n    ? { 'version._status': { equals: 'published' } }\n    : { latest: { equals: true } }\n  const scopedVersionQuery = storageWhere\n    ? combineQueries(whereQuery as unknown as Where, storageWhere)\n    : (whereQuery as unknown as Where)\n\n  if (hasDraftsEnabled(config)) {\n    latestVersion = (\n      await payload.db.findGlobalVersions({\n        global: slug,\n        limit: 1,\n        locale: locale || req?.locale || undefined,\n        pagination: false,\n        req,\n        where: scopedVersionQuery,\n      })\n    ).docs[0]\n  }\n\n  const scopedLiveGlobal = await payload.db.findGlobal({\n    slug,\n    locale,\n    req,\n    where: storageWhere,\n  })\n  const hasLiveGlobal = Boolean(scopedLiveGlobal && Object.keys(scopedLiveGlobal).length > 0)\n  const globalExists = Boolean(latestVersion) || hasLiveGlobal\n\n  if (latestVersion) {\n    let accessibleLatestVersion: TypeWithVersion<Document> | undefined = latestVersion\n\n    if (hasWhereAccessResult(where)) {\n      const versionAccessQuery = combineQueries(appendGlobalVersionToQueryKey(where), {\n        id: { equals: latestVersion.id },\n      })\n      const scopedVersionAccessQuery = storageWhere\n        ? combineQueries(versionAccessQuery, storageWhere)\n        : versionAccessQuery\n\n      accessibleLatestVersion = (\n        await payload.db.findGlobalVersions({\n          global: slug,\n          limit: 1,\n          locale: locale || req?.locale || undefined,\n          pagination: false,\n          req,\n          where: scopedVersionAccessQuery,\n        })\n      ).docs[0]\n    }\n\n    if (!accessibleLatestVersion) {\n      return {\n        global: {},\n        globalExists,\n        hasLiveGlobal,\n      }\n    }\n\n    if (!accessibleLatestVersion.version.createdAt) {\n      accessibleLatestVersion.version.createdAt = accessibleLatestVersion.createdAt\n    }\n\n    if (!accessibleLatestVersion.version.updatedAt) {\n      accessibleLatestVersion.version.updatedAt = accessibleLatestVersion.updatedAt\n    }\n\n    return {\n      global: accessibleLatestVersion.version,\n      globalExists,\n      hasLiveGlobal,\n    }\n  }\n\n  if (!hasWhereAccessResult(where) || !hasLiveGlobal) {\n    return {\n      global: scopedLiveGlobal,\n      globalExists,\n      hasLiveGlobal,\n    }\n  }\n\n  const liveGlobalBranch = scopedLiveGlobal[branchField]\n  const exactLiveStorageWhere =\n    typeof liveGlobalBranch === 'string'\n      ? combineQueries(storageWhere ?? {}, { [branchField]: { equals: liveGlobalBranch } })\n      : storageWhere\n  const liveAccessQuery = exactLiveStorageWhere\n    ? combineQueries(where, exactLiveStorageWhere)\n    : where\n  const accessibleLiveGlobal = await payload.db.findGlobal({\n    slug,\n    locale,\n    req,\n    where: liveAccessQuery,\n  })\n\n  return {\n    global: accessibleLiveGlobal,\n    globalExists,\n    hasLiveGlobal,\n  }\n}\n"],"names":["hasWhereAccessResult","branchField","combineQueries","hasDraftsEnabled","appendGlobalVersionToQueryKey","getLatestGlobalVersion","slug","config","locale","payload","published","req","storageWhere","where","latestVersion","whereQuery","equals","latest","scopedVersionQuery","db","findGlobalVersions","global","limit","undefined","pagination","docs","scopedLiveGlobal","findGlobal","hasLiveGlobal","Boolean","Object","keys","length","globalExists","accessibleLatestVersion","versionAccessQuery","id","scopedVersionAccessQuery","version","createdAt","updatedAt","liveGlobalBranch","exactLiveStorageWhere","liveAccessQuery","accessibleLiveGlobal"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,mBAAkB;AACvD,SAASC,WAAW,QAAQ,wBAAuB;AACnD,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,oCAAmC;AACpE,SAASC,6BAA6B,QAAQ,sCAAqC;AAoBnF,OAAO,MAAMC,yBAAyB,OAAO,EAC3CC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,GAAG,EACHC,YAAY,EACZC,KAAK,EACA;IACL,IAAIC;IAEJ,MAAMC,aAAaL,YACf;QAAE,mBAAmB;YAAEM,QAAQ;QAAY;IAAE,IAC7C;QAAEC,QAAQ;YAAED,QAAQ;QAAK;IAAE;IAC/B,MAAME,qBAAqBN,eACvBV,eAAea,YAAgCH,gBAC9CG;IAEL,IAAIZ,iBAAiBI,SAAS;QAC5BO,gBAAgB,AACd,CAAA,MAAML,QAAQU,EAAE,CAACC,kBAAkB,CAAC;YAClCC,QAAQf;YACRgB,OAAO;YACPd,QAAQA,UAAUG,KAAKH,UAAUe;YACjCC,YAAY;YACZb;YACAE,OAAOK;QACT,EAAC,EACDO,IAAI,CAAC,EAAE;IACX;IAEA,MAAMC,mBAAmB,MAAMjB,QAAQU,EAAE,CAACQ,UAAU,CAAC;QACnDrB;QACAE;QACAG;QACAE,OAAOD;IACT;IACA,MAAMgB,gBAAgBC,QAAQH,oBAAoBI,OAAOC,IAAI,CAACL,kBAAkBM,MAAM,GAAG;IACzF,MAAMC,eAAeJ,QAAQf,kBAAkBc;IAE/C,IAAId,eAAe;QACjB,IAAIoB,0BAAiEpB;QAErE,IAAId,qBAAqBa,QAAQ;YAC/B,MAAMsB,qBAAqBjC,eAAeE,8BAA8BS,QAAQ;gBAC9EuB,IAAI;oBAAEpB,QAAQF,cAAcsB,EAAE;gBAAC;YACjC;YACA,MAAMC,2BAA2BzB,eAC7BV,eAAeiC,oBAAoBvB,gBACnCuB;YAEJD,0BAA0B,AACxB,CAAA,MAAMzB,QAAQU,EAAE,CAACC,kBAAkB,CAAC;gBAClCC,QAAQf;gBACRgB,OAAO;gBACPd,QAAQA,UAAUG,KAAKH,UAAUe;gBACjCC,YAAY;gBACZb;gBACAE,OAAOwB;YACT,EAAC,EACDZ,IAAI,CAAC,EAAE;QACX;QAEA,IAAI,CAACS,yBAAyB;YAC5B,OAAO;gBACLb,QAAQ,CAAC;gBACTY;gBACAL;YACF;QACF;QAEA,IAAI,CAACM,wBAAwBI,OAAO,CAACC,SAAS,EAAE;YAC9CL,wBAAwBI,OAAO,CAACC,SAAS,GAAGL,wBAAwBK,SAAS;QAC/E;QAEA,IAAI,CAACL,wBAAwBI,OAAO,CAACE,SAAS,EAAE;YAC9CN,wBAAwBI,OAAO,CAACE,SAAS,GAAGN,wBAAwBM,SAAS;QAC/E;QAEA,OAAO;YACLnB,QAAQa,wBAAwBI,OAAO;YACvCL;YACAL;QACF;IACF;IAEA,IAAI,CAAC5B,qBAAqBa,UAAU,CAACe,eAAe;QAClD,OAAO;YACLP,QAAQK;YACRO;YACAL;QACF;IACF;IAEA,MAAMa,mBAAmBf,gBAAgB,CAACzB,YAAY;IACtD,MAAMyC,wBACJ,OAAOD,qBAAqB,WACxBvC,eAAeU,gBAAgB,CAAC,GAAG;QAAE,CAACX,YAAY,EAAE;YAAEe,QAAQyB;QAAiB;IAAE,KACjF7B;IACN,MAAM+B,kBAAkBD,wBACpBxC,eAAeW,OAAO6B,yBACtB7B;IACJ,MAAM+B,uBAAuB,MAAMnC,QAAQU,EAAE,CAACQ,UAAU,CAAC;QACvDrB;QACAE;QACAG;QACAE,OAAO8B;IACT;IAEA,OAAO;QACLtB,QAAQuB;QACRX;QACAL;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../src/versions/getLatestGlobalVersion.ts"],"sourcesContent":["import type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Document, Payload, PayloadRequest, Where } from '../types/index.js'\nimport type { TypeWithVersion } from './types.js'\n\nimport { hasWhereAccessResult } from '../auth/types.js'\nimport { combineQueries } from '../database/combineQueries.js'\nimport { hasDraftsEnabled } from '../utilities/getVersionsConfig.js'\nimport { appendVersionToQueryKey } from './drafts/appendVersionToQueryKey.js'\n\ntype Args = {\n  config: SanitizedGlobalConfig\n  locale?: string\n  payload: Payload\n  published?: boolean\n  req?: PayloadRequest\n  slug: string\n  where: Where\n}\n\nexport const getLatestGlobalVersion = async ({\n  slug,\n  config,\n  locale,\n  payload,\n  published,\n  req,\n  where,\n}: Args): Promise<{ global: Document; globalExists: boolean }> => {\n  let latestVersion: TypeWithVersion<Document> | undefined\n\n  const whereQuery = published\n    ? { 'version._status': { equals: 'published' } }\n    : { latest: { equals: true } }\n\n  if (hasDraftsEnabled(config)) {\n    latestVersion = (\n      await payload.db.findGlobalVersions({\n        global: slug,\n        limit: 1,\n        locale: locale || req?.locale || undefined,\n        pagination: false,\n        req,\n        where: combineQueries(appendVersionToQueryKey(where), whereQuery as unknown as Where),\n      })\n    ).docs[0]\n  }\n\n  const global = await payload.db.findGlobal({\n    slug,\n    locale,\n    req,\n    where,\n  })\n  const existingGlobal = hasWhereAccessResult(where)\n    ? await payload.db.findGlobal({\n        slug,\n        locale,\n        req,\n      })\n    : global\n  const globalExists = Boolean(existingGlobal && Object.keys(existingGlobal).length > 0)\n\n  if (!latestVersion) {\n    return {\n      global,\n      globalExists,\n    }\n  }\n\n  if (!latestVersion.version.createdAt) {\n    latestVersion.version.createdAt = latestVersion.createdAt\n  }\n\n  if (!latestVersion.version.updatedAt) {\n    latestVersion.version.updatedAt = latestVersion.updatedAt\n  }\n\n  return {\n    global: latestVersion.version,\n    globalExists,\n  }\n}\n"],"names":["hasWhereAccessResult","combineQueries","hasDraftsEnabled","appendVersionToQueryKey","getLatestGlobalVersion","slug","config","locale","payload","published","req","where","latestVersion","whereQuery","equals","latest","db","findGlobalVersions","global","limit","undefined","pagination","docs","findGlobal","existingGlobal","globalExists","Boolean","Object","keys","length","version","createdAt","updatedAt"],"mappings":"AAIA,SAASA,oBAAoB,QAAQ,mBAAkB;AACvD,SAASC,cAAc,QAAQ,gCAA+B;AAC9D,SAASC,gBAAgB,QAAQ,oCAAmC;AACpE,SAASC,uBAAuB,QAAQ,sCAAqC;AAY7E,OAAO,MAAMC,yBAAyB,OAAO,EAC3CC,IAAI,EACJC,MAAM,EACNC,MAAM,EACNC,OAAO,EACPC,SAAS,EACTC,GAAG,EACHC,KAAK,EACA;IACL,IAAIC;IAEJ,MAAMC,aAAaJ,YACf;QAAE,mBAAmB;YAAEK,QAAQ;QAAY;IAAE,IAC7C;QAAEC,QAAQ;YAAED,QAAQ;QAAK;IAAE;IAE/B,IAAIZ,iBAAiBI,SAAS;QAC5BM,gBAAgB,AACd,CAAA,MAAMJ,QAAQQ,EAAE,CAACC,kBAAkB,CAAC;YAClCC,QAAQb;YACRc,OAAO;YACPZ,QAAQA,UAAUG,KAAKH,UAAUa;YACjCC,YAAY;YACZX;YACAC,OAAOV,eAAeE,wBAAwBQ,QAAQE;QACxD,EAAC,EACDS,IAAI,CAAC,EAAE;IACX;IAEA,MAAMJ,SAAS,MAAMV,QAAQQ,EAAE,CAACO,UAAU,CAAC;QACzClB;QACAE;QACAG;QACAC;IACF;IACA,MAAMa,iBAAiBxB,qBAAqBW,SACxC,MAAMH,QAAQQ,EAAE,CAACO,UAAU,CAAC;QAC1BlB;QACAE;QACAG;IACF,KACAQ;IACJ,MAAMO,eAAeC,QAAQF,kBAAkBG,OAAOC,IAAI,CAACJ,gBAAgBK,MAAM,GAAG;IAEpF,IAAI,CAACjB,eAAe;QAClB,OAAO;YACLM;YACAO;QACF;IACF;IAEA,IAAI,CAACb,cAAckB,OAAO,CAACC,SAAS,EAAE;QACpCnB,cAAckB,OAAO,CAACC,SAAS,GAAGnB,cAAcmB,SAAS;IAC3D;IAEA,IAAI,CAACnB,cAAckB,OAAO,CAACE,SAAS,EAAE;QACpCpB,cAAckB,OAAO,CAACE,SAAS,GAAGpB,cAAcoB,SAAS;IAC3D;IAEA,OAAO;QACLd,QAAQN,cAAckB,OAAO;QAC7BL;IACF;AACF,EAAC"}

package/dist/versions/isInheritedReadVersionsAccess.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/isInheritedReadVersionsAccess.ts"],"sourcesContent":["import type { Access, AccessArgs } from '../config/types.js'\n\nconst inheritedReadVersionsAccess = Symbol('inheritedReadVersionsAccess')\nconst inheritedReadVersionsParentID = Symbol('inheritedReadVersionsParentID')\n\ntype InheritedReadVersionsAccess = {\n  [inheritedReadVersionsAccess]: true\n} & Access\n\ntype InheritedReadVersionsAccessArgs = {\n  [inheritedReadVersionsParentID]?: AccessArgs['id']\n} & AccessArgs\n\nexport const markInheritedReadVersionsAccess = <TAccess extends Access>(\n  access: TAccess,\n): TAccess => {\n  Object.defineProperty(access, inheritedReadVersionsAccess, { value: true })\n\n  return access\n}\n\nexport const isInheritedReadVersionsAccess = (access?: Access): boolean =>\n  Boolean(\n    access &&\n      (access as Partial<InheritedReadVersionsAccess>)[inheritedReadVersionsAccess] === true,\n  )\n\nexport const resolveInheritedReadVersionsAccessArgs = (args: AccessArgs): AccessArgs => {\n  const inheritedArgs = args as InheritedReadVersionsAccessArgs\n\n  if (!(inheritedReadVersionsParentID in inheritedArgs)) {\n    return args\n  }\n\n  const readArgs = {\n    ...args,\n    id: inheritedArgs[inheritedReadVersionsParentID],\n  } as InheritedReadVersionsAccessArgs\n\n  delete readArgs[inheritedReadVersionsParentID]\n\n  return readArgs\n}\n\nexport const withInheritedReadVersionsParentID = (\n  args: AccessArgs,\n  parentID: AccessArgs['id'],\n): AccessArgs => {\n  const inheritedArgs: InheritedReadVersionsAccessArgs = {\n    ...args,\n    [inheritedReadVersionsParentID]: parentID,\n  }\n\n  return inheritedArgs\n}\n"],"names":["inheritedReadVersionsAccess","Symbol","inheritedReadVersionsParentID","markInheritedReadVersionsAccess","access","Object","defineProperty","value","isInheritedReadVersionsAccess","Boolean","resolveInheritedReadVersionsAccessArgs","args","inheritedArgs","readArgs","id","withInheritedReadVersionsParentID","parentID"],"mappings":"AAEA,MAAMA,8BAA8BC,OAAO;AAC3C,MAAMC,gCAAgCD,OAAO;AAU7C,OAAO,MAAME,kCAAkC,CAC7CC;IAEAC,OAAOC,cAAc,CAACF,QAAQJ,6BAA6B;QAAEO,OAAO;IAAK;IAEzE,OAAOH;AACT,EAAC;AAED,OAAO,MAAMI,gCAAgC,CAACJ,SAC5CK,QACEL,UACE,AAACA,MAA+C,CAACJ,4BAA4B,KAAK,MACrF;AAEH,OAAO,MAAMU,yCAAyC,CAACC;IACrD,MAAMC,gBAAgBD;IAEtB,IAAI,CAAET,CAAAA,iCAAiCU,aAAY,GAAI;QACrD,OAAOD;IACT;IAEA,MAAME,WAAW;QACf,GAAGF,IAAI;QACPG,IAAIF,aAAa,CAACV,8BAA8B;IAClD;IAEA,OAAOW,QAAQ,CAACX,8BAA8B;IAE9C,OAAOW;AACT,EAAC;AAED,OAAO,MAAME,oCAAoC,CAC/CJ,MACAK;IAEA,MAAMJ,gBAAiD;QACrD,GAAGD,IAAI;QACP,CAACT,8BAA8B,EAAEc;IACnC;IAEA,OAAOJ;AACT,EAAC"}
+{"version":3,"sources":["../../src/versions/isInheritedReadVersionsAccess.ts"],"sourcesContent":["import type { Access, AccessArgs } from '../config/types.js'\n\nconst inheritedReadVersionsAccess = Symbol('inheritedReadVersionsAccess')\nconst inheritedReadVersionsParentID = Symbol('inheritedReadVersionsParentID')\n\ntype InheritedReadVersionsAccess = {\n  [inheritedReadVersionsAccess]: true\n} & Access\n\ntype InheritedReadVersionsAccessArgs = {\n  [inheritedReadVersionsParentID]?: AccessArgs['id']\n} & AccessArgs\n\nexport const markInheritedReadVersionsAccess = <TAccess extends Access>(\n  access: TAccess,\n): TAccess => {\n  Object.defineProperty(access, inheritedReadVersionsAccess, { value: true })\n\n  return access\n}\n\nexport const isInheritedReadVersionsAccess = (access?: Access): boolean =>\n  Boolean(\n    access &&\n    (access as Partial<InheritedReadVersionsAccess>)[inheritedReadVersionsAccess] === true,\n  )\n\nexport const resolveInheritedReadVersionsAccessArgs = (args: AccessArgs): AccessArgs => {\n  const inheritedArgs = args as InheritedReadVersionsAccessArgs\n\n  if (!(inheritedReadVersionsParentID in inheritedArgs)) {\n    return args\n  }\n\n  const readArgs = {\n    ...args,\n    id: inheritedArgs[inheritedReadVersionsParentID],\n  } as InheritedReadVersionsAccessArgs\n\n  delete readArgs[inheritedReadVersionsParentID]\n\n  return readArgs\n}\n\nexport const withInheritedReadVersionsParentID = (\n  args: AccessArgs,\n  parentID: AccessArgs['id'],\n): AccessArgs => {\n  const inheritedArgs: InheritedReadVersionsAccessArgs = {\n    ...args,\n    [inheritedReadVersionsParentID]: parentID,\n  }\n\n  return inheritedArgs\n}\n"],"names":["inheritedReadVersionsAccess","Symbol","inheritedReadVersionsParentID","markInheritedReadVersionsAccess","access","Object","defineProperty","value","isInheritedReadVersionsAccess","Boolean","resolveInheritedReadVersionsAccessArgs","args","inheritedArgs","readArgs","id","withInheritedReadVersionsParentID","parentID"],"mappings":"AAEA,MAAMA,8BAA8BC,OAAO;AAC3C,MAAMC,gCAAgCD,OAAO;AAU7C,OAAO,MAAME,kCAAkC,CAC7CC;IAEAC,OAAOC,cAAc,CAACF,QAAQJ,6BAA6B;QAAEO,OAAO;IAAK;IAEzE,OAAOH;AACT,EAAC;AAED,OAAO,MAAMI,gCAAgC,CAACJ,SAC5CK,QACEL,UACA,AAACA,MAA+C,CAACJ,4BAA4B,KAAK,MACnF;AAEH,OAAO,MAAMU,yCAAyC,CAACC;IACrD,MAAMC,gBAAgBD;IAEtB,IAAI,CAAET,CAAAA,iCAAiCU,aAAY,GAAI;QACrD,OAAOD;IACT;IAEA,MAAME,WAAW;QACf,GAAGF,IAAI;QACPG,IAAIF,aAAa,CAACV,8BAA8B;IAClD;IAEA,OAAOW,QAAQ,CAACX,8BAA8B;IAE9C,OAAOW;AACT,EAAC;AAED,OAAO,MAAME,oCAAoC,CAC/CJ,MACAK;IAEA,MAAMJ,gBAAiD;QACrD,GAAGD,IAAI;QACP,CAACT,8BAA8B,EAAEc;IACnC;IAEA,OAAOJ;AACT,EAAC"}

package/dist/versions/saveVersion.d.ts

@@ -14,15 +14,8 @@ type Args<T extends JsonObject = JsonObject> = {
     req?: PayloadRequest;
     returning?: boolean;
     select?: SelectType;
-    shouldReturnVersionDocument?: boolean;
     unpublish?: boolean;
 };
-export declare const captureSavedVersionIDContextKey: unique symbol;
-export type CaptureSavedVersionID = (args: {
-    collectionSlug?: string;
-    globalSlug?: string;
-    versionID: number | string;
-}) => void;
 export declare function saveVersion<TData extends JsonObject = JsonObject>(args: {
     returning: false;
 } & Args<TData>): Promise<null>;

package/dist/versions/saveVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"saveVersion.d.ts","sourceRoot":"","sources":["../../src/versions/saveVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,aAAa,CAAA;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAW/E,KAAK,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,cAAc,EAAE,CAAC,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,QAAQ,GAAG,gBAAgB,GAAG,QAAQ,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,+BAA+B,eAAuD,CAAA;AAEnG,MAAM,MAAM,qBAAqB,GAAG,CAAC,IAAI,EAAE;IACzC,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,GAAG,MAAM,CAAA;CAC3B,KAAK,IAAI,CAAA;AAEV,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC,CAAA;AAChB,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GACtC,OAAO,CAAC,UAAU,CAAC,CAAA;AACtB,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,GACnC,OAAO,CAAC,UAAU,CAAC,CAAA"}
+{"version":3,"file":"saveVersion.d.ts","sourceRoot":"","sources":["../../src/versions/saveVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAA8C,OAAO,EAAE,MAAM,aAAa,CAAA;AACtF,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAU/E,KAAK,IAAI,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IAC7C,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,cAAc,EAAE,CAAC,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,SAAS,CAAC,EAAE,QAAQ,GAAG,gBAAgB,GAAG,QAAQ,CAAA;IAClD,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE;IAAE,SAAS,EAAE,KAAK,CAAA;CAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GACvC,OAAO,CAAC,IAAI,CAAC,CAAA;AAChB,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE;IAAE,SAAS,EAAE,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC,KAAK,CAAC,GACtC,OAAO,CAAC,UAAU,CAAC,CAAA;AACtB,wBAAsB,WAAW,CAAC,KAAK,SAAS,UAAU,GAAG,UAAU,EACrE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC,GACnC,OAAO,CAAC,UAAU,CAAC,CAAA"}

package/dist/versions/saveVersion.js

@@ -2,18 +2,15 @@ import { deepCopyObjectSimple } from '../index.js';
 import { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js';
 import { getVersionsMax, hasLocalizeStatusEnabled } from '../utilities/getVersionsConfig.js';
 import { sanitizeInternalFields } from '../utilities/sanitizeInternalFields.js';
-import { markTransactionWrite } from '../utilities/transactionMutationTracker.js';
 import { getQueryDraftsSelect } from './drafts/getQueryDraftsSelect.js';
 import { enforceMaxVersions } from './enforceMaxVersions.js';
-import { coalesceLatestVersionContextKey, updateLatestVersion } from './updateLatestVersion.js';
-export const captureSavedVersionIDContextKey = Symbol.for('payload.versions.captureSavedVersionID');
-export async function saveVersion({ id, autosave, collection, docWithLocales, draft, global, operation, payload, req, returning, select, shouldReturnVersionDocument, unpublish }) {
+import { updateLatestVersion } from './updateLatestVersion.js';
+export async function saveVersion({ id, autosave, collection, docWithLocales, draft, global, operation, payload, req, returning, select, unpublish }) {
     assertNoValidationWrite(req);
     let result;
     let createdNewVersion = false;
     const now = new Date().toISOString();
     const versionData = deepCopyObjectSimple(docWithLocales);
-    const shouldCoalesceLatestVersion = req?.context?.[coalesceLatestVersionContextKey] === true;
     if ((collection?.timestamps || global) && draft) {
         versionData.updatedAt = now;
     }
@@ -31,7 +28,7 @@ export async function saveVersion({ id, autosave, collection, docWithLocales, dr
             ]));
     }
     try {
-        if (unpublish || autosave || shouldCoalesceLatestVersion) {
+        if (unpublish || autosave) {
             result = await updateLatestVersion({
                 id,
                 collection,
@@ -39,14 +36,9 @@ export async function saveVersion({ id, autosave, collection, docWithLocales, dr
                 now,
                 payload,
                 req,
-                shouldUpdate: shouldCoalesceLatestVersion ? undefined : autosave ? (v)=>'autosave' in v && v.autosave === true : undefined,
+                shouldUpdate: autosave ? (v)=>'autosave' in v && v.autosave === true : undefined,
                 versionData
             });
-            if (result) {
-                markTransactionWrite({
-                    req
-                });
-            }
         }
         if (!result) {
             createdNewVersion = true;
@@ -72,9 +64,6 @@ export async function saveVersion({ id, autosave, collection, docWithLocales, dr
                 createVersionArgs.globalSlug = global.slug;
                 result = await payload.db.createGlobalVersion(createVersionArgs);
             }
-            markTransactionWrite({
-                req
-            });
         }
     } catch (err) {
         let errorMessage;
@@ -101,21 +90,9 @@ export async function saveVersion({ id, autosave, collection, docWithLocales, dr
             req
         });
     }
-    const versionID = result?.id;
-    const captureSavedVersionID = req?.context?.[captureSavedVersionIDContextKey];
-    if (captureSavedVersionID && (typeof versionID === 'number' || typeof versionID === 'string')) {
-        captureSavedVersionID({
-            collectionSlug: collection?.slug,
-            globalSlug: global?.slug,
-            versionID
-        });
-    }
     if (returning === false) {
         return null;
     }
-    if (shouldReturnVersionDocument) {
-        return result;
-    }
     let createdVersion = result.version;
     createdVersion = sanitizeInternalFields(createdVersion);
     createdVersion.id = result.parent;

package/dist/versions/saveVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { CreateGlobalVersionArgs, CreateVersionArgs, Payload } from '../index.js'\nimport type { JsonObject, PayloadRequest, SelectType } from '../types/index.js'\n\nimport { deepCopyObjectSimple } from '../index.js'\nimport { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js'\nimport { getVersionsMax, hasLocalizeStatusEnabled } from '../utilities/getVersionsConfig.js'\nimport { sanitizeInternalFields } from '../utilities/sanitizeInternalFields.js'\nimport { markTransactionWrite } from '../utilities/transactionMutationTracker.js'\nimport { getQueryDraftsSelect } from './drafts/getQueryDraftsSelect.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\nimport { coalesceLatestVersionContextKey, updateLatestVersion } from './updateLatestVersion.js'\n\ntype Args<T extends JsonObject = JsonObject> = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: T\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  operation?: 'create' | 'restoreVersion' | 'update'\n  payload: Payload\n  req?: PayloadRequest\n  returning?: boolean\n  select?: SelectType\n  shouldReturnVersionDocument?: boolean\n  unpublish?: boolean\n}\n\nexport const captureSavedVersionIDContextKey = Symbol.for('payload.versions.captureSavedVersionID')\n\nexport type CaptureSavedVersionID = (args: {\n  collectionSlug?: string\n  globalSlug?: string\n  versionID: number | string\n}) => void\n\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: { returning: false } & Args<TData>,\n): Promise<null>\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: { returning: true } & Args<TData>,\n): Promise<JsonObject>\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: Omit<Args<TData>, 'returning'>,\n): Promise<JsonObject>\nexport async function saveVersion<TData extends JsonObject = JsonObject>({\n  id,\n  autosave,\n  collection,\n  docWithLocales,\n  draft,\n  global,\n  operation,\n  payload,\n  req,\n  returning,\n  select,\n  shouldReturnVersionDocument,\n  unpublish,\n}: Args<TData>): Promise<JsonObject | null> {\n  assertNoValidationWrite(req)\n\n  let result: JsonObject | undefined\n  let createdNewVersion = false\n  const now = new Date().toISOString()\n  const versionData: {\n    _status?: 'draft'\n    updatedAt?: string\n  } & TData = deepCopyObjectSimple(docWithLocales)\n  const shouldCoalesceLatestVersion =\n    (req?.context as Record<PropertyKey, unknown> | undefined)?.[\n      coalesceLatestVersionContextKey\n    ] === true\n\n  if ((collection?.timestamps || global) && draft) {\n    versionData.updatedAt = now\n  }\n\n  if (versionData._id) {\n    delete versionData._id\n  }\n\n  // When localizeStatus is enabled, _status must be stored as a localized object.\n  // Callers like restoreVersion set it as a plain string — expand it here.\n  const entity = collection ?? global\n  if (\n    entity &&\n    payload.config.localization &&\n    hasLocalizeStatusEnabled(entity) &&\n    typeof versionData._status === 'string'\n  ) {\n    const status = versionData._status\n    ;(versionData as JsonObject)._status = Object.fromEntries(\n      payload.config.localization.localeCodes.map((code) => [code, status]),\n    )\n  }\n\n  try {\n    if (unpublish || autosave || shouldCoalesceLatestVersion) {\n      result = await updateLatestVersion({\n        id,\n        collection,\n        global,\n        now,\n        payload,\n        req,\n        shouldUpdate: shouldCoalesceLatestVersion\n          ? undefined\n          : autosave\n            ? (v) => 'autosave' in v && v.autosave === true\n            : undefined,\n        versionData,\n      })\n      if (result) {\n        markTransactionWrite({ req })\n      }\n    }\n\n    if (!result) {\n      createdNewVersion = true\n\n      const createVersionArgs = {\n        autosave: Boolean(autosave),\n        collectionSlug: undefined as string | undefined,\n        createdAt: operation === 'restoreVersion' ? versionData.createdAt : now,\n        globalSlug: undefined as string | undefined,\n        parent: collection ? id : undefined,\n        req,\n        returning,\n        select: getQueryDraftsSelect({ select }),\n        updatedAt: now,\n        versionData,\n      }\n\n      if (collection) {\n        createVersionArgs.collectionSlug = collection.slug\n        result = await payload.db.createVersion(createVersionArgs as CreateVersionArgs)\n      }\n\n      if (global) {\n        createVersionArgs.globalSlug = global.slug\n        result = await payload.db.createGlobalVersion(createVersionArgs as CreateGlobalVersionArgs)\n      }\n      markTransactionWrite({ req })\n    }\n  } catch (err) {\n    let errorMessage: string | undefined\n\n    if (collection) {\n      errorMessage = `There was an error while saving a version for the ${typeof collection.labels.singular === 'string' ? collection.labels.singular : collection.slug} with ID ${id}.`\n    }\n    if (global) {\n      errorMessage = `There was an error while saving a version for the global ${typeof global.label === 'string' ? global.label : global.slug}.`\n    }\n    payload.logger.error({ err, msg: errorMessage })\n    throw err\n  }\n\n  const max = getVersionsMax(collection || global!)\n\n  if (createdNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n\n  const versionID = result?.id\n  const captureSavedVersionID = (req?.context as Record<PropertyKey, unknown> | undefined)?.[\n    captureSavedVersionIDContextKey\n  ] as CaptureSavedVersionID | undefined\n\n  if (captureSavedVersionID && (typeof versionID === 'number' || typeof versionID === 'string')) {\n    captureSavedVersionID({\n      collectionSlug: collection?.slug,\n      globalSlug: global?.slug,\n      versionID,\n    })\n  }\n\n  if (returning === false) {\n    return null\n  }\n\n  if (shouldReturnVersionDocument) {\n    return result as JsonObject\n  }\n\n  let createdVersion = (result as any).version\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = (result as any).parent\n\n  return createdVersion\n}\n"],"names":["deepCopyObjectSimple","assertNoValidationWrite","getVersionsMax","hasLocalizeStatusEnabled","sanitizeInternalFields","markTransactionWrite","getQueryDraftsSelect","enforceMaxVersions","coalesceLatestVersionContextKey","updateLatestVersion","captureSavedVersionIDContextKey","Symbol","for","saveVersion","id","autosave","collection","docWithLocales","draft","global","operation","payload","req","returning","select","shouldReturnVersionDocument","unpublish","result","createdNewVersion","now","Date","toISOString","versionData","shouldCoalesceLatestVersion","context","timestamps","updatedAt","_id","entity","config","localization","_status","status","Object","fromEntries","localeCodes","map","code","shouldUpdate","undefined","v","createVersionArgs","Boolean","collectionSlug","createdAt","globalSlug","parent","slug","db","createVersion","createGlobalVersion","err","errorMessage","labels","singular","label","logger","error","msg","max","versionID","captureSavedVersionID","createdVersion","version"],"mappings":"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"}
+{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { CreateGlobalVersionArgs, CreateVersionArgs, Payload } from '../index.js'\nimport type { JsonObject, PayloadRequest, SelectType } from '../types/index.js'\n\nimport { deepCopyObjectSimple } from '../index.js'\nimport { assertNoValidationWrite } from '../utilities/assertNoValidationWrite.js'\nimport { getVersionsMax, hasLocalizeStatusEnabled } from '../utilities/getVersionsConfig.js'\nimport { sanitizeInternalFields } from '../utilities/sanitizeInternalFields.js'\nimport { getQueryDraftsSelect } from './drafts/getQueryDraftsSelect.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\nimport { updateLatestVersion } from './updateLatestVersion.js'\n\ntype Args<T extends JsonObject = JsonObject> = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: T\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  operation?: 'create' | 'restoreVersion' | 'update'\n  payload: Payload\n  req?: PayloadRequest\n  returning?: boolean\n  select?: SelectType\n  unpublish?: boolean\n}\n\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: { returning: false } & Args<TData>,\n): Promise<null>\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: { returning: true } & Args<TData>,\n): Promise<JsonObject>\nexport async function saveVersion<TData extends JsonObject = JsonObject>(\n  args: Omit<Args<TData>, 'returning'>,\n): Promise<JsonObject>\nexport async function saveVersion<TData extends JsonObject = JsonObject>({\n  id,\n  autosave,\n  collection,\n  docWithLocales,\n  draft,\n  global,\n  operation,\n  payload,\n  req,\n  returning,\n  select,\n  unpublish,\n}: Args<TData>): Promise<JsonObject | null> {\n  assertNoValidationWrite(req)\n\n  let result: JsonObject | undefined\n  let createdNewVersion = false\n  const now = new Date().toISOString()\n  const versionData: {\n    _status?: 'draft'\n    updatedAt?: string\n  } & TData = deepCopyObjectSimple(docWithLocales)\n\n  if ((collection?.timestamps || global) && draft) {\n    versionData.updatedAt = now\n  }\n\n  if (versionData._id) {\n    delete versionData._id\n  }\n\n  // When localizeStatus is enabled, _status must be stored as a localized object.\n  // Callers like restoreVersion set it as a plain string — expand it here.\n  const entity = collection ?? global\n  if (\n    entity &&\n    payload.config.localization &&\n    hasLocalizeStatusEnabled(entity) &&\n    typeof versionData._status === 'string'\n  ) {\n    const status = versionData._status\n    ;(versionData as JsonObject)._status = Object.fromEntries(\n      payload.config.localization.localeCodes.map((code) => [code, status]),\n    )\n  }\n\n  try {\n    if (unpublish || autosave) {\n      result = await updateLatestVersion({\n        id,\n        collection,\n        global,\n        now,\n        payload,\n        req,\n        shouldUpdate: autosave ? (v) => 'autosave' in v && v.autosave === true : undefined,\n        versionData,\n      })\n    }\n\n    if (!result) {\n      createdNewVersion = true\n\n      const createVersionArgs = {\n        autosave: Boolean(autosave),\n        collectionSlug: undefined as string | undefined,\n        createdAt: operation === 'restoreVersion' ? versionData.createdAt : now,\n        globalSlug: undefined as string | undefined,\n        parent: collection ? id : undefined,\n        req,\n        returning,\n        select: getQueryDraftsSelect({ select }),\n        updatedAt: now,\n        versionData,\n      }\n\n      if (collection) {\n        createVersionArgs.collectionSlug = collection.slug\n        result = await payload.db.createVersion(createVersionArgs as CreateVersionArgs)\n      }\n\n      if (global) {\n        createVersionArgs.globalSlug = global.slug\n        result = await payload.db.createGlobalVersion(createVersionArgs as CreateGlobalVersionArgs)\n      }\n    }\n  } catch (err) {\n    let errorMessage: string | undefined\n\n    if (collection) {\n      errorMessage = `There was an error while saving a version for the ${typeof collection.labels.singular === 'string' ? collection.labels.singular : collection.slug} with ID ${id}.`\n    }\n    if (global) {\n      errorMessage = `There was an error while saving a version for the global ${typeof global.label === 'string' ? global.label : global.slug}.`\n    }\n    payload.logger.error({ err, msg: errorMessage })\n    throw err\n  }\n\n  const max = getVersionsMax(collection || global!)\n\n  if (createdNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n  if (returning === false) {\n    return null\n  }\n\n  let createdVersion = (result as any).version\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = (result as any).parent\n\n  return createdVersion\n}\n"],"names":["deepCopyObjectSimple","assertNoValidationWrite","getVersionsMax","hasLocalizeStatusEnabled","sanitizeInternalFields","getQueryDraftsSelect","enforceMaxVersions","updateLatestVersion","saveVersion","id","autosave","collection","docWithLocales","draft","global","operation","payload","req","returning","select","unpublish","result","createdNewVersion","now","Date","toISOString","versionData","timestamps","updatedAt","_id","entity","config","localization","_status","status","Object","fromEntries","localeCodes","map","code","shouldUpdate","v","undefined","createVersionArgs","Boolean","collectionSlug","createdAt","globalSlug","parent","slug","db","createVersion","createGlobalVersion","err","errorMessage","labels","singular","label","logger","error","msg","max","createdVersion","version"],"mappings":"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"}

package/dist/versions/updateLatestVersion.d.ts

@@ -2,7 +2,6 @@ import type { SanitizedCollectionConfig } from '../collections/config/types.js';
 import type { SanitizedGlobalConfig } from '../globals/config/types.js';
 import type { Payload } from '../index.js';
 import type { JsonObject, PayloadRequest } from '../types/index.js';
-export declare const coalesceLatestVersionContextKey: unique symbol;
 type Args<TData extends JsonObject> = {
     collection?: SanitizedCollectionConfig;
     global?: SanitizedGlobalConfig;

package/dist/versions/updateLatestVersion.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateLatestVersion.d.ts","sourceRoot":"","sources":["../../src/versions/updateLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAInE,eAAO,MAAM,+BAA+B,eAAkC,CAAA;AAE9E,KAAK,IAAI,CAAC,KAAK,SAAS,UAAU,IAAI;IACpC,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,YAAY,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,OAAO,CAAA;IACrD,WAAW,EAAE,KAAK,CAAA;CACnB,CAAA;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,SAAS,UAAU,EAAE,EAClE,EAAE,EACF,UAAU,EACV,MAAM,EACN,GAAG,EACH,OAAO,EACP,GAAG,EACH,YAAyB,EACzB,WAAW,GACZ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA4H/C"}
+{"version":3,"file":"updateLatestVersion.d.ts","sourceRoot":"","sources":["../../src/versions/updateLatestVersion.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAEnE,KAAK,IAAI,CAAC,KAAK,SAAS,UAAU,IAAI;IACpC,UAAU,CAAC,EAAE,yBAAyB,CAAA;IACtC,MAAM,CAAC,EAAE,qBAAqB,CAAA;IAC9B,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,YAAY,CAAC,EAAE,CAAC,aAAa,EAAE,UAAU,KAAK,OAAO,CAAA;IACrD,WAAW,EAAE,KAAK,CAAA;CACnB,CAAA;AAED;;;;;;GAMG;AACH,wBAAsB,mBAAmB,CAAC,KAAK,SAAS,UAAU,EAAE,EAClE,EAAE,EACF,UAAU,EACV,MAAM,EACN,GAAG,EACH,OAAO,EACP,GAAG,EACH,YAAyB,EACzB,WAAW,GACZ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CA0G/C"}

package/dist/versions/updateLatestVersion.js

@@ -1,5 +1,3 @@
-import { resolveBranchOwnVersions, resolveBranchVersionParent } from '../branching/versions.js';
-export const coalesceLatestVersionContextKey = Symbol('coalesceLatestVersion');
 /**
  * Finds the latest version and updates it in place if `shouldUpdate` returns true.
  * Used by both the unpublish and autosave paths in `saveVersion` to avoid creating
@@ -14,27 +12,16 @@ export const coalesceLatestVersionContextKey = Symbol('coalesceLatestVersion');
         req,
         sort: '-updatedAt'
     };
-    // On a branch, the row to rewrite and the row to rewrite it *as* both differ from
-    // main's. Resolved together because getting one without the other is worse than
-    // getting neither: the unscoped find returns main's latest version as part of the
-    // branch's ancestry (a branch reads main's history as its own past), so unpublishing
-    // on a branch rewrote main's version row in place with the branch's content.
-    const branched = collection ? await resolveBranchVersionParent({
-        collectionSlug: collection.slug,
-        parent: id,
-        req,
-        versionData: {}
-    }) : undefined;
     if (collection) {
         ;
         ({ docs } = await payload.db.findVersions({
             ...findVersionArgs,
             collection: collection.slug,
-            where: await resolveBranchOwnVersions({
-                id: id,
-                collectionSlug: collection.slug,
-                req
-            })
+            where: {
+                parent: {
+                    equals: id
+                }
+            }
         }));
     } else {
         ;
@@ -53,15 +40,11 @@ export const coalesceLatestVersionContextKey = Symbol('coalesceLatestVersion');
         versionData: {
             createdAt: new Date(latestVersion.createdAt).toISOString(),
             latest: true,
-            // The branch's chain hangs off its shadow row, and `_branch`/`_branchParent` are
-            // columns on the row being replaced — omitting them would strip the row's branch
-            // identity and hand it to main.
-            parent: branched?.parent ?? id,
+            parent: id,
             updatedAt: now,
             version: {
                 ...versionData
-            },
-            ...branched?.versionData ?? {}
+            }
         }
     };
     let versionUpdateFailed = undefined;

package/dist/versions/updateLatestVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/updateLatestVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { JsonObject, PayloadRequest } from '../types/index.js'\n\nimport { resolveBranchOwnVersions, resolveBranchVersionParent } from '../branching/versions.js'\n\nexport const coalesceLatestVersionContextKey = Symbol('coalesceLatestVersion')\n\ntype Args<TData extends JsonObject> = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  now: string\n  payload: Payload\n  req?: PayloadRequest\n  shouldUpdate?: (latestVersion: JsonObject) => boolean\n  versionData: TData\n}\n\n/**\n * Finds the latest version and updates it in place if `shouldUpdate` returns true.\n * Used by both the unpublish and autosave paths in `saveVersion` to avoid creating\n * a redundant new version.\n *\n * Returns the updated version result, or `undefined` if no update was performed.\n */\nexport async function updateLatestVersion<TData extends JsonObject>({\n  id,\n  collection,\n  global,\n  now,\n  payload,\n  req,\n  shouldUpdate = () => true,\n  versionData,\n}: Args<TData>): Promise<JsonObject | undefined> {\n  let docs\n  const findVersionArgs = {\n    limit: 1,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n  }\n\n  // On a branch, the row to rewrite and the row to rewrite it *as* both differ from\n  // main's. Resolved together because getting one without the other is worse than\n  // getting neither: the unscoped find returns main's latest version as part of the\n  // branch's ancestry (a branch reads main's history as its own past), so unpublishing\n  // on a branch rewrote main's version row in place with the branch's content.\n  const branched = collection\n    ? await resolveBranchVersionParent({\n        collectionSlug: collection.slug,\n        parent: id!,\n        req,\n        versionData: {},\n      })\n    : undefined\n\n  if (collection) {\n    ;({ docs } = await payload.db.findVersions<TData>({\n      ...findVersionArgs,\n      collection: collection.slug,\n      where: await resolveBranchOwnVersions({\n        id: id!,\n        collectionSlug: collection.slug,\n        req,\n      }),\n    }))\n  } else {\n    ;({ docs } = await payload.db.findGlobalVersions<TData>({\n      ...findVersionArgs,\n      global: global!.slug,\n    }))\n  }\n\n  const [latestVersion] = docs\n\n  if (!latestVersion || !shouldUpdate(latestVersion)) {\n    return undefined\n  }\n\n  const updateVersionArgs = {\n    id: latestVersion.id,\n    req,\n    versionData: {\n      createdAt: new Date(latestVersion.createdAt).toISOString(),\n      latest: true,\n      // The branch's chain hangs off its shadow row, and `_branch`/`_branchParent` are\n      // columns on the row being replaced — omitting them would strip the row's branch\n      // identity and hand it to main.\n      parent: branched?.parent ?? id,\n      updatedAt: now,\n      version: {\n        ...versionData,\n      },\n      ...(branched?.versionData ?? {}),\n    },\n  }\n\n  let versionUpdateFailed: boolean | undefined = undefined\n\n  try {\n    if (collection) {\n      return await payload.db.updateVersion<TData>({\n        ...updateVersionArgs,\n        collection: collection.slug,\n        req,\n      })\n    }\n\n    return await payload.db.updateGlobalVersion<TData>({\n      ...updateVersionArgs,\n      global: global!.slug,\n      req,\n    })\n  } catch (err) {\n    versionUpdateFailed = true\n    payload.logger.warn({\n      err,\n      msg: `Failed to update latest version — checking if a concurrent write already succeeded.`,\n    })\n  }\n\n  if (versionUpdateFailed) {\n    // If a concurrent request already committed, return its result to avoid a duplicate version.\n    // If updatedAt is unchanged, the update genuinely failed — fall back to createVersion.\n    try {\n      let freshDocs: JsonObject[]\n\n      if (collection) {\n        ;({ docs: freshDocs } = await payload.db.findVersions<TData>({\n          collection: collection.slug,\n          limit: 1,\n          pagination: false,\n          req,\n          sort: '-updatedAt',\n          where: { parent: { equals: id } },\n        }))\n      } else {\n        ;({ docs: freshDocs } = await payload.db.findGlobalVersions<TData>({\n          global: global!.slug,\n          limit: 1,\n          pagination: false,\n          req,\n          sort: '-updatedAt',\n        }))\n      }\n\n      const [freshVersion] = freshDocs\n\n      if (freshVersion && new Date(freshVersion.updatedAt) > new Date(latestVersion.updatedAt)) {\n        return freshVersion\n      }\n    } catch {\n      // If the follow-up query also fails, fall through to createVersion\n    }\n  }\n\n  return undefined\n}\n"],"names":["resolveBranchOwnVersions","resolveBranchVersionParent","coalesceLatestVersionContextKey","Symbol","updateLatestVersion","id","collection","global","now","payload","req","shouldUpdate","versionData","docs","findVersionArgs","limit","pagination","sort","branched","collectionSlug","slug","parent","undefined","db","findVersions","where","findGlobalVersions","latestVersion","updateVersionArgs","createdAt","Date","toISOString","latest","updatedAt","version","versionUpdateFailed","updateVersion","updateGlobalVersion","err","logger","warn","msg","freshDocs","equals","freshVersion"],"mappings":"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"}
+{"version":3,"sources":["../../src/versions/updateLatestVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { JsonObject, PayloadRequest } from '../types/index.js'\n\ntype Args<TData extends JsonObject> = {\n  collection?: SanitizedCollectionConfig\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  now: string\n  payload: Payload\n  req?: PayloadRequest\n  shouldUpdate?: (latestVersion: JsonObject) => boolean\n  versionData: TData\n}\n\n/**\n * Finds the latest version and updates it in place if `shouldUpdate` returns true.\n * Used by both the unpublish and autosave paths in `saveVersion` to avoid creating\n * a redundant new version.\n *\n * Returns the updated version result, or `undefined` if no update was performed.\n */\nexport async function updateLatestVersion<TData extends JsonObject>({\n  id,\n  collection,\n  global,\n  now,\n  payload,\n  req,\n  shouldUpdate = () => true,\n  versionData,\n}: Args<TData>): Promise<JsonObject | undefined> {\n  let docs\n  const findVersionArgs = {\n    limit: 1,\n    pagination: false,\n    req,\n    sort: '-updatedAt',\n  }\n\n  if (collection) {\n    ;({ docs } = await payload.db.findVersions<TData>({\n      ...findVersionArgs,\n      collection: collection.slug,\n      where: {\n        parent: {\n          equals: id,\n        },\n      },\n    }))\n  } else {\n    ;({ docs } = await payload.db.findGlobalVersions<TData>({\n      ...findVersionArgs,\n      global: global!.slug,\n    }))\n  }\n\n  const [latestVersion] = docs\n\n  if (!latestVersion || !shouldUpdate(latestVersion)) {\n    return undefined\n  }\n\n  const updateVersionArgs = {\n    id: latestVersion.id,\n    req,\n    versionData: {\n      createdAt: new Date(latestVersion.createdAt).toISOString(),\n      latest: true,\n      parent: id,\n      updatedAt: now,\n      version: {\n        ...versionData,\n      },\n    },\n  }\n\n  let versionUpdateFailed: boolean | undefined = undefined\n\n  try {\n    if (collection) {\n      return await payload.db.updateVersion<TData>({\n        ...updateVersionArgs,\n        collection: collection.slug,\n        req,\n      })\n    }\n\n    return await payload.db.updateGlobalVersion<TData>({\n      ...updateVersionArgs,\n      global: global!.slug,\n      req,\n    })\n  } catch (err) {\n    versionUpdateFailed = true\n    payload.logger.warn({\n      err,\n      msg: `Failed to update latest version — checking if a concurrent write already succeeded.`,\n    })\n  }\n\n  if (versionUpdateFailed) {\n    // If a concurrent request already committed, return its result to avoid a duplicate version.\n    // If updatedAt is unchanged, the update genuinely failed — fall back to createVersion.\n    try {\n      let freshDocs: JsonObject[]\n\n      if (collection) {\n        ;({ docs: freshDocs } = await payload.db.findVersions<TData>({\n          collection: collection.slug,\n          limit: 1,\n          pagination: false,\n          req,\n          sort: '-updatedAt',\n          where: { parent: { equals: id } },\n        }))\n      } else {\n        ;({ docs: freshDocs } = await payload.db.findGlobalVersions<TData>({\n          global: global!.slug,\n          limit: 1,\n          pagination: false,\n          req,\n          sort: '-updatedAt',\n        }))\n      }\n\n      const [freshVersion] = freshDocs\n\n      if (freshVersion && new Date(freshVersion.updatedAt) > new Date(latestVersion.updatedAt)) {\n        return freshVersion\n      }\n    } catch {\n      // If the follow-up query also fails, fall through to createVersion\n    }\n  }\n\n  return undefined\n}\n"],"names":["updateLatestVersion","id","collection","global","now","payload","req","shouldUpdate","versionData","docs","findVersionArgs","limit","pagination","sort","db","findVersions","slug","where","parent","equals","findGlobalVersions","latestVersion","undefined","updateVersionArgs","createdAt","Date","toISOString","latest","updatedAt","version","versionUpdateFailed","updateVersion","updateGlobalVersion","err","logger","warn","msg","freshDocs","freshVersion"],"mappings":"AAgBA;;;;;;CAMC,GACD,OAAO,eAAeA,oBAA8C,EAClEC,EAAE,EACFC,UAAU,EACVC,MAAM,EACNC,GAAG,EACHC,OAAO,EACPC,GAAG,EACHC,eAAe,IAAM,IAAI,EACzBC,WAAW,EACC;IACZ,IAAIC;IACJ,MAAMC,kBAAkB;QACtBC,OAAO;QACPC,YAAY;QACZN;QACAO,MAAM;IACR;IAEA,IAAIX,YAAY;;QACZ,CAAA,EAAEO,IAAI,EAAE,GAAG,MAAMJ,QAAQS,EAAE,CAACC,YAAY,CAAQ;YAChD,GAAGL,eAAe;YAClBR,YAAYA,WAAWc,IAAI;YAC3BC,OAAO;gBACLC,QAAQ;oBACNC,QAAQlB;gBACV;YACF;QACF,EAAC;IACH,OAAO;;QACH,CAAA,EAAEQ,IAAI,EAAE,GAAG,MAAMJ,QAAQS,EAAE,CAACM,kBAAkB,CAAQ;YACtD,GAAGV,eAAe;YAClBP,QAAQA,OAAQa,IAAI;QACtB,EAAC;IACH;IAEA,MAAM,CAACK,cAAc,GAAGZ;IAExB,IAAI,CAACY,iBAAiB,CAACd,aAAac,gBAAgB;QAClD,OAAOC;IACT;IAEA,MAAMC,oBAAoB;QACxBtB,IAAIoB,cAAcpB,EAAE;QACpBK;QACAE,aAAa;YACXgB,WAAW,IAAIC,KAAKJ,cAAcG,SAAS,EAAEE,WAAW;YACxDC,QAAQ;YACRT,QAAQjB;YACR2B,WAAWxB;YACXyB,SAAS;gBACP,GAAGrB,WAAW;YAChB;QACF;IACF;IAEA,IAAIsB,sBAA2CR;IAE/C,IAAI;QACF,IAAIpB,YAAY;YACd,OAAO,MAAMG,QAAQS,EAAE,CAACiB,aAAa,CAAQ;gBAC3C,GAAGR,iBAAiB;gBACpBrB,YAAYA,WAAWc,IAAI;gBAC3BV;YACF;QACF;QAEA,OAAO,MAAMD,QAAQS,EAAE,CAACkB,mBAAmB,CAAQ;YACjD,GAAGT,iBAAiB;YACpBpB,QAAQA,OAAQa,IAAI;YACpBV;QACF;IACF,EAAE,OAAO2B,KAAK;QACZH,sBAAsB;QACtBzB,QAAQ6B,MAAM,CAACC,IAAI,CAAC;YAClBF;YACAG,KAAK,CAAC,mFAAmF,CAAC;QAC5F;IACF;IAEA,IAAIN,qBAAqB;QACvB,6FAA6F;QAC7F,uFAAuF;QACvF,IAAI;YACF,IAAIO;YAEJ,IAAInC,YAAY;;gBACZ,CAAA,EAAEO,MAAM4B,SAAS,EAAE,GAAG,MAAMhC,QAAQS,EAAE,CAACC,YAAY,CAAQ;oBAC3Db,YAAYA,WAAWc,IAAI;oBAC3BL,OAAO;oBACPC,YAAY;oBACZN;oBACAO,MAAM;oBACNI,OAAO;wBAAEC,QAAQ;4BAAEC,QAAQlB;wBAAG;oBAAE;gBAClC,EAAC;YACH,OAAO;;gBACH,CAAA,EAAEQ,MAAM4B,SAAS,EAAE,GAAG,MAAMhC,QAAQS,EAAE,CAACM,kBAAkB,CAAQ;oBACjEjB,QAAQA,OAAQa,IAAI;oBACpBL,OAAO;oBACPC,YAAY;oBACZN;oBACAO,MAAM;gBACR,EAAC;YACH;YAEA,MAAM,CAACyB,aAAa,GAAGD;YAEvB,IAAIC,gBAAgB,IAAIb,KAAKa,aAAaV,SAAS,IAAI,IAAIH,KAAKJ,cAAcO,SAAS,GAAG;gBACxF,OAAOU;YACT;QACF,EAAE,OAAM;QACN,mEAAmE;QACrE;IACF;IAEA,OAAOhB;AACT"}