chore: path cleanup

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"
   }
 }

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,

packages/db-mongodb/src/queries/buildQuery.ts

@@ -1,8 +1,8 @@
-import { Where } from '../../../../../types';
+import { Where } from 'payload/dist/types';
-import { Field } from '../../../../../fields/config/types';
+import { Field } from 'payload/dist/fields/config/types';
-import QueryError from '../../../../../errors/QueryError';
+import QueryError from 'payload/dist/errors/QueryError';
+import { Payload } from 'payload';
 import { parseParams } from './parseParams';
-import { Payload } from '../../../../..';
 
 type GetBuildQueryPluginArgs = {
   collectionSlug?: string

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 { getLocalizedPaths } from 'payload/dist/database/getLocalizedPaths';
-import { Field, fieldAffectsData } from '../../../../../fields/config/types';
+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 { MongooseAdapter } from '..';
-import { Payload } from '../../../../..';
-import { MongooseAdapter } from '../..';
 
 type SearchParam = {
   path?: string,

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

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

packages/db-mongodb/src/queries/getLocalizedSortProperty.ts

@@ -1,6 +1,6 @@
-import { Config } from '../../../../../config/types';
+import { Config } from 'payload/dist/config/types';
-import { Field, fieldAffectsData, fieldIsPresentationalOnly } from '../../../../../fields/config/types';
+import { Field, fieldAffectsData, fieldIsPresentationalOnly } from 'payload/dist/fields/config/types';
-import flattenTopLevelFields from '../../../../../utilities/flattenTopLevelFields';
+import flattenTopLevelFields from 'payload/dist/utilities/flattenTopLevelFields';
 
 type Args = {
   segments: string[]

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,

packages/db-mongodb/src/queries/sanitizeQueryValue.ts

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose';
-import { createArrayFromCommaDelineated } from '../../../../../utilities/createArrayFromCommaDelineated';
+import { Field, TabAsField } from 'payload/dist/fields/config/types';
-import { Field, TabAsField } from '../../../../../fields/config/types';
+import { createArrayFromCommaDelineated } from '../utilities/createArrayFromCommaDelineated';
 
 type SanitizeQueryValueArgs = {
   field: Field | TabAsField

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 { BeginTransaction } from 'payload/dist/database/types';
-import { APIError } from '../../../../../errors';
+import { APIError } from 'payload/dist/errors';
 
 let transactionsNotAvailable;
 export const beginTransaction: BeginTransaction = async function beginTransaction(

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')) {

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()) {

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];
+}

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