@payloadcms/db-mongodb 3.0.0-canary.a78fca3 → 3.0.0-canary.ab70b75

package/dist/init.js

@@ -1,10 +1,11 @@
-/* eslint-disable no-param-reassign */ import mongoose from 'mongoose';
+import mongoose from 'mongoose';
+import mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2';
 import paginate from 'mongoose-paginate-v2';
 import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload';
-import buildCollectionSchema from './models/buildCollectionSchema.js';
+import { buildCollectionSchema } from './models/buildCollectionSchema.js';
 import { buildGlobalModel } from './models/buildGlobalModel.js';
-import buildSchema from './models/buildSchema.js';
-import getBuildQueryPlugin from './queries/buildQuery.js';
+import { buildSchema } from './models/buildSchema.js';
+import { getBuildQueryPlugin } from './queries/buildQuery.js';
 import { getDBName } from './utilities/getDBName.js';
 export const init = function init() {
     this.payload.config.collections.forEach((collection)=>{
@@ -14,7 +15,7 @@ export const init = function init() {
                 config: collection,
                 versions: true
             });
-            const versionCollectionFields = buildVersionCollectionFields(collection);
+            const versionCollectionFields = buildVersionCollectionFields(this.payload.config, collection);
             const versionSchema = buildSchema(this.payload.config, versionCollectionFields, {
                 disableUnique: true,
                 draftsEnabled: true,
@@ -30,8 +31,10 @@ export const init = function init() {
                 collectionSlug: collection.slug,
                 versionsFields: versionCollectionFields
             }));
+            if (Object.keys(collection.joins).length > 0) {
+                versionSchema.plugin(mongooseAggregatePaginate);
+            }
             const model = mongoose.model(versionModelName, versionSchema, this.autoPluralization === true ? undefined : versionModelName);
-            // this.payload.versions[collection.slug] = model;
             this.versions[collection.slug] = model;
         }
         const model = mongoose.model(getDBName({
@@ -47,7 +50,7 @@ export const init = function init() {
                 config: global,
                 versions: true
             });
-            const versionGlobalFields = buildVersionGlobalFields(global);
+            const versionGlobalFields = buildVersionGlobalFields(this.payload.config, global);
             const versionSchema = buildSchema(this.payload.config, versionGlobalFields, {
                 disableUnique: true,
                 draftsEnabled: true,

package/dist/init.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/init.ts"],"sourcesContent":["/* eslint-disable no-param-reassign */\nimport type { PaginateOptions } from 'mongoose'\nimport type { Init, SanitizedCollectionConfig } from 'payload'\n\nimport mongoose from 'mongoose'\nimport paginate from 'mongoose-paginate-v2'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\nimport type { CollectionModel } from './types.js'\n\nimport buildCollectionSchema from './models/buildCollectionSchema.js'\nimport { buildGlobalModel } from './models/buildGlobalModel.js'\nimport buildSchema from './models/buildSchema.js'\nimport getBuildQueryPlugin from './queries/buildQuery.js'\nimport { getDBName } from './utilities/getDBName.js'\n\nexport const init: Init = function init(this: MongooseAdapter) {\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    const schema = buildCollectionSchema(collection, this.payload.config)\n\n    if (collection.versions) {\n      const versionModelName = getDBName({ config: collection, versions: true })\n\n      const versionCollectionFields = buildVersionCollectionFields(collection)\n\n      const versionSchema = buildSchema(this.payload.config, versionCollectionFields, {\n        disableUnique: true,\n        draftsEnabled: true,\n        indexSortableFields: this.payload.config.indexSortableFields,\n        options: {\n          minimize: false,\n          timestamps: false,\n        },\n      })\n\n      versionSchema.plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true }).plugin(\n        getBuildQueryPlugin({\n          collectionSlug: collection.slug,\n          versionsFields: versionCollectionFields,\n        }),\n      )\n\n      const model = mongoose.model(\n        versionModelName,\n        versionSchema,\n        this.autoPluralization === true ? undefined : versionModelName,\n      ) as CollectionModel\n      // this.payload.versions[collection.slug] = model;\n      this.versions[collection.slug] = model\n    }\n\n    const model = mongoose.model(\n      getDBName({ config: collection }),\n      schema,\n      this.autoPluralization === true ? undefined : collection.slug,\n    ) as CollectionModel\n    this.collections[collection.slug] = model\n  })\n\n  const model = buildGlobalModel(this.payload.config)\n  this.globals = model\n\n  this.payload.config.globals.forEach((global) => {\n    if (global.versions) {\n      const versionModelName = getDBName({ config: global, versions: true })\n\n      const versionGlobalFields = buildVersionGlobalFields(global)\n\n      const versionSchema = buildSchema(this.payload.config, versionGlobalFields, {\n        disableUnique: true,\n        draftsEnabled: true,\n        indexSortableFields: this.payload.config.indexSortableFields,\n        options: {\n          minimize: false,\n          timestamps: false,\n        },\n      })\n\n      versionSchema\n        .plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true })\n        .plugin(getBuildQueryPlugin({ versionsFields: versionGlobalFields }))\n\n      const versionsModel = mongoose.model(\n        versionModelName,\n        versionSchema,\n        versionModelName,\n      ) as CollectionModel\n      this.versions[global.slug] = versionsModel\n    }\n  })\n}\n"],"names":["mongoose","paginate","buildVersionCollectionFields","buildVersionGlobalFields","buildCollectionSchema","buildGlobalModel","buildSchema","getBuildQueryPlugin","getDBName","init","payload","config","collections","forEach","collection","schema","versions","versionModelName","versionCollectionFields","versionSchema","disableUnique","draftsEnabled","indexSortableFields","options","minimize","timestamps","plugin","useEstimatedCount","collectionSlug","slug","versionsFields","model","autoPluralization","undefined","globals","global","versionGlobalFields","versionsModel"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,oCAAoC,GAIpC,OAAOA,cAAc,WAAU;AAC/B,OAAOC,cAAc,uBAAsB;AAC3C,SAASC,4BAA4B,EAAEC,wBAAwB,QAAQ,UAAS;AAKhF,OAAOC,2BAA2B,oCAAmC;AACrE,SAASC,gBAAgB,QAAQ,+BAA8B;AAC/D,OAAOC,iBAAiB,0BAAyB;AACjD,OAAOC,yBAAyB,0BAAyB;AACzD,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,OAAa,SAASA;IACjC,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,WAAW,CAACC,OAAO,CAAC,CAACC;QACvC,MAAMC,SAASX,sBAAsBU,YAAY,IAAI,CAACJ,OAAO,CAACC,MAAM;QAEpE,IAAIG,WAAWE,QAAQ,EAAE;YACvB,MAAMC,mBAAmBT,UAAU;gBAAEG,QAAQG;gBAAYE,UAAU;YAAK;YAExE,MAAME,0BAA0BhB,6BAA6BY;YAE7D,MAAMK,gBAAgBb,YAAY,IAAI,CAACI,OAAO,CAACC,MAAM,EAAEO,yBAAyB;gBAC9EE,eAAe;gBACfC,eAAe;gBACfC,qBAAqB,IAAI,CAACZ,OAAO,CAACC,MAAM,CAACW,mBAAmB;gBAC5DC,SAAS;oBACPC,UAAU;oBACVC,YAAY;gBACd;YACF;YAEAN,cAAcO,MAAM,CAAuBzB,UAAU;gBAAE0B,mBAAmB;YAAK,GAAGD,MAAM,CACtFnB,oBAAoB;gBAClBqB,gBAAgBd,WAAWe,IAAI;gBAC/BC,gBAAgBZ;YAClB;YAGF,MAAMa,QAAQ/B,SAAS+B,KAAK,CAC1Bd,kBACAE,eACA,IAAI,CAACa,iBAAiB,KAAK,OAAOC,YAAYhB;YAEhD,kDAAkD;YAClD,IAAI,CAACD,QAAQ,CAACF,WAAWe,IAAI,CAAC,GAAGE;QACnC;QAEA,MAAMA,QAAQ/B,SAAS+B,KAAK,CAC1BvB,UAAU;YAAEG,QAAQG;QAAW,IAC/BC,QACA,IAAI,CAACiB,iBAAiB,KAAK,OAAOC,YAAYnB,WAAWe,IAAI;QAE/D,IAAI,CAACjB,WAAW,CAACE,WAAWe,IAAI,CAAC,GAAGE;IACtC;IAEA,MAAMA,QAAQ1B,iBAAiB,IAAI,CAACK,OAAO,CAACC,MAAM;IAClD,IAAI,CAACuB,OAAO,GAAGH;IAEf,IAAI,CAACrB,OAAO,CAACC,MAAM,CAACuB,OAAO,CAACrB,OAAO,CAAC,CAACsB;QACnC,IAAIA,OAAOnB,QAAQ,EAAE;YACnB,MAAMC,mBAAmBT,UAAU;gBAAEG,QAAQwB;gBAAQnB,UAAU;YAAK;YAEpE,MAAMoB,sBAAsBjC,yBAAyBgC;YAErD,MAAMhB,gBAAgBb,YAAY,IAAI,CAACI,OAAO,CAACC,MAAM,EAAEyB,qBAAqB;gBAC1EhB,eAAe;gBACfC,eAAe;gBACfC,qBAAqB,IAAI,CAACZ,OAAO,CAACC,MAAM,CAACW,mBAAmB;gBAC5DC,SAAS;oBACPC,UAAU;oBACVC,YAAY;gBACd;YACF;YAEAN,cACGO,MAAM,CAAuBzB,UAAU;gBAAE0B,mBAAmB;YAAK,GACjED,MAAM,CAACnB,oBAAoB;gBAAEuB,gBAAgBM;YAAoB;YAEpE,MAAMC,gBAAgBrC,SAAS+B,KAAK,CAClCd,kBACAE,eACAF;YAEF,IAAI,CAACD,QAAQ,CAACmB,OAAON,IAAI,CAAC,GAAGQ;QAC/B;IACF;AACF,EAAC"}
+{"version":3,"sources":["../src/init.ts"],"sourcesContent":["import type { PaginateOptions } from 'mongoose'\nimport type { Init, SanitizedCollectionConfig } from 'payload'\n\nimport mongoose from 'mongoose'\nimport mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2'\nimport paginate from 'mongoose-paginate-v2'\nimport { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\nimport type { CollectionModel } from './types.js'\n\nimport { buildCollectionSchema } from './models/buildCollectionSchema.js'\nimport { buildGlobalModel } from './models/buildGlobalModel.js'\nimport { buildSchema } from './models/buildSchema.js'\nimport { getBuildQueryPlugin } from './queries/buildQuery.js'\nimport { getDBName } from './utilities/getDBName.js'\n\nexport const init: Init = function init(this: MongooseAdapter) {\n  this.payload.config.collections.forEach((collection: SanitizedCollectionConfig) => {\n    const schema = buildCollectionSchema(collection, this.payload.config)\n\n    if (collection.versions) {\n      const versionModelName = getDBName({ config: collection, versions: true })\n\n      const versionCollectionFields = buildVersionCollectionFields(this.payload.config, collection)\n\n      const versionSchema = buildSchema(this.payload.config, versionCollectionFields, {\n        disableUnique: true,\n        draftsEnabled: true,\n        indexSortableFields: this.payload.config.indexSortableFields,\n        options: {\n          minimize: false,\n          timestamps: false,\n        },\n      })\n\n      versionSchema.plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true }).plugin(\n        getBuildQueryPlugin({\n          collectionSlug: collection.slug,\n          versionsFields: versionCollectionFields,\n        }),\n      )\n\n      if (Object.keys(collection.joins).length > 0) {\n        versionSchema.plugin(mongooseAggregatePaginate)\n      }\n\n      const model = mongoose.model(\n        versionModelName,\n        versionSchema,\n        this.autoPluralization === true ? undefined : versionModelName,\n      ) as CollectionModel\n\n      this.versions[collection.slug] = model\n    }\n\n    const model = mongoose.model(\n      getDBName({ config: collection }),\n      schema,\n      this.autoPluralization === true ? undefined : collection.slug,\n    ) as CollectionModel\n    this.collections[collection.slug] = model\n  })\n\n  const model = buildGlobalModel(this.payload.config)\n  this.globals = model\n\n  this.payload.config.globals.forEach((global) => {\n    if (global.versions) {\n      const versionModelName = getDBName({ config: global, versions: true })\n\n      const versionGlobalFields = buildVersionGlobalFields(this.payload.config, global)\n\n      const versionSchema = buildSchema(this.payload.config, versionGlobalFields, {\n        disableUnique: true,\n        draftsEnabled: true,\n        indexSortableFields: this.payload.config.indexSortableFields,\n        options: {\n          minimize: false,\n          timestamps: false,\n        },\n      })\n\n      versionSchema\n        .plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true })\n        .plugin(getBuildQueryPlugin({ versionsFields: versionGlobalFields }))\n\n      const versionsModel = mongoose.model(\n        versionModelName,\n        versionSchema,\n        versionModelName,\n      ) as CollectionModel\n      this.versions[global.slug] = versionsModel\n    }\n  })\n}\n"],"names":["mongoose","mongooseAggregatePaginate","paginate","buildVersionCollectionFields","buildVersionGlobalFields","buildCollectionSchema","buildGlobalModel","buildSchema","getBuildQueryPlugin","getDBName","init","payload","config","collections","forEach","collection","schema","versions","versionModelName","versionCollectionFields","versionSchema","disableUnique","draftsEnabled","indexSortableFields","options","minimize","timestamps","plugin","useEstimatedCount","collectionSlug","slug","versionsFields","Object","keys","joins","length","model","autoPluralization","undefined","globals","global","versionGlobalFields","versionsModel"],"mappings":"AAGA,OAAOA,cAAc,WAAU;AAC/B,OAAOC,+BAA+B,iCAAgC;AACtE,OAAOC,cAAc,uBAAsB;AAC3C,SAASC,4BAA4B,EAAEC,wBAAwB,QAAQ,UAAS;AAKhF,SAASC,qBAAqB,QAAQ,oCAAmC;AACzE,SAASC,gBAAgB,QAAQ,+BAA8B;AAC/D,SAASC,WAAW,QAAQ,0BAAyB;AACrD,SAASC,mBAAmB,QAAQ,0BAAyB;AAC7D,SAASC,SAAS,QAAQ,2BAA0B;AAEpD,OAAO,MAAMC,OAAa,SAASA;IACjC,IAAI,CAACC,OAAO,CAACC,MAAM,CAACC,WAAW,CAACC,OAAO,CAAC,CAACC;QACvC,MAAMC,SAASX,sBAAsBU,YAAY,IAAI,CAACJ,OAAO,CAACC,MAAM;QAEpE,IAAIG,WAAWE,QAAQ,EAAE;YACvB,MAAMC,mBAAmBT,UAAU;gBAAEG,QAAQG;gBAAYE,UAAU;YAAK;YAExE,MAAME,0BAA0BhB,6BAA6B,IAAI,CAACQ,OAAO,CAACC,MAAM,EAAEG;YAElF,MAAMK,gBAAgBb,YAAY,IAAI,CAACI,OAAO,CAACC,MAAM,EAAEO,yBAAyB;gBAC9EE,eAAe;gBACfC,eAAe;gBACfC,qBAAqB,IAAI,CAACZ,OAAO,CAACC,MAAM,CAACW,mBAAmB;gBAC5DC,SAAS;oBACPC,UAAU;oBACVC,YAAY;gBACd;YACF;YAEAN,cAAcO,MAAM,CAAuBzB,UAAU;gBAAE0B,mBAAmB;YAAK,GAAGD,MAAM,CACtFnB,oBAAoB;gBAClBqB,gBAAgBd,WAAWe,IAAI;gBAC/BC,gBAAgBZ;YAClB;YAGF,IAAIa,OAAOC,IAAI,CAAClB,WAAWmB,KAAK,EAAEC,MAAM,GAAG,GAAG;gBAC5Cf,cAAcO,MAAM,CAAC1B;YACvB;YAEA,MAAMmC,QAAQpC,SAASoC,KAAK,CAC1BlB,kBACAE,eACA,IAAI,CAACiB,iBAAiB,KAAK,OAAOC,YAAYpB;YAGhD,IAAI,CAACD,QAAQ,CAACF,WAAWe,IAAI,CAAC,GAAGM;QACnC;QAEA,MAAMA,QAAQpC,SAASoC,KAAK,CAC1B3B,UAAU;YAAEG,QAAQG;QAAW,IAC/BC,QACA,IAAI,CAACqB,iBAAiB,KAAK,OAAOC,YAAYvB,WAAWe,IAAI;QAE/D,IAAI,CAACjB,WAAW,CAACE,WAAWe,IAAI,CAAC,GAAGM;IACtC;IAEA,MAAMA,QAAQ9B,iBAAiB,IAAI,CAACK,OAAO,CAACC,MAAM;IAClD,IAAI,CAAC2B,OAAO,GAAGH;IAEf,IAAI,CAACzB,OAAO,CAACC,MAAM,CAAC2B,OAAO,CAACzB,OAAO,CAAC,CAAC0B;QACnC,IAAIA,OAAOvB,QAAQ,EAAE;YACnB,MAAMC,mBAAmBT,UAAU;gBAAEG,QAAQ4B;gBAAQvB,UAAU;YAAK;YAEpE,MAAMwB,sBAAsBrC,yBAAyB,IAAI,CAACO,OAAO,CAACC,MAAM,EAAE4B;YAE1E,MAAMpB,gBAAgBb,YAAY,IAAI,CAACI,OAAO,CAACC,MAAM,EAAE6B,qBAAqB;gBAC1EpB,eAAe;gBACfC,eAAe;gBACfC,qBAAqB,IAAI,CAACZ,OAAO,CAACC,MAAM,CAACW,mBAAmB;gBAC5DC,SAAS;oBACPC,UAAU;oBACVC,YAAY;gBACd;YACF;YAEAN,cACGO,MAAM,CAAuBzB,UAAU;gBAAE0B,mBAAmB;YAAK,GACjED,MAAM,CAACnB,oBAAoB;gBAAEuB,gBAAgBU;YAAoB;YAEpE,MAAMC,gBAAgB1C,SAASoC,KAAK,CAClClB,kBACAE,eACAF;YAEF,IAAI,CAACD,QAAQ,CAACuB,OAAOV,IAAI,CAAC,GAAGY;QAC/B;IACF;AACF,EAAC"}

package/dist/migrateFresh.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/migrateFresh.ts"],"sourcesContent":["import type { PayloadRequestWithData } from 'payload'\n\nimport { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload'\nimport prompts from 'prompts'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * Drop the current database and run all migrate up functions\n */\nexport async function migrateFresh(\n  this: MongooseAdapter,\n  { forceAcceptWarning = false }: { forceAcceptWarning?: boolean },\n): Promise<void> {\n  const { payload } = this\n\n  if (!forceAcceptWarning) {\n    const { confirm: acceptWarning } = await prompts(\n      {\n        name: 'confirm',\n        type: 'confirm',\n        initial: false,\n        message: `WARNING: This will drop your database and run all migrations. Are you sure you want to proceed?`,\n      },\n      {\n        onCancel: () => {\n          process.exit(0)\n        },\n      },\n    )\n\n    if (!acceptWarning) {\n      process.exit(0)\n    }\n  }\n\n  payload.logger.info({\n    msg: `Dropping database.`,\n  })\n\n  await this.connection.dropDatabase()\n\n  const migrationFiles = await readMigrationFiles({ payload })\n  payload.logger.debug({\n    msg: `Found ${migrationFiles.length} migration files.`,\n  })\n\n  const req = { payload } as PayloadRequestWithData\n\n  // Run all migrate up\n  for (const migration of migrationFiles) {\n    payload.logger.info({ msg: `Migrating: ${migration.name}` })\n    try {\n      const start = Date.now()\n      await initTransaction(req)\n      await migration.up({ payload, req })\n      await payload.create({\n        collection: 'payload-migrations',\n        data: {\n          name: migration.name,\n          batch: 1,\n        },\n        req,\n      })\n\n      await commitTransaction(req)\n\n      payload.logger.info({ msg: `Migrated:  ${migration.name} (${Date.now() - start}ms)` })\n    } catch (err: unknown) {\n      await killTransaction(req)\n      payload.logger.error({\n        err,\n        msg: `Error running migration ${migration.name}. Rolling back.`,\n      })\n      throw err\n    }\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","readMigrationFiles","prompts","migrateFresh","forceAcceptWarning","payload","confirm","acceptWarning","name","type","initial","message","onCancel","process","exit","logger","info","msg","connection","dropDatabase","migrationFiles","debug","length","req","migration","start","Date","now","up","create","collection","data","batch","err","error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,SAASA,iBAAiB,EAAEC,eAAe,EAAEC,eAAe,EAAEC,kBAAkB,QAAQ,UAAS;AACjG,OAAOC,aAAa,UAAS;AAI7B;;CAEC,GACD,OAAO,eAAeC,aAEpB,EAAEC,qBAAqB,KAAK,EAAoC;IAEhE,MAAM,EAAEC,OAAO,EAAE,GAAG,IAAI;IAExB,IAAI,CAACD,oBAAoB;QACvB,MAAM,EAAEE,SAASC,aAAa,EAAE,GAAG,MAAML,QACvC;YACEM,MAAM;YACNC,MAAM;YACNC,SAAS;YACTC,SAAS,CAAC,+FAA+F,CAAC;QAC5G,GACA;YACEC,UAAU;gBACRC,QAAQC,IAAI,CAAC;YACf;QACF;QAGF,IAAI,CAACP,eAAe;YAClBM,QAAQC,IAAI,CAAC;QACf;IACF;IAEAT,QAAQU,MAAM,CAACC,IAAI,CAAC;QAClBC,KAAK,CAAC,kBAAkB,CAAC;IAC3B;IAEA,MAAM,IAAI,CAACC,UAAU,CAACC,YAAY;IAElC,MAAMC,iBAAiB,MAAMnB,mBAAmB;QAAEI;IAAQ;IAC1DA,QAAQU,MAAM,CAACM,KAAK,CAAC;QACnBJ,KAAK,CAAC,MAAM,EAAEG,eAAeE,MAAM,CAAC,iBAAiB,CAAC;IACxD;IAEA,MAAMC,MAAM;QAAElB;IAAQ;IAEtB,qBAAqB;IACrB,KAAK,MAAMmB,aAAaJ,eAAgB;QACtCf,QAAQU,MAAM,CAACC,IAAI,CAAC;YAAEC,KAAK,CAAC,WAAW,EAAEO,UAAUhB,IAAI,CAAC,CAAC;QAAC;QAC1D,IAAI;YACF,MAAMiB,QAAQC,KAAKC,GAAG;YACtB,MAAM5B,gBAAgBwB;YACtB,MAAMC,UAAUI,EAAE,CAAC;gBAAEvB;gBAASkB;YAAI;YAClC,MAAMlB,QAAQwB,MAAM,CAAC;gBACnBC,YAAY;gBACZC,MAAM;oBACJvB,MAAMgB,UAAUhB,IAAI;oBACpBwB,OAAO;gBACT;gBACAT;YACF;YAEA,MAAMzB,kBAAkByB;YAExBlB,QAAQU,MAAM,CAACC,IAAI,CAAC;gBAAEC,KAAK,CAAC,WAAW,EAAEO,UAAUhB,IAAI,CAAC,EAAE,EAAEkB,KAAKC,GAAG,KAAKF,MAAM,GAAG,CAAC;YAAC;QACtF,EAAE,OAAOQ,KAAc;YACrB,MAAMjC,gBAAgBuB;YACtBlB,QAAQU,MAAM,CAACmB,KAAK,CAAC;gBACnBD;gBACAhB,KAAK,CAAC,wBAAwB,EAAEO,UAAUhB,IAAI,CAAC,eAAe,CAAC;YACjE;YACA,MAAMyB;QACR;IACF;AACF"}
+{"version":3,"sources":["../src/migrateFresh.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\n\nimport { commitTransaction, initTransaction, killTransaction, readMigrationFiles } from 'payload'\nimport prompts from 'prompts'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * Drop the current database and run all migrate up functions\n */\nexport async function migrateFresh(\n  this: MongooseAdapter,\n  { forceAcceptWarning = false }: { forceAcceptWarning?: boolean },\n): Promise<void> {\n  const { payload } = this\n\n  if (!forceAcceptWarning) {\n    const { confirm: acceptWarning } = await prompts(\n      {\n        name: 'confirm',\n        type: 'confirm',\n        initial: false,\n        message: `WARNING: This will drop your database and run all migrations. Are you sure you want to proceed?`,\n      },\n      {\n        onCancel: () => {\n          process.exit(0)\n        },\n      },\n    )\n\n    if (!acceptWarning) {\n      process.exit(0)\n    }\n  }\n\n  payload.logger.info({\n    msg: `Dropping database.`,\n  })\n\n  await this.connection.dropDatabase()\n\n  const migrationFiles = await readMigrationFiles({ payload })\n  payload.logger.debug({\n    msg: `Found ${migrationFiles.length} migration files.`,\n  })\n\n  const req = { payload } as PayloadRequest\n\n  // Run all migrate up\n  for (const migration of migrationFiles) {\n    payload.logger.info({ msg: `Migrating: ${migration.name}` })\n    try {\n      const start = Date.now()\n      await initTransaction(req)\n      await migration.up({ payload, req })\n      await payload.create({\n        collection: 'payload-migrations',\n        data: {\n          name: migration.name,\n          batch: 1,\n        },\n        req,\n      })\n\n      await commitTransaction(req)\n\n      payload.logger.info({ msg: `Migrated:  ${migration.name} (${Date.now() - start}ms)` })\n    } catch (err: unknown) {\n      await killTransaction(req)\n      payload.logger.error({\n        err,\n        msg: `Error running migration ${migration.name}. Rolling back.`,\n      })\n      throw err\n    }\n  }\n}\n"],"names":["commitTransaction","initTransaction","killTransaction","readMigrationFiles","prompts","migrateFresh","forceAcceptWarning","payload","confirm","acceptWarning","name","type","initial","message","onCancel","process","exit","logger","info","msg","connection","dropDatabase","migrationFiles","debug","length","req","migration","start","Date","now","up","create","collection","data","batch","err","error"],"mappings":"AAEA,SAASA,iBAAiB,EAAEC,eAAe,EAAEC,eAAe,EAAEC,kBAAkB,QAAQ,UAAS;AACjG,OAAOC,aAAa,UAAS;AAI7B;;CAEC,GACD,OAAO,eAAeC,aAEpB,EAAEC,qBAAqB,KAAK,EAAoC;IAEhE,MAAM,EAAEC,OAAO,EAAE,GAAG,IAAI;IAExB,IAAI,CAACD,oBAAoB;QACvB,MAAM,EAAEE,SAASC,aAAa,EAAE,GAAG,MAAML,QACvC;YACEM,MAAM;YACNC,MAAM;YACNC,SAAS;YACTC,SAAS,CAAC,+FAA+F,CAAC;QAC5G,GACA;YACEC,UAAU;gBACRC,QAAQC,IAAI,CAAC;YACf;QACF;QAGF,IAAI,CAACP,eAAe;YAClBM,QAAQC,IAAI,CAAC;QACf;IACF;IAEAT,QAAQU,MAAM,CAACC,IAAI,CAAC;QAClBC,KAAK,CAAC,kBAAkB,CAAC;IAC3B;IAEA,MAAM,IAAI,CAACC,UAAU,CAACC,YAAY;IAElC,MAAMC,iBAAiB,MAAMnB,mBAAmB;QAAEI;IAAQ;IAC1DA,QAAQU,MAAM,CAACM,KAAK,CAAC;QACnBJ,KAAK,CAAC,MAAM,EAAEG,eAAeE,MAAM,CAAC,iBAAiB,CAAC;IACxD;IAEA,MAAMC,MAAM;QAAElB;IAAQ;IAEtB,qBAAqB;IACrB,KAAK,MAAMmB,aAAaJ,eAAgB;QACtCf,QAAQU,MAAM,CAACC,IAAI,CAAC;YAAEC,KAAK,CAAC,WAAW,EAAEO,UAAUhB,IAAI,CAAC,CAAC;QAAC;QAC1D,IAAI;YACF,MAAMiB,QAAQC,KAAKC,GAAG;YACtB,MAAM5B,gBAAgBwB;YACtB,MAAMC,UAAUI,EAAE,CAAC;gBAAEvB;gBAASkB;YAAI;YAClC,MAAMlB,QAAQwB,MAAM,CAAC;gBACnBC,YAAY;gBACZC,MAAM;oBACJvB,MAAMgB,UAAUhB,IAAI;oBACpBwB,OAAO;gBACT;gBACAT;YACF;YAEA,MAAMzB,kBAAkByB;YAExBlB,QAAQU,MAAM,CAACC,IAAI,CAAC;gBAAEC,KAAK,CAAC,WAAW,EAAEO,UAAUhB,IAAI,CAAC,EAAE,EAAEkB,KAAKC,GAAG,KAAKF,MAAM,GAAG,CAAC;YAAC;QACtF,EAAE,OAAOQ,KAAc;YACrB,MAAMjC,gBAAgBuB;YACtBlB,QAAQU,MAAM,CAACmB,KAAK,CAAC;gBACnBD;gBACAhB,KAAK,CAAC,wBAAwB,EAAEO,UAAUhB,IAAI,CAAC,eAAe,CAAC;YACjE;YACA,MAAMyB;QACR;IACF;AACF"}

package/dist/models/buildCollectionSchema.d.ts

@@ -1,30 +1,4 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose-paginate-v2" />
 import type { Schema } from 'mongoose';
 import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload';
-declare const buildCollectionSchema: (collection: SanitizedCollectionConfig, config: SanitizedConfig, schemaOptions?: {}) => Schema;
-export default buildCollectionSchema;
+export declare const buildCollectionSchema: (collection: SanitizedCollectionConfig, config: SanitizedConfig, schemaOptions?: {}) => Schema;
 //# sourceMappingURL=buildCollectionSchema.d.ts.map

package/dist/models/buildCollectionSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildCollectionSchema.d.ts","sourceRoot":"","sources":["../../src/models/buildCollectionSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAmB,MAAM,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAOzE,QAAA,MAAM,qBAAqB,eACb,yBAAyB,UAC7B,eAAe,yBAEtB,MAqBF,CAAA;AAED,eAAe,qBAAqB,CAAA"}
+{"version":3,"file":"buildCollectionSchema.d.ts","sourceRoot":"","sources":["../../src/models/buildCollectionSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAmB,MAAM,EAAE,MAAM,UAAU,CAAA;AACvD,OAAO,KAAK,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAA;AAQzE,eAAO,MAAM,qBAAqB,eACpB,yBAAyB,UAC7B,eAAe,yBAEtB,MAqCF,CAAA"}

package/dist/models/buildCollectionSchema.js

@@ -1,7 +1,8 @@
+import mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2';
 import paginate from 'mongoose-paginate-v2';
-import getBuildQueryPlugin from '../queries/buildQuery.js';
-import buildSchema from './buildSchema.js';
-const buildCollectionSchema = (collection, config, schemaOptions = {})=>{
+import { getBuildQueryPlugin } from '../queries/buildQuery.js';
+import { buildSchema } from './buildSchema.js';
+export const buildCollectionSchema = (collection, config, schemaOptions = {})=>{
     const schema = buildSchema(config, collection.fields, {
         draftsEnabled: Boolean(typeof collection?.versions === 'object' && collection.versions.drafts),
         indexSortableFields: config.indexSortableFields,
@@ -11,6 +12,15 @@ const buildCollectionSchema = (collection, config, schemaOptions = {})=>{
             ...schemaOptions
         }
     });
+    if (Array.isArray(collection.upload.filenameCompoundIndex)) {
+        const indexDefinition = collection.upload.filenameCompoundIndex.reduce((acc, index)=>{
+            acc[index] = 1;
+            return acc;
+        }, {});
+        schema.index(indexDefinition, {
+            unique: true
+        });
+    }
     if (config.indexSortableFields && collection.timestamps !== false) {
         schema.index({
             updatedAt: 1
@@ -24,8 +34,10 @@ const buildCollectionSchema = (collection, config, schemaOptions = {})=>{
     }).plugin(getBuildQueryPlugin({
         collectionSlug: collection.slug
     }));
+    if (Object.keys(collection.joins).length > 0) {
+        schema.plugin(mongooseAggregatePaginate);
+    }
     return schema;
 };
-export default buildCollectionSchema;
 
 //# sourceMappingURL=buildCollectionSchema.js.map

package/dist/models/buildCollectionSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/buildCollectionSchema.ts"],"sourcesContent":["import type { PaginateOptions, Schema } from 'mongoose'\nimport type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'\n\nimport paginate from 'mongoose-paginate-v2'\n\nimport getBuildQueryPlugin from '../queries/buildQuery.js'\nimport buildSchema from './buildSchema.js'\n\nconst buildCollectionSchema = (\n  collection: SanitizedCollectionConfig,\n  config: SanitizedConfig,\n  schemaOptions = {},\n): Schema => {\n  const schema = buildSchema(config, collection.fields, {\n    draftsEnabled: Boolean(typeof collection?.versions === 'object' && collection.versions.drafts),\n    indexSortableFields: config.indexSortableFields,\n    options: {\n      minimize: false,\n      timestamps: collection.timestamps !== false,\n      ...schemaOptions,\n    },\n  })\n\n  if (config.indexSortableFields && collection.timestamps !== false) {\n    schema.index({ updatedAt: 1 })\n    schema.index({ createdAt: 1 })\n  }\n\n  schema\n    .plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true })\n    .plugin(getBuildQueryPlugin({ collectionSlug: collection.slug }))\n\n  return schema\n}\n\nexport default buildCollectionSchema\n"],"names":["paginate","getBuildQueryPlugin","buildSchema","buildCollectionSchema","collection","config","schemaOptions","schema","fields","draftsEnabled","Boolean","versions","drafts","indexSortableFields","options","minimize","timestamps","index","updatedAt","createdAt","plugin","useEstimatedCount","collectionSlug","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,OAAOA,cAAc,uBAAsB;AAE3C,OAAOC,yBAAyB,2BAA0B;AAC1D,OAAOC,iBAAiB,mBAAkB;AAE1C,MAAMC,wBAAwB,CAC5BC,YACAC,QACAC,gBAAgB,CAAC,CAAC;IAElB,MAAMC,SAASL,YAAYG,QAAQD,WAAWI,MAAM,EAAE;QACpDC,eAAeC,QAAQ,OAAON,YAAYO,aAAa,YAAYP,WAAWO,QAAQ,CAACC,MAAM;QAC7FC,qBAAqBR,OAAOQ,mBAAmB;QAC/CC,SAAS;YACPC,UAAU;YACVC,YAAYZ,WAAWY,UAAU,KAAK;YACtC,GAAGV,aAAa;QAClB;IACF;IAEA,IAAID,OAAOQ,mBAAmB,IAAIT,WAAWY,UAAU,KAAK,OAAO;QACjET,OAAOU,KAAK,CAAC;YAAEC,WAAW;QAAE;QAC5BX,OAAOU,KAAK,CAAC;YAAEE,WAAW;QAAE;IAC9B;IAEAZ,OACGa,MAAM,CAAuBpB,UAAU;QAAEqB,mBAAmB;IAAK,GACjED,MAAM,CAACnB,oBAAoB;QAAEqB,gBAAgBlB,WAAWmB,IAAI;IAAC;IAEhE,OAAOhB;AACT;AAEA,eAAeJ,sBAAqB"}
+{"version":3,"sources":["../../src/models/buildCollectionSchema.ts"],"sourcesContent":["import type { PaginateOptions, Schema } from 'mongoose'\nimport type { SanitizedCollectionConfig, SanitizedConfig } from 'payload'\n\nimport mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2'\nimport paginate from 'mongoose-paginate-v2'\n\nimport { getBuildQueryPlugin } from '../queries/buildQuery.js'\nimport { buildSchema } from './buildSchema.js'\n\nexport const buildCollectionSchema = (\n  collection: SanitizedCollectionConfig,\n  config: SanitizedConfig,\n  schemaOptions = {},\n): Schema => {\n  const schema = buildSchema(config, collection.fields, {\n    draftsEnabled: Boolean(typeof collection?.versions === 'object' && collection.versions.drafts),\n    indexSortableFields: config.indexSortableFields,\n    options: {\n      minimize: false,\n      timestamps: collection.timestamps !== false,\n      ...schemaOptions,\n    },\n  })\n\n  if (Array.isArray(collection.upload.filenameCompoundIndex)) {\n    const indexDefinition: Record<string, 1> = collection.upload.filenameCompoundIndex.reduce(\n      (acc, index) => {\n        acc[index] = 1\n        return acc\n      },\n      {},\n    )\n\n    schema.index(indexDefinition, { unique: true })\n  }\n\n  if (config.indexSortableFields && collection.timestamps !== false) {\n    schema.index({ updatedAt: 1 })\n    schema.index({ createdAt: 1 })\n  }\n\n  schema\n    .plugin<any, PaginateOptions>(paginate, { useEstimatedCount: true })\n    .plugin(getBuildQueryPlugin({ collectionSlug: collection.slug }))\n\n  if (Object.keys(collection.joins).length > 0) {\n    schema.plugin(mongooseAggregatePaginate)\n  }\n\n  return schema\n}\n"],"names":["mongooseAggregatePaginate","paginate","getBuildQueryPlugin","buildSchema","buildCollectionSchema","collection","config","schemaOptions","schema","fields","draftsEnabled","Boolean","versions","drafts","indexSortableFields","options","minimize","timestamps","Array","isArray","upload","filenameCompoundIndex","indexDefinition","reduce","acc","index","unique","updatedAt","createdAt","plugin","useEstimatedCount","collectionSlug","slug","Object","keys","joins","length"],"mappings":"AAGA,OAAOA,+BAA+B,iCAAgC;AACtE,OAAOC,cAAc,uBAAsB;AAE3C,SAASC,mBAAmB,QAAQ,2BAA0B;AAC9D,SAASC,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,wBAAwB,CACnCC,YACAC,QACAC,gBAAgB,CAAC,CAAC;IAElB,MAAMC,SAASL,YAAYG,QAAQD,WAAWI,MAAM,EAAE;QACpDC,eAAeC,QAAQ,OAAON,YAAYO,aAAa,YAAYP,WAAWO,QAAQ,CAACC,MAAM;QAC7FC,qBAAqBR,OAAOQ,mBAAmB;QAC/CC,SAAS;YACPC,UAAU;YACVC,YAAYZ,WAAWY,UAAU,KAAK;YACtC,GAAGV,aAAa;QAClB;IACF;IAEA,IAAIW,MAAMC,OAAO,CAACd,WAAWe,MAAM,CAACC,qBAAqB,GAAG;QAC1D,MAAMC,kBAAqCjB,WAAWe,MAAM,CAACC,qBAAqB,CAACE,MAAM,CACvF,CAACC,KAAKC;YACJD,GAAG,CAACC,MAAM,GAAG;YACb,OAAOD;QACT,GACA,CAAC;QAGHhB,OAAOiB,KAAK,CAACH,iBAAiB;YAAEI,QAAQ;QAAK;IAC/C;IAEA,IAAIpB,OAAOQ,mBAAmB,IAAIT,WAAWY,UAAU,KAAK,OAAO;QACjET,OAAOiB,KAAK,CAAC;YAAEE,WAAW;QAAE;QAC5BnB,OAAOiB,KAAK,CAAC;YAAEG,WAAW;QAAE;IAC9B;IAEApB,OACGqB,MAAM,CAAuB5B,UAAU;QAAE6B,mBAAmB;IAAK,GACjED,MAAM,CAAC3B,oBAAoB;QAAE6B,gBAAgB1B,WAAW2B,IAAI;IAAC;IAEhE,IAAIC,OAAOC,IAAI,CAAC7B,WAAW8B,KAAK,EAAEC,MAAM,GAAG,GAAG;QAC5C5B,OAAOqB,MAAM,CAAC7B;IAChB;IAEA,OAAOQ;AACT,EAAC"}

package/dist/models/buildGlobalModel.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
-import getBuildQueryPlugin from '../queries/buildQuery.js';
-import buildSchema from './buildSchema.js';
+import { getBuildQueryPlugin } from '../queries/buildQuery.js';
+import { buildSchema } from './buildSchema.js';
 export const buildGlobalModel = (config)=>{
     if (config.globals && config.globals.length > 0) {
         const globalsSchema = new mongoose.Schema({}, {

package/dist/models/buildGlobalModel.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/models/buildGlobalModel.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport mongoose from 'mongoose'\n\nimport type { GlobalModel } from '../types.js'\n\nimport getBuildQueryPlugin from '../queries/buildQuery.js'\nimport buildSchema from './buildSchema.js'\n\nexport const buildGlobalModel = (config: SanitizedConfig): GlobalModel | null => {\n  if (config.globals && config.globals.length > 0) {\n    const globalsSchema = new mongoose.Schema(\n      {},\n      { discriminatorKey: 'globalType', minimize: false, timestamps: true },\n    )\n\n    globalsSchema.plugin(getBuildQueryPlugin())\n\n    const Globals = mongoose.model('globals', globalsSchema, 'globals') as unknown as GlobalModel\n\n    Object.values(config.globals).forEach((globalConfig) => {\n      const globalSchema = buildSchema(config, globalConfig.fields, {\n        options: {\n          minimize: false,\n        },\n      })\n      Globals.discriminator(globalConfig.slug, globalSchema)\n    })\n\n    return Globals\n  }\n\n  return null\n}\n"],"names":["mongoose","getBuildQueryPlugin","buildSchema","buildGlobalModel","config","globals","length","globalsSchema","Schema","discriminatorKey","minimize","timestamps","plugin","Globals","model","Object","values","forEach","globalConfig","globalSchema","fields","options","discriminator","slug"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAEA,OAAOA,cAAc,WAAU;AAI/B,OAAOC,yBAAyB,2BAA0B;AAC1D,OAAOC,iBAAiB,mBAAkB;AAE1C,OAAO,MAAMC,mBAAmB,CAACC;IAC/B,IAAIA,OAAOC,OAAO,IAAID,OAAOC,OAAO,CAACC,MAAM,GAAG,GAAG;QAC/C,MAAMC,gBAAgB,IAAIP,SAASQ,MAAM,CACvC,CAAC,GACD;YAAEC,kBAAkB;YAAcC,UAAU;YAAOC,YAAY;QAAK;QAGtEJ,cAAcK,MAAM,CAACX;QAErB,MAAMY,UAAUb,SAASc,KAAK,CAAC,WAAWP,eAAe;QAEzDQ,OAAOC,MAAM,CAACZ,OAAOC,OAAO,EAAEY,OAAO,CAAC,CAACC;YACrC,MAAMC,eAAejB,YAAYE,QAAQc,aAAaE,MAAM,EAAE;gBAC5DC,SAAS;oBACPX,UAAU;gBACZ;YACF;YACAG,QAAQS,aAAa,CAACJ,aAAaK,IAAI,EAAEJ;QAC3C;QAEA,OAAON;IACT;IAEA,OAAO;AACT,EAAC"}
+{"version":3,"sources":["../../src/models/buildGlobalModel.ts"],"sourcesContent":["import type { SanitizedConfig } from 'payload'\n\nimport mongoose from 'mongoose'\n\nimport type { GlobalModel } from '../types.js'\n\nimport { getBuildQueryPlugin } from '../queries/buildQuery.js'\nimport { buildSchema } from './buildSchema.js'\n\nexport const buildGlobalModel = (config: SanitizedConfig): GlobalModel | null => {\n  if (config.globals && config.globals.length > 0) {\n    const globalsSchema = new mongoose.Schema(\n      {},\n      { discriminatorKey: 'globalType', minimize: false, timestamps: true },\n    )\n\n    globalsSchema.plugin(getBuildQueryPlugin())\n\n    const Globals = mongoose.model('globals', globalsSchema, 'globals') as unknown as GlobalModel\n\n    Object.values(config.globals).forEach((globalConfig) => {\n      const globalSchema = buildSchema(config, globalConfig.fields, {\n        options: {\n          minimize: false,\n        },\n      })\n      Globals.discriminator(globalConfig.slug, globalSchema)\n    })\n\n    return Globals\n  }\n\n  return null\n}\n"],"names":["mongoose","getBuildQueryPlugin","buildSchema","buildGlobalModel","config","globals","length","globalsSchema","Schema","discriminatorKey","minimize","timestamps","plugin","Globals","model","Object","values","forEach","globalConfig","globalSchema","fields","options","discriminator","slug"],"mappings":"AAEA,OAAOA,cAAc,WAAU;AAI/B,SAASC,mBAAmB,QAAQ,2BAA0B;AAC9D,SAASC,WAAW,QAAQ,mBAAkB;AAE9C,OAAO,MAAMC,mBAAmB,CAACC;IAC/B,IAAIA,OAAOC,OAAO,IAAID,OAAOC,OAAO,CAACC,MAAM,GAAG,GAAG;QAC/C,MAAMC,gBAAgB,IAAIP,SAASQ,MAAM,CACvC,CAAC,GACD;YAAEC,kBAAkB;YAAcC,UAAU;YAAOC,YAAY;QAAK;QAGtEJ,cAAcK,MAAM,CAACX;QAErB,MAAMY,UAAUb,SAASc,KAAK,CAAC,WAAWP,eAAe;QAEzDQ,OAAOC,MAAM,CAACZ,OAAOC,OAAO,EAAEY,OAAO,CAAC,CAACC;YACrC,MAAMC,eAAejB,YAAYE,QAAQc,aAAaE,MAAM,EAAE;gBAC5DC,SAAS;oBACPX,UAAU;gBACZ;YACF;YACAG,QAAQS,aAAa,CAACJ,aAAaK,IAAI,EAAEJ;QAC3C;QAEA,OAAON;IACT;IAEA,OAAO;AACT,EAAC"}

package/dist/models/buildSchema.d.ts

@@ -1,28 +1,3 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose-paginate-v2" />
 import type { Schema, SchemaOptions } from 'mongoose';
 import type { Field, SanitizedConfig } from 'payload';
 export type BuildSchemaOptions = {
@@ -32,6 +7,5 @@ export type BuildSchemaOptions = {
     indexSortableFields?: boolean;
     options?: SchemaOptions;
 };
-declare const buildSchema: (config: SanitizedConfig, configFields: Field[], buildSchemaOptions?: BuildSchemaOptions) => Schema;
-export default buildSchema;
+export declare const buildSchema: (config: SanitizedConfig, configFields: Field[], buildSchemaOptions?: BuildSchemaOptions) => Schema;
 //# sourceMappingURL=buildSchema.d.ts.map

package/dist/models/buildSchema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"buildSchema.d.ts","sourceRoot":"","sources":["../../src/models/buildSchema.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAGA,OAAO,KAAK,EAAgB,MAAM,EAAE,aAAa,EAAqB,MAAM,UAAU,CAAA;AACtF,OAAO,KAAK,EASV,KAAK,EAWL,eAAe,EAQhB,MAAM,SAAS,CAAA;AAUhB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB,CAAA;AA0DD,QAAA,MAAM,WAAW,WACP,eAAe,gBACT,KAAK,EAAE,uBACD,kBAAkB,KACrC,MA+BF,CAAA;AA+cD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"buildSchema.d.ts","sourceRoot":"","sources":["../../src/models/buildSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAgB,MAAM,EAAE,aAAa,EAAqB,MAAM,UAAU,CAAA;AACtF,OAAO,KAAK,EASV,KAAK,EAWL,eAAe,EAQhB,MAAM,SAAS,CAAA;AAWhB,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,OAAO,CAAC,EAAE,aAAa,CAAA;CACxB,CAAA;AAoED,eAAO,MAAM,WAAW,WACd,eAAe,gBACT,KAAK,EAAE,uBACD,kBAAkB,KACrC,MAmCF,CAAA"}

package/dist/models/buildSchema.js

@@ -1,8 +1,13 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */ /* eslint-disable class-methods-use-this */ /* eslint-disable @typescript-eslint/no-use-before-define */ import mongoose from 'mongoose';
-import { fieldAffectsData, fieldIsLocalized, fieldIsPresentationalOnly, tabHasName } from 'payload/shared';
+import mongoose from 'mongoose';
+import { fieldAffectsData, fieldIsLocalized, fieldIsPresentationalOnly, fieldIsVirtual, tabHasName } from 'payload/shared';
+/**
+ * get a field's defaultValue only if defined and not dynamic so that it can be set on the field schema
+ * @param field
+ */ const formatDefaultValue = (field)=>typeof field.defaultValue !== 'undefined' && typeof field.defaultValue !== 'function' ? field.defaultValue : undefined;
 const formatBaseSchema = (field, buildSchemaOptions)=>{
     const { disableUnique, draftsEnabled, indexSortableFields } = buildSchemaOptions;
     const schema = {
+        default: formatDefaultValue(field),
         index: field.index || !disableUnique && field.unique || indexSortableFields || false,
         required: false,
         unique: !disableUnique && field.unique || false
@@ -29,7 +34,7 @@ const localizeSchema = (entity, schema, localization)=>{
     }
     return schema;
 };
-const buildSchema = (config, configFields, buildSchemaOptions = {})=>{
+export const buildSchema = (config, configFields, buildSchemaOptions = {})=>{
     const { allowIDField, options } = buildSchemaOptions;
     let fields = {};
     let schemaFields = configFields;
@@ -44,6 +49,9 @@ const buildSchema = (config, configFields, buildSchemaOptions = {})=>{
     }
     const schema = new mongoose.Schema(fields, options);
     schemaFields.forEach((field)=>{
+        if (fieldIsVirtual(field)) {
+            return;
+        }
         if (!fieldIsPresentationalOnly(field)) {
             const addFieldSchema = fieldToSchemaMap[field.type];
             if (addFieldSchema) {
@@ -68,8 +76,7 @@ const fieldToSchemaMap = {
                         minimize: false
                     }
                 })
-            ],
-            default: undefined
+            ]
         };
         schema.add({
             [field.name]: localizeSchema(field, baseSchema, config.localization)
@@ -82,8 +89,7 @@ const fieldToSchemaMap = {
                     _id: false,
                     discriminatorKey: 'blockType'
                 })
-            ],
-            default: undefined
+            ]
         };
         schema.add({
             [field.name]: localizeSchema(field, fieldSchema, config.localization)
@@ -101,12 +107,10 @@ const fieldToSchemaMap = {
             });
             if (field.localized && config.localization) {
                 config.localization.localeCodes.forEach((localeCode)=>{
-                    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                     // @ts-expect-error Possible incorrect typing in mongoose types, this works
                     schema.path(`${field.name}.${localeCode}`).discriminator(blockItem.slug, blockSchema);
                 });
             } else {
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
                 // @ts-expect-error Possible incorrect typing in mongoose types, this works
                 schema.path(field.name).discriminator(blockItem.slug, blockSchema);
             }
@@ -132,6 +136,9 @@ const fieldToSchemaMap = {
     },
     collapsible: (field, schema, config, buildSchemaOptions)=>{
         field.fields.forEach((subField)=>{
+            if (fieldIsVirtual(subField)) {
+                return;
+            }
             const addFieldSchema = fieldToSchemaMap[subField.type];
             if (addFieldSchema) {
                 addFieldSchema(subField, schema, config, buildSchemaOptions);
@@ -209,7 +216,7 @@ const fieldToSchemaMap = {
                 type: [
                     Number
                 ],
-                default: field.defaultValue || undefined,
+                default: formatDefaultValue(field),
                 required: false
             }
         };
@@ -243,7 +250,9 @@ const fieldToSchemaMap = {
             ...formatBaseSchema(field, buildSchemaOptions),
             type: String,
             enum: field.options.map((option)=>{
-                if (typeof option === 'object') return option.value;
+                if (typeof option === 'object') {
+                    return option.value;
+                }
                 return option;
             })
         };
@@ -285,7 +294,7 @@ const fieldToSchemaMap = {
                             type: [
                                 localeSchema
                             ],
-                            default: undefined
+                            default: formatDefaultValue(field)
                         } : localeSchema
                     };
                 }, {}),
@@ -310,7 +319,7 @@ const fieldToSchemaMap = {
                     type: [
                         schemaToReturn
                     ],
-                    default: undefined
+                    default: formatDefaultValue(field)
                 };
             }
         } else {
@@ -324,7 +333,7 @@ const fieldToSchemaMap = {
                     type: [
                         schemaToReturn
                     ],
-                    default: undefined
+                    default: formatDefaultValue(field)
                 };
             }
         }
@@ -343,6 +352,9 @@ const fieldToSchemaMap = {
     },
     row: (field, schema, config, buildSchemaOptions)=>{
         field.fields.forEach((subField)=>{
+            if (fieldIsVirtual(subField)) {
+                return;
+            }
             const addFieldSchema = fieldToSchemaMap[subField.type];
             if (addFieldSchema) {
                 addFieldSchema(subField, schema, config, buildSchemaOptions);
@@ -354,7 +366,9 @@ const fieldToSchemaMap = {
             ...formatBaseSchema(field, buildSchemaOptions),
             type: String,
             enum: field.options.map((option)=>{
-                if (typeof option === 'object') return option.value;
+                if (typeof option === 'object') {
+                    return option.value;
+                }
                 return option;
             })
         };
@@ -370,6 +384,9 @@ const fieldToSchemaMap = {
     tabs: (field, schema, config, buildSchemaOptions)=>{
         field.tabs.forEach((tab)=>{
             if (tabHasName(tab)) {
+                if (fieldIsVirtual(tab)) {
+                    return;
+                }
                 const baseSchema = {
                     type: buildSchema(config, tab.fields, {
                         disableUnique: buildSchemaOptions.disableUnique,
@@ -386,6 +403,9 @@ const fieldToSchemaMap = {
                 });
             } else {
                 tab.fields.forEach((subField)=>{
+                    if (fieldIsVirtual(subField)) {
+                        return;
+                    }
                     const addFieldSchema = fieldToSchemaMap[subField.type];
                     if (addFieldSchema) {
                         addFieldSchema(subField, schema, config, buildSchemaOptions);
@@ -415,16 +435,86 @@ const fieldToSchemaMap = {
         });
     },
     upload: (field, schema, config, buildSchemaOptions)=>{
-        const baseSchema = {
-            ...formatBaseSchema(field, buildSchemaOptions),
-            type: mongoose.Schema.Types.Mixed,
-            ref: field.relationTo
-        };
+        const hasManyRelations = Array.isArray(field.relationTo);
+        let schemaToReturn = {};
+        if (field.localized && config.localization) {
+            schemaToReturn = {
+                type: config.localization.localeCodes.reduce((locales, locale)=>{
+                    let localeSchema = {};
+                    if (hasManyRelations) {
+                        localeSchema = {
+                            ...formatBaseSchema(field, buildSchemaOptions),
+                            _id: false,
+                            type: mongoose.Schema.Types.Mixed,
+                            relationTo: {
+                                type: String,
+                                enum: field.relationTo
+                            },
+                            value: {
+                                type: mongoose.Schema.Types.Mixed,
+                                refPath: `${field.name}.${locale}.relationTo`
+                            }
+                        };
+                    } else {
+                        localeSchema = {
+                            ...formatBaseSchema(field, buildSchemaOptions),
+                            type: mongoose.Schema.Types.Mixed,
+                            ref: field.relationTo
+                        };
+                    }
+                    return {
+                        ...locales,
+                        [locale]: field.hasMany ? {
+                            type: [
+                                localeSchema
+                            ],
+                            default: formatDefaultValue(field)
+                        } : localeSchema
+                    };
+                }, {}),
+                localized: true
+            };
+        } else if (hasManyRelations) {
+            schemaToReturn = {
+                ...formatBaseSchema(field, buildSchemaOptions),
+                _id: false,
+                type: mongoose.Schema.Types.Mixed,
+                relationTo: {
+                    type: String,
+                    enum: field.relationTo
+                },
+                value: {
+                    type: mongoose.Schema.Types.Mixed,
+                    refPath: `${field.name}.relationTo`
+                }
+            };
+            if (field.hasMany) {
+                schemaToReturn = {
+                    type: [
+                        schemaToReturn
+                    ],
+                    default: formatDefaultValue(field)
+                };
+            }
+        } else {
+            schemaToReturn = {
+                ...formatBaseSchema(field, buildSchemaOptions),
+                type: mongoose.Schema.Types.Mixed,
+                ref: field.relationTo
+            };
+            if (field.hasMany) {
+                schemaToReturn = {
+                    type: [
+                        schemaToReturn
+                    ],
+                    default: formatDefaultValue(field)
+                };
+            }
+        }
         schema.add({
-            [field.name]: localizeSchema(field, baseSchema, config.localization)
+            [field.name]: schemaToReturn
         });
     }
 };
-export default buildSchema;
 
 //# sourceMappingURL=buildSchema.js.map