From 2fdbf1d212f5090499448e67ee30406e91c6fc1a Mon Sep 17 00:00:00 2001
From: Alessio Gravili <alessio@gravili.de>
Date: Fri, 25 Aug 2023 15:44:31 +0000
Subject: [PATCH] chore: more work on imports and exports

---
 .../src/queries/buildAndOrConditions.ts       |  3 +-
 packages/db-mongodb/src/queries/buildQuery.ts |  5 +--
 .../src/queries/buildSearchParams.ts          |  8 ++--
 .../db-mongodb/src/queries/buildSortParam.ts  |  4 +-
 .../queries/getLocalizedSortProperty.spec.ts  |  4 +-
 .../src/queries/getLocalizedSortProperty.ts   |  6 +--
 .../db-mongodb/src/queries/parseParams.ts     | 10 ++---
 packages/payload/src/errors/index.ts          |  1 +
 packages/payload/src/exports/config.ts        |  8 ++++
 packages/payload/src/exports/database.ts      | 15 ++++++-
 packages/payload/src/exports/errors.ts        |  1 +
 packages/payload/src/exports/fields/config.ts |  1 -
 packages/payload/src/exports/types.ts         | 44 +++++++++++++++++++
 packages/payload/src/exports/utilities.ts     |  2 +
 14 files changed, 89 insertions(+), 23 deletions(-)
 delete mode 100644 packages/payload/src/exports/fields/config.ts

diff --git a/packages/db-mongodb/src/queries/buildAndOrConditions.ts b/packages/db-mongodb/src/queries/buildAndOrConditions.ts
index 5a3b5effa..15d852a52 100644
--- a/packages/db-mongodb/src/queries/buildAndOrConditions.ts
+++ b/packages/db-mongodb/src/queries/buildAndOrConditions.ts
@@ -1,5 +1,4 @@
-import { Where } from 'payload/types';
-import { Field } from 'payload/dist/fields/config/types';
+import { Where, Field } from 'payload/types';
 import { Payload } from 'payload';
 import { parseParams } from './parseParams';
 
diff --git a/packages/db-mongodb/src/queries/buildQuery.ts b/packages/db-mongodb/src/queries/buildQuery.ts
index 30c884d33..bda485e9b 100644
--- a/packages/db-mongodb/src/queries/buildQuery.ts
+++ b/packages/db-mongodb/src/queries/buildQuery.ts
@@ -1,6 +1,5 @@
-import { Where } from 'payload/dist/types';
-import { Field } from 'payload/dist/fields/config/types';
-import QueryError from 'payload/dist/errors/QueryError';
+import { Where, Field } from 'payload/types';
+import { QueryError } from 'payload/errors';
 import { Payload } from 'payload';
 import { parseParams } from './parseParams';
 
diff --git a/packages/db-mongodb/src/queries/buildSearchParams.ts b/packages/db-mongodb/src/queries/buildSearchParams.ts
index 2ebeaed34..a6ee12b1a 100644
--- a/packages/db-mongodb/src/queries/buildSearchParams.ts
+++ b/packages/db-mongodb/src/queries/buildSearchParams.ts
@@ -1,9 +1,9 @@
 import mongoose from 'mongoose';
 import objectID from 'bson-objectid';
-import { getLocalizedPaths } from 'payload/dist/database/getLocalizedPaths';
-import { Field, fieldAffectsData } from 'payload/dist/fields/config/types';
-import { PathToQuery } from 'payload/dist/database/queryValidation/types';
-import { validOperators } from 'payload/dist/types/constants';
+import { getLocalizedPaths } from 'payload/database';
+import { Field, fieldAffectsData } from 'payload/types';
+import { PathToQuery } from 'payload/database';
+import { validOperators } from 'payload/types';
 import { Payload } from 'payload';
 import { Operator } from 'payload/types';
 import { operatorMap } from './operatorMap';
