diff --git a/packages/db-mongodb/src/connect.ts b/packages/db-mongodb/src/connect.ts index 7c1a1fb2c..0fba10bc9 100644 --- a/packages/db-mongodb/src/connect.ts +++ b/packages/db-mongodb/src/connect.ts @@ -59,8 +59,10 @@ export const connect: Connect = async function connect( await this.migrate({ migrations: this.prodMigrations }) } } catch (err) { - console.log(err) - this.payload.logger.error(`Error: cannot connect to MongoDB. Details: ${err.message}`, err) + this.payload.logger.error({ + err, + msg: `Error: cannot connect to MongoDB. Details: ${err.message}`, + }) process.exit(1) } } diff --git a/packages/db-mongodb/src/createGlobal.ts b/packages/db-mongodb/src/createGlobal.ts index 6b6bc9ff4..f199b621c 100644 --- a/packages/db-mongodb/src/createGlobal.ts +++ b/packages/db-mongodb/src/createGlobal.ts @@ -2,7 +2,7 @@ import type { CreateGlobal, PayloadRequest } from 'payload' import type { MongooseAdapter } from './index.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const createGlobal: CreateGlobal = async function createGlobal( diff --git a/packages/db-mongodb/src/deleteOne.ts b/packages/db-mongodb/src/deleteOne.ts index 66c781abc..5cf4895b4 100644 --- a/packages/db-mongodb/src/deleteOne.ts +++ b/packages/db-mongodb/src/deleteOne.ts @@ -2,7 +2,7 @@ import type { DeleteOne, Document, PayloadRequest } from 'payload' import type { MongooseAdapter } from './index.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const deleteOne: DeleteOne = async function deleteOne( diff --git a/packages/db-mongodb/src/find.ts b/packages/db-mongodb/src/find.ts index 450414fb1..4fc321b96 100644 --- a/packages/db-mongodb/src/find.ts +++ b/packages/db-mongodb/src/find.ts @@ -6,7 +6,7 @@ import { flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' import { buildSortParam } from './queries/buildSortParam.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const find: Find = async function find( diff --git a/packages/db-mongodb/src/findGlobal.ts b/packages/db-mongodb/src/findGlobal.ts index 1cfc06253..0473674dc 100644 --- a/packages/db-mongodb/src/findGlobal.ts +++ b/packages/db-mongodb/src/findGlobal.ts @@ -4,7 +4,7 @@ import { combineQueries } from 'payload' import type { MongooseAdapter } from './index.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const findGlobal: FindGlobal = async function findGlobal( diff --git a/packages/db-mongodb/src/findGlobalVersions.ts b/packages/db-mongodb/src/findGlobalVersions.ts index 0c723e5c8..2063eb91b 100644 --- a/packages/db-mongodb/src/findGlobalVersions.ts +++ b/packages/db-mongodb/src/findGlobalVersions.ts @@ -6,7 +6,7 @@ import { buildVersionGlobalFields, flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' import { buildSortParam } from './queries/buildSortParam.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions( diff --git a/packages/db-mongodb/src/findOne.ts b/packages/db-mongodb/src/findOne.ts index c17e93aea..c0fc96265 100644 --- a/packages/db-mongodb/src/findOne.ts +++ b/packages/db-mongodb/src/findOne.ts @@ -3,7 +3,7 @@ import type { Document, FindOne, PayloadRequest } from 'payload' import type { MongooseAdapter } from './index.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const findOne: FindOne = async function findOne( diff --git a/packages/db-mongodb/src/findVersions.ts b/packages/db-mongodb/src/findVersions.ts index 037dfd2ce..186d93821 100644 --- a/packages/db-mongodb/src/findVersions.ts +++ b/packages/db-mongodb/src/findVersions.ts @@ -6,7 +6,7 @@ import { flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' import { buildSortParam } from './queries/buildSortParam.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const findVersions: FindVersions = async function findVersions( diff --git a/packages/db-mongodb/src/init.ts b/packages/db-mongodb/src/init.ts index ee1f9fe38..0f694deb8 100644 --- a/packages/db-mongodb/src/init.ts +++ b/packages/db-mongodb/src/init.ts @@ -8,10 +8,10 @@ import { buildVersionCollectionFields, buildVersionGlobalFields } from 'payload' import type { MongooseAdapter } from './index.js' import type { CollectionModel } from './types.js' -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: Init = function init(this: MongooseAdapter) { diff --git a/packages/db-mongodb/src/models/buildCollectionSchema.ts b/packages/db-mongodb/src/models/buildCollectionSchema.ts index 08eaf9d29..028560954 100644 --- a/packages/db-mongodb/src/models/buildCollectionSchema.ts +++ b/packages/db-mongodb/src/models/buildCollectionSchema.ts @@ -3,10 +3,10 @@ import type { SanitizedCollectionConfig, SanitizedConfig } from 'payload' import paginate from 'mongoose-paginate-v2' -import getBuildQueryPlugin from '../queries/buildQuery.js' -import buildSchema from './buildSchema.js' +import { getBuildQueryPlugin } from '../queries/buildQuery.js' +import { buildSchema } from './buildSchema.js' -const buildCollectionSchema = ( +export const buildCollectionSchema = ( collection: SanitizedCollectionConfig, config: SanitizedConfig, schemaOptions = {}, @@ -44,5 +44,3 @@ const buildCollectionSchema = ( return schema } - -export default buildCollectionSchema diff --git a/packages/db-mongodb/src/models/buildGlobalModel.ts b/packages/db-mongodb/src/models/buildGlobalModel.ts index 65927f606..82a91a8ef 100644 --- a/packages/db-mongodb/src/models/buildGlobalModel.ts +++ b/packages/db-mongodb/src/models/buildGlobalModel.ts @@ -4,8 +4,8 @@ import mongoose from 'mongoose' import type { GlobalModel } from '../types.js' -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: SanitizedConfig): GlobalModel | null => { if (config.globals && config.globals.length > 0) { diff --git a/packages/db-mongodb/src/models/buildSchema.ts b/packages/db-mongodb/src/models/buildSchema.ts index 566c4ea36..c2535def3 100644 --- a/packages/db-mongodb/src/models/buildSchema.ts +++ b/packages/db-mongodb/src/models/buildSchema.ts @@ -111,7 +111,7 @@ const localizeSchema = ( return schema } -const buildSchema = ( +export const buildSchema = ( config: SanitizedConfig, configFields: Field[], buildSchemaOptions: BuildSchemaOptions = {}, @@ -669,5 +669,3 @@ const fieldToSchemaMap: Record = { }) }, } - -export default buildSchema diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts index 3224e6290..49ab646b6 100644 --- a/packages/db-mongodb/src/queries/buildQuery.ts +++ b/packages/db-mongodb/src/queries/buildQuery.ts @@ -18,7 +18,10 @@ export type BuildQueryArgs = { // This plugin asynchronously builds a list of Mongoose query constraints // which can then be used in subsequent Mongoose queries. -const getBuildQueryPlugin = ({ collectionSlug, versionsFields }: GetBuildQueryPluginArgs = {}) => { +export const getBuildQueryPlugin = ({ + collectionSlug, + versionsFields, +}: GetBuildQueryPluginArgs = {}) => { return function buildQueryPlugin(schema) { const modifiedSchema = schema async function buildQuery({ @@ -57,5 +60,3 @@ const getBuildQueryPlugin = ({ collectionSlug, versionsFields }: GetBuildQueryPl modifiedSchema.statics.buildQuery = buildQuery } } - -export default getBuildQueryPlugin diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts index f4e2e653f..c771fb9fe 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts +++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts @@ -16,7 +16,7 @@ describe('get localized sort property', () => { }, } as Config) }) - it('passes through a non-localized sort property', async () => { + it('passes through a non-localized sort property', () => { const result = getLocalizedSortProperty({ config, fields: [ diff --git a/packages/db-mongodb/src/queryDrafts.ts b/packages/db-mongodb/src/queryDrafts.ts index 68ae72cdc..b7badbd64 100644 --- a/packages/db-mongodb/src/queryDrafts.ts +++ b/packages/db-mongodb/src/queryDrafts.ts @@ -6,7 +6,7 @@ import { combineQueries, flattenWhereToOperators } from 'payload' import type { MongooseAdapter } from './index.js' import { buildSortParam } from './queries/buildSortParam.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const queryDrafts: QueryDrafts = async function queryDrafts( diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts index 8f97c01c9..82e681d0b 100644 --- a/packages/db-mongodb/src/transactions/beginTransaction.ts +++ b/packages/db-mongodb/src/transactions/beginTransaction.ts @@ -6,6 +6,8 @@ import { v4 as uuid } from 'uuid' import type { MongooseAdapter } from '../index.js' +// Needs await to fulfill the interface +// eslint-disable-next-line @typescript-eslint/require-await export const beginTransaction: BeginTransaction = async function beginTransaction( this: MongooseAdapter, options: TransactionOptions, diff --git a/packages/db-mongodb/src/updateGlobal.ts b/packages/db-mongodb/src/updateGlobal.ts index 726a2d98e..19e943a6d 100644 --- a/packages/db-mongodb/src/updateGlobal.ts +++ b/packages/db-mongodb/src/updateGlobal.ts @@ -2,7 +2,7 @@ import type { PayloadRequest, UpdateGlobal } from 'payload' import type { MongooseAdapter } from './index.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const updateGlobal: UpdateGlobal = async function updateGlobal( diff --git a/packages/db-mongodb/src/updateOne.ts b/packages/db-mongodb/src/updateOne.ts index 0c751621c..efee0b8fc 100644 --- a/packages/db-mongodb/src/updateOne.ts +++ b/packages/db-mongodb/src/updateOne.ts @@ -3,7 +3,7 @@ import type { PayloadRequest, UpdateOne } from 'payload' import type { MongooseAdapter } from './index.js' import { handleError } from './utilities/handleError.js' -import sanitizeInternalFields from './utilities/sanitizeInternalFields.js' +import { sanitizeInternalFields } from './utilities/sanitizeInternalFields.js' import { withSession } from './withSession.js' export const updateOne: UpdateOne = async function updateOne( diff --git a/packages/db-mongodb/src/utilities/sanitizeInternalFields.ts b/packages/db-mongodb/src/utilities/sanitizeInternalFields.ts index 6877cde86..14ab00da6 100644 --- a/packages/db-mongodb/src/utilities/sanitizeInternalFields.ts +++ b/packages/db-mongodb/src/utilities/sanitizeInternalFields.ts @@ -1,6 +1,6 @@ const internalFields = ['__v'] -const sanitizeInternalFields = >(incomingDoc: T): T => +export const sanitizeInternalFields = >(incomingDoc: T): T => Object.entries(incomingDoc).reduce((newDoc, [key, val]): T => { if (key === '_id') { return { @@ -18,5 +18,3 @@ const sanitizeInternalFields = >(incomingDoc: [key]: val, } }, {} as T) - -export default sanitizeInternalFields