@payloadcms/db-mongodb 3.2.2-canary.d2399ed → 3.2.3-canary.2d2e7d5

package/dist/findGlobalVersions.js

@@ -1,14 +1,21 @@
-import { buildVersionGlobalFields } from 'payload';
-import { getSession } from './getSession.js';
+import { buildVersionGlobalFields, flattenWhereToOperators } from 'payload';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
-import { findMany } from './utilities/findMany.js';
-import { getHasNearConstraint } from './utilities/getHasNearConstraint.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
+import { withSession } from './withSession.js';
 export const findGlobalVersions = async function findGlobalVersions({ global, limit, locale, page, pagination, req = {}, select, skip, sort: sortArg, where }) {
     const Model = this.versions[global];
     const versionFields = buildVersionGlobalFields(this.payload.config, this.payload.globals.config.find(({ slug })=>slug === global), true);
-    const hasNearConstraint = getHasNearConstraint(where);
+    const options = {
+        ...await withSession(this, req),
+        limit,
+        skip
+    };
+    let hasNearConstraint = false;
+    if (where) {
+        const constraints = flattenWhereToOperators(where);
+        hasNearConstraint = constraints.some((prop)=>Object.keys(prop).some((key)=>key === 'near'));
+    }
     let sort;
     if (!hasNearConstraint) {
         sort = buildSortParam({
@@ -19,46 +26,68 @@ export const findGlobalVersions = async function findGlobalVersions({ global, li
             timestamps: true
         });
     }
-    const session = await getSession(this, req);
     const query = await Model.buildQuery({
         globalSlug: global,
         locale,
         payload: this.payload,
-        session,
         where
     });
     // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.
     const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0;
-    const projection = buildProjectionFromSelect({
-        adapter: this,
-        fields: versionFields,
-        select
-    });
-    const collation = this.collation ? {
-        locale: locale && locale !== 'all' && locale !== '*' ? locale : 'en',
-        ...this.collation
-    } : undefined;
-    const result = await findMany({
-        adapter: this,
-        collation,
-        collection: Model.collection,
+    const paginationOptions = {
+        lean: true,
+        leanWithId: true,
         limit,
+        options,
         page,
         pagination,
-        projection,
-        query,
-        session,
-        skip,
+        projection: buildProjectionFromSelect({
+            adapter: this,
+            fields: versionFields,
+            select
+        }),
         sort,
         useEstimatedCount
-    });
-    transform({
-        adapter: this,
-        data: result.docs,
-        fields: versionFields,
-        operation: 'read'
-    });
-    return result;
+    };
+    if (this.collation) {
+        const defaultLocale = 'en';
+        paginationOptions.collation = {
+            locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,
+            ...this.collation
+        };
+    }
+    if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {
+        // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding
+        // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,
+        // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses
+        // the correct indexed field
+        paginationOptions.useCustomCountFn = ()=>{
+            return Promise.resolve(Model.countDocuments(query, {
+                ...options,
+                hint: {
+                    _id: 1
+                }
+            }));
+        };
+    }
+    if (limit >= 0) {
+        paginationOptions.limit = limit;
+        // limit must also be set here, it's ignored when pagination is false
+        paginationOptions.options.limit = limit;
+        // Disable pagination if limit is 0
+        if (limit === 0) {
+            paginationOptions.pagination = false;
+        }
+    }
+    const result = await Model.paginate(query, paginationOptions);
+    const docs = JSON.parse(JSON.stringify(result.docs));
+    return {
+        ...result,
+        docs: docs.map((doc)=>{
+            doc.id = doc._id;
+            return sanitizeInternalFields(doc);
+        })
+    };
 };
 
 //# sourceMappingURL=findGlobalVersions.js.map

package/dist/findGlobalVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { CollationOptions } from 'mongodb'\nimport type { FindGlobalVersions, PayloadRequest } from 'payload'\n\nimport { buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './getSession.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { findMany } from './utilities/findMany.js'\nimport { getHasNearConstraint } from './utilities/getHasNearConstraint.js'\nimport { transform } from './utilities/transform.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: MongooseAdapter,\n  {\n    global,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    select,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const Model = this.versions[global]\n  const versionFields = buildVersionGlobalFields(\n    this.payload.config,\n    this.payload.globals.config.find(({ slug }) => slug === global),\n    true,\n  )\n\n  const hasNearConstraint = getHasNearConstraint(where)\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      config: this.payload.config,\n      fields: versionFields,\n      locale,\n      sort: sortArg || '-updatedAt',\n      timestamps: true,\n    })\n  }\n\n  const session = await getSession(this, req)\n\n  const query = await Model.buildQuery({\n    globalSlug: global,\n    locale,\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const projection = buildProjectionFromSelect({ adapter: this, fields: versionFields, select })\n\n  const collation: CollationOptions | undefined = this.collation\n    ? {\n        locale: locale && locale !== 'all' && locale !== '*' ? locale : 'en',\n        ...this.collation,\n      }\n    : undefined\n\n  const result = await findMany({\n    adapter: this,\n    collation,\n    collection: Model.collection,\n    limit,\n    page,\n    pagination,\n    projection,\n    query,\n    session,\n    skip,\n    sort,\n    useEstimatedCount,\n  })\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: versionFields,\n    operation: 'read',\n  })\n\n  return result\n}\n"],"names":["buildVersionGlobalFields","getSession","buildSortParam","buildProjectionFromSelect","findMany","getHasNearConstraint","transform","findGlobalVersions","global","limit","locale","page","pagination","req","select","skip","sort","sortArg","where","Model","versions","versionFields","payload","config","globals","find","slug","hasNearConstraint","fields","timestamps","session","query","buildQuery","globalSlug","useEstimatedCount","Object","keys","length","projection","adapter","collation","undefined","result","collection","data","docs","operation"],"mappings":"AAGA,SAASA,wBAAwB,QAAQ,UAAS;AAIlD,SAASC,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,QAAQ,QAAQ,0BAAyB;AAClD,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,qBAAyC,eAAeA,mBAEnE,EACEC,MAAM,EACNC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,MAAM,EACNC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,QAAQ,IAAI,CAACC,QAAQ,CAACZ,OAAO;IACnC,MAAMa,gBAAgBrB,yBACpB,IAAI,CAACsB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,OAAO,CAACD,MAAM,CAACE,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAASlB,SACxD;IAGF,MAAMmB,oBAAoBtB,qBAAqBa;IAE/C,IAAIF;IACJ,IAAI,CAACW,mBAAmB;QACtBX,OAAOd,eAAe;YACpBqB,QAAQ,IAAI,CAACD,OAAO,CAACC,MAAM;YAC3BK,QAAQP;YACRX;YACAM,MAAMC,WAAW;YACjBY,YAAY;QACd;IACF;IAEA,MAAMC,UAAU,MAAM7B,WAAW,IAAI,EAAEY;IAEvC,MAAMkB,QAAQ,MAAMZ,MAAMa,UAAU,CAAC;QACnCC,YAAYzB;QACZE;QACAY,SAAS,IAAI,CAACA,OAAO;QACrBQ;QACAZ;IACF;IAEA,4HAA4H;IAC5H,MAAMgB,oBAAoBP,qBAAqB,CAACI,SAASI,OAAOC,IAAI,CAACL,OAAOM,MAAM,KAAK;IAEvF,MAAMC,aAAanC,0BAA0B;QAAEoC,SAAS,IAAI;QAAEX,QAAQP;QAAeP;IAAO;IAE5F,MAAM0B,YAA0C,IAAI,CAACA,SAAS,GAC1D;QACE9B,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAAS;QAChE,GAAG,IAAI,CAAC8B,SAAS;IACnB,IACAC;IAEJ,MAAMC,SAAS,MAAMtC,SAAS;QAC5BmC,SAAS,IAAI;QACbC;QACAG,YAAYxB,MAAMwB,UAAU;QAC5BlC;QACAE;QACAC;QACA0B;QACAP;QACAD;QACAf;QACAC;QACAkB;IACF;IAEA5B,UAAU;QACRiC,SAAS,IAAI;QACbK,MAAMF,OAAOG,IAAI;QACjBjB,QAAQP;QACRyB,WAAW;IACb;IAEA,OAAOJ;AACT,EAAC"}
+{"version":3,"sources":["../src/findGlobalVersions.ts"],"sourcesContent":["import type { PaginateOptions } from 'mongoose'\nimport type { FindGlobalVersions, PayloadRequest } from 'payload'\n\nimport { buildVersionGlobalFields, flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\nimport { withSession } from './withSession.js'\n\nexport const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(\n  this: MongooseAdapter,\n  {\n    global,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    select,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const Model = this.versions[global]\n  const versionFields = buildVersionGlobalFields(\n    this.payload.config,\n    this.payload.globals.config.find(({ slug }) => slug === global),\n    true,\n  )\n  const options = {\n    ...(await withSession(this, req)),\n    limit,\n    skip,\n  }\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      config: this.payload.config,\n      fields: versionFields,\n      locale,\n      sort: sortArg || '-updatedAt',\n      timestamps: true,\n    })\n  }\n\n  const query = await Model.buildQuery({\n    globalSlug: global,\n    locale,\n    payload: this.payload,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    limit,\n    options,\n    page,\n    pagination,\n    projection: buildProjectionFromSelect({ adapter: this, fields: versionFields, select }),\n    sort,\n    useEstimatedCount,\n  }\n\n  if (this.collation) {\n    const defaultLocale = 'en'\n    paginationOptions.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          ...options,\n          hint: { _id: 1 },\n        }),\n      )\n    }\n  }\n\n  if (limit >= 0) {\n    paginationOptions.limit = limit\n    // limit must also be set here, it's ignored when pagination is false\n    paginationOptions.options.limit = limit\n\n    // Disable pagination if limit is 0\n    if (limit === 0) {\n      paginationOptions.pagination = false\n    }\n  }\n\n  const result = await Model.paginate(query, paginationOptions)\n  const docs = JSON.parse(JSON.stringify(result.docs))\n\n  return {\n    ...result,\n    docs: docs.map((doc) => {\n      doc.id = doc._id\n      return sanitizeInternalFields(doc)\n    }),\n  }\n}\n"],"names":["buildVersionGlobalFields","flattenWhereToOperators","buildSortParam","buildProjectionFromSelect","sanitizeInternalFields","withSession","findGlobalVersions","global","limit","locale","page","pagination","req","select","skip","sort","sortArg","where","Model","versions","versionFields","payload","config","globals","find","slug","options","hasNearConstraint","constraints","some","prop","Object","keys","key","fields","timestamps","query","buildQuery","globalSlug","useEstimatedCount","length","paginationOptions","lean","leanWithId","projection","adapter","collation","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","paginate","docs","JSON","parse","stringify","map","doc","id"],"mappings":"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"}

