@payloadcms/db-mongodb 3.10.0 → 3.11.0

package/dist/createVersion.js

@@ -1,31 +1,29 @@
 import { Types } from 'mongoose';
 import { buildVersionCollectionFields } from 'payload';
 import { getSession } from './utilities/getSession.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js';
 export const createVersion = async function createVersion({ autosave, collectionSlug, createdAt, parent, publishedLocale, req, snapshot, updatedAt, versionData }) {
     const VersionModel = this.versions[collectionSlug];
-    const session = await getSession(this, req);
-    const data = {
-        autosave,
-        createdAt,
-        latest: true,
-        parent,
-        publishedLocale,
-        snapshot,
-        updatedAt,
-        version: versionData
+    const options = {
+        session: await getSession(this, req)
     };
-    const fields = buildVersionCollectionFields(this.payload.config, this.payload.collections[collectionSlug].config, true);
-    transform({
-        adapter: this,
-        data,
-        fields,
-        operation: 'create'
+    const data = sanitizeRelationshipIDs({
+        config: this.payload.config,
+        data: {
+            autosave,
+            createdAt,
+            latest: true,
+            parent,
+            publishedLocale,
+            snapshot,
+            updatedAt,
+            version: versionData
+        },
+        fields: buildVersionCollectionFields(this.payload.config, this.payload.collections[collectionSlug].config)
     });
-    const { insertedId: insertedID } = await VersionModel.collection.insertOne(data, {
-        session
-    });
-    data._id = insertedID;
+    const [doc] = await VersionModel.create([
+        data
+    ], options, req);
     const parentQuery = {
         $or: [
             {
@@ -42,11 +40,11 @@ export const createVersion = async function createVersion({ autosave, collection
             }
         });
     }
-    await VersionModel.collection.updateMany({
+    await VersionModel.updateMany({
         $and: [
             {
                 _id: {
-                    $ne: insertedID
+                    $ne: doc._id
                 }
             },
             parentQuery,
@@ -57,7 +55,7 @@ export const createVersion = async function createVersion({ autosave, collection
             },
             {
                 updatedAt: {
-                    $lt: new Date(data.updatedAt)
+                    $lt: new Date(doc.updatedAt)
                 }
             }
         ]
@@ -65,16 +63,15 @@ export const createVersion = async function createVersion({ autosave, collection
         $unset: {
             latest: 1
         }
-    }, {
-        session
-    });
-    transform({
-        adapter: this,
-        data,
-        fields,
-        operation: 'read'
-    });
-    return data;
+    }, options);
+    const result = JSON.parse(JSON.stringify(doc));
+    const verificationToken = doc._verificationToken;
+    // custom id type reset
+    result.id = result._id;
+    if (verificationToken) {
+        result._verificationToken = verificationToken;
+    }
+    return result;
 };
 
 //# sourceMappingURL=createVersion.js.map

package/dist/createVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import { Types } from 'mongoose'\nimport { buildVersionCollectionFields, type CreateVersion } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const createVersion: CreateVersion = async function createVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const VersionModel = this.versions[collectionSlug]\n  const session = await getSession(this, req)\n\n  const data: any = {\n    autosave,\n    createdAt,\n    latest: true,\n    parent,\n    publishedLocale,\n    snapshot,\n    updatedAt,\n    version: versionData,\n  }\n\n  const fields = buildVersionCollectionFields(\n    this.payload.config,\n    this.payload.collections[collectionSlug].config,\n    true,\n  )\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'create',\n  })\n\n  const { insertedId: insertedID } = await VersionModel.collection.insertOne(data, { session })\n  data._id = insertedID\n\n  const parentQuery = {\n    $or: [\n      {\n        parent: {\n          $eq: data.parent,\n        },\n      },\n    ],\n  }\n  if ((data.parent as unknown) instanceof Types.ObjectId) {\n    parentQuery.$or.push({\n      parent: {\n        $eq: data.parent.toString(),\n      },\n    })\n  }\n\n  await VersionModel.collection.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: insertedID,\n          },\n        },\n        parentQuery,\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n        {\n          updatedAt: {\n            $lt: new Date(data.updatedAt),\n          },\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    { session },\n  )\n\n  transform({\n    adapter: this,\n    data,\n    fields,\n    operation: 'read',\n  })\n\n  return data\n}\n"],"names":["Types","buildVersionCollectionFields","getSession","transform","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","snapshot","updatedAt","versionData","VersionModel","versions","session","data","latest","version","fields","payload","config","collections","adapter","operation","insertedId","insertedID","collection","insertOne","_id","parentQuery","$or","$eq","ObjectId","push","toString","updateMany","$and","$ne","$lt","Date","$unset"],"mappings":"AAAA,SAASA,KAAK,QAAQ,WAAU;AAChC,SAASC,4BAA4B,QAA4B,UAAS;AAI1E,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAMC,eAAe,IAAI,CAACC,QAAQ,CAACT,eAAe;IAClD,MAAMU,UAAU,MAAMd,WAAW,IAAI,EAAEQ;IAEvC,MAAMO,OAAY;QAChBZ;QACAE;QACAW,QAAQ;QACRV;QACAC;QACAE;QACAC;QACAO,SAASN;IACX;IAEA,MAAMO,SAASnB,6BACb,IAAI,CAACoB,OAAO,CAACC,MAAM,EACnB,IAAI,CAACD,OAAO,CAACE,WAAW,CAACjB,eAAe,CAACgB,MAAM,EAC/C;IAGFnB,UAAU;QACRqB,SAAS,IAAI;QACbP;QACAG;QACAK,WAAW;IACb;IAEA,MAAM,EAAEC,YAAYC,UAAU,EAAE,GAAG,MAAMb,aAAac,UAAU,CAACC,SAAS,CAACZ,MAAM;QAAED;IAAQ;IAC3FC,KAAKa,GAAG,GAAGH;IAEX,MAAMI,cAAc;QAClBC,KAAK;YACH;gBACExB,QAAQ;oBACNyB,KAAKhB,KAAKT,MAAM;gBAClB;YACF;SACD;IACH;IACA,IAAI,AAACS,KAAKT,MAAM,YAAwBR,MAAMkC,QAAQ,EAAE;QACtDH,YAAYC,GAAG,CAACG,IAAI,CAAC;YACnB3B,QAAQ;gBACNyB,KAAKhB,KAAKT,MAAM,CAAC4B,QAAQ;YAC3B;QACF;IACF;IAEA,MAAMtB,aAAac,UAAU,CAACS,UAAU,CACtC;QACEC,MAAM;YACJ;gBACER,KAAK;oBACHS,KAAKZ;gBACP;YACF;YACAI;YACA;gBACEb,QAAQ;oBACNe,KAAK;gBACP;YACF;YACA;gBACErB,WAAW;oBACT4B,KAAK,IAAIC,KAAKxB,KAAKL,SAAS;gBAC9B;YACF;SACD;IACH,GACA;QAAE8B,QAAQ;YAAExB,QAAQ;QAAE;IAAE,GACxB;QAAEF;IAAQ;IAGZb,UAAU;QACRqB,SAAS,IAAI;QACbP;QACAG;QACAK,WAAW;IACb;IAEA,OAAOR;AACT,EAAC"}
+{"version":3,"sources":["../src/createVersion.ts"],"sourcesContent":["import type { CreateOptions } from 'mongoose'\n\nimport { Types } from 'mongoose'\nimport { buildVersionCollectionFields, type CreateVersion, type Document } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\nimport { sanitizeRelationshipIDs } from './utilities/sanitizeRelationshipIDs.js'\n\nexport const createVersion: CreateVersion = async function createVersion(\n  this: MongooseAdapter,\n  {\n    autosave,\n    collectionSlug,\n    createdAt,\n    parent,\n    publishedLocale,\n    req,\n    snapshot,\n    updatedAt,\n    versionData,\n  },\n) {\n  const VersionModel = this.versions[collectionSlug]\n  const options: CreateOptions = {\n    session: await getSession(this, req),\n  }\n\n  const data = sanitizeRelationshipIDs({\n    config: this.payload.config,\n    data: {\n      autosave,\n      createdAt,\n      latest: true,\n      parent,\n      publishedLocale,\n      snapshot,\n      updatedAt,\n      version: versionData,\n    },\n    fields: buildVersionCollectionFields(\n      this.payload.config,\n      this.payload.collections[collectionSlug].config,\n    ),\n  })\n\n  const [doc] = await VersionModel.create([data], options, req)\n\n  const parentQuery = {\n    $or: [\n      {\n        parent: {\n          $eq: data.parent,\n        },\n      },\n    ],\n  }\n  if (data.parent instanceof Types.ObjectId) {\n    parentQuery.$or.push({\n      parent: {\n        $eq: data.parent.toString(),\n      },\n    })\n  }\n\n  await VersionModel.updateMany(\n    {\n      $and: [\n        {\n          _id: {\n            $ne: doc._id,\n          },\n        },\n        parentQuery,\n        {\n          latest: {\n            $eq: true,\n          },\n        },\n        {\n          updatedAt: {\n            $lt: new Date(doc.updatedAt),\n          },\n        },\n      ],\n    },\n    { $unset: { latest: 1 } },\n    options,\n  )\n\n  const result: Document = JSON.parse(JSON.stringify(doc))\n  const verificationToken = doc._verificationToken\n\n  // custom id type reset\n  result.id = result._id\n  if (verificationToken) {\n    result._verificationToken = verificationToken\n  }\n  return result\n}\n"],"names":["Types","buildVersionCollectionFields","getSession","sanitizeRelationshipIDs","createVersion","autosave","collectionSlug","createdAt","parent","publishedLocale","req","snapshot","updatedAt","versionData","VersionModel","versions","options","session","data","config","payload","latest","version","fields","collections","doc","create","parentQuery","$or","$eq","ObjectId","push","toString","updateMany","$and","_id","$ne","$lt","Date","$unset","result","JSON","parse","stringify","verificationToken","_verificationToken","id"],"mappings":"AAEA,SAASA,KAAK,QAAQ,WAAU;AAChC,SAASC,4BAA4B,QAA2C,UAAS;AAIzF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,uBAAuB,QAAQ,yCAAwC;AAEhF,OAAO,MAAMC,gBAA+B,eAAeA,cAEzD,EACEC,QAAQ,EACRC,cAAc,EACdC,SAAS,EACTC,MAAM,EACNC,eAAe,EACfC,GAAG,EACHC,QAAQ,EACRC,SAAS,EACTC,WAAW,EACZ;IAED,MAAMC,eAAe,IAAI,CAACC,QAAQ,CAACT,eAAe;IAClD,MAAMU,UAAyB;QAC7BC,SAAS,MAAMf,WAAW,IAAI,EAAEQ;IAClC;IAEA,MAAMQ,OAAOf,wBAAwB;QACnCgB,QAAQ,IAAI,CAACC,OAAO,CAACD,MAAM;QAC3BD,MAAM;YACJb;YACAE;YACAc,QAAQ;YACRb;YACAC;YACAE;YACAC;YACAU,SAAST;QACX;QACAU,QAAQtB,6BACN,IAAI,CAACmB,OAAO,CAACD,MAAM,EACnB,IAAI,CAACC,OAAO,CAACI,WAAW,CAAClB,eAAe,CAACa,MAAM;IAEnD;IAEA,MAAM,CAACM,IAAI,GAAG,MAAMX,aAAaY,MAAM,CAAC;QAACR;KAAK,EAAEF,SAASN;IAEzD,MAAMiB,cAAc;QAClBC,KAAK;YACH;gBACEpB,QAAQ;oBACNqB,KAAKX,KAAKV,MAAM;gBAClB;YACF;SACD;IACH;IACA,IAAIU,KAAKV,MAAM,YAAYR,MAAM8B,QAAQ,EAAE;QACzCH,YAAYC,GAAG,CAACG,IAAI,CAAC;YACnBvB,QAAQ;gBACNqB,KAAKX,KAAKV,MAAM,CAACwB,QAAQ;YAC3B;QACF;IACF;IAEA,MAAMlB,aAAamB,UAAU,CAC3B;QACEC,MAAM;YACJ;gBACEC,KAAK;oBACHC,KAAKX,IAAIU,GAAG;gBACd;YACF;YACAR;YACA;gBACEN,QAAQ;oBACNQ,KAAK;gBACP;YACF;YACA;gBACEjB,WAAW;oBACTyB,KAAK,IAAIC,KAAKb,IAAIb,SAAS;gBAC7B;YACF;SACD;IACH,GACA;QAAE2B,QAAQ;YAAElB,QAAQ;QAAE;IAAE,GACxBL;IAGF,MAAMwB,SAAmBC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAAClB;IACnD,MAAMmB,oBAAoBnB,IAAIoB,kBAAkB;IAEhD,uBAAuB;IACvBL,OAAOM,EAAE,GAAGN,OAAOL,GAAG;IACtB,IAAIS,mBAAmB;QACrBJ,OAAOK,kBAAkB,GAAGD;IAC9B;IACA,OAAOJ;AACT,EAAC"}

package/dist/deleteMany.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../src/deleteMany.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,eAAO,MAAM,UAAU,EAAE,UAiBxB,CAAA"}
+{"version":3,"file":"deleteMany.d.ts","sourceRoot":"","sources":["../src/deleteMany.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAMzC,eAAO,MAAM,UAAU,EAAE,UAexB,CAAA"}

package/dist/deleteMany.js

@@ -1,15 +1,14 @@
 import { getSession } from './utilities/getSession.js';
 export const deleteMany = async function deleteMany({ collection, req, where }) {
     const Model = this.collections[collection];
-    const session = await getSession(this, req);
+    const options = {
+        session: await getSession(this, req)
+    };
     const query = await Model.buildQuery({
         payload: this.payload,
-        session,
         where
     });
-    await Model.collection.deleteMany(query, {
-        session
-    });
+    await Model.deleteMany(query, options);
 };
 
 //# sourceMappingURL=deleteMany.js.map

package/dist/deleteMany.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteMany.ts"],"sourcesContent":["import type { DeleteMany } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteMany: DeleteMany = async function deleteMany(\n  this: MongooseAdapter,\n  { collection, req, where },\n) {\n  const Model = this.collections[collection]\n\n  const session = await getSession(this, req)\n\n  const query = await Model.buildQuery({\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  await Model.collection.deleteMany(query, {\n    session,\n  })\n}\n"],"names":["getSession","deleteMany","collection","req","where","Model","collections","session","query","buildQuery","payload"],"mappings":"AAIA,SAASA,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,UAAU,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE1B,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACJ,WAAW;IAE1C,MAAMK,UAAU,MAAMP,WAAW,IAAI,EAAEG;IAEvC,MAAMK,QAAQ,MAAMH,MAAMI,UAAU,CAAC;QACnCC,SAAS,IAAI,CAACA,OAAO;QACrBH;QACAH;IACF;IAEA,MAAMC,MAAMH,UAAU,CAACD,UAAU,CAACO,OAAO;QACvCD;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/deleteMany.ts"],"sourcesContent":["import type { DeleteOptions } from 'mongodb'\nimport type { DeleteMany } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteMany: DeleteMany = async function deleteMany(\n  this: MongooseAdapter,\n  { collection, req, where },\n) {\n  const Model = this.collections[collection]\n  const options: DeleteOptions = {\n    session: await getSession(this, req),\n  }\n\n  const query = await Model.buildQuery({\n    payload: this.payload,\n    where,\n  })\n\n  await Model.deleteMany(query, options)\n}\n"],"names":["getSession","deleteMany","collection","req","where","Model","collections","options","session","query","buildQuery","payload"],"mappings":"AAKA,SAASA,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,UAAU,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAE1B,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACJ,WAAW;IAC1C,MAAMK,UAAyB;QAC7BC,SAAS,MAAMR,WAAW,IAAI,EAAEG;IAClC;IAEA,MAAMM,QAAQ,MAAMJ,MAAMK,UAAU,CAAC;QACnCC,SAAS,IAAI,CAACA,OAAO;QACrBP;IACF;IAEA,MAAMC,MAAMJ,UAAU,CAACQ,OAAOF;AAChC,EAAC"}

package/dist/deleteOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAQxC,eAAO,MAAM,SAAS,EAAE,SAgCvB,CAAA"}
+{"version":3,"file":"deleteOne.d.ts","sourceRoot":"","sources":["../src/deleteOne.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAY,MAAM,SAAS,CAAA;AAQlD,eAAO,MAAM,SAAS,EAAE,SA4BvB,CAAA"}

package/dist/deleteOne.js

@@ -1,30 +1,26 @@
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getSession } from './utilities/getSession.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
 export const deleteOne = async function deleteOne({ collection, req, select, where }) {
     const Model = this.collections[collection];
-    const session = await getSession(this, req);
-    const query = await Model.buildQuery({
-        payload: this.payload,
-        session,
-        where
-    });
-    const fields = this.payload.collections[collection].config.flattenedFields;
-    const doc = await Model.collection.findOneAndDelete(query, {
+    const options = {
         projection: buildProjectionFromSelect({
             adapter: this,
-            fields,
+            fields: this.payload.collections[collection].config.flattenedFields,
             select
         }),
-        session
-    });
-    transform({
-        adapter: this,
-        data: doc,
-        fields,
-        operation: 'read'
+        session: await getSession(this, req)
+    };
+    const query = await Model.buildQuery({
+        payload: this.payload,
+        where
     });
-    return doc;
+    const doc = await Model.findOneAndDelete(query, options).lean();
+    let result = JSON.parse(JSON.stringify(doc));
+    // custom id type reset
+    result.id = result._id;
+    result = sanitizeInternalFields(result);
+    return result;
 };
 
 //# sourceMappingURL=deleteOne.js.map

package/dist/deleteOne.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { DeleteOne } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: MongooseAdapter,\n  { collection, req, select, where },\n) {\n  const Model = this.collections[collection]\n  const session = await getSession(this, req)\n\n  const query = await Model.buildQuery({\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  const fields = this.payload.collections[collection].config.flattenedFields\n\n  const doc = await Model.collection.findOneAndDelete(query, {\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields,\n      select,\n    }),\n    session,\n  })\n\n  transform({\n    adapter: this,\n    data: doc,\n    fields,\n    operation: 'read',\n  })\n\n  return doc\n}\n"],"names":["buildProjectionFromSelect","getSession","transform","deleteOne","collection","req","select","where","Model","collections","session","query","buildQuery","payload","fields","config","flattenedFields","doc","findOneAndDelete","projection","adapter","data","operation"],"mappings":"AAIA,SAASA,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAElC,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACL,WAAW;IAC1C,MAAMM,UAAU,MAAMT,WAAW,IAAI,EAAEI;IAEvC,MAAMM,QAAQ,MAAMH,MAAMI,UAAU,CAAC;QACnCC,SAAS,IAAI,CAACA,OAAO;QACrBH;QACAH;IACF;IAEA,MAAMO,SAAS,IAAI,CAACD,OAAO,CAACJ,WAAW,CAACL,WAAW,CAACW,MAAM,CAACC,eAAe;IAE1E,MAAMC,MAAM,MAAMT,MAAMJ,UAAU,CAACc,gBAAgB,CAACP,OAAO;QACzDQ,YAAYnB,0BAA0B;YACpCoB,SAAS,IAAI;YACbN;YACAR;QACF;QACAI;IACF;IAEAR,UAAU;QACRkB,SAAS,IAAI;QACbC,MAAMJ;QACNH;QACAQ,WAAW;IACb;IAEA,OAAOL;AACT,EAAC"}
+{"version":3,"sources":["../src/deleteOne.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { DeleteOne, Document } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\n\nexport const deleteOne: DeleteOne = async function deleteOne(\n  this: MongooseAdapter,\n  { collection, req, select, where },\n) {\n  const Model = this.collections[collection]\n  const options: QueryOptions = {\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields: this.payload.collections[collection].config.flattenedFields,\n      select,\n    }),\n    session: await getSession(this, req),\n  }\n\n  const query = await Model.buildQuery({\n    payload: this.payload,\n    where,\n  })\n\n  const doc = await Model.findOneAndDelete(query, options).lean()\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":["buildProjectionFromSelect","getSession","sanitizeInternalFields","deleteOne","collection","req","select","where","Model","collections","options","projection","adapter","fields","payload","config","flattenedFields","session","query","buildQuery","doc","findOneAndDelete","lean","result","JSON","parse","stringify","id","_id"],"mappings":"AAKA,SAASA,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,sBAAsB,QAAQ,wCAAuC;AAE9E,OAAO,MAAMC,YAAuB,eAAeA,UAEjD,EAAEC,UAAU,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAElC,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACL,WAAW;IAC1C,MAAMM,UAAwB;QAC5BC,YAAYX,0BAA0B;YACpCY,SAAS,IAAI;YACbC,QAAQ,IAAI,CAACC,OAAO,CAACL,WAAW,CAACL,WAAW,CAACW,MAAM,CAACC,eAAe;YACnEV;QACF;QACAW,SAAS,MAAMhB,WAAW,IAAI,EAAEI;IAClC;IAEA,MAAMa,QAAQ,MAAMV,MAAMW,UAAU,CAAC;QACnCL,SAAS,IAAI,CAACA,OAAO;QACrBP;IACF;IAEA,MAAMa,MAAM,MAAMZ,MAAMa,gBAAgB,CAACH,OAAOR,SAASY,IAAI;IAE7D,IAAIC,SAAmBC,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACN;IAEjD,uBAAuB;IACvBG,OAAOI,EAAE,GAAGJ,OAAOK,GAAG;IACtBL,SAASrB,uBAAuBqB;IAEhC,OAAOA;AACT,EAAC"}

package/dist/deleteVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"deleteVersions.d.ts","sourceRoot":"","sources":["../src/deleteVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,eAAO,MAAM,cAAc,EAAE,cAkB5B,CAAA"}
+{"version":3,"file":"deleteVersions.d.ts","sourceRoot":"","sources":["../src/deleteVersions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAM7C,eAAO,MAAM,cAAc,EAAE,cAe5B,CAAA"}

package/dist/deleteVersions.js

@@ -5,10 +5,9 @@ export const deleteVersions = async function deleteVersions({ collection, locale
     const query = await VersionsModel.buildQuery({
         locale,
         payload: this.payload,
-        session,
         where
     });
-    await VersionsModel.collection.deleteMany(query, {
+    await VersionsModel.deleteMany(query, {
         session
     });
 };

package/dist/deleteVersions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/deleteVersions.ts"],"sourcesContent":["import type { DeleteVersions } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteVersions: DeleteVersions = async function deleteVersions(\n  this: MongooseAdapter,\n  { collection, locale, req, where },\n) {\n  const VersionsModel = this.versions[collection]\n\n  const session = await getSession(this, req)\n\n  const query = await VersionsModel.buildQuery({\n    locale,\n    payload: this.payload,\n    session,\n    where,\n  })\n\n  await VersionsModel.collection.deleteMany(query, {\n    session,\n  })\n}\n"],"names":["getSession","deleteVersions","collection","locale","req","where","VersionsModel","versions","session","query","buildQuery","payload","deleteMany"],"mappings":"AAIA,SAASA,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,iBAAiC,eAAeA,eAE3D,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAElC,MAAMC,gBAAgB,IAAI,CAACC,QAAQ,CAACL,WAAW;IAE/C,MAAMM,UAAU,MAAMR,WAAW,IAAI,EAAEI;IAEvC,MAAMK,QAAQ,MAAMH,cAAcI,UAAU,CAAC;QAC3CP;QACAQ,SAAS,IAAI,CAACA,OAAO;QACrBH;QACAH;IACF;IAEA,MAAMC,cAAcJ,UAAU,CAACU,UAAU,CAACH,OAAO;QAC/CD;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/deleteVersions.ts"],"sourcesContent":["import type { DeleteVersions } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { getSession } from './utilities/getSession.js'\n\nexport const deleteVersions: DeleteVersions = async function deleteVersions(\n  this: MongooseAdapter,\n  { collection, locale, req, where },\n) {\n  const VersionsModel = this.versions[collection]\n\n  const session = await getSession(this, req)\n\n  const query = await VersionsModel.buildQuery({\n    locale,\n    payload: this.payload,\n    where,\n  })\n\n  await VersionsModel.deleteMany(query, { session })\n}\n"],"names":["getSession","deleteVersions","collection","locale","req","where","VersionsModel","versions","session","query","buildQuery","payload","deleteMany"],"mappings":"AAIA,SAASA,UAAU,QAAQ,4BAA2B;AAEtD,OAAO,MAAMC,iBAAiC,eAAeA,eAE3D,EAAEC,UAAU,EAAEC,MAAM,EAAEC,GAAG,EAAEC,KAAK,EAAE;IAElC,MAAMC,gBAAgB,IAAI,CAACC,QAAQ,CAACL,WAAW;IAE/C,MAAMM,UAAU,MAAMR,WAAW,IAAI,EAAEI;IAEvC,MAAMK,QAAQ,MAAMH,cAAcI,UAAU,CAAC;QAC3CP;QACAQ,SAAS,IAAI,CAACA,OAAO;QACrBN;IACF;IAEA,MAAMC,cAAcM,UAAU,CAACH,OAAO;QAAED;IAAQ;AAClD,EAAC"}

package/dist/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAYnC,eAAO,MAAM,IAAI,EAAE,IAoFlB,CAAA"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../src/find.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,SAAS,CAAA;AAYnC,eAAO,MAAM,IAAI,EAAE,IAgIlB,CAAA"}

package/dist/find.js

@@ -1,21 +1,23 @@
+import { flattenWhereToOperators } from 'payload';
 import { buildSortParam } from './queries/buildSortParam.js';
 import { buildJoinAggregation } from './utilities/buildJoinAggregation.js';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
-import { findMany } from './utilities/findMany.js';
-import { getHasNearConstraint } from './utilities/getHasNearConstraint.js';
 import { getSession } from './utilities/getSession.js';
-import { transform } from './utilities/transform.js';
-export const find = async function find({ collection, joins = {}, limit = 0, locale, page, pagination, req, select, sort: sortArg, where }) {
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
+export const find = async function find({ collection, joins = {}, limit = 0, locale, page, pagination, projection, req, select, sort: sortArg, where }) {
     const Model = this.collections[collection];
     const collectionConfig = this.payload.collections[collection].config;
     const session = await getSession(this, req);
-    const hasNearConstraint = getHasNearConstraint(where);
-    const fields = collectionConfig.flattenedFields;
+    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({
             config: this.payload.config,
-            fields,
+            fields: collectionConfig.flattenedFields,
             locale,
             sort: sortArg || collectionConfig.defaultSort,
             timestamps: true
@@ -24,49 +26,82 @@ export const find = async function find({ collection, joins = {}, limit = 0, loc
     const query = await Model.buildQuery({
         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,
-        select
-    });
-    const collation = this.collation ? {
-        locale: locale && locale !== 'all' && locale !== '*' ? locale : 'en',
-        ...this.collation
-    } : undefined;
-    const joinAgreggation = await buildJoinAggregation({
-        adapter: this,
-        collection,
-        collectionConfig,
-        joins,
-        locale,
-        session
-    });
-    const result = await findMany({
-        adapter: this,
-        collation,
-        collection: Model.collection,
-        joinAgreggation,
-        limit,
+    const paginationOptions = {
+        lean: true,
+        leanWithId: true,
+        options: {
+            session
+        },
         page,
         pagination,
         projection,
-        query,
-        session,
         sort,
         useEstimatedCount
-    });
-    transform({
+    };
+    if (select) {
+        paginationOptions.projection = buildProjectionFromSelect({
+            adapter: this,
+            fields: collectionConfig.flattenedFields,
+            select
+        });
+    }
+    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, {
+                hint: {
+                    _id: 1
+                },
+                session
+            }));
+        };
+    }
+    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;
+        }
+    }
+    let result;
+    const aggregate = await buildJoinAggregation({
         adapter: this,
-        data: result.docs,
-        fields,
-        operation: 'read'
+        collection,
+        collectionConfig,
+        joins,
+        locale,
+        query
     });
-    return result;
+    // build join aggregation
+    if (aggregate) {
+        result = await Model.aggregatePaginate(Model.aggregate(aggregate), paginationOptions);
+    } else {
+        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=find.js.map

package/dist/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { CollationOptions } from 'mongodb'\nimport type { Find } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { findMany } from './utilities/findMany.js'\nimport { getHasNearConstraint } from './utilities/getHasNearConstraint.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const find: Find = async function find(\n  this: MongooseAdapter,\n  {\n    collection,\n    joins = {},\n    limit = 0,\n    locale,\n    page,\n    pagination,\n    req,\n    select,\n    sort: sortArg,\n    where,\n  },\n) {\n  const Model = this.collections[collection]\n  const collectionConfig = this.payload.collections[collection].config\n  const session = await getSession(this, req)\n\n  const hasNearConstraint = getHasNearConstraint(where)\n\n  const fields = collectionConfig.flattenedFields\n\n  let sort\n  if (!hasNearConstraint) {\n    sort = buildSortParam({\n      config: this.payload.config,\n      fields,\n      locale,\n      sort: sortArg || collectionConfig.defaultSort,\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  // 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,\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 joinAgreggation = await buildJoinAggregation({\n    adapter: this,\n    collection,\n    collectionConfig,\n    joins,\n    locale,\n    session,\n  })\n\n  const result = await findMany({\n    adapter: this,\n    collation,\n    collection: Model.collection,\n    joinAgreggation,\n    limit,\n    page,\n    pagination,\n    projection,\n    query,\n    session,\n    sort,\n    useEstimatedCount,\n  })\n\n  transform({ adapter: this, data: result.docs, fields, operation: 'read' })\n\n  return result\n}\n"],"names":["buildSortParam","buildJoinAggregation","buildProjectionFromSelect","findMany","getHasNearConstraint","getSession","transform","find","collection","joins","limit","locale","page","pagination","req","select","sort","sortArg","where","Model","collections","collectionConfig","payload","config","session","hasNearConstraint","fields","flattenedFields","defaultSort","timestamps","query","buildQuery","useEstimatedCount","Object","keys","length","projection","adapter","collation","undefined","joinAgreggation","result","data","docs","operation"],"mappings":"AAKA,SAASA,cAAc,QAAQ,8BAA6B;AAC5D,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,QAAQ,QAAQ,0BAAyB;AAClD,SAASC,oBAAoB,QAAQ,sCAAqC;AAC1E,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,OAAa,eAAeA,KAEvC,EACEC,UAAU,EACVC,QAAQ,CAAC,CAAC,EACVC,QAAQ,CAAC,EACTC,MAAM,EACNC,IAAI,EACJC,UAAU,EACVC,GAAG,EACHC,MAAM,EACNC,MAAMC,OAAO,EACbC,KAAK,EACN;IAED,MAAMC,QAAQ,IAAI,CAACC,WAAW,CAACZ,WAAW;IAC1C,MAAMa,mBAAmB,IAAI,CAACC,OAAO,CAACF,WAAW,CAACZ,WAAW,CAACe,MAAM;IACpE,MAAMC,UAAU,MAAMnB,WAAW,IAAI,EAAES;IAEvC,MAAMW,oBAAoBrB,qBAAqBc;IAE/C,MAAMQ,SAASL,iBAAiBM,eAAe;IAE/C,IAAIX;IACJ,IAAI,CAACS,mBAAmB;QACtBT,OAAOhB,eAAe;YACpBuB,QAAQ,IAAI,CAACD,OAAO,CAACC,MAAM;YAC3BG;YACAf;YACAK,MAAMC,WAAWI,iBAAiBO,WAAW;YAC7CC,YAAY;QACd;IACF;IAEA,MAAMC,QAAQ,MAAMX,MAAMY,UAAU,CAAC;QACnCpB;QACAW,SAAS,IAAI,CAACA,OAAO;QACrBE;QACAN;IACF;IAEA,4HAA4H;IAC5H,MAAMc,oBAAoBP,qBAAqB,CAACK,SAASG,OAAOC,IAAI,CAACJ,OAAOK,MAAM,KAAK;IAEvF,MAAMC,aAAalC,0BAA0B;QAC3CmC,SAAS,IAAI;QACbX;QACAX;IACF;IAEA,MAAMuB,YAA0C,IAAI,CAACA,SAAS,GAC1D;QACE3B,QAAQA,UAAUA,WAAW,SAASA,WAAW,MAAMA,SAAS;QAChE,GAAG,IAAI,CAAC2B,SAAS;IACnB,IACAC;IAEJ,MAAMC,kBAAkB,MAAMvC,qBAAqB;QACjDoC,SAAS,IAAI;QACb7B;QACAa;QACAZ;QACAE;QACAa;IACF;IAEA,MAAMiB,SAAS,MAAMtC,SAAS;QAC5BkC,SAAS,IAAI;QACbC;QACA9B,YAAYW,MAAMX,UAAU;QAC5BgC;QACA9B;QACAE;QACAC;QACAuB;QACAN;QACAN;QACAR;QACAgB;IACF;IAEA1B,UAAU;QAAE+B,SAAS,IAAI;QAAEK,MAAMD,OAAOE,IAAI;QAAEjB;QAAQkB,WAAW;IAAO;IAExE,OAAOH;AACT,EAAC"}
+{"version":3,"sources":["../src/find.ts"],"sourcesContent":["import type { PaginateOptions } from 'mongoose'\nimport type { Find } from 'payload'\n\nimport { flattenWhereToOperators } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildSortParam } from './queries/buildSortParam.js'\nimport { buildJoinAggregation } from './utilities/buildJoinAggregation.js'\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\n\nexport const find: Find = async function find(\n  this: MongooseAdapter,\n  {\n    collection,\n    joins = {},\n    limit = 0,\n    locale,\n    page,\n    pagination,\n    projection,\n    req,\n    select,\n    sort: sortArg,\n    where,\n  },\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  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 || collectionConfig.defaultSort,\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    options: {\n      session,\n    },\n    page,\n    pagination,\n    projection,\n    sort,\n    useEstimatedCount,\n  }\n\n  if (select) {\n    paginationOptions.projection = buildProjectionFromSelect({\n      adapter: this,\n      fields: collectionConfig.flattenedFields,\n      select,\n    })\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          hint: { _id: 1 },\n          session,\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  let result\n\n  const aggregate = await buildJoinAggregation({\n    adapter: this,\n    collection,\n    collectionConfig,\n    joins,\n    locale,\n    query,\n  })\n  // build join aggregation\n  if (aggregate) {\n    result = await Model.aggregatePaginate(Model.aggregate(aggregate), paginationOptions)\n  } else {\n    result = await Model.paginate(query, paginationOptions)\n  }\n\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":["flattenWhereToOperators","buildSortParam","buildJoinAggregation","buildProjectionFromSelect","getSession","sanitizeInternalFields","find","collection","joins","limit","locale","page","pagination","projection","req","select","sort","sortArg","where","Model","collections","collectionConfig","payload","config","session","hasNearConstraint","constraints","some","prop","Object","keys","key","fields","flattenedFields","defaultSort","timestamps","query","buildQuery","useEstimatedCount","length","paginationOptions","lean","leanWithId","options","adapter","collation","defaultLocale","disableIndexHints","useCustomCountFn","Promise","resolve","countDocuments","hint","_id","result","aggregate","aggregatePaginate","paginate","docs","JSON","parse","stringify","map","doc","id"],"mappings":"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"}

package/dist/findGlobal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findGlobal.d.ts","sourceRoot":"","sources":["../src/findGlobal.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAUzC,eAAO,MAAM,UAAU,EAAE,UAkCxB,CAAA"}
+{"version":3,"file":"findGlobal.d.ts","sourceRoot":"","sources":["../src/findGlobal.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAUzC,eAAO,MAAM,UAAU,EAAE,UAoCxB,CAAA"}

package/dist/findGlobal.js

@@ -1,39 +1,38 @@
 import { combineQueries } from 'payload';
 import { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js';
 import { getSession } from './utilities/getSession.js';
-import { transform } from './utilities/transform.js';
+import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js';
 export const findGlobal = async function findGlobal({ slug, locale, req, select, where }) {
     const Model = this.globals;
-    const session = await getSession(this, req);
+    const options = {
+        lean: true,
+        select: buildProjectionFromSelect({
+            adapter: this,
+            fields: this.payload.globals.config.find((each)=>each.slug === slug).flattenedFields,
+            select
+        }),
+        session: await getSession(this, req)
+    };
     const query = await Model.buildQuery({
         globalSlug: slug,
         locale,
         payload: this.payload,
-        session,
         where: combineQueries({
             globalType: {
                 equals: slug
             }
         }, where)
     });
-    const fields = this.payload.globals.config.find((each)=>each.slug === slug).flattenedFields;
-    const doc = await Model.collection.findOne(query, {
-        projection: buildProjectionFromSelect({
-            adapter: this,
-            fields,
-            select
-        }),
-        session: await getSession(this, req)
-    });
+    let doc = await Model.findOne(query, {}, options);
     if (!doc) {
         return null;
     }
-    transform({
-        adapter: this,
-        data: doc,
-        fields,
-        operation: 'read'
-    });
+    if (doc._id) {
+        doc.id = doc._id;
+        delete doc._id;
+    }
+    doc = JSON.parse(JSON.stringify(doc));
+    doc = sanitizeInternalFields(doc);
     return doc;
 };
 

package/dist/findGlobal.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/findGlobal.ts"],"sourcesContent":["import type { FindGlobal } from 'payload'\n\nimport { combineQueries } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { transform } from './utilities/transform.js'\n\nexport const findGlobal: FindGlobal = async function findGlobal(\n  this: MongooseAdapter,\n  { slug, locale, req, select, where },\n) {\n  const Model = this.globals\n\n  const session = await getSession(this, req)\n\n  const query = await Model.buildQuery({\n    globalSlug: slug,\n    locale,\n    payload: this.payload,\n    session,\n    where: combineQueries({ globalType: { equals: slug } }, where),\n  })\n\n  const fields = this.payload.globals.config.find((each) => each.slug === slug).flattenedFields\n\n  const doc = await Model.collection.findOne(query, {\n    projection: buildProjectionFromSelect({\n      adapter: this,\n      fields,\n      select,\n    }),\n    session: await getSession(this, req),\n  })\n\n  if (!doc) {\n    return null\n  }\n\n  transform({ adapter: this, data: doc, fields, operation: 'read' })\n\n  return doc as any\n}\n"],"names":["combineQueries","buildProjectionFromSelect","getSession","transform","findGlobal","slug","locale","req","select","where","Model","globals","session","query","buildQuery","globalSlug","payload","globalType","equals","fields","config","find","each","flattenedFields","doc","collection","findOne","projection","adapter","data","operation"],"mappings":"AAEA,SAASA,cAAc,QAAQ,UAAS;AAIxC,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,IAAI,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAEpC,MAAMC,QAAQ,IAAI,CAACC,OAAO;IAE1B,MAAMC,UAAU,MAAMV,WAAW,IAAI,EAAEK;IAEvC,MAAMM,QAAQ,MAAMH,MAAMI,UAAU,CAAC;QACnCC,YAAYV;QACZC;QACAU,SAAS,IAAI,CAACA,OAAO;QACrBJ;QACAH,OAAOT,eAAe;YAAEiB,YAAY;gBAAEC,QAAQb;YAAK;QAAE,GAAGI;IAC1D;IAEA,MAAMU,SAAS,IAAI,CAACH,OAAO,CAACL,OAAO,CAACS,MAAM,CAACC,IAAI,CAAC,CAACC,OAASA,KAAKjB,IAAI,KAAKA,MAAMkB,eAAe;IAE7F,MAAMC,MAAM,MAAMd,MAAMe,UAAU,CAACC,OAAO,CAACb,OAAO;QAChDc,YAAY1B,0BAA0B;YACpC2B,SAAS,IAAI;YACbT;YACAX;QACF;QACAI,SAAS,MAAMV,WAAW,IAAI,EAAEK;IAClC;IAEA,IAAI,CAACiB,KAAK;QACR,OAAO;IACT;IAEArB,UAAU;QAAEyB,SAAS,IAAI;QAAEC,MAAML;QAAKL;QAAQW,WAAW;IAAO;IAEhE,OAAON;AACT,EAAC"}
+{"version":3,"sources":["../src/findGlobal.ts"],"sourcesContent":["import type { QueryOptions } from 'mongoose'\nimport type { FindGlobal } from 'payload'\n\nimport { combineQueries } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\nimport { buildProjectionFromSelect } from './utilities/buildProjectionFromSelect.js'\nimport { getSession } from './utilities/getSession.js'\nimport { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js'\n\nexport const findGlobal: FindGlobal = async function findGlobal(\n  this: MongooseAdapter,\n  { slug, locale, req, select, where },\n) {\n  const Model = this.globals\n  const options: QueryOptions = {\n    lean: true,\n    select: buildProjectionFromSelect({\n      adapter: this,\n      fields: this.payload.globals.config.find((each) => each.slug === slug).flattenedFields,\n      select,\n    }),\n    session: await getSession(this, req),\n  }\n\n  const query = await Model.buildQuery({\n    globalSlug: slug,\n    locale,\n    payload: this.payload,\n    where: combineQueries({ globalType: { equals: slug } }, where),\n  })\n\n  let doc = (await Model.findOne(query, {}, options)) as any\n\n  if (!doc) {\n    return null\n  }\n  if (doc._id) {\n    doc.id = doc._id\n    delete doc._id\n  }\n\n  doc = JSON.parse(JSON.stringify(doc))\n  doc = sanitizeInternalFields(doc)\n\n  return doc\n}\n"],"names":["combineQueries","buildProjectionFromSelect","getSession","sanitizeInternalFields","findGlobal","slug","locale","req","select","where","Model","globals","options","lean","adapter","fields","payload","config","find","each","flattenedFields","session","query","buildQuery","globalSlug","globalType","equals","doc","findOne","_id","id","JSON","parse","stringify"],"mappings":"AAGA,SAASA,cAAc,QAAQ,UAAS;AAIxC,SAASC,yBAAyB,QAAQ,2CAA0C;AACpF,SAASC,UAAU,QAAQ,4BAA2B;AACtD,SAASC,sBAAsB,QAAQ,wCAAuC;AAE9E,OAAO,MAAMC,aAAyB,eAAeA,WAEnD,EAAEC,IAAI,EAAEC,MAAM,EAAEC,GAAG,EAAEC,MAAM,EAAEC,KAAK,EAAE;IAEpC,MAAMC,QAAQ,IAAI,CAACC,OAAO;IAC1B,MAAMC,UAAwB;QAC5BC,MAAM;QACNL,QAAQP,0BAA0B;YAChCa,SAAS,IAAI;YACbC,QAAQ,IAAI,CAACC,OAAO,CAACL,OAAO,CAACM,MAAM,CAACC,IAAI,CAAC,CAACC,OAASA,KAAKd,IAAI,KAAKA,MAAMe,eAAe;YACtFZ;QACF;QACAa,SAAS,MAAMnB,WAAW,IAAI,EAAEK;IAClC;IAEA,MAAMe,QAAQ,MAAMZ,MAAMa,UAAU,CAAC;QACnCC,YAAYnB;QACZC;QACAU,SAAS,IAAI,CAACA,OAAO;QACrBP,OAAOT,eAAe;YAAEyB,YAAY;gBAAEC,QAAQrB;YAAK;QAAE,GAAGI;IAC1D;IAEA,IAAIkB,MAAO,MAAMjB,MAAMkB,OAAO,CAACN,OAAO,CAAC,GAAGV;IAE1C,IAAI,CAACe,KAAK;QACR,OAAO;IACT;IACA,IAAIA,IAAIE,GAAG,EAAE;QACXF,IAAIG,EAAE,GAAGH,IAAIE,GAAG;QAChB,OAAOF,IAAIE,GAAG;IAChB;IAEAF,MAAMI,KAAKC,KAAK,CAACD,KAAKE,SAAS,CAACN;IAChCA,MAAMxB,uBAAuBwB;IAE7B,OAAOA;AACT,EAAC"}

package/dist/findGlobalVersions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findGlobalVersions.d.ts","sourceRoot":"","sources":["../src/findGlobalVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAajD,eAAO,MAAM,kBAAkB,EAAE,kBAqEhC,CAAA"}
+{"version":3,"file":"findGlobalVersions.d.ts","sourceRoot":"","sources":["../src/findGlobalVersions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAA;AAWjD,eAAO,MAAM,kBAAkB,EAAE,kBAqGhC,CAAA"}