payload 3.0.0-beta.13 → 3.0.0-beta.130

package/dist/globals/operations/findOne.js

@@ -1,13 +1,11 @@
 import executeAccess from '../../auth/executeAccess.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
-import { commitTransaction } from '../../utilities/commitTransaction.js';
-import { initTransaction } from '../../utilities/initTransaction.js';
+import { getSelectMode } from '../../utilities/getSelectMode.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 import replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable.js';
 export const findOneOperation = async (args)=>{
-    const { slug, depth, draft: draftEnabled = false, globalConfig, overrideAccess = false, req: { fallbackLocale, locale }, req, showHiddenFields } = args;
+    const { slug, depth, draft: draftEnabled = false, globalConfig, includeLockStatus, overrideAccess = false, populate, req: { fallbackLocale, locale }, req, select, showHiddenFields } = args;
     try {
-        const shouldCommit = await initTransaction(req);
         // /////////////////////////////////////
         // Retrieve and execute access
         // /////////////////////////////////////
@@ -24,12 +22,55 @@ export const findOneOperation = async (args)=>{
             slug,
             locale,
             req,
+            select,
             where: overrideAccess ? undefined : accessResult
         });
         if (!doc) {
             doc = {};
         }
         // /////////////////////////////////////
+        // Include Lock Status if required
+        // /////////////////////////////////////
+        if (includeLockStatus && slug) {
+            let lockStatus = null;
+            try {
+                const lockDocumentsProp = globalConfig?.lockDocuments;
+                const lockDurationDefault = 300 // Default 5 minutes in seconds
+                ;
+                const lockDuration = typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault;
+                const lockDurationInMilliseconds = lockDuration * 1000;
+                const lockedDocument = await req.payload.find({
+                    collection: 'payload-locked-documents',
+                    depth: 1,
+                    limit: 1,
+                    overrideAccess: false,
+                    pagination: false,
+                    req,
+                    where: {
+                        and: [
+                            {
+                                globalSlug: {
+                                    equals: slug
+                                }
+                            },
+                            {
+                                updatedAt: {
+                                    greater_than: new Date(new Date().getTime() - lockDurationInMilliseconds)
+                                }
+                            }
+                        ]
+                    }
+                });
+                if (lockedDocument && lockedDocument.docs.length > 0) {
+                    lockStatus = lockedDocument.docs[0];
+                }
+            } catch  {
+            // swallow error
+            }
+            doc._isLocked = !!lockStatus;
+            doc._userEditing = lockStatus?.user?.value ?? null;
+        }
+        // /////////////////////////////////////
         // Replace document with draft if available
         // /////////////////////////////////////
         if (globalConfig.versions?.drafts && draftEnabled) {
@@ -39,7 +80,8 @@ export const findOneOperation = async (args)=>{
                 entity: globalConfig,
                 entityType: 'global',
                 overrideAccess,
-                req
+                req,
+                select
             });
         }
         // /////////////////////////////////////
@@ -55,6 +97,15 @@ export const findOneOperation = async (args)=>{
             }) || doc;
         }, Promise.resolve());
         // /////////////////////////////////////