package/dist/findOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAkB,MAAM,SAAS,CAAA;AAStD,eAAO,MAAM,OAAO,EAAE,OAkErB,CAAA"}
+{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../src/findOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAY,OAAO,EAAkB,MAAM,SAAS,CAAA;AAShE,eAAO,MAAM,OAAO,EAAE,OAqDrB,CAAA"}

package/dist/findOne.js

@@ -1,62 +1,49 @@
-import { getSession } from './getSession.js';
 import { buildJoinAggregation } from './utilities/buildJoinAggregation.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
+import { withSession } from './withSession.js';
 export const findOne = async function findOne({ collection, joins, locale, req = {}, select, where }) {
     const Model = this.collections[collection];
     const collectionConfig = this.payload.collections[collection].config;
-    const session = await getSession(this, req);
+    const options = {
+        ...await withSession(this, req),
+        lean: true
+    };
     const query = await Model.buildQuery({
         locale,
         payload: this.payload,
-        session,
         where
     });
-    const fields = collectionConfig.flattenedFields;
     const projection = buildProjectionFromSelect({
         adapter: this,
-        fields,
+        fields: collectionConfig.flattenedFields,
         select
     });
-    const joinAggregation = await buildJoinAggregation({
+    const aggregate = await buildJoinAggregation({
         adapter: this,
         collection,
         collectionConfig,
         joins,
+        limit: 1,
         locale,
         projection,
-        session
+        query
     });
     let doc;
-    if (joinAggregation) {
-        const cursor = Model.collection.aggregate([
-            {
-                $match: query
-            }
-        ], {
-            session
-        });
-        cursor.limit(1);
-        for (const stage of joinAggregation){
-            cursor.addStage(stage);
-        }
-        [doc] = await cursor.toArray();
+    if (aggregate) {
+        [doc] = await Model.aggregate(aggregate, options);
     } else {
-        doc = await Model.collection.findOne(query, {
-            projection,
-            session
-        });
+        options.projection = projection;
+        doc = await Model.findOne(query, {}, options);
     }
     if (!doc) {
         return null;
     }
-    transform({
-        adapter: this,
-        data: doc,
-        fields,
-        operation: 'read'
-    });
-    return doc;
+    let result = JSON.parse(JSON.stringify(doc));
+    // custom id type reset
+    result.id = result._id;
+    result = sanitizeInternalFields(result);
+    return result;
 };
 
 //# sourceMappingURL=findOne.js.map

package/dist/findOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { FindOne, PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './getSession.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { transform } from './utilities/transform.js'\n\nexport const findOne: FindOne = async function findOne(\n  this: MongooseAdapter,\n  { collection, joins, locale, req = {} as PayloadRequest, select, where },\n) {\n  const Model = this.collections[collection]\n  const collectionConfig = this.payload.collections[collection].config\n\n  const session = await getSession(this, req)\n\n  const query = await Model.buildQuery({\n    locale,\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  const fields = collectionConfig.flattenedFields\n\n  const projection = buildProjectionFromSelect({\n    adapter: this,\n    fields,\n    select,\n  })\n\n  const joinAggregation = await buildJoinAggregation({\n    adapter: this,\n    collection,\n    collectionConfig,\n    joins,\n    locale,\n    projection,\n    session,\n  })\n\n  let doc\n  if (joinAggregation) {\n    const cursor = Model.collection.aggregate(\n      [\n        {\n          $match: query,\n        },\n      ],\n      { session },\n    )\n    cursor.limit(1)\n    for (const stage of joinAggregation) {\n      cursor.addStage(stage)\n    }\n\n    ;[doc] = await cursor.toArray()\n  } else {\n    doc = await Model.collection.findOne(query, { projection, session })\n  }\n\n  if (!doc) {\n    return null\n  }\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["getSession","buildJoinAggregation","buildProjectionFromSelect","transform","findOne","collection","joins","locale","req","select","where","Model","collections","collectionConfig","payload","config","session","query","buildQuery","fields","flattenedFields","projection","adapter","joinAggregation","doc","cursor","aggregate","$match","limit","stage","addStage","toArray","data","operation"],"mappings":"AAIA,SAASA,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,UAAmB,eAAeA,QAE7C,EAAEC,UAAU,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAmB,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAExE,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACP,WAAW;IAC1C,MAAMQ,mBAAmB,IAAI,CAACC,OAAO,CAACF,WAAW,CAACP,WAAW,CAACU,MAAM;IAEpE,MAAMC,UAAU,MAAMhB,WAAW,IAAI,EAAEQ;IAEvC,MAAMS,QAAQ,MAAMN,MAAMO,UAAU,CAAC;QACnCX;QACAO,SAAS,IAAI,CAACA,OAAO;QACrBE;QACAN;IACF;IAEA,MAAMS,SAASN,iBAAiBO,eAAe;IAE/C,MAAMC,aAAanB,0BAA0B;QAC3CoB,SAAS,IAAI;QACbH;QACAV;IACF;IAEA,MAAMc,kBAAkB,MAAMtB,qBAAqB;QACjDqB,SAAS,IAAI;QACbjB;QACAQ;QACAP;QACAC;QACAc;QACAL;IACF;IAEA,IAAIQ;IACJ,IAAID,iBAAiB;QACnB,MAAME,SAASd,MAAMN,UAAU,CAACqB,SAAS,CACvC;YACE;gBACEC,QAAQV;YACV;SACD,EACD;YAAED;QAAQ;QAEZS,OAAOG,KAAK,CAAC;QACb,KAAK,MAAMC,SAASN,gBAAiB;YACnCE,OAAOK,QAAQ,CAACD;QAClB;QAEC,CAACL,IAAI,GAAG,MAAMC,OAAOM,OAAO;IAC/B,OAAO;QACLP,MAAM,MAAMb,MAAMN,UAAU,CAACD,OAAO,CAACa,OAAO;YAAEI;YAAYL;QAAQ;IACpE;IAEA,IAAI,CAACQ,KAAK;QACR,OAAO;IACT;IAEArB,UAAU;QACRmB,SAAS,IAAI;QACbU,MAAMR;QACNL;QACAc,WAAW;IACb;IAEA,OAAOT;AACT,EAAC"}
+{"version":3,"sources":["../src/findOne.ts"],"sourcesContent":["import type { MongooseQueryOptions, QueryOptions } from 'mongoose'\nimport type { Document, FindOne, PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\nimport { withSession } from './withSession.js'\n\nexport const findOne: FindOne = async function findOne(\n  this: MongooseAdapter,\n  { collection, joins, locale, req = {} as PayloadRequest, select, where },\n) {\n  const Model = this.collections[collection]\n  const collectionConfig = this.payload.collections[collection].config\n  const options: MongooseQueryOptions = {\n    ...(await withSession(this, req)),\n    lean: true,\n  }\n\n  const query = await Model.buildQuery({\n    locale,\n    payload: this.payload,\n    where,\n  })\n\n  const projection = buildProjectionFromSelect({\n    adapter: this,\n    fields: collectionConfig.flattenedFields,\n    select,\n  })\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    collection,\n    collectionConfig,\n    joins,\n    limit: 1,\n    locale,\n    projection,\n    query,\n  })\n\n  let doc\n  if (aggregate) {\n    ;[doc] = await Model.aggregate(aggregate, options)\n  } else {\n    ;(options as Record<string, unknown>).projection = projection\n    doc = await Model.findOne(query, {}, options)\n  }\n\n  if (!doc) {\n    return null\n  }\n\n  let result: Document = JSON.parse(JSON.stringify(doc))\n\n  // custom id type reset\n  result.id = result._id\n  result = sanitizeInternalFields(result)\n\n  return result\n}\n"],"names":["buildJoinAggregation","buildProjectionFromSelect","sanitizeInternalFields","withSession","findOne","collection","joins","locale","req","select","where","Model","collections","collectionConfig","payload","config","options","lean","query","buildQuery","projection","adapter","fields","flattenedFields","aggregate","limit","doc","result","JSON","parse","stringify","id","_id"],"mappings":"AAKA,SAASA,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,sBAAsB,QAAQ,wCAAuC;AAC9E,SAASC,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,UAAmB,eAAeA,QAE7C,EAAEC,UAAU,EAAEC,KAAK,EAAEC,MAAM,EAAEC,MAAM,CAAC,CAAmB,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAExE,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACP,WAAW;IAC1C,MAAMQ,mBAAmB,IAAI,CAACC,OAAO,CAACF,WAAW,CAACP,WAAW,CAACU,MAAM;IACpE,MAAMC,UAAgC;QACpC,GAAI,MAAMb,YAAY,IAAI,EAAEK,IAAI;QAChCS,MAAM;IACR;IAEA,MAAMC,QAAQ,MAAMP,MAAMQ,UAAU,CAAC;QACnCZ;QACAO,SAAS,IAAI,CAACA,OAAO;QACrBJ;IACF;IAEA,MAAMU,aAAanB,0BAA0B;QAC3CoB,SAAS,IAAI;QACbC,QAAQT,iBAAiBU,eAAe;QACxCd;IACF;IAEA,MAAMe,YAAY,MAAMxB,qBAAqB;QAC3CqB,SAAS,IAAI;QACbhB;QACAQ;QACAP;QACAmB,OAAO;QACPlB;QACAa;QACAF;IACF;IAEA,IAAIQ;IACJ,IAAIF,WAAW;QACZ,CAACE,IAAI,GAAG,MAAMf,MAAMa,SAAS,CAACA,WAAWR;IAC5C,OAAO;QACHA,QAAoCI,UAAU,GAAGA;QACnDM,MAAM,MAAMf,MAAMP,OAAO,CAACc,OAAO,CAAC,GAAGF;IACvC;IAEA,IAAI,CAACU,KAAK;QACR,OAAO;IACT;IAEA,IAAIC,SAAmBC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACJ;IAEjD,uBAAuB;IACvBC,OAAOI,EAAE,GAAGJ,OAAOK,GAAG;IACtBL,SAASzB,uBAAuByB;IAEhC,OAAOA;AACT,EAAC"}

package/dist/findVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../src/findVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAA;AAa3D,eAAO,MAAM,YAAY,EAAE,YAgF1B,CAAA"}
+{"version":3,"file":"findVersions.d.ts","sourceRoot":"","sources":["../src/findVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,SAAS,CAAA;AAW3D,eAAO,MAAM,YAAY,EAAE,YA6G1B,CAAA"}

package/dist/findVersions.js

@@ -1,15 +1,21 @@
-import { buildVersionCollectionFields } from 'payload';
-import { getSession } from './getSession.js';
+import { buildVersionCollectionFields, flattenWhereToOperators } from 'payload';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
-import { findMany } from './utilities/findMany.js';
-import { getHasNearConstraint } from './utilities/getHasNearConstraint.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
+import { withSession } from './withSession.js';
 export const findVersions = async function findVersions({ collection, limit, locale, page, pagination, req = {}, select, skip, sort: sortArg, where }) {
     const Model = this.versions[collection];
     const collectionConfig = this.payload.collections[collection].config;
-    const session = await getSession(this, req);
-    const hasNearConstraint = getHasNearConstraint(where);
+    const options = {
+        ...await withSession(this, req),
+        limit,
+        skip
+    };
+    let hasNearConstraint = false;
+    if (where) {
+        const constraints = flattenWhereToOperators(where);
+        hasNearConstraint = constraints.some((prop)=>Object.keys(prop).some((key)=>key === 'near'));
+    }
     let sort;
     if (!hasNearConstraint) {
         sort = buildSortParam({
@@ -23,42 +29,64 @@ export const findVersions = async function findVersions({ collection, limit, loc
     const query = await Model.buildQuery({
         locale,
         payload: this.payload,
-        session,
         where
     });
-    const versionFields = buildVersionCollectionFields(this.payload.config, collectionConfig, true);
     // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.
     const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0;
-    const projection = buildProjectionFromSelect({
-        adapter: this,
-        fields: versionFields,
-        select
-    });
-    const collation = this.collation ? {
-        locale: locale && locale !== 'all' && locale !== '*' ? locale : 'en',
-        ...this.collation
-    } : undefined;
-    const result = await findMany({
-        adapter: this,
-        collation,
-        collection: Model.collection,
+    const paginationOptions = {
+        lean: true,
+        leanWithId: true,
         limit,
+        options,
         page,
         pagination,
-        projection,
-        query,
-        session,
-        skip,
+        projection: buildProjectionFromSelect({
+            adapter: this,
+            fields: buildVersionCollectionFields(this.payload.config, collectionConfig, true),
+            select
+        }),
         sort,
         useEstimatedCount
-    });
-    transform({
-        adapter: this,
-        data: result.docs,
-        fields: versionFields,
-        operation: 'read'
-    });
-    return result;
+    };
+    if (this.collation) {
+        const defaultLocale = 'en';
+        paginationOptions.collation = {
+            locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,
+            ...this.collation
+        };
+    }
+    if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {
+        // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding
+        // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,
+        // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses
+        // the correct indexed field
+        paginationOptions.useCustomCountFn = ()=>{
+            return Promise.resolve(Model.countDocuments(query, {
+                ...options,
+                hint: {
+                    _id: 1
+                }
+            }));
+        };
+    }
+    if (limit >= 0) {
+        paginationOptions.limit = limit;
+        // limit must also be set here, it's ignored when pagination is false
+        paginationOptions.options.limit = limit;
+        // Disable pagination if limit is 0
+        if (limit === 0) {
+            paginationOptions.pagination = false;
+        }
+    }
+    const result = await Model.paginate(query, paginationOptions);
+    const docs = JSON.parse(JSON.stringify(result.docs));
+    return {
+        ...result,
+        docs: docs.map((doc)=>{
+            doc.id = doc._id;
+            return sanitizeInternalFields(doc);
+        })
+    };
 };
 
 //# sourceMappingURL=findVersions.js.map

package/dist/findVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { CollationOptions } from 'mongodb'\nimport type { FindVersions, PayloadRequest } from 'payload'\n\nimport { buildVersionCollectionFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './getSession.js'\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { findMany } from './utilities/findMany.js'\nimport { getHasNearConstraint } from './utilities/getHasNearConstraint.js'\nimport { transform } from './utilities/transform.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: MongooseAdapter,\n  {\n    collection,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    select,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const Model = this.versions[collection]\n  const collectionConfig = this.payload.collections[collection].config\n\n  const session = await getSession(this, req)\n\n  const hasNearConstraint = getHasNearConstraint(where)\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      config: this.payload.config,\n      fields: collectionConfig.flattenedFields,\n      locale,\n      sort: sortArg || '-updatedAt',\n      timestamps: true,\n    })\n  }\n\n  const query = await Model.buildQuery({\n    locale,\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  const versionFields = buildVersionCollectionFields(this.payload.config, collectionConfig, true)\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n\n  const projection = buildProjectionFromSelect({\n    adapter: this,\n    fields: versionFields,\n    select,\n  })\n\n  const collation: CollationOptions | undefined = this.collation\n    ? {\n        locale: locale && locale !== 'all' && locale !== '*' ? locale : 'en',\n        ...this.collation,\n      }\n    : undefined\n\n  const result = await findMany({\n    adapter: this,\n    collation,\n    collection: Model.collection,\n    limit,\n    page,\n    pagination,\n    projection,\n    query,\n    session,\n    skip,\n    sort,\n    useEstimatedCount,\n  })\n\n  transform({\n    adapter: this,\n    data: result.docs,\n    fields: versionFields,\n    operation: 'read',\n  })\n\n  return result\n}\n"],"names":["buildVersionCollectionFields","getSession","buildSortParam","buildProjectionFromSelect","findMany","getHasNearConstraint","transform","findVersions","collection","limit","locale","page","pagination","req","select","skip","sort","sortArg","where","Model","versions","collectionConfig","payload","collections","config","session","hasNearConstraint","fields","flattenedFields","timestamps","query","buildQuery","versionFields","useEstimatedCount","Object","keys","length","projection","adapter","collation","undefined","result","data","docs","operation"],"mappings":"AAGA,SAASA,4BAA4B,QAAQ,UAAS;AAItD,SAASC,UAAU,QAAQ,kBAAiB;AAC5C,SAASC,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,QAAQ,QAAQ,0BAAyB;AAClD,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,eAA6B,eAAeA,aAEvD,EACEC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,MAAM,CAAC,CAAmB,EAC1BC,MAAM,EACNC,IAAI,EACJC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,QAAQ,IAAI,CAACC,QAAQ,CAACZ,WAAW;IACvC,MAAMa,mBAAmB,IAAI,CAACC,OAAO,CAACC,WAAW,CAACf,WAAW,CAACgB,MAAM;IAEpE,MAAMC,UAAU,MAAMxB,WAAW,IAAI,EAAEY;IAEvC,MAAMa,oBAAoBrB,qBAAqBa;IAE/C,IAAIF;IACJ,IAAI,CAACU,mBAAmB;QACtBV,OAAOd,eAAe;YACpBsB,QAAQ,IAAI,CAACF,OAAO,CAACE,MAAM;YAC3BG,QAAQN,iBAAiBO,eAAe;YACxClB;YACAM,MAAMC,WAAW;YACjBY,YAAY;QACd;IACF;IAEA,MAAMC,QAAQ,MAAMX,MAAMY,UAAU,CAAC;QACnCrB;QACAY,SAAS,IAAI,CAACA,OAAO;QACrBG;QACAP;IACF;IAEA,MAAMc,gBAAgBhC,6BAA6B,IAAI,CAACsB,OAAO,CAACE,MAAM,EAAEH,kBAAkB;IAC1F,4HAA4H;IAC5H,MAAMY,oBAAoBP,qBAAqB,CAACI,SAASI,OAAOC,IAAI,CAACL,OAAOM,MAAM,KAAK;IAEvF,MAAMC,aAAalC,0BAA0B;QAC3CmC,SAAS,IAAI;QACbX,QAAQK;QACRlB;IACF;IAEA,MAAMyB,YAA0C,IAAI,CAACA,SAAS,GAC1D;QACE7B,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAAS;QAChE,GAAG,IAAI,CAAC6B,SAAS;IACnB,IACAC;IAEJ,MAAMC,SAAS,MAAMrC,SAAS;QAC5BkC,SAAS,IAAI;QACbC;QACA/B,YAAYW,MAAMX,UAAU;QAC5BC;QACAE;QACAC;QACAyB;QACAP;QACAL;QACAV;QACAC;QACAiB;IACF;IAEA3B,UAAU;QACRgC,SAAS,IAAI;QACbI,MAAMD,OAAOE,IAAI;QACjBhB,QAAQK;QACRY,WAAW;IACb;IAEA,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../src/findVersions.ts"],"sourcesContent":["import type { PaginateOptions } from 'mongoose'\nimport type { FindVersions, PayloadRequest } from 'payload'\n\nimport { buildVersionCollectionFields, flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\nimport { withSession } from './withSession.js'\n\nexport const findVersions: FindVersions = async function findVersions(\n  this: MongooseAdapter,\n  {\n    collection,\n    limit,\n    locale,\n    page,\n    pagination,\n    req = {} as PayloadRequest,\n    select,\n    skip,\n    sort: sortArg,\n    where,\n  },\n) {\n  const Model = this.versions[collection]\n  const collectionConfig = this.payload.collections[collection].config\n  const options = {\n    ...(await withSession(this, req)),\n    limit,\n    skip,\n  }\n\n  let hasNearConstraint = false\n\n  if (where) {\n    const constraints = flattenWhereToOperators(where)\n    hasNearConstraint = constraints.some((prop) => Object.keys(prop).some((key) => key === 'near'))\n  }\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      config: this.payload.config,\n      fields: collectionConfig.flattenedFields,\n      locale,\n      sort: sortArg || '-updatedAt',\n      timestamps: true,\n    })\n  }\n\n  const query = await Model.buildQuery({\n    locale,\n    payload: this.payload,\n    where,\n  })\n\n  // useEstimatedCount is faster, but not accurate, as it ignores any filters. It is thus set to true if there are no filters.\n  const useEstimatedCount = hasNearConstraint || !query || Object.keys(query).length === 0\n  const paginationOptions: PaginateOptions = {\n    lean: true,\n    leanWithId: true,\n    limit,\n    options,\n    page,\n    pagination,\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: buildVersionCollectionFields(this.payload.config, collectionConfig, true),\n      select,\n    }),\n    sort,\n    useEstimatedCount,\n  }\n\n  if (this.collation) {\n    const defaultLocale = 'en'\n    paginationOptions.collation = {\n      locale: locale && locale !== 'all' && locale !== '*' ? locale : defaultLocale,\n      ...this.collation,\n    }\n  }\n\n  if (!useEstimatedCount && Object.keys(query).length === 0 && this.disableIndexHints !== true) {\n    // Improve the performance of the countDocuments query which is used if useEstimatedCount is set to false by adding\n    // a hint. By default, if no hint is provided, MongoDB does not use an indexed field to count the returned documents,\n    // which makes queries very slow. This only happens when no query (filter) is provided. If one is provided, it uses\n    // the correct indexed field\n    paginationOptions.useCustomCountFn = () => {\n      return Promise.resolve(\n        Model.countDocuments(query, {\n          ...options,\n          hint: { _id: 1 },\n        }),\n      )\n    }\n  }\n\n  if (limit >= 0) {\n    paginationOptions.limit = limit\n    // limit must also be set here, it's ignored when pagination is false\n    paginationOptions.options.limit = limit\n\n    // Disable pagination if limit is 0\n    if (limit === 0) {\n      paginationOptions.pagination = false\n    }\n  }\n\n  const result = await Model.paginate(query, paginationOptions)\n  const docs = JSON.parse(JSON.stringify(result.docs))\n\n  return {\n    ...result,\n    docs: docs.map((doc) => {\n      doc.id = doc._id\n      return sanitizeInternalFields(doc)\n    }),\n  }\n}\n"],"names":["buildVersionCollectionFields","flattenWhereToOperators","buildSortParam","buildProjectionFromSelect","sanitizeInternalFields","withSession","findVersions","collection","limit","locale","page","pagination","req","select","skip","sort","sortArg","where","Model","versions","collectionConfig","payload","collections","config","options","hasNearConstraint","constraints","some","prop","Object","keys","key","fields","flattenedFields","timestamps","query","buildQuery","useEstimatedCount","length","paginationOptions","lean","leanWithId","projection","adapter","collation","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","paginate","docs","JSON","parse","stringify","map","doc","id"],"mappings":"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"}

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"migrateRelationshipsV2_V3.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAyB,cAAc,EAAE,MAAM,SAAS,CAAA;AAmGpE,wBAAsB,yBAAyB,CAAC,EAC9C,SAAS,EACT,GAAG,GACJ,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqFhB"}
+{"version":3,"file":"migrateRelationshipsV2_V3.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAS,cAAc,EAAmB,MAAM,SAAS,CAAA;AAmGrE,wBAAsB,yBAAyB,CAAC,EAC9C,SAAS,EACT,GAAG,GACJ,EAAE;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,GAAG,EAAE,cAAc,CAAA;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+EhB"}

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js

@@ -1,7 +1,7 @@
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload';
-import { getSession } from '../getSession.js';
-import { transform } from '../utilities/transform.js';
-const migrateModelWithBatching = async ({ adapter, batchSize, fields, Model, session })=>{
+import { sanitizeRelationshipIDs } from '../utilities/sanitizeRelationshipIDs.js';
+import { withSession } from '../withSession.js';
+const migrateModelWithBatching = async ({ batchSize, config, fields, Model, session })=>{
     let hasNext = true;
     let skip = 0;
     while(hasNext){
@@ -19,12 +19,10 @@ const migrateModelWithBatching = async ({ adapter, batchSize, fields, Model, ses
             docs.pop();
         }
         for (const doc of docs){
-            transform({
-                adapter,
+            sanitizeRelationshipIDs({
+                config,
                 data: doc,
-                fields,
-                operation: 'update',
-                validateRelationships: false
+                fields
             });
         }
         await Model.collection.bulkWrite(docs.map((doc)=>({
@@ -79,13 +77,13 @@ export async function migrateRelationshipsV2_V3({ batchSize, req }) {
     const { payload } = req;
     const db = payload.db;
     const config = payload.config;
-    const session = await getSession(db, req);
+    const { session } = await withSession(db, req);
     for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)){
         payload.logger.info(`Migrating collection "${collection.slug}"`);
         await migrateModelWithBatching({
-            adapter: db,
             batchSize,
-            fields: collection.flattenedFields,
+            config,
+            fields: collection.fields,
             Model: db.collections[collection.slug],
             session
         });
@@ -93,9 +91,9 @@ export async function migrateRelationshipsV2_V3({ batchSize, req }) {
         if (collection.versions) {
             payload.logger.info(`Migrating collection versions "${collection.slug}"`);
             await migrateModelWithBatching({
-                adapter: db,
                 batchSize,
-                fields: buildVersionCollectionFields(config, collection, true),
+                config,
+                fields: buildVersionCollectionFields(config, collection),
                 Model: db.versions[collection.slug],
                 session
             });
@@ -115,12 +113,10 @@ export async function migrateRelationshipsV2_V3({ batchSize, req }) {
         });
         // in case if the global doesn't exist in the database yet  (not saved)
         if (doc) {
-            transform({
-                adapter: db,
+            sanitizeRelationshipIDs({
+                config,
                 data: doc,
-                fields: global.flattenedFields,
-                operation: 'update',
-                validateRelationships: false
+                fields: global.fields
             });
             await GlobalsModel.collection.updateOne({
                 globalType: global.slug
@@ -134,9 +130,9 @@ export async function migrateRelationshipsV2_V3({ batchSize, req }) {
         if (global.versions) {
             payload.logger.info(`Migrating global versions "${global.slug}"`);
             await migrateModelWithBatching({
-                adapter: db,
                 batchSize,
-                fields: buildVersionGlobalFields(config, global, true),
+                config,
+                fields: buildVersionGlobalFields(config, global),
                 Model: db.versions[global.slug],
                 session
             });

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"sourcesContent":["import type { ClientSession, Model } from 'mongoose'\nimport type { Field, FlattenedField, PayloadRequest } from 'payload'\n\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getSession } from '../getSession.js'\nimport { transform } from '../utilities/transform.js'\n\nconst migrateModelWithBatching = async ({\n  adapter,\n  batchSize,\n  fields,\n  Model,\n  session,\n}: {\n  adapter: MongooseAdapter\n  batchSize: number\n  fields: FlattenedField[]\n  Model: Model<any>\n  session: ClientSession\n}): Promise<void> => {\n  let hasNext = true\n  let skip = 0\n\n  while (hasNext) {\n    const docs = await Model.find(\n      {},\n      {},\n      {\n        lean: true,\n        limit: batchSize + 1,\n        session,\n        skip,\n      },\n    )\n\n    if (docs.length === 0) {\n      break\n    }\n\n    hasNext = docs.length > batchSize\n\n    if (hasNext) {\n      docs.pop()\n    }\n\n    for (const doc of docs) {\n      transform({ adapter, data: doc, fields, operation: 'update', validateRelationships: false })\n    }\n\n    await Model.collection.bulkWrite(\n      docs.map((doc) => ({\n        updateOne: {\n          filter: { _id: doc._id },\n          update: {\n            $set: doc,\n          },\n        },\n      })),\n      { session },\n    )\n\n    skip += batchSize\n  }\n}\n\nconst hasRelationshipOrUploadField = ({ fields }: { fields: Field[] }): boolean => {\n  for (const field of fields) {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      return true\n    }\n\n    if ('fields' in field) {\n      if (hasRelationshipOrUploadField({ fields: field.fields })) {\n        return true\n      }\n    }\n\n    if ('blocks' in field) {\n      for (const block of field.blocks) {\n        if (hasRelationshipOrUploadField({ fields: block.fields })) {\n          return true\n        }\n      }\n    }\n\n    if ('tabs' in field) {\n      for (const tab of field.tabs) {\n        if (hasRelationshipOrUploadField({ fields: tab.fields })) {\n          return true\n        }\n      }\n    }\n  }\n\n  return false\n}\n\nexport async function migrateRelationshipsV2_V3({\n  batchSize,\n  req,\n}: {\n  batchSize: number\n  req: PayloadRequest\n}): Promise<void> {\n  const { payload } = req\n  const db = payload.db as MongooseAdapter\n  const config = payload.config\n\n  const session = await getSession(db, req)\n\n  for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating collection \"${collection.slug}\"`)\n\n    await migrateModelWithBatching({\n      adapter: db,\n      batchSize,\n      fields: collection.flattenedFields,\n      Model: db.collections[collection.slug],\n      session,\n    })\n\n    payload.logger.info(`Migrated collection \"${collection.slug}\"`)\n\n    if (collection.versions) {\n      payload.logger.info(`Migrating collection versions \"${collection.slug}\"`)\n\n      await migrateModelWithBatching({\n        adapter: db,\n        batchSize,\n        fields: buildVersionCollectionFields(config, collection, true),\n        Model: db.versions[collection.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated collection versions \"${collection.slug}\"`)\n    }\n  }\n\n  const { globals: GlobalsModel } = db\n\n  for (const global of payload.config.globals.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating global \"${global.slug}\"`)\n\n    const doc = await GlobalsModel.findOne<Record<string, unknown>>(\n      {\n        globalType: {\n          $eq: global.slug,\n        },\n      },\n      {},\n      { lean: true, session },\n    )\n\n    // in case if the global doesn't exist in the database yet  (not saved)\n    if (doc) {\n      transform({\n        adapter: db,\n        data: doc,\n        fields: global.flattenedFields,\n        operation: 'update',\n        validateRelationships: false,\n      })\n\n      await GlobalsModel.collection.updateOne(\n        {\n          globalType: global.slug,\n        },\n        { $set: doc },\n        { session },\n      )\n    }\n\n    payload.logger.info(`Migrated global \"${global.slug}\"`)\n\n    if (global.versions) {\n      payload.logger.info(`Migrating global versions \"${global.slug}\"`)\n\n      await migrateModelWithBatching({\n        adapter: db,\n        batchSize,\n        fields: buildVersionGlobalFields(config, global, true),\n        Model: db.versions[global.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated global versions \"${global.slug}\"`)\n    }\n  }\n}\n"],"names":["buildVersionCollectionFields","buildVersionGlobalFields","getSession","transform","migrateModelWithBatching","adapter","batchSize","fields","Model","session","hasNext","skip","docs","find","lean","limit","length","pop","doc","data","operation","validateRelationships","collection","bulkWrite","map","updateOne","filter","_id","update","$set","hasRelationshipOrUploadField","field","type","block","blocks","tab","tabs","migrateRelationshipsV2_V3","req","payload","db","config","collections","logger","info","slug","flattenedFields","versions","globals","GlobalsModel","global","findOne","globalType","$eq"],"mappings":"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"}
+{"version":3,"sources":["../../src/predefinedMigrations/migrateRelationshipsV2_V3.ts"],"sourcesContent":["import type { ClientSession, Model } from 'mongoose'\nimport type { Field, PayloadRequest, SanitizedConfig } from 'payload'\n\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { sanitizeRelationshipIDs } from '../utilities/sanitizeRelationshipIDs.js'\nimport { withSession } from '../withSession.js'\n\nconst migrateModelWithBatching = async ({\n  batchSize,\n  config,\n  fields,\n  Model,\n  session,\n}: {\n  batchSize: number\n  config: SanitizedConfig\n  fields: Field[]\n  Model: Model<any>\n  session: ClientSession\n}): Promise<void> => {\n  let hasNext = true\n  let skip = 0\n\n  while (hasNext) {\n    const docs = await Model.find(\n      {},\n      {},\n      {\n        lean: true,\n        limit: batchSize + 1,\n        session,\n        skip,\n      },\n    )\n\n    if (docs.length === 0) {\n      break\n    }\n\n    hasNext = docs.length > batchSize\n\n    if (hasNext) {\n      docs.pop()\n    }\n\n    for (const doc of docs) {\n      sanitizeRelationshipIDs({ config, data: doc, fields })\n    }\n\n    await Model.collection.bulkWrite(\n      docs.map((doc) => ({\n        updateOne: {\n          filter: { _id: doc._id },\n          update: {\n            $set: doc,\n          },\n        },\n      })),\n      { session },\n    )\n\n    skip += batchSize\n  }\n}\n\nconst hasRelationshipOrUploadField = ({ fields }: { fields: Field[] }): boolean => {\n  for (const field of fields) {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      return true\n    }\n\n    if ('fields' in field) {\n      if (hasRelationshipOrUploadField({ fields: field.fields })) {\n        return true\n      }\n    }\n\n    if ('blocks' in field) {\n      for (const block of field.blocks) {\n        if (hasRelationshipOrUploadField({ fields: block.fields })) {\n          return true\n        }\n      }\n    }\n\n    if ('tabs' in field) {\n      for (const tab of field.tabs) {\n        if (hasRelationshipOrUploadField({ fields: tab.fields })) {\n          return true\n        }\n      }\n    }\n  }\n\n  return false\n}\n\nexport async function migrateRelationshipsV2_V3({\n  batchSize,\n  req,\n}: {\n  batchSize: number\n  req: PayloadRequest\n}): Promise<void> {\n  const { payload } = req\n  const db = payload.db as MongooseAdapter\n  const config = payload.config\n\n  const { session } = await withSession(db, req)\n\n  for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating collection \"${collection.slug}\"`)\n\n    await migrateModelWithBatching({\n      batchSize,\n      config,\n      fields: collection.fields,\n      Model: db.collections[collection.slug],\n      session,\n    })\n\n    payload.logger.info(`Migrated collection \"${collection.slug}\"`)\n\n    if (collection.versions) {\n      payload.logger.info(`Migrating collection versions \"${collection.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionCollectionFields(config, collection),\n        Model: db.versions[collection.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated collection versions \"${collection.slug}\"`)\n    }\n  }\n\n  const { globals: GlobalsModel } = db\n\n  for (const global of payload.config.globals.filter(hasRelationshipOrUploadField)) {\n    payload.logger.info(`Migrating global \"${global.slug}\"`)\n\n    const doc = await GlobalsModel.findOne<Record<string, unknown>>(\n      {\n        globalType: {\n          $eq: global.slug,\n        },\n      },\n      {},\n      { lean: true, session },\n    )\n\n    // in case if the global doesn't exist in the database yet  (not saved)\n    if (doc) {\n      sanitizeRelationshipIDs({ config, data: doc, fields: global.fields })\n\n      await GlobalsModel.collection.updateOne(\n        {\n          globalType: global.slug,\n        },\n        { $set: doc },\n        { session },\n      )\n    }\n\n    payload.logger.info(`Migrated global \"${global.slug}\"`)\n\n    if (global.versions) {\n      payload.logger.info(`Migrating global versions \"${global.slug}\"`)\n\n      await migrateModelWithBatching({\n        batchSize,\n        config,\n        fields: buildVersionGlobalFields(config, global),\n        Model: db.versions[global.slug],\n        session,\n      })\n\n      payload.logger.info(`Migrated global versions \"${global.slug}\"`)\n    }\n  }\n}\n"],"names":["buildVersionCollectionFields","buildVersionGlobalFields","sanitizeRelationshipIDs","withSession","migrateModelWithBatching","batchSize","config","fields","Model","session","hasNext","skip","docs","find","lean","limit","length","pop","doc","data","collection","bulkWrite","map","updateOne","filter","_id","update","$set","hasRelationshipOrUploadField","field","type","block","blocks","tab","tabs","migrateRelationshipsV2_V3","req","payload","db","collections","logger","info","slug","versions","globals","GlobalsModel","global","findOne","globalType","$eq"],"mappings":"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"}

package/dist/predefinedMigrations/migrateVersionsV1_V2.js

@@ -1,7 +1,7 @@
-import { getSession } from '../getSession.js';
+import { withSession } from '../withSession.js';
 export async function migrateVersionsV1_V2({ req }) {
     const { payload } = req;
-    const session = await getSession(payload.db, req);
+    const { session } = await withSession(payload.db, req);
     // For each collection
     for (const { slug, versions } of payload.config.collections){
         if (versions?.drafts) {

package/dist/predefinedMigrations/migrateVersionsV1_V2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/predefinedMigrations/migrateVersionsV1_V2.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { getSession } from '../getSession.js'\n\nexport async function migrateVersionsV1_V2({ req }: { req: PayloadRequest }) {\n  const { payload } = req\n\n  const session = await getSession(payload.db as MongooseAdapter, req)\n\n  // For each collection\n\n  for (const { slug, versions } of payload.config.collections) {\n    if (versions?.drafts) {\n      await migrateCollectionDocs({ slug, payload, session })\n\n      payload.logger.info(`Migrated the \"${slug}\" collection.`)\n    }\n  }\n\n  // For each global\n  for (const { slug, versions } of payload.config.globals) {\n    if (versions) {\n      const VersionsModel = payload.db.versions[slug]\n\n      await VersionsModel.findOneAndUpdate(\n        {},\n        { latest: true },\n        {\n          session,\n          sort: { updatedAt: -1 },\n        },\n      ).exec()\n\n      payload.logger.info(`Migrated the \"${slug}\" global.`)\n    }\n  }\n}\n\nasync function migrateCollectionDocs({\n  slug,\n  docsAtATime = 100,\n  payload,\n  session,\n}: {\n  docsAtATime?: number\n  payload: Payload\n  session: ClientSession\n  slug: string\n}) {\n  const VersionsModel = payload.db.versions[slug]\n  const remainingDocs = await VersionsModel.aggregate(\n    [\n      // Sort so that newest are first\n      {\n        $sort: {\n          updatedAt: -1,\n        },\n      },\n      // Group by parent ID\n      // take the $first of each\n      {\n        $group: {\n          _id: '$parent',\n          _versionID: { $first: '$_id' },\n          createdAt: { $first: '$createdAt' },\n          latest: { $first: '$latest' },\n          updatedAt: { $first: '$updatedAt' },\n          version: { $first: '$version' },\n        },\n      },\n      {\n        $match: {\n          latest: { $eq: null },\n        },\n      },\n      {\n        $limit: docsAtATime,\n      },\n    ],\n    {\n      allowDiskUse: true,\n      session,\n    },\n  ).exec()\n\n  if (!remainingDocs || remainingDocs.length === 0) {\n    const newVersions = await VersionsModel.find(\n      {\n        latest: {\n          $eq: true,\n        },\n      },\n      undefined,\n      { session },\n    )\n\n    if (newVersions?.length) {\n      payload.logger.info(\n        `Migrated ${newVersions.length} documents in the \"${slug}\" versions collection.`,\n      )\n    }\n\n    return\n  }\n\n  const remainingDocIds = remainingDocs.map((doc) => doc._versionID)\n\n  await VersionsModel.updateMany(\n    {\n      _id: {\n        $in: remainingDocIds,\n      },\n    },\n    {\n      latest: true,\n    },\n    {\n      session,\n    },\n  )\n\n  await migrateCollectionDocs({ slug, payload, session })\n}\n"],"names":["getSession","migrateVersionsV1_V2","req","payload","session","db","slug","versions","config","collections","drafts","migrateCollectionDocs","logger","info","globals","VersionsModel","findOneAndUpdate","latest","sort","updatedAt","exec","docsAtATime","remainingDocs","aggregate","$sort","$group","_id","_versionID","$first","createdAt","version","$match","$eq","$limit","allowDiskUse","length","newVersions","find","undefined","remainingDocIds","map","doc","updateMany","$in"],"mappings":"AAKA,SAASA,UAAU,QAAQ,mBAAkB;AAE7C,OAAO,eAAeC,qBAAqB,EAAEC,GAAG,EAA2B;IACzE,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAEpB,MAAME,UAAU,MAAMJ,WAAWG,QAAQE,EAAE,EAAqBH;IAEhE,sBAAsB;IAEtB,KAAK,MAAM,EAAEI,IAAI,EAAEC,QAAQ,EAAE,IAAIJ,QAAQK,MAAM,CAACC,WAAW,CAAE;QAC3D,IAAIF,UAAUG,QAAQ;YACpB,MAAMC,sBAAsB;gBAAEL;gBAAMH;gBAASC;YAAQ;YAErDD,QAAQS,MAAM,CAACC,IAAI,CAAC,CAAC,cAAc,EAAEP,KAAK,aAAa,CAAC;QAC1D;IACF;IAEA,kBAAkB;IAClB,KAAK,MAAM,EAAEA,IAAI,EAAEC,QAAQ,EAAE,IAAIJ,QAAQK,MAAM,CAACM,OAAO,CAAE;QACvD,IAAIP,UAAU;YACZ,MAAMQ,gBAAgBZ,QAAQE,EAAE,CAACE,QAAQ,CAACD,KAAK;YAE/C,MAAMS,cAAcC,gBAAgB,CAClC,CAAC,GACD;gBAAEC,QAAQ;YAAK,GACf;gBACEb;gBACAc,MAAM;oBAAEC,WAAW,CAAC;gBAAE;YACxB,GACAC,IAAI;YAENjB,QAAQS,MAAM,CAACC,IAAI,CAAC,CAAC,cAAc,EAAEP,KAAK,SAAS,CAAC;QACtD;IACF;AACF;AAEA,eAAeK,sBAAsB,EACnCL,IAAI,EACJe,cAAc,GAAG,EACjBlB,OAAO,EACPC,OAAO,EAMR;IACC,MAAMW,gBAAgBZ,QAAQE,EAAE,CAACE,QAAQ,CAACD,KAAK;IAC/C,MAAMgB,gBAAgB,MAAMP,cAAcQ,SAAS,CACjD;QACE,gCAAgC;QAChC;YACEC,OAAO;gBACLL,WAAW,CAAC;YACd;QACF;QACA,qBAAqB;QACrB,0BAA0B;QAC1B;YACEM,QAAQ;gBACNC,KAAK;gBACLC,YAAY;oBAAEC,QAAQ;gBAAO;gBAC7BC,WAAW;oBAAED,QAAQ;gBAAa;gBAClCX,QAAQ;oBAAEW,QAAQ;gBAAU;gBAC5BT,WAAW;oBAAES,QAAQ;gBAAa;gBAClCE,SAAS;oBAAEF,QAAQ;gBAAW;YAChC;QACF;QACA;YACEG,QAAQ;gBACNd,QAAQ;oBAAEe,KAAK;gBAAK;YACtB;QACF;QACA;YACEC,QAAQZ;QACV;KACD,EACD;QACEa,cAAc;QACd9B;IACF,GACAgB,IAAI;IAEN,IAAI,CAACE,iBAAiBA,cAAca,MAAM,KAAK,GAAG;QAChD,MAAMC,cAAc,MAAMrB,cAAcsB,IAAI,CAC1C;YACEpB,QAAQ;gBACNe,KAAK;YACP;QACF,GACAM,WACA;YAAElC;QAAQ;QAGZ,IAAIgC,aAAaD,QAAQ;YACvBhC,QAAQS,MAAM,CAACC,IAAI,CACjB,CAAC,SAAS,EAAEuB,YAAYD,MAAM,CAAC,mBAAmB,EAAE7B,KAAK,sBAAsB,CAAC;QAEpF;QAEA;IACF;IAEA,MAAMiC,kBAAkBjB,cAAckB,GAAG,CAAC,CAACC,MAAQA,IAAId,UAAU;IAEjE,MAAMZ,cAAc2B,UAAU,CAC5B;QACEhB,KAAK;YACHiB,KAAKJ;QACP;IACF,GACA;QACEtB,QAAQ;IACV,GACA;QACEb;IACF;IAGF,MAAMO,sBAAsB;QAAEL;QAAMH;QAASC;IAAQ;AACvD"}
+{"version":3,"sources":["../../src/predefinedMigrations/migrateVersionsV1_V2.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { Payload, PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from '../index.js'\n\nimport { withSession } from '../withSession.js'\n\nexport async function migrateVersionsV1_V2({ req }: { req: PayloadRequest }) {\n  const { payload } = req\n\n  const { session } = await withSession(payload.db as MongooseAdapter, req)\n\n  // For each collection\n\n  for (const { slug, versions } of payload.config.collections) {\n    if (versions?.drafts) {\n      await migrateCollectionDocs({ slug, payload, session })\n\n      payload.logger.info(`Migrated the \"${slug}\" collection.`)\n    }\n  }\n\n  // For each global\n  for (const { slug, versions } of payload.config.globals) {\n    if (versions) {\n      const VersionsModel = payload.db.versions[slug]\n\n      await VersionsModel.findOneAndUpdate(\n        {},\n        { latest: true },\n        {\n          session,\n          sort: { updatedAt: -1 },\n        },\n      ).exec()\n\n      payload.logger.info(`Migrated the \"${slug}\" global.`)\n    }\n  }\n}\n\nasync function migrateCollectionDocs({\n  slug,\n  docsAtATime = 100,\n  payload,\n  session,\n}: {\n  docsAtATime?: number\n  payload: Payload\n  session: ClientSession\n  slug: string\n}) {\n  const VersionsModel = payload.db.versions[slug]\n  const remainingDocs = await VersionsModel.aggregate(\n    [\n      // Sort so that newest are first\n      {\n        $sort: {\n          updatedAt: -1,\n        },\n      },\n      // Group by parent ID\n      // take the $first of each\n      {\n        $group: {\n          _id: '$parent',\n          _versionID: { $first: '$_id' },\n          createdAt: { $first: '$createdAt' },\n          latest: { $first: '$latest' },\n          updatedAt: { $first: '$updatedAt' },\n          version: { $first: '$version' },\n        },\n      },\n      {\n        $match: {\n          latest: { $eq: null },\n        },\n      },\n      {\n        $limit: docsAtATime,\n      },\n    ],\n    {\n      allowDiskUse: true,\n      session,\n    },\n  ).exec()\n\n  if (!remainingDocs || remainingDocs.length === 0) {\n    const newVersions = await VersionsModel.find(\n      {\n        latest: {\n          $eq: true,\n        },\n      },\n      undefined,\n      { session },\n    )\n\n    if (newVersions?.length) {\n      payload.logger.info(\n        `Migrated ${newVersions.length} documents in the \"${slug}\" versions collection.`,\n      )\n    }\n\n    return\n  }\n\n  const remainingDocIds = remainingDocs.map((doc) => doc._versionID)\n\n  await VersionsModel.updateMany(\n    {\n      _id: {\n        $in: remainingDocIds,\n      },\n    },\n    {\n      latest: true,\n    },\n    {\n      session,\n    },\n  )\n\n  await migrateCollectionDocs({ slug, payload, session })\n}\n"],"names":["withSession","migrateVersionsV1_V2","req","payload","session","db","slug","versions","config","collections","drafts","migrateCollectionDocs","logger","info","globals","VersionsModel","findOneAndUpdate","latest","sort","updatedAt","exec","docsAtATime","remainingDocs","aggregate","$sort","$group","_id","_versionID","$first","createdAt","version","$match","$eq","$limit","allowDiskUse","length","newVersions","find","undefined","remainingDocIds","map","doc","updateMany","$in"],"mappings":"AAKA,SAASA,WAAW,QAAQ,oBAAmB;AAE/C,OAAO,eAAeC,qBAAqB,EAAEC,GAAG,EAA2B;IACzE,MAAM,EAAEC,OAAO,EAAE,GAAGD;IAEpB,MAAM,EAAEE,OAAO,EAAE,GAAG,MAAMJ,YAAYG,QAAQE,EAAE,EAAqBH;IAErE,sBAAsB;IAEtB,KAAK,MAAM,EAAEI,IAAI,EAAEC,QAAQ,EAAE,IAAIJ,QAAQK,MAAM,CAACC,WAAW,CAAE;QAC3D,IAAIF,UAAUG,QAAQ;YACpB,MAAMC,sBAAsB;gBAAEL;gBAAMH;gBAASC;YAAQ;YAErDD,QAAQS,MAAM,CAACC,IAAI,CAAC,CAAC,cAAc,EAAEP,KAAK,aAAa,CAAC;QAC1D;IACF;IAEA,kBAAkB;IAClB,KAAK,MAAM,EAAEA,IAAI,EAAEC,QAAQ,EAAE,IAAIJ,QAAQK,MAAM,CAACM,OAAO,CAAE;QACvD,IAAIP,UAAU;YACZ,MAAMQ,gBAAgBZ,QAAQE,EAAE,CAACE,QAAQ,CAACD,KAAK;YAE/C,MAAMS,cAAcC,gBAAgB,CAClC,CAAC,GACD;gBAAEC,QAAQ;YAAK,GACf;gBACEb;gBACAc,MAAM;oBAAEC,WAAW,CAAC;gBAAE;YACxB,GACAC,IAAI;YAENjB,QAAQS,MAAM,CAACC,IAAI,CAAC,CAAC,cAAc,EAAEP,KAAK,SAAS,CAAC;QACtD;IACF;AACF;AAEA,eAAeK,sBAAsB,EACnCL,IAAI,EACJe,cAAc,GAAG,EACjBlB,OAAO,EACPC,OAAO,EAMR;IACC,MAAMW,gBAAgBZ,QAAQE,EAAE,CAACE,QAAQ,CAACD,KAAK;IAC/C,MAAMgB,gBAAgB,MAAMP,cAAcQ,SAAS,CACjD;QACE,gCAAgC;QAChC;YACEC,OAAO;gBACLL,WAAW,CAAC;YACd;QACF;QACA,qBAAqB;QACrB,0BAA0B;QAC1B;YACEM,QAAQ;gBACNC,KAAK;gBACLC,YAAY;oBAAEC,QAAQ;gBAAO;gBAC7BC,WAAW;oBAAED,QAAQ;gBAAa;gBAClCX,QAAQ;oBAAEW,QAAQ;gBAAU;gBAC5BT,WAAW;oBAAES,QAAQ;gBAAa;gBAClCE,SAAS;oBAAEF,QAAQ;gBAAW;YAChC;QACF;QACA;YACEG,QAAQ;gBACNd,QAAQ;oBAAEe,KAAK;gBAAK;YACtB;QACF;QACA;YACEC,QAAQZ;QACV;KACD,EACD;QACEa,cAAc;QACd9B;IACF,GACAgB,IAAI;IAEN,IAAI,CAACE,iBAAiBA,cAAca,MAAM,KAAK,GAAG;QAChD,MAAMC,cAAc,MAAMrB,cAAcsB,IAAI,CAC1C;YACEpB,QAAQ;gBACNe,KAAK;YACP;QACF,GACAM,WACA;YAAElC;QAAQ;QAGZ,IAAIgC,aAAaD,QAAQ;YACvBhC,QAAQS,MAAM,CAACC,IAAI,CACjB,CAAC,SAAS,EAAEuB,YAAYD,MAAM,CAAC,mBAAmB,EAAE7B,KAAK,sBAAsB,CAAC;QAEpF;QAEA;IACF;IAEA,MAAMiC,kBAAkBjB,cAAckB,GAAG,CAAC,CAACC,MAAQA,IAAId,UAAU;IAEjE,MAAMZ,cAAc2B,UAAU,CAC5B;QACEhB,KAAK;YACHiB,KAAKJ;QACP;IACF,GACA;QACEtB,QAAQ;IACV,GACA;QACEb;IACF;IAGF,MAAMO,sBAAsB;QAAEL;QAAMH;QAASC;IAAQ;AACvD"}