payload 4.0.0-internal.e7d4ebc → 4.0.0-internal.ea6e8f8

package/dist/globals/operations/findVersionByID.js

@@ -1,128 +1,139 @@
 import { executeAccess } from '../../auth/executeAccess.js';
+import { assertBranchReadable } from '../../branching/assertBranchReadable.js';
 import { combineQueries } from '../../database/combineQueries.js';
+import { sanitizeWhereQuery } from '../../database/sanitizeWhereQuery.js';
 import { Forbidden, NotFound } from '../../errors/index.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
 import { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js';
-import { killTransaction } from '../../utilities/killTransaction.js';
 import { resolveSelect } from '../../utilities/resolveSelect.js';
 import { sanitizeSelect } from '../../utilities/sanitizeSelect.js';
 import { buildVersionGlobalFields } from '../../versions/buildGlobalFields.js';
 export const findVersionByIDOperation = async (args)=>{
     const { id, currentDepth, depth, disableErrors, globalConfig, overrideAccess, populate, req: { fallbackLocale, locale, payload }, req, select: incomingSelect, showHiddenFields } = args;
-    try {
-        // /////////////////////////////////////
-        // Access
-        // /////////////////////////////////////
-        const accessResults = !overrideAccess ? await executeAccess({
-            id,
-            disableErrors,
+    if (!overrideAccess) {
+        await assertBranchReadable({
+            globalSlug: globalConfig.slug,
             req
-        }, globalConfig.access.readVersions) : true;
-        // If errors are disabled, and access returns false, return null
-        if (accessResults === false) {
-            return null;
-        }
-        const hasWhereAccess = typeof accessResults === 'object';
-        const select = sanitizeSelect({
-            fields: buildVersionGlobalFields(payload.config, globalConfig, true),
-            select: resolveSelect({
-                config: globalConfig.select,
-                operation: 'read',
-                req,
-                select: incomingSelect
-            }),
-            versions: true
         });
-        const findGlobalVersionsArgs = {
-            global: globalConfig.slug,
-            limit: 1,
-            locale: locale,
+    }
+    // /////////////////////////////////////
+    // Access
+    // /////////////////////////////////////
+    const accessResults = !overrideAccess ? await executeAccess({
+        id,
+        slug: globalConfig.slug,
+        disableErrors,
+        req
+    }, globalConfig.access.readVersions) : true;
+    // If errors are disabled, and access returns false, return null
+    if (accessResults === false) {
+        return null;
+    }
+    const isValidID = typeof id === 'string' && id.length > 0 || typeof id === 'number' && Number.isFinite(id);
+    if (!isValidID) {
+        throw new NotFound(req.t);
+    }
+    const hasWhereAccess = typeof accessResults === 'object';
+    const versionFields = buildVersionGlobalFields(payload.config, globalConfig, true);
+    const select = sanitizeSelect({
+        fields: versionFields,
+        select: resolveSelect({
+            config: globalConfig.select,
+            operation: 'read',
             req,
-            select,
-            where: combineQueries({
-                id: {
-                    equals: id
-                }
-            }, accessResults)
-        };
-        // /////////////////////////////////////
-        // Find by ID
-        // /////////////////////////////////////
-        if (!findGlobalVersionsArgs.where?.and?.[0]?.id) {
-            throw new NotFound(req.t);
+            select: incomingSelect
+        }),
+        versions: true
+    });
+    const where = combineQueries({
+        id: {
+            equals: id
         }
-        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);
-                }
+    }, accessResults);
+    sanitizeWhereQuery({
+        fields: versionFields,
+        payload,
+        where
+    });
+    const findGlobalVersionsArgs = {
+        global: globalConfig.slug,
+        limit: 1,
+        locale: locale,
+        req,
+        select,
+        where
+    };
+    // /////////////////////////////////////
+    // Find by ID
+    // /////////////////////////////////////
+    const { docs: results } = await payload.db.findGlobalVersions(findGlobalVersionsArgs);
+    if (!results || results?.length === 0) {
+        if (!disableErrors) {
+            if (!hasWhereAccess) {
+                throw new NotFound(req.t);
             }
-            return null;
-        }
-        // Clone the result - it may have come back memoized
-        let result = deepCopyObjectSimple(results[0]);
-        if (!result.version) {
-            result.version = {};
-        }
-        // Patch globalType onto version doc
-        result.version.globalType = globalConfig.slug;
-        // /////////////////////////////////////
-        // beforeRead - Collection
-        // /////////////////////////////////////
-        if (globalConfig.hooks?.beforeRead?.length) {
-            for (const hook of globalConfig.hooks.beforeRead){
-                result = await hook({
-                    context: req.context,
-                    doc: result.version,
-                    global: globalConfig,
-                    overrideAccess,
-                    req
-                }) || result.version;
+            if (hasWhereAccess) {
+                throw new Forbidden(req.t);
             }
         }
-        // /////////////////////////////////////
-        // afterRead - Fields
-        // /////////////////////////////////////
-        result.version = await afterRead({
-            collection: null,
-            context: req.context,
-            currentDepth,
-            depth: depth,
-            doc: result.version,
-            draft: undefined,
-            fallbackLocale: fallbackLocale,
-            global: globalConfig,
-            locale: locale,
-            overrideAccess: overrideAccess,
-            populate,
-            req,
-            select: typeof select?.version === 'object' ? select.version : undefined,
-            showHiddenFields: showHiddenFields
-        });
-        // /////////////////////////////////////
-        // afterRead - Global
-        // /////////////////////////////////////
-        if (globalConfig.hooks?.afterRead?.length) {
-            for (const hook of globalConfig.hooks.afterRead){
-                result.version = await hook({
-                    context: req.context,
-                    doc: result.version,
-                    global: globalConfig,
-                    overrideAccess,
-                    query: findGlobalVersionsArgs.where,
-                    req
-                }) || result.version;
-            }
+        return null;
+    }
+    // Clone the result - it may have come back memoized
+    let result = deepCopyObjectSimple(results[0]);
+    if (!result.version) {
+        result.version = {};
+    }
+    // Patch globalType onto version doc
+    result.version.globalType = globalConfig.slug;
+    // /////////////////////////////////////
+    // beforeRead - Collection
+    // /////////////////////////////////////
+    if (globalConfig.hooks?.beforeRead?.length) {
+        for (const hook of globalConfig.hooks.beforeRead){
+            result = await hook({
+                context: req.context,
+                doc: result.version,
+                global: globalConfig,
+                overrideAccess,
+                req
+            }) || result.version;
+        }
+    }
+    // /////////////////////////////////////
+    // afterRead - Fields
+    // /////////////////////////////////////
+    result.version = await afterRead({
+        collection: null,
+        context: req.context,
+        currentDepth,
+        depth: depth,
+        doc: result.version,
+        draft: undefined,
+        fallbackLocale: fallbackLocale,
+        global: globalConfig,
+        locale: locale,
+        overrideAccess: overrideAccess,
+        populate,
+        req,
+        select: typeof select?.version === 'object' ? select.version : undefined,
+        showHiddenFields: showHiddenFields
+    });
+    // /////////////////////////////////////
+    // afterRead - Global
+    // /////////////////////////////////////
+    if (globalConfig.hooks?.afterRead?.length) {
+        for (const hook of globalConfig.hooks.afterRead){
+            result.version = await hook({
+                context: req.context,
+                doc: result.version,
+                global: globalConfig,
+                overrideAccess,
+                query: findGlobalVersionsArgs.where,
+                req
+            }) || result.version;
         }
-        return result;
-    } catch (error) {
-        await killTransaction(req);
-        throw error;
     }
+    return result;
 };
 
 //# sourceMappingURL=findVersionByID.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/globals/operations/findVersionByID.ts"],"sourcesContent":["import type { FindOptions } from '../../collections/operations/local/find.js'\nimport 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'\nimport { resolveSelect } from '../../utilities/resolveSelect.js'\nimport { sanitizeSelect } from '../../utilities/sanitizeSelect.js'\nimport { buildVersionGlobalFields } from '../../versions/buildGlobalFields.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  showHiddenFields?: boolean\n} & Pick<FindOptions<string, SelectType>, 'select'>\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: incomingSelect,\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 select = sanitizeSelect({\n      fields: buildVersionGlobalFields(payload.config, globalConfig, true),\n      select: resolveSelect({\n        config: globalConfig.select,\n        operation: 'read',\n        req,\n        select: incomingSelect,\n      }),\n      versions: true,\n    })\n\n    const findGlobalVersionsArgs: FindGlobalVersionsArgs = {\n      global: globalConfig.slug,\n      limit: 1,\n      locale: 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    if (!result.version) {\n      result.version = {}\n    }\n\n    // Patch globalType onto version doc\n    result.version.globalType = globalConfig.slug\n\n    // /////////////////////////////////////\n    // beforeRead - Collection\n    // /////////////////////////////////////\n\n    if (globalConfig.hooks?.beforeRead?.length) {\n      for (const hook of globalConfig.hooks.beforeRead) {\n        result =\n          (await hook({\n            context: req.context,\n            doc: result.version,\n            global: globalConfig,\n            overrideAccess,\n            req,\n          })) || result.version\n      }\n    }\n\n    // /////////////////////////////////////\n    // afterRead - Fields\n    // /////////////////////////////////////\n\n    result.version = await afterRead({\n      collection: null,\n      context: req.context,\n      currentDepth,\n      depth: depth!,\n      doc: result.version,\n      draft: undefined!,\n      fallbackLocale: fallbackLocale!,\n      global: globalConfig,\n      locale: locale!,\n      overrideAccess: overrideAccess!,\n      populate,\n      req,\n      select: typeof select?.version === 'object' ? select.version : undefined,\n      showHiddenFields: showHiddenFields!,\n    })\n\n    // /////////////////////////////////////\n    // afterRead - Global\n    // /////////////////////////////////////\n\n    if (globalConfig.hooks?.afterRead?.length) {\n      for (const hook of globalConfig.hooks.afterRead) {\n        result.version =\n          (await hook({\n            context: req.context,\n            doc: result.version,\n            global: globalConfig,\n            overrideAccess,\n            query: findGlobalVersionsArgs.where,\n            req,\n          })) || result.version\n      }\n    }\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","resolveSelect","sanitizeSelect","buildVersionGlobalFields","findVersionByIDOperation","args","id","currentDepth","depth","disableErrors","globalConfig","overrideAccess","populate","req","fallbackLocale","locale","payload","select","incomingSelect","showHiddenFields","accessResults","access","readVersions","hasWhereAccess","fields","config","operation","versions","findGlobalVersionsArgs","global","slug","limit","where","equals","and","t","docs","results","db","findGlobalVersions","length","result","version","globalType","hooks","beforeRead","hook","context","doc","collection","draft","undefined","query","error"],"mappings":"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"}
+{"version":3,"sources":["../../../src/globals/operations/findVersionByID.ts"],"sourcesContent":["import type { FindOptions } from '../../collections/operations/local/find.js'\nimport 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 { assertBranchReadable } from '../../branching/assertBranchReadable.js'\nimport { combineQueries } from '../../database/combineQueries.js'\nimport { sanitizeWhereQuery } from '../../database/sanitizeWhereQuery.js'\nimport { Forbidden, NotFound } from '../../errors/index.js'\nimport { afterRead } from '../../fields/hooks/afterRead/index.js'\nimport { deepCopyObjectSimple } from '../../utilities/deepCopyObject.js'\nimport { resolveSelect } from '../../utilities/resolveSelect.js'\nimport { sanitizeSelect } from '../../utilities/sanitizeSelect.js'\nimport { buildVersionGlobalFields } from '../../versions/buildGlobalFields.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  showHiddenFields?: boolean\n} & Pick<FindOptions<string, SelectType>, 'select'>\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: incomingSelect,\n    showHiddenFields,\n  } = args\n\n  if (!overrideAccess) {\n    await assertBranchReadable({ globalSlug: globalConfig.slug, req })\n  }\n\n  // /////////////////////////////////////\n  // Access\n  // /////////////////////////////////////\n\n  const accessResults = !overrideAccess\n    ? await executeAccess(\n        { id, slug: globalConfig.slug, disableErrors, req },\n        globalConfig.access.readVersions,\n      )\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 isValidID =\n    (typeof id === 'string' && id.length > 0) || (typeof id === 'number' && Number.isFinite(id))\n\n  if (!isValidID) {\n    throw new NotFound(req.t)\n  }\n\n  const hasWhereAccess = typeof accessResults === 'object'\n\n  const versionFields = buildVersionGlobalFields(payload.config, globalConfig, true)\n  const select = sanitizeSelect({\n    fields: versionFields,\n    select: resolveSelect({\n      config: globalConfig.select,\n      operation: 'read',\n      req,\n      select: incomingSelect,\n    }),\n    versions: true,\n  })\n\n  const where = combineQueries({ id: { equals: id } }, accessResults)\n\n  sanitizeWhereQuery({ fields: versionFields, payload, where })\n\n  const findGlobalVersionsArgs: FindGlobalVersionsArgs = {\n    global: globalConfig.slug,\n    limit: 1,\n    locale: locale!,\n    req,\n    select,\n    where,\n  }\n\n  // /////////////////////////////////////\n  // Find by ID\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  if (!result.version) {\n    result.version = {}\n  }\n\n  // Patch globalType onto version doc\n  result.version.globalType = globalConfig.slug\n\n  // /////////////////////////////////////\n  // beforeRead - Collection\n  // /////////////////////////////////////\n\n  if (globalConfig.hooks?.beforeRead?.length) {\n    for (const hook of globalConfig.hooks.beforeRead) {\n      result =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          overrideAccess,\n          req,\n        })) || result.version\n    }\n  }\n\n  // /////////////////////////////////////\n  // afterRead - Fields\n  // /////////////////////////////////////\n\n  result.version = await afterRead({\n    collection: null,\n    context: req.context,\n    currentDepth,\n    depth: depth!,\n    doc: result.version,\n    draft: undefined!,\n    fallbackLocale: fallbackLocale!,\n    global: globalConfig,\n    locale: locale!,\n    overrideAccess: overrideAccess!,\n    populate,\n    req,\n    select: typeof select?.version === 'object' ? select.version : undefined,\n    showHiddenFields: showHiddenFields!,\n  })\n\n  // /////////////////////////////////////\n  // afterRead - Global\n  // /////////////////////////////////////\n\n  if (globalConfig.hooks?.afterRead?.length) {\n    for (const hook of globalConfig.hooks.afterRead) {\n      result.version =\n        (await hook({\n          context: req.context,\n          doc: result.version,\n          global: globalConfig,\n          overrideAccess,\n          query: findGlobalVersionsArgs.where,\n          req,\n        })) || result.version\n    }\n  }\n\n  return result\n}\n"],"names":["executeAccess","assertBranchReadable","combineQueries","sanitizeWhereQuery","Forbidden","NotFound","afterRead","deepCopyObjectSimple","resolveSelect","sanitizeSelect","buildVersionGlobalFields","findVersionByIDOperation","args","id","currentDepth","depth","disableErrors","globalConfig","overrideAccess","populate","req","fallbackLocale","locale","payload","select","incomingSelect","showHiddenFields","globalSlug","slug","accessResults","access","readVersions","isValidID","length","Number","isFinite","t","hasWhereAccess","versionFields","config","fields","operation","versions","where","equals","findGlobalVersionsArgs","global","limit","docs","results","db","findGlobalVersions","result","version","globalType","hooks","beforeRead","hook","context","doc","collection","draft","undefined","query"],"mappings":"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"}

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,WAAW,EAAE,MAAM,4CAA4C,CAAA;AAC7E,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;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,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,YAAY,CAAA;IACvB,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEnD,eAAO,MAAM,qBAAqB,GAAU,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,QAChE,SAAS,KACd,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAqJ1B,CAAA"}
+{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../../../src/globals/operations/findVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAA;AAC7E,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;AAc/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,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,KAAK,CAAC,EAAE,KAAK,CAAA;CACd,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAA;AAEnD,eAAO,MAAM,qBAAqB,GAAU,CAAC,SAAS,eAAe,CAAC,CAAC,CAAC,QAChE,SAAS,KACd,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CA8J1B,CAAA"}

package/dist/globals/operations/findVersions.js

@@ -1,8 +1,10 @@
 import { executeAccess } from '../../auth/executeAccess.js';
+import { assertBranchReadable } from '../../branching/assertBranchReadable.js';
 import { combineQueries } from '../../database/combineQueries.js';
 import { validateQueryPaths } from '../../database/queryValidation/validateQueryPaths.js';
+import { validateSortQuery } from '../../database/queryValidation/validateSortQuery.js';
+import { sanitizeWhereQuery } from '../../database/sanitizeWhereQuery.js';
 import { afterRead } from '../../fields/hooks/afterRead/index.js';
-import { killTransaction } from '../../utilities/killTransaction.js';
 import { resolveSelect } from '../../utilities/resolveSelect.js';
 import { sanitizeInternalFields } from '../../utilities/sanitizeInternalFields.js';
 import { sanitizeSelect } from '../../utilities/sanitizeSelect.js';
@@ -11,117 +13,131 @@ export const findVersionsOperation = async (args)=>{
     const { depth, globalConfig, limit, overrideAccess, page, pagination = true, populate, select: incomingSelect, showHiddenFields, sort, where } = args;
     const req = args.req;
     const { fallbackLocale, locale, payload } = req;
-    const versionFields = buildVersionGlobalFields(payload.config, globalConfig, true);
-    try {
-        // /////////////////////////////////////
-        // Access
-        // /////////////////////////////////////
-        const accessResults = !overrideAccess ? await executeAccess({
+    if (!overrideAccess) {
+        await assertBranchReadable({
+            globalSlug: globalConfig.slug,
             req
-        }, globalConfig.access.readVersions) : true;
-        await validateQueryPaths({
-            globalConfig,
-            overrideAccess: overrideAccess,
-            req,
-            versionFields,
-            where: where
-        });
-        const fullWhere = combineQueries(where, accessResults);
-        const select = sanitizeSelect({
-            fields: buildVersionGlobalFields(payload.config, globalConfig, true),
-            select: resolveSelect({
-                config: globalConfig.select,
-                operation: 'read',
-                req,
-                select: incomingSelect
-            }),
-            versions: true
         });
-        // /////////////////////////////////////
-        // Find
-        // /////////////////////////////////////
-        const usePagination = pagination && limit !== 0;
-        const sanitizedLimit = limit ?? (usePagination ? 10 : 0);
-        const sanitizedPage = page || 1;
-        const paginatedDocs = await payload.db.findGlobalVersions({
-            global: globalConfig.slug,
-            limit: sanitizedLimit,
-            locale: locale,
-            page: sanitizedPage,
-            pagination,
+    }
+    const versionFields = buildVersionGlobalFields(payload.config, globalConfig, true);
+    // /////////////////////////////////////
+    // Access
+    // /////////////////////////////////////
+    const accessResults = !overrideAccess ? await executeAccess({
+        slug: globalConfig.slug,
+        req
+    }, globalConfig.access.readVersions) : true;
+    await validateQueryPaths({
+        globalConfig,
+        overrideAccess: overrideAccess,
+        req,
+        versionFields,
+        where: where
+    });
+    await validateSortQuery({
+        globalConfig,
+        overrideAccess: overrideAccess,
+        req,
+        sort,
+        versionFields
+    });
+    const fullWhere = combineQueries(where, accessResults);
+    sanitizeWhereQuery({
+        fields: versionFields,
+        payload,
+        where: fullWhere
+    });
+    const select = sanitizeSelect({
+        fields: buildVersionGlobalFields(payload.config, globalConfig, true),
+        select: resolveSelect({
+            config: globalConfig.select,
+            operation: 'read',
             req,
-            select,
-            sort,
-            where: fullWhere
-        });
-        // /////////////////////////////////////
-        // afterRead - Fields
-        // /////////////////////////////////////
-        let result = {
-            ...paginatedDocs,
-            docs: await Promise.all(paginatedDocs.docs.map(async (data)=>{
-                if (!data.version) {
-                    // Fallback if not selected
-                    ;
-                    data.version = {};
-                }
-                return {
-                    ...data,
-                    version: await afterRead({
-                        collection: null,
-                        context: req.context,
-                        depth: depth,
-                        doc: {
-                            ...data.version,
-                            // Patch globalType onto version doc
-                            globalType: globalConfig.slug
-                        },
-                        draft: undefined,
-                        fallbackLocale: fallbackLocale,
-                        findMany: true,
-                        global: globalConfig,
-                        locale: locale,
-                        overrideAccess: overrideAccess,
-                        populate,
-                        req,
-                        select,
-                        showHiddenFields: showHiddenFields
-                    })
-                };
-            }))
-        };
-        // /////////////////////////////////////
-        // afterRead - Global
-        // /////////////////////////////////////
-        if (globalConfig.hooks?.afterRead?.length) {
-            result.docs = await Promise.all(result.docs.map(async (doc)=>{
-                const docRef = doc;
-                for (const hook of globalConfig.hooks.afterRead){
-                    docRef.version = await hook({
-                        context: req.context,
-                        doc: doc.version,
-                        findMany: true,
-                        global: globalConfig,
-                        overrideAccess,
-                        query: fullWhere,
-                        req
-                    }) || doc.version;
-                }
-                return docRef;
-            }));
-        }
-        // /////////////////////////////////////
-        // Return results
-        // /////////////////////////////////////
-        result = {
-            ...result,
-            docs: result.docs.map((doc)=>sanitizeInternalFields(doc))
-        };
-        return result;
-    } catch (error) {
-        await killTransaction(req);
-        throw error;
+            select: incomingSelect
+        }),
+        versions: true
+    });
+    // /////////////////////////////////////
+    // Find
+    // /////////////////////////////////////
+    const usePagination = pagination && limit !== 0;
+    const sanitizedLimit = limit ?? (usePagination ? 10 : 0);
+    const sanitizedPage = page || 1;
+    const paginatedDocs = await payload.db.findGlobalVersions({
+        global: globalConfig.slug,
+        limit: sanitizedLimit,
+        locale: locale,
+        page: sanitizedPage,
+        pagination,
+        req,
+        select,
+        sort,
+        where: fullWhere
+    });
+    // /////////////////////////////////////
+    // afterRead - Fields
+    // /////////////////////////////////////
+    let result = {
+        ...paginatedDocs,
+        docs: await Promise.all(paginatedDocs.docs.map(async (data)=>{
+            if (!data.version) {
+                // Fallback if not selected
+                ;
+                data.version = {};
+            }
+            return {
+                ...data,
+                version: await afterRead({
+                    collection: null,
+                    context: req.context,
+                    depth: depth,
+                    doc: {
+                        ...data.version,
+                        // Patch globalType onto version doc
+                        globalType: globalConfig.slug
+                    },
+                    draft: undefined,
+                    fallbackLocale: fallbackLocale,
+                    findMany: true,
+                    global: globalConfig,
+                    locale: locale,
+                    overrideAccess: overrideAccess,
+                    populate,
+                    req,
+                    select,
+                    showHiddenFields: showHiddenFields
+                })
+            };
+        }))
+    };
+    // /////////////////////////////////////
+    // afterRead - Global
+    // /////////////////////////////////////
+    if (globalConfig.hooks?.afterRead?.length) {
+        result.docs = await Promise.all(result.docs.map(async (doc)=>{
+            const docRef = doc;
+            for (const hook of globalConfig.hooks.afterRead){
+                docRef.version = await hook({
+                    context: req.context,
+                    doc: doc.version,
+                    findMany: true,
+                    global: globalConfig,
+                    overrideAccess,
+                    query: fullWhere,
+                    req
+                }) || doc.version;
+            }
+            return docRef;
+        }));
     }
+    // /////////////////////////////////////
+    // Return results
+    // /////////////////////////////////////
+    result = {
+        ...result,
+        docs: result.docs.map((doc)=>sanitizeInternalFields(doc))
+    };
+    return result;
 };
 
 //# sourceMappingURL=findVersions.js.map