From 948dae5b63fa82cf920949ceb68792c87ef9237e Mon Sep 17 00:00:00 2001 From: James Date: Mon, 31 Jul 2023 15:16:20 -0400 Subject: [PATCH] chore: path cleanup --- packages/db-mongodb/package.json | 5 ++++- .../db-mongodb/src/queries/buildAndOrConditions.ts | 6 +++--- packages/db-mongodb/src/queries/buildQuery.ts | 8 ++++---- packages/db-mongodb/src/queries/buildSearchParams.ts | 10 +++++----- packages/db-mongodb/src/queries/buildSortParam.ts | 4 ++-- .../src/queries/getLocalizedSortProperty.spec.ts | 2 +- .../db-mongodb/src/queries/getLocalizedSortProperty.ts | 6 +++--- packages/db-mongodb/src/queries/parseParams.ts | 10 +++++----- packages/db-mongodb/src/queries/sanitizeQueryValue.ts | 4 ++-- .../db-mongodb/src/transactions/beginTransaction.ts | 4 ++-- .../db-mongodb/src/transactions/commitTransaction.ts | 3 +-- .../db-mongodb/src/transactions/rollbackTransaction.ts | 3 +-- .../src/utilities/createArrayFromCommaDelineated.ts | 7 +++++++ packages/db-mongodb/yarn.lock | 2 +- 14 files changed, 41 insertions(+), 33 deletions(-) create mode 100644 packages/db-mongodb/src/utilities/createArrayFromCommaDelineated.ts diff --git a/packages/db-mongodb/package.json b/packages/db-mongodb/package.json index a2a686866..1bad57af7 100644 --- a/packages/db-mongodb/package.json +++ b/packages/db-mongodb/package.json @@ -16,9 +16,12 @@ "typescript": "^4.9.4" }, "dependencies": { + "bson-objectid": "^2.0.4", + "deepmerge": "^4.3.1", "get-port": "^7.0.0", "mongoose": "6.11.4", "mongoose-aggregate-paginate-v2": "^1.0.6", - "mongoose-paginate-v2": "1.7.22" + "mongoose-paginate-v2": "1.7.22", + "uuid": "^9.0.0" } } diff --git a/packages/db-mongodb/src/queries/buildAndOrConditions.ts b/packages/db-mongodb/src/queries/buildAndOrConditions.ts index 00297aa71..5a3b5effa 100644 --- a/packages/db-mongodb/src/queries/buildAndOrConditions.ts +++ b/packages/db-mongodb/src/queries/buildAndOrConditions.ts @@ -1,7 +1,7 @@ -import { Where } from '../../../../../types'; +import { Where } from 'payload/types'; +import { Field } from 'payload/dist/fields/config/types'; +import { Payload } from 'payload'; import { parseParams } from './parseParams'; -import { Field } from '../../../../../fields/config/types'; -import { Payload } from '../../../../..'; export async function buildAndOrConditions({ where, diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts index 448eb58fe..30c884d33 100644 --- a/packages/db-mongodb/src/queries/buildQuery.ts +++ b/packages/db-mongodb/src/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 'payload/dist/types'; +import { Field } from 'payload/dist/fields/config/types'; +import QueryError from 'payload/dist/errors/QueryError'; +import { Payload } from 'payload'; import { parseParams } from './parseParams'; -import { Payload } from '../../../../..'; type GetBuildQueryPluginArgs = { collectionSlug?: string diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts index f63359dff..38efb9071 100644 --- a/packages/db-mongodb/src/queries/buildSearchParams.ts +++ b/packages/db-mongodb/src/queries/buildSearchParams.ts @@ -1,12 +1,12 @@ import mongoose from 'mongoose'; import objectID from 'bson-objectid'; -import { getLocalizedPaths } from 'payload/database/getLocalizedPaths'; -import { Field, fieldAffectsData } from '../../../../../fields/config/types'; +import { getLocalizedPaths } from 'payload/dist/database/getLocalizedPaths'; +import { Field, fieldAffectsData } from 'payload/dist/fields/config/types'; +import { PathToQuery, validOperators } from 'payload/dist/database/queryValidation/types'; +import { Payload } from 'payload'; import { operatorMap } from './operatorMap'; import { sanitizeQueryValue } from './sanitizeQueryValue'; -import { PathToQuery, validOperators } from '../../../../queryValidation/types'; -import { Payload } from '../../../../..'; -import { MongooseAdapter } from '../..'; +import { MongooseAdapter } from '..'; type SearchParam = { path?: string, diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts index 75885d28c..d1809b08d 100644 --- a/packages/db-mongodb/src/queries/buildSortParam.ts +++ b/packages/db-mongodb/src/queries/buildSortParam.ts @@ -1,7 +1,7 @@ import { PaginateOptions } from 'mongoose'; -import { Config } from '../../../../../config/types'; +import { Config } from 'payload/dist/config/types'; +import { Field } from 'payload/dist/fields/config/types'; import { getLocalizedSortProperty } from './getLocalizedSortProperty'; -import { Field } from '../../../../../fields/config/types'; type Args = { sort: string diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts index fdd035def..1ca8b8d1a 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts +++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts @@ -1,4 +1,4 @@ -import { Config } from '../../../../../config/types'; +import { Config } from 'payload/dist/config/types'; import { getLocalizedSortProperty } from './getLocalizedSortProperty'; const config = { diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts index efc90f4ef..f02e1be1d 100644 --- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts +++ b/packages/db-mongodb/src/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 'payload/dist/config/types'; +import { Field, fieldAffectsData, fieldIsPresentationalOnly } from 'payload/dist/fields/config/types'; +import flattenTopLevelFields from 'payload/dist/utilities/flattenTopLevelFields'; type Args = { segments: string[] diff --git a/packages/db-mongodb/src/queries/parseParams.ts b/packages/db-mongodb/src/queries/parseParams.ts index 4cbfbdecb..3ecd3d247 100644 --- a/packages/db-mongodb/src/queries/parseParams.ts +++ b/packages/db-mongodb/src/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 'payload/types'; +import { combineMerge } from 'payload/dist/utilities/combineMerge'; +import { Field } from 'payload/dist/fields/config/types'; +import { validOperators } from 'payload/dist/database/queryValidation/types'; +import { Payload } from 'payload'; import { buildSearchParam } from './buildSearchParams'; -import { combineMerge } from '../../../../../utilities/combineMerge'; import { buildAndOrConditions } from './buildAndOrConditions'; -import { Field } from '../../../../../fields/config/types'; -import { validOperators } from '../../../../queryValidation/types'; -import { Payload } from '../../../../..'; export async function parseParams({ where, diff --git a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts index 2bd7d4e7f..0d573df81 100644 --- a/packages/db-mongodb/src/queries/sanitizeQueryValue.ts +++ b/packages/db-mongodb/src/queries/sanitizeQueryValue.ts @@ -1,6 +1,6 @@ import mongoose from 'mongoose'; -import { createArrayFromCommaDelineated } from '../../../../../utilities/createArrayFromCommaDelineated'; -import { Field, TabAsField } from '../../../../../fields/config/types'; +import { Field, TabAsField } from 'payload/dist/fields/config/types'; +import { createArrayFromCommaDelineated } from '../utilities/createArrayFromCommaDelineated'; type SanitizeQueryValueArgs = { field: Field | TabAsField diff --git a/packages/db-mongodb/src/transactions/beginTransaction.ts b/packages/db-mongodb/src/transactions/beginTransaction.ts index 45f14c9bd..49c9b0b2a 100644 --- a/packages/db-mongodb/src/transactions/beginTransaction.ts +++ b/packages/db-mongodb/src/transactions/beginTransaction.ts @@ -1,7 +1,7 @@ import type { TransactionOptions } from 'mongodb'; import { v4 as uuid } from 'uuid'; -import { BeginTransaction } from '../../../../types'; -import { APIError } from '../../../../../errors'; +import { BeginTransaction } from 'payload/dist/database/types'; +import { APIError } from 'payload/dist/errors'; let transactionsNotAvailable; export const beginTransaction: BeginTransaction = async function beginTransaction( diff --git a/packages/db-mongodb/src/transactions/commitTransaction.ts b/packages/db-mongodb/src/transactions/commitTransaction.ts index 88e78d316..feca8b270 100644 --- a/packages/db-mongodb/src/transactions/commitTransaction.ts +++ b/packages/db-mongodb/src/transactions/commitTransaction.ts @@ -1,5 +1,4 @@ -import { CommitTransaction } from '../../../../types'; - +import { CommitTransaction } from 'payload/dist/database/types'; export const commitTransaction: CommitTransaction = async function commitTransaction(id) { if (!this.connection.get('replicaSet')) { diff --git a/packages/db-mongodb/src/transactions/rollbackTransaction.ts b/packages/db-mongodb/src/transactions/rollbackTransaction.ts index 7a31c24b7..d8f3cf827 100644 --- a/packages/db-mongodb/src/transactions/rollbackTransaction.ts +++ b/packages/db-mongodb/src/transactions/rollbackTransaction.ts @@ -1,5 +1,4 @@ -import { RollbackTransaction } from '../../../../types'; - +import { RollbackTransaction } from 'payload/dist/database/types'; export const rollbackTransaction: RollbackTransaction = async function rollbackTransaction(id = '') { if (!this.session[id]?.inTransaction()) { diff --git a/packages/db-mongodb/src/utilities/createArrayFromCommaDelineated.ts b/packages/db-mongodb/src/utilities/createArrayFromCommaDelineated.ts new file mode 100644 index 000000000..90949cf75 --- /dev/null +++ b/packages/db-mongodb/src/utilities/createArrayFromCommaDelineated.ts @@ -0,0 +1,7 @@ +export function createArrayFromCommaDelineated(input: string): string[] { + if (Array.isArray(input)) return input; + if (input.indexOf(',') > -1) { + return input.split(','); + } + return [input]; +} diff --git a/packages/db-mongodb/yarn.lock b/packages/db-mongodb/yarn.lock index f71a64b4b..dc0897ae4 100644 --- a/packages/db-mongodb/yarn.lock +++ b/packages/db-mongodb/yarn.lock @@ -2731,7 +2731,7 @@ deep-extend@^0.6.0: resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA== -deepmerge@^4.0.0, deepmerge@^4.2.2: +deepmerge@^4.0.0, deepmerge@^4.2.2, deepmerge@^4.3.1: version "4.3.1" resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==