diff --git a/packages/db-mongodb/src/queries/buildSortParam.ts b/packages/db-mongodb/src/queries/buildSortParam.ts
index 6d1d54bd1..847ec93fe 100644
--- a/packages/db-mongodb/src/queries/buildSortParam.ts
+++ b/packages/db-mongodb/src/queries/buildSortParam.ts
@@ -1,6 +1,6 @@
 import { PaginateOptions } from 'mongoose';
-import { SanitizedConfig } from 'payload/dist/config/types';
-import { Field } from 'payload/dist/fields/config/types';
+import { SanitizedConfig } from 'payload/config';
+import { Field } from 'payload/types';
 import { getLocalizedSortProperty } from './getLocalizedSortProperty';
 
 type Args = {
diff --git a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts
index 2737ea47b..40a3b0edc 100644
--- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts
+++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.spec.ts
@@ -1,5 +1,5 @@
-import { sanitizeConfig } from 'payload/dist/config/sanitize';
-import { Config } from 'payload/dist/config/types';
+import { sanitizeConfig } from 'payload/config';
+import { Config } from 'payload/config';
 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 8fdee83e5..4a70119b3 100644
--- a/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts
+++ b/packages/db-mongodb/src/queries/getLocalizedSortProperty.ts
@@ -1,6 +1,6 @@
-import { SanitizedConfig } from 'payload/dist/config/types';
-import { Field, fieldAffectsData, fieldIsPresentationalOnly } from 'payload/dist/fields/config/types';
-import flattenTopLevelFields from 'payload/dist/utilities/flattenTopLevelFields';
+import { SanitizedConfig } from 'payload/config';
+import { Field, fieldAffectsData, fieldIsPresentationalOnly } from 'payload/types';
+import { flattenTopLevelFields } from 'payload/utilities';
 
 type Args = {
   segments: string[]
diff --git a/packages/db-mongodb/src/queries/parseParams.ts b/packages/db-mongodb/src/queries/parseParams.ts
index 070e276fd..c5f572a03 100644
--- a/packages/db-mongodb/src/queries/parseParams.ts
+++ b/packages/db-mongodb/src/queries/parseParams.ts
@@ -2,10 +2,10 @@
 /* eslint-disable no-await-in-loop */
 import { FilterQuery } from 'mongoose';
 import deepmerge from 'deepmerge';
-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/types/constants';
+import { Operator, Where } from 'payload/types';
+import { combineMerge } from 'payload/utilities';
+import { Field } from 'payload/types';
+import { validOperators } from 'payload/types';
 import { Payload } from 'payload';
 import { buildSearchParam } from './buildSearchParams';
 import { buildAndOrConditions } from './buildAndOrConditions';
@@ -54,7 +54,7 @@ export async function parseParams({
         const pathOperators = where[relationOrPath];
         if (typeof pathOperators === 'object') {
           for (const operator of Object.keys(pathOperators)) {
-            if (validOperators.includes(operator)) {
+            if (validOperators.includes(operator as Operator)) {
               const searchParam = await buildSearchParam({
                 collectionSlug,
                 globalSlug,
diff --git a/packages/payload/src/errors/index.ts b/packages/payload/src/errors/index.ts
index cca8cb106..4aeae33c6 100644
--- a/packages/payload/src/errors/index.ts
+++ b/packages/payload/src/errors/index.ts
@@ -16,3 +16,4 @@ export { default as MissingFieldType } from './MissingFieldType';
 export { default as MissingFile } from './MissingFile';
 export { default as NotFound } from './NotFound';
 export { default as ValidationError } from './ValidationError';
+export { default as QueryError } from './QueryError';
diff --git a/packages/payload/src/exports/config.ts b/packages/payload/src/exports/config.ts
index 85aa272cd..e73d26456 100644
--- a/packages/payload/src/exports/config.ts
+++ b/packages/payload/src/exports/config.ts
@@ -1,2 +1,10 @@
 export { buildConfig } from '../config/build';
 export * from '../config/types';
+
+export {
+    sanitizeConfig
+} from '../config/sanitize';
+
+export {
+    defaults
+} from '../config/defaults';
\ No newline at end of file
diff --git a/packages/payload/src/exports/database.ts b/packages/payload/src/exports/database.ts
index 034dcc606..7ff1918ad 100644
--- a/packages/payload/src/exports/database.ts
+++ b/packages/payload/src/exports/database.ts
@@ -102,4 +102,17 @@ export {
 
 export {
    readMigrationFiles
-} from '../database/migrations/readMigrationFiles'
\ No newline at end of file
+} from '../database/migrations/readMigrationFiles'
+
+export {
+   EntityPolicies,
+   PathToQuery
+} from '../database/queryValidation/types'
+
+export {
+   validateQueryPaths
+} from '../database/queryValidation/validateQueryPaths'
+
+export {
+   validateSearchParam
+} from '../database/queryValidation/validateSearchParams'
\ No newline at end of file
diff --git a/packages/payload/src/exports/errors.ts b/packages/payload/src/exports/errors.ts
index 54517bf1c..84d8111ba 100644
--- a/packages/payload/src/exports/errors.ts
+++ b/packages/payload/src/exports/errors.ts
@@ -16,4 +16,5 @@ export {
     MissingFile,
     NotFound,
     ValidationError,
+    QueryError
 } from '../errors'
\ No newline at end of file
diff --git a/packages/payload/src/exports/fields/config.ts b/packages/payload/src/exports/fields/config.ts
deleted file mode 100644
index 2af413ad2..000000000
--- a/packages/payload/src/exports/fields/config.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from '../../fields/config/types';
\ No newline at end of file
diff --git a/packages/payload/src/exports/types.ts b/packages/payload/src/exports/types.ts
index ed523ca20..0afcbba10 100644
--- a/packages/payload/src/exports/types.ts
+++ b/packages/payload/src/exports/types.ts
@@ -1,5 +1,10 @@
 export * from './../types';
 
+export {
+  validOperators
+} from './../types/constants';
+
+
 export {
   AccessArgs,
   Access,
@@ -65,6 +70,45 @@ export {
   TabsField,
   UIField,
   Validate,
+  Condition,
+  FieldAffectingData,
+  FieldBase,
+  FieldHookArgs,
+  FieldPresentationalOnly,
+  FieldWithMany,
+  FieldWithMaxDepth,
+  FieldWithSubFields,
+  FilterOptions,
+  FilterOptionsProps,
+  HookName,
+  Labels,
+  NamedTab,
+  NonPresentationalField,
+  Option,
+  OptionObject,
+  RelationshipValue,
+  RichTextElement,
+  RichTextLeaf,
+  RowAdmin,
+  Tab,
+  TabAsField,
+  TabsAdmin,
+  UnnamedTab,
+  ValidateOptions,
+  ValueWithRelation,
+  fieldAffectsData,
+  fieldHasMaxDepth,
+  fieldHasSubFields,
+  fieldIsArrayType,
+  fieldIsBlockType,
+  fieldIsLocalized,
+  fieldIsPresentationalOnly,
+  fieldSupportsMany,
+  optionIsObject,
+  optionIsValue,
+  optionsAreObjects,
+  tabHasName,
+  valueIsValueWithRelation,
 } from './../fields/config/types';
 
 export {
diff --git a/packages/payload/src/exports/utilities.ts b/packages/payload/src/exports/utilities.ts
index 8174fd44f..b383ff3c9 100644
--- a/packages/payload/src/exports/utilities.ts
+++ b/packages/payload/src/exports/utilities.ts
@@ -1,3 +1,5 @@
 export { entityToJSONSchema } from '../utilities/configToJSONSchema';
+export { default as flattenTopLevelFields } from '../utilities/flattenTopLevelFields';
+export { combineMerge } from '../utilities/combineMerge';
 
 export { i18nInit } from '../translations/init'
\ No newline at end of file