From 06b1fe88ca71aa2e1ebc4d22ae6607c12f7d576c Mon Sep 17 00:00:00 2001 From: James Date: Sat, 29 Jul 2023 11:24:35 -0400 Subject: [PATCH] chore: moves mongoose adapter --- src/{ => database/adapters}/mongoose/connect.ts | 2 +- src/{ => database/adapters}/mongoose/create.ts | 6 +++--- src/{ => database/adapters}/mongoose/createGlobal.ts | 6 +++--- src/{ => database/adapters}/mongoose/createVersion.ts | 6 +++--- src/{ => database/adapters}/mongoose/deleteMany.ts | 4 ++-- src/{ => database/adapters}/mongoose/deleteOne.ts | 8 ++++---- src/{ => database/adapters}/mongoose/deleteVersions.ts | 4 ++-- src/{ => database/adapters}/mongoose/destroy.ts | 2 +- src/{ => database/adapters}/mongoose/find.ts | 8 ++++---- src/{ => database/adapters}/mongoose/findGlobal.ts | 8 ++++---- .../adapters}/mongoose/findGlobalVersions.ts | 10 +++++----- src/{ => database/adapters}/mongoose/findOne.ts | 8 ++++---- src/{ => database/adapters}/mongoose/findVersions.ts | 8 ++++---- src/{ => database/adapters}/mongoose/index.ts | 8 ++++---- src/{ => database/adapters}/mongoose/init.ts | 10 +++++----- src/{ => database/adapters}/mongoose/mock.js | 0 .../adapters}/mongoose/models/buildCollectionSchema.ts | 4 ++-- .../adapters}/mongoose/models/buildGlobalModel.ts | 2 +- .../adapters}/mongoose/models/buildSchema.ts | 4 ++-- .../adapters}/mongoose/queries/buildAndOrConditions.ts | 6 +++--- .../adapters}/mongoose/queries/buildQuery.ts | 8 ++++---- .../adapters}/mongoose/queries/buildSearchParams.ts | 6 +++--- .../adapters}/mongoose/queries/buildSortParam.ts | 4 ++-- .../adapters}/mongoose/queries/getLocalizedPaths.ts | 8 ++++---- .../mongoose/queries/getLocalizedSortProperty.spec.ts | 0 .../mongoose/queries/getLocalizedSortProperty.ts | 6 +++--- src/{ => database/adapters}/mongoose/queries/mock.js | 0 .../adapters}/mongoose/queries/operatorMap.ts | 0 .../adapters}/mongoose/queries/parseParams.ts | 10 +++++----- .../adapters}/mongoose/queries/sanitizeQueryValue.ts | 4 ++-- src/{ => database/adapters}/mongoose/queryDrafts.ts | 8 ++++---- .../adapters}/mongoose/testCredentials.ts | 0 .../mongoose/transactions/beginTransaction.ts | 4 ++-- .../mongoose/transactions/commitTransaction.ts | 2 +- .../mongoose/transactions/rollbackTransaction.ts | 2 +- src/{ => database/adapters}/mongoose/types.ts | 0 src/{ => database/adapters}/mongoose/updateGlobal.ts | 6 +++--- src/{ => database/adapters}/mongoose/updateOne.ts | 10 +++++----- src/{ => database/adapters}/mongoose/updateVersion.ts | 4 ++-- src/{ => database/adapters}/mongoose/webpack.ts | 2 +- src/{ => database/adapters}/mongoose/withSession.ts | 0 src/database/queryValidation/validateSearchParams.ts | 2 +- src/payload.ts | 2 +- 43 files changed, 101 insertions(+), 101 deletions(-) rename src/{ => database/adapters}/mongoose/connect.ts (97%) rename src/{ => database/adapters}/mongoose/create.ts (85%) rename src/{ => database/adapters}/mongoose/createGlobal.ts (76%) rename src/{ => database/adapters}/mongoose/createVersion.ts (86%) rename src/{ => database/adapters}/mongoose/deleteMany.ts (82%) rename src/{ => database/adapters}/mongoose/deleteOne.ts (74%) rename src/{ => database/adapters}/mongoose/deleteVersions.ts (83%) rename src/{ => database/adapters}/mongoose/destroy.ts (87%) rename src/{ => database/adapters}/mongoose/find.ts (88%) rename src/{ => database/adapters}/mongoose/findGlobal.ts (76%) rename src/{ => database/adapters}/mongoose/findGlobalVersions.ts (85%) rename src/{ => database/adapters}/mongoose/findOne.ts (78%) rename src/{ => database/adapters}/mongoose/findVersions.ts (88%) rename src/{ => database/adapters}/mongoose/index.ts (92%) rename src/{ => database/adapters}/mongoose/init.ts (91%) rename src/{ => database/adapters}/mongoose/mock.js (100%) rename src/{ => database/adapters}/mongoose/models/buildCollectionSchema.ts (89%) rename src/{ => database/adapters}/mongoose/models/buildGlobalModel.ts (93%) rename src/{ => database/adapters}/mongoose/models/buildSchema.ts (99%) rename src/{ => database/adapters}/mongoose/queries/buildAndOrConditions.ts (88%) rename src/{ => database/adapters}/mongoose/queries/buildQuery.ts (88%) rename src/{ => database/adapters}/mongoose/queries/buildSearchParams.ts (97%) rename src/{ => database/adapters}/mongoose/queries/buildSortParam.ts (90%) rename src/{ => database/adapters}/mongoose/queries/getLocalizedPaths.ts (94%) rename src/{ => database/adapters}/mongoose/queries/getLocalizedSortProperty.spec.ts (100%) rename src/{ => database/adapters}/mongoose/queries/getLocalizedSortProperty.ts (94%) rename src/{ => database/adapters}/mongoose/queries/mock.js (100%) rename src/{ => database/adapters}/mongoose/queries/operatorMap.ts (100%) rename src/{ => database/adapters}/mongoose/queries/parseParams.ts (90%) rename src/{ => database/adapters}/mongoose/queries/sanitizeQueryValue.ts (95%) rename src/{ => database/adapters}/mongoose/queryDrafts.ts (92%) rename src/{ => database/adapters}/mongoose/testCredentials.ts (100%) rename src/{ => database/adapters}/mongoose/transactions/beginTransaction.ts (91%) rename src/{ => database/adapters}/mongoose/transactions/commitTransaction.ts (87%) rename src/{ => database/adapters}/mongoose/transactions/rollbackTransaction.ts (85%) rename src/{ => database/adapters}/mongoose/types.ts (100%) rename src/{ => database/adapters}/mongoose/updateGlobal.ts (77%) rename src/{ => database/adapters}/mongoose/updateOne.ts (79%) rename src/{ => database/adapters}/mongoose/updateVersion.ts (89%) rename src/{ => database/adapters}/mongoose/webpack.ts (84%) rename src/{ => database/adapters}/mongoose/withSession.ts (100%) diff --git a/src/mongoose/connect.ts b/src/database/adapters/mongoose/connect.ts similarity index 97% rename from src/mongoose/connect.ts rename to src/database/adapters/mongoose/connect.ts index ac284f0e9f..d45e7285c0 100644 --- a/src/mongoose/connect.ts +++ b/src/database/adapters/mongoose/connect.ts @@ -3,7 +3,7 @@ import type { ConnectOptions } from 'mongoose'; import mongoose from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { Connect } from '../database/types'; +import type { Connect } from '../../types'; export const connect: Connect = async function connect( this: MongooseAdapter, diff --git a/src/mongoose/create.ts b/src/database/adapters/mongoose/create.ts similarity index 85% rename from src/mongoose/create.ts rename to src/database/adapters/mongoose/create.ts index 07b0b81906..02644a7a36 100644 --- a/src/mongoose/create.ts +++ b/src/database/adapters/mongoose/create.ts @@ -1,7 +1,7 @@ import type { MongooseAdapter } from '.'; -import type { Create } from '../database/types'; -import type { Document } from '../types'; -import { PayloadRequest } from '../types'; +import type { Create } from '../../types'; +import type { Document } from '../../../types'; +import { PayloadRequest } from '../../../types'; import { withSession } from './withSession'; export const create: Create = async function create( diff --git a/src/mongoose/createGlobal.ts b/src/database/adapters/mongoose/createGlobal.ts similarity index 76% rename from src/mongoose/createGlobal.ts rename to src/database/adapters/mongoose/createGlobal.ts index fe766e954b..0043d34588 100644 --- a/src/mongoose/createGlobal.ts +++ b/src/database/adapters/mongoose/createGlobal.ts @@ -1,8 +1,8 @@ import type { MongooseAdapter } from '.'; -import type { CreateGlobal } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import type { CreateGlobal } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const createGlobal: CreateGlobal = async function createGlobal( this: MongooseAdapter, diff --git a/src/mongoose/createVersion.ts b/src/database/adapters/mongoose/createVersion.ts similarity index 86% rename from src/mongoose/createVersion.ts rename to src/database/adapters/mongoose/createVersion.ts index 2e6bef772b..5257895f7a 100644 --- a/src/mongoose/createVersion.ts +++ b/src/database/adapters/mongoose/createVersion.ts @@ -1,7 +1,7 @@ import type { MongooseAdapter } from '.'; -import type { CreateVersion } from '../database/types'; -import type { Document } from '../types'; -import { PayloadRequest } from '../types'; +import type { CreateVersion } from '../../types'; +import type { Document } from '../../../types'; +import { PayloadRequest } from '../../../types'; import { withSession } from './withSession'; export const createVersion: CreateVersion = async function createVersion( diff --git a/src/mongoose/deleteMany.ts b/src/database/adapters/mongoose/deleteMany.ts similarity index 82% rename from src/mongoose/deleteMany.ts rename to src/database/adapters/mongoose/deleteMany.ts index 966b31e9e5..d1297d8373 100644 --- a/src/mongoose/deleteMany.ts +++ b/src/database/adapters/mongoose/deleteMany.ts @@ -1,7 +1,7 @@ import type { MongooseAdapter } from '.'; -import type { DeleteMany } from '../database/types'; +import type { DeleteMany } from '../../types'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const deleteMany: DeleteMany = async function deleteMany(this: MongooseAdapter, { collection, where, req = {} as PayloadRequest }) { diff --git a/src/mongoose/deleteOne.ts b/src/database/adapters/mongoose/deleteOne.ts similarity index 74% rename from src/mongoose/deleteOne.ts rename to src/database/adapters/mongoose/deleteOne.ts index 4d901a86b1..329493779f 100644 --- a/src/mongoose/deleteOne.ts +++ b/src/database/adapters/mongoose/deleteOne.ts @@ -1,8 +1,8 @@ import type { MongooseAdapter } from '.'; -import type { DeleteOne } from '../database/types'; -import type { Document } from '../types'; -import { PayloadRequest } from '../types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import type { DeleteOne } from '../../types'; +import type { Document } from '../../../types'; +import { PayloadRequest } from '../../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { withSession } from './withSession'; export const deleteOne: DeleteOne = async function deleteOne( diff --git a/src/mongoose/deleteVersions.ts b/src/database/adapters/mongoose/deleteVersions.ts similarity index 83% rename from src/mongoose/deleteVersions.ts rename to src/database/adapters/mongoose/deleteVersions.ts index 3c4e0c07ea..0dde795ebc 100644 --- a/src/mongoose/deleteVersions.ts +++ b/src/database/adapters/mongoose/deleteVersions.ts @@ -1,7 +1,7 @@ import type { MongooseAdapter } from '.'; -import type { DeleteVersions } from '../database/types'; +import type { DeleteVersions } from '../../types'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const deleteVersions: DeleteVersions = async function deleteVersions(this: MongooseAdapter, { collection, where, locale, req = {} as PayloadRequest }) { diff --git a/src/mongoose/destroy.ts b/src/database/adapters/mongoose/destroy.ts similarity index 87% rename from src/mongoose/destroy.ts rename to src/database/adapters/mongoose/destroy.ts index 22d314e383..7556b2dad9 100644 --- a/src/mongoose/destroy.ts +++ b/src/database/adapters/mongoose/destroy.ts @@ -1,5 +1,5 @@ import mongoose from 'mongoose'; -import { Destroy } from '../database/types'; +import { Destroy } from '../../types'; import { MongooseAdapter } from './index'; export const destroy: Destroy = async function destroy( diff --git a/src/mongoose/find.ts b/src/database/adapters/mongoose/find.ts similarity index 88% rename from src/mongoose/find.ts rename to src/database/adapters/mongoose/find.ts index 993c89a3ab..5774e6cd20 100644 --- a/src/mongoose/find.ts +++ b/src/database/adapters/mongoose/find.ts @@ -1,11 +1,11 @@ import type { PaginateOptions } from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { Find } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; -import flattenWhereToOperators from '../database/flattenWhereToOperators'; +import type { Find } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; +import flattenWhereToOperators from '../../flattenWhereToOperators'; import { buildSortParam } from './queries/buildSortParam'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const find: Find = async function find( this: MongooseAdapter, diff --git a/src/mongoose/findGlobal.ts b/src/database/adapters/mongoose/findGlobal.ts similarity index 76% rename from src/mongoose/findGlobal.ts rename to src/database/adapters/mongoose/findGlobal.ts index 0f1fb28d14..7c0c044a95 100644 --- a/src/mongoose/findGlobal.ts +++ b/src/database/adapters/mongoose/findGlobal.ts @@ -1,9 +1,9 @@ import type { MongooseAdapter } from '.'; -import { combineQueries } from '../database/combineQueries'; -import type { FindGlobal } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import { combineQueries } from '../../combineQueries'; +import type { FindGlobal } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const findGlobal: FindGlobal = async function findGlobal( this: MongooseAdapter, diff --git a/src/mongoose/findGlobalVersions.ts b/src/database/adapters/mongoose/findGlobalVersions.ts similarity index 85% rename from src/mongoose/findGlobalVersions.ts rename to src/database/adapters/mongoose/findGlobalVersions.ts index a1ace75ae1..94264511a0 100644 --- a/src/mongoose/findGlobalVersions.ts +++ b/src/database/adapters/mongoose/findGlobalVersions.ts @@ -1,12 +1,12 @@ import { PaginateOptions } from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { FindGlobalVersions } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; -import flattenWhereToOperators from '../database/flattenWhereToOperators'; +import type { FindGlobalVersions } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; +import flattenWhereToOperators from '../../flattenWhereToOperators'; import { buildSortParam } from './queries/buildSortParam'; -import { buildVersionGlobalFields } from '../versions/buildGlobalFields'; +import { buildVersionGlobalFields } from '../../../versions/buildGlobalFields'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions( this: MongooseAdapter, diff --git a/src/mongoose/findOne.ts b/src/database/adapters/mongoose/findOne.ts similarity index 78% rename from src/mongoose/findOne.ts rename to src/database/adapters/mongoose/findOne.ts index a637d55f53..40610dee23 100644 --- a/src/mongoose/findOne.ts +++ b/src/database/adapters/mongoose/findOne.ts @@ -1,9 +1,9 @@ import type { MongooseQueryOptions } from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { FindOne } from '../database/types'; -import type { Document } from '../types'; -import { PayloadRequest } from '../types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import type { FindOne } from '../../types'; +import type { Document } from '../../../types'; +import { PayloadRequest } from '../../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { withSession } from './withSession'; export const findOne: FindOne = async function findOne( diff --git a/src/mongoose/findVersions.ts b/src/database/adapters/mongoose/findVersions.ts similarity index 88% rename from src/mongoose/findVersions.ts rename to src/database/adapters/mongoose/findVersions.ts index c403124f86..db90a2be6c 100644 --- a/src/mongoose/findVersions.ts +++ b/src/database/adapters/mongoose/findVersions.ts @@ -1,11 +1,11 @@ import { PaginateOptions } from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { FindVersions } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; -import flattenWhereToOperators from '../database/flattenWhereToOperators'; +import type { FindVersions } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; +import flattenWhereToOperators from '../../flattenWhereToOperators'; import { buildSortParam } from './queries/buildSortParam'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const findVersions: FindVersions = async function findVersions( this: MongooseAdapter, diff --git a/src/mongoose/index.ts b/src/database/adapters/mongoose/index.ts similarity index 92% rename from src/mongoose/index.ts rename to src/database/adapters/mongoose/index.ts index 419483de03..62457ca6be 100644 --- a/src/mongoose/index.ts +++ b/src/database/adapters/mongoose/index.ts @@ -1,8 +1,8 @@ import type { ClientSession, Connection, ConnectOptions } from 'mongoose'; import mongoose from 'mongoose'; -import { createMigration } from '../database/migrations/createMigration'; -import type { Payload } from '../index'; -import type { DatabaseAdapter } from '../database/types'; +import { createMigration } from '../../migrations/createMigration'; +import type { Payload } from '../../../index'; +import type { DatabaseAdapter } from '../../types'; import { connect } from './connect'; import { init } from './init'; import { webpack } from './webpack'; @@ -24,7 +24,7 @@ import { updateGlobal } from './updateGlobal'; import { updateOne } from './updateOne'; import { updateVersion } from './updateVersion'; import { deleteMany } from './deleteMany'; -import { baseDatabaseAdapter } from '../database/baseDatabaseAdapter'; +import { baseDatabaseAdapter } from '../../baseDatabaseAdapter'; import { destroy } from './destroy'; import type { CollectionModel, GlobalModel } from './types'; diff --git a/src/mongoose/init.ts b/src/database/adapters/mongoose/init.ts similarity index 91% rename from src/mongoose/init.ts rename to src/database/adapters/mongoose/init.ts index 846135aa35..5eb35d85e7 100644 --- a/src/mongoose/init.ts +++ b/src/database/adapters/mongoose/init.ts @@ -2,16 +2,16 @@ import mongoose, { PaginateOptions } from 'mongoose'; import paginate from 'mongoose-paginate-v2'; import mongooseAggregatePaginate from 'mongoose-aggregate-paginate-v2'; -import { buildVersionCollectionFields } from '../versions/buildCollectionFields'; +import { buildVersionCollectionFields } from '../../../versions/buildCollectionFields'; import getBuildQueryPlugin from './queries/buildQuery'; import buildCollectionSchema from './models/buildCollectionSchema'; import buildSchema from './models/buildSchema'; -import { SanitizedCollectionConfig } from '../collections/config/types'; -import { getVersionsModelName } from '../versions/getVersionsModelName'; +import { SanitizedCollectionConfig } from '../../../collections/config/types'; +import { getVersionsModelName } from '../../../versions/getVersionsModelName'; import type { MongooseAdapter } from '.'; import { buildGlobalModel } from './models/buildGlobalModel'; -import { buildVersionGlobalFields } from '../versions/buildGlobalFields'; -import type { Init } from '../database/types'; +import { buildVersionGlobalFields } from '../../../versions/buildGlobalFields'; +import type { Init } from '../../types'; import { CollectionModel } from './types'; export const init: Init = async function init( diff --git a/src/mongoose/mock.js b/src/database/adapters/mongoose/mock.js similarity index 100% rename from src/mongoose/mock.js rename to src/database/adapters/mongoose/mock.js diff --git a/src/mongoose/models/buildCollectionSchema.ts b/src/database/adapters/mongoose/models/buildCollectionSchema.ts similarity index 89% rename from src/mongoose/models/buildCollectionSchema.ts rename to src/database/adapters/mongoose/models/buildCollectionSchema.ts index aff26d46a2..5603c398f8 100644 --- a/src/mongoose/models/buildCollectionSchema.ts +++ b/src/database/adapters/mongoose/models/buildCollectionSchema.ts @@ -1,9 +1,9 @@ import paginate from 'mongoose-paginate-v2'; import { PaginateOptions, Schema } from 'mongoose'; -import { SanitizedConfig } from '../../config/types'; +import { SanitizedConfig } from '../../../../config/types'; import getBuildQueryPlugin from '../queries/buildQuery'; import buildSchema from './buildSchema'; -import { SanitizedCollectionConfig } from '../../collections/config/types'; +import { SanitizedCollectionConfig } from '../../../../collections/config/types'; const buildCollectionSchema = (collection: SanitizedCollectionConfig, config: SanitizedConfig, schemaOptions = {}): Schema => { const schema = buildSchema( diff --git a/src/mongoose/models/buildGlobalModel.ts b/src/database/adapters/mongoose/models/buildGlobalModel.ts similarity index 93% rename from src/mongoose/models/buildGlobalModel.ts rename to src/database/adapters/mongoose/models/buildGlobalModel.ts index 945dbf43d5..e5b10205dd 100644 --- a/src/mongoose/models/buildGlobalModel.ts +++ b/src/database/adapters/mongoose/models/buildGlobalModel.ts @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; import buildSchema from './buildSchema'; -import { SanitizedConfig } from '../../config/types'; +import { SanitizedConfig } from '../../../../config/types'; import getBuildQueryPlugin from '../queries/buildQuery'; import type { GlobalModel } from '../types'; diff --git a/src/mongoose/models/buildSchema.ts b/src/database/adapters/mongoose/models/buildSchema.ts similarity index 99% rename from src/mongoose/models/buildSchema.ts rename to src/database/adapters/mongoose/models/buildSchema.ts index 3564a147d4..b5589bcf81 100644 --- a/src/mongoose/models/buildSchema.ts +++ b/src/database/adapters/mongoose/models/buildSchema.ts @@ -3,7 +3,7 @@ /* eslint-disable @typescript-eslint/no-use-before-define */ /* eslint-disable no-use-before-define */ import { IndexOptions, Schema, SchemaOptions, SchemaTypeOptions } from 'mongoose'; -import { SanitizedConfig } from '../../config/types'; +import { SanitizedConfig } from '../../../../config/types'; import { ArrayField, Block, @@ -35,7 +35,7 @@ import { TextField, UnnamedTab, UploadField, -} from '../../fields/config/types'; +} from '../../../../fields/config/types'; export type BuildSchemaOptions = { options?: SchemaOptions diff --git a/src/mongoose/queries/buildAndOrConditions.ts b/src/database/adapters/mongoose/queries/buildAndOrConditions.ts similarity index 88% rename from src/mongoose/queries/buildAndOrConditions.ts rename to src/database/adapters/mongoose/queries/buildAndOrConditions.ts index 5bd716dfa3..04c330802a 100644 --- a/src/mongoose/queries/buildAndOrConditions.ts +++ b/src/database/adapters/mongoose/queries/buildAndOrConditions.ts @@ -1,7 +1,7 @@ -import { Where } from '../../types'; +import { Where } from '../../../../types'; import { parseParams } from './parseParams'; -import { Field } from '../../fields/config/types'; -import { Payload } from '../..'; +import { Field } from '../../../../fields/config/types'; +import { Payload } from '../../../..'; export async function buildAndOrConditions({ where, diff --git a/src/mongoose/queries/buildQuery.ts b/src/database/adapters/mongoose/queries/buildQuery.ts similarity index 88% rename from src/mongoose/queries/buildQuery.ts rename to src/database/adapters/mongoose/queries/buildQuery.ts index 16ff64c8b0..9d4c4620dd 100644 --- a/src/mongoose/queries/buildQuery.ts +++ b/src/database/adapters/mongoose/queries/buildQuery.ts @@ -1,8 +1,8 @@ -import { Where } from '../../types'; -import { Field } from '../../fields/config/types'; -import QueryError from '../../errors/QueryError'; +import { Where } from '../../../../types'; +import { Field } from '../../../../fields/config/types'; +import QueryError from '../../../../errors/QueryError'; import { parseParams } from './parseParams'; -import { Payload } from '../..'; +import { Payload } from '../../../..'; type GetBuildQueryPluginArgs = { collectionSlug?: string diff --git a/src/mongoose/queries/buildSearchParams.ts b/src/database/adapters/mongoose/queries/buildSearchParams.ts similarity index 97% rename from src/mongoose/queries/buildSearchParams.ts rename to src/database/adapters/mongoose/queries/buildSearchParams.ts index e55663bf7b..b03bd1f974 100644 --- a/src/mongoose/queries/buildSearchParams.ts +++ b/src/database/adapters/mongoose/queries/buildSearchParams.ts @@ -1,11 +1,11 @@ import mongoose from 'mongoose'; import objectID from 'bson-objectid'; -import { Field, fieldAffectsData } from '../../fields/config/types'; +import { Field, fieldAffectsData } from '../../../../fields/config/types'; import { operatorMap } from './operatorMap'; import { getLocalizedPaths } from './getLocalizedPaths'; import { sanitizeQueryValue } from './sanitizeQueryValue'; -import { PathToQuery, validOperators } from '../../database/queryValidation/types'; -import { Payload } from '../..'; +import { PathToQuery, validOperators } from '../../../queryValidation/types'; +import { Payload } from '../../../..'; import { MongooseAdapter } from '..'; type SearchParam = { diff --git a/src/mongoose/queries/buildSortParam.ts b/src/database/adapters/mongoose/queries/buildSortParam.ts similarity index 90% rename from src/mongoose/queries/buildSortParam.ts rename to src/database/adapters/mongoose/queries/buildSortParam.ts index 188ad89e24..b9a8f05b9e 100644 --- a/src/mongoose/queries/buildSortParam.ts +++ b/src/database/adapters/mongoose/queries/buildSortParam.ts @@ -1,7 +1,7 @@ import { PaginateOptions } from 'mongoose'; -import { Config } from '../../config/types'; +import { Config } from '../../../../config/types'; import { getLocalizedSortProperty } from './getLocalizedSortProperty'; -import { Field } from '../../fields/config/types'; +import { Field } from '../../../../fields/config/types'; type Args = { sort: string diff --git a/src/mongoose/queries/getLocalizedPaths.ts b/src/database/adapters/mongoose/queries/getLocalizedPaths.ts similarity index 94% rename from src/mongoose/queries/getLocalizedPaths.ts rename to src/database/adapters/mongoose/queries/getLocalizedPaths.ts index e441eb7ed3..0d929d09ff 100644 --- a/src/mongoose/queries/getLocalizedPaths.ts +++ b/src/database/adapters/mongoose/queries/getLocalizedPaths.ts @@ -1,7 +1,7 @@ -import { Field, fieldAffectsData } from '../../fields/config/types'; -import flattenFields from '../../utilities/flattenTopLevelFields'; -import { PathToQuery } from '../../database/queryValidation/types'; -import { Payload } from '../..'; +import { Field, fieldAffectsData } from '../../../../fields/config/types'; +import flattenFields from '../../../../utilities/flattenTopLevelFields'; +import { PathToQuery } from '../../../queryValidation/types'; +import { Payload } from '../../../..'; export async function getLocalizedPaths({ payload, diff --git a/src/mongoose/queries/getLocalizedSortProperty.spec.ts b/src/database/adapters/mongoose/queries/getLocalizedSortProperty.spec.ts similarity index 100% rename from src/mongoose/queries/getLocalizedSortProperty.spec.ts rename to src/database/adapters/mongoose/queries/getLocalizedSortProperty.spec.ts diff --git a/src/mongoose/queries/getLocalizedSortProperty.ts b/src/database/adapters/mongoose/queries/getLocalizedSortProperty.ts similarity index 94% rename from src/mongoose/queries/getLocalizedSortProperty.ts rename to src/database/adapters/mongoose/queries/getLocalizedSortProperty.ts index 8c6d81813a..7464e5d133 100644 --- a/src/mongoose/queries/getLocalizedSortProperty.ts +++ b/src/database/adapters/mongoose/queries/getLocalizedSortProperty.ts @@ -1,6 +1,6 @@ -import { Config } from '../../config/types'; -import { Field, fieldAffectsData, fieldIsPresentationalOnly } from '../../fields/config/types'; -import flattenTopLevelFields from '../../utilities/flattenTopLevelFields'; +import { Config } from '../../../../config/types'; +import { Field, fieldAffectsData, fieldIsPresentationalOnly } from '../../../../fields/config/types'; +import flattenTopLevelFields from '../../../../utilities/flattenTopLevelFields'; type Args = { segments: string[] diff --git a/src/mongoose/queries/mock.js b/src/database/adapters/mongoose/queries/mock.js similarity index 100% rename from src/mongoose/queries/mock.js rename to src/database/adapters/mongoose/queries/mock.js diff --git a/src/mongoose/queries/operatorMap.ts b/src/database/adapters/mongoose/queries/operatorMap.ts similarity index 100% rename from src/mongoose/queries/operatorMap.ts rename to src/database/adapters/mongoose/queries/operatorMap.ts diff --git a/src/mongoose/queries/parseParams.ts b/src/database/adapters/mongoose/queries/parseParams.ts similarity index 90% rename from src/mongoose/queries/parseParams.ts rename to src/database/adapters/mongoose/queries/parseParams.ts index d92b146d22..0f973fe54b 100644 --- a/src/mongoose/queries/parseParams.ts +++ b/src/database/adapters/mongoose/queries/parseParams.ts @@ -2,13 +2,13 @@ /* eslint-disable no-await-in-loop */ import { FilterQuery } from 'mongoose'; import deepmerge from 'deepmerge'; -import { Where } from '../../types'; +import { Where } from '../../../../types'; import { buildSearchParam } from './buildSearchParams'; -import { combineMerge } from '../../utilities/combineMerge'; +import { combineMerge } from '../../../../utilities/combineMerge'; import { buildAndOrConditions } from './buildAndOrConditions'; -import { Field } from '../../fields/config/types'; -import { validOperators } from '../../database/queryValidation/types'; -import { Payload } from '../..'; +import { Field } from '../../../../fields/config/types'; +import { validOperators } from '../../../queryValidation/types'; +import { Payload } from '../../../..'; export async function parseParams({ where, diff --git a/src/mongoose/queries/sanitizeQueryValue.ts b/src/database/adapters/mongoose/queries/sanitizeQueryValue.ts similarity index 95% rename from src/mongoose/queries/sanitizeQueryValue.ts rename to src/database/adapters/mongoose/queries/sanitizeQueryValue.ts index 20a9c9f84e..c7a411b269 100644 --- a/src/mongoose/queries/sanitizeQueryValue.ts +++ b/src/database/adapters/mongoose/queries/sanitizeQueryValue.ts @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; -import { createArrayFromCommaDelineated } from '../../utilities/createArrayFromCommaDelineated'; -import { Field, TabAsField } from '../../fields/config/types'; +import { createArrayFromCommaDelineated } from '../../../../utilities/createArrayFromCommaDelineated'; +import { Field, TabAsField } from '../../../../fields/config/types'; type SanitizeQueryValueArgs = { field: Field | TabAsField diff --git a/src/mongoose/queryDrafts.ts b/src/database/adapters/mongoose/queryDrafts.ts similarity index 92% rename from src/mongoose/queryDrafts.ts rename to src/database/adapters/mongoose/queryDrafts.ts index 7e33cdfb2b..6034ccd351 100644 --- a/src/mongoose/queryDrafts.ts +++ b/src/database/adapters/mongoose/queryDrafts.ts @@ -1,11 +1,11 @@ import { PaginateOptions } from 'mongoose'; import type { MongooseAdapter } from '.'; -import type { QueryDrafts } from '../database/types'; -import flattenWhereToOperators from '../database/flattenWhereToOperators'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import type { QueryDrafts } from '../../types'; +import flattenWhereToOperators from '../../flattenWhereToOperators'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { buildSortParam } from './queries/buildSortParam'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; type AggregateVersion = { _id: string; diff --git a/src/mongoose/testCredentials.ts b/src/database/adapters/mongoose/testCredentials.ts similarity index 100% rename from src/mongoose/testCredentials.ts rename to src/database/adapters/mongoose/testCredentials.ts diff --git a/src/mongoose/transactions/beginTransaction.ts b/src/database/adapters/mongoose/transactions/beginTransaction.ts similarity index 91% rename from src/mongoose/transactions/beginTransaction.ts rename to src/database/adapters/mongoose/transactions/beginTransaction.ts index 918448652b..1f1afef061 100644 --- a/src/mongoose/transactions/beginTransaction.ts +++ b/src/database/adapters/mongoose/transactions/beginTransaction.ts @@ -1,7 +1,7 @@ import type { TransactionOptions } from 'mongodb'; import { v4 as uuid } from 'uuid'; -import { BeginTransaction } from '../../database/types'; -import { APIError } from '../../errors'; +import { BeginTransaction } from '../../../types'; +import { APIError } from '../../../../errors'; let transactionsNotAvailable; export const beginTransaction: BeginTransaction = async function beginTransaction( diff --git a/src/mongoose/transactions/commitTransaction.ts b/src/database/adapters/mongoose/transactions/commitTransaction.ts similarity index 87% rename from src/mongoose/transactions/commitTransaction.ts rename to src/database/adapters/mongoose/transactions/commitTransaction.ts index f55c7f3fd8..bdd6bbcf94 100644 --- a/src/mongoose/transactions/commitTransaction.ts +++ b/src/database/adapters/mongoose/transactions/commitTransaction.ts @@ -1,4 +1,4 @@ -import { CommitTransaction } from '../../database/types'; +import { CommitTransaction } from '../../../types'; export const commitTransaction: CommitTransaction = async function commitTransaction(id) { diff --git a/src/mongoose/transactions/rollbackTransaction.ts b/src/database/adapters/mongoose/transactions/rollbackTransaction.ts similarity index 85% rename from src/mongoose/transactions/rollbackTransaction.ts rename to src/database/adapters/mongoose/transactions/rollbackTransaction.ts index 36d6acbc9b..bc716798c8 100644 --- a/src/mongoose/transactions/rollbackTransaction.ts +++ b/src/database/adapters/mongoose/transactions/rollbackTransaction.ts @@ -1,4 +1,4 @@ -import { RollbackTransaction } from '../../database/types'; +import { RollbackTransaction } from '../../../types'; export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(id = '') { diff --git a/src/mongoose/types.ts b/src/database/adapters/mongoose/types.ts similarity index 100% rename from src/mongoose/types.ts rename to src/database/adapters/mongoose/types.ts diff --git a/src/mongoose/updateGlobal.ts b/src/database/adapters/mongoose/updateGlobal.ts similarity index 77% rename from src/mongoose/updateGlobal.ts rename to src/database/adapters/mongoose/updateGlobal.ts index c06c02f02c..504fcb8ff4 100644 --- a/src/mongoose/updateGlobal.ts +++ b/src/database/adapters/mongoose/updateGlobal.ts @@ -1,8 +1,8 @@ import type { MongooseAdapter } from '.'; -import type { UpdateGlobal } from '../database/types'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; +import type { UpdateGlobal } from '../../types'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const updateGlobal: UpdateGlobal = async function updateGlobal( this: MongooseAdapter, diff --git a/src/mongoose/updateOne.ts b/src/database/adapters/mongoose/updateOne.ts similarity index 79% rename from src/mongoose/updateOne.ts rename to src/database/adapters/mongoose/updateOne.ts index eb15e06705..290f8e5f22 100644 --- a/src/mongoose/updateOne.ts +++ b/src/database/adapters/mongoose/updateOne.ts @@ -1,10 +1,10 @@ import type { MongooseAdapter } from '.'; -import type { UpdateOne } from '../database/types'; -import { ValidationError } from '../errors'; -import sanitizeInternalFields from '../utilities/sanitizeInternalFields'; -import { i18nInit } from '../translations/init'; +import type { UpdateOne } from '../../types'; +import { ValidationError } from '../../../errors'; +import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields'; +import { i18nInit } from '../../../translations/init'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const updateOne: UpdateOne = async function updateOne( this: MongooseAdapter, diff --git a/src/mongoose/updateVersion.ts b/src/database/adapters/mongoose/updateVersion.ts similarity index 89% rename from src/mongoose/updateVersion.ts rename to src/database/adapters/mongoose/updateVersion.ts index 3d05f09f2c..3dae205241 100644 --- a/src/mongoose/updateVersion.ts +++ b/src/database/adapters/mongoose/updateVersion.ts @@ -1,7 +1,7 @@ import type { MongooseAdapter } from '.'; -import type { UpdateVersion } from '../database/types'; +import type { UpdateVersion } from '../../types'; import { withSession } from './withSession'; -import { PayloadRequest } from '../express/types'; +import { PayloadRequest } from '../../../express/types'; export const updateVersion: UpdateVersion = async function updateVersion( this: MongooseAdapter, diff --git a/src/mongoose/webpack.ts b/src/database/adapters/mongoose/webpack.ts similarity index 84% rename from src/mongoose/webpack.ts rename to src/database/adapters/mongoose/webpack.ts index f6c6791a47..e88332c977 100644 --- a/src/mongoose/webpack.ts +++ b/src/database/adapters/mongoose/webpack.ts @@ -1,5 +1,5 @@ import path from 'path'; -import type { Webpack } from '../database/types'; +import type { Webpack } from '../../types'; export const webpack: Webpack = (config) => ({ ...config, diff --git a/src/mongoose/withSession.ts b/src/database/adapters/mongoose/withSession.ts similarity index 100% rename from src/mongoose/withSession.ts rename to src/database/adapters/mongoose/withSession.ts diff --git a/src/database/queryValidation/validateSearchParams.ts b/src/database/queryValidation/validateSearchParams.ts index 90aebea1dd..149eaa867c 100644 --- a/src/database/queryValidation/validateSearchParams.ts +++ b/src/database/queryValidation/validateSearchParams.ts @@ -1,6 +1,6 @@ import { Field, fieldAffectsData } from '../../fields/config/types'; import { PayloadRequest } from '../../express/types'; -import { getLocalizedPaths } from '../../mongoose/queries/getLocalizedPaths'; +import { getLocalizedPaths } from '../adapters/mongoose/queries/getLocalizedPaths'; import { getEntityPolicies } from '../../utilities/getEntityPolicies'; import { SanitizedCollectionConfig } from '../../collections/config/types'; import { SanitizedGlobalConfig } from '../../globals/config/types'; diff --git a/src/payload.ts b/src/payload.ts index 61f538ee28..d81ebedc50 100644 --- a/src/payload.ts +++ b/src/payload.ts @@ -58,7 +58,7 @@ import findConfig from './config/find'; import { defaults as emailDefaults } from './email/defaults'; import type { DatabaseAdapter } from '.'; -import { mongooseAdapter } from './mongoose'; +import { mongooseAdapter } from './database/adapters/mongoose'; import type { PaginatedDocs } from './database/types'; /**