chore: moves mongoose adapter

This commit is contained in:
James
2023-07-29 11:24:35 -04:00
parent 20179ba77b
commit 06b1fe88ca
43 changed files with 101 additions and 101 deletions

View File

@@ -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,

View File

@@ -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(

View File

@@ -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,

View File

@@ -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(

View File

@@ -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 }) {

View File

@@ -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(

View File

@@ -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 }) {

View File

@@ -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(

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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(

View File

@@ -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,

View File

@@ -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';

View File

@@ -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(

View File

@@ -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(

View File

@@ -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';

View File

@@ -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

View File

@@ -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,

View File

@@ -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

View File

@@ -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 = {

View File

@@ -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

View File

@@ -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,

View File

@@ -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[]

View File

@@ -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,

View File

@@ -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

View File

@@ -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<T> = {
_id: string;

View File

@@ -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(

View File

@@ -1,4 +1,4 @@
import { CommitTransaction } from '../../database/types';
import { CommitTransaction } from '../../../types';
export const commitTransaction: CommitTransaction = async function commitTransaction(id) {

View File

@@ -1,4 +1,4 @@
import { RollbackTransaction } from '../../database/types';
import { RollbackTransaction } from '../../../types';
export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(id = '') {

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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,

View File

@@ -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';

View File

@@ -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';
/**