@payloadcms/db-mongodb 3.26.0-canary.bbb3083 → 3.27.0-canary.ecc3f49

package/dist/queries/buildSearchParams.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildSearchParams.ts"],"sourcesContent":["import type { FlattenedField, Operator, PathToQuery, Payload } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { getLocalizedPaths } from 'payload'\nimport { validOperatorSet } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { operatorMap } from './operatorMap.js'\nimport { sanitizeQueryValue } from './sanitizeQueryValue.js'\n\ntype SearchParam = {\n  path?: string\n  rawQuery?: unknown\n  value?: unknown\n}\n\nconst subQueryOptions = {\n  lean: true,\n  limit: 50,\n}\n\n/**\n * Convert the Payload key / value / operator into a MongoDB query\n */\nexport async function buildSearchParam({\n  collectionSlug,\n  fields,\n  globalSlug,\n  incomingPath,\n  locale,\n  operator,\n  parentIsLocalized,\n  payload,\n  val,\n}: {\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  incomingPath: string\n  locale?: string\n  operator: string\n  parentIsLocalized: boolean\n  payload: Payload\n  val: unknown\n}): Promise<SearchParam> {\n  // Replace GraphQL nested field double underscore formatting\n  let sanitizedPath = incomingPath.replace(/__/g, '.')\n  if (sanitizedPath === 'id') {\n    sanitizedPath = '_id'\n  }\n\n  let paths: PathToQuery[] = []\n\n  let hasCustomID = false\n\n  if (sanitizedPath === '_id') {\n    const customIDFieldType = payload.collections[collectionSlug]?.customIDType\n\n    let idFieldType: 'number' | 'text' = 'text'\n\n    if (customIDFieldType) {\n      idFieldType = customIDFieldType\n      hasCustomID = true\n    }\n\n    paths.push({\n      collectionSlug,\n      complete: true,\n      field: {\n        name: 'id',\n        type: idFieldType,\n      } as FlattenedField,\n      parentIsLocalized,\n      path: '_id',\n    })\n  } else {\n    paths = getLocalizedPaths({\n      collectionSlug,\n      fields,\n      globalSlug,\n      incomingPath: sanitizedPath,\n      locale,\n      parentIsLocalized,\n      payload,\n    })\n  }\n\n  const [{ field, path }] = paths\n  if (path) {\n    const sanitizedQueryValue = sanitizeQueryValue({\n      field,\n      hasCustomID,\n      locale,\n      operator,\n      parentIsLocalized,\n      path,\n      payload,\n      val,\n    })\n\n    if (!sanitizedQueryValue) {\n      return undefined\n    }\n\n    const { operator: formattedOperator, rawQuery, val: formattedValue } = sanitizedQueryValue\n\n    if (rawQuery) {\n      return { value: rawQuery }\n    }\n\n    // If there are multiple collections to search through,\n    // Recursively build up a list of query constraints\n    if (paths.length > 1) {\n      // Remove top collection and reverse array\n      // to work backwards from top\n      const pathsToQuery = paths.slice(1).reverse()\n\n      const initialRelationshipQuery = {\n        value: {},\n      } as SearchParam\n\n      const relationshipQuery = await pathsToQuery.reduce(\n        async (priorQuery, { collectionSlug: slug, path: subPath }, i) => {\n          const priorQueryResult = await priorQuery\n\n          const SubModel = (payload.db as MongooseAdapter).collections[slug]\n\n          // On the \"deepest\" collection,\n          // Search on the value passed through the query\n          if (i === 0) {\n            const subQuery = await SubModel.buildQuery({\n              locale,\n              payload,\n              where: {\n                [subPath]: {\n                  [formattedOperator]: val,\n                },\n              },\n            })\n\n            const result = await SubModel.find(subQuery, subQueryOptions)\n\n            const $in: unknown[] = []\n\n            result.forEach((doc) => {\n              const stringID = doc._id.toString()\n              $in.push(stringID)\n\n              if (Types.ObjectId.isValid(stringID)) {\n                $in.push(doc._id)\n              }\n            })\n\n            if (pathsToQuery.length === 1) {\n              return {\n                path,\n                value: { $in },\n              }\n            }\n\n            const nextSubPath = pathsToQuery[i + 1].path\n\n            return {\n              value: { [nextSubPath]: { $in } },\n            }\n          }\n\n          const subQuery = priorQueryResult.value\n          const result = await SubModel.find(subQuery, subQueryOptions)\n\n          const $in = result.map((doc) => doc._id)\n\n          // If it is the last recursion\n          // then pass through the search param\n          if (i + 1 === pathsToQuery.length) {\n            return {\n              path,\n              value: { $in },\n            }\n          }\n\n          return {\n            value: {\n              _id: { $in },\n            },\n          }\n        },\n        Promise.resolve(initialRelationshipQuery),\n      )\n\n      return relationshipQuery\n    }\n\n    if (formattedOperator && validOperatorSet.has(formattedOperator as Operator)) {\n      const operatorKey = operatorMap[formattedOperator]\n\n      if (field.type === 'relationship' || field.type === 'upload') {\n        let hasNumberIDRelation\n        let multiIDCondition = '$or'\n        if (operatorKey === '$ne') {\n          multiIDCondition = '$and'\n        }\n\n        const result = {\n          value: {\n            [multiIDCondition]: [{ [path]: { [operatorKey]: formattedValue } }],\n          },\n        }\n\n        if (typeof formattedValue === 'string') {\n          if (Types.ObjectId.isValid(formattedValue)) {\n            result.value[multiIDCondition].push({\n              [path]: { [operatorKey]: new Types.ObjectId(formattedValue) },\n            })\n          } else {\n            ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach(\n              (relationTo) => {\n                const isRelatedToCustomNumberID =\n                  payload.collections[relationTo]?.customIDType === 'number'\n\n                if (isRelatedToCustomNumberID) {\n                  hasNumberIDRelation = true\n                }\n              },\n            )\n\n            if (hasNumberIDRelation) {\n              result.value[multiIDCondition].push({\n                [path]: { [operatorKey]: parseFloat(formattedValue) },\n              })\n            }\n          }\n        }\n\n        if (result.value[multiIDCondition].length > 1) {\n          return result\n        }\n      }\n\n      if (formattedOperator === 'like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $options: 'i',\n                $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      if (formattedOperator === 'not_like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $not: {\n                  $options: 'i',\n                  $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n                },\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      // Some operators like 'near' need to define a full query\n      // so if there is no operator key, just return the value\n      if (!operatorKey) {\n        return {\n          path,\n          value: formattedValue,\n        }\n      }\n\n      return {\n        path,\n        value: { [operatorKey]: formattedValue },\n      }\n    }\n  }\n  return undefined\n}\n"],"names":["Types","getLocalizedPaths","validOperatorSet","operatorMap","sanitizeQueryValue","subQueryOptions","lean","limit","buildSearchParam","collectionSlug","fields","globalSlug","incomingPath","locale","operator","parentIsLocalized","payload","val","sanitizedPath","replace","paths","hasCustomID","customIDFieldType","collections","customIDType","idFieldType","push","complete","field","name","type","path","sanitizedQueryValue","undefined","formattedOperator","rawQuery","formattedValue","value","length","pathsToQuery","slice","reverse","initialRelationshipQuery","relationshipQuery","reduce","priorQuery","slug","subPath","i","priorQueryResult","SubModel","db","subQuery","buildQuery","where","result","find","$in","forEach","doc","stringID","_id","toString","ObjectId","isValid","nextSubPath","map","Promise","resolve","has","operatorKey","hasNumberIDRelation","multiIDCondition","Array","isArray","relationTo","isRelatedToCustomNumberID","parseFloat","words","split","$and","word","$options","$regex","$not"],"mappings":"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"}
+{"version":3,"sources":["../../src/queries/buildSearchParams.ts"],"sourcesContent":["import type { FilterQuery } from 'mongoose'\nimport type { FlattenedField, Operator, PathToQuery, Payload } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { APIError, getLocalizedPaths } from 'payload'\nimport { validOperatorSet } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\nimport type { OperatorMapKey } from './operatorMap.js'\n\nimport { getCollection } from '../utilities/getEntity.js'\nimport { operatorMap } from './operatorMap.js'\nimport { sanitizeQueryValue } from './sanitizeQueryValue.js'\n\ntype SearchParam = {\n  path?: string\n  rawQuery?: unknown\n  value?: unknown\n}\n\nconst subQueryOptions = {\n  lean: true,\n  limit: 50,\n}\n\n/**\n * Convert the Payload key / value / operator into a MongoDB query\n */\nexport async function buildSearchParam({\n  collectionSlug,\n  fields,\n  globalSlug,\n  incomingPath,\n  locale,\n  operator,\n  parentIsLocalized,\n  payload,\n  val,\n}: {\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  incomingPath: string\n  locale?: string\n  operator: string\n  parentIsLocalized: boolean\n  payload: Payload\n  val: unknown\n}): Promise<SearchParam | undefined> {\n  // Replace GraphQL nested field double underscore formatting\n  let sanitizedPath = incomingPath.replace(/__/g, '.')\n  if (sanitizedPath === 'id') {\n    sanitizedPath = '_id'\n  }\n\n  let paths: PathToQuery[] = []\n\n  let hasCustomID = false\n\n  if (sanitizedPath === '_id') {\n    const customIDFieldType = collectionSlug\n      ? payload.collections[collectionSlug]?.customIDType\n      : undefined\n\n    let idFieldType: 'number' | 'text' = 'text'\n\n    if (customIDFieldType) {\n      idFieldType = customIDFieldType\n      hasCustomID = true\n    }\n\n    paths.push({\n      collectionSlug,\n      complete: true,\n      field: {\n        name: 'id',\n        type: idFieldType,\n      } as FlattenedField,\n      parentIsLocalized: parentIsLocalized ?? false,\n      path: '_id',\n    })\n  } else {\n    paths = getLocalizedPaths({\n      collectionSlug,\n      fields,\n      globalSlug,\n      incomingPath: sanitizedPath,\n      locale,\n      parentIsLocalized,\n      payload,\n    })\n  }\n\n  if (!paths[0]) {\n    return undefined\n  }\n\n  const [{ field, path }] = paths\n  if (path) {\n    const sanitizedQueryValue = sanitizeQueryValue({\n      field,\n      hasCustomID,\n      locale,\n      operator,\n      parentIsLocalized,\n      path,\n      payload,\n      val,\n    })\n\n    if (!sanitizedQueryValue) {\n      return undefined\n    }\n\n    const { operator: formattedOperator, rawQuery, val: formattedValue } = sanitizedQueryValue\n\n    if (rawQuery) {\n      return { value: rawQuery }\n    }\n\n    if (!formattedOperator) {\n      return undefined\n    }\n\n    // If there are multiple collections to search through,\n    // Recursively build up a list of query constraints\n    if (paths.length > 1) {\n      // Remove top collection and reverse array\n      // to work backwards from top\n      const pathsToQuery = paths.slice(1).reverse()\n\n      let relationshipQuery: SearchParam = {\n        value: {},\n      }\n\n      for (const [i, { collectionSlug, path: subPath }] of pathsToQuery.entries()) {\n        if (!collectionSlug) {\n          throw new APIError(`Collection with the slug ${collectionSlug} was not found.`)\n        }\n\n        const { Model: SubModel } = getCollection({\n          adapter: payload.db as MongooseAdapter,\n          collectionSlug,\n        })\n\n        if (i === 0) {\n          const subQuery = await SubModel.buildQuery({\n            locale,\n            payload,\n            where: {\n              [subPath]: {\n                [formattedOperator]: val,\n              },\n            },\n          })\n\n          const result = await SubModel.find(subQuery, subQueryOptions)\n\n          const $in: unknown[] = []\n\n          result.forEach((doc) => {\n            const stringID = doc._id.toString()\n            $in.push(stringID)\n\n            if (Types.ObjectId.isValid(stringID)) {\n              $in.push(doc._id)\n            }\n          })\n\n          if (pathsToQuery.length === 1) {\n            return {\n              path,\n              value: { $in },\n            }\n          }\n\n          const nextSubPath = pathsToQuery[i + 1]?.path\n\n          if (nextSubPath) {\n            relationshipQuery = { value: { [nextSubPath]: $in } }\n          }\n\n          continue\n        }\n\n        const subQuery = relationshipQuery.value as FilterQuery<any>\n        const result = await SubModel.find(subQuery, subQueryOptions)\n\n        const $in = result.map((doc) => doc._id)\n\n        // If it is the last recursion\n        // then pass through the search param\n        if (i + 1 === pathsToQuery.length) {\n          relationshipQuery = {\n            path,\n            value: { $in },\n          }\n        } else {\n          relationshipQuery = {\n            value: {\n              _id: { $in },\n            },\n          }\n        }\n      }\n\n      return relationshipQuery\n    }\n\n    if (formattedOperator && validOperatorSet.has(formattedOperator as Operator)) {\n      const operatorKey = operatorMap[formattedOperator as OperatorMapKey]\n\n      if (field.type === 'relationship' || field.type === 'upload') {\n        let hasNumberIDRelation\n        let multiIDCondition = '$or'\n        if (operatorKey === '$ne') {\n          multiIDCondition = '$and'\n        }\n\n        const result = {\n          value: {\n            [multiIDCondition]: [{ [path]: { [operatorKey]: formattedValue } }],\n          },\n        }\n\n        if (typeof formattedValue === 'string') {\n          if (Types.ObjectId.isValid(formattedValue)) {\n            result.value[multiIDCondition]?.push({\n              [path]: { [operatorKey]: new Types.ObjectId(formattedValue) },\n            })\n          } else {\n            ;(Array.isArray(field.relationTo) ? field.relationTo : [field.relationTo]).forEach(\n              (relationTo) => {\n                const isRelatedToCustomNumberID =\n                  payload.collections[relationTo]?.customIDType === 'number'\n\n                if (isRelatedToCustomNumberID) {\n                  hasNumberIDRelation = true\n                }\n              },\n            )\n\n            if (hasNumberIDRelation) {\n              result.value[multiIDCondition]?.push({\n                [path]: { [operatorKey]: parseFloat(formattedValue) },\n              })\n            }\n          }\n        }\n\n        const length = result.value[multiIDCondition]?.length\n\n        if (typeof length === 'number' && length > 1) {\n          return result\n        }\n      }\n\n      if (formattedOperator === 'like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $options: 'i',\n                $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      if (formattedOperator === 'not_like' && typeof formattedValue === 'string') {\n        const words = formattedValue.split(' ')\n\n        const result = {\n          value: {\n            $and: words.map((word) => ({\n              [path]: {\n                $not: {\n                  $options: 'i',\n                  $regex: word.replace(/[\\\\^$*+?.()|[\\]{}]/g, '\\\\$&'),\n                },\n              },\n            })),\n          },\n        }\n\n        return result\n      }\n\n      // Some operators like 'near' need to define a full query\n      // so if there is no operator key, just return the value\n      if (!operatorKey) {\n        return {\n          path,\n          value: formattedValue,\n        }\n      }\n\n      return {\n        path,\n        value: { [operatorKey]: formattedValue },\n      }\n    }\n  }\n  return undefined\n}\n"],"names":["Types","APIError","getLocalizedPaths","validOperatorSet","getCollection","operatorMap","sanitizeQueryValue","subQueryOptions","lean","limit","buildSearchParam","collectionSlug","fields","globalSlug","incomingPath","locale","operator","parentIsLocalized","payload","val","sanitizedPath","replace","paths","hasCustomID","customIDFieldType","collections","customIDType","undefined","idFieldType","push","complete","field","name","type","path","sanitizedQueryValue","formattedOperator","rawQuery","formattedValue","value","length","pathsToQuery","slice","reverse","relationshipQuery","i","subPath","entries","Model","SubModel","adapter","db","subQuery","buildQuery","where","result","find","$in","forEach","doc","stringID","_id","toString","ObjectId","isValid","nextSubPath","map","has","operatorKey","hasNumberIDRelation","multiIDCondition","Array","isArray","relationTo","isRelatedToCustomNumberID","parseFloat","words","split","$and","word","$options","$regex","$not"],"mappings":"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"}

package/dist/queries/buildSortParam.d.ts

@@ -1,9 +1,8 @@
-import type { PaginateOptions } from 'mongoose';
 import type { FlattenedField, SanitizedConfig, Sort } from 'payload';
 type Args = {
     config: SanitizedConfig;
     fields: FlattenedField[];
-    locale: string;
+    locale?: string;
     parentIsLocalized?: boolean;
     sort: Sort;
     timestamps: boolean;
@@ -13,6 +12,6 @@ export type SortArgs = {
     property: string;
 }[];
 export type SortDirection = 'asc' | 'desc';
-export declare const buildSortParam: ({ config, fields, locale, parentIsLocalized, sort, timestamps, }: Args) => PaginateOptions["sort"];
+export declare const buildSortParam: ({ config, fields, locale, parentIsLocalized, sort, timestamps, }: Args) => Record<string, string>;
 export {};
 //# sourceMappingURL=buildSortParam.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildSortParam.d.ts","sourceRoot":"","sources":["../../src/queries/buildSortParam.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,UAAU,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAIpE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,IAAI,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,EAAE,CAAA;AAEH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAA;AAE1C,eAAO,MAAM,cAAc,qEAOxB,IAAI,KAAG,eAAe,CAAC,MAAM,CAuC/B,CAAA"}
+{"version":3,"file":"buildSortParam.d.ts","sourceRoot":"","sources":["../../src/queries/buildSortParam.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAIpE,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,EAAE,IAAI,CAAA;IACV,UAAU,EAAE,OAAO,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,EAAE,CAAA;AAEH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAA;AAE1C,eAAO,MAAM,cAAc,qEAOxB,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAuC9B,CAAA"}

package/dist/queries/buildSortParam.js

@@ -1,5 +1,5 @@
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js';
-export const buildSortParam = ({ config, fields, locale, parentIsLocalized, sort, timestamps })=>{
+export const buildSortParam = ({ config, fields, locale, parentIsLocalized = false, sort, timestamps })=>{
     if (!sort) {
         if (timestamps) {
             sort = '-createdAt';

package/dist/queries/buildSortParam.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildSortParam.ts"],"sourcesContent":["import type { PaginateOptions } from 'mongoose'\nimport type { FlattenedField, SanitizedConfig, Sort } from 'payload'\n\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\ntype Args = {\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale: string\n  parentIsLocalized?: boolean\n  sort: Sort\n  timestamps: boolean\n}\n\nexport type SortArgs = {\n  direction: SortDirection\n  property: string\n}[]\n\nexport type SortDirection = 'asc' | 'desc'\n\nexport const buildSortParam = ({\n  config,\n  fields,\n  locale,\n  parentIsLocalized,\n  sort,\n  timestamps,\n}: Args): PaginateOptions['sort'] => {\n  if (!sort) {\n    if (timestamps) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  const sorting = sort.reduce<PaginateOptions['sort']>((acc, item) => {\n    let sortProperty: string\n    let sortDirection: SortDirection\n    if (item.indexOf('-') === 0) {\n      sortProperty = item.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = item\n      sortDirection = 'asc'\n    }\n    if (sortProperty === 'id') {\n      acc['_id'] = sortDirection\n      return acc\n    }\n    const localizedProperty = getLocalizedSortProperty({\n      config,\n      fields,\n      locale,\n      parentIsLocalized,\n      segments: sortProperty.split('.'),\n    })\n    acc[localizedProperty] = sortDirection\n    return acc\n  }, {})\n\n  return sorting\n}\n"],"names":["getLocalizedSortProperty","buildSortParam","config","fields","locale","parentIsLocalized","sort","timestamps","sorting","reduce","acc","item","sortProperty","sortDirection","indexOf","substring","localizedProperty","segments","split"],"mappings":"AAGA,SAASA,wBAAwB,QAAQ,gCAA+B;AAkBxE,OAAO,MAAMC,iBAAiB,CAAC,EAC7BC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,iBAAiB,EACjBC,IAAI,EACJC,UAAU,EACL;IACL,IAAI,CAACD,MAAM;QACT,IAAIC,YAAY;YACdD,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,MAAME,UAAUF,KAAKG,MAAM,CAA0B,CAACC,KAAKC;QACzD,IAAIC;QACJ,IAAIC;QACJ,IAAIF,KAAKG,OAAO,CAAC,SAAS,GAAG;YAC3BF,eAAeD,KAAKI,SAAS,CAAC;YAC9BF,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAID,iBAAiB,MAAM;YACzBF,GAAG,CAAC,MAAM,GAAGG;YACb,OAAOH;QACT;QACA,MAAMM,oBAAoBhB,yBAAyB;YACjDE;YACAC;YACAC;YACAC;YACAY,UAAUL,aAAaM,KAAK,CAAC;QAC/B;QACAR,GAAG,CAACM,kBAAkB,GAAGH;QACzB,OAAOH;IACT,GAAG,CAAC;IAEJ,OAAOF;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildSortParam.ts"],"sourcesContent":["import type { FlattenedField, SanitizedConfig, Sort } from 'payload'\n\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\ntype Args = {\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale?: string\n  parentIsLocalized?: boolean\n  sort: Sort\n  timestamps: boolean\n}\n\nexport type SortArgs = {\n  direction: SortDirection\n  property: string\n}[]\n\nexport type SortDirection = 'asc' | 'desc'\n\nexport const buildSortParam = ({\n  config,\n  fields,\n  locale,\n  parentIsLocalized = false,\n  sort,\n  timestamps,\n}: Args): Record<string, string> => {\n  if (!sort) {\n    if (timestamps) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  const sorting = sort.reduce<Record<string, string>>((acc, item) => {\n    let sortProperty: string\n    let sortDirection: SortDirection\n    if (item.indexOf('-') === 0) {\n      sortProperty = item.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = item\n      sortDirection = 'asc'\n    }\n    if (sortProperty === 'id') {\n      acc['_id'] = sortDirection\n      return acc\n    }\n    const localizedProperty = getLocalizedSortProperty({\n      config,\n      fields,\n      locale,\n      parentIsLocalized,\n      segments: sortProperty.split('.'),\n    })\n    acc[localizedProperty] = sortDirection\n    return acc\n  }, {})\n\n  return sorting\n}\n"],"names":["getLocalizedSortProperty","buildSortParam","config","fields","locale","parentIsLocalized","sort","timestamps","sorting","reduce","acc","item","sortProperty","sortDirection","indexOf","substring","localizedProperty","segments","split"],"mappings":"AAEA,SAASA,wBAAwB,QAAQ,gCAA+B;AAkBxE,OAAO,MAAMC,iBAAiB,CAAC,EAC7BC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,oBAAoB,KAAK,EACzBC,IAAI,EACJC,UAAU,EACL;IACL,IAAI,CAACD,MAAM;QACT,IAAIC,YAAY;YACdD,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,MAAME,UAAUF,KAAKG,MAAM,CAAyB,CAACC,KAAKC;QACxD,IAAIC;QACJ,IAAIC;QACJ,IAAIF,KAAKG,OAAO,CAAC,SAAS,GAAG;YAC3BF,eAAeD,KAAKI,SAAS,CAAC;YAC9BF,gBAAgB;QAClB,OAAO;YACLD,eAAeD;YACfE,gBAAgB;QAClB;QACA,IAAID,iBAAiB,MAAM;YACzBF,GAAG,CAAC,MAAM,GAAGG;YACb,OAAOH;QACT;QACA,MAAMM,oBAAoBhB,yBAAyB;YACjDE;YACAC;YACAC;YACAC;YACAY,UAAUL,aAAaM,KAAK,CAAC;QAC/B;QACAR,GAAG,CAACM,kBAAkB,GAAGH;QACzB,OAAOH;IACT,GAAG,CAAC;IAEJ,OAAOF;AACT,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"getBuildQueryPlugin.d.ts","sourceRoot":"","sources":["../../src/queries/getBuildQueryPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAM7D,KAAK,uBAAuB,GAAG;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,cAAc,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAKD,eAAO,MAAM,mBAAmB,yCAG7B,uBAAuB,0BAwCzB,CAAA"}
+{"version":3,"file":"getBuildQueryPlugin.d.ts","sourceRoot":"","sources":["../../src/queries/getBuildQueryPlugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAM7D,KAAK,uBAAuB,GAAG;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,cAAc,EAAE,CAAA;CAClC,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAKD,eAAO,MAAM,mBAAmB,yCAG7B,uBAAuB,cACiB,GAAG,SAmD7C,CAAA"}

package/dist/queries/getBuildQueryPlugin.js

@@ -1,4 +1,4 @@
-import { QueryError } from 'payload';
+import { APIError } from 'payload';
 import { parseParams } from './parseParams.js';
 // This plugin asynchronously builds a list of Mongoose query constraints
 // which can then be used in subsequent Mongoose queries.
@@ -7,18 +7,28 @@ export const getBuildQueryPlugin = ({ collectionSlug, versionsFields } = {})=>{
     return function buildQueryPlugin(schema) {
         const modifiedSchema = schema;
         async function schemaBuildQuery({ globalSlug, locale, payload, where }) {
-            let fields = versionsFields;
-            if (!fields) {
+            let fields = null;
+            if (versionsFields) {
+                fields = versionsFields;
+            } else {
                 if (globalSlug) {
                     const globalConfig = payload.globals.config.find(({ slug })=>slug === globalSlug);
+                    if (!globalConfig) {
+                        throw new APIError(`Global with the slug ${globalSlug} was not found`);
+                    }
                     fields = globalConfig.flattenedFields;
                 }
                 if (collectionSlug) {
-                    const collectionConfig = payload.collections[collectionSlug].config;
+                    const collectionConfig = payload.collections[collectionSlug]?.config;
+                    if (!collectionConfig) {
+                        throw new APIError(`Collection with the slug ${globalSlug} was not found`);
+                    }
                     fields = collectionConfig.flattenedFields;
                 }
             }
-            const errors = [];
+            if (fields === null) {
+                throw new APIError('Fields are not initialized.');
+            }
             const result = await parseParams({
                 collectionSlug,
                 fields,
@@ -28,9 +38,6 @@ export const getBuildQueryPlugin = ({ collectionSlug, versionsFields } = {})=>{
                 payload,
                 where
             });
-            if (errors.length > 0) {
-                throw new QueryError(errors);
-            }
             return result;
         }
         modifiedSchema.statics.buildQuery = schemaBuildQuery;

package/dist/queries/getBuildQueryPlugin.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/getBuildQueryPlugin.ts"],"sourcesContent":["import type { FlattenedField, Payload, Where } from 'payload'\n\nimport { QueryError } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\ntype GetBuildQueryPluginArgs = {\n  collectionSlug?: string\n  versionsFields?: FlattenedField[]\n}\n\nexport type BuildQueryArgs = {\n  globalSlug?: string\n  locale?: string\n  payload: Payload\n  where: Where\n}\n\n// This plugin asynchronously builds a list of Mongoose query constraints\n// which can then be used in subsequent Mongoose queries.\n// Deprecated in favor of using simpler buildQuery directly\nexport const getBuildQueryPlugin = ({\n  collectionSlug,\n  versionsFields,\n}: GetBuildQueryPluginArgs = {}) => {\n  return function buildQueryPlugin(schema) {\n    const modifiedSchema = schema\n    async function schemaBuildQuery({\n      globalSlug,\n      locale,\n      payload,\n      where,\n    }: BuildQueryArgs): Promise<Record<string, unknown>> {\n      let fields = versionsFields\n      if (!fields) {\n        if (globalSlug) {\n          const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n          fields = globalConfig.flattenedFields\n        }\n        if (collectionSlug) {\n          const collectionConfig = payload.collections[collectionSlug].config\n          fields = collectionConfig.flattenedFields\n        }\n      }\n\n      const errors = []\n      const result = await parseParams({\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        parentIsLocalized: false,\n        payload,\n        where,\n      })\n\n      if (errors.length > 0) {\n        throw new QueryError(errors)\n      }\n\n      return result\n    }\n    modifiedSchema.statics.buildQuery = schemaBuildQuery\n  }\n}\n"],"names":["QueryError","parseParams","getBuildQueryPlugin","collectionSlug","versionsFields","buildQueryPlugin","schema","modifiedSchema","schemaBuildQuery","globalSlug","locale","payload","where","fields","globalConfig","globals","config","find","slug","flattenedFields","collectionConfig","collections","errors","result","parentIsLocalized","length","statics","buildQuery"],"mappings":"AAEA,SAASA,UAAU,QAAQ,UAAS;AAEpC,SAASC,WAAW,QAAQ,mBAAkB;AAc9C,yEAAyE;AACzE,yDAAyD;AACzD,2DAA2D;AAC3D,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,cAAc,EACdC,cAAc,EACU,GAAG,CAAC,CAAC;IAC7B,OAAO,SAASC,iBAAiBC,MAAM;QACrC,MAAMC,iBAAiBD;QACvB,eAAeE,iBAAiB,EAC9BC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,KAAK,EACU;YACf,IAAIC,SAAST;YACb,IAAI,CAACS,QAAQ;gBACX,IAAIJ,YAAY;oBACd,MAAMK,eAAeH,QAAQI,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAAST;oBACxEI,SAASC,aAAaK,eAAe;gBACvC;gBACA,IAAIhB,gBAAgB;oBAClB,MAAMiB,mBAAmBT,QAAQU,WAAW,CAAClB,eAAe,CAACa,MAAM;oBACnEH,SAASO,iBAAiBD,eAAe;gBAC3C;YACF;YAEA,MAAMG,SAAS,EAAE;YACjB,MAAMC,SAAS,MAAMtB,YAAY;gBAC/BE;gBACAU;gBACAJ;gBACAC;gBACAc,mBAAmB;gBACnBb;gBACAC;YACF;YAEA,IAAIU,OAAOG,MAAM,GAAG,GAAG;gBACrB,MAAM,IAAIzB,WAAWsB;YACvB;YAEA,OAAOC;QACT;QACAhB,eAAemB,OAAO,CAACC,UAAU,GAAGnB;IACtC;AACF,EAAC"}
+{"version":3,"sources":["../../src/queries/getBuildQueryPlugin.ts"],"sourcesContent":["import type { FlattenedField, Payload, Where } from 'payload'\n\nimport { APIError } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\ntype GetBuildQueryPluginArgs = {\n  collectionSlug?: string\n  versionsFields?: FlattenedField[]\n}\n\nexport type BuildQueryArgs = {\n  globalSlug?: string\n  locale?: string\n  payload: Payload\n  where: Where\n}\n\n// This plugin asynchronously builds a list of Mongoose query constraints\n// which can then be used in subsequent Mongoose queries.\n// Deprecated in favor of using simpler buildQuery directly\nexport const getBuildQueryPlugin = ({\n  collectionSlug,\n  versionsFields,\n}: GetBuildQueryPluginArgs = {}) => {\n  return function buildQueryPlugin(schema: any) {\n    const modifiedSchema = schema\n    async function schemaBuildQuery({\n      globalSlug,\n      locale,\n      payload,\n      where,\n    }: BuildQueryArgs): Promise<Record<string, unknown>> {\n      let fields: FlattenedField[] | null = null\n\n      if (versionsFields) {\n        fields = versionsFields\n      } else {\n        if (globalSlug) {\n          const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n\n          if (!globalConfig) {\n            throw new APIError(`Global with the slug ${globalSlug} was not found`)\n          }\n\n          fields = globalConfig.flattenedFields\n        }\n        if (collectionSlug) {\n          const collectionConfig = payload.collections[collectionSlug]?.config\n\n          if (!collectionConfig) {\n            throw new APIError(`Collection with the slug ${globalSlug} was not found`)\n          }\n\n          fields = collectionConfig.flattenedFields\n        }\n      }\n\n      if (fields === null) {\n        throw new APIError('Fields are not initialized.')\n      }\n\n      const result = await parseParams({\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        parentIsLocalized: false,\n        payload,\n        where,\n      })\n\n      return result\n    }\n    modifiedSchema.statics.buildQuery = schemaBuildQuery\n  }\n}\n"],"names":["APIError","parseParams","getBuildQueryPlugin","collectionSlug","versionsFields","buildQueryPlugin","schema","modifiedSchema","schemaBuildQuery","globalSlug","locale","payload","where","fields","globalConfig","globals","config","find","slug","flattenedFields","collectionConfig","collections","result","parentIsLocalized","statics","buildQuery"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAElC,SAASC,WAAW,QAAQ,mBAAkB;AAc9C,yEAAyE;AACzE,yDAAyD;AACzD,2DAA2D;AAC3D,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,cAAc,EACdC,cAAc,EACU,GAAG,CAAC,CAAC;IAC7B,OAAO,SAASC,iBAAiBC,MAAW;QAC1C,MAAMC,iBAAiBD;QACvB,eAAeE,iBAAiB,EAC9BC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,KAAK,EACU;YACf,IAAIC,SAAkC;YAEtC,IAAIT,gBAAgB;gBAClBS,SAAST;YACX,OAAO;gBACL,IAAIK,YAAY;oBACd,MAAMK,eAAeH,QAAQI,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAAST;oBAExE,IAAI,CAACK,cAAc;wBACjB,MAAM,IAAId,SAAS,CAAC,qBAAqB,EAAES,WAAW,cAAc,CAAC;oBACvE;oBAEAI,SAASC,aAAaK,eAAe;gBACvC;gBACA,IAAIhB,gBAAgB;oBAClB,MAAMiB,mBAAmBT,QAAQU,WAAW,CAAClB,eAAe,EAAEa;oBAE9D,IAAI,CAACI,kBAAkB;wBACrB,MAAM,IAAIpB,SAAS,CAAC,yBAAyB,EAAES,WAAW,cAAc,CAAC;oBAC3E;oBAEAI,SAASO,iBAAiBD,eAAe;gBAC3C;YACF;YAEA,IAAIN,WAAW,MAAM;gBACnB,MAAM,IAAIb,SAAS;YACrB;YAEA,MAAMsB,SAAS,MAAMrB,YAAY;gBAC/BE;gBACAU;gBACAJ;gBACAC;gBACAa,mBAAmB;gBACnBZ;gBACAC;YACF;YAEA,OAAOU;QACT;QACAf,eAAeiB,OAAO,CAACC,UAAU,GAAGjB;IACtC;AACF,EAAC"}

package/dist/queries/getLocalizedSortProperty.d.ts

@@ -2,7 +2,7 @@ import type { FlattenedField, SanitizedConfig } from 'payload';
 type Args = {
     config: SanitizedConfig;
     fields: FlattenedField[];
-    locale: string;
+    locale?: string;
     parentIsLocalized: boolean;
     result?: string;
     segments: string[];

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

@@ -1 +1 @@
-{"version":3,"file":"getLocalizedSortProperty.d.ts","sourceRoot":"","sources":["../../src/queries/getLocalizedSortProperty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9D,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,iBAAiB,EAAE,OAAO,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,wBAAwB,uGAOlC,IAAI,KAAG,MA0FT,CAAA"}
+{"version":3,"file":"getLocalizedSortProperty.d.ts","sourceRoot":"","sources":["../../src/queries/getLocalizedSortProperty.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAI9D,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,EAAE,OAAO,CAAA;IAC1B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,EAAE,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,wBAAwB,uGAOlC,IAAI,KAAG,MAiGT,CAAA"}

package/dist/queries/getLocalizedSortProperty.js

@@ -13,7 +13,7 @@ export const getLocalizedSortProperty = ({ config, fields, locale, parentIsLocal
     // Attempt to find a matched field
     const matchedField = fields.find((field)=>fieldAffectsData(field) && field.name === firstSegment);
     if (matchedField && !fieldIsPresentationalOnly(matchedField)) {
-        let nextFields;
+        let nextFields = null;
         let nextParentIsLocalized = parentIsLocalized;
         const remainingSegments = [
             ...segments
@@ -21,10 +21,10 @@ export const getLocalizedSortProperty = ({ config, fields, locale, parentIsLocal
         let localizedSegment = matchedField.name;
         if (fieldShouldBeLocalized({
             field: matchedField,
-            parentIsLocalized
+            parentIsLocalized: parentIsLocalized ?? false
         })) {
             // Check to see if next segment is a locale
-            if (segments.length > 0) {
+            if (segments.length > 0 && remainingSegments[0]) {
                 const nextSegmentIsLocale = config.localization.localeCodes.includes(remainingSegments[0]);
                 // If next segment is locale, remove it from remaining segments
                 // and use it to localize the current segment
@@ -41,13 +41,18 @@ export const getLocalizedSortProperty = ({ config, fields, locale, parentIsLocal
         if (matchedField.type === 'tab' || matchedField.type === 'group' || matchedField.type === 'array') {
             nextFields = matchedField.flattenedFields;
             if (!nextParentIsLocalized) {
-                nextParentIsLocalized = matchedField.localized;
+                nextParentIsLocalized = matchedField.localized ?? false;
             }
         }
         if (matchedField.type === 'blocks') {
             nextFields = (matchedField.blockReferences ?? matchedField.blocks).reduce((flattenedBlockFields, _block)=>{
                 // TODO: iterate over blocks mapped to block slug in v4, or pass through payload.blocks
-                const block = typeof _block === 'string' ? config.blocks.find((b)=>b.slug === _block) : _block;
+                const block = typeof _block === 'string' ? config.blocks?.find((b)=>b.slug === _block) : _block;
+                if (!block) {
+                    return [
+                        ...flattenedBlockFields
+                    ];
+                }
                 return [
                     ...flattenedBlockFields,
                     ...block.flattenedFields.filter((blockField)=>fieldAffectsData(blockField) && blockField.name !== 'blockType' && blockField.name !== 'blockName' || !fieldAffectsData(blockField))
@@ -55,7 +60,7 @@ export const getLocalizedSortProperty = ({ config, fields, locale, parentIsLocal
             }, []);
         }
         const result = incomingResult ? `${incomingResult}.${localizedSegment}` : localizedSegment;
-        if (nextFields) {
+        if (nextFields !== null) {
             return getLocalizedSortProperty({
                 config,
                 fields: nextFields,

package/dist/queries/getLocalizedSortProperty.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/getLocalizedSortProperty.ts"],"sourcesContent":["import type { FlattenedField, SanitizedConfig } from 'payload'\n\nimport { fieldAffectsData, fieldIsPresentationalOnly, fieldShouldBeLocalized } from 'payload/shared'\n\ntype Args = {\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale: string\n  parentIsLocalized: boolean\n  result?: string\n  segments: string[]\n}\n\nexport const getLocalizedSortProperty = ({\n  config,\n  fields,\n  locale,\n  parentIsLocalized,\n  result: incomingResult,\n  segments: incomingSegments,\n}: Args): string => {\n  // If localization is not enabled, accept exactly\n  // what is sent in\n  if (!config.localization) {\n    return incomingSegments.join('.')\n  }\n\n  const segments = [...incomingSegments]\n\n  // Retrieve first segment, and remove from segments\n  const firstSegment = segments.shift()\n\n  // Attempt to find a matched field\n  const matchedField = fields.find(\n    (field) => fieldAffectsData(field) && field.name === firstSegment,\n  )\n\n  if (matchedField && !fieldIsPresentationalOnly(matchedField)) {\n    let nextFields: FlattenedField[]\n    let nextParentIsLocalized = parentIsLocalized\n    const remainingSegments = [...segments]\n    let localizedSegment = matchedField.name\n\n    if (fieldShouldBeLocalized({ field: matchedField, parentIsLocalized })) {\n      // Check to see if next segment is a locale\n      if (segments.length > 0) {\n        const nextSegmentIsLocale = config.localization.localeCodes.includes(remainingSegments[0])\n\n        // If next segment is locale, remove it from remaining segments\n        // and use it to localize the current segment\n        if (nextSegmentIsLocale) {\n          const nextSegment = remainingSegments.shift()\n          localizedSegment = `${matchedField.name}.${nextSegment}`\n        }\n      } else {\n        // If no more segments, but field is localized, use default locale\n        localizedSegment = `${matchedField.name}.${locale}`\n      }\n    }\n\n    // If there are subfields, pass them through\n    if (\n      matchedField.type === 'tab' ||\n      matchedField.type === 'group' ||\n      matchedField.type === 'array'\n    ) {\n      nextFields = matchedField.flattenedFields\n      if (!nextParentIsLocalized) {\n        nextParentIsLocalized = matchedField.localized\n      }\n    }\n\n    if (matchedField.type === 'blocks') {\n      nextFields = (matchedField.blockReferences ?? matchedField.blocks).reduce(\n        (flattenedBlockFields, _block) => {\n          // TODO: iterate over blocks mapped to block slug in v4, or pass through payload.blocks\n          const block =\n            typeof _block === 'string' ? config.blocks.find((b) => b.slug === _block) : _block\n          return [\n            ...flattenedBlockFields,\n            ...block.flattenedFields.filter(\n              (blockField) =>\n                (fieldAffectsData(blockField) &&\n                  blockField.name !== 'blockType' &&\n                  blockField.name !== 'blockName') ||\n                !fieldAffectsData(blockField),\n            ),\n          ]\n        },\n        [],\n      )\n    }\n\n    const result = incomingResult ? `${incomingResult}.${localizedSegment}` : localizedSegment\n\n    if (nextFields) {\n      return getLocalizedSortProperty({\n        config,\n        fields: nextFields,\n        locale,\n        parentIsLocalized: nextParentIsLocalized,\n        result,\n        segments: remainingSegments,\n      })\n    }\n\n    return result\n  }\n\n  return incomingSegments.join('.')\n}\n"],"names":["fieldAffectsData","fieldIsPresentationalOnly","fieldShouldBeLocalized","getLocalizedSortProperty","config","fields","locale","parentIsLocalized","result","incomingResult","segments","incomingSegments","localization","join","firstSegment","shift","matchedField","find","field","name","nextFields","nextParentIsLocalized","remainingSegments","localizedSegment","length","nextSegmentIsLocale","localeCodes","includes","nextSegment","type","flattenedFields","localized","blockReferences","blocks","reduce","flattenedBlockFields","_block","block","b","slug","filter","blockField"],"mappings":"AAEA,SAASA,gBAAgB,EAAEC,yBAAyB,EAAEC,sBAAsB,QAAQ,iBAAgB;AAWpG,OAAO,MAAMC,2BAA2B,CAAC,EACvCC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,iBAAiB,EACjBC,QAAQC,cAAc,EACtBC,UAAUC,gBAAgB,EACrB;IACL,iDAAiD;IACjD,kBAAkB;IAClB,IAAI,CAACP,OAAOQ,YAAY,EAAE;QACxB,OAAOD,iBAAiBE,IAAI,CAAC;IAC/B;IAEA,MAAMH,WAAW;WAAIC;KAAiB;IAEtC,mDAAmD;IACnD,MAAMG,eAAeJ,SAASK,KAAK;IAEnC,kCAAkC;IAClC,MAAMC,eAAeX,OAAOY,IAAI,CAC9B,CAACC,QAAUlB,iBAAiBkB,UAAUA,MAAMC,IAAI,KAAKL;IAGvD,IAAIE,gBAAgB,CAACf,0BAA0Be,eAAe;QAC5D,IAAII;QACJ,IAAIC,wBAAwBd;QAC5B,MAAMe,oBAAoB;eAAIZ;SAAS;QACvC,IAAIa,mBAAmBP,aAAaG,IAAI;QAExC,IAAIjB,uBAAuB;YAAEgB,OAAOF;YAAcT;QAAkB,IAAI;YACtE,2CAA2C;YAC3C,IAAIG,SAASc,MAAM,GAAG,GAAG;gBACvB,MAAMC,sBAAsBrB,OAAOQ,YAAY,CAACc,WAAW,CAACC,QAAQ,CAACL,iBAAiB,CAAC,EAAE;gBAEzF,+DAA+D;gBAC/D,6CAA6C;gBAC7C,IAAIG,qBAAqB;oBACvB,MAAMG,cAAcN,kBAAkBP,KAAK;oBAC3CQ,mBAAmB,GAAGP,aAAaG,IAAI,CAAC,CAAC,EAAES,aAAa;gBAC1D;YACF,OAAO;gBACL,kEAAkE;gBAClEL,mBAAmB,GAAGP,aAAaG,IAAI,CAAC,CAAC,EAAEb,QAAQ;YACrD;QACF;QAEA,4CAA4C;QAC5C,IACEU,aAAaa,IAAI,KAAK,SACtBb,aAAaa,IAAI,KAAK,WACtBb,aAAaa,IAAI,KAAK,SACtB;YACAT,aAAaJ,aAAac,eAAe;YACzC,IAAI,CAACT,uBAAuB;gBAC1BA,wBAAwBL,aAAae,SAAS;YAChD;QACF;QAEA,IAAIf,aAAaa,IAAI,KAAK,UAAU;YAClCT,aAAa,AAACJ,CAAAA,aAAagB,eAAe,IAAIhB,aAAaiB,MAAM,AAAD,EAAGC,MAAM,CACvE,CAACC,sBAAsBC;gBACrB,uFAAuF;gBACvF,MAAMC,QACJ,OAAOD,WAAW,WAAWhC,OAAO6B,MAAM,CAAChB,IAAI,CAAC,CAACqB,IAAMA,EAAEC,IAAI,KAAKH,UAAUA;gBAC9E,OAAO;uBACFD;uBACAE,MAAMP,eAAe,CAACU,MAAM,CAC7B,CAACC,aACC,AAACzC,iBAAiByC,eAChBA,WAAWtB,IAAI,KAAK,eACpBsB,WAAWtB,IAAI,KAAK,eACtB,CAACnB,iBAAiByC;iBAEvB;YACH,GACA,EAAE;QAEN;QAEA,MAAMjC,SAASC,iBAAiB,GAAGA,eAAe,CAAC,EAAEc,kBAAkB,GAAGA;QAE1E,IAAIH,YAAY;YACd,OAAOjB,yBAAyB;gBAC9BC;gBACAC,QAAQe;gBACRd;gBACAC,mBAAmBc;gBACnBb;gBACAE,UAAUY;YACZ;QACF;QAEA,OAAOd;IACT;IAEA,OAAOG,iBAAiBE,IAAI,CAAC;AAC/B,EAAC"}
+{"version":3,"sources":["../../src/queries/getLocalizedSortProperty.ts"],"sourcesContent":["import type { FlattenedField, SanitizedConfig } from 'payload'\n\nimport { fieldAffectsData, fieldIsPresentationalOnly, fieldShouldBeLocalized } from 'payload/shared'\n\ntype Args = {\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale?: string\n  parentIsLocalized: boolean\n  result?: string\n  segments: string[]\n}\n\nexport const getLocalizedSortProperty = ({\n  config,\n  fields,\n  locale,\n  parentIsLocalized,\n  result: incomingResult,\n  segments: incomingSegments,\n}: Args): string => {\n  // If localization is not enabled, accept exactly\n  // what is sent in\n  if (!config.localization) {\n    return incomingSegments.join('.')\n  }\n\n  const segments = [...incomingSegments]\n\n  // Retrieve first segment, and remove from segments\n  const firstSegment = segments.shift()\n\n  // Attempt to find a matched field\n  const matchedField = fields.find(\n    (field) => fieldAffectsData(field) && field.name === firstSegment,\n  )\n\n  if (matchedField && !fieldIsPresentationalOnly(matchedField)) {\n    let nextFields: FlattenedField[] | null = null\n    let nextParentIsLocalized = parentIsLocalized\n    const remainingSegments = [...segments]\n    let localizedSegment = matchedField.name\n\n    if (\n      fieldShouldBeLocalized({ field: matchedField, parentIsLocalized: parentIsLocalized ?? false })\n    ) {\n      // Check to see if next segment is a locale\n      if (segments.length > 0 && remainingSegments[0]) {\n        const nextSegmentIsLocale = config.localization.localeCodes.includes(remainingSegments[0])\n\n        // If next segment is locale, remove it from remaining segments\n        // and use it to localize the current segment\n        if (nextSegmentIsLocale) {\n          const nextSegment = remainingSegments.shift()\n          localizedSegment = `${matchedField.name}.${nextSegment}`\n        }\n      } else {\n        // If no more segments, but field is localized, use default locale\n        localizedSegment = `${matchedField.name}.${locale}`\n      }\n    }\n\n    // If there are subfields, pass them through\n    if (\n      matchedField.type === 'tab' ||\n      matchedField.type === 'group' ||\n      matchedField.type === 'array'\n    ) {\n      nextFields = matchedField.flattenedFields\n      if (!nextParentIsLocalized) {\n        nextParentIsLocalized = matchedField.localized ?? false\n      }\n    }\n\n    if (matchedField.type === 'blocks') {\n      nextFields = (matchedField.blockReferences ?? matchedField.blocks).reduce<FlattenedField[]>(\n        (flattenedBlockFields, _block) => {\n          // TODO: iterate over blocks mapped to block slug in v4, or pass through payload.blocks\n          const block =\n            typeof _block === 'string' ? config.blocks?.find((b) => b.slug === _block) : _block\n\n          if (!block) {\n            return [...flattenedBlockFields]\n          }\n\n          return [\n            ...flattenedBlockFields,\n            ...block.flattenedFields.filter(\n              (blockField) =>\n                (fieldAffectsData(blockField) &&\n                  blockField.name !== 'blockType' &&\n                  blockField.name !== 'blockName') ||\n                !fieldAffectsData(blockField),\n            ),\n          ]\n        },\n        [],\n      )\n    }\n\n    const result = incomingResult ? `${incomingResult}.${localizedSegment}` : localizedSegment\n\n    if (nextFields !== null) {\n      return getLocalizedSortProperty({\n        config,\n        fields: nextFields,\n        locale,\n        parentIsLocalized: nextParentIsLocalized,\n        result,\n        segments: remainingSegments,\n      })\n    }\n\n    return result\n  }\n\n  return incomingSegments.join('.')\n}\n"],"names":["fieldAffectsData","fieldIsPresentationalOnly","fieldShouldBeLocalized","getLocalizedSortProperty","config","fields","locale","parentIsLocalized","result","incomingResult","segments","incomingSegments","localization","join","firstSegment","shift","matchedField","find","field","name","nextFields","nextParentIsLocalized","remainingSegments","localizedSegment","length","nextSegmentIsLocale","localeCodes","includes","nextSegment","type","flattenedFields","localized","blockReferences","blocks","reduce","flattenedBlockFields","_block","block","b","slug","filter","blockField"],"mappings":"AAEA,SAASA,gBAAgB,EAAEC,yBAAyB,EAAEC,sBAAsB,QAAQ,iBAAgB;AAWpG,OAAO,MAAMC,2BAA2B,CAAC,EACvCC,MAAM,EACNC,MAAM,EACNC,MAAM,EACNC,iBAAiB,EACjBC,QAAQC,cAAc,EACtBC,UAAUC,gBAAgB,EACrB;IACL,iDAAiD;IACjD,kBAAkB;IAClB,IAAI,CAACP,OAAOQ,YAAY,EAAE;QACxB,OAAOD,iBAAiBE,IAAI,CAAC;IAC/B;IAEA,MAAMH,WAAW;WAAIC;KAAiB;IAEtC,mDAAmD;IACnD,MAAMG,eAAeJ,SAASK,KAAK;IAEnC,kCAAkC;IAClC,MAAMC,eAAeX,OAAOY,IAAI,CAC9B,CAACC,QAAUlB,iBAAiBkB,UAAUA,MAAMC,IAAI,KAAKL;IAGvD,IAAIE,gBAAgB,CAACf,0BAA0Be,eAAe;QAC5D,IAAII,aAAsC;QAC1C,IAAIC,wBAAwBd;QAC5B,MAAMe,oBAAoB;eAAIZ;SAAS;QACvC,IAAIa,mBAAmBP,aAAaG,IAAI;QAExC,IACEjB,uBAAuB;YAAEgB,OAAOF;YAAcT,mBAAmBA,qBAAqB;QAAM,IAC5F;YACA,2CAA2C;YAC3C,IAAIG,SAASc,MAAM,GAAG,KAAKF,iBAAiB,CAAC,EAAE,EAAE;gBAC/C,MAAMG,sBAAsBrB,OAAOQ,YAAY,CAACc,WAAW,CAACC,QAAQ,CAACL,iBAAiB,CAAC,EAAE;gBAEzF,+DAA+D;gBAC/D,6CAA6C;gBAC7C,IAAIG,qBAAqB;oBACvB,MAAMG,cAAcN,kBAAkBP,KAAK;oBAC3CQ,mBAAmB,GAAGP,aAAaG,IAAI,CAAC,CAAC,EAAES,aAAa;gBAC1D;YACF,OAAO;gBACL,kEAAkE;gBAClEL,mBAAmB,GAAGP,aAAaG,IAAI,CAAC,CAAC,EAAEb,QAAQ;YACrD;QACF;QAEA,4CAA4C;QAC5C,IACEU,aAAaa,IAAI,KAAK,SACtBb,aAAaa,IAAI,KAAK,WACtBb,aAAaa,IAAI,KAAK,SACtB;YACAT,aAAaJ,aAAac,eAAe;YACzC,IAAI,CAACT,uBAAuB;gBAC1BA,wBAAwBL,aAAae,SAAS,IAAI;YACpD;QACF;QAEA,IAAIf,aAAaa,IAAI,KAAK,UAAU;YAClCT,aAAa,AAACJ,CAAAA,aAAagB,eAAe,IAAIhB,aAAaiB,MAAM,AAAD,EAAGC,MAAM,CACvE,CAACC,sBAAsBC;gBACrB,uFAAuF;gBACvF,MAAMC,QACJ,OAAOD,WAAW,WAAWhC,OAAO6B,MAAM,EAAEhB,KAAK,CAACqB,IAAMA,EAAEC,IAAI,KAAKH,UAAUA;gBAE/E,IAAI,CAACC,OAAO;oBACV,OAAO;2BAAIF;qBAAqB;gBAClC;gBAEA,OAAO;uBACFA;uBACAE,MAAMP,eAAe,CAACU,MAAM,CAC7B,CAACC,aACC,AAACzC,iBAAiByC,eAChBA,WAAWtB,IAAI,KAAK,eACpBsB,WAAWtB,IAAI,KAAK,eACtB,CAACnB,iBAAiByC;iBAEvB;YACH,GACA,EAAE;QAEN;QAEA,MAAMjC,SAASC,iBAAiB,GAAGA,eAAe,CAAC,EAAEc,kBAAkB,GAAGA;QAE1E,IAAIH,eAAe,MAAM;YACvB,OAAOjB,yBAAyB;gBAC9BC;gBACAC,QAAQe;gBACRd;gBACAC,mBAAmBc;gBACnBb;gBACAE,UAAUY;YACZ;QACF;QAEA,OAAOd;IACT;IAEA,OAAOG,iBAAiBE,IAAI,CAAC;AAC/B,EAAC"}

package/dist/queries/getLocalizedSortProperty.spec.js

@@ -17,6 +17,7 @@ describe('get localized sort property', ()=>{
     it('passes through a non-localized sort property', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: [
                 {
                     name: 'title',
@@ -33,6 +34,7 @@ describe('get localized sort property', ()=>{
     it('properly localizes an un-localized sort property', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: [
                 {
                     name: 'title',
@@ -50,6 +52,7 @@ describe('get localized sort property', ()=>{
     it('keeps specifically asked-for localized sort properties', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: [
                 {
                     name: 'title',
@@ -68,6 +71,7 @@ describe('get localized sort property', ()=>{
     it('properly localizes nested sort properties', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: flattenAllFields({
                 fields: [
                     {
@@ -94,6 +98,7 @@ describe('get localized sort property', ()=>{
     it('keeps requested locale with nested sort properties', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: flattenAllFields({
                 fields: [
                     {
@@ -121,6 +126,7 @@ describe('get localized sort property', ()=>{
     it('properly localizes field within row', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: flattenAllFields({
                 fields: [
                     {
@@ -145,6 +151,7 @@ describe('get localized sort property', ()=>{
     it('properly localizes field within named tab', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: flattenAllFields({
                 fields: [
                     {
@@ -175,6 +182,7 @@ describe('get localized sort property', ()=>{
     it('properly localizes field within unnamed tab', ()=>{
         const result = getLocalizedSortProperty({
             config,
+            parentIsLocalized: false,
             fields: flattenAllFields({
                 fields: [
                     {

package/dist/queries/getLocalizedSortProperty.spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/getLocalizedSortProperty.spec.ts"],"sourcesContent":["import type { Config, SanitizedConfig } from 'payload'\n\nimport { flattenAllFields, sanitizeConfig } from 'payload'\n\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\nlet config: SanitizedConfig\n\ndescribe('get localized sort property', () => {\n  beforeAll(async () => {\n    config = await sanitizeConfig({\n      localization: {\n        defaultLocale: 'en',\n        fallback: true,\n        locales: ['en', 'es'],\n      },\n    } as Config)\n  })\n  it('passes through a non-localized sort property', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n        },\n      ],\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title')\n  })\n\n  it('properly localizes an un-localized sort property', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n          localized: true,\n        },\n      ],\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n\n  it('keeps specifically asked-for localized sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n          localized: true,\n        },\n      ],\n      locale: 'en',\n      segments: ['title', 'es'],\n    })\n\n    expect(result).toStrictEqual('title.es')\n  })\n\n  it('properly localizes nested sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: flattenAllFields({\n        fields: [\n          {\n            name: 'group',\n            type: 'group',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['group', 'title'],\n    })\n\n    expect(result).toStrictEqual('group.title.en')\n  })\n\n  it('keeps requested locale with nested sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: flattenAllFields({\n        fields: [\n          {\n            name: 'group',\n            type: 'group',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['group', 'title', 'es'],\n    })\n\n    expect(result).toStrictEqual('group.title.es')\n  })\n\n  it('properly localizes field within row', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'row',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n\n  it('properly localizes field within named tab', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'tabs',\n            tabs: [\n              {\n                name: 'tab',\n                fields: [\n                  {\n                    name: 'title',\n                    type: 'text',\n                    localized: true,\n                  },\n                ],\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['tab', 'title'],\n    })\n\n    expect(result).toStrictEqual('tab.title.en')\n  })\n\n  it('properly localizes field within unnamed tab', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'tabs',\n            tabs: [\n              {\n                fields: [\n                  {\n                    name: 'title',\n                    type: 'text',\n                    localized: true,\n                  },\n                ],\n                label: 'Tab',\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n})\n"],"names":["flattenAllFields","sanitizeConfig","getLocalizedSortProperty","config","describe","beforeAll","localization","defaultLocale","fallback","locales","it","result","fields","name","type","locale","segments","expect","toStrictEqual","localized","tabs","label"],"mappings":"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"}
+{"version":3,"sources":["../../src/queries/getLocalizedSortProperty.spec.ts"],"sourcesContent":["import type { Config, SanitizedConfig } from 'payload'\n\nimport { flattenAllFields, sanitizeConfig } from 'payload'\n\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\nlet config: SanitizedConfig\n\ndescribe('get localized sort property', () => {\n  beforeAll(async () => {\n    config = await sanitizeConfig({\n      localization: {\n        defaultLocale: 'en',\n        fallback: true,\n        locales: ['en', 'es'],\n      },\n    } as Config)\n  })\n  it('passes through a non-localized sort property', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n        },\n      ],\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title')\n  })\n\n  it('properly localizes an un-localized sort property', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n          localized: true,\n        },\n      ],\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n\n  it('keeps specifically asked-for localized sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: [\n        {\n          name: 'title',\n          type: 'text',\n          localized: true,\n        },\n      ],\n      locale: 'en',\n      segments: ['title', 'es'],\n    })\n\n    expect(result).toStrictEqual('title.es')\n  })\n\n  it('properly localizes nested sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: flattenAllFields({\n        fields: [\n          {\n            name: 'group',\n            type: 'group',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['group', 'title'],\n    })\n\n    expect(result).toStrictEqual('group.title.en')\n  })\n\n  it('keeps requested locale with nested sort properties', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: flattenAllFields({\n        fields: [\n          {\n            name: 'group',\n            type: 'group',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['group', 'title', 'es'],\n    })\n\n    expect(result).toStrictEqual('group.title.es')\n  })\n\n  it('properly localizes field within row', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'row',\n            fields: [\n              {\n                name: 'title',\n                type: 'text',\n                localized: true,\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n\n  it('properly localizes field within named tab', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'tabs',\n            tabs: [\n              {\n                name: 'tab',\n                fields: [\n                  {\n                    name: 'title',\n                    type: 'text',\n                    localized: true,\n                  },\n                ],\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['tab', 'title'],\n    })\n\n    expect(result).toStrictEqual('tab.title.en')\n  })\n\n  it('properly localizes field within unnamed tab', () => {\n    const result = getLocalizedSortProperty({\n      config,\n      parentIsLocalized: false,\n      fields: flattenAllFields({\n        fields: [\n          {\n            type: 'tabs',\n            tabs: [\n              {\n                fields: [\n                  {\n                    name: 'title',\n                    type: 'text',\n                    localized: true,\n                  },\n                ],\n                label: 'Tab',\n              },\n            ],\n          },\n        ],\n      }),\n      locale: 'en',\n      segments: ['title'],\n    })\n\n    expect(result).toStrictEqual('title.en')\n  })\n})\n"],"names":["flattenAllFields","sanitizeConfig","getLocalizedSortProperty","config","describe","beforeAll","localization","defaultLocale","fallback","locales","it","result","parentIsLocalized","fields","name","type","locale","segments","expect","toStrictEqual","localized","tabs","label"],"mappings":"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"}

package/dist/queries/operatorMap.d.ts

@@ -1,3 +1,4 @@
+export type OperatorMapKey = keyof typeof operatorMap;
 export declare const operatorMap: {
     all: string;
     equals: string;

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

@@ -1 +1 @@
-{"version":3,"file":"operatorMap.d.ts","sourceRoot":"","sources":["../../src/queries/operatorMap.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcvB,CAAA"}
+{"version":3,"file":"operatorMap.d.ts","sourceRoot":"","sources":["../../src/queries/operatorMap.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,GAAG,MAAM,OAAO,WAAW,CAAA;AAErD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;CAcvB,CAAA"}

package/dist/queries/operatorMap.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/operatorMap.ts"],"sourcesContent":["export const operatorMap = {\n  all: '$all',\n  equals: '$eq',\n  exists: '$exists',\n  greater_than: '$gt',\n  greater_than_equal: '$gte',\n  in: '$in',\n  intersects: '$geoIntersects',\n  less_than: '$lt',\n  less_than_equal: '$lte',\n  near: '$near',\n  not_equals: '$ne',\n  not_in: '$nin',\n  within: '$geoWithin',\n}\n"],"names":["operatorMap","all","equals","exists","greater_than","greater_than_equal","in","intersects","less_than","less_than_equal","near","not_equals","not_in","within"],"mappings":"AAAA,OAAO,MAAMA,cAAc;IACzBC,KAAK;IACLC,QAAQ;IACRC,QAAQ;IACRC,cAAc;IACdC,oBAAoB;IACpBC,IAAI;IACJC,YAAY;IACZC,WAAW;IACXC,iBAAiB;IACjBC,MAAM;IACNC,YAAY;IACZC,QAAQ;IACRC,QAAQ;AACV,EAAC"}
+{"version":3,"sources":["../../src/queries/operatorMap.ts"],"sourcesContent":["export type OperatorMapKey = keyof typeof operatorMap\n\nexport const operatorMap = {\n  all: '$all',\n  equals: '$eq',\n  exists: '$exists',\n  greater_than: '$gt',\n  greater_than_equal: '$gte',\n  in: '$in',\n  intersects: '$geoIntersects',\n  less_than: '$lt',\n  less_than_equal: '$lte',\n  near: '$near',\n  not_equals: '$ne',\n  not_in: '$nin',\n  within: '$geoWithin',\n}\n"],"names":["operatorMap","all","equals","exists","greater_than","greater_than_equal","in","intersects","less_than","less_than_equal","near","not_equals","not_in","within"],"mappings":"AAEA,OAAO,MAAMA,cAAc;IACzBC,KAAK;IACLC,QAAQ;IACRC,QAAQ;IACRC,cAAc;IACdC,oBAAoB;IACpBC,IAAI;IACJC,YAAY;IACZC,WAAW;IACXC,iBAAiB;IACjBC,MAAM;IACNC,YAAY;IACZC,QAAQ;IACRC,QAAQ;AACV,EAAC"}

package/dist/queries/parseParams.d.ts

@@ -3,7 +3,7 @@ export declare function parseParams({ collectionSlug, fields, globalSlug, locale
     collectionSlug?: string;
     fields: FlattenedField[];
     globalSlug?: string;
-    locale: string;
+    locale?: string;
     parentIsLocalized: boolean;
     payload: Payload;
     where: Where;

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

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

package/dist/queries/parseParams.js

@@ -8,7 +8,7 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
         // We need to determine if the whereKey is an AND, OR, or a schema path
         for (const relationOrPath of Object.keys(where)){
             const condition = where[relationOrPath];
-            let conditionOperator;
+            let conditionOperator = null;
             if (relationOrPath.toLowerCase() === 'and') {
                 conditionOperator = '$and';
             } else if (relationOrPath.toLowerCase() === 'or') {
@@ -24,7 +24,7 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
                     payload,
                     where: condition
                 });
-                if (builtConditions.length > 0) {
+                if (builtConditions.length > 0 && conditionOperator !== null) {
                     result[conditionOperator] = builtConditions;
                 }
             } else {
@@ -58,7 +58,7 @@ export async function parseParams({ collectionSlug, fields, globalSlug, locale,
                                 result[searchParam.path] = searchParam.value;
                             }
                         } else if (typeof searchParam?.value === 'object') {
-                            result = deepMergeWithCombinedArrays(result, searchParam.value, {
+                            result = deepMergeWithCombinedArrays(result, searchParam.value ?? {}, {
                                 // dont clone Types.ObjectIDs
                                 clone: false
                             });

package/dist/queries/parseParams.js.map

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

package/dist/queries/sanitizeQueryValue.d.ts

@@ -13,6 +13,6 @@ export declare const sanitizeQueryValue: ({ field, hasCustomID, locale, operator
     operator?: string;
     rawQuery?: unknown;
     val?: unknown;
-};
+} | undefined;
 export {};
 //# sourceMappingURL=sanitizeQueryValue.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,cAAc,EACd,OAAO,EAER,MAAM,SAAS,CAAA;AAMhB,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAiED,eAAO,MAAM,kBAAkB,qFAS5B,sBAAsB,KAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;CA6Vd,CAAA"}
+{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,cAAc,EACd,OAAO,EAER,MAAM,SAAS,CAAA;AAMhB,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAoED,eAAO,MAAM,kBAAkB,qFAS5B,sBAAsB,KACrB;IACE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;CACd,GACD,SA8VH,CAAA"}