@payloadcms/db-mongodb 3.0.0-canary.ff8c8fd → 3.0.1-canary.34c6cc0

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js

@@ -0,0 +1,141 @@
+import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload';
+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){
+        const docs = await Model.find({}, {}, {
+            lean: true,
+            limit: batchSize + 1,
+            session,
+            skip
+        });
+        if (docs.length === 0) {
+            break;
+        }
+        hasNext = docs.length > batchSize;
+        if (hasNext) {
+            docs.pop();
+        }
+        for (const doc of docs){
+            sanitizeRelationshipIDs({
+                config,
+                data: doc,
+                fields
+            });
+        }
+        await Model.collection.bulkWrite(docs.map((doc)=>({
+                updateOne: {
+                    filter: {
+                        _id: doc._id
+                    },
+                    update: {
+                        $set: doc
+                    }
+                }
+            })), {
+            session
+        });
+        skip += batchSize;
+    }
+};
+const hasRelationshipOrUploadField = ({ fields })=>{
+    for (const field of fields){
+        if (field.type === 'relationship' || field.type === 'upload') {
+            return true;
+        }
+        if ('fields' in field) {
+            if (hasRelationshipOrUploadField({
+                fields: field.fields
+            })) {
+                return true;
+            }
+        }
+        if ('blocks' in field) {
+            for (const block of field.blocks){
+                if (hasRelationshipOrUploadField({
+                    fields: block.fields
+                })) {
+                    return true;
+                }
+            }
+        }
+        if ('tabs' in field) {
+            for (const tab of field.tabs){
+                if (hasRelationshipOrUploadField({
+                    fields: tab.fields
+                })) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+};
+export async function migrateRelationshipsV2_V3({ batchSize, req }) {
+    const { payload } = req;
+    const db = payload.db;
+    const config = payload.config;
+    const { session } = await withSession(db, req);
+    for (const collection of payload.config.collections.filter(hasRelationshipOrUploadField)){
+        payload.logger.info(`Migrating collection "${collection.slug}"`);
+        await migrateModelWithBatching({
+            batchSize,
+            config,
+            fields: collection.fields,
+            Model: db.collections[collection.slug],
+            session
+        });
+        payload.logger.info(`Migrated collection "${collection.slug}"`);
+        if (collection.versions) {
+            payload.logger.info(`Migrating collection versions "${collection.slug}"`);
+            await migrateModelWithBatching({
+                batchSize,
+                config,
+                fields: buildVersionCollectionFields(config, collection),
+                Model: db.versions[collection.slug],
+                session
+            });
+            payload.logger.info(`Migrated collection versions "${collection.slug}"`);
+        }
+    }
+    const { globals: GlobalsModel } = db;
+    for (const global of payload.config.globals.filter(hasRelationshipOrUploadField)){
+        payload.logger.info(`Migrating global "${global.slug}"`);
+        const doc = await GlobalsModel.findOne({
+            globalType: {
+                $eq: global.slug
+            }
+        }, {}, {
+            lean: true,
+            session
+        });
+        sanitizeRelationshipIDs({
+            config,
+            data: doc,
+            fields: global.fields
+        });
+        await GlobalsModel.collection.updateOne({
+            globalType: global.slug
+        }, {
+            $set: doc
+        }, {
+            session
+        });
+        payload.logger.info(`Migrated global "${global.slug}"`);
+        if (global.versions) {
+            payload.logger.info(`Migrating global versions "${global.slug}"`);
+            await migrateModelWithBatching({
+                batchSize,
+                config,
+                fields: buildVersionGlobalFields(config, global),
+                Model: db.versions[global.slug],
+                session
+            });
+            payload.logger.info(`Migrated global versions "${global.slug}"`);
+        }
+    }
+}
+
+//# sourceMappingURL=migrateRelationshipsV2_V3.js.map

package/dist/predefinedMigrations/migrateRelationshipsV2_V3.js.map

@@ -0,0 +1 @@
+{"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    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    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.d.ts

@@ -0,0 +1,5 @@
+import type { PayloadRequest } from 'payload';
+export declare function migrateVersionsV1_V2({ req }: {
+    req: PayloadRequest;
+}): Promise<void>;
+//# sourceMappingURL=migrateVersionsV1_V2.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"migrateVersionsV1_V2.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/migrateVersionsV1_V2.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAW,cAAc,EAAE,MAAM,SAAS,CAAA;AAMtD,wBAAsB,oBAAoB,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,cAAc,CAAA;CAAE,iBAgC1E"}

package/dist/predefinedMigrations/migrateVersionsV1_V2.js

@@ -0,0 +1,107 @@
+import { withSession } from '../withSession.js';
+export async function migrateVersionsV1_V2({ req }) {
+    const { payload } = req;
+    const { session } = await withSession(payload.db, req);
+    // For each collection
+    for (const { slug, versions } of payload.config.collections){
+        if (versions?.drafts) {
+            await migrateCollectionDocs({
+                slug,
+                payload,
+                session
+            });
+            payload.logger.info(`Migrated the "${slug}" collection.`);
+        }
+    }
+    // For each global
+    for (const { slug, versions } of payload.config.globals){
+        if (versions) {
+            const VersionsModel = payload.db.versions[slug];
+            await VersionsModel.findOneAndUpdate({}, {
+                latest: true
+            }, {
+                session,
+                sort: {
+                    updatedAt: -1
+                }
+            }).exec();
+            payload.logger.info(`Migrated the "${slug}" global.`);
+        }
+    }
+}
+async function migrateCollectionDocs({ slug, docsAtATime = 100, payload, session }) {
+    const VersionsModel = payload.db.versions[slug];
+    const remainingDocs = await VersionsModel.aggregate([
+        // Sort so that newest are first
+        {
+            $sort: {
+                updatedAt: -1
+            }
+        },
+        // Group by parent ID
+        // take the $first of each
+        {
+            $group: {
+                _id: '$parent',
+                _versionID: {
+                    $first: '$_id'
+                },
+                createdAt: {
+                    $first: '$createdAt'
+                },
+                latest: {
+                    $first: '$latest'
+                },
+                updatedAt: {
+                    $first: '$updatedAt'
+                },
+                version: {
+                    $first: '$version'
+                }
+            }
+        },
+        {
+            $match: {
+                latest: {
+                    $eq: null
+                }
+            }
+        },
+        {
+            $limit: docsAtATime
+        }
+    ], {
+        allowDiskUse: true,
+        session
+    }).exec();
+    if (!remainingDocs || remainingDocs.length === 0) {
+        const newVersions = await VersionsModel.find({
+            latest: {
+                $eq: true
+            }
+        }, undefined, {
+            session
+        });
+        if (newVersions?.length) {
+            payload.logger.info(`Migrated ${newVersions.length} documents in the "${slug}" versions collection.`);
+        }
+        return;
+    }
+    const remainingDocIds = remainingDocs.map((doc)=>doc._versionID);
+    await VersionsModel.updateMany({
+        _id: {
+            $in: remainingDocIds
+        }
+    }, {
+        latest: true
+    }, {
+        session
+    });
+    await migrateCollectionDocs({
+        slug,
+        payload,
+        session
+    });
+}
+
+//# sourceMappingURL=migrateVersionsV1_V2.js.map

package/dist/predefinedMigrations/migrateVersionsV1_V2.js.map

@@ -0,0 +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 { 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"}

package/dist/predefinedMigrations/relationships-v2-v3.d.ts

@@ -0,0 +1,4 @@
+declare const imports = "import { migrateRelationshipsV2_V3 } from '@payloadcms/db-mongodb/migration-utils'";
+declare const upSQL = "   await migrateRelationshipsV2_V3({\n        batchSize: 100,\n        req,\n        })\n";
+export { imports, upSQL };
+//# sourceMappingURL=relationships-v2-v3.d.ts.map

package/dist/predefinedMigrations/relationships-v2-v3.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relationships-v2-v3.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/relationships-v2-v3.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,uFAAuF,CAAA;AACpG,QAAA,MAAM,KAAK,8FAIV,CAAA;AACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/dist/predefinedMigrations/relationships-v2-v3.js

@@ -0,0 +1,9 @@
+const imports = `import { migrateRelationshipsV2_V3 } from '@payloadcms/db-mongodb/migration-utils'`;
+const upSQL = `   await migrateRelationshipsV2_V3({
+        batchSize: 100,
+        req,
+        })
+`;
+export { imports, upSQL };
+
+//# sourceMappingURL=relationships-v2-v3.js.map

package/dist/predefinedMigrations/relationships-v2-v3.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/predefinedMigrations/relationships-v2-v3.ts"],"sourcesContent":["const imports = `import { migrateRelationshipsV2_V3 } from '@payloadcms/db-mongodb/migration-utils'`\nconst upSQL = `   await migrateRelationshipsV2_V3({\n        batchSize: 100,\n        req,\n        })\n`\nexport { imports, upSQL }\n"],"names":["imports","upSQL"],"mappings":"AAAA,MAAMA,UAAU,CAAC,kFAAkF,CAAC;AACpG,MAAMC,QAAQ,CAAC;;;;AAIf,CAAC;AACD,SAASD,OAAO,EAAEC,KAAK,GAAE"}

package/dist/predefinedMigrations/versions-v1-v2.d.ts

@@ -0,0 +1,4 @@
+declare const imports = "import { migrateVersionsV1_V2 } from '@payloadcms/db-mongodb/migration-utils'";
+declare const upSQL = "   await migrateVersionsV1_V2({\n        req,\n        })\n";
+export { imports, upSQL };
+//# sourceMappingURL=versions-v1-v2.d.ts.map

package/dist/predefinedMigrations/versions-v1-v2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"versions-v1-v2.d.ts","sourceRoot":"","sources":["../../src/predefinedMigrations/versions-v1-v2.ts"],"names":[],"mappings":"AAAA,QAAA,MAAM,OAAO,kFAAkF,CAAA;AAC/F,QAAA,MAAM,KAAK,gEAGV,CAAA;AACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA"}

package/dist/predefinedMigrations/versions-v1-v2.js

@@ -1,98 +1,8 @@
-module.exports.up = `  async function migrateCollectionDocs(slug: string, docsAtATime = 100) {
-    const VersionsModel = payload.db.versions[slug]
-    const remainingDocs = await VersionsModel.aggregate(
-      [
-        // Sort so that newest are first
-        {
-          $sort: {
-            updatedAt: -1,
-          },
-        },
-        // Group by parent ID
-        // take the $first of each
-        {
-          $group: {
-            _id: '$parent',
-            _versionID: { $first: '$_id' },
-            createdAt: { $first: '$createdAt' },
-            latest: { $first: '$latest' },
-            updatedAt: { $first: '$updatedAt' },
-            version: { $first: '$version' },
-          },
-        },
-        {
-          $match: {
-            latest: { $eq: null },
-          },
-        },
-        {
-          $limit: docsAtATime,
-        },
-      ],
-      {
-        allowDiskUse: true,
-      },
-    ).exec()
-
-    if (!remainingDocs || remainingDocs.length === 0) {
-      const newVersions = await VersionsModel.find({
-        latest: {
-          $eq: true,
-        },
-      })
-
-      if (newVersions?.length) {
-        payload.logger.info(
-          \`Migrated \${newVersions.length} documents in the "\${slug}" versions collection.\`,
-        )
-      }
-
-      return
-    }
-
-    const remainingDocIds = remainingDocs.map((doc) => doc._versionID)
-
-    await VersionsModel.updateMany(
-      {
-        _id: {
-          $in: remainingDocIds,
-        },
-      },
-      {
-        latest: true,
-      },
-    )
-
-    await migrateCollectionDocs(slug)
-  }
-
-  // For each collection
-  await Promise.all(
-    payload.config.collections.map(async ({ slug, versions }) => {
-      if (versions?.drafts) {
-        return migrateCollectionDocs(slug)
-      }
-    }),
-  )
-
-  // For each global
-  await Promise.all(
-    payload.config.globals.map(async ({ slug, versions }) => {
-      if (versions) {
-        const VersionsModel = payload.db.versions[slug]
-
-        await VersionsModel.findOneAndUpdate(
-          {},
-          { latest: true },
-          {
-            sort: { updatedAt: -1 },
-          },
-        ).exec()
-
-        payload.logger.info(\`Migrated the "\${slug}" global.\`)
-      }
-    }),
-  )
+const imports = `import { migrateVersionsV1_V2 } from '@payloadcms/db-mongodb/migration-utils'`;
+const upSQL = `   await migrateVersionsV1_V2({
+        req,
+        })
 `;
+export { imports, upSQL };
 
 //# sourceMappingURL=versions-v1-v2.js.map

package/dist/predefinedMigrations/versions-v1-v2.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/predefinedMigrations/versions-v1-v2.js"],"sourcesContent":["module.exports.up = `  async function migrateCollectionDocs(slug: string, docsAtATime = 100) {\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      },\n    ).exec()\n\n    if (!remainingDocs || remainingDocs.length === 0) {\n      const newVersions = await VersionsModel.find({\n        latest: {\n          $eq: true,\n        },\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\n    await migrateCollectionDocs(slug)\n  }\n\n  // For each collection\n  await Promise.all(\n    payload.config.collections.map(async ({ slug, versions }) => {\n      if (versions?.drafts) {\n        return migrateCollectionDocs(slug)\n      }\n    }),\n  )\n\n  // For each global\n  await Promise.all(\n    payload.config.globals.map(async ({ slug, versions }) => {\n      if (versions) {\n        const VersionsModel = payload.db.versions[slug]\n\n        await VersionsModel.findOneAndUpdate(\n          {},\n          { latest: true },\n          {\n            sort: { updatedAt: -1 },\n          },\n        ).exec()\n\n        payload.logger.info(\\`Migrated the \"\\${slug}\" global.\\`)\n      }\n    }),\n  )\n`\n"],"names":["module","exports","up"],"mappings":"AAAAA,OAAOC,OAAO,CAACC,EAAE,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA+FrB,CAAC"}
+{"version":3,"sources":["../../src/predefinedMigrations/versions-v1-v2.ts"],"sourcesContent":["const imports = `import { migrateVersionsV1_V2 } from '@payloadcms/db-mongodb/migration-utils'`\nconst upSQL = `   await migrateVersionsV1_V2({\n        req,\n        })\n`\nexport { imports, upSQL }\n"],"names":["imports","upSQL"],"mappings":"AAAA,MAAMA,UAAU,CAAC,6EAA6E,CAAC;AAC/F,MAAMC,QAAQ,CAAC;;;AAGf,CAAC;AACD,SAASD,OAAO,EAAEC,KAAK,GAAE"}

package/dist/queries/buildQuery.d.ts

@@ -9,6 +9,6 @@ export type BuildQueryArgs = {
     payload: Payload;
     where: Where;
 };
-declare const getBuildQueryPlugin: ({ collectionSlug, versionsFields }?: GetBuildQueryPluginArgs) => (schema: any) => void;
-export default getBuildQueryPlugin;
+export declare const getBuildQueryPlugin: ({ collectionSlug, versionsFields, }?: GetBuildQueryPluginArgs) => (schema: any) => void;
+export {};
 //# sourceMappingURL=buildQuery.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAMpD,KAAK,uBAAuB,GAAG;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,KAAK,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAID,QAAA,MAAM,mBAAmB,wCAAwC,uBAAuB,0BAsCvF,CAAA;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"buildQuery.d.ts","sourceRoot":"","sources":["../../src/queries/buildQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAA;AAMpD,KAAK,uBAAuB,GAAG;IAC7B,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,cAAc,CAAC,EAAE,KAAK,EAAE,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,KAAK,CAAA;CACb,CAAA;AAID,eAAO,MAAM,mBAAmB,yCAG7B,uBAAuB,0BAsCzB,CAAA"}

package/dist/queries/buildQuery.js

@@ -2,7 +2,7 @@ import { QueryError } from 'payload';
 import { parseParams } from './parseParams.js';
 // This plugin asynchronously builds a list of Mongoose query constraints
 // which can then be used in subsequent Mongoose queries.
-const getBuildQueryPlugin = ({ collectionSlug, versionsFields } = {})=>{
+export const getBuildQueryPlugin = ({ collectionSlug, versionsFields } = {})=>{
     return function buildQueryPlugin(schema) {
         const modifiedSchema = schema;
         async function buildQuery({ globalSlug, locale, payload, where }) {
@@ -34,6 +34,5 @@ const getBuildQueryPlugin = ({ collectionSlug, versionsFields } = {})=>{
         modifiedSchema.statics.buildQuery = buildQuery;
     };
 };
-export default getBuildQueryPlugin;
 
 //# sourceMappingURL=buildQuery.js.map

package/dist/queries/buildQuery.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { Field, Payload, Where } from 'payload'\n\nimport { QueryError } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\ntype GetBuildQueryPluginArgs = {\n  collectionSlug?: string\n  versionsFields?: Field[]\n}\n\nexport type BuildQueryArgs = {\n  globalSlug?: string\n  locale?: string\n  payload: Payload\n  where: Where\n}\n\n// This plugin asynchronously builds a list of Mongoose query constraints\n// which can then be used in subsequent Mongoose queries.\nconst getBuildQueryPlugin = ({ collectionSlug, versionsFields }: GetBuildQueryPluginArgs = {}) => {\n  return function buildQueryPlugin(schema) {\n    const modifiedSchema = schema\n    async function buildQuery({\n      globalSlug,\n      locale,\n      payload,\n      where,\n    }: BuildQueryArgs): Promise<Record<string, unknown>> {\n      let fields = versionsFields\n      if (!fields) {\n        if (globalSlug) {\n          const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n          fields = globalConfig.fields\n        }\n        if (collectionSlug) {\n          const collectionConfig = payload.collections[collectionSlug].config\n          fields = collectionConfig.fields\n        }\n      }\n      const errors = []\n      const result = await parseParams({\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        payload,\n        where,\n      })\n\n      if (errors.length > 0) {\n        throw new QueryError(errors)\n      }\n\n      return result\n    }\n    modifiedSchema.statics.buildQuery = buildQuery\n  }\n}\n\nexport default getBuildQueryPlugin\n"],"names":["QueryError","parseParams","getBuildQueryPlugin","collectionSlug","versionsFields","buildQueryPlugin","schema","modifiedSchema","buildQuery","globalSlug","locale","payload","where","fields","globalConfig","globals","config","find","slug","collectionConfig","collections","errors","result","length","statics"],"mappings":"AAEA,SAASA,UAAU,QAAQ,UAAS;AAEpC,SAASC,WAAW,QAAQ,mBAAkB;AAc9C,yEAAyE;AACzE,yDAAyD;AACzD,MAAMC,sBAAsB,CAAC,EAAEC,cAAc,EAAEC,cAAc,EAA2B,GAAG,CAAC,CAAC;IAC3F,OAAO,SAASC,iBAAiBC,MAAM;QACrC,MAAMC,iBAAiBD;QACvB,eAAeE,WAAW,EACxBC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,KAAK,EACU;YACf,IAAIC,SAAST;YACb,IAAI,CAACS,QAAQ;gBACX,IAAIJ,YAAY;oBACd,MAAMK,eAAeH,QAAQI,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAAST;oBACxEI,SAASC,aAAaD,MAAM;gBAC9B;gBACA,IAAIV,gBAAgB;oBAClB,MAAMgB,mBAAmBR,QAAQS,WAAW,CAACjB,eAAe,CAACa,MAAM;oBACnEH,SAASM,iBAAiBN,MAAM;gBAClC;YACF;YACA,MAAMQ,SAAS,EAAE;YACjB,MAAMC,SAAS,MAAMrB,YAAY;gBAC/BE;gBACAU;gBACAJ;gBACAC;gBACAC;gBACAC;YACF;YAEA,IAAIS,OAAOE,MAAM,GAAG,GAAG;gBACrB,MAAM,IAAIvB,WAAWqB;YACvB;YAEA,OAAOC;QACT;QACAf,eAAeiB,OAAO,CAAChB,UAAU,GAAGA;IACtC;AACF;AAEA,eAAeN,oBAAmB"}
+{"version":3,"sources":["../../src/queries/buildQuery.ts"],"sourcesContent":["import type { Field, Payload, Where } from 'payload'\n\nimport { QueryError } from 'payload'\n\nimport { parseParams } from './parseParams.js'\n\ntype GetBuildQueryPluginArgs = {\n  collectionSlug?: string\n  versionsFields?: Field[]\n}\n\nexport type BuildQueryArgs = {\n  globalSlug?: string\n  locale?: string\n  payload: Payload\n  where: Where\n}\n\n// This plugin asynchronously builds a list of Mongoose query constraints\n// which can then be used in subsequent Mongoose queries.\nexport const getBuildQueryPlugin = ({\n  collectionSlug,\n  versionsFields,\n}: GetBuildQueryPluginArgs = {}) => {\n  return function buildQueryPlugin(schema) {\n    const modifiedSchema = schema\n    async function buildQuery({\n      globalSlug,\n      locale,\n      payload,\n      where,\n    }: BuildQueryArgs): Promise<Record<string, unknown>> {\n      let fields = versionsFields\n      if (!fields) {\n        if (globalSlug) {\n          const globalConfig = payload.globals.config.find(({ slug }) => slug === globalSlug)\n          fields = globalConfig.fields\n        }\n        if (collectionSlug) {\n          const collectionConfig = payload.collections[collectionSlug].config\n          fields = collectionConfig.fields\n        }\n      }\n      const errors = []\n      const result = await parseParams({\n        collectionSlug,\n        fields,\n        globalSlug,\n        locale,\n        payload,\n        where,\n      })\n\n      if (errors.length > 0) {\n        throw new QueryError(errors)\n      }\n\n      return result\n    }\n    modifiedSchema.statics.buildQuery = buildQuery\n  }\n}\n"],"names":["QueryError","parseParams","getBuildQueryPlugin","collectionSlug","versionsFields","buildQueryPlugin","schema","modifiedSchema","buildQuery","globalSlug","locale","payload","where","fields","globalConfig","globals","config","find","slug","collectionConfig","collections","errors","result","length","statics"],"mappings":"AAEA,SAASA,UAAU,QAAQ,UAAS;AAEpC,SAASC,WAAW,QAAQ,mBAAkB;AAc9C,yEAAyE;AACzE,yDAAyD;AACzD,OAAO,MAAMC,sBAAsB,CAAC,EAClCC,cAAc,EACdC,cAAc,EACU,GAAG,CAAC,CAAC;IAC7B,OAAO,SAASC,iBAAiBC,MAAM;QACrC,MAAMC,iBAAiBD;QACvB,eAAeE,WAAW,EACxBC,UAAU,EACVC,MAAM,EACNC,OAAO,EACPC,KAAK,EACU;YACf,IAAIC,SAAST;YACb,IAAI,CAACS,QAAQ;gBACX,IAAIJ,YAAY;oBACd,MAAMK,eAAeH,QAAQI,OAAO,CAACC,MAAM,CAACC,IAAI,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKA,SAAST;oBACxEI,SAASC,aAAaD,MAAM;gBAC9B;gBACA,IAAIV,gBAAgB;oBAClB,MAAMgB,mBAAmBR,QAAQS,WAAW,CAACjB,eAAe,CAACa,MAAM;oBACnEH,SAASM,iBAAiBN,MAAM;gBAClC;YACF;YACA,MAAMQ,SAAS,EAAE;YACjB,MAAMC,SAAS,MAAMrB,YAAY;gBAC/BE;gBACAU;gBACAJ;gBACAC;gBACAC;gBACAC;YACF;YAEA,IAAIS,OAAOE,MAAM,GAAG,GAAG;gBACrB,MAAM,IAAIvB,WAAWqB;YACvB;YAEA,OAAOC;QACT;QACAf,eAAeiB,OAAO,CAAChB,UAAU,GAAGA;IACtC;AACF,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"buildSearchParams.d.ts","sourceRoot":"","sources":["../../src/queries/buildSearchParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAyB,OAAO,EAAE,MAAM,SAAS,CAAA;AAepE,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAOD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,cAAc,EACd,MAAM,EACN,UAAU,EACV,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,GACJ,EAAE;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb,GAAG,OAAO,CAAC,WAAW,CAAC,CAuNvB"}
+{"version":3,"file":"buildSearchParams.d.ts","sourceRoot":"","sources":["../../src/queries/buildSearchParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAyB,OAAO,EAAE,MAAM,SAAS,CAAA;AAWpE,KAAK,WAAW,GAAG;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB,CAAA;AAOD;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACrC,cAAc,EACd,MAAM,EACN,UAAU,EACV,YAAY,EACZ,MAAM,EACN,QAAQ,EACR,OAAO,EACP,GAAG,GACJ,EAAE;IACD,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,EAAE,KAAK,EAAE,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;IAChB,GAAG,EAAE,OAAO,CAAA;CACb,GAAG,OAAO,CAAC,WAAW,CAAC,CAgOvB"}

package/dist/queries/buildSearchParams.js

@@ -1,10 +1,8 @@
-import ObjectIdImport from 'bson-objectid';
-import mongoose from 'mongoose';
+import { Types } from 'mongoose';
 import { getLocalizedPaths } from 'payload';
 import { validOperators } from 'payload/shared';
 import { operatorMap } from './operatorMap.js';
 import { sanitizeQueryValue } from './sanitizeQueryValue.js';
-const ObjectId = ObjectIdImport.default || ObjectIdImport;
 const subQueryOptions = {
     lean: true,
     limit: 50
@@ -14,7 +12,9 @@ const subQueryOptions = {
  */ export async function buildSearchParam({ collectionSlug, fields, globalSlug, incomingPath, locale, operator, payload, val }) {
     // Replace GraphQL nested field double underscore formatting
     let sanitizedPath = incomingPath.replace(/__/g, '.');
-    if (sanitizedPath === 'id') sanitizedPath = '_id';
+    if (sanitizedPath === 'id') {
+        sanitizedPath = '_id';
+    }
     let paths = [];
     let hasCustomID = false;
     if (sanitizedPath === '_id') {
@@ -45,16 +45,23 @@ const subQueryOptions = {
     }
     const [{ field, path }] = paths;
     if (path) {
-        const { operator: formattedOperator, rawQuery, val: formattedValue } = sanitizeQueryValue({
+        const sanitizedQueryValue = sanitizeQueryValue({
             field,
             hasCustomID,
             operator,
             path,
+            payload,
             val
         });
-        if (rawQuery) return {
-            value: rawQuery
-        };
+        if (!sanitizedQueryValue) {
+            return undefined;
+        }
+        const { operator: formattedOperator, rawQuery, val: formattedValue } = sanitizedQueryValue;
+        if (rawQuery) {
+            return {
+                value: rawQuery
+            };
+        }
         // If there are multiple collections to search through,
         // Recursively build up a list of query constraints
         if (paths.length > 1) {
@@ -84,7 +91,7 @@ const subQueryOptions = {
                     result.forEach((doc)=>{
                         const stringID = doc._id.toString();
                         $in.push(stringID);
-                        if (mongoose.Types.ObjectId.isValid(stringID)) {
+                        if (Types.ObjectId.isValid(stringID)) {
                             $in.push(doc._id);
                         }
                     });
@@ -107,7 +114,7 @@ const subQueryOptions = {
                 }
                 const subQuery = priorQueryResult.value;
                 const result = await SubModel.find(subQuery, subQueryOptions);
-                const $in = result.map((doc)=>doc._id.toString());
+                const $in = result.map((doc)=>doc._id);
                 // If it is the last recursion
                 // then pass through the search param
                 if (i + 1 === pathsToQuery.length) {
@@ -133,7 +140,9 @@ const subQueryOptions = {
             if (field.type === 'relationship' || field.type === 'upload') {
                 let hasNumberIDRelation;
                 let multiIDCondition = '$or';
-                if (operatorKey === '$ne') multiIDCondition = '$and';
+                if (operatorKey === '$ne') {
+                    multiIDCondition = '$and';
+                }
                 const result = {
                     value: {
                         [multiIDCondition]: [
@@ -146,10 +155,10 @@ const subQueryOptions = {
                     }
                 };
                 if (typeof formattedValue === 'string') {
-                    if (mongoose.Types.ObjectId.isValid(formattedValue)) {
+                    if (Types.ObjectId.isValid(formattedValue)) {
                         result.value[multiIDCondition].push({
                             [path]: {
-                                [operatorKey]: ObjectId(formattedValue)
+                                [operatorKey]: new Types.ObjectId(formattedValue)
                             }
                         });
                     } else {
@@ -161,11 +170,13 @@ const subQueryOptions = {
                                 hasNumberIDRelation = true;
                             }
                         });
-                        if (hasNumberIDRelation) result.value[multiIDCondition].push({
-                            [path]: {
-                                [operatorKey]: parseFloat(formattedValue)
-                            }
-                        });
+                        if (hasNumberIDRelation) {
+                            result.value[multiIDCondition].push({
+                                [path]: {
+                                    [operatorKey]: parseFloat(formattedValue)
+                                }
+                            });
+                        }
                     }
                 }
                 if (result.value[multiIDCondition].length > 1) {