+        // Execute globalType field if not selected
+        // /////////////////////////////////////
+        if (select && doc.globalType) {
+            const selectMode = getSelectMode(select);
+            if (selectMode === 'include' && !select['globalType'] || selectMode === 'exclude' && select['globalType'] === false) {
+                delete doc['globalType'];
+            }
+        }
+        // /////////////////////////////////////
         // Execute field-level hooks and access
         // /////////////////////////////////////
         doc = await afterRead({
@@ -62,11 +113,14 @@ export const findOneOperation = async (args)=>{
             context: req.context,
             depth,
             doc,
+            draft: draftEnabled,
             fallbackLocale,
             global: globalConfig,
             locale,
             overrideAccess,
+            populate,
             req,
+            select,
             showHiddenFields
         });
         // /////////////////////////////////////
@@ -84,10 +138,6 @@ export const findOneOperation = async (args)=>{
         // /////////////////////////////////////
         // Return results
         // /////////////////////////////////////
-        if (shouldCommit) await commitTransaction(req);
-        // /////////////////////////////////////
-        // Return results
-        // /////////////////////////////////////
         return doc;
     } catch (error) {
         await killTransaction(req);

package/dist/globals/operations/findOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/globals/operations/findOne.ts"],"sourcesContent":["import type { AccessResult } from '../../config/types.js'\nimport type { GeneratedTypes } from '../../index.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable.js'\n\ntype Args = {\n  depth?: number\n  draft?: boolean\n  globalConfig: SanitizedGlobalConfig\n  overrideAccess?: boolean\n  req: PayloadRequest\n  showHiddenFields?: boolean\n  slug: string\n}\n\nexport const findOneOperation = async <T extends Record<string, unknown>>(\n  args: Args,\n): Promise<T> => {\n  const {\n    slug,\n    depth,\n    draft: draftEnabled = false,\n    globalConfig,\n    overrideAccess = false,\n    req: { fallbackLocale, locale },\n    req,\n    showHiddenFields,\n  } = args\n\n  try {\n    const shouldCommit = await initTransaction(req)\n\n    // /////////////////////////////////////\n    // Retrieve and execute access\n    // /////////////////////////////////////\n\n    let accessResult: AccessResult\n\n    if (!overrideAccess) {\n      accessResult = await executeAccess({ req }, globalConfig.access.read)\n    }\n\n    // /////////////////////////////////////\n    // Perform database operation\n    // /////////////////////////////////////\n\n    let doc = await req.payload.db.findGlobal({\n      slug,\n      locale,\n      req,\n      where: overrideAccess ? undefined : (accessResult as Where),\n    })\n    if (!doc) {\n      doc = {}\n    }\n\n    // /////////////////////////////////////\n    // Replace document with draft if available\n    // /////////////////////////////////////\n\n    if (globalConfig.versions?.drafts && draftEnabled) {\n      doc = await replaceWithDraftIfAvailable({\n        accessResult,\n        doc,\n        entity: globalConfig,\n        entityType: 'global',\n        overrideAccess,\n        req,\n      })\n    }\n\n    // /////////////////////////////////////\n    // Execute before global hook\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.beforeRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      doc =\n        (await hook({\n          context: req.context,\n          doc,\n          global: globalConfig,\n          req,\n        })) || doc\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // Execute field-level hooks and access\n    // /////////////////////////////////////\n\n    doc = await afterRead({\n      collection: null,\n      context: req.context,\n      depth,\n      doc,\n      fallbackLocale,\n      global: globalConfig,\n      locale,\n      overrideAccess,\n      req,\n      showHiddenFields,\n    })\n\n    // /////////////////////////////////////\n    // Execute after global hook\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      doc =\n        (await hook({\n          context: req.context,\n          doc,\n          global: globalConfig,\n          req,\n        })) || doc\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    if (shouldCommit) await commitTransaction(req)\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    return doc\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","afterRead","commitTransaction","initTransaction","killTransaction","replaceWithDraftIfAvailable","findOneOperation","args","slug","depth","draft","draftEnabled","globalConfig","overrideAccess","req","fallbackLocale","locale","showHiddenFields","shouldCommit","accessResult","access","read","doc","payload","db","findGlobal","where","undefined","versions","drafts","entity","entityType","hooks","beforeRead","reduce","priorHook","hook","context","global","Promise","resolve","collection","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAKA,OAAOA,mBAAmB,8BAA6B;AACvD,SAASC,SAAS,QAAQ,wCAAuC;AACjE,SAASC,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,OAAOC,iCAAiC,uDAAsD;AAY9F,OAAO,MAAMC,mBAAmB,OAC9BC;IAEA,MAAM,EACJC,IAAI,EACJC,KAAK,EACLC,OAAOC,eAAe,KAAK,EAC3BC,YAAY,EACZC,iBAAiB,KAAK,EACtBC,KAAK,EAAEC,cAAc,EAAEC,MAAM,EAAE,EAC/BF,GAAG,EACHG,gBAAgB,EACjB,GAAGV;IAEJ,IAAI;QACF,MAAMW,eAAe,MAAMf,gBAAgBW;QAE3C,wCAAwC;QACxC,8BAA8B;QAC9B,wCAAwC;QAExC,IAAIK;QAEJ,IAAI,CAACN,gBAAgB;YACnBM,eAAe,MAAMnB,cAAc;gBAAEc;YAAI,GAAGF,aAAaQ,MAAM,CAACC,IAAI;QACtE;QAEA,wCAAwC;QACxC,6BAA6B;QAC7B,wCAAwC;QAExC,IAAIC,MAAM,MAAMR,IAAIS,OAAO,CAACC,EAAE,CAACC,UAAU,CAAC;YACxCjB;YACAQ;YACAF;YACAY,OAAOb,iBAAiBc,YAAaR;QACvC;QACA,IAAI,CAACG,KAAK;YACRA,MAAM,CAAC;QACT;QAEA,wCAAwC;QACxC,2CAA2C;QAC3C,wCAAwC;QAExC,IAAIV,aAAagB,QAAQ,EAAEC,UAAUlB,cAAc;YACjDW,MAAM,MAAMjB,4BAA4B;gBACtCc;gBACAG;gBACAQ,QAAQlB;gBACRmB,YAAY;gBACZlB;gBACAC;YACF;QACF;QAEA,wCAAwC;QACxC,6BAA6B;QAC7B,wCAAwC;QAExC,MAAMF,aAAaoB,KAAK,CAACC,UAAU,CAACC,MAAM,CAAC,OAAOC,WAAWC;YAC3D,MAAMD;YAENb,MACE,AAAC,MAAMc,KAAK;gBACVC,SAASvB,IAAIuB,OAAO;gBACpBf;gBACAgB,QAAQ1B;gBACRE;YACF,MAAOQ;QACX,GAAGiB,QAAQC,OAAO;QAElB,wCAAwC;QACxC,uCAAuC;QACvC,wCAAwC;QAExClB,MAAM,MAAMrB,UAAU;YACpBwC,YAAY;YACZJ,SAASvB,IAAIuB,OAAO;YACpB5B;YACAa;YACAP;YACAuB,QAAQ1B;YACRI;YACAH;YACAC;YACAG;QACF;QAEA,wCAAwC;QACxC,4BAA4B;QAC5B,wCAAwC;QAExC,MAAML,aAAaoB,KAAK,CAAC/B,SAAS,CAACiC,MAAM,CAAC,OAAOC,WAAWC;YAC1D,MAAMD;YAENb,MACE,AAAC,MAAMc,KAAK;gBACVC,SAASvB,IAAIuB,OAAO;gBACpBf;gBACAgB,QAAQ1B;gBACRE;YACF,MAAOQ;QACX,GAAGiB,QAAQC,OAAO;QAElB,wCAAwC;QACxC,iBAAiB;QACjB,wCAAwC;QAExC,IAAItB,cAAc,MAAMhB,kBAAkBY;QAE1C,wCAAwC;QACxC,iBAAiB;QACjB,wCAAwC;QAExC,OAAOQ;IACT,EAAE,OAAOoB,OAAgB;QACvB,MAAMtC,gBAAgBU;QACtB,MAAM4B;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../../src/globals/operations/findOne.ts"],"sourcesContent":["import type { AccessResult } from '../../config/types.js'\nimport type { PayloadRequest, PopulateType, SelectType, Where } from '../../types/index.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { getSelectMode } from '../../utilities/getSelectMode.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport replaceWithDraftIfAvailable from '../../versions/drafts/replaceWithDraftIfAvailable.js'\n\ntype Args = {\n  depth?: number\n  draft?: boolean\n  globalConfig: SanitizedGlobalConfig\n  includeLockStatus?: boolean\n  overrideAccess?: boolean\n  populate?: PopulateType\n  req: PayloadRequest\n  select?: SelectType\n  showHiddenFields?: boolean\n  slug: string\n}\n\nexport const findOneOperation = async <T extends Record<string, unknown>>(\n  args: Args,\n): Promise<T> => {\n  const {\n    slug,\n    depth,\n    draft: draftEnabled = false,\n    globalConfig,\n    includeLockStatus,\n    overrideAccess = false,\n    populate,\n    req: { fallbackLocale, locale },\n    req,\n    select,\n    showHiddenFields,\n  } = args\n\n  try {\n    // /////////////////////////////////////\n    // Retrieve and execute access\n    // /////////////////////////////////////\n\n    let accessResult: AccessResult\n\n    if (!overrideAccess) {\n      accessResult = await executeAccess({ req }, globalConfig.access.read)\n    }\n\n    // /////////////////////////////////////\n    // Perform database operation\n    // /////////////////////////////////////\n\n    let doc = await req.payload.db.findGlobal({\n      slug,\n      locale,\n      req,\n      select,\n      where: overrideAccess ? undefined : (accessResult as Where),\n    })\n    if (!doc) {\n      doc = {}\n    }\n\n    // /////////////////////////////////////\n    // Include Lock Status if required\n    // /////////////////////////////////////\n    if (includeLockStatus && slug) {\n      let lockStatus = null\n\n      try {\n        const lockDocumentsProp = globalConfig?.lockDocuments\n\n        const lockDurationDefault = 300 // Default 5 minutes in seconds\n        const lockDuration =\n          typeof lockDocumentsProp === 'object' ? lockDocumentsProp.duration : lockDurationDefault\n        const lockDurationInMilliseconds = lockDuration * 1000\n\n        const lockedDocument = await req.payload.find({\n          collection: 'payload-locked-documents',\n          depth: 1,\n          limit: 1,\n          overrideAccess: false,\n          pagination: false,\n          req,\n          where: {\n            and: [\n              {\n                globalSlug: {\n                  equals: slug,\n                },\n              },\n              {\n                updatedAt: {\n                  greater_than: new Date(new Date().getTime() - lockDurationInMilliseconds),\n                },\n              },\n            ],\n          },\n        })\n\n        if (lockedDocument && lockedDocument.docs.length > 0) {\n          lockStatus = lockedDocument.docs[0]\n        }\n      } catch {\n        // swallow error\n      }\n\n      doc._isLocked = !!lockStatus\n      doc._userEditing = lockStatus?.user?.value ?? null\n    }\n\n    // /////////////////////////////////////\n    // Replace document with draft if available\n    // /////////////////////////////////////\n\n    if (globalConfig.versions?.drafts && draftEnabled) {\n      doc = await replaceWithDraftIfAvailable({\n        accessResult,\n        doc,\n        entity: globalConfig,\n        entityType: 'global',\n        overrideAccess,\n        req,\n        select,\n      })\n    }\n\n    // /////////////////////////////////////\n    // Execute before global hook\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.beforeRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      doc =\n        (await hook({\n          context: req.context,\n          doc,\n          global: globalConfig,\n          req,\n        })) || doc\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // Execute globalType field if not selected\n    // /////////////////////////////////////\n    if (select && doc.globalType) {\n      const selectMode = getSelectMode(select)\n      if (\n        (selectMode === 'include' && !select['globalType']) ||\n        (selectMode === 'exclude' && select['globalType'] === false)\n      ) {\n        delete doc['globalType']\n      }\n    }\n\n    // /////////////////////////////////////\n    // Execute field-level hooks and access\n    // /////////////////////////////////////\n\n    doc = await afterRead({\n      collection: null,\n      context: req.context,\n      depth,\n      doc,\n      draft: draftEnabled,\n      fallbackLocale,\n      global: globalConfig,\n      locale,\n      overrideAccess,\n      populate,\n      req,\n      select,\n      showHiddenFields,\n    })\n\n    // /////////////////////////////////////\n    // Execute after global hook\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      doc =\n        (await hook({\n          context: req.context,\n          doc,\n          global: globalConfig,\n          req,\n        })) || doc\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    return doc\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","afterRead","getSelectMode","killTransaction","replaceWithDraftIfAvailable","findOneOperation","args","slug","depth","draft","draftEnabled","globalConfig","includeLockStatus","overrideAccess","populate","req","fallbackLocale","locale","select","showHiddenFields","accessResult","access","read","doc","payload","db","findGlobal","where","undefined","lockStatus","lockDocumentsProp","lockDocuments","lockDurationDefault","lockDuration","duration","lockDurationInMilliseconds","lockedDocument","find","collection","limit","pagination","and","globalSlug","equals","updatedAt","greater_than","Date","getTime","docs","length","_isLocked","_userEditing","user","value","versions","drafts","entity","entityType","hooks","beforeRead","reduce","priorHook","hook","context","global","Promise","resolve","globalType","selectMode","error"],"mappings":"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"}

package/dist/globals/operations/findVersionByID.d.ts

@@ -1,4 +1,4 @@
-import type { PayloadRequest } from '../../types/index.js';
+import type { PayloadRequest, PopulateType, SelectType } from '../../types/index.js';
 import type { TypeWithVersion } from '../../versions/types.js';
 import type { SanitizedGlobalConfig } from '../config/types.js';
 export type Arguments = {
@@ -8,7 +8,9 @@ export type Arguments = {
     globalConfig: SanitizedGlobalConfig;
     id: number | string;
     overrideAccess?: boolean;
+    populate?: PopulateType;
     req: PayloadRequest;
+    select?: SelectType;
     showHiddenFields?: boolean;
 };
 export declare const findVersionByIDOperation: <T extends TypeWithVersion<T> = any>(args: Arguments) => Promise<T>;

package/dist/globals/operations/findVersionByID.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findVersionByID.d.ts","sourceRoot":"","sources":["../../../src/globals/operations/findVersionByID.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAU/D,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,qBAAqB,CAAA;IACnC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,EAAE,cAAc,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,wBAAwB,6CAC7B,SAAS,KACd,QAAQ,CAAC,CAyHX,CAAA"}
+{"version":3,"file":"findVersionByID.d.ts","sourceRoot":"","sources":["../../../src/globals/operations/findVersionByID.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACpF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAS/D,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,YAAY,EAAE,qBAAqB,CAAA;IACnC,EAAE,EAAE,MAAM,GAAG,MAAM,CAAA;IACnB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,EAAE,cAAc,CAAA;IACnB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAU,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,cACnE,SAAS,KACd,OAAO,CAAC,CAAC,CA+HX,CAAA"}

package/dist/globals/operations/findVersionByID.js

@@ -1,14 +1,12 @@
-/* eslint-disable no-underscore-dangle */ import executeAccess from '../../auth/executeAccess.js';
+import executeAccess from '../../auth/executeAccess.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { Forbidden, NotFound } from '../../errors/index.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
-import { commitTransaction } from '../../utilities/commitTransaction.js';
-import { initTransaction } from '../../utilities/initTransaction.js';
+import { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 export const findVersionByIDOperation = async (args)=>{
-    const { id, currentDepth, depth, disableErrors, globalConfig, overrideAccess, req: { fallbackLocale, locale, payload }, req, showHiddenFields } = args;
+    const { id, currentDepth, depth, disableErrors, globalConfig, overrideAccess, populate, req: { fallbackLocale, locale, payload }, req, select, showHiddenFields } = args;
     try {
-        const shouldCommit = await initTransaction(req);
         // /////////////////////////////////////
         // Access
         // /////////////////////////////////////
@@ -18,13 +16,16 @@ export const findVersionByIDOperation = async (args)=>{
             req
         }, globalConfig.access.readVersions) : true;
         // If errors are disabled, and access returns false, return null
-        if (accessResults === false) return null;
+        if (accessResults === false) {
+            return null;
+        }
         const hasWhereAccess = typeof accessResults === 'object';
         const findGlobalVersionsArgs = {
             global: globalConfig.slug,
             limit: 1,
             locale,
             req,
+            select,
             where: combineQueries({
                 id: {
                     equals: id
@@ -34,17 +35,23 @@ export const findVersionByIDOperation = async (args)=>{
         // /////////////////////////////////////
         // Find by ID
         // /////////////////////////////////////
-        if (!findGlobalVersionsArgs.where.and[0].id) throw new NotFound(req.t);
+        if (!findGlobalVersionsArgs.where.and[0].id) {
+            throw new NotFound(req.t);
+        }
         const { docs: results } = await payload.db.findGlobalVersions(findGlobalVersionsArgs);
         if (!results || results?.length === 0) {
             if (!disableErrors) {
-                if (!hasWhereAccess) throw new NotFound(req.t);
-                if (hasWhereAccess) throw new Forbidden(req.t);
+                if (!hasWhereAccess) {
+                    throw new NotFound(req.t);
+                }
+                if (hasWhereAccess) {
+                    throw new Forbidden(req.t);
+                }
             }
             return null;
         }
         // Clone the result - it may have come back memoized
-        let result = JSON.parse(JSON.stringify(results[0]));
+        let result = deepCopyObjectSimple(results[0]);
         // Patch globalType onto version doc
         result.version.globalType = globalConfig.slug;
         // /////////////////////////////////////
@@ -68,11 +75,14 @@ export const findVersionByIDOperation = async (args)=>{
             currentDepth,
             depth,
             doc: result.version,
+            draft: undefined,
             fallbackLocale,
             global: globalConfig,
             locale,
             overrideAccess,
+            populate,
             req,
+            select: typeof select?.version === 'object' ? select.version : undefined,
             showHiddenFields
         });
         // /////////////////////////////////////
@@ -88,10 +98,6 @@ export const findVersionByIDOperation = async (args)=>{
                 req
             }) || result.version;
         }, Promise.resolve());
-        // /////////////////////////////////////
-        // Return results
-        // /////////////////////////////////////
-        if (shouldCommit) await commitTransaction(req);
         return result;
     } catch (error) {
         await killTransaction(req);

package/dist/globals/operations/findVersionByID.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/globals/operations/findVersionByID.ts"],"sourcesContent":["/* eslint-disable no-underscore-dangle */\nimport type { FindGlobalVersionsArgs } from '../../database/types.js'\nimport type { PayloadRequest } from '../../types/index.js'\nimport type { TypeWithVersion } from '../../versions/types.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { Forbidden, NotFound } from '../../errors/index.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\n\nexport type Arguments = {\n  currentDepth?: number\n  depth?: number\n  disableErrors?: boolean\n  globalConfig: SanitizedGlobalConfig\n  id: number | string\n  overrideAccess?: boolean\n  req: PayloadRequest\n  showHiddenFields?: boolean\n}\n\nexport const findVersionByIDOperation = async <T extends TypeWithVersion<T> = any>(\n  args: Arguments,\n): Promise<T> => {\n  const {\n    id,\n    currentDepth,\n    depth,\n    disableErrors,\n    globalConfig,\n    overrideAccess,\n    req: { fallbackLocale, locale, payload },\n    req,\n    showHiddenFields,\n  } = args\n\n  try {\n    const shouldCommit = await initTransaction(req)\n\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    const accessResults = !overrideAccess\n      ? await executeAccess({ id, disableErrors, req }, globalConfig.access.readVersions)\n      : true\n\n    // If errors are disabled, and access returns false, return null\n    if (accessResults === false) return null\n\n    const hasWhereAccess = typeof accessResults === 'object'\n\n    const findGlobalVersionsArgs: FindGlobalVersionsArgs = {\n      global: globalConfig.slug,\n      limit: 1,\n      locale,\n      req,\n      where: combineQueries({ id: { equals: id } }, accessResults),\n    }\n\n    // /////////////////////////////////////\n    // Find by ID\n    // /////////////////////////////////////\n\n    if (!findGlobalVersionsArgs.where.and[0].id) throw new NotFound(req.t)\n\n    const { docs: results } = await payload.db.findGlobalVersions(findGlobalVersionsArgs)\n    if (!results || results?.length === 0) {\n      if (!disableErrors) {\n        if (!hasWhereAccess) throw new NotFound(req.t)\n        if (hasWhereAccess) throw new Forbidden(req.t)\n      }\n\n      return null\n    }\n\n    // Clone the result - it may have come back memoized\n    let result = JSON.parse(JSON.stringify(results[0]))\n\n    // Patch globalType onto version doc\n    result.version.globalType = globalConfig.slug\n\n    // /////////////////////////////////////\n    // beforeRead - Collection\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.beforeRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      result =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          req,\n        })) || result.version\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // afterRead - Fields\n    // /////////////////////////////////////\n\n    result.version = await afterRead({\n      collection: null,\n      context: req.context,\n      currentDepth,\n      depth,\n      doc: result.version,\n      fallbackLocale,\n      global: globalConfig,\n      locale,\n      overrideAccess,\n      req,\n      showHiddenFields,\n    })\n\n    // /////////////////////////////////////\n    // afterRead - Global\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      result.version =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          query: findGlobalVersionsArgs.where,\n          req,\n        })) || result.version\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    if (shouldCommit) await commitTransaction(req)\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","Forbidden","NotFound","afterRead","commitTransaction","initTransaction","killTransaction","findVersionByIDOperation","args","id","currentDepth","depth","disableErrors","globalConfig","overrideAccess","req","fallbackLocale","locale","payload","showHiddenFields","shouldCommit","accessResults","access","readVersions","hasWhereAccess","findGlobalVersionsArgs","global","slug","limit","where","equals","and","t","docs","results","db","findGlobalVersions","length","result","JSON","parse","stringify","version","globalType","hooks","beforeRead","reduce","priorHook","hook","context","doc","Promise","resolve","collection","query","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,uCAAuC,GAMvC,OAAOA,mBAAmB,8BAA6B;AACvD,SAASC,cAAc,QAAQ,mCAAkC;AACjE,SAASC,SAAS,EAAEC,QAAQ,QAAQ,wBAAuB;AAC3D,SAASC,SAAS,QAAQ,wCAAuC;AACjE,SAASC,iBAAiB,QAAQ,uCAAsC;AACxE,SAASC,eAAe,QAAQ,qCAAoC;AACpE,SAASC,eAAe,QAAQ,qCAAoC;AAapE,OAAO,MAAMC,2BAA2B,OACtCC;IAEA,MAAM,EACJC,EAAE,EACFC,YAAY,EACZC,KAAK,EACLC,aAAa,EACbC,YAAY,EACZC,cAAc,EACdC,KAAK,EAAEC,cAAc,EAAEC,MAAM,EAAEC,OAAO,EAAE,EACxCH,GAAG,EACHI,gBAAgB,EACjB,GAAGX;IAEJ,IAAI;QACF,MAAMY,eAAe,MAAMf,gBAAgBU;QAE3C,wCAAwC;QACxC,SAAS;QACT,wCAAwC;QAExC,MAAMM,gBAAgB,CAACP,iBACnB,MAAMf,cAAc;YAAEU;YAAIG;YAAeG;QAAI,GAAGF,aAAaS,MAAM,CAACC,YAAY,IAChF;QAEJ,gEAAgE;QAChE,IAAIF,kBAAkB,OAAO,OAAO;QAEpC,MAAMG,iBAAiB,OAAOH,kBAAkB;QAEhD,MAAMI,yBAAiD;YACrDC,QAAQb,aAAac,IAAI;YACzBC,OAAO;YACPX;YACAF;YACAc,OAAO7B,eAAe;gBAAES,IAAI;oBAAEqB,QAAQrB;gBAAG;YAAE,GAAGY;QAChD;QAEA,wCAAwC;QACxC,aAAa;QACb,wCAAwC;QAExC,IAAI,CAACI,uBAAuBI,KAAK,CAACE,GAAG,CAAC,EAAE,CAACtB,EAAE,EAAE,MAAM,IAAIP,SAASa,IAAIiB,CAAC;QAErE,MAAM,EAAEC,MAAMC,OAAO,EAAE,GAAG,MAAMhB,QAAQiB,EAAE,CAACC,kBAAkB,CAACX;QAC9D,IAAI,CAACS,WAAWA,SAASG,WAAW,GAAG;YACrC,IAAI,CAACzB,eAAe;gBAClB,IAAI,CAACY,gBAAgB,MAAM,IAAItB,SAASa,IAAIiB,CAAC;gBAC7C,IAAIR,gBAAgB,MAAM,IAAIvB,UAAUc,IAAIiB,CAAC;YAC/C;YAEA,OAAO;QACT;QAEA,oDAAoD;QACpD,IAAIM,SAASC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACP,OAAO,CAAC,EAAE;QAEjD,oCAAoC;QACpCI,OAAOI,OAAO,CAACC,UAAU,GAAG9B,aAAac,IAAI;QAE7C,wCAAwC;QACxC,0BAA0B;QAC1B,wCAAwC;QAExC,MAAMd,aAAa+B,KAAK,CAACC,UAAU,CAACC,MAAM,CAAC,OAAOC,WAAWC;YAC3D,MAAMD;YAENT,SACE,AAAC,MAAMU,KAAK;gBACVC,SAASlC,IAAIkC,OAAO;gBACpBC,KAAKZ,OAAOI,OAAO;gBACnBhB,QAAQb;gBACRE;YACF,MAAOuB,OAAOI,OAAO;QACzB,GAAGS,QAAQC,OAAO;QAElB,wCAAwC;QACxC,qBAAqB;QACrB,wCAAwC;QAExCd,OAAOI,OAAO,GAAG,MAAMvC,UAAU;YAC/BkD,YAAY;YACZJ,SAASlC,IAAIkC,OAAO;YACpBvC;YACAC;YACAuC,KAAKZ,OAAOI,OAAO;YACnB1B;YACAU,QAAQb;YACRI;YACAH;YACAC;YACAI;QACF;QAEA,wCAAwC;QACxC,qBAAqB;QACrB,wCAAwC;QAExC,MAAMN,aAAa+B,KAAK,CAACzC,SAAS,CAAC2C,MAAM,CAAC,OAAOC,WAAWC;YAC1D,MAAMD;YAENT,OAAOI,OAAO,GACZ,AAAC,MAAMM,KAAK;gBACVC,SAASlC,IAAIkC,OAAO;gBACpBC,KAAKZ,OAAOI,OAAO;gBACnBhB,QAAQb;gBACRyC,OAAO7B,uBAAuBI,KAAK;gBACnCd;YACF,MAAOuB,OAAOI,OAAO;QACzB,GAAGS,QAAQC,OAAO;QAElB,wCAAwC;QACxC,iBAAiB;QACjB,wCAAwC;QAExC,IAAIhC,cAAc,MAAMhB,kBAAkBW;QAE1C,OAAOuB;IACT,EAAE,OAAOiB,OAAgB;QACvB,MAAMjD,gBAAgBS;QACtB,MAAMwC;IACR;AACF,EAAC"}
+{"version":3,"sources":["../../../src/globals/operations/findVersionByID.ts"],"sourcesContent":["import type { FindGlobalVersionsArgs } from '../../database/types.js'\nimport type { PayloadRequest, PopulateType, SelectType } from '../../types/index.js'\nimport type { TypeWithVersion } from '../../versions/types.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { Forbidden, NotFound } from '../../errors/index.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\n\nexport type Arguments = {\n  currentDepth?: number\n  depth?: number\n  disableErrors?: boolean\n  globalConfig: SanitizedGlobalConfig\n  id: number | string\n  overrideAccess?: boolean\n  populate?: PopulateType\n  req: PayloadRequest\n  select?: SelectType\n  showHiddenFields?: boolean\n}\n\nexport const findVersionByIDOperation = async <T extends TypeWithVersion<T> = any>(\n  args: Arguments,\n): Promise<T> => {\n  const {\n    id,\n    currentDepth,\n    depth,\n    disableErrors,\n    globalConfig,\n    overrideAccess,\n    populate,\n    req: { fallbackLocale, locale, payload },\n    req,\n    select,\n    showHiddenFields,\n  } = args\n\n  try {\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    const accessResults = !overrideAccess\n      ? await executeAccess({ id, disableErrors, req }, globalConfig.access.readVersions)\n      : true\n\n    // If errors are disabled, and access returns false, return null\n    if (accessResults === false) {\n      return null\n    }\n\n    const hasWhereAccess = typeof accessResults === 'object'\n\n    const findGlobalVersionsArgs: FindGlobalVersionsArgs = {\n      global: globalConfig.slug,\n      limit: 1,\n      locale,\n      req,\n      select,\n      where: combineQueries({ id: { equals: id } }, accessResults),\n    }\n\n    // /////////////////////////////////////\n    // Find by ID\n    // /////////////////////////////////////\n\n    if (!findGlobalVersionsArgs.where.and[0].id) {\n      throw new NotFound(req.t)\n    }\n\n    const { docs: results } = await payload.db.findGlobalVersions(findGlobalVersionsArgs)\n    if (!results || results?.length === 0) {\n      if (!disableErrors) {\n        if (!hasWhereAccess) {\n          throw new NotFound(req.t)\n        }\n        if (hasWhereAccess) {\n          throw new Forbidden(req.t)\n        }\n      }\n\n      return null\n    }\n\n    // Clone the result - it may have come back memoized\n    let result: any = deepCopyObjectSimple(results[0])\n\n    // Patch globalType onto version doc\n    result.version.globalType = globalConfig.slug\n\n    // /////////////////////////////////////\n    // beforeRead - Collection\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.beforeRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      result =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          req,\n        })) || result.version\n    }, Promise.resolve())\n\n    // /////////////////////////////////////\n    // afterRead - Fields\n    // /////////////////////////////////////\n\n    result.version = await afterRead({\n      collection: null,\n      context: req.context,\n      currentDepth,\n      depth,\n      doc: result.version,\n      draft: undefined,\n      fallbackLocale,\n      global: globalConfig,\n      locale,\n      overrideAccess,\n      populate,\n      req,\n      select: typeof select?.version === 'object' ? select.version : undefined,\n      showHiddenFields,\n    })\n\n    // /////////////////////////////////////\n    // afterRead - Global\n    // /////////////////////////////////////\n\n    await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n      await priorHook\n\n      result.version =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          query: findGlobalVersionsArgs.where,\n          req,\n        })) || result.version\n    }, Promise.resolve())\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","Forbidden","NotFound","afterRead","deepCopyObjectSimple","killTransaction","findVersionByIDOperation","args","id","currentDepth","depth","disableErrors","globalConfig","overrideAccess","populate","req","fallbackLocale","locale","payload","select","showHiddenFields","accessResults","access","readVersions","hasWhereAccess","findGlobalVersionsArgs","global","slug","limit","where","equals","and","t","docs","results","db","findGlobalVersions","length","result","version","globalType","hooks","beforeRead","reduce","priorHook","hook","context","doc","Promise","resolve","collection","draft","undefined","query","error"],"mappings":"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"}

package/dist/globals/operations/findVersions.d.ts

@@ -1,5 +1,5 @@
 import type { PaginatedDocs } from '../../database/types.js';
-import type { PayloadRequest, Where } from '../../types/index.js';
+import type { PayloadRequest, PopulateType, SelectType, Sort, Where } from '../../types/index.js';
 import type { TypeWithVersion } from '../../versions/types.js';
 import type { SanitizedGlobalConfig } from '../config/types.js';
 export type Arguments = {
@@ -8,9 +8,12 @@ export type Arguments = {
     limit?: number;
     overrideAccess?: boolean;
     page?: number;
+    pagination?: boolean;
+    populate?: PopulateType;
     req?: PayloadRequest;
+    select?: SelectType;
     showHiddenFields?: boolean;
-    sort?: string;
+    sort?: Sort;
     where?: Where;
 };
 export declare const findVersionsOperation: <T extends TypeWithVersion<T>>(args: Arguments) => Promise<PaginatedDocs<T>>;

package/dist/globals/operations/findVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAY/D,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,qBAAqB,CAAA;IACnC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,eAAO,MAAM,qBAAqB,uCAC1B,SAAS,KACd,QAAQ,cAAc,CAAC,CAAC,CA8H1B,CAAA"}
+{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAC5D,OAAO,KAAK,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,sBAAsB,CAAA;AACjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAA;AAU/D,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,YAAY,EAAE,qBAAqB,CAAA;IACnC,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,MAAM,CAAC,EAAE,UAAU,CAAA;IACnB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAU,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,QAChE,SAAS,KACd,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAoI1B,CAAA"}

package/dist/globals/operations/findVersions.js

@@ -2,16 +2,13 @@ import executeAccess from '../../auth/executeAccess.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
-import { commitTransaction } from '../../utilities/commitTransaction.js';
-import { initTransaction } from '../../utilities/initTransaction.js';
 import { killTransaction } from '../../utilities/killTransaction.js';
 import sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js';
 import { buildVersionGlobalFields } from '../../versions/buildGlobalFields.js';
 export const findVersionsOperation = async (args)=>{
-    const { depth, globalConfig, limit, overrideAccess, page, req: { fallbackLocale, locale, payload }, req, showHiddenFields, sort, where } = args;
-    const versionFields = buildVersionGlobalFields(globalConfig);
+    const { depth, globalConfig, limit, overrideAccess, page, pagination = true, populate, req: { fallbackLocale, locale, payload }, req, select, showHiddenFields, sort, where } = args;
+    const versionFields = buildVersionGlobalFields(payload.config, globalConfig);
     try {
-        const shouldCommit = await initTransaction(req);
         // /////////////////////////////////////
         // Access
         // /////////////////////////////////////
@@ -34,7 +31,9 @@ export const findVersionsOperation = async (args)=>{
             limit: limit ?? 10,
             locale,
             page: page || 1,
+            pagination,
             req,
+            select,
             sort,
             where: fullWhere
         });
@@ -43,7 +42,8 @@ export const findVersionsOperation = async (args)=>{
         // /////////////////////////////////////
         let result = {
             ...paginatedDocs,
-            docs: await Promise.all(paginatedDocs.docs.map(async (data)=>({
+            docs: await Promise.all(paginatedDocs.docs.map(async (data)=>{
+                return {
                     ...data,
                     version: await afterRead({
                         collection: null,
@@ -54,15 +54,19 @@ export const findVersionsOperation = async (args)=>{
                             // Patch globalType onto version doc
                             globalType: globalConfig.slug
                         },
+                        draft: undefined,
                         fallbackLocale,
                         findMany: true,
                         global: globalConfig,
                         locale,
                         overrideAccess,
+                        populate,
                         req,
+                        select,
                         showHiddenFields
                     })
-                })))
+                };
+            }))
         };
         // /////////////////////////////////////
         // afterRead - Global
@@ -92,7 +96,6 @@ export const findVersionsOperation = async (args)=>{
             ...result,
             docs: result.docs.map((doc)=>sanitizeInternalFields(doc))
         };
-        if (shouldCommit) await commitTransaction(req);
         return result;
     } catch (error) {
         await killTransaction(req);

package/dist/globals/operations/findVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/globals/operations/findVersions.ts"],"sourcesContent":["import type { PaginatedDocs } from '../../database/types.js'\nimport type { PayloadRequest, Where } from '../../types/index.js'\nimport type { TypeWithVersion } from '../../versions/types.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { commitTransaction } from '../../utilities/commitTransaction.js'\nimport { initTransaction } from '../../utilities/initTransaction.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'\nimport { buildVersionGlobalFields } from '../../versions/buildGlobalFields.js'\n\nexport type Arguments = {\n  depth?: number\n  globalConfig: SanitizedGlobalConfig\n  limit?: number\n  overrideAccess?: boolean\n  page?: number\n  req?: PayloadRequest\n  showHiddenFields?: boolean\n  sort?: string\n  where?: Where\n}\n\nexport const findVersionsOperation = async <T extends TypeWithVersion<T>>(\n  args: Arguments,\n): Promise<PaginatedDocs<T>> => {\n  const {\n    depth,\n    globalConfig,\n    limit,\n    overrideAccess,\n    page,\n    req: { fallbackLocale, locale, payload },\n    req,\n    showHiddenFields,\n    sort,\n    where,\n  } = args\n\n  const versionFields = buildVersionGlobalFields(globalConfig)\n\n  try {\n    const shouldCommit = await initTransaction(req)\n\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    const accessResults = !overrideAccess\n      ? await executeAccess({ req }, globalConfig.access.readVersions)\n      : true\n\n    await validateQueryPaths({\n      globalConfig,\n      overrideAccess,\n      req,\n      versionFields,\n      where,\n    })\n\n    const fullWhere = combineQueries(where, accessResults)\n\n    // /////////////////////////////////////\n    // Find\n    // /////////////////////////////////////\n\n    const paginatedDocs = await payload.db.findGlobalVersions<T>({\n      global: globalConfig.slug,\n      limit: limit ?? 10,\n      locale,\n      page: page || 1,\n      req,\n      sort,\n      where: fullWhere,\n    })\n\n    // /////////////////////////////////////\n    // afterRead - Fields\n    // /////////////////////////////////////\n\n    let result = {\n      ...paginatedDocs,\n      docs: await Promise.all(\n        paginatedDocs.docs.map(async (data) => ({\n          ...data,\n          version: await afterRead({\n            collection: null,\n            context: req.context,\n            depth,\n            doc: {\n              ...data.version,\n              // Patch globalType onto version doc\n              globalType: globalConfig.slug,\n            },\n            fallbackLocale,\n            findMany: true,\n            global: globalConfig,\n            locale,\n            overrideAccess,\n            req,\n            showHiddenFields,\n          }),\n        })),\n      ),\n    } as PaginatedDocs<T>\n\n    // /////////////////////////////////////\n    // afterRead - Global\n    // /////////////////////////////////////\n\n    result = {\n      ...result,\n      docs: await Promise.all(\n        result.docs.map(async (doc) => {\n          const docRef = doc\n\n          await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n            await priorHook\n\n            docRef.version =\n              (await hook({\n                context: req.context,\n                doc: doc.version,\n                findMany: true,\n                global: globalConfig,\n                query: fullWhere,\n                req,\n              })) || doc.version\n          }, Promise.resolve())\n\n          return docRef\n        }),\n      ),\n    }\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    result = {\n      ...result,\n      docs: result.docs.map((doc) => sanitizeInternalFields<T>(doc)),\n    }\n\n    if (shouldCommit) await commitTransaction(req)\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","validateQueryPaths","afterRead","commitTransaction","initTransaction","killTransaction","sanitizeInternalFields","buildVersionGlobalFields","findVersionsOperation","args","depth","globalConfig","limit","overrideAccess","page","req","fallbackLocale","locale","payload","showHiddenFields","sort","where","versionFields","shouldCommit","accessResults","access","readVersions","fullWhere","paginatedDocs","db","findGlobalVersions","global","slug","result","docs","Promise","all","map","data","version","collection","context","doc","globalType","findMany","docRef","hooks","reduce","priorHook","hook","query","resolve","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../../src/globals/operations/findVersions.ts"],"sourcesContent":["import type { PaginatedDocs } from '../../database/types.js'\nimport type { PayloadRequest, PopulateType, SelectType, Sort, Where } from '../../types/index.js'\nimport type { TypeWithVersion } from '../../versions/types.js'\nimport type { SanitizedGlobalConfig } from '../config/types.js'\n\nimport executeAccess from '../../auth/executeAccess.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { killTransaction } from '../../utilities/killTransaction.js'\nimport sanitizeInternalFields from '../../utilities/sanitizeInternalFields.js'\nimport { buildVersionGlobalFields } from '../../versions/buildGlobalFields.js'\n\nexport type Arguments = {\n  depth?: number\n  globalConfig: SanitizedGlobalConfig\n  limit?: number\n  overrideAccess?: boolean\n  page?: number\n  pagination?: boolean\n  populate?: PopulateType\n  req?: PayloadRequest\n  select?: SelectType\n  showHiddenFields?: boolean\n  sort?: Sort\n  where?: Where\n}\n\nexport const findVersionsOperation = async <T extends TypeWithVersion<T>>(\n  args: Arguments,\n): Promise<PaginatedDocs<T>> => {\n  const {\n    depth,\n    globalConfig,\n    limit,\n    overrideAccess,\n    page,\n    pagination = true,\n    populate,\n    req: { fallbackLocale, locale, payload },\n    req,\n    select,\n    showHiddenFields,\n    sort,\n    where,\n  } = args\n\n  const versionFields = buildVersionGlobalFields(payload.config, globalConfig)\n\n  try {\n    // /////////////////////////////////////\n    // Access\n    // /////////////////////////////////////\n\n    const accessResults = !overrideAccess\n      ? await executeAccess({ req }, globalConfig.access.readVersions)\n      : true\n\n    await validateQueryPaths({\n      globalConfig,\n      overrideAccess,\n      req,\n      versionFields,\n      where,\n    })\n\n    const fullWhere = combineQueries(where, accessResults)\n\n    // /////////////////////////////////////\n    // Find\n    // /////////////////////////////////////\n\n    const paginatedDocs = await payload.db.findGlobalVersions<T>({\n      global: globalConfig.slug,\n      limit: limit ?? 10,\n      locale,\n      page: page || 1,\n      pagination,\n      req,\n      select,\n      sort,\n      where: fullWhere,\n    })\n\n    // /////////////////////////////////////\n    // afterRead - Fields\n    // /////////////////////////////////////\n\n    let result = {\n      ...paginatedDocs,\n      docs: await Promise.all(\n        paginatedDocs.docs.map(async (data) => {\n          return {\n            ...data,\n            version: await afterRead<T>({\n              collection: null,\n              context: req.context,\n              depth,\n              doc: {\n                ...data.version,\n                // Patch globalType onto version doc\n                globalType: globalConfig.slug,\n              },\n              draft: undefined,\n              fallbackLocale,\n              findMany: true,\n              global: globalConfig,\n              locale,\n              overrideAccess,\n              populate,\n              req,\n              select,\n              showHiddenFields,\n            }),\n          }\n        }),\n      ),\n    } as PaginatedDocs<T>\n\n    // /////////////////////////////////////\n    // afterRead - Global\n    // /////////////////////////////////////\n\n    result = {\n      ...result,\n      docs: await Promise.all(\n        result.docs.map(async (doc) => {\n          const docRef = doc\n\n          await globalConfig.hooks.afterRead.reduce(async (priorHook, hook) => {\n            await priorHook\n\n            docRef.version =\n              (await hook({\n                context: req.context,\n                doc: doc.version,\n                findMany: true,\n                global: globalConfig,\n                query: fullWhere,\n                req,\n              })) || doc.version\n          }, Promise.resolve())\n\n          return docRef\n        }),\n      ),\n    }\n\n    // /////////////////////////////////////\n    // Return results\n    // /////////////////////////////////////\n\n    result = {\n      ...result,\n      docs: result.docs.map((doc) => sanitizeInternalFields<T>(doc)),\n    }\n\n    return result\n  } catch (error: unknown) {\n    await killTransaction(req)\n    throw error\n  }\n}\n"],"names":["executeAccess","combineQueries","validateQueryPaths","afterRead","killTransaction","sanitizeInternalFields","buildVersionGlobalFields","findVersionsOperation","args","depth","globalConfig","limit","overrideAccess","page","pagination","populate","req","fallbackLocale","locale","payload","select","showHiddenFields","sort","where","versionFields","config","accessResults","access","readVersions","fullWhere","paginatedDocs","db","findGlobalVersions","global","slug","result","docs","Promise","all","map","data","version","collection","context","doc","globalType","draft","undefined","findMany","docRef","hooks","reduce","priorHook","hook","query","resolve","error"],"mappings":"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"}

package/dist/globals/operations/local/countGlobalVersions.d.ts

@@ -0,0 +1,20 @@
+import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js';
+import type { Document, PayloadRequest, Where } from '../../../types/index.js';
+export type CountGlobalVersionsOptions<TSlug extends GlobalSlug> = {
+    /**
+     * context, which will then be passed to req.context, which can be read by hooks
+     */
+    context?: RequestContext;
+    depth?: number;
+    disableErrors?: boolean;
+    global: TSlug;
+    locale?: TypedLocale;
+    overrideAccess?: boolean;
+    req?: PayloadRequest;
+    user?: Document;
+    where?: Where;
+};
+export default function countGlobalVersionsLocal<TSlug extends GlobalSlug>(payload: Payload, options: CountGlobalVersionsOptions<TSlug>): Promise<{
+    totalDocs: number;
+}>;
+//# sourceMappingURL=countGlobalVersions.d.ts.map

package/dist/globals/operations/local/countGlobalVersions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"countGlobalVersions.d.ts","sourceRoot":"","sources":["../../../../src/globals/operations/local/countGlobalVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACzF,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAA;AAM9E,MAAM,MAAM,0BAA0B,CAAC,KAAK,SAAS,UAAU,IAAI;IACjE;;OAEG;IACH,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,MAAM,EAAE,KAAK,CAAA;IACb,MAAM,CAAC,EAAE,WAAW,CAAA;IACpB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,CAAA;AAGD,wBAA8B,wBAAwB,CAAC,KAAK,SAAS,UAAU,EAC7E,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,0BAA0B,CAAC,KAAK,CAAC,GACzC,OAAO,CAAC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC,CAkBhC"}

package/dist/globals/operations/local/countGlobalVersions.js

@@ -0,0 +1,20 @@
+import { APIError } from '../../../errors/index.js';
+import { createLocalReq } from '../../../utilities/createLocalReq.js';
+import { countGlobalVersionsOperation } from '../countGlobalVersions.js';
+// eslint-disable-next-line no-restricted-exports
+export default async function countGlobalVersionsLocal(payload, options) {
+    const { disableErrors, global: globalSlug, overrideAccess = true, where } = options;
+    const global = payload.globals.config.find(({ slug })=>slug === globalSlug);
+    if (!global) {
+        throw new APIError(`The global with slug ${String(globalSlug)} can't be found. Count Global Versions Operation.`);
+    }
+    return countGlobalVersionsOperation({
+        disableErrors,
+        global,
+        overrideAccess,
+        req: await createLocalReq(options, payload),
+        where
+    });
+}
+
+//# sourceMappingURL=countGlobalVersions.js.map

package/dist/globals/operations/local/countGlobalVersions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../src/globals/operations/local/countGlobalVersions.ts"],"sourcesContent":["import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js'\nimport type { Document, PayloadRequest, Where } from '../../../types/index.js'\n\nimport { APIError } from '../../../errors/index.js'\nimport { createLocalReq } from '../../../utilities/createLocalReq.js'\nimport { countGlobalVersionsOperation } from '../countGlobalVersions.js'\n\nexport type CountGlobalVersionsOptions<TSlug extends GlobalSlug> = {\n  /**\n   * context, which will then be passed to req.context, which can be read by hooks\n   */\n  context?: RequestContext\n  depth?: number\n  disableErrors?: boolean\n  global: TSlug\n  locale?: TypedLocale\n  overrideAccess?: boolean\n  req?: PayloadRequest\n  user?: Document\n  where?: Where\n}\n\n// eslint-disable-next-line no-restricted-exports\nexport default async function countGlobalVersionsLocal<TSlug extends GlobalSlug>(\n  payload: Payload,\n  options: CountGlobalVersionsOptions<TSlug>,\n): Promise<{ totalDocs: number }> {\n  const { disableErrors, global: globalSlug, overrideAccess = true, where } = options\n\n  const global = payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n  if (!global) {\n    throw new APIError(\n      `The global with slug ${String(globalSlug)} can't be found. Count Global Versions Operation.`,\n    )\n  }\n\n  return countGlobalVersionsOperation<TSlug>({\n    disableErrors,\n    global,\n    overrideAccess,\n    req: await createLocalReq(options, payload),\n    where,\n  })\n}\n"],"names":["APIError","createLocalReq","countGlobalVersionsOperation","countGlobalVersionsLocal","payload","options","disableErrors","global","globalSlug","overrideAccess","where","globals","config","find","slug","String","req"],"mappings":"AAGA,SAASA,QAAQ,QAAQ,2BAA0B;AACnD,SAASC,cAAc,QAAQ,uCAAsC;AACrE,SAASC,4BAA4B,QAAQ,4BAA2B;AAiBxE,iDAAiD;AACjD,eAAe,eAAeC,yBAC5BC,OAAgB,EAChBC,OAA0C;IAE1C,MAAM,EAAEC,aAAa,EAAEC,QAAQC,UAAU,EAAEC,iBAAiB,IAAI,EAAEC,KAAK,EAAE,GAAGL;IAE5E,MAAME,SAASH,QAAQO,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASN;IAElE,IAAI,CAACD,QAAQ;QACX,MAAM,IAAIP,SACR,CAAC,qBAAqB,EAAEe,OAAOP,YAAY,iDAAiD,CAAC;IAEjG;IAEA,OAAON,6BAAoC;QACzCI;QACAC;QACAE;QACAO,KAAK,MAAMf,eAAeI,SAASD;QACnCM;IACF;AACF"}

package/dist/globals/operations/local/findOne.d.ts

@@ -1,16 +1,20 @@
-import type { GeneratedTypes, Payload, RequestContext } from '../../../index.js';
-import type { Document, PayloadRequest } from '../../../types/index.js';
-export type Options<T extends keyof GeneratedTypes['globals']> = {
+import type { GlobalSlug, Payload, RequestContext, TypedLocale } from '../../../index.js';
+import type { Document, PayloadRequest, PopulateType, SelectType, TransformGlobalWithSelect } from '../../../types/index.js';
+import type { SelectFromGlobalSlug } from '../../config/types.js';
+export type Options<TSlug extends GlobalSlug, TSelect extends SelectType> = {
     context?: RequestContext;
     depth?: number;
     draft?: boolean;
-    fallbackLocale?: GeneratedTypes['locale'];
-    locale?: 'all' | GeneratedTypes['locale'];
+    fallbackLocale?: false | TypedLocale;
+    includeLockStatus?: boolean;
+    locale?: 'all' | TypedLocale;
     overrideAccess?: boolean;
+    populate?: PopulateType;
     req?: PayloadRequest;
+    select?: TSelect;
     showHiddenFields?: boolean;
-    slug: T;
+    slug: TSlug;
     user?: Document;
 };
-export default function findOneLocal<T extends keyof GeneratedTypes['globals']>(payload: Payload, options: Options<T>): Promise<GeneratedTypes['globals'][T]>;
+export default function findOneLocal<TSlug extends GlobalSlug, TSelect extends SelectFromGlobalSlug<TSlug>>(payload: Payload, options: Options<TSlug, TSelect>): Promise<TransformGlobalWithSelect<TSlug, TSelect>>;
 //# sourceMappingURL=findOne.d.ts.map

package/dist/globals/operations/local/findOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../../../../src/globals/operations/local/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAChF,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAA;AAMvE,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,MAAM,cAAc,CAAC,SAAS,CAAC,IAAI;IAC/D,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAA;IACzC,MAAM,CAAC,EAAE,KAAK,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;IACzC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,CAAC,CAAA;IACP,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,wBAA8B,YAAY,CAAC,CAAC,SAAS,MAAM,cAAc,CAAC,SAAS,CAAC,EAClF,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,GAClB,OAAO,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAwBvC"}
+{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../../../../src/globals/operations/local/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACzF,OAAO,KAAK,EACV,QAAQ,EACR,cAAc,EACd,YAAY,EACZ,UAAU,EACV,yBAAyB,EAC1B,MAAM,yBAAyB,CAAA;AAChC,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAA;AAMjE,MAAM,MAAM,OAAO,CAAC,KAAK,SAAS,UAAU,EAAE,OAAO,SAAS,UAAU,IAAI;IAC1E,OAAO,CAAC,EAAE,cAAc,CAAA;IACxB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,cAAc,CAAC,EAAE,KAAK,GAAG,WAAW,CAAA;IACpC,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,MAAM,CAAC,EAAE,KAAK,GAAG,WAAW,CAAA;IAC5B,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,KAAK,CAAA;IACX,IAAI,CAAC,EAAE,QAAQ,CAAA;CAChB,CAAA;AAED,wBAA8B,YAAY,CACxC,KAAK,SAAS,UAAU,EACxB,OAAO,SAAS,oBAAoB,CAAC,KAAK,CAAC,EAE3C,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,yBAAyB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CA8BpD"}