@payloadcms/db-mongodb 4.0.0-internal.934870d → 4.0.0-internal.952ed66

package/dist/predefinedMigrations/migrateSizesToVariants.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/predefinedMigrations/migrateSizesToVariants.ts"],"sourcesContent":["import type {\n  Collection,\n  CreateIndexesOptions,\n  Document,\n  IndexDescriptionInfo,\n  IndexDirection,\n} from 'mongodb'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport { isDeepStrictEqual } from 'node:util'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getSession } from '../utilities/getSession.js'\n\n/** Mongo error codes for an index that conflicts with an existing index. */\nconst INDEX_CONFLICT_CODES = new Set([85, 86])\n/** Mongo error code for a collection that hasn't been created yet. */\nconst NAMESPACE_NOT_FOUND_CODE = 26\nconst GENERATED_VARIANT_METADATA_FIELDS = new Set([\n  'filename',\n  'filesize',\n  'height',\n  'mimeType',\n  'url',\n  'width',\n])\n\n/**\n * Moves every upload collection's stored image sizes between the legacy `sizes` field and\n * `variants`, on each collection and its versions collection (`version.sizes`). Uses `$rename`,\n * so no document is rewritten beyond the renamed key, and re-keys the indexes on those fields.\n * Documents that are already renamed are left as they are, so it's safe to re-run.\n */\nexport async function migrateSizesToVariants({\n  direction = 'up',\n  payload,\n  req,\n}: {\n  direction?: 'down' | 'up'\n  payload: Payload\n  req?: Partial<PayloadRequest>\n}): Promise<void> {\n  const adapter = payload.db as unknown as MongooseAdapter\n  const session = await getSession(adapter, req)\n  const [from, to] = direction === 'up' ? ['sizes', 'variants'] : ['variants', 'sizes']\n\n  const targets: {\n    collection: Collection\n    expectedVariantNames: string[]\n    fromPath: string\n    toPath: string\n  }[] = []\n\n  for (const collection of payload.config.collections) {\n    if (!collection.upload) {\n      continue\n    }\n\n    const upload = typeof collection.upload === 'object' ? collection.upload : undefined\n    const expectedVariantNames = (upload?.variants ?? []).map(({ name }) => name)\n\n    targets.push({\n      collection: adapter.collections[collection.slug]!.collection,\n      expectedVariantNames,\n      fromPath: from,\n      toPath: to,\n    })\n\n    if (collection.versions && adapter.versions[collection.slug]) {\n      targets.push({\n        collection: adapter.versions[collection.slug]!.collection,\n        expectedVariantNames,\n        fromPath: `version.${from}`,\n        toPath: `version.${to}`,\n      })\n    }\n  }\n\n  for (const { collection, expectedVariantNames, fromPath, toPath } of targets) {\n    const [sourceData, directCollision] = await Promise.all([\n      collection.findOne({ [fromPath]: { $exists: true } }, { projection: { _id: 1 } }),\n      collection.findOne(\n        { [fromPath]: { $exists: true }, [toPath]: { $exists: true } },\n        { projection: { _id: 1 } },\n      ),\n    ])\n\n    if (\n      sourceData &&\n      (directCollision ||\n        (await findUnexpectedDestinationData({ collection, expectedVariantNames, toPath })))\n    ) {\n      throw new Error(\n        `Cannot run the sizes-to-variants migration because collection \"${collection.collectionName}\" contains both \"${fromPath}\" and \"${toPath}\" data. Move or rename the existing destination data before running this migration.`,\n      )\n    }\n  }\n\n  // Index changes can't be part of a multi-document transaction, and one made after the\n  // migration's transaction has written to a collection aborts it. A transaction's snapshot starts\n  // at its first operation, so re-keying every index before any transactional write is safe.\n  for (const target of targets) {\n    await rekeyIndexes(target)\n  }\n\n  for (const { collection, fromPath, toPath } of targets) {\n    const result = await collection.updateMany(\n      { [fromPath]: { $exists: true }, [toPath]: { $exists: false } },\n      { $rename: { [fromPath]: toPath } },\n      { session },\n    )\n\n    payload.logger.info({\n      msg: `sizes-to-variants (${direction}): renamed ${fromPath} on ${result.modifiedCount} document(s) in \"${collection.collectionName}\"`,\n    })\n  }\n}\n\nasync function findUnexpectedDestinationData({\n  collection,\n  expectedVariantNames,\n  toPath,\n}: {\n  collection: Collection\n  expectedVariantNames: string[]\n  toPath: string\n}): Promise<Document | null> {\n  const expectedVariantNameSet = new Set(expectedVariantNames)\n  const cursor = collection.find(\n    { [toPath]: { $exists: true } },\n    { projection: { _id: 1, [toPath]: 1 } },\n  )\n\n  try {\n    for await (const document of cursor) {\n      const destinationData = getDocumentPath({ document, path: toPath })\n\n      if (hasUnexpectedVariantData({ destinationData, expectedVariantNameSet })) {\n        return document\n      }\n    }\n  } finally {\n    await cursor.close()\n  }\n\n  return null\n}\n\nfunction getDocumentPath({ document, path }: { document: Document; path: string }): unknown {\n  return path.split('.').reduce<unknown>((value, pathSegment) => {\n    if (!isRecord(value)) {\n      return undefined\n    }\n\n    return value[pathSegment]\n  }, document)\n}\n\nfunction hasUnexpectedVariantData({\n  destinationData,\n  expectedVariantNameSet,\n}: {\n  destinationData: unknown\n  expectedVariantNameSet: Set<string>\n}): boolean {\n  if (!isRecord(destinationData)) {\n    return destinationData !== null && destinationData !== undefined\n  }\n\n  for (const [variantName, variantData] of Object.entries(destinationData)) {\n    if (!expectedVariantNameSet.has(variantName)) {\n      return true\n    }\n\n    if (variantData === null || variantData === undefined) {\n      continue\n    }\n\n    if (\n      !isRecord(variantData) ||\n      Object.keys(variantData).some(\n        (metadataFieldName) => !GENERATED_VARIANT_METADATA_FIELDS.has(metadataFieldName),\n      )\n    ) {\n      return true\n    }\n  }\n\n  return false\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return value !== null && typeof value === 'object' && !Array.isArray(value)\n}\n\nasync function rekeyIndexes({\n  collection,\n  fromPath,\n  toPath,\n}: {\n  collection: Collection\n  fromPath: string\n  toPath: string\n}): Promise<void> {\n  let indexes: IndexDescriptionInfo[]\n\n  try {\n    indexes = await collection.indexes()\n  } catch (err) {\n    if ((err as { code?: number }).code === NAMESPACE_NOT_FOUND_CODE) {\n      return\n    }\n\n    throw err\n  }\n\n  for (const index of indexes) {\n    const sourceKeys = getIndexKeysForCreate({ fromPath, index, toPath: fromPath })\n\n    if (!Object.keys(sourceKeys).some((key) => isPathAtOrBelow({ key, path: fromPath }))) {\n      continue\n    }\n\n    const rekeyedKeys = getIndexKeysForCreate({ fromPath, index, toPath })\n    const destinationOptions = getDestinationIndexOptions({ fromPath, index, toPath })\n\n    if (index.weights && '_fts' in index.key && '_ftsx' in index.key) {\n      await rekeyTextIndex({\n        collection,\n        destinationOptions,\n        index,\n        rekeyedKeys,\n        sourceKeys,\n      })\n      continue\n    }\n\n    try {\n      await collection.createIndex(rekeyedKeys, destinationOptions)\n    } catch (err) {\n      if (!INDEX_CONFLICT_CODES.has((err as { code?: number }).code ?? 0)) {\n        throw err\n      }\n\n      const destinationIndex = (await collection.indexes()).find((candidate) =>\n        isDeepStrictEqual(\n          getIndexKeysForCreate({ fromPath: toPath, index: candidate, toPath }),\n          rekeyedKeys,\n        ),\n      )\n      const existingDestinationOptions = destinationIndex\n        ? getDestinationIndexOptions({\n            fromPath: toPath,\n            index: destinationIndex,\n            toPath,\n          })\n        : undefined\n\n      if (!destinationIndex || !isDeepStrictEqual(existingDestinationOptions, destinationOptions)) {\n        throw err\n      }\n    }\n\n    await collection.dropIndex(index.name!)\n  }\n}\n\nasync function rekeyTextIndex({\n  collection,\n  destinationOptions,\n  index,\n  rekeyedKeys,\n  sourceKeys,\n}: {\n  collection: Collection\n  destinationOptions: CreateIndexesOptions\n  index: IndexDescriptionInfo\n  rekeyedKeys: Record<string, IndexDirection>\n  sourceKeys: Record<string, IndexDirection>\n}): Promise<void> {\n  if (!index.name) {\n    throw new Error('Cannot re-key an unnamed MongoDB text index.')\n  }\n\n  const sourceOptions: CreateIndexesOptions = {\n    ...getDestinationIndexOptions({ fromPath: '', index, toPath: '' }),\n    name: index.name,\n  }\n\n  await collection.dropIndex(index.name)\n\n  try {\n    await collection.createIndex(rekeyedKeys, destinationOptions)\n  } catch (err) {\n    try {\n      await collection.createIndex(sourceKeys, sourceOptions)\n    } catch (restoreErr) {\n      throw new AggregateError(\n        [err, restoreErr],\n        `Failed to create the replacement for MongoDB text index \"${index.name}\" and failed to restore the source index.`,\n      )\n    }\n\n    throw err\n  }\n}\n\nfunction getIndexKeysForCreate({\n  fromPath,\n  index,\n  toPath,\n}: {\n  fromPath: string\n  index: IndexDescriptionInfo\n  toPath: string\n}): Record<string, IndexDirection> {\n  const keys: [string, IndexDirection][] = []\n  const hasInternalTextKeys = '_fts' in index.key && '_ftsx' in index.key\n\n  for (const [key, value] of Object.entries(index.key)) {\n    if (hasInternalTextKeys && key === '_fts') {\n      for (const textPath of Object.keys(index.weights ?? {})) {\n        keys.push([rekeyPath({ fromPath, path: textPath, toPath }), 'text'])\n      }\n      continue\n    }\n\n    if (hasInternalTextKeys && key === '_ftsx') {\n      continue\n    }\n\n    keys.push([rekeyPath({ fromPath, path: key, toPath }), value])\n  }\n\n  return Object.fromEntries(keys)\n}\n\nfunction getDestinationIndexOptions({\n  fromPath,\n  index,\n  toPath,\n}: {\n  fromPath: string\n  index: IndexDescriptionInfo\n  toPath: string\n}): CreateIndexesOptions {\n  const options: CreateIndexesOptions = {\n    '2dsphereIndexVersion': index['2dsphereIndexVersion'],\n    background: index.background,\n    bits: index.bits,\n    bucketSize: index.bucketSize,\n    collation: index.collation,\n    default_language: index.default_language,\n    expireAfterSeconds: index.expireAfterSeconds,\n    hidden: index.hidden,\n    language_override: index.language_override,\n    max: index.max,\n    min: index.min,\n    partialFilterExpression: index.partialFilterExpression\n      ? rekeyDocumentPaths({ document: index.partialFilterExpression, fromPath, toPath })\n      : undefined,\n    sparse: index.sparse,\n    storageEngine: index.storageEngine,\n    textIndexVersion: index.textIndexVersion,\n    unique: index.unique,\n    weights: index.weights\n      ? rekeyDocumentPaths({ document: index.weights, fromPath, toPath })\n      : undefined,\n    wildcardProjection: index.wildcardProjection\n      ? rekeyDocumentPaths({ document: index.wildcardProjection, fromPath, toPath })\n      : undefined,\n  }\n\n  return Object.fromEntries(\n    Object.entries(options).filter(([, value]) => value !== undefined),\n  ) as CreateIndexesOptions\n}\n\nfunction rekeyDocumentPaths({\n  document,\n  fromPath,\n  toPath,\n}: {\n  document: Document\n  fromPath: string\n  toPath: string\n}): Document {\n  return Object.fromEntries(\n    Object.entries(document).map(([key, value]) => [\n      rekeyPath({ fromPath, path: key, toPath }),\n      rekeyDocumentValue({ fromPath, toPath, value }),\n    ]),\n  )\n}\n\nfunction isPathAtOrBelow({ key, path }: { key: string; path: string }): boolean {\n  return key === path || key.startsWith(`${path}.`)\n}\n\nfunction rekeyPath({\n  fromPath,\n  path,\n  toPath,\n}: {\n  fromPath: string\n  path: string\n  toPath: string\n}): string {\n  return isPathAtOrBelow({ key: path, path: fromPath })\n    ? `${toPath}${path.slice(fromPath.length)}`\n    : path\n}\n\nfunction rekeyDocumentValue({\n  fromPath,\n  toPath,\n  value,\n}: {\n  fromPath: string\n  toPath: string\n  value: unknown\n}): unknown {\n  if (Array.isArray(value)) {\n    return value.map((item) => rekeyDocumentValue({ fromPath, toPath, value: item }))\n  }\n\n  if (\n    value !== null &&\n    typeof value === 'object' &&\n    (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)\n  ) {\n    return rekeyDocumentPaths({ document: value as Document, fromPath, toPath })\n  }\n\n  return value\n}\n"],"names":["isDeepStrictEqual","getSession","INDEX_CONFLICT_CODES","Set","NAMESPACE_NOT_FOUND_CODE","GENERATED_VARIANT_METADATA_FIELDS","migrateSizesToVariants","direction","payload","req","adapter","db","session","from","to","targets","collection","config","collections","upload","undefined","expectedVariantNames","variants","map","name","push","slug","fromPath","toPath","versions","sourceData","directCollision","Promise","all","findOne","$exists","projection","_id","findUnexpectedDestinationData","Error","collectionName","target","rekeyIndexes","result","updateMany","$rename","logger","info","msg","modifiedCount","expectedVariantNameSet","cursor","find","document","destinationData","getDocumentPath","path","hasUnexpectedVariantData","close","split","reduce","value","pathSegment","isRecord","variantName","variantData","Object","entries","has","keys","some","metadataFieldName","Array","isArray","indexes","err","code","index","sourceKeys","getIndexKeysForCreate","key","isPathAtOrBelow","rekeyedKeys","destinationOptions","getDestinationIndexOptions","weights","rekeyTextIndex","createIndex","destinationIndex","candidate","existingDestinationOptions","dropIndex","sourceOptions","restoreErr","AggregateError","hasInternalTextKeys","textPath","rekeyPath","fromEntries","options","background","bits","bucketSize","collation","default_language","expireAfterSeconds","hidden","language_override","max","min","partialFilterExpression","rekeyDocumentPaths","sparse","storageEngine","textIndexVersion","unique","wildcardProjection","filter","rekeyDocumentValue","startsWith","slice","length","item","getPrototypeOf","prototype"],"mappings":"AASA,SAASA,iBAAiB,QAAQ,YAAW;AAI7C,SAASC,UAAU,QAAQ,6BAA4B;AAEvD,0EAA0E,GAC1E,MAAMC,uBAAuB,IAAIC,IAAI;IAAC;IAAI;CAAG;AAC7C,oEAAoE,GACpE,MAAMC,2BAA2B;AACjC,MAAMC,oCAAoC,IAAIF,IAAI;IAChD;IACA;IACA;IACA;IACA;IACA;CACD;AAED;;;;;CAKC,GACD,OAAO,eAAeG,uBAAuB,EAC3CC,YAAY,IAAI,EAChBC,OAAO,EACPC,GAAG,EAKJ;IACC,MAAMC,UAAUF,QAAQG,EAAE;IAC1B,MAAMC,UAAU,MAAMX,WAAWS,SAASD;IAC1C,MAAM,CAACI,MAAMC,GAAG,GAAGP,cAAc,OAAO;QAAC;QAAS;KAAW,GAAG;QAAC;QAAY;KAAQ;IAErF,MAAMQ,UAKA,EAAE;IAER,KAAK,MAAMC,cAAcR,QAAQS,MAAM,CAACC,WAAW,CAAE;QACnD,IAAI,CAACF,WAAWG,MAAM,EAAE;YACtB;QACF;QAEA,MAAMA,SAAS,OAAOH,WAAWG,MAAM,KAAK,WAAWH,WAAWG,MAAM,GAAGC;QAC3E,MAAMC,uBAAuB,AAACF,CAAAA,QAAQG,YAAY,EAAE,AAAD,EAAGC,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA;QAExET,QAAQU,IAAI,CAAC;YACXT,YAAYN,QAAQQ,WAAW,CAACF,WAAWU,IAAI,CAAC,CAAEV,UAAU;YAC5DK;YACAM,UAAUd;YACVe,QAAQd;QACV;QAEA,IAAIE,WAAWa,QAAQ,IAAInB,QAAQmB,QAAQ,CAACb,WAAWU,IAAI,CAAC,EAAE;YAC5DX,QAAQU,IAAI,CAAC;gBACXT,YAAYN,QAAQmB,QAAQ,CAACb,WAAWU,IAAI,CAAC,CAAEV,UAAU;gBACzDK;gBACAM,UAAU,CAAC,QAAQ,EAAEd,MAAM;gBAC3Be,QAAQ,CAAC,QAAQ,EAAEd,IAAI;YACzB;QACF;IACF;IAEA,KAAK,MAAM,EAAEE,UAAU,EAAEK,oBAAoB,EAAEM,QAAQ,EAAEC,MAAM,EAAE,IAAIb,QAAS;QAC5E,MAAM,CAACe,YAAYC,gBAAgB,GAAG,MAAMC,QAAQC,GAAG,CAAC;YACtDjB,WAAWkB,OAAO,CAAC;gBAAE,CAACP,SAAS,EAAE;oBAAEQ,SAAS;gBAAK;YAAE,GAAG;gBAAEC,YAAY;oBAAEC,KAAK;gBAAE;YAAE;YAC/ErB,WAAWkB,OAAO,CAChB;gBAAE,CAACP,SAAS,EAAE;oBAAEQ,SAAS;gBAAK;gBAAG,CAACP,OAAO,EAAE;oBAAEO,SAAS;gBAAK;YAAE,GAC7D;gBAAEC,YAAY;oBAAEC,KAAK;gBAAE;YAAE;SAE5B;QAED,IACEP,cACCC,CAAAA,mBACE,MAAMO,8BAA8B;YAAEtB;YAAYK;YAAsBO;QAAO,EAAE,GACpF;YACA,MAAM,IAAIW,MACR,CAAC,+DAA+D,EAAEvB,WAAWwB,cAAc,CAAC,iBAAiB,EAAEb,SAAS,OAAO,EAAEC,OAAO,mFAAmF,CAAC;QAEhO;IACF;IAEA,sFAAsF;IACtF,iGAAiG;IACjG,2FAA2F;IAC3F,KAAK,MAAMa,UAAU1B,QAAS;QAC5B,MAAM2B,aAAaD;IACrB;IAEA,KAAK,MAAM,EAAEzB,UAAU,EAAEW,QAAQ,EAAEC,MAAM,EAAE,IAAIb,QAAS;QACtD,MAAM4B,SAAS,MAAM3B,WAAW4B,UAAU,CACxC;YAAE,CAACjB,SAAS,EAAE;gBAAEQ,SAAS;YAAK;YAAG,CAACP,OAAO,EAAE;gBAAEO,SAAS;YAAM;QAAE,GAC9D;YAAEU,SAAS;gBAAE,CAAClB,SAAS,EAAEC;YAAO;QAAE,GAClC;YAAEhB;QAAQ;QAGZJ,QAAQsC,MAAM,CAACC,IAAI,CAAC;YAClBC,KAAK,CAAC,mBAAmB,EAAEzC,UAAU,WAAW,EAAEoB,SAAS,IAAI,EAAEgB,OAAOM,aAAa,CAAC,iBAAiB,EAAEjC,WAAWwB,cAAc,CAAC,CAAC,CAAC;QACvI;IACF;AACF;AAEA,eAAeF,8BAA8B,EAC3CtB,UAAU,EACVK,oBAAoB,EACpBO,MAAM,EAKP;IACC,MAAMsB,yBAAyB,IAAI/C,IAAIkB;IACvC,MAAM8B,SAASnC,WAAWoC,IAAI,CAC5B;QAAE,CAACxB,OAAO,EAAE;YAAEO,SAAS;QAAK;IAAE,GAC9B;QAAEC,YAAY;YAAEC,KAAK;YAAG,CAACT,OAAO,EAAE;QAAE;IAAE;IAGxC,IAAI;QACF,WAAW,MAAMyB,YAAYF,OAAQ;YACnC,MAAMG,kBAAkBC,gBAAgB;gBAAEF;gBAAUG,MAAM5B;YAAO;YAEjE,IAAI6B,yBAAyB;gBAAEH;gBAAiBJ;YAAuB,IAAI;gBACzE,OAAOG;YACT;QACF;IACF,SAAU;QACR,MAAMF,OAAOO,KAAK;IACpB;IAEA,OAAO;AACT;AAEA,SAASH,gBAAgB,EAAEF,QAAQ,EAAEG,IAAI,EAAwC;IAC/E,OAAOA,KAAKG,KAAK,CAAC,KAAKC,MAAM,CAAU,CAACC,OAAOC;QAC7C,IAAI,CAACC,SAASF,QAAQ;YACpB,OAAOzC;QACT;QAEA,OAAOyC,KAAK,CAACC,YAAY;IAC3B,GAAGT;AACL;AAEA,SAASI,yBAAyB,EAChCH,eAAe,EACfJ,sBAAsB,EAIvB;IACC,IAAI,CAACa,SAAST,kBAAkB;QAC9B,OAAOA,oBAAoB,QAAQA,oBAAoBlC;IACzD;IAEA,KAAK,MAAM,CAAC4C,aAAaC,YAAY,IAAIC,OAAOC,OAAO,CAACb,iBAAkB;QACxE,IAAI,CAACJ,uBAAuBkB,GAAG,CAACJ,cAAc;YAC5C,OAAO;QACT;QAEA,IAAIC,gBAAgB,QAAQA,gBAAgB7C,WAAW;YACrD;QACF;QAEA,IACE,CAAC2C,SAASE,gBACVC,OAAOG,IAAI,CAACJ,aAAaK,IAAI,CAC3B,CAACC,oBAAsB,CAAClE,kCAAkC+D,GAAG,CAACG,qBAEhE;YACA,OAAO;QACT;IACF;IAEA,OAAO;AACT;AAEA,SAASR,SAASF,KAAc;IAC9B,OAAOA,UAAU,QAAQ,OAAOA,UAAU,YAAY,CAACW,MAAMC,OAAO,CAACZ;AACvE;AAEA,eAAenB,aAAa,EAC1B1B,UAAU,EACVW,QAAQ,EACRC,MAAM,EAKP;IACC,IAAI8C;IAEJ,IAAI;QACFA,UAAU,MAAM1D,WAAW0D,OAAO;IACpC,EAAE,OAAOC,KAAK;QACZ,IAAI,AAACA,IAA0BC,IAAI,KAAKxE,0BAA0B;YAChE;QACF;QAEA,MAAMuE;IACR;IAEA,KAAK,MAAME,SAASH,QAAS;QAC3B,MAAMI,aAAaC,sBAAsB;YAAEpD;YAAUkD;YAAOjD,QAAQD;QAAS;QAE7E,IAAI,CAACuC,OAAOG,IAAI,CAACS,YAAYR,IAAI,CAAC,CAACU,MAAQC,gBAAgB;gBAAED;gBAAKxB,MAAM7B;YAAS,KAAK;YACpF;QACF;QAEA,MAAMuD,cAAcH,sBAAsB;YAAEpD;YAAUkD;YAAOjD;QAAO;QACpE,MAAMuD,qBAAqBC,2BAA2B;YAAEzD;YAAUkD;YAAOjD;QAAO;QAEhF,IAAIiD,MAAMQ,OAAO,IAAI,UAAUR,MAAMG,GAAG,IAAI,WAAWH,MAAMG,GAAG,EAAE;YAChE,MAAMM,eAAe;gBACnBtE;gBACAmE;gBACAN;gBACAK;gBACAJ;YACF;YACA;QACF;QAEA,IAAI;YACF,MAAM9D,WAAWuE,WAAW,CAACL,aAAaC;QAC5C,EAAE,OAAOR,KAAK;YACZ,IAAI,CAACzE,qBAAqBkE,GAAG,CAAC,AAACO,IAA0BC,IAAI,IAAI,IAAI;gBACnE,MAAMD;YACR;YAEA,MAAMa,mBAAmB,AAAC,CAAA,MAAMxE,WAAW0D,OAAO,EAAC,EAAGtB,IAAI,CAAC,CAACqC,YAC1DzF,kBACE+E,sBAAsB;oBAAEpD,UAAUC;oBAAQiD,OAAOY;oBAAW7D;gBAAO,IACnEsD;YAGJ,MAAMQ,6BAA6BF,mBAC/BJ,2BAA2B;gBACzBzD,UAAUC;gBACViD,OAAOW;gBACP5D;YACF,KACAR;YAEJ,IAAI,CAACoE,oBAAoB,CAACxF,kBAAkB0F,4BAA4BP,qBAAqB;gBAC3F,MAAMR;YACR;QACF;QAEA,MAAM3D,WAAW2E,SAAS,CAACd,MAAMrD,IAAI;IACvC;AACF;AAEA,eAAe8D,eAAe,EAC5BtE,UAAU,EACVmE,kBAAkB,EAClBN,KAAK,EACLK,WAAW,EACXJ,UAAU,EAOX;IACC,IAAI,CAACD,MAAMrD,IAAI,EAAE;QACf,MAAM,IAAIe,MAAM;IAClB;IAEA,MAAMqD,gBAAsC;QAC1C,GAAGR,2BAA2B;YAAEzD,UAAU;YAAIkD;YAAOjD,QAAQ;QAAG,EAAE;QAClEJ,MAAMqD,MAAMrD,IAAI;IAClB;IAEA,MAAMR,WAAW2E,SAAS,CAACd,MAAMrD,IAAI;IAErC,IAAI;QACF,MAAMR,WAAWuE,WAAW,CAACL,aAAaC;IAC5C,EAAE,OAAOR,KAAK;QACZ,IAAI;YACF,MAAM3D,WAAWuE,WAAW,CAACT,YAAYc;QAC3C,EAAE,OAAOC,YAAY;YACnB,MAAM,IAAIC,eACR;gBAACnB;gBAAKkB;aAAW,EACjB,CAAC,yDAAyD,EAAEhB,MAAMrD,IAAI,CAAC,yCAAyC,CAAC;QAErH;QAEA,MAAMmD;IACR;AACF;AAEA,SAASI,sBAAsB,EAC7BpD,QAAQ,EACRkD,KAAK,EACLjD,MAAM,EAKP;IACC,MAAMyC,OAAmC,EAAE;IAC3C,MAAM0B,sBAAsB,UAAUlB,MAAMG,GAAG,IAAI,WAAWH,MAAMG,GAAG;IAEvE,KAAK,MAAM,CAACA,KAAKnB,MAAM,IAAIK,OAAOC,OAAO,CAACU,MAAMG,GAAG,EAAG;QACpD,IAAIe,uBAAuBf,QAAQ,QAAQ;YACzC,KAAK,MAAMgB,YAAY9B,OAAOG,IAAI,CAACQ,MAAMQ,OAAO,IAAI,CAAC,GAAI;gBACvDhB,KAAK5C,IAAI,CAAC;oBAACwE,UAAU;wBAAEtE;wBAAU6B,MAAMwC;wBAAUpE;oBAAO;oBAAI;iBAAO;YACrE;YACA;QACF;QAEA,IAAImE,uBAAuBf,QAAQ,SAAS;YAC1C;QACF;QAEAX,KAAK5C,IAAI,CAAC;YAACwE,UAAU;gBAAEtE;gBAAU6B,MAAMwB;gBAAKpD;YAAO;YAAIiC;SAAM;IAC/D;IAEA,OAAOK,OAAOgC,WAAW,CAAC7B;AAC5B;AAEA,SAASe,2BAA2B,EAClCzD,QAAQ,EACRkD,KAAK,EACLjD,MAAM,EAKP;IACC,MAAMuE,UAAgC;QACpC,wBAAwBtB,KAAK,CAAC,uBAAuB;QACrDuB,YAAYvB,MAAMuB,UAAU;QAC5BC,MAAMxB,MAAMwB,IAAI;QAChBC,YAAYzB,MAAMyB,UAAU;QAC5BC,WAAW1B,MAAM0B,SAAS;QAC1BC,kBAAkB3B,MAAM2B,gBAAgB;QACxCC,oBAAoB5B,MAAM4B,kBAAkB;QAC5CC,QAAQ7B,MAAM6B,MAAM;QACpBC,mBAAmB9B,MAAM8B,iBAAiB;QAC1CC,KAAK/B,MAAM+B,GAAG;QACdC,KAAKhC,MAAMgC,GAAG;QACdC,yBAAyBjC,MAAMiC,uBAAuB,GAClDC,mBAAmB;YAAE1D,UAAUwB,MAAMiC,uBAAuB;YAAEnF;YAAUC;QAAO,KAC/ER;QACJ4F,QAAQnC,MAAMmC,MAAM;QACpBC,eAAepC,MAAMoC,aAAa;QAClCC,kBAAkBrC,MAAMqC,gBAAgB;QACxCC,QAAQtC,MAAMsC,MAAM;QACpB9B,SAASR,MAAMQ,OAAO,GAClB0B,mBAAmB;YAAE1D,UAAUwB,MAAMQ,OAAO;YAAE1D;YAAUC;QAAO,KAC/DR;QACJgG,oBAAoBvC,MAAMuC,kBAAkB,GACxCL,mBAAmB;YAAE1D,UAAUwB,MAAMuC,kBAAkB;YAAEzF;YAAUC;QAAO,KAC1ER;IACN;IAEA,OAAO8C,OAAOgC,WAAW,CACvBhC,OAAOC,OAAO,CAACgC,SAASkB,MAAM,CAAC,CAAC,GAAGxD,MAAM,GAAKA,UAAUzC;AAE5D;AAEA,SAAS2F,mBAAmB,EAC1B1D,QAAQ,EACR1B,QAAQ,EACRC,MAAM,EAKP;IACC,OAAOsC,OAAOgC,WAAW,CACvBhC,OAAOC,OAAO,CAACd,UAAU9B,GAAG,CAAC,CAAC,CAACyD,KAAKnB,MAAM,GAAK;YAC7CoC,UAAU;gBAAEtE;gBAAU6B,MAAMwB;gBAAKpD;YAAO;YACxC0F,mBAAmB;gBAAE3F;gBAAUC;gBAAQiC;YAAM;SAC9C;AAEL;AAEA,SAASoB,gBAAgB,EAAED,GAAG,EAAExB,IAAI,EAAiC;IACnE,OAAOwB,QAAQxB,QAAQwB,IAAIuC,UAAU,CAAC,GAAG/D,KAAK,CAAC,CAAC;AAClD;AAEA,SAASyC,UAAU,EACjBtE,QAAQ,EACR6B,IAAI,EACJ5B,MAAM,EAKP;IACC,OAAOqD,gBAAgB;QAAED,KAAKxB;QAAMA,MAAM7B;IAAS,KAC/C,GAAGC,SAAS4B,KAAKgE,KAAK,CAAC7F,SAAS8F,MAAM,GAAG,GACzCjE;AACN;AAEA,SAAS8D,mBAAmB,EAC1B3F,QAAQ,EACRC,MAAM,EACNiC,KAAK,EAKN;IACC,IAAIW,MAAMC,OAAO,CAACZ,QAAQ;QACxB,OAAOA,MAAMtC,GAAG,CAAC,CAACmG,OAASJ,mBAAmB;gBAAE3F;gBAAUC;gBAAQiC,OAAO6D;YAAK;IAChF;IAEA,IACE7D,UAAU,QACV,OAAOA,UAAU,YAChBK,CAAAA,OAAOyD,cAAc,CAAC9D,WAAWK,OAAO0D,SAAS,IAAI1D,OAAOyD,cAAc,CAAC9D,WAAW,IAAG,GAC1F;QACA,OAAOkD,mBAAmB;YAAE1D,UAAUQ;YAAmBlC;YAAUC;QAAO;IAC5E;IAEA,OAAOiC;AACT"}
+{"version":3,"sources":["../../src/predefinedMigrations/migrateSizesToVariants.ts"],"sourcesContent":["import type {\n  Collection,\n  CreateIndexesOptions,\n  Document,\n  IndexDescriptionInfo,\n  IndexDirection,\n} from 'mongodb'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport { isDeepStrictEqual } from 'node:util'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getSession } from '../utilities/getSession.js'\n\n/** Mongo error codes for an index that conflicts with an existing index. */\nconst INDEX_CONFLICT_CODES = new Set([85, 86])\n/** Mongo error code for a collection that hasn't been created yet. */\nconst NAMESPACE_NOT_FOUND_CODE = 26\nconst GENERATED_VARIANT_METADATA_FIELDS = new Set([\n  'filename',\n  'filesize',\n  'height',\n  'mimeType',\n  'url',\n  'width',\n])\n\n/**\n * Moves every upload collection's stored image sizes between the legacy `sizes` field and\n * `variants`, on each collection and its versions collection (`version.sizes`). Uses `$rename`,\n * so no document is rewritten beyond the renamed key, and re-keys the indexes on those fields.\n * Documents that are already renamed are left as they are, so it's safe to re-run.\n */\nexport async function migrateSizesToVariants({\n  direction = 'up',\n  payload,\n  req,\n}: {\n  direction?: 'down' | 'up'\n  payload: Payload\n  req?: Partial<PayloadRequest>\n}): Promise<void> {\n  const adapter = payload.db as unknown as MongooseAdapter\n  const session = await getSession(adapter, req)\n  const [from, to] = direction === 'up' ? ['sizes', 'variants'] : ['variants', 'sizes']\n\n  const targets: {\n    collection: Collection\n    expectedVariantNames: string[]\n    fromPath: string\n    toPath: string\n  }[] = []\n\n  for (const collection of payload.config.collections) {\n    if (!collection.upload) {\n      continue\n    }\n\n    const upload = typeof collection.upload === 'object' ? collection.upload : undefined\n    const expectedVariantNames = (upload?.variants ?? []).map(({ name }) => name)\n\n    targets.push({\n      collection: adapter.collections[collection.slug]!.collection,\n      expectedVariantNames,\n      fromPath: from,\n      toPath: to,\n    })\n\n    if (collection.versions && adapter.versions[collection.slug]) {\n      targets.push({\n        collection: adapter.versions[collection.slug]!.collection,\n        expectedVariantNames,\n        fromPath: `version.${from}`,\n        toPath: `version.${to}`,\n      })\n    }\n  }\n\n  for (const { collection, expectedVariantNames, fromPath, toPath } of targets) {\n    const [sourceData, directCollision] = await Promise.all([\n      collection.findOne({ [fromPath]: { $exists: true } }, { projection: { _id: 1 } }),\n      collection.findOne(\n        { [fromPath]: { $exists: true }, [toPath]: { $exists: true } },\n        { projection: { _id: 1 } },\n      ),\n    ])\n\n    if (\n      sourceData &&\n      (directCollision ||\n        (await findUnexpectedDestinationData({ collection, expectedVariantNames, toPath })))\n    ) {\n      throw new Error(\n        `Cannot run the sizes-to-variants migration because collection \"${collection.collectionName}\" contains both \"${fromPath}\" and \"${toPath}\" data. Move or rename the existing destination data before running this migration.`,\n      )\n    }\n  }\n\n  // Index changes can't be part of a multi-document transaction, and one made after the\n  // migration's transaction has written to a collection aborts it. A transaction's snapshot starts\n  // at its first operation, so re-keying every index before any transactional write is safe.\n  for (const target of targets) {\n    await rekeyIndexes(target)\n  }\n\n  for (const { collection, fromPath, toPath } of targets) {\n    const result = await collection.updateMany(\n      { [fromPath]: { $exists: true }, [toPath]: { $exists: false } },\n      { $rename: { [fromPath]: toPath } },\n      { session },\n    )\n\n    payload.logger.info({\n      msg: `sizes-to-variants (${direction}): renamed ${fromPath} on ${result.modifiedCount} document(s) in \"${collection.collectionName}\"`,\n    })\n  }\n}\n\nasync function findUnexpectedDestinationData({\n  collection,\n  expectedVariantNames,\n  toPath,\n}: {\n  collection: Collection\n  expectedVariantNames: string[]\n  toPath: string\n}): Promise<Document | null> {\n  const expectedVariantNameSet = new Set(expectedVariantNames)\n  const cursor = collection.find(\n    { [toPath]: { $exists: true } },\n    { projection: { _id: 1, [toPath]: 1 } },\n  )\n\n  try {\n    for await (const document of cursor) {\n      const destinationData = getDocumentPath({ document, path: toPath })\n\n      if (hasUnexpectedVariantData({ destinationData, expectedVariantNameSet })) {\n        return document\n      }\n    }\n  } finally {\n    await cursor.close()\n  }\n\n  return null\n}\n\nfunction getDocumentPath({ document, path }: { document: Document; path: string }): unknown {\n  return path.split('.').reduce<unknown>((value, pathSegment) => {\n    if (!isRecord(value)) {\n      return undefined\n    }\n\n    return value[pathSegment]\n  }, document)\n}\n\nfunction hasUnexpectedVariantData({\n  destinationData,\n  expectedVariantNameSet,\n}: {\n  destinationData: unknown\n  expectedVariantNameSet: Set<string>\n}): boolean {\n  if (!isRecord(destinationData)) {\n    return destinationData !== null && destinationData !== undefined\n  }\n\n  for (const [variantName, variantData] of Object.entries(destinationData)) {\n    if (!expectedVariantNameSet.has(variantName)) {\n      return true\n    }\n\n    if (variantData === null || variantData === undefined) {\n      continue\n    }\n\n    if (\n      !isRecord(variantData) ||\n      Object.keys(variantData).some(\n        (metadataFieldName) => !GENERATED_VARIANT_METADATA_FIELDS.has(metadataFieldName),\n      )\n    ) {\n      return true\n    }\n  }\n\n  return false\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return value !== null && typeof value === 'object' && !Array.isArray(value)\n}\n\nasync function rekeyIndexes({\n  collection,\n  fromPath,\n  toPath,\n}: {\n  collection: Collection\n  fromPath: string\n  toPath: string\n}): Promise<void> {\n  let indexes: IndexDescriptionInfo[]\n\n  try {\n    indexes = await collection.indexes()\n  } catch (err) {\n    if ((err as { code?: number }).code === NAMESPACE_NOT_FOUND_CODE) {\n      return\n    }\n\n    throw err\n  }\n\n  for (const index of indexes) {\n    const sourceKeys = getIndexKeysForCreate({ fromPath, index, toPath: fromPath })\n\n    if (!Object.keys(sourceKeys).some((key) => isPathAtOrBelow({ key, path: fromPath }))) {\n      continue\n    }\n\n    const rekeyedKeys = getIndexKeysForCreate({ fromPath, index, toPath })\n    const destinationOptions = getDestinationIndexOptions({ fromPath, index, toPath })\n\n    if (index.weights && '_fts' in index.key && '_ftsx' in index.key) {\n      await rekeyTextIndex({\n        collection,\n        destinationOptions,\n        index,\n        rekeyedKeys,\n        sourceKeys,\n      })\n      continue\n    }\n\n    try {\n      await collection.createIndex(rekeyedKeys, destinationOptions)\n    } catch (err) {\n      if (!INDEX_CONFLICT_CODES.has((err as { code?: number }).code ?? 0)) {\n        throw err\n      }\n\n      const destinationIndex = (await collection.indexes()).find((candidate) =>\n        isDeepStrictEqual(\n          getIndexKeysForCreate({ fromPath: toPath, index: candidate, toPath }),\n          rekeyedKeys,\n        ),\n      )\n      const existingDestinationOptions = destinationIndex\n        ? getDestinationIndexOptions({\n            fromPath: toPath,\n            index: destinationIndex,\n            toPath,\n          })\n        : undefined\n\n      if (!destinationIndex || !isDeepStrictEqual(existingDestinationOptions, destinationOptions)) {\n        throw err\n      }\n    }\n\n    await collection.dropIndex(index.name!)\n  }\n}\n\nasync function rekeyTextIndex({\n  collection,\n  destinationOptions,\n  index,\n  rekeyedKeys,\n  sourceKeys,\n}: {\n  collection: Collection\n  destinationOptions: CreateIndexesOptions\n  index: IndexDescriptionInfo\n  rekeyedKeys: Record<string, IndexDirection>\n  sourceKeys: Record<string, IndexDirection>\n}): Promise<void> {\n  if (!index.name) {\n    throw new Error('Cannot re-key an unnamed MongoDB text index.')\n  }\n\n  const sourceOptions: CreateIndexesOptions = {\n    ...getDestinationIndexOptions({ fromPath: '', index, toPath: '' }),\n    name: index.name,\n  }\n\n  await collection.dropIndex(index.name)\n\n  try {\n    await collection.createIndex(rekeyedKeys, destinationOptions)\n  } catch (err) {\n    try {\n      await collection.createIndex(sourceKeys, sourceOptions)\n    } catch (restoreErr) {\n      throw new AggregateError(\n        [err, restoreErr],\n        `Failed to create the replacement for MongoDB text index \"${index.name}\" and failed to restore the source index.`,\n      )\n    }\n\n    throw err\n  }\n}\n\nfunction getIndexKeysForCreate({\n  fromPath,\n  index,\n  toPath,\n}: {\n  fromPath: string\n  index: IndexDescriptionInfo\n  toPath: string\n}): Record<string, IndexDirection> {\n  const keys: [string, IndexDirection][] = []\n  const hasInternalTextKeys = '_fts' in index.key && '_ftsx' in index.key\n\n  for (const [key, value] of Object.entries(index.key)) {\n    if (hasInternalTextKeys && key === '_fts') {\n      for (const textPath of Object.keys(index.weights ?? {})) {\n        keys.push([rekeyPath({ fromPath, path: textPath, toPath }), 'text'])\n      }\n      continue\n    }\n\n    if (hasInternalTextKeys && key === '_ftsx') {\n      continue\n    }\n\n    keys.push([rekeyPath({ fromPath, path: key, toPath }), value])\n  }\n\n  return Object.fromEntries(keys)\n}\n\nfunction getDestinationIndexOptions({\n  fromPath,\n  index,\n  toPath,\n}: {\n  fromPath: string\n  index: IndexDescriptionInfo\n  toPath: string\n}): CreateIndexesOptions {\n  const options: CreateIndexesOptions = {\n    '2dsphereIndexVersion': index['2dsphereIndexVersion'],\n    background: index.background,\n    bits: index.bits,\n    bucketSize: index.bucketSize,\n    collation: index.collation,\n    default_language: index.default_language,\n    expireAfterSeconds: index.expireAfterSeconds,\n    hidden: index.hidden,\n    language_override: index.language_override,\n    max: index.max,\n    min: index.min,\n    partialFilterExpression: index.partialFilterExpression\n      ? rekeyDocumentPaths({ document: index.partialFilterExpression, fromPath, toPath })\n      : undefined,\n    sparse: index.sparse,\n    storageEngine: index.storageEngine,\n    textIndexVersion: index.textIndexVersion,\n    unique: index.unique,\n    weights: index.weights\n      ? rekeyDocumentPaths({ document: index.weights, fromPath, toPath })\n      : undefined,\n    wildcardProjection: index.wildcardProjection\n      ? rekeyDocumentPaths({ document: index.wildcardProjection, fromPath, toPath })\n      : undefined,\n  }\n\n  return Object.fromEntries(Object.entries(options).filter(([, value]) => value !== undefined))\n}\n\nfunction rekeyDocumentPaths({\n  document,\n  fromPath,\n  toPath,\n}: {\n  document: Document\n  fromPath: string\n  toPath: string\n}): Document {\n  return Object.fromEntries(\n    Object.entries(document).map(([key, value]) => [\n      rekeyPath({ fromPath, path: key, toPath }),\n      rekeyDocumentValue({ fromPath, toPath, value }),\n    ]),\n  )\n}\n\nfunction isPathAtOrBelow({ key, path }: { key: string; path: string }): boolean {\n  return key === path || key.startsWith(`${path}.`)\n}\n\nfunction rekeyPath({\n  fromPath,\n  path,\n  toPath,\n}: {\n  fromPath: string\n  path: string\n  toPath: string\n}): string {\n  return isPathAtOrBelow({ key: path, path: fromPath })\n    ? `${toPath}${path.slice(fromPath.length)}`\n    : path\n}\n\nfunction rekeyDocumentValue({\n  fromPath,\n  toPath,\n  value,\n}: {\n  fromPath: string\n  toPath: string\n  value: unknown\n}): unknown {\n  if (Array.isArray(value)) {\n    return value.map((item) => rekeyDocumentValue({ fromPath, toPath, value: item }))\n  }\n\n  if (\n    value !== null &&\n    typeof value === 'object' &&\n    (Object.getPrototypeOf(value) === Object.prototype || Object.getPrototypeOf(value) === null)\n  ) {\n    return rekeyDocumentPaths({ document: value, fromPath, toPath })\n  }\n\n  return value\n}\n"],"names":["isDeepStrictEqual","getSession","INDEX_CONFLICT_CODES","Set","NAMESPACE_NOT_FOUND_CODE","GENERATED_VARIANT_METADATA_FIELDS","migrateSizesToVariants","direction","payload","req","adapter","db","session","from","to","targets","collection","config","collections","upload","undefined","expectedVariantNames","variants","map","name","push","slug","fromPath","toPath","versions","sourceData","directCollision","Promise","all","findOne","$exists","projection","_id","findUnexpectedDestinationData","Error","collectionName","target","rekeyIndexes","result","updateMany","$rename","logger","info","msg","modifiedCount","expectedVariantNameSet","cursor","find","document","destinationData","getDocumentPath","path","hasUnexpectedVariantData","close","split","reduce","value","pathSegment","isRecord","variantName","variantData","Object","entries","has","keys","some","metadataFieldName","Array","isArray","indexes","err","code","index","sourceKeys","getIndexKeysForCreate","key","isPathAtOrBelow","rekeyedKeys","destinationOptions","getDestinationIndexOptions","weights","rekeyTextIndex","createIndex","destinationIndex","candidate","existingDestinationOptions","dropIndex","sourceOptions","restoreErr","AggregateError","hasInternalTextKeys","textPath","rekeyPath","fromEntries","options","background","bits","bucketSize","collation","default_language","expireAfterSeconds","hidden","language_override","max","min","partialFilterExpression","rekeyDocumentPaths","sparse","storageEngine","textIndexVersion","unique","wildcardProjection","filter","rekeyDocumentValue","startsWith","slice","length","item","getPrototypeOf","prototype"],"mappings":"AASA,SAASA,iBAAiB,QAAQ,YAAW;AAI7C,SAASC,UAAU,QAAQ,6BAA4B;AAEvD,0EAA0E,GAC1E,MAAMC,uBAAuB,IAAIC,IAAI;IAAC;IAAI;CAAG;AAC7C,oEAAoE,GACpE,MAAMC,2BAA2B;AACjC,MAAMC,oCAAoC,IAAIF,IAAI;IAChD;IACA;IACA;IACA;IACA;IACA;CACD;AAED;;;;;CAKC,GACD,OAAO,eAAeG,uBAAuB,EAC3CC,YAAY,IAAI,EAChBC,OAAO,EACPC,GAAG,EAKJ;IACC,MAAMC,UAAUF,QAAQG,EAAE;IAC1B,MAAMC,UAAU,MAAMX,WAAWS,SAASD;IAC1C,MAAM,CAACI,MAAMC,GAAG,GAAGP,cAAc,OAAO;QAAC;QAAS;KAAW,GAAG;QAAC;QAAY;KAAQ;IAErF,MAAMQ,UAKA,EAAE;IAER,KAAK,MAAMC,cAAcR,QAAQS,MAAM,CAACC,WAAW,CAAE;QACnD,IAAI,CAACF,WAAWG,MAAM,EAAE;YACtB;QACF;QAEA,MAAMA,SAAS,OAAOH,WAAWG,MAAM,KAAK,WAAWH,WAAWG,MAAM,GAAGC;QAC3E,MAAMC,uBAAuB,AAACF,CAAAA,QAAQG,YAAY,EAAE,AAAD,EAAGC,GAAG,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA;QAExET,QAAQU,IAAI,CAAC;YACXT,YAAYN,QAAQQ,WAAW,CAACF,WAAWU,IAAI,CAAC,CAAEV,UAAU;YAC5DK;YACAM,UAAUd;YACVe,QAAQd;QACV;QAEA,IAAIE,WAAWa,QAAQ,IAAInB,QAAQmB,QAAQ,CAACb,WAAWU,IAAI,CAAC,EAAE;YAC5DX,QAAQU,IAAI,CAAC;gBACXT,YAAYN,QAAQmB,QAAQ,CAACb,WAAWU,IAAI,CAAC,CAAEV,UAAU;gBACzDK;gBACAM,UAAU,CAAC,QAAQ,EAAEd,MAAM;gBAC3Be,QAAQ,CAAC,QAAQ,EAAEd,IAAI;YACzB;QACF;IACF;IAEA,KAAK,MAAM,EAAEE,UAAU,EAAEK,oBAAoB,EAAEM,QAAQ,EAAEC,MAAM,EAAE,IAAIb,QAAS;QAC5E,MAAM,CAACe,YAAYC,gBAAgB,GAAG,MAAMC,QAAQC,GAAG,CAAC;YACtDjB,WAAWkB,OAAO,CAAC;gBAAE,CAACP,SAAS,EAAE;oBAAEQ,SAAS;gBAAK;YAAE,GAAG;gBAAEC,YAAY;oBAAEC,KAAK;gBAAE;YAAE;YAC/ErB,WAAWkB,OAAO,CAChB;gBAAE,CAACP,SAAS,EAAE;oBAAEQ,SAAS;gBAAK;gBAAG,CAACP,OAAO,EAAE;oBAAEO,SAAS;gBAAK;YAAE,GAC7D;gBAAEC,YAAY;oBAAEC,KAAK;gBAAE;YAAE;SAE5B;QAED,IACEP,cACCC,CAAAA,mBACE,MAAMO,8BAA8B;YAAEtB;YAAYK;YAAsBO;QAAO,EAAE,GACpF;YACA,MAAM,IAAIW,MACR,CAAC,+DAA+D,EAAEvB,WAAWwB,cAAc,CAAC,iBAAiB,EAAEb,SAAS,OAAO,EAAEC,OAAO,mFAAmF,CAAC;QAEhO;IACF;IAEA,sFAAsF;IACtF,iGAAiG;IACjG,2FAA2F;IAC3F,KAAK,MAAMa,UAAU1B,QAAS;QAC5B,MAAM2B,aAAaD;IACrB;IAEA,KAAK,MAAM,EAAEzB,UAAU,EAAEW,QAAQ,EAAEC,MAAM,EAAE,IAAIb,QAAS;QACtD,MAAM4B,SAAS,MAAM3B,WAAW4B,UAAU,CACxC;YAAE,CAACjB,SAAS,EAAE;gBAAEQ,SAAS;YAAK;YAAG,CAACP,OAAO,EAAE;gBAAEO,SAAS;YAAM;QAAE,GAC9D;YAAEU,SAAS;gBAAE,CAAClB,SAAS,EAAEC;YAAO;QAAE,GAClC;YAAEhB;QAAQ;QAGZJ,QAAQsC,MAAM,CAACC,IAAI,CAAC;YAClBC,KAAK,CAAC,mBAAmB,EAAEzC,UAAU,WAAW,EAAEoB,SAAS,IAAI,EAAEgB,OAAOM,aAAa,CAAC,iBAAiB,EAAEjC,WAAWwB,cAAc,CAAC,CAAC,CAAC;QACvI;IACF;AACF;AAEA,eAAeF,8BAA8B,EAC3CtB,UAAU,EACVK,oBAAoB,EACpBO,MAAM,EAKP;IACC,MAAMsB,yBAAyB,IAAI/C,IAAIkB;IACvC,MAAM8B,SAASnC,WAAWoC,IAAI,CAC5B;QAAE,CAACxB,OAAO,EAAE;YAAEO,SAAS;QAAK;IAAE,GAC9B;QAAEC,YAAY;YAAEC,KAAK;YAAG,CAACT,OAAO,EAAE;QAAE;IAAE;IAGxC,IAAI;QACF,WAAW,MAAMyB,YAAYF,OAAQ;YACnC,MAAMG,kBAAkBC,gBAAgB;gBAAEF;gBAAUG,MAAM5B;YAAO;YAEjE,IAAI6B,yBAAyB;gBAAEH;gBAAiBJ;YAAuB,IAAI;gBACzE,OAAOG;YACT;QACF;IACF,SAAU;QACR,MAAMF,OAAOO,KAAK;IACpB;IAEA,OAAO;AACT;AAEA,SAASH,gBAAgB,EAAEF,QAAQ,EAAEG,IAAI,EAAwC;IAC/E,OAAOA,KAAKG,KAAK,CAAC,KAAKC,MAAM,CAAU,CAACC,OAAOC;QAC7C,IAAI,CAACC,SAASF,QAAQ;YACpB,OAAOzC;QACT;QAEA,OAAOyC,KAAK,CAACC,YAAY;IAC3B,GAAGT;AACL;AAEA,SAASI,yBAAyB,EAChCH,eAAe,EACfJ,sBAAsB,EAIvB;IACC,IAAI,CAACa,SAAST,kBAAkB;QAC9B,OAAOA,oBAAoB,QAAQA,oBAAoBlC;IACzD;IAEA,KAAK,MAAM,CAAC4C,aAAaC,YAAY,IAAIC,OAAOC,OAAO,CAACb,iBAAkB;QACxE,IAAI,CAACJ,uBAAuBkB,GAAG,CAACJ,cAAc;YAC5C,OAAO;QACT;QAEA,IAAIC,gBAAgB,QAAQA,gBAAgB7C,WAAW;YACrD;QACF;QAEA,IACE,CAAC2C,SAASE,gBACVC,OAAOG,IAAI,CAACJ,aAAaK,IAAI,CAC3B,CAACC,oBAAsB,CAAClE,kCAAkC+D,GAAG,CAACG,qBAEhE;YACA,OAAO;QACT;IACF;IAEA,OAAO;AACT;AAEA,SAASR,SAASF,KAAc;IAC9B,OAAOA,UAAU,QAAQ,OAAOA,UAAU,YAAY,CAACW,MAAMC,OAAO,CAACZ;AACvE;AAEA,eAAenB,aAAa,EAC1B1B,UAAU,EACVW,QAAQ,EACRC,MAAM,EAKP;IACC,IAAI8C;IAEJ,IAAI;QACFA,UAAU,MAAM1D,WAAW0D,OAAO;IACpC,EAAE,OAAOC,KAAK;QACZ,IAAI,AAACA,IAA0BC,IAAI,KAAKxE,0BAA0B;YAChE;QACF;QAEA,MAAMuE;IACR;IAEA,KAAK,MAAME,SAASH,QAAS;QAC3B,MAAMI,aAAaC,sBAAsB;YAAEpD;YAAUkD;YAAOjD,QAAQD;QAAS;QAE7E,IAAI,CAACuC,OAAOG,IAAI,CAACS,YAAYR,IAAI,CAAC,CAACU,MAAQC,gBAAgB;gBAAED;gBAAKxB,MAAM7B;YAAS,KAAK;YACpF;QACF;QAEA,MAAMuD,cAAcH,sBAAsB;YAAEpD;YAAUkD;YAAOjD;QAAO;QACpE,MAAMuD,qBAAqBC,2BAA2B;YAAEzD;YAAUkD;YAAOjD;QAAO;QAEhF,IAAIiD,MAAMQ,OAAO,IAAI,UAAUR,MAAMG,GAAG,IAAI,WAAWH,MAAMG,GAAG,EAAE;YAChE,MAAMM,eAAe;gBACnBtE;gBACAmE;gBACAN;gBACAK;gBACAJ;YACF;YACA;QACF;QAEA,IAAI;YACF,MAAM9D,WAAWuE,WAAW,CAACL,aAAaC;QAC5C,EAAE,OAAOR,KAAK;YACZ,IAAI,CAACzE,qBAAqBkE,GAAG,CAAC,AAACO,IAA0BC,IAAI,IAAI,IAAI;gBACnE,MAAMD;YACR;YAEA,MAAMa,mBAAmB,AAAC,CAAA,MAAMxE,WAAW0D,OAAO,EAAC,EAAGtB,IAAI,CAAC,CAACqC,YAC1DzF,kBACE+E,sBAAsB;oBAAEpD,UAAUC;oBAAQiD,OAAOY;oBAAW7D;gBAAO,IACnEsD;YAGJ,MAAMQ,6BAA6BF,mBAC/BJ,2BAA2B;gBACzBzD,UAAUC;gBACViD,OAAOW;gBACP5D;YACF,KACAR;YAEJ,IAAI,CAACoE,oBAAoB,CAACxF,kBAAkB0F,4BAA4BP,qBAAqB;gBAC3F,MAAMR;YACR;QACF;QAEA,MAAM3D,WAAW2E,SAAS,CAACd,MAAMrD,IAAI;IACvC;AACF;AAEA,eAAe8D,eAAe,EAC5BtE,UAAU,EACVmE,kBAAkB,EAClBN,KAAK,EACLK,WAAW,EACXJ,UAAU,EAOX;IACC,IAAI,CAACD,MAAMrD,IAAI,EAAE;QACf,MAAM,IAAIe,MAAM;IAClB;IAEA,MAAMqD,gBAAsC;QAC1C,GAAGR,2BAA2B;YAAEzD,UAAU;YAAIkD;YAAOjD,QAAQ;QAAG,EAAE;QAClEJ,MAAMqD,MAAMrD,IAAI;IAClB;IAEA,MAAMR,WAAW2E,SAAS,CAACd,MAAMrD,IAAI;IAErC,IAAI;QACF,MAAMR,WAAWuE,WAAW,CAACL,aAAaC;IAC5C,EAAE,OAAOR,KAAK;QACZ,IAAI;YACF,MAAM3D,WAAWuE,WAAW,CAACT,YAAYc;QAC3C,EAAE,OAAOC,YAAY;YACnB,MAAM,IAAIC,eACR;gBAACnB;gBAAKkB;aAAW,EACjB,CAAC,yDAAyD,EAAEhB,MAAMrD,IAAI,CAAC,yCAAyC,CAAC;QAErH;QAEA,MAAMmD;IACR;AACF;AAEA,SAASI,sBAAsB,EAC7BpD,QAAQ,EACRkD,KAAK,EACLjD,MAAM,EAKP;IACC,MAAMyC,OAAmC,EAAE;IAC3C,MAAM0B,sBAAsB,UAAUlB,MAAMG,GAAG,IAAI,WAAWH,MAAMG,GAAG;IAEvE,KAAK,MAAM,CAACA,KAAKnB,MAAM,IAAIK,OAAOC,OAAO,CAACU,MAAMG,GAAG,EAAG;QACpD,IAAIe,uBAAuBf,QAAQ,QAAQ;YACzC,KAAK,MAAMgB,YAAY9B,OAAOG,IAAI,CAACQ,MAAMQ,OAAO,IAAI,CAAC,GAAI;gBACvDhB,KAAK5C,IAAI,CAAC;oBAACwE,UAAU;wBAAEtE;wBAAU6B,MAAMwC;wBAAUpE;oBAAO;oBAAI;iBAAO;YACrE;YACA;QACF;QAEA,IAAImE,uBAAuBf,QAAQ,SAAS;YAC1C;QACF;QAEAX,KAAK5C,IAAI,CAAC;YAACwE,UAAU;gBAAEtE;gBAAU6B,MAAMwB;gBAAKpD;YAAO;YAAIiC;SAAM;IAC/D;IAEA,OAAOK,OAAOgC,WAAW,CAAC7B;AAC5B;AAEA,SAASe,2BAA2B,EAClCzD,QAAQ,EACRkD,KAAK,EACLjD,MAAM,EAKP;IACC,MAAMuE,UAAgC;QACpC,wBAAwBtB,KAAK,CAAC,uBAAuB;QACrDuB,YAAYvB,MAAMuB,UAAU;QAC5BC,MAAMxB,MAAMwB,IAAI;QAChBC,YAAYzB,MAAMyB,UAAU;QAC5BC,WAAW1B,MAAM0B,SAAS;QAC1BC,kBAAkB3B,MAAM2B,gBAAgB;QACxCC,oBAAoB5B,MAAM4B,kBAAkB;QAC5CC,QAAQ7B,MAAM6B,MAAM;QACpBC,mBAAmB9B,MAAM8B,iBAAiB;QAC1CC,KAAK/B,MAAM+B,GAAG;QACdC,KAAKhC,MAAMgC,GAAG;QACdC,yBAAyBjC,MAAMiC,uBAAuB,GAClDC,mBAAmB;YAAE1D,UAAUwB,MAAMiC,uBAAuB;YAAEnF;YAAUC;QAAO,KAC/ER;QACJ4F,QAAQnC,MAAMmC,MAAM;QACpBC,eAAepC,MAAMoC,aAAa;QAClCC,kBAAkBrC,MAAMqC,gBAAgB;QACxCC,QAAQtC,MAAMsC,MAAM;QACpB9B,SAASR,MAAMQ,OAAO,GAClB0B,mBAAmB;YAAE1D,UAAUwB,MAAMQ,OAAO;YAAE1D;YAAUC;QAAO,KAC/DR;QACJgG,oBAAoBvC,MAAMuC,kBAAkB,GACxCL,mBAAmB;YAAE1D,UAAUwB,MAAMuC,kBAAkB;YAAEzF;YAAUC;QAAO,KAC1ER;IACN;IAEA,OAAO8C,OAAOgC,WAAW,CAAChC,OAAOC,OAAO,CAACgC,SAASkB,MAAM,CAAC,CAAC,GAAGxD,MAAM,GAAKA,UAAUzC;AACpF;AAEA,SAAS2F,mBAAmB,EAC1B1D,QAAQ,EACR1B,QAAQ,EACRC,MAAM,EAKP;IACC,OAAOsC,OAAOgC,WAAW,CACvBhC,OAAOC,OAAO,CAACd,UAAU9B,GAAG,CAAC,CAAC,CAACyD,KAAKnB,MAAM,GAAK;YAC7CoC,UAAU;gBAAEtE;gBAAU6B,MAAMwB;gBAAKpD;YAAO;YACxC0F,mBAAmB;gBAAE3F;gBAAUC;gBAAQiC;YAAM;SAC9C;AAEL;AAEA,SAASoB,gBAAgB,EAAED,GAAG,EAAExB,IAAI,EAAiC;IACnE,OAAOwB,QAAQxB,QAAQwB,IAAIuC,UAAU,CAAC,GAAG/D,KAAK,CAAC,CAAC;AAClD;AAEA,SAASyC,UAAU,EACjBtE,QAAQ,EACR6B,IAAI,EACJ5B,MAAM,EAKP;IACC,OAAOqD,gBAAgB;QAAED,KAAKxB;QAAMA,MAAM7B;IAAS,KAC/C,GAAGC,SAAS4B,KAAKgE,KAAK,CAAC7F,SAAS8F,MAAM,GAAG,GACzCjE;AACN;AAEA,SAAS8D,mBAAmB,EAC1B3F,QAAQ,EACRC,MAAM,EACNiC,KAAK,EAKN;IACC,IAAIW,MAAMC,OAAO,CAACZ,QAAQ;QACxB,OAAOA,MAAMtC,GAAG,CAAC,CAACmG,OAASJ,mBAAmB;gBAAE3F;gBAAUC;gBAAQiC,OAAO6D;YAAK;IAChF;IAEA,IACE7D,UAAU,QACV,OAAOA,UAAU,YAChBK,CAAAA,OAAOyD,cAAc,CAAC9D,WAAWK,OAAO0D,SAAS,IAAI1D,OAAOyD,cAAc,CAAC9D,WAAW,IAAG,GAC1F;QACA,OAAOkD,mBAAmB;YAAE1D,UAAUQ;YAAOlC;YAAUC;QAAO;IAChE;IAEA,OAAOiC;AACT"}

package/dist/queries/buildAndOrConditions.d.ts

@@ -1,11 +1,13 @@
-import type { FlattenedField, Payload, Where } from 'payload';
-export declare function buildAndOrConditions({ collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, where, }: {
+import type { FlattenedField, Payload, PayloadRequest, Where } from 'payload';
+export declare function buildAndOrConditions({ branch, collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, req, where, }: {
+    branch?: false | string;
     collectionSlug?: string;
     fields: FlattenedField[];
     globalSlug?: string;
     locale?: string;
     parentIsLocalized: boolean;
     payload: Payload;
+    req?: Partial<PayloadRequest>;
     where: Where[];
 }): Promise<Record<string, unknown>[]>;
 //# sourceMappingURL=buildAndOrConditions.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildAndOrConditions.d.ts","sourceRoot":"","sources":["../../src/queries/buildAndOrConditions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAI7D,wBAAsB,oBAAoB,CAAC,EACzC,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,EAAE,CAAA;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAuBrC"}
+{"version":3,"file":"buildAndOrConditions.d.ts","sourceRoot":"","sources":["../../src/queries/buildAndOrConditions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,OAAO,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAI7E,wBAAsB,oBAAoB,CAAC,EACzC,MAAM,EACN,cAAc,EACd,MAAM,EACN,UAAU,EACV,MAAM,EACN,iBAAiB,EACjB,OAAO,EACP,GAAG,EACH,KAAK,GACN,EAAE;IACD,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,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,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,KAAK,EAAE,KAAK,EAAE,CAAA;CACf,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC,CAyBrC"}

package/dist/queries/buildAndOrConditions.js

@@ -1,5 +1,5 @@
 import { parseParams } from './parseParams.js';
-export async function buildAndOrConditions({ collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, where }) {
+export async function buildAndOrConditions({ branch, collectionSlug, fields, globalSlug, locale, parentIsLocalized, payload, req, where }) {
     const completedConditions = [];
     // Loop over all AND / OR operations and add them to the AND / OR query param
     // Operations should come through as an array
@@ -7,12 +7,14 @@ export async function buildAndOrConditions({ collectionSlug, fields, globalSlug,
         // If the operation is properly formatted as an object
         if (typeof condition === 'object') {
             const result = await parseParams({
+                branch,
                 collectionSlug,
                 fields,
                 globalSlug,
                 locale,
                 parentIsLocalized,
                 payload,
+                req,
                 where: condition
             });
             if (Object.keys(result).length > 0) {

package/dist/queries/buildAndOrConditions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildAndOrConditions.ts"],"sourcesContent":["import type { FlattenedField, Payload, Where } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\nexport async function buildAndOrConditions({\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  const completedConditions = []\n  // Loop over all AND / OR operations and add them to the AND / OR query param\n  // Operations should come through as an array\n\n  for (const condition of where) {\n    // If the operation is properly formatted as an object\n    if (typeof condition === 'object') {\n      const result = await parseParams({\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        parentIsLocalized,\n        payload,\n        where: condition,\n      })\n      if (Object.keys(result).length > 0) {\n        completedConditions.push(result)\n      }\n    }\n  }\n  return completedConditions\n}\n"],"names":["parseParams","buildAndOrConditions","collectionSlug","fields","globalSlug","locale","parentIsLocalized","payload","where","completedConditions","condition","result","Object","keys","length","push"],"mappings":"AAEA,SAASA,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,eAAeC,qBAAqB,EACzCC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,KAAK,EASN;IACC,MAAMC,sBAAsB,EAAE;IAC9B,6EAA6E;IAC7E,6CAA6C;IAE7C,KAAK,MAAMC,aAAaF,MAAO;QAC7B,sDAAsD;QACtD,IAAI,OAAOE,cAAc,UAAU;YACjC,MAAMC,SAAS,MAAMX,YAAY;gBAC/BE;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC,OAAOE;YACT;YACA,IAAIE,OAAOC,IAAI,CAACF,QAAQG,MAAM,GAAG,GAAG;gBAClCL,oBAAoBM,IAAI,CAACJ;YAC3B;QACF;IACF;IACA,OAAOF;AACT"}
+{"version":3,"sources":["../../src/queries/buildAndOrConditions.ts"],"sourcesContent":["import type { FlattenedField, Payload, PayloadRequest, Where } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\nexport async function buildAndOrConditions({\n  branch,\n  collectionSlug,\n  fields,\n  globalSlug,\n  locale,\n  parentIsLocalized,\n  payload,\n  req,\n  where,\n}: {\n  branch?: false | string\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  locale?: string\n  parentIsLocalized: boolean\n  payload: Payload\n  req?: Partial<PayloadRequest>\n  where: Where[]\n}): Promise<Record<string, unknown>[]> {\n  const completedConditions = []\n  // Loop over all AND / OR operations and add them to the AND / OR query param\n  // Operations should come through as an array\n\n  for (const condition of where) {\n    // If the operation is properly formatted as an object\n    if (typeof condition === 'object') {\n      const result = await parseParams({\n        branch,\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        parentIsLocalized,\n        payload,\n        req,\n        where: condition,\n      })\n      if (Object.keys(result).length > 0) {\n        completedConditions.push(result)\n      }\n    }\n  }\n  return completedConditions\n}\n"],"names":["parseParams","buildAndOrConditions","branch","collectionSlug","fields","globalSlug","locale","parentIsLocalized","payload","req","where","completedConditions","condition","result","Object","keys","length","push"],"mappings":"AAEA,SAASA,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,eAAeC,qBAAqB,EACzCC,MAAM,EACNC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,iBAAiB,EACjBC,OAAO,EACPC,GAAG,EACHC,KAAK,EAWN;IACC,MAAMC,sBAAsB,EAAE;IAC9B,6EAA6E;IAC7E,6CAA6C;IAE7C,KAAK,MAAMC,aAAaF,MAAO;QAC7B,sDAAsD;QACtD,IAAI,OAAOE,cAAc,UAAU;YACjC,MAAMC,SAAS,MAAMb,YAAY;gBAC/BE;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC,OAAOE;YACT;YACA,IAAIE,OAAOC,IAAI,CAACF,QAAQG,MAAM,GAAG,GAAG;gBAClCL,oBAAoBM,IAAI,CAACJ;YAC3B;QACF;IACF;IACA,OAAOF;AACT"}

package/dist/queries/buildBranchVisibility.d.ts

@@ -0,0 +1,11 @@
+import type { PipelineStage } from 'mongoose';
+import type { MongooseAdapter } from '../index.js';
+type BranchVisibilityStage = Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>;
+export declare const buildBranchVisibilityStages: ({ adapter, branch, collectionSlug, mode, }: {
+    adapter: MongooseAdapter;
+    branch: string;
+    collectionSlug: string;
+    mode?: 'documents' | 'drafts' | 'history';
+}) => BranchVisibilityStage[];
+export {};
+//# sourceMappingURL=buildBranchVisibility.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildBranchVisibility.d.ts","sourceRoot":"","sources":["../../src/queries/buildBranchVisibility.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAI7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,KAAK,qBAAqB,GAAG,OAAO,CAAC,aAAa,EAAE,aAAa,CAAC,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAA;AAE5F,eAAO,MAAM,2BAA2B,+CAKrC;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;IACtB,IAAI,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAA;CAC1C,KAAG,qBAAqB,EAmGxB,CAAA"}

package/dist/queries/buildBranchVisibility.js

@@ -0,0 +1,204 @@
+import { branchChangesCollectionSlug, MAIN_BRANCH } from 'payload';
+const lookupField = '__payloadBranchChange';
+export const buildBranchVisibilityStages = ({ adapter, branch, collectionSlug, mode = 'documents' })=>{
+    const branchChangesModel = adapter.collections[branchChangesCollectionSlug];
+    if (!branchChangesModel) {
+        throw new Error(`Collection model "${branchChangesCollectionSlug}" is not initialized.`);
+    }
+    const canonicalIDExpression = mode === 'documents' ? {
+        $ifNull: [
+            '$_branchDocID',
+            '$_id'
+        ]
+    } : {
+        $ifNull: [
+            '$_branchParent',
+            '$parent'
+        ]
+    };
+    const hasNoMatchingChange = {
+        $eq: [
+            {
+                $size: `$${lookupField}`
+            },
+            0
+        ]
+    };
+    const operation = {
+        $arrayElemAt: [
+            `$${lookupField}.operation`,
+            0
+        ]
+    };
+    const mainVisibility = mode === 'history' ? {
+        $or: [
+            hasNoMatchingChange,
+            {
+                $and: [
+                    {
+                        $ne: [
+                            operation,
+                            'create'
+                        ]
+                    },
+                    {
+                        $or: [
+                            {
+                                $and: [
+                                    {
+                                        $eq: [
+                                            {
+                                                $arrayElemAt: [
+                                                    `$${lookupField}.baseVersionID`,
+                                                    0
+                                                ]
+                                            },
+                                            null
+                                        ]
+                                    },
+                                    {
+                                        $eq: [
+                                            {
+                                                $arrayElemAt: [
+                                                    `$${lookupField}.baseVersionUpdatedAt`,
+                                                    0
+                                                ]
+                                            },
+                                            null
+                                        ]
+                                    }
+                                ]
+                            },
+                            {
+                                $eq: [
+                                    {
+                                        $toString: '$_id'
+                                    },
+                                    {
+                                        $arrayElemAt: [
+                                            `$${lookupField}.baseVersionID`,
+                                            0
+                                        ]
+                                    }
+                                ]
+                            },
+                            {
+                                $lte: [
+                                    '$updatedAt',
+                                    {
+                                        $arrayElemAt: [
+                                            `$${lookupField}.baseVersionUpdatedAt`,
+                                            0
+                                        ]
+                                    }
+                                ]
+                            }
+                        ]
+                    }
+                ]
+            }
+        ]
+    } : hasNoMatchingChange;
+    const branchVisibility = mode === 'history' ? true : {
+        $ne: [
+            operation,
+            'delete'
+        ]
+    };
+    return [
+        {
+            $match: {
+                _branch: {
+                    $in: [
+                        MAIN_BRANCH,
+                        branch
+                    ]
+                }
+            }
+        },
+        {
+            $lookup: {
+                as: lookupField,
+                from: branchChangesModel.collection.name,
+                let: {
+                    canonicalDocumentID: {
+                        $toString: canonicalIDExpression
+                    }
+                },
+                pipeline: [
+                    {
+                        $match: {
+                            $expr: {
+                                $and: [
+                                    {
+                                        $eq: [
+                                            '$branch',
+                                            branch
+                                        ]
+                                    },
+                                    {
+                                        $eq: [
+                                            '$collectionSlug',
+                                            collectionSlug
+                                        ]
+                                    },
+                                    {
+                                        $eq: [
+                                            '$documentID',
+                                            '$$canonicalDocumentID'
+                                        ]
+                                    }
+                                ]
+                            }
+                        }
+                    },
+                    {
+                        $project: {
+                            baseVersionID: 1,
+                            baseVersionUpdatedAt: 1,
+                            operation: 1
+                        }
+                    },
+                    {
+                        $limit: 1
+                    }
+                ]
+            }
+        },
+        {
+            $match: {
+                $expr: {
+                    $or: [
+                        {
+                            $and: [
+                                {
+                                    $eq: [
+                                        '$_branch',
+                                        MAIN_BRANCH
+                                    ]
+                                },
+                                mainVisibility
+                            ]
+                        },
+                        {
+                            $and: [
+                                {
+                                    $eq: [
+                                        '$_branch',
+                                        branch
+                                    ]
+                                },
+                                branchVisibility
+                            ]
+                        }
+                    ]
+                }
+            }
+        },
+        {
+            $unset: lookupField
+        }
+    ];
+};
+
+//# sourceMappingURL=buildBranchVisibility.js.map

package/dist/queries/buildBranchVisibility.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/buildBranchVisibility.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport { branchChangesCollectionSlug, MAIN_BRANCH } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst lookupField = '__payloadBranchChange'\n\ntype BranchVisibilityStage = Exclude<PipelineStage, PipelineStage.Merge | PipelineStage.Out>\n\nexport const buildBranchVisibilityStages = ({\n  adapter,\n  branch,\n  collectionSlug,\n  mode = 'documents',\n}: {\n  adapter: MongooseAdapter\n  branch: string\n  collectionSlug: string\n  mode?: 'documents' | 'drafts' | 'history'\n}): BranchVisibilityStage[] => {\n  const branchChangesModel = adapter.collections[branchChangesCollectionSlug]\n\n  if (!branchChangesModel) {\n    throw new Error(`Collection model \"${branchChangesCollectionSlug}\" is not initialized.`)\n  }\n\n  const canonicalIDExpression =\n    mode === 'documents'\n      ? { $ifNull: ['$_branchDocID', '$_id'] }\n      : { $ifNull: ['$_branchParent', '$parent'] }\n  const hasNoMatchingChange = { $eq: [{ $size: `$${lookupField}` }, 0] }\n  const operation = { $arrayElemAt: [`$${lookupField}.operation`, 0] }\n  const mainVisibility =\n    mode === 'history'\n      ? {\n          $or: [\n            hasNoMatchingChange,\n            {\n              $and: [\n                { $ne: [operation, 'create'] },\n                {\n                  $or: [\n                    {\n                      $and: [\n                        {\n                          $eq: [{ $arrayElemAt: [`$${lookupField}.baseVersionID`, 0] }, null],\n                        },\n                        {\n                          $eq: [\n                            { $arrayElemAt: [`$${lookupField}.baseVersionUpdatedAt`, 0] },\n                            null,\n                          ],\n                        },\n                      ],\n                    },\n                    {\n                      $eq: [\n                        { $toString: '$_id' },\n                        { $arrayElemAt: [`$${lookupField}.baseVersionID`, 0] },\n                      ],\n                    },\n                    {\n                      $lte: [\n                        '$updatedAt',\n                        { $arrayElemAt: [`$${lookupField}.baseVersionUpdatedAt`, 0] },\n                      ],\n                    },\n                  ],\n                },\n              ],\n            },\n          ],\n        }\n      : hasNoMatchingChange\n  const branchVisibility = mode === 'history' ? true : { $ne: [operation, 'delete'] }\n\n  return [\n    { $match: { _branch: { $in: [MAIN_BRANCH, branch] } } },\n    {\n      $lookup: {\n        as: lookupField,\n        from: branchChangesModel.collection.name,\n        let: { canonicalDocumentID: { $toString: canonicalIDExpression } },\n        pipeline: [\n          {\n            $match: {\n              $expr: {\n                $and: [\n                  { $eq: ['$branch', branch] },\n                  { $eq: ['$collectionSlug', collectionSlug] },\n                  { $eq: ['$documentID', '$$canonicalDocumentID'] },\n                ],\n              },\n            },\n          },\n          {\n            $project: {\n              baseVersionID: 1,\n              baseVersionUpdatedAt: 1,\n              operation: 1,\n            },\n          },\n          { $limit: 1 },\n        ],\n      },\n    },\n    {\n      $match: {\n        $expr: {\n          $or: [\n            { $and: [{ $eq: ['$_branch', MAIN_BRANCH] }, mainVisibility] },\n            { $and: [{ $eq: ['$_branch', branch] }, branchVisibility] },\n          ],\n        },\n      },\n    },\n    { $unset: lookupField },\n  ]\n}\n"],"names":["branchChangesCollectionSlug","MAIN_BRANCH","lookupField","buildBranchVisibilityStages","adapter","branch","collectionSlug","mode","branchChangesModel","collections","Error","canonicalIDExpression","$ifNull","hasNoMatchingChange","$eq","$size","operation","$arrayElemAt","mainVisibility","$or","$and","$ne","$toString","$lte","branchVisibility","$match","_branch","$in","$lookup","as","from","collection","name","let","canonicalDocumentID","pipeline","$expr","$project","baseVersionID","baseVersionUpdatedAt","$limit","$unset"],"mappings":"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"}

package/dist/queries/buildQuery.d.ts

@@ -1,11 +1,13 @@
-import type { FlattenedField, Where } from 'payload';
+import type { FlattenedField, PayloadRequest, Where } from 'payload';
 import type { MongooseAdapter } from '../index.js';
-export declare const buildQuery: ({ adapter, collectionSlug, fields, globalSlug, locale, where, }: {
+export declare const buildQuery: ({ adapter, branch, collectionSlug, fields, globalSlug, locale, req, where, }: {
     adapter: MongooseAdapter;
+    branch?: false | string;
     collectionSlug?: string;
     fields: FlattenedField[];
     globalSlug?: string;
     locale?: string;
+    req?: Partial<PayloadRequest>;
     where: Where;
 }) => Promise<Record<string, unknown>>;
 //# sourceMappingURL=buildQuery.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,UAAU,oEAOpB;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,KAAK,CAAA;CACb,qCAYA,CAAA"}
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAIlD,eAAO,MAAM,UAAU,iFASpB;IACD,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,KAAK,EAAE,KAAK,CAAA;CACb,qCAcA,CAAA"}

package/dist/queries/buildQuery.js

@@ -1,12 +1,14 @@
 import { parseParams } from './parseParams.js';
-export const buildQuery = async ({ adapter, collectionSlug, fields, globalSlug, locale, where })=>{
+export const buildQuery = async ({ adapter, branch, collectionSlug, fields, globalSlug, locale, req, where })=>{
     const result = await parseParams({
+        branch,
         collectionSlug,
         fields,
         globalSlug,
         locale,
         parentIsLocalized: false,
         payload: adapter.payload,
+        req,
         where
     });
     return result;

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { FlattenedField, Where } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { parseParams } from './parseParams.js'\n\nexport const buildQuery = async ({\n  adapter,\n  collectionSlug,\n  fields,\n  globalSlug,\n  locale,\n  where,\n}: {\n  adapter: MongooseAdapter\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  locale?: string\n  where: Where\n}) => {\n  const result = await parseParams({\n    collectionSlug,\n    fields,\n    globalSlug,\n    locale,\n    parentIsLocalized: false,\n    payload: adapter.payload,\n    where,\n  })\n\n  return result\n}\n"],"names":["parseParams","buildQuery","adapter","collectionSlug","fields","globalSlug","locale","where","result","parentIsLocalized","payload"],"mappings":"AAIA,SAASA,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,aAAa,OAAO,EAC/BC,OAAO,EACPC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,KAAK,EAQN;IACC,MAAMC,SAAS,MAAMR,YAAY;QAC/BG;QACAC;QACAC;QACAC;QACAG,mBAAmB;QACnBC,SAASR,QAAQQ,OAAO;QACxBH;IACF;IAEA,OAAOC;AACT,EAAC"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { FlattenedField, PayloadRequest, Where } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { parseParams } from './parseParams.js'\n\nexport const buildQuery = async ({\n  adapter,\n  branch,\n  collectionSlug,\n  fields,\n  globalSlug,\n  locale,\n  req,\n  where,\n}: {\n  adapter: MongooseAdapter\n  branch?: false | string\n  collectionSlug?: string\n  fields: FlattenedField[]\n  globalSlug?: string\n  locale?: string\n  req?: Partial<PayloadRequest>\n  where: Where\n}) => {\n  const result = await parseParams({\n    branch,\n    collectionSlug,\n    fields,\n    globalSlug,\n    locale,\n    parentIsLocalized: false,\n    payload: adapter.payload,\n    req,\n    where,\n  })\n\n  return result\n}\n"],"names":["parseParams","buildQuery","adapter","branch","collectionSlug","fields","globalSlug","locale","req","where","result","parentIsLocalized","payload"],"mappings":"AAIA,SAASA,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,aAAa,OAAO,EAC/BC,OAAO,EACPC,MAAM,EACNC,cAAc,EACdC,MAAM,EACNC,UAAU,EACVC,MAAM,EACNC,GAAG,EACHC,KAAK,EAUN;IACC,MAAMC,SAAS,MAAMV,YAAY;QAC/BG;QACAC;QACAC;QACAC;QACAC;QACAI,mBAAmB;QACnBC,SAASV,QAAQU,OAAO;QACxBJ;QACAC;IACF;IAEA,OAAOC;AACT,EAAC"}

package/dist/queries/buildRelatedQueryPipeline.d.ts

@@ -0,0 +1,7 @@
+import type { PipelineStage } from 'mongoose';
+/** Keep geospatial filtering first, before branch visibility introduces lookups. */
+export declare const buildRelatedQueryPipeline: ({ branchVisibility, query, }: {
+    branchVisibility: PipelineStage[];
+    query: Record<string, unknown>;
+}) => PipelineStage[];
+//# sourceMappingURL=buildRelatedQueryPipeline.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"buildRelatedQueryPipeline.d.ts","sourceRoot":"","sources":["../../src/queries/buildRelatedQueryPipeline.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAI7C,oFAAoF;AACpF,eAAO,MAAM,yBAAyB,iCAGnC;IACD,gBAAgB,EAAE,aAAa,EAAE,CAAA;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC/B,KAAG,aAAa,EAiDhB,CAAA"}

package/dist/queries/buildRelatedQueryPipeline.js

@@ -0,0 +1,56 @@
+import { APIError } from 'payload';
+/** Keep geospatial filtering first, before branch visibility introduces lookups. */ export const buildRelatedQueryPipeline = ({ branchVisibility, query })=>{
+    let geoNear;
+    const extractNear = ({ query })=>{
+        const remainingQuery = {};
+        for (const [key, value] of Object.entries(query)){
+            if (key === '$and' && Array.isArray(value)) {
+                remainingQuery[key] = value.map((query)=>extractNear({
+                        query
+                    }));
+            } else if (value && typeof value === 'object' && '$near' in value) {
+                if (geoNear) {
+                    throw new APIError('Only one near constraint is supported per related query.', 400);
+                }
+                const { $near, ...remainingOperators } = value;
+                const near = $near;
+                geoNear = {
+                    distanceField: '__payloadRelatedDistance',
+                    key,
+                    near: near.$geometry,
+                    spherical: true,
+                    ...near.$maxDistance !== undefined ? {
+                        maxDistance: near.$maxDistance
+                    } : {},
+                    ...near.$minDistance !== undefined ? {
+                        minDistance: near.$minDistance
+                    } : {}
+                };
+                if (Object.keys(remainingOperators).length) {
+                    remainingQuery[key] = remainingOperators;
+                }
+            } else {
+                remainingQuery[key] = value;
+            }
+        }
+        return remainingQuery;
+    };
+    // MongoDB permits $near at the top level or in $and, but not inside $or/$nor.
+    // Leave those unsupported forms intact so MongoDB still rejects invalid queries.
+    const remainingQuery = extractNear({
+        query
+    });
+    return [
+        geoNear ? {
+            $geoNear: {
+                ...geoNear,
+                query: remainingQuery
+            }
+        } : {
+            $match: query
+        },
+        ...branchVisibility
+    ];
+};
+
+//# sourceMappingURL=buildRelatedQueryPipeline.js.map

package/dist/queries/buildRelatedQueryPipeline.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/queries/buildRelatedQueryPipeline.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport { APIError } from 'payload'\n\n/** Keep geospatial filtering first, before branch visibility introduces lookups. */\nexport const buildRelatedQueryPipeline = ({\n  branchVisibility,\n  query,\n}: {\n  branchVisibility: PipelineStage[]\n  query: Record<string, unknown>\n}): PipelineStage[] => {\n  let geoNear: PipelineStage.GeoNear['$geoNear'] | undefined\n\n  const extractNear = ({ query }: { query: Record<string, unknown> }): Record<string, unknown> => {\n    const remainingQuery: Record<string, unknown> = {}\n\n    for (const [key, value] of Object.entries(query)) {\n      if (key === '$and' && Array.isArray(value)) {\n        remainingQuery[key] = value.map((query) => extractNear({ query }))\n      } else if (value && typeof value === 'object' && '$near' in value) {\n        if (geoNear) {\n          throw new APIError('Only one near constraint is supported per related query.', 400)\n        }\n\n        const { $near, ...remainingOperators } = value\n        const near = $near as {\n          $geometry: { coordinates: [number, number]; type: 'Point' }\n          $maxDistance?: number\n          $minDistance?: number\n        }\n\n        geoNear = {\n          distanceField: '__payloadRelatedDistance',\n          key,\n          near: near.$geometry,\n          spherical: true,\n          ...(near.$maxDistance !== undefined ? { maxDistance: near.$maxDistance } : {}),\n          ...(near.$minDistance !== undefined ? { minDistance: near.$minDistance } : {}),\n        }\n\n        if (Object.keys(remainingOperators).length) {\n          remainingQuery[key] = remainingOperators\n        }\n      } else {\n        remainingQuery[key] = value\n      }\n    }\n\n    return remainingQuery\n  }\n\n  // MongoDB permits $near at the top level or in $and, but not inside $or/$nor.\n  // Leave those unsupported forms intact so MongoDB still rejects invalid queries.\n  const remainingQuery = extractNear({ query })\n\n  return [\n    geoNear ? { $geoNear: { ...geoNear, query: remainingQuery } } : { $match: query },\n    ...branchVisibility,\n  ]\n}\n"],"names":["APIError","buildRelatedQueryPipeline","branchVisibility","query","geoNear","extractNear","remainingQuery","key","value","Object","entries","Array","isArray","map","$near","remainingOperators","near","distanceField","$geometry","spherical","$maxDistance","undefined","maxDistance","$minDistance","minDistance","keys","length","$geoNear","$match"],"mappings":"AAEA,SAASA,QAAQ,QAAQ,UAAS;AAElC,kFAAkF,GAClF,OAAO,MAAMC,4BAA4B,CAAC,EACxCC,gBAAgB,EAChBC,KAAK,EAIN;IACC,IAAIC;IAEJ,MAAMC,cAAc,CAAC,EAAEF,KAAK,EAAsC;QAChE,MAAMG,iBAA0C,CAAC;QAEjD,KAAK,MAAM,CAACC,KAAKC,MAAM,IAAIC,OAAOC,OAAO,CAACP,OAAQ;YAChD,IAAII,QAAQ,UAAUI,MAAMC,OAAO,CAACJ,QAAQ;gBAC1CF,cAAc,CAACC,IAAI,GAAGC,MAAMK,GAAG,CAAC,CAACV,QAAUE,YAAY;wBAAEF;oBAAM;YACjE,OAAO,IAAIK,SAAS,OAAOA,UAAU,YAAY,WAAWA,OAAO;gBACjE,IAAIJ,SAAS;oBACX,MAAM,IAAIJ,SAAS,4DAA4D;gBACjF;gBAEA,MAAM,EAAEc,KAAK,EAAE,GAAGC,oBAAoB,GAAGP;gBACzC,MAAMQ,OAAOF;gBAMbV,UAAU;oBACRa,eAAe;oBACfV;oBACAS,MAAMA,KAAKE,SAAS;oBACpBC,WAAW;oBACX,GAAIH,KAAKI,YAAY,KAAKC,YAAY;wBAAEC,aAAaN,KAAKI,YAAY;oBAAC,IAAI,CAAC,CAAC;oBAC7E,GAAIJ,KAAKO,YAAY,KAAKF,YAAY;wBAAEG,aAAaR,KAAKO,YAAY;oBAAC,IAAI,CAAC,CAAC;gBAC/E;gBAEA,IAAId,OAAOgB,IAAI,CAACV,oBAAoBW,MAAM,EAAE;oBAC1CpB,cAAc,CAACC,IAAI,GAAGQ;gBACxB;YACF,OAAO;gBACLT,cAAc,CAACC,IAAI,GAAGC;YACxB;QACF;QAEA,OAAOF;IACT;IAEA,8EAA8E;IAC9E,iFAAiF;IACjF,MAAMA,iBAAiBD,YAAY;QAAEF;IAAM;IAE3C,OAAO;QACLC,UAAU;YAAEuB,UAAU;gBAAE,GAAGvB,OAAO;gBAAED,OAAOG;YAAe;QAAE,IAAI;YAAEsB,QAAQzB;QAAM;WAC7ED;KACJ;AACH,EAAC"}

package/dist/queries/buildSearchParams.d.ts

@@ -1,4 +1,4 @@
-import type { FlattenedField, Operator, Payload } from 'payload';
+import type { FlattenedField, Operator, Payload, PayloadRequest } from 'payload';
 type SearchParam = {
     path?: string;
     rawQuery?: unknown;
@@ -7,7 +7,8 @@ type SearchParam = {
 /**
  * Convert the Payload key / value / operator into a MongoDB query
  */
-export declare function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPath, locale, operator, parentIsLocalized, payload, val, }: {
+export declare function buildSearchParam({ branch, collectionSlug, fields, globalSlug, incomingPath, locale, operator, parentIsLocalized, payload, req, val, }: {
+    branch?: false | string;
     collectionSlug?: string;
     fields: FlattenedField[];
     globalSlug?: string;
@@ -16,6 +17,7 @@ export declare function buildSearchParam({ collectionSlug, fields, globalSlug, i
     operator: Operator;
     parentIsLocalized: boolean;
     payload: Payload;
+    req?: Partial<PayloadRequest>;
     val: unknown;
 }): Promise<SearchParam | undefined>;
 export {};

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

@@ -1 +1 @@
-{"version":3,"file":"buildSearchParams.d.ts","sourceRoot":"","sources":["../../src/queries/buildSearchParams.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAEd,QAAQ,EAER,OAAO,EACR,MAAM,SAAS,CAAA;AAkBhB,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAMD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,cAAc,EACd,MAAM,EACN,UAAU,EACV,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,GAAG,GACJ,EAAE;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,QAAQ,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAmZnC"}
+{"version":3,"file":"buildSearchParams.d.ts","sourceRoot":"","sources":["../../src/queries/buildSearchParams.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,cAAc,EAEd,QAAQ,EAER,OAAO,EACP,cAAc,EAEf,MAAM,SAAS,CAAA;AA6BhB,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,MAAM,EACN,cAAc,EACd,MAAM,EACN,UAAU,EACV,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,GAAG,EACH,GAAG,GACJ,EAAE;IACD,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,QAAQ,CAAA;IAClB,iBAAiB,EAAE,OAAO,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;IAC7B,GAAG,EAAE,OAAO,CAAA;CACb,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CA2bnC"}