@payloadcms/db-mongodb 3.56.0-canary.7 → 3.56.0-canary.8

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

@@ -1 +1 @@
-{"version":3,"file":"buildSortParam.d.ts","sourceRoot":"","sources":["../../src/queries/buildSortParam.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAEL,KAAK,cAAc,EAEnB,KAAK,eAAe,EACpB,KAAK,IAAI,EACV,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAKlD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,EAAE,CAAA;AAEH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAA;AA8H1C,eAAO,MAAM,cAAc,yGAUxB,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAgF9B,CAAA"}
+{"version":3,"file":"buildSortParam.d.ts","sourceRoot":"","sources":["../../src/queries/buildSortParam.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,EAEL,KAAK,cAAc,EAEnB,KAAK,eAAe,EACpB,KAAK,IAAI,EACV,MAAM,SAAS,CAAA;AAEhB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAKlD,KAAK,IAAI,GAAG;IACV,OAAO,EAAE,eAAe,CAAA;IACxB,MAAM,EAAE,eAAe,CAAA;IACvB,MAAM,EAAE,cAAc,EAAE,CAAA;IACxB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,IAAI,CAAC,EAAE,IAAI,CAAA;IACX,eAAe,CAAC,EAAE,aAAa,EAAE,CAAA;IACjC,UAAU,EAAE,OAAO,CAAA;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;CACjB,EAAE,CAAA;AAEH,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAA;AAgH1C,eAAO,MAAM,cAAc,yGAUxB,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAgF9B,CAAA"}

package/dist/queries/buildSortParam.js

@@ -1,93 +1,75 @@
-import { APIError, getFieldByPath } from 'payload';
+import { getFieldByPath } from 'payload';
 import { getCollection } from '../utilities/getEntity.js';
 import { getLocalizedSortProperty } from './getLocalizedSortProperty.js';
-const relationshipSort = ({ adapter, fields, locale, path, sort, sortAggregation, sortDirection, versions })=>{
+const relationshipSort = ({ adapter, fields, locale, path, previousField = '', sortAggregation })=>{
     let currentFields = fields;
     const segments = path.split('.');
     if (segments.length < 2) {
-        return false;
+        return null;
     }
     for(let i = 0; i < segments.length; i++){
         const segment = segments[i];
         const field = currentFields.find((each)=>each.name === segment);
         if (!field) {
-            return false;
+            return null;
         }
         if ('fields' in field) {
             currentFields = field.flattenedFields;
-            if (field.name === 'version' && versions && i === 0) {
-                segments.shift();
-                i--;
-            }
         } else if ((field.type === 'relationship' || field.type === 'upload') && i !== segments.length - 1) {
             const relationshipPath = segments.slice(0, i + 1).join('.');
-            let sortFieldPath = segments.slice(i + 1, segments.length).join('.');
-            if (sortFieldPath.endsWith('.id')) {
-                sortFieldPath = sortFieldPath.split('.').slice(0, -1).join('.');
-            }
-            if (Array.isArray(field.relationTo)) {
-                throw new APIError('Not supported');
+            const nextPath = segments.slice(i + 1, segments.length);
+            const relationshipFieldResult = getFieldByPath({
+                fields,
+                path: relationshipPath
+            });
+            if (!relationshipFieldResult || !('relationTo' in relationshipFieldResult.field) || typeof relationshipFieldResult.field.relationTo !== 'string') {
+                return null;
             }
-            const foreignCollection = getCollection({
+            const { collectionConfig, Model } = getCollection({
                 adapter,
-                collectionSlug: field.relationTo
+                collectionSlug: relationshipFieldResult.field.relationTo
             });
-            const foreignFieldPath = getFieldByPath({
-                fields: foreignCollection.collectionConfig.flattenedFields,
-                path: sortFieldPath
-            });
-            if (!foreignFieldPath) {
-                return false;
+            let localizedRelationshipPath = relationshipFieldResult.localizedPath;
+            if (locale && relationshipFieldResult.pathHasLocalized) {
+                localizedRelationshipPath = relationshipFieldResult.localizedPath.replace('<locale>', locale);
             }
-            if (foreignFieldPath.pathHasLocalized && locale) {
-                sortFieldPath = foreignFieldPath.localizedPath.replace('<locale>', locale);
+            if (nextPath.join('.') === 'id') {
+                return `${previousField}${localizedRelationshipPath}`;
             }
-            const as = `__${relationshipPath.replace(/\./g, '__')}`;
-            // If we have not already sorted on this relationship yet, we need to add a lookup stage
-            if (!sortAggregation.some((each)=>'$lookup' in each && each.$lookup.as === as)) {
-                let localField = versions ? `version.${relationshipPath}` : relationshipPath;
-                if (adapter.usePipelineInSortLookup) {
-                    const flattenedField = `__${localField.replace(/\./g, '__')}_lookup`;
-                    sortAggregation.push({
-                        $addFields: {
-                            [flattenedField]: `$${localField}`
-                        }
-                    });
-                    localField = flattenedField;
+            const as = `__${previousField}${localizedRelationshipPath}`;
+            sortAggregation.push({
+                $lookup: {
+                    as: `__${previousField}${localizedRelationshipPath}`,
+                    foreignField: '_id',
+                    from: Model.collection.name,
+                    localField: `${previousField}${localizedRelationshipPath}`
                 }
-                sortAggregation.push({
-                    $lookup: {
-                        as,
-                        foreignField: '_id',
-                        from: foreignCollection.Model.collection.name,
-                        localField,
-                        ...!adapter.usePipelineInSortLookup && {
-                            pipeline: [
-                                {
-                                    $project: {
-                                        [sortFieldPath]: true
-                                    }
-                                }
-                            ]
-                        }
-                    }
+            });
+            if (nextPath.length > 1) {
+                const nextRes = relationshipSort({
+                    adapter,
+                    fields: collectionConfig.flattenedFields,
+                    locale,
+                    path: nextPath.join('.'),
+                    previousField: `${as}.`,
+                    sortAggregation
                 });
-                if (adapter.usePipelineInSortLookup) {
-                    sortAggregation.push({
-                        $unset: localField
-                    });
+                if (nextRes) {
+                    return nextRes;
                 }
+                return `${as}.${nextPath.join('.')}`;
             }
-            if (!adapter.usePipelineInSortLookup) {
-                const lookup = sortAggregation.find((each)=>'$lookup' in each && each.$lookup.as === as);
-                const pipeline = lookup.$lookup.pipeline[0];
-                pipeline.$project[sortFieldPath] = true;
+            const nextField = getFieldByPath({
+                fields: collectionConfig.flattenedFields,
+                path: nextPath[0]
+            });
+            if (nextField && nextField.pathHasLocalized && locale) {
+                return `${as}.${nextField.localizedPath.replace('<locale>', locale)}`;
             }
-            sort[`${as}.${sortFieldPath}`] = sortDirection;
-            return true;
+            return `${as}.${nextPath[0]}`;
         }
     }
-    return false;
+    return null;
 };
 export const buildSortParam = ({ adapter, config, fields, locale, parentIsLocalized = false, sort, sortAggregation, timestamps, versions })=>{
     if (!sort) {
@@ -134,17 +116,19 @@ export const buildSortParam = ({ adapter, config, fields, locale, parentIsLocali
             acc['_id'] = sortDirection;
             return acc;
         }
-        if (sortAggregation && relationshipSort({
-            adapter,
-            fields,
-            locale,
-            path: sortProperty,
-            sort: acc,
-            sortAggregation,
-            sortDirection,
-            versions
-        })) {
-            return acc;
+        if (sortAggregation) {
+            const sortRelProperty = relationshipSort({
+                adapter,
+                fields,
+                locale,
+                path: sortProperty,
+                sortAggregation,
+                versions
+            });
+            if (sortRelProperty) {
+                acc[sortRelProperty] = sortDirection;
+                return acc;
+            }
         }
         const localizedProperty = getLocalizedSortProperty({
             config,

package/dist/queries/buildSortParam.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildSortParam.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport {\n  APIError,\n  type FlattenedField,\n  getFieldByPath,\n  type SanitizedConfig,\n  type Sort,\n} from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getCollection } from '../utilities/getEntity.js'\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\ntype Args = {\n  adapter: MongooseAdapter\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale?: string\n  parentIsLocalized?: boolean\n  sort?: Sort\n  sortAggregation?: PipelineStage[]\n  timestamps: boolean\n  versions?: boolean\n}\n\nexport type SortArgs = {\n  direction: SortDirection\n  property: string\n}[]\n\nexport type SortDirection = 'asc' | 'desc'\n\nconst relationshipSort = ({\n  adapter,\n  fields,\n  locale,\n  path,\n  sort,\n  sortAggregation,\n  sortDirection,\n  versions,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  locale?: string\n  path: string\n  sort: Record<string, string>\n  sortAggregation: PipelineStage[]\n  sortDirection: SortDirection\n  versions?: boolean\n}) => {\n  let currentFields = fields\n  const segments = path.split('.')\n  if (segments.length < 2) {\n    return false\n  }\n\n  for (let i = 0; i < segments.length; i++) {\n    const segment = segments[i]\n    const field = currentFields.find((each) => each.name === segment)\n\n    if (!field) {\n      return false\n    }\n\n    if ('fields' in field) {\n      currentFields = field.flattenedFields\n      if (field.name === 'version' && versions && i === 0) {\n        segments.shift()\n        i--\n      }\n    } else if (\n      (field.type === 'relationship' || field.type === 'upload') &&\n      i !== segments.length - 1\n    ) {\n      const relationshipPath = segments.slice(0, i + 1).join('.')\n      let sortFieldPath = segments.slice(i + 1, segments.length).join('.')\n      if (sortFieldPath.endsWith('.id')) {\n        sortFieldPath = sortFieldPath.split('.').slice(0, -1).join('.')\n      }\n      if (Array.isArray(field.relationTo)) {\n        throw new APIError('Not supported')\n      }\n\n      const foreignCollection = getCollection({ adapter, collectionSlug: field.relationTo })\n\n      const foreignFieldPath = getFieldByPath({\n        fields: foreignCollection.collectionConfig.flattenedFields,\n        path: sortFieldPath,\n      })\n\n      if (!foreignFieldPath) {\n        return false\n      }\n\n      if (foreignFieldPath.pathHasLocalized && locale) {\n        sortFieldPath = foreignFieldPath.localizedPath.replace('<locale>', locale)\n      }\n\n      const as = `__${relationshipPath.replace(/\\./g, '__')}`\n\n      // If we have not already sorted on this relationship yet, we need to add a lookup stage\n      if (!sortAggregation.some((each) => '$lookup' in each && each.$lookup.as === as)) {\n        let localField = versions ? `version.${relationshipPath}` : relationshipPath\n\n        if (adapter.usePipelineInSortLookup) {\n          const flattenedField = `__${localField.replace(/\\./g, '__')}_lookup`\n          sortAggregation.push({\n            $addFields: {\n              [flattenedField]: `$${localField}`,\n            },\n          })\n          localField = flattenedField\n        }\n\n        sortAggregation.push({\n          $lookup: {\n            as,\n            foreignField: '_id',\n            from: foreignCollection.Model.collection.name,\n            localField,\n            ...(!adapter.usePipelineInSortLookup && {\n              pipeline: [\n                {\n                  $project: {\n                    [sortFieldPath]: true,\n                  },\n                },\n              ],\n            }),\n          },\n        })\n\n        if (adapter.usePipelineInSortLookup) {\n          sortAggregation.push({\n            $unset: localField,\n          })\n        }\n      }\n\n      if (!adapter.usePipelineInSortLookup) {\n        const lookup = sortAggregation.find(\n          (each) => '$lookup' in each && each.$lookup.as === as,\n        ) as PipelineStage.Lookup\n        const pipeline = lookup.$lookup.pipeline![0] as PipelineStage.Project\n        pipeline.$project[sortFieldPath] = true\n      }\n\n      sort[`${as}.${sortFieldPath}`] = sortDirection\n      return true\n    }\n  }\n\n  return false\n}\n\nexport const buildSortParam = ({\n  adapter,\n  config,\n  fields,\n  locale,\n  parentIsLocalized = false,\n  sort,\n  sortAggregation,\n  timestamps,\n  versions,\n}: Args): Record<string, string> => {\n  if (!sort) {\n    if (timestamps) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // We use this flag to determine if the sort is unique or not to decide whether to add a fallback sort.\n  const isUniqueSort = sort.some((item) => {\n    const field = getFieldByPath({ fields, path: item })\n    return field?.field?.unique\n  })\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (timestamps) {\n    fallbackSort = '-createdAt'\n  }\n\n  const includeFallbackSort =\n    !adapter.disableFallbackSort &&\n    !isUniqueSort &&\n    !(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))\n\n  if (includeFallbackSort) {\n    sort.push(fallbackSort)\n  }\n\n  const sorting = sort.reduce<Record<string, string>>((acc, item) => {\n    let sortProperty: string\n    let sortDirection: SortDirection\n    if (item.indexOf('-') === 0) {\n      sortProperty = item.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = item\n      sortDirection = 'asc'\n    }\n    if (sortProperty === 'id') {\n      acc['_id'] = sortDirection\n      return acc\n    }\n\n    if (\n      sortAggregation &&\n      relationshipSort({\n        adapter,\n        fields,\n        locale,\n        path: sortProperty,\n        sort: acc,\n        sortAggregation,\n        sortDirection,\n        versions,\n      })\n    ) {\n      return acc\n    }\n\n    const localizedProperty = getLocalizedSortProperty({\n      config,\n      fields,\n      locale,\n      parentIsLocalized,\n      segments: sortProperty.split('.'),\n    })\n    acc[localizedProperty] = sortDirection\n\n    return acc\n  }, {})\n\n  return sorting\n}\n"],"names":["APIError","getFieldByPath","getCollection","getLocalizedSortProperty","relationshipSort","adapter","fields","locale","path","sort","sortAggregation","sortDirection","versions","currentFields","segments","split","length","i","segment","field","find","each","name","flattenedFields","shift","type","relationshipPath","slice","join","sortFieldPath","endsWith","Array","isArray","relationTo","foreignCollection","collectionSlug","foreignFieldPath","collectionConfig","pathHasLocalized","localizedPath","replace","as","some","$lookup","localField","usePipelineInSortLookup","flattenedField","push","$addFields","foreignField","from","Model","collection","pipeline","$project","$unset","lookup","buildSortParam","config","parentIsLocalized","timestamps","isUniqueSort","item","unique","fallbackSort","includeFallbackSort","disableFallbackSort","includes","sorting","reduce","acc","sortProperty","indexOf","substring","localizedProperty"],"mappings":"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"}
+{"version":3,"sources":["../../src/queries/buildSortParam.ts"],"sourcesContent":["import type { PipelineStage } from 'mongoose'\n\nimport {\n  APIError,\n  type FlattenedField,\n  getFieldByPath,\n  type SanitizedConfig,\n  type Sort,\n} from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getCollection } from '../utilities/getEntity.js'\nimport { getLocalizedSortProperty } from './getLocalizedSortProperty.js'\n\ntype Args = {\n  adapter: MongooseAdapter\n  config: SanitizedConfig\n  fields: FlattenedField[]\n  locale?: string\n  parentIsLocalized?: boolean\n  sort?: Sort\n  sortAggregation?: PipelineStage[]\n  timestamps: boolean\n  versions?: boolean\n}\n\nexport type SortArgs = {\n  direction: SortDirection\n  property: string\n}[]\n\nexport type SortDirection = 'asc' | 'desc'\n\nconst relationshipSort = ({\n  adapter,\n  fields,\n  locale,\n  path,\n  previousField = '',\n  sortAggregation,\n}: {\n  adapter: MongooseAdapter\n  fields: FlattenedField[]\n  locale?: string\n  path: string\n  previousField?: string\n  sortAggregation: PipelineStage[]\n  versions?: boolean\n}): null | string => {\n  let currentFields = fields\n  const segments = path.split('.')\n  if (segments.length < 2) {\n    return null\n  }\n\n  for (let i = 0; i < segments.length; i++) {\n    const segment = segments[i]\n    const field = currentFields.find((each) => each.name === segment)\n\n    if (!field) {\n      return null\n    }\n\n    if ('fields' in field) {\n      currentFields = field.flattenedFields\n    } else if (\n      (field.type === 'relationship' || field.type === 'upload') &&\n      i !== segments.length - 1\n    ) {\n      const relationshipPath = segments.slice(0, i + 1).join('.')\n      const nextPath = segments.slice(i + 1, segments.length)\n      const relationshipFieldResult = getFieldByPath({ fields, path: relationshipPath })\n\n      if (\n        !relationshipFieldResult ||\n        !('relationTo' in relationshipFieldResult.field) ||\n        typeof relationshipFieldResult.field.relationTo !== 'string'\n      ) {\n        return null\n      }\n\n      const { collectionConfig, Model } = getCollection({\n        adapter,\n        collectionSlug: relationshipFieldResult.field.relationTo,\n      })\n\n      let localizedRelationshipPath: string = relationshipFieldResult.localizedPath\n\n      if (locale && relationshipFieldResult.pathHasLocalized) {\n        localizedRelationshipPath = relationshipFieldResult.localizedPath.replace(\n          '<locale>',\n          locale,\n        )\n      }\n\n      if (nextPath.join('.') === 'id') {\n        return `${previousField}${localizedRelationshipPath}`\n      }\n\n      const as = `__${previousField}${localizedRelationshipPath}`\n\n      sortAggregation.push({\n        $lookup: {\n          as: `__${previousField}${localizedRelationshipPath}`,\n          foreignField: '_id',\n          from: Model.collection.name,\n          localField: `${previousField}${localizedRelationshipPath}`,\n        },\n      })\n\n      if (nextPath.length > 1) {\n        const nextRes = relationshipSort({\n          adapter,\n          fields: collectionConfig.flattenedFields,\n          locale,\n          path: nextPath.join('.'),\n          previousField: `${as}.`,\n          sortAggregation,\n        })\n\n        if (nextRes) {\n          return nextRes\n        }\n\n        return `${as}.${nextPath.join('.')}`\n      }\n\n      const nextField = getFieldByPath({\n        fields: collectionConfig.flattenedFields,\n        path: nextPath[0]!,\n      })\n\n      if (nextField && nextField.pathHasLocalized && locale) {\n        return `${as}.${nextField.localizedPath.replace('<locale>', locale)}`\n      }\n\n      return `${as}.${nextPath[0]}`\n    }\n  }\n\n  return null\n}\n\nexport const buildSortParam = ({\n  adapter,\n  config,\n  fields,\n  locale,\n  parentIsLocalized = false,\n  sort,\n  sortAggregation,\n  timestamps,\n  versions,\n}: Args): Record<string, string> => {\n  if (!sort) {\n    if (timestamps) {\n      sort = '-createdAt'\n    } else {\n      sort = '-id'\n    }\n  }\n\n  if (typeof sort === 'string') {\n    sort = [sort]\n  }\n\n  // We use this flag to determine if the sort is unique or not to decide whether to add a fallback sort.\n  const isUniqueSort = sort.some((item) => {\n    const field = getFieldByPath({ fields, path: item })\n    return field?.field?.unique\n  })\n\n  // In the case of Mongo, when sorting by a field that is not unique, the results are not guaranteed to be in the same order each time.\n  // So we add a fallback sort to ensure that the results are always in the same order.\n  let fallbackSort = '-id'\n\n  if (timestamps) {\n    fallbackSort = '-createdAt'\n  }\n\n  const includeFallbackSort =\n    !adapter.disableFallbackSort &&\n    !isUniqueSort &&\n    !(sort.includes(fallbackSort) || sort.includes(fallbackSort.replace('-', '')))\n\n  if (includeFallbackSort) {\n    sort.push(fallbackSort)\n  }\n\n  const sorting = sort.reduce<Record<string, string>>((acc, item) => {\n    let sortProperty: string\n    let sortDirection: SortDirection\n    if (item.indexOf('-') === 0) {\n      sortProperty = item.substring(1)\n      sortDirection = 'desc'\n    } else {\n      sortProperty = item\n      sortDirection = 'asc'\n    }\n    if (sortProperty === 'id') {\n      acc['_id'] = sortDirection\n      return acc\n    }\n\n    if (sortAggregation) {\n      const sortRelProperty = relationshipSort({\n        adapter,\n        fields,\n        locale,\n        path: sortProperty,\n        sortAggregation,\n        versions,\n      })\n\n      if (sortRelProperty) {\n        acc[sortRelProperty] = sortDirection\n        return acc\n      }\n    }\n\n    const localizedProperty = getLocalizedSortProperty({\n      config,\n      fields,\n      locale,\n      parentIsLocalized,\n      segments: sortProperty.split('.'),\n    })\n    acc[localizedProperty] = sortDirection\n\n    return acc\n  }, {})\n\n  return sorting\n}\n"],"names":["getFieldByPath","getCollection","getLocalizedSortProperty","relationshipSort","adapter","fields","locale","path","previousField","sortAggregation","currentFields","segments","split","length","i","segment","field","find","each","name","flattenedFields","type","relationshipPath","slice","join","nextPath","relationshipFieldResult","relationTo","collectionConfig","Model","collectionSlug","localizedRelationshipPath","localizedPath","pathHasLocalized","replace","as","push","$lookup","foreignField","from","collection","localField","nextRes","nextField","buildSortParam","config","parentIsLocalized","sort","timestamps","versions","isUniqueSort","some","item","unique","fallbackSort","includeFallbackSort","disableFallbackSort","includes","sorting","reduce","acc","sortProperty","sortDirection","indexOf","substring","sortRelProperty","localizedProperty"],"mappings":"AAEA,SAGEA,cAAc,QAGT,UAAS;AAIhB,SAASC,aAAa,QAAQ,4BAA2B;AACzD,SAASC,wBAAwB,QAAQ,gCAA+B;AAqBxE,MAAMC,mBAAmB,CAAC,EACxBC,OAAO,EACPC,MAAM,EACNC,MAAM,EACNC,IAAI,EACJC,gBAAgB,EAAE,EAClBC,eAAe,EAShB;IACC,IAAIC,gBAAgBL;IACpB,MAAMM,WAAWJ,KAAKK,KAAK,CAAC;IAC5B,IAAID,SAASE,MAAM,GAAG,GAAG;QACvB,OAAO;IACT;IAEA,IAAK,IAAIC,IAAI,GAAGA,IAAIH,SAASE,MAAM,EAAEC,IAAK;QACxC,MAAMC,UAAUJ,QAAQ,CAACG,EAAE;QAC3B,MAAME,QAAQN,cAAcO,IAAI,CAAC,CAACC,OAASA,KAAKC,IAAI,KAAKJ;QAEzD,IAAI,CAACC,OAAO;YACV,OAAO;QACT;QAEA,IAAI,YAAYA,OAAO;YACrBN,gBAAgBM,MAAMI,eAAe;QACvC,OAAO,IACL,AAACJ,CAAAA,MAAMK,IAAI,KAAK,kBAAkBL,MAAMK,IAAI,KAAK,QAAO,KACxDP,MAAMH,SAASE,MAAM,GAAG,GACxB;YACA,MAAMS,mBAAmBX,SAASY,KAAK,CAAC,GAAGT,IAAI,GAAGU,IAAI,CAAC;YACvD,MAAMC,WAAWd,SAASY,KAAK,CAACT,IAAI,GAAGH,SAASE,MAAM;YACtD,MAAMa,0BAA0B1B,eAAe;gBAAEK;gBAAQE,MAAMe;YAAiB;YAEhF,IACE,CAACI,2BACD,CAAE,CAAA,gBAAgBA,wBAAwBV,KAAK,AAAD,KAC9C,OAAOU,wBAAwBV,KAAK,CAACW,UAAU,KAAK,UACpD;gBACA,OAAO;YACT;YAEA,MAAM,EAAEC,gBAAgB,EAAEC,KAAK,EAAE,GAAG5B,cAAc;gBAChDG;gBACA0B,gBAAgBJ,wBAAwBV,KAAK,CAACW,UAAU;YAC1D;YAEA,IAAII,4BAAoCL,wBAAwBM,aAAa;YAE7E,IAAI1B,UAAUoB,wBAAwBO,gBAAgB,EAAE;gBACtDF,4BAA4BL,wBAAwBM,aAAa,CAACE,OAAO,CACvE,YACA5B;YAEJ;YAEA,IAAImB,SAASD,IAAI,CAAC,SAAS,MAAM;gBAC/B,OAAO,GAAGhB,gBAAgBuB,2BAA2B;YACvD;YAEA,MAAMI,KAAK,CAAC,EAAE,EAAE3B,gBAAgBuB,2BAA2B;YAE3DtB,gBAAgB2B,IAAI,CAAC;gBACnBC,SAAS;oBACPF,IAAI,CAAC,EAAE,EAAE3B,gBAAgBuB,2BAA2B;oBACpDO,cAAc;oBACdC,MAAMV,MAAMW,UAAU,CAACrB,IAAI;oBAC3BsB,YAAY,GAAGjC,gBAAgBuB,2BAA2B;gBAC5D;YACF;YAEA,IAAIN,SAASZ,MAAM,GAAG,GAAG;gBACvB,MAAM6B,UAAUvC,iBAAiB;oBAC/BC;oBACAC,QAAQuB,iBAAiBR,eAAe;oBACxCd;oBACAC,MAAMkB,SAASD,IAAI,CAAC;oBACpBhB,eAAe,GAAG2B,GAAG,CAAC,CAAC;oBACvB1B;gBACF;gBAEA,IAAIiC,SAAS;oBACX,OAAOA;gBACT;gBAEA,OAAO,GAAGP,GAAG,CAAC,EAAEV,SAASD,IAAI,CAAC,MAAM;YACtC;YAEA,MAAMmB,YAAY3C,eAAe;gBAC/BK,QAAQuB,iBAAiBR,eAAe;gBACxCb,MAAMkB,QAAQ,CAAC,EAAE;YACnB;YAEA,IAAIkB,aAAaA,UAAUV,gBAAgB,IAAI3B,QAAQ;gBACrD,OAAO,GAAG6B,GAAG,CAAC,EAAEQ,UAAUX,aAAa,CAACE,OAAO,CAAC,YAAY5B,SAAS;YACvE;YAEA,OAAO,GAAG6B,GAAG,CAAC,EAAEV,QAAQ,CAAC,EAAE,EAAE;QAC/B;IACF;IAEA,OAAO;AACT;AAEA,OAAO,MAAMmB,iBAAiB,CAAC,EAC7BxC,OAAO,EACPyC,MAAM,EACNxC,MAAM,EACNC,MAAM,EACNwC,oBAAoB,KAAK,EACzBC,IAAI,EACJtC,eAAe,EACfuC,UAAU,EACVC,QAAQ,EACH;IACL,IAAI,CAACF,MAAM;QACT,IAAIC,YAAY;YACdD,OAAO;QACT,OAAO;YACLA,OAAO;QACT;IACF;IAEA,IAAI,OAAOA,SAAS,UAAU;QAC5BA,OAAO;YAACA;SAAK;IACf;IAEA,uGAAuG;IACvG,MAAMG,eAAeH,KAAKI,IAAI,CAAC,CAACC;QAC9B,MAAMpC,QAAQhB,eAAe;YAAEK;YAAQE,MAAM6C;QAAK;QAClD,OAAOpC,OAAOA,OAAOqC;IACvB;IAEA,sIAAsI;IACtI,qFAAqF;IACrF,IAAIC,eAAe;IAEnB,IAAIN,YAAY;QACdM,eAAe;IACjB;IAEA,MAAMC,sBACJ,CAACnD,QAAQoD,mBAAmB,IAC5B,CAACN,gBACD,CAAEH,CAAAA,KAAKU,QAAQ,CAACH,iBAAiBP,KAAKU,QAAQ,CAACH,aAAapB,OAAO,CAAC,KAAK,IAAG;IAE9E,IAAIqB,qBAAqB;QACvBR,KAAKX,IAAI,CAACkB;IACZ;IAEA,MAAMI,UAAUX,KAAKY,MAAM,CAAyB,CAACC,KAAKR;QACxD,IAAIS;QACJ,IAAIC;QACJ,IAAIV,KAAKW,OAAO,CAAC,SAAS,GAAG;YAC3BF,eAAeT,KAAKY,SAAS,CAAC;YAC9BF,gBAAgB;QAClB,OAAO;YACLD,eAAeT;YACfU,gBAAgB;QAClB;QACA,IAAID,iBAAiB,MAAM;YACzBD,GAAG,CAAC,MAAM,GAAGE;YACb,OAAOF;QACT;QAEA,IAAInD,iBAAiB;YACnB,MAAMwD,kBAAkB9D,iBAAiB;gBACvCC;gBACAC;gBACAC;gBACAC,MAAMsD;gBACNpD;gBACAwC;YACF;YAEA,IAAIgB,iBAAiB;gBACnBL,GAAG,CAACK,gBAAgB,GAAGH;gBACvB,OAAOF;YACT;QACF;QAEA,MAAMM,oBAAoBhE,yBAAyB;YACjD2C;YACAxC;YACAC;YACAwC;YACAnC,UAAUkD,aAAajD,KAAK,CAAC;QAC/B;QACAgD,GAAG,CAACM,kBAAkB,GAAGJ;QAEzB,OAAOF;IACT,GAAG,CAAC;IAEJ,OAAOF;AACT,EAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.56.0-canary.7",
+  "version": "3.56.0-canary.8",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -50,10 +50,10 @@
     "mongodb": "6.16.0",
     "mongodb-memory-server": "10.1.4",
     "@payloadcms/eslint-config": "3.28.0",
-    "payload": "3.56.0-canary.7"
+    "payload": "3.56.0-canary.8"
   },
   "peerDependencies": {
-    "payload": "3.56.0-canary.7"
+    "payload": "3.56.0-canary.8"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",