@payloadcms/db-mongodb 4.0.0-internal.5f0cd13 → 4.0.0-internal.688c4d0

package/dist/predefinedMigrations/migrateLocalizeStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/predefinedMigrations/migrateLocalizeStatus.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport { calculateVersionLocaleStatuses, type VersionRecord } from 'payload/migrations'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getSession } from '../utilities/getSession.js'\n\nexport type LocalizeStatusArgs = {\n  collectionSlug?: string\n  globalSlug?: string\n  payload: Payload\n  req?: any\n  session?: ClientSession\n}\n\n/**\n * Migrate all collections and globals with versions.drafts enabled to use per-locale _status.\n *\n * This migration:\n * 1. Converts version._status from a scalar string to a locale-keyed object for each entity\n * 2. Deletes all snapshot:true version documents from each versions collection\n * 3. Unsets the `snapshot` field from remaining version documents\n */\nexport async function migrateLocalizeStatus({\n  payload,\n  req,\n}: {\n  payload: Payload\n  req: PayloadRequest\n}): Promise<void> {\n  if (!payload.config.localization) {\n    payload.logger.info({\n      msg: 'Localization not enabled, skipping localize-status migration',\n    })\n    return\n  }\n\n  const collections = payload.config.collections.filter(\n    (c) =>\n      c.versions?.drafts &&\n      typeof c.versions.drafts === 'object' &&\n      c.versions.drafts.localizeStatus,\n  )\n  const globals = payload.config.globals.filter(\n    (g) =>\n      g.versions?.drafts &&\n      typeof g.versions.drafts === 'object' &&\n      g.versions.drafts.localizeStatus,\n  )\n\n  payload.logger.info({\n    msg: `Starting localize-status migration for ${collections.length} collection(s) and ${globals.length} global(s)`,\n  })\n\n  const connection = (payload.db as any).connection\n  const session = await getSession(payload.db as MongooseAdapter, req)\n\n  for (const collection of collections) {\n    await localizeStatus({ collectionSlug: collection.slug, payload, req, session })\n    await cleanupSnapshotDocuments({ connection, entitySlug: collection.slug, payload, session })\n  }\n\n  for (const global of globals) {\n    await localizeStatus({ globalSlug: global.slug, payload, req, session })\n    await cleanupSnapshotDocuments({ connection, entitySlug: global.slug, payload, session })\n  }\n\n  payload.logger.info({ msg: 'localize-status migration completed successfully' })\n}\n\n/**\n * Converts version._status (and the main document _status) from a scalar string to a\n * per-locale object for a single collection or global.\n */\nexport async function localizeStatus(args: LocalizeStatusArgs): Promise<void> {\n  const { collectionSlug, globalSlug, payload, req, session } = args\n\n  if (!collectionSlug && !globalSlug) {\n    throw new Error('Either collectionSlug or globalSlug must be provided')\n  }\n\n  if (collectionSlug && globalSlug) {\n    throw new Error('Cannot provide both collectionSlug and globalSlug')\n  }\n\n  const entitySlug = collectionSlug || globalSlug\n  // MongoDB collection names are case-insensitive and stored as lowercase\n  const versionsCollection = `_${entitySlug}_versions`.toLowerCase()\n\n  if (!payload.config.localization) {\n    throw new Error('Localization is not enabled in payload config')\n  }\n\n  // Check if versions are enabled on this collection/global\n  let entityConfig\n  if (collectionSlug) {\n    const collection = payload.config.collections.find((c) => c.slug === collectionSlug)\n    if (collection) {\n      entityConfig = collection\n    }\n  } else if (globalSlug) {\n    const global = payload.config.globals.find((g) => g.slug === globalSlug)\n    if (global) {\n      entityConfig = global\n    }\n  }\n\n  if (!entityConfig) {\n    throw new Error(\n      `${collectionSlug ? 'Collection' : 'Global'} not found: ${collectionSlug || globalSlug}`,\n    )\n  }\n\n  payload.logger.info({\n    msg: `Starting _status localization migration for ${collectionSlug ? 'collection' : 'global'}: ${entitySlug}`,\n  })\n\n  // Check if versions are enabled in config (skip if not)\n  if (!entityConfig.versions) {\n    payload.logger.info({\n      msg: `Skipping migration for ${collectionSlug ? 'collection' : 'global'}: ${entitySlug} - versions not enabled`,\n    })\n    return\n  }\n\n  // Get MongoDB connection\n  const connection = (payload.db as any).connection\n\n  // Get filtered locales if filterAvailableLocales is defined\n  let locales = payload.config.localization.localeCodes\n  if (typeof payload.config.localization.filterAvailableLocales === 'function') {\n    const filteredLocaleObjects = await payload.config.localization.filterAvailableLocales({\n      locales: payload.config.localization.locales,\n      req,\n    })\n    locales = filteredLocaleObjects.map((locale) => locale.code)\n  }\n  payload.logger.info({ msg: `Locales: ${locales.join(', ')}` })\n\n  // Check if version._status exists and is NOT already localized\n  const sampleDoc = await connection.collection(versionsCollection).findOne({}, { session })\n\n  if (!sampleDoc) {\n    payload.logger.info({ msg: 'No version documents found, nothing to migrate' })\n    return\n  }\n\n  // Check if _status is already localized\n  if (\n    sampleDoc.version?._status &&\n    typeof sampleDoc.version._status === 'object' &&\n    !Array.isArray(sampleDoc.version._status)\n  ) {\n    payload.logger.info({\n      msg: 'version._status is already localized, migration already completed',\n    })\n    return\n  }\n\n  // Validate that version._status exists and is a string\n  if (\n    !sampleDoc.version ||\n    typeof sampleDoc.version._status !== 'string' ||\n    Array.isArray(sampleDoc.version._status)\n  ) {\n    throw new Error(\n      `Migration aborted: version._status field not found or has unexpected format in ${versionsCollection}. ` +\n        `This migration should only run on schemas that have NOT yet been migrated to per-locale status.`,\n    )\n  }\n\n  payload.logger.info({ msg: 'Fetching all version documents...' })\n\n  // Get all versions, sorted chronologically\n  const allVersions = await connection\n    .collection(versionsCollection)\n    .find({}, { session })\n    .sort({ createdAt: 1, parent: 1 })\n    .toArray()\n\n  payload.logger.info({ msg: `Found ${allVersions.length} version documents` })\n\n  // Transform MongoDB documents to VersionRecord format\n  const versionRecords: VersionRecord[] = allVersions.map((doc: any) => ({\n    id: doc._id.toString(),\n    _status: doc.version._status as 'draft' | 'published',\n    createdAt: doc.createdAt,\n    parent: doc.parent?.toString(),\n    publishedLocale: doc.publishedLocale,\n    snapshot: doc.snapshot || false,\n  }))\n\n  // Calculate status per locale using shared logic\n  const versionLocaleStatus = calculateVersionLocaleStatuses(versionRecords, locales, payload)\n\n  payload.logger.info({ msg: 'Updating version documents with per-locale status...' })\n\n  // Update each version document\n  let updateCount = 0\n  for (const doc of allVersions) {\n    const versionId = doc._id.toString()\n    const localeStatusMap = versionLocaleStatus.get(versionId)\n\n    if (!localeStatusMap) {\n      payload.logger.warn({ msg: `No status map found for version ${versionId}, skipping` })\n      continue\n    }\n\n    // Build the new _status object: { en: 'published', es: 'draft', ... }\n    const newStatus: Record<string, string> = {}\n    for (const [locale, status] of localeStatusMap.entries()) {\n      newStatus[locale] = status\n    }\n\n    // Update the document: change version._status from string to object\n    await connection.collection(versionsCollection).updateOne(\n      { _id: doc._id },\n      {\n        $set: {\n          'version._status': newStatus,\n        },\n      },\n      { session },\n    )\n\n    updateCount++\n  }\n\n  payload.logger.info({ msg: `Updated ${updateCount} version documents` })\n\n  // Migrate main collection/global document _status to per-locale status object\n  // Only if it has a status field\n  if (collectionSlug) {\n    const mainCollection = collectionSlug\n    const mainDoc = await connection.collection(mainCollection).findOne({}, { session })\n\n    if (mainDoc && '_status' in mainDoc) {\n      payload.logger.info({ msg: `Migrating main collection documents for: ${mainCollection}` })\n\n      const allDocs = await connection.collection(mainCollection).find({}, { session }).toArray()\n\n      for (const doc of allDocs) {\n        if (!doc._id) {\n          continue\n        }\n\n        // Get the latest version for this document to determine status per locale\n        const latestVersions = await connection\n          .collection(versionsCollection)\n          .find({ parent: doc._id }, { session })\n          .sort({ createdAt: -1 })\n          .limit(1)\n          .toArray()\n\n        let statusObj: Record<string, string> = {}\n\n        if (latestVersions.length > 0 && latestVersions[0]?.version?._status) {\n          // Use the status from the latest version\n          statusObj = latestVersions[0].version._status\n        } else {\n          // Fallback: set all locales to draft\n          for (const locale of locales) {\n            statusObj[locale] = 'draft'\n          }\n        }\n\n        // Update main document\n        await connection.collection(mainCollection).updateOne(\n          { _id: doc._id },\n          {\n            $set: {\n              _status: statusObj,\n            },\n          },\n          { session },\n        )\n      }\n\n      payload.logger.info({ msg: `Migrated ${allDocs.length} collection documents` })\n    } else {\n      payload.logger.info({\n        msg: 'Skipping main document status migration (no status field found)',\n      })\n    }\n  } else if (globalSlug) {\n    // Globals are stored in a single 'globals' collection with globalType discriminator\n    const globalDoc = await connection\n      .collection('globals')\n      .findOne({ globalType: globalSlug }, { session })\n    if (globalDoc && '_status' in globalDoc && globalDoc._id) {\n      payload.logger.info({ msg: `Migrating main global document for: ${globalSlug}` })\n\n      // Get the latest version for the global\n      const latestVersions = await connection\n        .collection(versionsCollection)\n        .find({}, { session })\n        .sort({ createdAt: -1 })\n        .limit(1)\n        .toArray()\n\n      let statusObj: Record<string, string> = {}\n\n      if (latestVersions.length > 0 && latestVersions[0]?.version?._status) {\n        statusObj = latestVersions[0].version._status\n      } else {\n        for (const locale of locales) {\n          statusObj[locale] = 'draft'\n        }\n      }\n\n      // Update global document\n      await connection.collection('globals').updateOne(\n        { _id: globalDoc._id, globalType: globalSlug },\n        {\n          $set: {\n            _status: statusObj,\n          },\n        },\n        { session },\n      )\n\n      payload.logger.info({ msg: 'Migrated global document' })\n    } else {\n      payload.logger.info({\n        msg: 'Skipping main document status migration (no status field found)',\n      })\n    }\n  }\n\n  payload.logger.info({ msg: 'Migration completed successfully' })\n}\n\nasync function cleanupSnapshotDocuments({\n  connection,\n  entitySlug,\n  payload,\n  session,\n}: {\n  connection: any\n  entitySlug: string\n  payload: Payload\n  session?: ClientSession\n}): Promise<void> {\n  const versionsCollection = `_${entitySlug}_versions`.toLowerCase()\n\n  const col = connection.collection(versionsCollection)\n\n  // Delete all snapshot=true documents\n  const deleteResult = await col.deleteMany({ snapshot: true }, { session })\n\n  if (deleteResult.deletedCount > 0) {\n    payload.logger.info({\n      msg: `Deleted ${deleteResult.deletedCount} snapshot documents from ${versionsCollection}`,\n    })\n  }\n\n  // Unset the snapshot field from remaining documents\n  await col.updateMany({ snapshot: { $exists: true } }, { $unset: { snapshot: '' } }, { session })\n}\n"],"names":["calculateVersionLocaleStatuses","getSession","migrateLocalizeStatus","payload","req","config","localization","logger","info","msg","collections","filter","c","versions","drafts","localizeStatus","globals","g","length","connection","db","session","collection","collectionSlug","slug","cleanupSnapshotDocuments","entitySlug","global","globalSlug","args","Error","versionsCollection","toLowerCase","entityConfig","find","locales","localeCodes","filterAvailableLocales","filteredLocaleObjects","map","locale","code","join","sampleDoc","findOne","version","_status","Array","isArray","allVersions","sort","createdAt","parent","toArray","versionRecords","doc","id","_id","toString","publishedLocale","snapshot","versionLocaleStatus","updateCount","versionId","localeStatusMap","get","warn","newStatus","status","entries","updateOne","$set","mainCollection","mainDoc","allDocs","latestVersions","limit","statusObj","globalDoc","globalType","col","deleteResult","deleteMany","deletedCount","updateMany","$exists","$unset"],"mappings":"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"}

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,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,GAAI,oGAOtC,IAAI,KAAG,MAiGT,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,GAAI,oGAOtC,IAAI,KAAG,MA8FT,CAAA"}

package/dist/queries/getLocalizedSortProperty.js

@@ -45,7 +45,7 @@ export const getLocalizedSortProperty = ({ config, fields, locale, parentIsLocal
             }
         }
         if (matchedField.type === 'blocks') {
-            nextFields = (matchedField.blockReferences ?? matchedField.blocks).reduce((flattenedBlockFields, _block)=>{
+            nextFields = 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;
                 if (!block) {

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[] | 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"}
+{"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.blocks.reduce<FlattenedField[]>((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    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","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,aAAaJ,aAAagB,MAAM,CAACC,MAAM,CAAmB,CAACC,sBAAsBC;gBAC/E,uFAAuF;gBACvF,MAAMC,QACJ,OAAOD,WAAW,WAAW/B,OAAO4B,MAAM,EAAEf,KAAK,CAACoB,IAAMA,EAAEC,IAAI,KAAKH,UAAUA;gBAE/E,IAAI,CAACC,OAAO;oBACV,OAAO;2BAAIF;qBAAqB;gBAClC;gBAEA,OAAO;uBACFA;uBACAE,MAAMN,eAAe,CAACS,MAAM,CAC7B,CAACC,aACC,AAACxC,iBAAiBwC,eAChBA,WAAWrB,IAAI,KAAK,eACpBqB,WAAWrB,IAAI,KAAK,eACtB,CAACnB,iBAAiBwC;iBAEvB;YACH,GAAG,EAAE;QACP;QAEA,MAAMhC,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/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,QAAQ,EACR,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,QAAQ,CAAA;IAClB,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,GAAI,kFAShC,sBAAsB,KACrB;IACE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;CACd,GACD,SAycH,CAAA"}
+{"version":3,"file":"sanitizeQueryValue.d.ts","sourceRoot":"","sources":["../../src/queries/sanitizeQueryValue.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkB,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAqB,MAAM,SAAS,CAAA;AAMnG,KAAK,sBAAsB,GAAG;IAC5B,KAAK,EAAE,cAAc,CAAA;IACrB,WAAW,EAAE,OAAO,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,QAAQ,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,GAAG,CAAA;CACT,CAAA;AAmED,eAAO,MAAM,kBAAkB,GAAI,kFAShC,sBAAsB,KACrB;IACE,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,GAAG,CAAC,EAAE,OAAO,CAAA;CACd,GACD,SAycH,CAAA"}

package/dist/queries/sanitizeQueryValue.js

@@ -54,9 +54,8 @@ const buildExistsQuery = (formattedValue, path, treatEmptyString = true)=>{
 };
 // returns nestedField Field object from blocks.nestedField path because getLocalizedPaths splits them only for relationships
 const getFieldFromSegments = ({ field, payload, segments })=>{
-    if ('blocks' in field || 'blockReferences' in field) {
-        const _field = field;
-        for (const _block of _field.blockReferences ?? _field.blocks){
+    if ('blocks' in field) {
+        for (const _block of field.blocks){
             const block = typeof _block === 'string' ? payload.blocks[_block] : _block;
             if (block) {
                 const field = getFieldFromSegments({

package/dist/queries/sanitizeQueryValue.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/sanitizeQueryValue.ts"],"sourcesContent":["import type {\n  FlattenedBlock,\n  FlattenedBlocksField,\n  FlattenedField,\n  Operator,\n  Payload,\n  RelationshipField,\n} from 'payload'\n\nimport { Types } from 'mongoose'\nimport { createArrayFromCommaDelineated, escapeRegExp } from 'payload'\nimport { fieldShouldBeLocalized } from 'payload/shared'\n\ntype SanitizeQueryValueArgs = {\n  field: FlattenedField\n  hasCustomID: boolean\n  locale?: string\n  operator: Operator\n  parentIsLocalized: boolean\n  path: string\n  payload: Payload\n  val: any\n}\n\nconst buildExistsQuery = (formattedValue: unknown, path: string, treatEmptyString = true) => {\n  if (formattedValue) {\n    return {\n      rawQuery: {\n        $and: [\n          { [path]: { $exists: true } },\n          { [path]: { $ne: null } },\n          ...(treatEmptyString ? [{ [path]: { $ne: '' } }] : []), // Treat empty string as null / undefined\n        ],\n      },\n    }\n  } else {\n    return {\n      rawQuery: {\n        $or: [\n          { [path]: { $exists: false } },\n          { [path]: { $eq: null } },\n          ...(treatEmptyString ? [{ [path]: { $eq: '' } }] : []), // Treat empty string as null / undefined\n        ],\n      },\n    }\n  }\n}\n\n// returns nestedField Field object from blocks.nestedField path because getLocalizedPaths splits them only for relationships\nconst getFieldFromSegments = ({\n  field,\n  payload,\n  segments,\n}: {\n  field: FlattenedBlock | FlattenedField\n  payload: Payload\n  segments: string[]\n}): FlattenedField | undefined => {\n  if ('blocks' in field || 'blockReferences' in field) {\n    const _field: FlattenedBlocksField = field as FlattenedBlocksField\n    for (const _block of _field.blockReferences ?? _field.blocks) {\n      const block: FlattenedBlock | undefined =\n        typeof _block === 'string' ? payload.blocks[_block] : _block\n      if (block) {\n        const field = getFieldFromSegments({ field: block, payload, segments })\n        if (field) {\n          return field\n        }\n      }\n    }\n  }\n\n  if ('fields' in field) {\n    for (let i = 0; i < segments.length; i++) {\n      const foundField = field.flattenedFields.find((each) => each.name === segments[i])\n\n      if (!foundField) {\n        break\n      }\n\n      if (foundField && segments.length - 1 === i) {\n        return foundField\n      }\n\n      segments.shift()\n      return getFieldFromSegments({ field: foundField, payload, segments })\n    }\n  }\n}\n\nexport const sanitizeQueryValue = ({\n  field,\n  hasCustomID,\n  locale,\n  operator,\n  parentIsLocalized,\n  path,\n  payload,\n  val,\n}: SanitizeQueryValueArgs):\n  | {\n      operator?: string\n      rawQuery?: unknown\n      val?: unknown\n    }\n  | undefined => {\n  let formattedValue = val\n  let formattedOperator = operator\n\n  if (['array', 'blocks', 'group', 'tab'].includes(field.type) && path.includes('.')) {\n    const segments = path.split('.')\n    segments.shift()\n    const foundField = getFieldFromSegments({ field, payload, segments })\n\n    if (foundField) {\n      field = foundField\n    }\n  }\n\n  // Disregard invalid _ids\n  if (path === '_id') {\n    if (typeof val === 'string' && val.split(',').length === 1) {\n      if (!hasCustomID) {\n        const isValid = Types.ObjectId.isValid(val)\n\n        if (!isValid) {\n          return { operator: formattedOperator, val: undefined }\n        } else {\n          if (['in', 'not_in'].includes(operator)) {\n            formattedValue = createArrayFromCommaDelineated(formattedValue).map(\n              (id) => new Types.ObjectId(id),\n            )\n          } else {\n            formattedValue = new Types.ObjectId(val)\n          }\n        }\n      }\n\n      if (field.type === 'number') {\n        const parsedNumber = parseFloat(val)\n\n        if (Number.isNaN(parsedNumber)) {\n          return { operator: formattedOperator, val: undefined }\n        }\n      }\n    } else if (Array.isArray(val) || (typeof val === 'string' && val.split(',').length > 1)) {\n      if (typeof val === 'string') {\n        formattedValue = createArrayFromCommaDelineated(val)\n      }\n\n      if (Array.isArray(formattedValue)) {\n        formattedValue = formattedValue.reduce<unknown[]>((formattedValues, inVal) => {\n          if (!hasCustomID) {\n            if (Types.ObjectId.isValid(inVal)) {\n              formattedValues.push(new Types.ObjectId(inVal))\n\n              return formattedValues\n            }\n          }\n\n          if (field.type === 'number') {\n            const parsedNumber = parseFloat(inVal)\n            if (!Number.isNaN(parsedNumber)) {\n              formattedValues.push(parsedNumber)\n            }\n          } else {\n            formattedValues.push(inVal)\n          }\n\n          return formattedValues\n        }, [])\n      }\n    }\n  }\n\n  // Cast incoming values as proper searchable types\n  if (field.type === 'checkbox' && typeof val === 'string') {\n    if (val.toLowerCase() === 'true') {\n      formattedValue = true\n    }\n    if (val.toLowerCase() === 'false') {\n      formattedValue = false\n    }\n  }\n\n  if (['all', 'in', 'not_in'].includes(operator) && typeof formattedValue === 'string') {\n    formattedValue = createArrayFromCommaDelineated(formattedValue)\n\n    if (field.type === 'number' && Array.isArray(formattedValue)) {\n      formattedValue = formattedValue.map((arrayVal) => parseFloat(arrayVal))\n    }\n  }\n\n  if (field.type === 'number') {\n    if (typeof formattedValue === 'string' && operator !== 'exists') {\n      formattedValue = Number(val)\n    }\n\n    if (operator === 'exists') {\n      formattedValue = val === 'true' ? true : val === 'false' ? false : Boolean(val)\n      return buildExistsQuery(formattedValue, path)\n    }\n  }\n\n  if (field.type === 'date' && typeof val === 'string' && operator !== 'exists') {\n    formattedValue = new Date(val)\n    if (Number.isNaN(Date.parse(formattedValue))) {\n      return undefined\n    }\n  }\n\n  if (['relationship', 'upload'].includes(field.type)) {\n    if (val === 'null') {\n      formattedValue = null\n    }\n\n    // Object equality requires the value to be the first key in the object that is being queried.\n    if (\n      operator === 'equals' &&\n      formattedValue &&\n      typeof formattedValue === 'object' &&\n      formattedValue.value &&\n      formattedValue.relationTo\n    ) {\n      const { value } = formattedValue\n      const isValid = Types.ObjectId.isValid(value)\n\n      if (isValid) {\n        formattedValue.value = new Types.ObjectId(value)\n      }\n\n      let localizedPath = path\n\n      if (\n        fieldShouldBeLocalized({ field, parentIsLocalized }) &&\n        payload.config.localization &&\n        locale\n      ) {\n        localizedPath = `${path}.${locale}`\n      }\n\n      return {\n        rawQuery: {\n          $or: [\n            {\n              [localizedPath]: {\n                $eq: {\n                  // disable auto sort\n                  /* eslint-disable */\n                  value: formattedValue.value,\n                  relationTo: formattedValue.relationTo,\n                  /* eslint-enable */\n                },\n              },\n            },\n            {\n              [localizedPath]: {\n                $eq: {\n                  relationTo: formattedValue.relationTo,\n                  value: formattedValue.value,\n                },\n              },\n            },\n          ],\n        },\n      }\n    }\n\n    const relationTo = (field as RelationshipField).relationTo\n\n    if (['in', 'not_in'].includes(operator) && Array.isArray(formattedValue)) {\n      formattedValue = formattedValue.reduce((formattedValues, inVal) => {\n        if (!inVal) {\n          return formattedValues\n        }\n\n        if (typeof relationTo === 'string' && payload.collections[relationTo]?.customIDType) {\n          if (payload.collections[relationTo].customIDType === 'number') {\n            const parsedNumber = parseFloat(inVal)\n            if (!Number.isNaN(parsedNumber)) {\n              formattedValues.push(parsedNumber)\n              return formattedValues\n            }\n          }\n\n          formattedValues.push(inVal)\n          return formattedValues\n        }\n\n        if (\n          Array.isArray(relationTo) &&\n          relationTo.some((relationTo) => !!payload.collections[relationTo]?.customIDType)\n        ) {\n          if (Types.ObjectId.isValid(inVal.toString())) {\n            formattedValues.push(new Types.ObjectId(inVal))\n          } else {\n            formattedValues.push(inVal)\n          }\n          return formattedValues\n        }\n\n        if (Types.ObjectId.isValid(inVal.toString())) {\n          formattedValues.push(new Types.ObjectId(inVal))\n        }\n\n        return formattedValues\n      }, [])\n    }\n\n    // Handle hasMany relationships with equals operator and array values\n    // For array equality checking\n    if (\n      ['equals', 'not_equals'].includes(operator) &&\n      Array.isArray(formattedValue) &&\n      'hasMany' in field &&\n      field.hasMany\n    ) {\n      if (typeof relationTo === 'string') {\n        const customIDType = payload.collections[relationTo]?.customIDType\n\n        // Convert array values to proper types (ObjectId or custom ID type)\n        formattedValue = formattedValue.map((v) => {\n          if (customIDType === 'number') {\n            const parsed = parseFloat(v)\n            return Number.isNaN(parsed) ? v : parsed\n          }\n          if (!Types.ObjectId.isValid(v)) {\n            return v\n          }\n          return new Types.ObjectId(v)\n        })\n      } else {\n        // Polymorphic hasMany - convert array of {relationTo, value} objects\n        formattedValue = formattedValue.map((item) => {\n          if (typeof item === 'object' && 'value' in item) {\n            const relTo = item.relationTo\n            const customIDType = payload.collections[relTo]?.customIDType\n            if (customIDType === 'number') {\n              const parsed = parseFloat(item.value)\n              return { relationTo: relTo, value: Number.isNaN(parsed) ? item.value : parsed }\n            }\n            if (Types.ObjectId.isValid(item.value)) {\n              return { relationTo: relTo, value: new Types.ObjectId(item.value) }\n            }\n            return item\n          }\n          // Non-polymorphic format - just IDs\n          if (Types.ObjectId.isValid(item)) {\n            return new Types.ObjectId(item)\n          }\n          return item\n        })\n      }\n    } else if (\n      ['contains', 'equals', 'like', 'not_equals'].includes(operator) &&\n      (!Array.isArray(relationTo) || !path.endsWith('.relationTo'))\n    ) {\n      if (typeof relationTo === 'string') {\n        const customIDType = payload.collections[relationTo]?.customIDType\n\n        if (customIDType) {\n          if (customIDType === 'number') {\n            formattedValue = parseFloat(val)\n\n            if (Number.isNaN(formattedValue)) {\n              return { operator: formattedOperator, val: undefined }\n            }\n          }\n        } else {\n          if (!Types.ObjectId.isValid(formattedValue)) {\n            return { operator: formattedOperator, val: undefined }\n          }\n          formattedValue = new Types.ObjectId(formattedValue)\n        }\n      } else {\n        const hasCustomIDType = relationTo.some(\n          (relationTo) => !!payload.collections[relationTo]?.customIDType,\n        )\n\n        if (hasCustomIDType) {\n          if (typeof val === 'string') {\n            const formattedNumber = Number(val)\n            formattedValue = [Types.ObjectId.isValid(val) ? new Types.ObjectId(val) : val]\n            formattedOperator = operator === 'not_equals' ? 'not_in' : 'in'\n            if (!Number.isNaN(formattedNumber)) {\n              formattedValue.push(formattedNumber)\n            }\n          }\n        } else {\n          if (!Types.ObjectId.isValid(formattedValue)) {\n            return { operator: formattedOperator, val: undefined }\n          }\n          formattedValue = new Types.ObjectId(formattedValue)\n        }\n      }\n    }\n\n    if (\n      operator === 'all' &&\n      Array.isArray(relationTo) &&\n      path.endsWith('.value') &&\n      Array.isArray(formattedValue)\n    ) {\n      formattedValue.forEach((v, i) => {\n        if (Types.ObjectId.isValid(v)) {\n          formattedValue[i] = new Types.ObjectId(v)\n        }\n      })\n    }\n  }\n\n  // Set up specific formatting necessary by operators\n\n  if (operator === 'near') {\n    let lng\n    let lat\n    let maxDistance\n    let minDistance\n\n    if (Array.isArray(formattedValue)) {\n      ;[lng, lat, maxDistance, minDistance] = formattedValue\n    }\n\n    if (typeof formattedValue === 'string') {\n      ;[lng, lat, maxDistance, minDistance] = createArrayFromCommaDelineated(formattedValue)\n    }\n\n    if (lng == null || lat == null || (maxDistance == null && minDistance == null)) {\n      formattedValue = undefined\n    } else {\n      formattedValue = {\n        $geometry: { type: 'Point', coordinates: [parseFloat(lng), parseFloat(lat)] },\n      }\n\n      if (maxDistance && !Number.isNaN(Number(maxDistance))) {\n        formattedValue.$maxDistance = parseFloat(maxDistance)\n      }\n\n      if (minDistance && !Number.isNaN(Number(minDistance))) {\n        formattedValue.$minDistance = parseFloat(minDistance)\n      }\n    }\n  }\n\n  if (operator === 'within' || operator === 'intersects') {\n    formattedValue = {\n      $geometry: formattedValue,\n    }\n  }\n\n  if (path !== '_id' || (path === '_id' && hasCustomID && field.type === 'text')) {\n    if (operator === 'contains' && !Types.ObjectId.isValid(formattedValue)) {\n      if ('hasMany' in field && field.hasMany && field.type === 'select') {\n        // For hasMany select, \"contains\" means the array includes this exact value\n        if (typeof formattedValue === 'string') {\n          return {\n            rawQuery: {\n              [path]: formattedValue,\n            },\n          }\n        } else if (Array.isArray(formattedValue)) {\n          return {\n            rawQuery: {\n              $or: formattedValue.map((val) => ({\n                [path]: val,\n              })),\n            },\n          }\n        }\n      } else if ('hasMany' in field && field.hasMany && ['number', 'text'].includes(field.type)) {\n        // For hasMany text/number, \"contains\" means substring matching within array elements\n        if (typeof formattedValue === 'string') {\n          // Search for documents where any array element contains this string\n          const escapedValue = escapeRegExp(formattedValue)\n          return {\n            rawQuery: {\n              [path]: {\n                $elemMatch: {\n                  $options: 'i',\n                  $regex: escapedValue,\n                },\n              },\n            },\n          }\n        } else if (Array.isArray(formattedValue)) {\n          // Search for documents where any array element contains any of the search values\n          return {\n            rawQuery: {\n              $or: formattedValue.map((val) => {\n                const escapedValue = escapeRegExp(String(val))\n                return {\n                  [path]: {\n                    $elemMatch: {\n                      $options: 'i',\n                      $regex: escapedValue,\n                    },\n                  },\n                }\n              }),\n            },\n          }\n        }\n      } else {\n        // Regular (non-hasMany) text field\n        formattedValue = {\n          $options: 'i',\n          $regex: escapeRegExp(formattedValue),\n        }\n      }\n    }\n\n    if (operator === 'exists') {\n      formattedValue = formattedValue === 'true' || formattedValue === true\n\n      let treatEmptyString = !['array', 'blocks', 'checkbox', 'relationship', 'upload'].includes(\n        field.type,\n      )\n\n      if (field.type === 'text' && field.hasMany) {\n        treatEmptyString = false\n      } else if (field.type === 'number' && field.hasMany) {\n        treatEmptyString = false\n      } else if (field.type === 'select' && field.hasMany) {\n        treatEmptyString = false\n      }\n\n      // _id can't be empty string, will error Cast to ObjectId failed for value \"\"\n      return buildExistsQuery(formattedValue, path, treatEmptyString)\n    }\n  }\n\n  if (\n    (path === '_id' || path === 'parent') &&\n    operator === 'like' &&\n    formattedValue.length === 24 &&\n    !hasCustomID\n  ) {\n    formattedOperator = 'equals'\n  }\n\n  if (operator === 'exists') {\n    formattedValue = formattedValue === 'true' || formattedValue === true\n\n    // Clearable fields\n    if (['relationship', 'select', 'upload'].includes(field.type)) {\n      if (formattedValue) {\n        return {\n          rawQuery: {\n            $and: [{ [path]: { $exists: true } }, { [path]: { $ne: null } }],\n          },\n        }\n      } else {\n        return {\n          rawQuery: {\n            $or: [{ [path]: { $exists: false } }, { [path]: { $eq: null } }],\n          },\n        }\n      }\n    }\n  }\n\n  return { operator: formattedOperator, val: formattedValue }\n}\n"],"names":["Types","createArrayFromCommaDelineated","escapeRegExp","fieldShouldBeLocalized","buildExistsQuery","formattedValue","path","treatEmptyString","rawQuery","$and","$exists","$ne","$or","$eq","getFieldFromSegments","field","payload","segments","_field","_block","blockReferences","blocks","block","i","length","foundField","flattenedFields","find","each","name","shift","sanitizeQueryValue","hasCustomID","locale","operator","parentIsLocalized","val","formattedOperator","includes","type","split","isValid","ObjectId","undefined","map","id","parsedNumber","parseFloat","Number","isNaN","Array","isArray","reduce","formattedValues","inVal","push","toLowerCase","arrayVal","Boolean","Date","parse","value","relationTo","localizedPath","config","localization","collections","customIDType","some","toString","hasMany","v","parsed","item","relTo","endsWith","hasCustomIDType","formattedNumber","forEach","lng","lat","maxDistance","minDistance","$geometry","coordinates","$maxDistance","$minDistance","escapedValue","$elemMatch","$options","$regex","String"],"mappings":"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"}
+{"version":3,"sources":["../../src/queries/sanitizeQueryValue.ts"],"sourcesContent":["import type { FlattenedBlock, FlattenedField, Operator, Payload, RelationshipField } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { createArrayFromCommaDelineated, escapeRegExp } from 'payload'\nimport { fieldShouldBeLocalized } from 'payload/shared'\n\ntype SanitizeQueryValueArgs = {\n  field: FlattenedField\n  hasCustomID: boolean\n  locale?: string\n  operator: Operator\n  parentIsLocalized: boolean\n  path: string\n  payload: Payload\n  val: any\n}\n\nconst buildExistsQuery = (formattedValue: unknown, path: string, treatEmptyString = true) => {\n  if (formattedValue) {\n    return {\n      rawQuery: {\n        $and: [\n          { [path]: { $exists: true } },\n          { [path]: { $ne: null } },\n          ...(treatEmptyString ? [{ [path]: { $ne: '' } }] : []), // Treat empty string as null / undefined\n        ],\n      },\n    }\n  } else {\n    return {\n      rawQuery: {\n        $or: [\n          { [path]: { $exists: false } },\n          { [path]: { $eq: null } },\n          ...(treatEmptyString ? [{ [path]: { $eq: '' } }] : []), // Treat empty string as null / undefined\n        ],\n      },\n    }\n  }\n}\n\n// returns nestedField Field object from blocks.nestedField path because getLocalizedPaths splits them only for relationships\nconst getFieldFromSegments = ({\n  field,\n  payload,\n  segments,\n}: {\n  field: FlattenedBlock | FlattenedField\n  payload: Payload\n  segments: string[]\n}): FlattenedField | undefined => {\n  if ('blocks' in field) {\n    for (const _block of field.blocks) {\n      const block: FlattenedBlock | undefined =\n        typeof _block === 'string' ? payload.blocks[_block] : _block\n      if (block) {\n        const field = getFieldFromSegments({ field: block, payload, segments })\n        if (field) {\n          return field\n        }\n      }\n    }\n  }\n\n  if ('fields' in field) {\n    for (let i = 0; i < segments.length; i++) {\n      const foundField = field.flattenedFields.find((each) => each.name === segments[i])\n\n      if (!foundField) {\n        break\n      }\n\n      if (foundField && segments.length - 1 === i) {\n        return foundField\n      }\n\n      segments.shift()\n      return getFieldFromSegments({ field: foundField, payload, segments })\n    }\n  }\n}\n\nexport const sanitizeQueryValue = ({\n  field,\n  hasCustomID,\n  locale,\n  operator,\n  parentIsLocalized,\n  path,\n  payload,\n  val,\n}: SanitizeQueryValueArgs):\n  | {\n      operator?: string\n      rawQuery?: unknown\n      val?: unknown\n    }\n  | undefined => {\n  let formattedValue = val\n  let formattedOperator = operator\n\n  if (['array', 'blocks', 'group', 'tab'].includes(field.type) && path.includes('.')) {\n    const segments = path.split('.')\n    segments.shift()\n    const foundField = getFieldFromSegments({ field, payload, segments })\n\n    if (foundField) {\n      field = foundField\n    }\n  }\n\n  // Disregard invalid _ids\n  if (path === '_id') {\n    if (typeof val === 'string' && val.split(',').length === 1) {\n      if (!hasCustomID) {\n        const isValid = Types.ObjectId.isValid(val)\n\n        if (!isValid) {\n          return { operator: formattedOperator, val: undefined }\n        } else {\n          if (['in', 'not_in'].includes(operator)) {\n            formattedValue = createArrayFromCommaDelineated(formattedValue).map(\n              (id) => new Types.ObjectId(id),\n            )\n          } else {\n            formattedValue = new Types.ObjectId(val)\n          }\n        }\n      }\n\n      if (field.type === 'number') {\n        const parsedNumber = parseFloat(val)\n\n        if (Number.isNaN(parsedNumber)) {\n          return { operator: formattedOperator, val: undefined }\n        }\n      }\n    } else if (Array.isArray(val) || (typeof val === 'string' && val.split(',').length > 1)) {\n      if (typeof val === 'string') {\n        formattedValue = createArrayFromCommaDelineated(val)\n      }\n\n      if (Array.isArray(formattedValue)) {\n        formattedValue = formattedValue.reduce<unknown[]>((formattedValues, inVal) => {\n          if (!hasCustomID) {\n            if (Types.ObjectId.isValid(inVal)) {\n              formattedValues.push(new Types.ObjectId(inVal))\n\n              return formattedValues\n            }\n          }\n\n          if (field.type === 'number') {\n            const parsedNumber = parseFloat(inVal)\n            if (!Number.isNaN(parsedNumber)) {\n              formattedValues.push(parsedNumber)\n            }\n          } else {\n            formattedValues.push(inVal)\n          }\n\n          return formattedValues\n        }, [])\n      }\n    }\n  }\n\n  // Cast incoming values as proper searchable types\n  if (field.type === 'checkbox' && typeof val === 'string') {\n    if (val.toLowerCase() === 'true') {\n      formattedValue = true\n    }\n    if (val.toLowerCase() === 'false') {\n      formattedValue = false\n    }\n  }\n\n  if (['all', 'in', 'not_in'].includes(operator) && typeof formattedValue === 'string') {\n    formattedValue = createArrayFromCommaDelineated(formattedValue)\n\n    if (field.type === 'number' && Array.isArray(formattedValue)) {\n      formattedValue = formattedValue.map((arrayVal) => parseFloat(arrayVal))\n    }\n  }\n\n  if (field.type === 'number') {\n    if (typeof formattedValue === 'string' && operator !== 'exists') {\n      formattedValue = Number(val)\n    }\n\n    if (operator === 'exists') {\n      formattedValue = val === 'true' ? true : val === 'false' ? false : Boolean(val)\n      return buildExistsQuery(formattedValue, path)\n    }\n  }\n\n  if (field.type === 'date' && typeof val === 'string' && operator !== 'exists') {\n    formattedValue = new Date(val)\n    if (Number.isNaN(Date.parse(formattedValue))) {\n      return undefined\n    }\n  }\n\n  if (['relationship', 'upload'].includes(field.type)) {\n    if (val === 'null') {\n      formattedValue = null\n    }\n\n    // Object equality requires the value to be the first key in the object that is being queried.\n    if (\n      operator === 'equals' &&\n      formattedValue &&\n      typeof formattedValue === 'object' &&\n      formattedValue.value &&\n      formattedValue.relationTo\n    ) {\n      const { value } = formattedValue\n      const isValid = Types.ObjectId.isValid(value)\n\n      if (isValid) {\n        formattedValue.value = new Types.ObjectId(value)\n      }\n\n      let localizedPath = path\n\n      if (\n        fieldShouldBeLocalized({ field, parentIsLocalized }) &&\n        payload.config.localization &&\n        locale\n      ) {\n        localizedPath = `${path}.${locale}`\n      }\n\n      return {\n        rawQuery: {\n          $or: [\n            {\n              [localizedPath]: {\n                $eq: {\n                  // disable auto sort\n                  /* eslint-disable */\n                  value: formattedValue.value,\n                  relationTo: formattedValue.relationTo,\n                  /* eslint-enable */\n                },\n              },\n            },\n            {\n              [localizedPath]: {\n                $eq: {\n                  relationTo: formattedValue.relationTo,\n                  value: formattedValue.value,\n                },\n              },\n            },\n          ],\n        },\n      }\n    }\n\n    const relationTo = (field as RelationshipField).relationTo\n\n    if (['in', 'not_in'].includes(operator) && Array.isArray(formattedValue)) {\n      formattedValue = formattedValue.reduce((formattedValues, inVal) => {\n        if (!inVal) {\n          return formattedValues\n        }\n\n        if (typeof relationTo === 'string' && payload.collections[relationTo]?.customIDType) {\n          if (payload.collections[relationTo].customIDType === 'number') {\n            const parsedNumber = parseFloat(inVal)\n            if (!Number.isNaN(parsedNumber)) {\n              formattedValues.push(parsedNumber)\n              return formattedValues\n            }\n          }\n\n          formattedValues.push(inVal)\n          return formattedValues\n        }\n\n        if (\n          Array.isArray(relationTo) &&\n          relationTo.some((relationTo) => !!payload.collections[relationTo]?.customIDType)\n        ) {\n          if (Types.ObjectId.isValid(inVal.toString())) {\n            formattedValues.push(new Types.ObjectId(inVal))\n          } else {\n            formattedValues.push(inVal)\n          }\n          return formattedValues\n        }\n\n        if (Types.ObjectId.isValid(inVal.toString())) {\n          formattedValues.push(new Types.ObjectId(inVal))\n        }\n\n        return formattedValues\n      }, [])\n    }\n\n    // Handle hasMany relationships with equals operator and array values\n    // For array equality checking\n    if (\n      ['equals', 'not_equals'].includes(operator) &&\n      Array.isArray(formattedValue) &&\n      'hasMany' in field &&\n      field.hasMany\n    ) {\n      if (typeof relationTo === 'string') {\n        const customIDType = payload.collections[relationTo]?.customIDType\n\n        // Convert array values to proper types (ObjectId or custom ID type)\n        formattedValue = formattedValue.map((v) => {\n          if (customIDType === 'number') {\n            const parsed = parseFloat(v)\n            return Number.isNaN(parsed) ? v : parsed\n          }\n          if (!Types.ObjectId.isValid(v)) {\n            return v\n          }\n          return new Types.ObjectId(v)\n        })\n      } else {\n        // Polymorphic hasMany - convert array of {relationTo, value} objects\n        formattedValue = formattedValue.map((item) => {\n          if (typeof item === 'object' && 'value' in item) {\n            const relTo = item.relationTo\n            const customIDType = payload.collections[relTo]?.customIDType\n            if (customIDType === 'number') {\n              const parsed = parseFloat(item.value)\n              return { relationTo: relTo, value: Number.isNaN(parsed) ? item.value : parsed }\n            }\n            if (Types.ObjectId.isValid(item.value)) {\n              return { relationTo: relTo, value: new Types.ObjectId(item.value) }\n            }\n            return item\n          }\n          // Non-polymorphic format - just IDs\n          if (Types.ObjectId.isValid(item)) {\n            return new Types.ObjectId(item)\n          }\n          return item\n        })\n      }\n    } else if (\n      ['contains', 'equals', 'like', 'not_equals'].includes(operator) &&\n      (!Array.isArray(relationTo) || !path.endsWith('.relationTo'))\n    ) {\n      if (typeof relationTo === 'string') {\n        const customIDType = payload.collections[relationTo]?.customIDType\n\n        if (customIDType) {\n          if (customIDType === 'number') {\n            formattedValue = parseFloat(val)\n\n            if (Number.isNaN(formattedValue)) {\n              return { operator: formattedOperator, val: undefined }\n            }\n          }\n        } else {\n          if (!Types.ObjectId.isValid(formattedValue)) {\n            return { operator: formattedOperator, val: undefined }\n          }\n          formattedValue = new Types.ObjectId(formattedValue)\n        }\n      } else {\n        const hasCustomIDType = relationTo.some(\n          (relationTo) => !!payload.collections[relationTo]?.customIDType,\n        )\n\n        if (hasCustomIDType) {\n          if (typeof val === 'string') {\n            const formattedNumber = Number(val)\n            formattedValue = [Types.ObjectId.isValid(val) ? new Types.ObjectId(val) : val]\n            formattedOperator = operator === 'not_equals' ? 'not_in' : 'in'\n            if (!Number.isNaN(formattedNumber)) {\n              formattedValue.push(formattedNumber)\n            }\n          }\n        } else {\n          if (!Types.ObjectId.isValid(formattedValue)) {\n            return { operator: formattedOperator, val: undefined }\n          }\n          formattedValue = new Types.ObjectId(formattedValue)\n        }\n      }\n    }\n\n    if (\n      operator === 'all' &&\n      Array.isArray(relationTo) &&\n      path.endsWith('.value') &&\n      Array.isArray(formattedValue)\n    ) {\n      formattedValue.forEach((v, i) => {\n        if (Types.ObjectId.isValid(v)) {\n          formattedValue[i] = new Types.ObjectId(v)\n        }\n      })\n    }\n  }\n\n  // Set up specific formatting necessary by operators\n\n  if (operator === 'near') {\n    let lng\n    let lat\n    let maxDistance\n    let minDistance\n\n    if (Array.isArray(formattedValue)) {\n      ;[lng, lat, maxDistance, minDistance] = formattedValue\n    }\n\n    if (typeof formattedValue === 'string') {\n      ;[lng, lat, maxDistance, minDistance] = createArrayFromCommaDelineated(formattedValue)\n    }\n\n    if (lng == null || lat == null || (maxDistance == null && minDistance == null)) {\n      formattedValue = undefined\n    } else {\n      formattedValue = {\n        $geometry: { type: 'Point', coordinates: [parseFloat(lng), parseFloat(lat)] },\n      }\n\n      if (maxDistance && !Number.isNaN(Number(maxDistance))) {\n        formattedValue.$maxDistance = parseFloat(maxDistance)\n      }\n\n      if (minDistance && !Number.isNaN(Number(minDistance))) {\n        formattedValue.$minDistance = parseFloat(minDistance)\n      }\n    }\n  }\n\n  if (operator === 'within' || operator === 'intersects') {\n    formattedValue = {\n      $geometry: formattedValue,\n    }\n  }\n\n  if (path !== '_id' || (path === '_id' && hasCustomID && field.type === 'text')) {\n    if (operator === 'contains' && !Types.ObjectId.isValid(formattedValue)) {\n      if ('hasMany' in field && field.hasMany && field.type === 'select') {\n        // For hasMany select, \"contains\" means the array includes this exact value\n        if (typeof formattedValue === 'string') {\n          return {\n            rawQuery: {\n              [path]: formattedValue,\n            },\n          }\n        } else if (Array.isArray(formattedValue)) {\n          return {\n            rawQuery: {\n              $or: formattedValue.map((val) => ({\n                [path]: val,\n              })),\n            },\n          }\n        }\n      } else if ('hasMany' in field && field.hasMany && ['number', 'text'].includes(field.type)) {\n        // For hasMany text/number, \"contains\" means substring matching within array elements\n        if (typeof formattedValue === 'string') {\n          // Search for documents where any array element contains this string\n          const escapedValue = escapeRegExp(formattedValue)\n          return {\n            rawQuery: {\n              [path]: {\n                $elemMatch: {\n                  $options: 'i',\n                  $regex: escapedValue,\n                },\n              },\n            },\n          }\n        } else if (Array.isArray(formattedValue)) {\n          // Search for documents where any array element contains any of the search values\n          return {\n            rawQuery: {\n              $or: formattedValue.map((val) => {\n                const escapedValue = escapeRegExp(String(val))\n                return {\n                  [path]: {\n                    $elemMatch: {\n                      $options: 'i',\n                      $regex: escapedValue,\n                    },\n                  },\n                }\n              }),\n            },\n          }\n        }\n      } else {\n        // Regular (non-hasMany) text field\n        formattedValue = {\n          $options: 'i',\n          $regex: escapeRegExp(formattedValue),\n        }\n      }\n    }\n\n    if (operator === 'exists') {\n      formattedValue = formattedValue === 'true' || formattedValue === true\n\n      let treatEmptyString = !['array', 'blocks', 'checkbox', 'relationship', 'upload'].includes(\n        field.type,\n      )\n\n      if (field.type === 'text' && field.hasMany) {\n        treatEmptyString = false\n      } else if (field.type === 'number' && field.hasMany) {\n        treatEmptyString = false\n      } else if (field.type === 'select' && field.hasMany) {\n        treatEmptyString = false\n      }\n\n      // _id can't be empty string, will error Cast to ObjectId failed for value \"\"\n      return buildExistsQuery(formattedValue, path, treatEmptyString)\n    }\n  }\n\n  if (\n    (path === '_id' || path === 'parent') &&\n    operator === 'like' &&\n    formattedValue.length === 24 &&\n    !hasCustomID\n  ) {\n    formattedOperator = 'equals'\n  }\n\n  if (operator === 'exists') {\n    formattedValue = formattedValue === 'true' || formattedValue === true\n\n    // Clearable fields\n    if (['relationship', 'select', 'upload'].includes(field.type)) {\n      if (formattedValue) {\n        return {\n          rawQuery: {\n            $and: [{ [path]: { $exists: true } }, { [path]: { $ne: null } }],\n          },\n        }\n      } else {\n        return {\n          rawQuery: {\n            $or: [{ [path]: { $exists: false } }, { [path]: { $eq: null } }],\n          },\n        }\n      }\n    }\n  }\n\n  return { operator: formattedOperator, val: formattedValue }\n}\n"],"names":["Types","createArrayFromCommaDelineated","escapeRegExp","fieldShouldBeLocalized","buildExistsQuery","formattedValue","path","treatEmptyString","rawQuery","$and","$exists","$ne","$or","$eq","getFieldFromSegments","field","payload","segments","_block","blocks","block","i","length","foundField","flattenedFields","find","each","name","shift","sanitizeQueryValue","hasCustomID","locale","operator","parentIsLocalized","val","formattedOperator","includes","type","split","isValid","ObjectId","undefined","map","id","parsedNumber","parseFloat","Number","isNaN","Array","isArray","reduce","formattedValues","inVal","push","toLowerCase","arrayVal","Boolean","Date","parse","value","relationTo","localizedPath","config","localization","collections","customIDType","some","toString","hasMany","v","parsed","item","relTo","endsWith","hasCustomIDType","formattedNumber","forEach","lng","lat","maxDistance","minDistance","$geometry","coordinates","$maxDistance","$minDistance","escapedValue","$elemMatch","$options","$regex","String"],"mappings":"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"}

package/dist/utilities/buildProjectionFromSelect.js

@@ -77,7 +77,7 @@ const traverseFields = ({ adapter, databaseSchemaPath = '', fields, parentIsLoca
             case 'blocks':
                 {
                     const blocksSelect = select[field.name];
-                    for (const _block of field.blockReferences ?? field.blocks){
+                    for (const _block of field.blocks){
                         const block = typeof _block === 'string' ? adapter.payload.blocks[_block] : _block;
                         if (!block) {
                             continue;

package/dist/utilities/buildProjectionFromSelect.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/buildProjectionFromSelect.ts"],"sourcesContent":["import type {\n  FieldAffectingData,\n  FlattenedField,\n  SelectIncludeType,\n  SelectMode,\n  SelectType,\n} from 'payload'\n\nimport {\n  deepCopyObjectSimple,\n  fieldAffectsData,\n  fieldShouldBeLocalized,\n  getSelectMode,\n} from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst addFieldToProjection = ({\n  adapter,\n  databaseSchemaPath,\n  field,\n  parentIsLocalized,\n  projection,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath: string\n  field: FieldAffectingData\n  parentIsLocalized: boolean\n  projection: Record<string, true>\n}) => {\n  const { config } = adapter.payload\n\n  if (parentIsLocalized && config.localization) {\n    for (const locale of config.localization.localeCodes) {\n      const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale)\n      projection[`${localeDatabaseSchemaPath}${field.name}`] = true\n    }\n  } else {\n    projection[`${databaseSchemaPath}${field.name}`] = true\n  }\n}\n\nconst traverseFields = ({\n  adapter,\n  databaseSchemaPath = '',\n  fields,\n  parentIsLocalized = false,\n  projection,\n  select,\n  selectAllOnCurrentLevel = false,\n  selectMode,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath?: string\n  fields: FlattenedField[]\n  parentIsLocalized?: boolean\n  projection: Record<string, true>\n  select: SelectType\n  selectAllOnCurrentLevel?: boolean\n  selectMode: SelectMode\n}) => {\n  for (const field of fields) {\n    if (fieldAffectsData(field)) {\n      if (selectMode === 'include') {\n        if (select[field.name] === true || selectAllOnCurrentLevel) {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            parentIsLocalized,\n            projection,\n          })\n          continue\n        }\n\n        if (!select[field.name]) {\n          continue\n        }\n      }\n\n      if (selectMode === 'exclude') {\n        if (typeof select[field.name] === 'undefined') {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            parentIsLocalized,\n            projection,\n          })\n          continue\n        }\n\n        if (select[field.name] === false) {\n          continue\n        }\n      }\n    }\n\n    let fieldDatabaseSchemaPath = databaseSchemaPath\n\n    if (fieldAffectsData(field)) {\n      fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`\n\n      if (fieldShouldBeLocalized({ field, parentIsLocalized })) {\n        fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`\n      }\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'group':\n      case 'tab': {\n        const fieldSelect = select[field.name] as SelectType\n\n        if (field.type === 'array' && selectMode === 'include') {\n          fieldSelect.id = true\n        }\n\n        traverseFields({\n          adapter,\n          databaseSchemaPath: fieldDatabaseSchemaPath,\n          fields: field.flattenedFields,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          projection,\n          select: fieldSelect,\n          selectMode,\n        })\n\n        break\n      }\n      case 'blocks': {\n        const blocksSelect = select[field.name] as SelectType\n\n        for (const _block of field.blockReferences ?? field.blocks) {\n          const block = typeof _block === 'string' ? adapter.payload.blocks[_block] : _block\n\n          if (!block) {\n            continue\n          }\n\n          if (\n            (selectMode === 'include' && blocksSelect[block.slug] === true) ||\n            (selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined')\n          ) {\n            traverseFields({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              fields: block.flattenedFields,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              projection,\n              select: {},\n              selectAllOnCurrentLevel: true,\n              selectMode: 'include',\n            })\n            continue\n          }\n\n          let blockSelectMode = selectMode\n\n          if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {\n            blockSelectMode = 'include'\n          }\n\n          if (typeof blocksSelect[block.slug] !== 'object') {\n            blocksSelect[block.slug] = {}\n          }\n\n          if (blockSelectMode === 'include' && typeof blocksSelect[block.slug] === 'object') {\n            const blockSelect = blocksSelect[block.slug] as SelectIncludeType\n            blockSelect.id = true\n            blockSelect.blockType = true\n          }\n\n          traverseFields({\n            adapter,\n            databaseSchemaPath: fieldDatabaseSchemaPath,\n            fields: block.flattenedFields,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            projection,\n            select: blocksSelect[block.slug] as SelectType,\n            selectMode: blockSelectMode,\n          })\n        }\n\n        break\n      }\n\n      case 'relationship':\n      case 'upload': {\n        // When a relationship/upload field is selected with nested fields (for population), we still need to include the raw\n        // field value in the projection so that population can work. The nested select is handled by the population logic.\n        addFieldToProjection({\n          adapter,\n          databaseSchemaPath,\n          field,\n          parentIsLocalized,\n          projection,\n        })\n        break\n      }\n\n      default:\n        break\n    }\n  }\n}\n\nexport const buildProjectionFromSelect = ({\n  adapter,\n  fields,\n  select,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  select?: SelectType\n}): Record<string, true> | undefined => {\n  if (!select) {\n    return\n  }\n\n  const projection: Record<string, true> = {\n    _id: true,\n  }\n\n  traverseFields({\n    adapter,\n    fields,\n    projection,\n    // Clone to safely mutate it later\n    select: deepCopyObjectSimple(select),\n    selectMode: getSelectMode(select),\n  })\n\n  return projection\n}\n"],"names":["deepCopyObjectSimple","fieldAffectsData","fieldShouldBeLocalized","getSelectMode","addFieldToProjection","adapter","databaseSchemaPath","field","parentIsLocalized","projection","config","payload","localization","locale","localeCodes","localeDatabaseSchemaPath","replace","name","traverseFields","fields","select","selectAllOnCurrentLevel","selectMode","fieldDatabaseSchemaPath","type","fieldSelect","id","flattenedFields","localized","blocksSelect","_block","blockReferences","blocks","block","slug","blockSelectMode","blockSelect","blockType","buildProjectionFromSelect","_id"],"mappings":"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"}
+{"version":3,"sources":["../../src/utilities/buildProjectionFromSelect.ts"],"sourcesContent":["import type {\n  FieldAffectingData,\n  FlattenedField,\n  SelectIncludeType,\n  SelectMode,\n  SelectType,\n} from 'payload'\n\nimport {\n  deepCopyObjectSimple,\n  fieldAffectsData,\n  fieldShouldBeLocalized,\n  getSelectMode,\n} from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst addFieldToProjection = ({\n  adapter,\n  databaseSchemaPath,\n  field,\n  parentIsLocalized,\n  projection,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath: string\n  field: FieldAffectingData\n  parentIsLocalized: boolean\n  projection: Record<string, true>\n}) => {\n  const { config } = adapter.payload\n\n  if (parentIsLocalized && config.localization) {\n    for (const locale of config.localization.localeCodes) {\n      const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale)\n      projection[`${localeDatabaseSchemaPath}${field.name}`] = true\n    }\n  } else {\n    projection[`${databaseSchemaPath}${field.name}`] = true\n  }\n}\n\nconst traverseFields = ({\n  adapter,\n  databaseSchemaPath = '',\n  fields,\n  parentIsLocalized = false,\n  projection,\n  select,\n  selectAllOnCurrentLevel = false,\n  selectMode,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath?: string\n  fields: FlattenedField[]\n  parentIsLocalized?: boolean\n  projection: Record<string, true>\n  select: SelectType\n  selectAllOnCurrentLevel?: boolean\n  selectMode: SelectMode\n}) => {\n  for (const field of fields) {\n    if (fieldAffectsData(field)) {\n      if (selectMode === 'include') {\n        if (select[field.name] === true || selectAllOnCurrentLevel) {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            parentIsLocalized,\n            projection,\n          })\n          continue\n        }\n\n        if (!select[field.name]) {\n          continue\n        }\n      }\n\n      if (selectMode === 'exclude') {\n        if (typeof select[field.name] === 'undefined') {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            parentIsLocalized,\n            projection,\n          })\n          continue\n        }\n\n        if (select[field.name] === false) {\n          continue\n        }\n      }\n    }\n\n    let fieldDatabaseSchemaPath = databaseSchemaPath\n\n    if (fieldAffectsData(field)) {\n      fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`\n\n      if (fieldShouldBeLocalized({ field, parentIsLocalized })) {\n        fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`\n      }\n    }\n\n    switch (field.type) {\n      case 'array':\n      case 'group':\n      case 'tab': {\n        const fieldSelect = select[field.name] as SelectType\n\n        if (field.type === 'array' && selectMode === 'include') {\n          fieldSelect.id = true\n        }\n\n        traverseFields({\n          adapter,\n          databaseSchemaPath: fieldDatabaseSchemaPath,\n          fields: field.flattenedFields,\n          parentIsLocalized: parentIsLocalized || field.localized,\n          projection,\n          select: fieldSelect,\n          selectMode,\n        })\n\n        break\n      }\n      case 'blocks': {\n        const blocksSelect = select[field.name] as SelectType\n\n        for (const _block of field.blocks) {\n          const block = typeof _block === 'string' ? adapter.payload.blocks[_block] : _block\n\n          if (!block) {\n            continue\n          }\n\n          if (\n            (selectMode === 'include' && blocksSelect[block.slug] === true) ||\n            (selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined')\n          ) {\n            traverseFields({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              fields: block.flattenedFields,\n              parentIsLocalized: parentIsLocalized || field.localized,\n              projection,\n              select: {},\n              selectAllOnCurrentLevel: true,\n              selectMode: 'include',\n            })\n            continue\n          }\n\n          let blockSelectMode = selectMode\n\n          if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {\n            blockSelectMode = 'include'\n          }\n\n          if (typeof blocksSelect[block.slug] !== 'object') {\n            blocksSelect[block.slug] = {}\n          }\n\n          if (blockSelectMode === 'include' && typeof blocksSelect[block.slug] === 'object') {\n            const blockSelect = blocksSelect[block.slug] as SelectIncludeType\n            blockSelect.id = true\n            blockSelect.blockType = true\n          }\n\n          traverseFields({\n            adapter,\n            databaseSchemaPath: fieldDatabaseSchemaPath,\n            fields: block.flattenedFields,\n            parentIsLocalized: parentIsLocalized || field.localized,\n            projection,\n            select: blocksSelect[block.slug] as SelectType,\n            selectMode: blockSelectMode,\n          })\n        }\n\n        break\n      }\n\n      case 'relationship':\n      case 'upload': {\n        // When a relationship/upload field is selected with nested fields (for population), we still need to include the raw\n        // field value in the projection so that population can work. The nested select is handled by the population logic.\n        addFieldToProjection({\n          adapter,\n          databaseSchemaPath,\n          field,\n          parentIsLocalized,\n          projection,\n        })\n        break\n      }\n\n      default:\n        break\n    }\n  }\n}\n\nexport const buildProjectionFromSelect = ({\n  adapter,\n  fields,\n  select,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  select?: SelectType\n}): Record<string, true> | undefined => {\n  if (!select) {\n    return\n  }\n\n  const projection: Record<string, true> = {\n    _id: true,\n  }\n\n  traverseFields({\n    adapter,\n    fields,\n    projection,\n    // Clone to safely mutate it later\n    select: deepCopyObjectSimple(select),\n    selectMode: getSelectMode(select),\n  })\n\n  return projection\n}\n"],"names":["deepCopyObjectSimple","fieldAffectsData","fieldShouldBeLocalized","getSelectMode","addFieldToProjection","adapter","databaseSchemaPath","field","parentIsLocalized","projection","config","payload","localization","locale","localeCodes","localeDatabaseSchemaPath","replace","name","traverseFields","fields","select","selectAllOnCurrentLevel","selectMode","fieldDatabaseSchemaPath","type","fieldSelect","id","flattenedFields","localized","blocksSelect","_block","blocks","block","slug","blockSelectMode","blockSelect","blockType","buildProjectionFromSelect","_id"],"mappings":"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"}

package/dist/utilities/transform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utilities/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,KAAK,EAQN,MAAM,SAAS,CAAA;AAMhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAmQlD,KAAK,IAAI,GAAG;IACV,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAC9C,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACzD,uCAAuC;IACvC,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAmMD;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,4HAYvB,IAAI,qBA6XN,CAAA"}
+{"version":3,"file":"transform.d.ts","sourceRoot":"","sources":["../../src/utilities/transform.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,KAAK,EAQN,MAAM,SAAS,CAAA;AAMhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAmQlD,KAAK,IAAI,GAAG;IACV,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAClD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAC5C,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,KAAK,EAAE,GAAG,EAAE,CAAA;KAAE,GAAG,GAAG,CAAC,CAAA;IAC9C,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAA;IACzD,uCAAuC;IACvC,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,kEAAkE;IAClE,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB;;;;OAIG;IACH,SAAS,EAAE,MAAM,GAAG,OAAO,CAAA;IAC3B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B;;;OAGG;IACH,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AA2KD;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,4HAYvB,IAAI,qBA6XN,CAAA"}

package/dist/utilities/transform.js

@@ -202,23 +202,11 @@ const stripFields = ({ config, data, fields, parentIsLocalized = false, reserved
                             if (field.type === 'array') {
                                 fields = field.flattenedFields;
                             } else {
-                                let maybeBlock = undefined;
-                                if (field.blockReferences) {
-                                    const maybeBlockReference = field.blockReferences.find((each)=>{
-                                        const slug = typeof each === 'string' ? each : each.slug;
-                                        return slug === data.blockType;
-                                    });
-                                    if (maybeBlockReference) {
-                                        if (typeof maybeBlockReference === 'object') {
-                                            maybeBlock = maybeBlockReference;
-                                        } else {
-                                            maybeBlock = config.blocks?.find((each)=>each.slug === maybeBlockReference);
-                                        }
-                                    }
-                                }
-                                if (!maybeBlock) {
-                                    maybeBlock = field.blocks.find((each)=>each.slug === data.blockType);
-                                }
+                                const blockOrSlug = field.blocks.find((each)=>{
+                                    const slug = typeof each === 'string' ? each : each.slug;
+                                    return slug === data.blockType;
+                                });
+                                const maybeBlock = typeof blockOrSlug === 'string' ? config.blocks?.find((each)=>each.slug === blockOrSlug) : blockOrSlug;
                                 if (maybeBlock) {
                                     fields = maybeBlock.flattenedFields;
                                 } else {
@@ -264,23 +252,11 @@ const stripFields = ({ config, data, fields, parentIsLocalized = false, reserved
                     if (field.type === 'array') {
                         fields = field.flattenedFields;
                     } else {
-                        let maybeBlock = undefined;
-                        if (field.blockReferences) {
-                            const maybeBlockReference = field.blockReferences.find((each)=>{
-                                const slug = typeof each === 'string' ? each : each.slug;
-                                return slug === data.blockType;
-                            });
-                            if (maybeBlockReference) {
-                                if (typeof maybeBlockReference === 'object') {
-                                    maybeBlock = maybeBlockReference;
-                                } else {
-                                    maybeBlock = config.blocks?.find((each)=>each.slug === maybeBlockReference);
-                                }
-                            }
-                        }
-                        if (!maybeBlock) {
-                            maybeBlock = field.blocks.find((each)=>each.slug === data.blockType);
-                        }
+                        const blockOrSlug = field.blocks.find((each)=>{
+                            const slug = typeof each === 'string' ? each : each.slug;
+                            return slug === data.blockType;
+                        });
+                        const maybeBlock = typeof blockOrSlug === 'string' ? config.blocks?.find((each)=>each.slug === blockOrSlug) : blockOrSlug;
                         if (maybeBlock) {
                             fields = maybeBlock.flattenedFields;
                         } else {