From 6e561b11ca046faa6ec4f435a9665399e62b12cf Mon Sep 17 00:00:00 2001 From: Elliot DeNolf Date: Wed, 28 Aug 2024 23:51:03 -0400 Subject: [PATCH] chore(graphql): adjust default exports (#7946) --- packages/graphql/src/index.ts | 12 +++---- .../QueryComplexity.ts | 2 +- .../createComplexityRule.ts | 2 +- packages/graphql/src/resolvers/auth/access.ts | 6 ++-- .../src/resolvers/auth/forgotPassword.ts | 4 +-- packages/graphql/src/resolvers/auth/init.ts | 4 +-- packages/graphql/src/resolvers/auth/login.ts | 4 +-- packages/graphql/src/resolvers/auth/logout.ts | 4 +-- packages/graphql/src/resolvers/auth/me.ts | 4 +-- .../graphql/src/resolvers/auth/refresh.ts | 4 +-- .../src/resolvers/auth/resetPassword.ts | 4 +-- packages/graphql/src/resolvers/auth/unlock.ts | 4 +-- .../graphql/src/resolvers/auth/verifyEmail.ts | 4 +-- .../src/resolvers/collections/create.ts | 2 +- .../src/resolvers/collections/duplicate.ts | 2 +- .../resolvers/collections/restoreVersion.ts | 2 +- .../graphql/src/resolvers/globals/findOne.ts | 2 +- .../src/resolvers/globals/findVersionByID.ts | 2 +- .../src/resolvers/globals/findVersions.ts | 2 +- .../graphql/src/resolvers/globals/index.ts | 10 +++--- .../src/resolvers/globals/restoreVersion.ts | 2 +- .../graphql/src/resolvers/globals/update.ts | 2 +- .../schema/buildFallbackLocaleInputType.ts | 6 ++-- .../src/schema/buildLocaleInputType.ts | 6 ++-- .../src/schema/buildMutationInputType.ts | 6 ++-- .../graphql/src/schema/buildObjectType.ts | 27 ++++------------ .../graphql/src/schema/buildPoliciesType.ts | 4 +-- .../graphql/src/schema/buildWhereInputType.ts | 8 ++--- .../src/schema/fieldToWhereInputSchemaMap.ts | 10 +++--- .../graphql/src/schema/initCollections.ts | 32 +++++++++---------- packages/graphql/src/schema/initGlobals.ts | 28 ++++++++-------- .../graphql/src/schema/isFieldNullable.ts | 4 +-- packages/graphql/src/schema/operators.ts | 4 +-- .../src/schema/recursivelyBuildNestedPaths.ts | 6 ++-- .../graphql/src/schema/withNullableType.ts | 4 +-- packages/graphql/src/schema/withOperators.ts | 6 ++-- .../src/utilities/combineParentName.ts | 6 ++-- .../graphql/src/utilities/formatName.spec.ts | 2 +- packages/graphql/src/utilities/formatName.ts | 4 +-- .../graphql/src/utilities/formatOptions.ts | 6 ++-- .../src/utilities/getCheckIfLocaleObject.ts | 4 --- packages/graphql/src/utilities/uppercase.ts | 11 ------- 42 files changed, 97 insertions(+), 171 deletions(-) delete mode 100644 packages/graphql/src/utilities/getCheckIfLocaleObject.ts delete mode 100644 packages/graphql/src/utilities/uppercase.ts diff --git a/packages/graphql/src/index.ts b/packages/graphql/src/index.ts index 7cf4c64c1..eee7a0ee8 100644 --- a/packages/graphql/src/index.ts +++ b/packages/graphql/src/index.ts @@ -8,12 +8,12 @@ import { fieldExtensionsEstimator, simpleEstimator, } from './packages/graphql-query-complexity/index.js' -import accessResolver from './resolvers/auth/access.js' -import buildFallbackLocaleInputType from './schema/buildFallbackLocaleInputType.js' -import buildLocaleInputType from './schema/buildLocaleInputType.js' -import buildPoliciesType from './schema/buildPoliciesType.js' -import initCollections from './schema/initCollections.js' -import initGlobals from './schema/initGlobals.js' +import { accessResolver } from './resolvers/auth/access.js' +import { buildFallbackLocaleInputType } from './schema/buildFallbackLocaleInputType.js' +import { buildLocaleInputType } from './schema/buildLocaleInputType.js' +import { buildPoliciesType } from './schema/buildPoliciesType.js' +import { initCollections } from './schema/initCollections.js' +import { initGlobals } from './schema/initGlobals.js' import { wrapCustomFields } from './utilities/wrapCustomResolver.js' export function configToSchema(config: SanitizedConfig): { diff --git a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts index 4d96a0ebd..60cc47add 100644 --- a/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts +++ b/packages/graphql/src/packages/graphql-query-complexity/QueryComplexity.ts @@ -122,7 +122,7 @@ export function getComplexity(options: { return visitor.complexity } -export default class QueryComplexity { +export class QueryComplexity { OperationDefinition: Record complexity: number context: ValidationContext diff --git a/packages/graphql/src/packages/graphql-query-complexity/createComplexityRule.ts b/packages/graphql/src/packages/graphql-query-complexity/createComplexityRule.ts index e21680ee3..80415938d 100644 --- a/packages/graphql/src/packages/graphql-query-complexity/createComplexityRule.ts +++ b/packages/graphql/src/packages/graphql-query-complexity/createComplexityRule.ts @@ -2,7 +2,7 @@ import type { ValidationContext } from 'graphql' import type { QueryComplexityOptions } from './QueryComplexity.js' -import QueryComplexity from './QueryComplexity.js' +import { QueryComplexity } from './QueryComplexity.js' export function createComplexityRule( options: QueryComplexityOptions, diff --git a/packages/graphql/src/resolvers/auth/access.ts b/packages/graphql/src/resolvers/auth/access.ts index 0ec80f0ba..0c036baf9 100644 --- a/packages/graphql/src/resolvers/auth/access.ts +++ b/packages/graphql/src/resolvers/auth/access.ts @@ -4,7 +4,7 @@ import { accessOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' -import formatName from '../../utilities/formatName.js' +import { formatName } from '../../utilities/formatName.js' const formatConfigNames = (results, configs) => { const formattedResults = { ...results } @@ -17,7 +17,7 @@ const formatConfigNames = (results, configs) => { return formattedResults } -function accessResolver(config: SanitizedConfig) { +export function accessResolver(config: SanitizedConfig) { async function resolver(_, args, context: Context) { const options = { req: isolateObjectProperty(context.req, 'transactionID'), @@ -34,5 +34,3 @@ function accessResolver(config: SanitizedConfig) { return resolver } - -export default accessResolver diff --git a/packages/graphql/src/resolvers/auth/forgotPassword.ts b/packages/graphql/src/resolvers/auth/forgotPassword.ts index ea1dc7a7b..44d931fd7 100644 --- a/packages/graphql/src/resolvers/auth/forgotPassword.ts +++ b/packages/graphql/src/resolvers/auth/forgotPassword.ts @@ -4,7 +4,7 @@ import { forgotPasswordOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' -function forgotPasswordResolver(collection: Collection): any { +export function forgotPassword(collection: Collection): any { async function resolver(_, args, context: Context) { const options = { collection, @@ -23,5 +23,3 @@ function forgotPasswordResolver(collection: Collection): any { return resolver } - -export default forgotPasswordResolver diff --git a/packages/graphql/src/resolvers/auth/init.ts b/packages/graphql/src/resolvers/auth/init.ts index e9d72cd62..33fa577c2 100644 --- a/packages/graphql/src/resolvers/auth/init.ts +++ b/packages/graphql/src/resolvers/auth/init.ts @@ -2,7 +2,7 @@ import { initOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' -function initResolver(collection: string) { +export function init(collection: string) { async function resolver(_, args, context: Context) { const options = { collection, @@ -14,5 +14,3 @@ function initResolver(collection: string) { return resolver } - -export default initResolver diff --git a/packages/graphql/src/resolvers/auth/login.ts b/packages/graphql/src/resolvers/auth/login.ts index 88e1d1b75..241c204eb 100644 --- a/packages/graphql/src/resolvers/auth/login.ts +++ b/packages/graphql/src/resolvers/auth/login.ts @@ -4,7 +4,7 @@ import { generatePayloadCookie, isolateObjectProperty, loginOperation } from 'pa import type { Context } from '../types.js' -function loginResolver(collection: Collection): any { +export function login(collection: Collection): any { async function resolver(_, args, context: Context) { const options = { collection, @@ -35,5 +35,3 @@ function loginResolver(collection: Collection): any { return resolver } - -export default loginResolver diff --git a/packages/graphql/src/resolvers/auth/logout.ts b/packages/graphql/src/resolvers/auth/logout.ts index 73d9f175b..c81dbb799 100644 --- a/packages/graphql/src/resolvers/auth/logout.ts +++ b/packages/graphql/src/resolvers/auth/logout.ts @@ -4,7 +4,7 @@ import { generateExpiredPayloadCookie, isolateObjectProperty, logoutOperation } import type { Context } from '../types.js' -function logoutResolver(collection: Collection): any { +export function logout(collection: Collection): any { async function resolver(_, args, context: Context) { const options = { collection, @@ -22,5 +22,3 @@ function logoutResolver(collection: Collection): any { return resolver } - -export default logoutResolver diff --git a/packages/graphql/src/resolvers/auth/me.ts b/packages/graphql/src/resolvers/auth/me.ts index 4d5ab0007..29e3701ff 100644 --- a/packages/graphql/src/resolvers/auth/me.ts +++ b/packages/graphql/src/resolvers/auth/me.ts @@ -4,7 +4,7 @@ import { extractJWT, isolateObjectProperty, meOperation } from 'payload' import type { Context } from '../types.js' -function meResolver(collection: Collection): any { +export function me(collection: Collection): any { async function resolver(_, args, context: Context) { const currentToken = extractJWT(context.req) @@ -26,5 +26,3 @@ function meResolver(collection: Collection): any { return resolver } - -export default meResolver diff --git a/packages/graphql/src/resolvers/auth/refresh.ts b/packages/graphql/src/resolvers/auth/refresh.ts index e2af3916a..ef25253e5 100644 --- a/packages/graphql/src/resolvers/auth/refresh.ts +++ b/packages/graphql/src/resolvers/auth/refresh.ts @@ -4,7 +4,7 @@ import { generatePayloadCookie, isolateObjectProperty, refreshOperation } from ' import type { Context } from '../types.js' -function refreshResolver(collection: Collection): any { +export function refresh(collection: Collection): any { async function resolver(_, __, context: Context) { const options = { collection, @@ -29,5 +29,3 @@ function refreshResolver(collection: Collection): any { return resolver } - -export default refreshResolver diff --git a/packages/graphql/src/resolvers/auth/resetPassword.ts b/packages/graphql/src/resolvers/auth/resetPassword.ts index 27d7eda0e..43632df7e 100644 --- a/packages/graphql/src/resolvers/auth/resetPassword.ts +++ b/packages/graphql/src/resolvers/auth/resetPassword.ts @@ -4,7 +4,7 @@ import { generatePayloadCookie, isolateObjectProperty, resetPasswordOperation } import type { Context } from '../types.js' -function resetPasswordResolver(collection: Collection): any { +export function resetPassword(collection: Collection): any { async function resolver(_, args, context: Context) { if (args.locale) context.req.locale = args.locale if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale @@ -34,5 +34,3 @@ function resetPasswordResolver(collection: Collection): any { return resolver } - -export default resetPasswordResolver diff --git a/packages/graphql/src/resolvers/auth/unlock.ts b/packages/graphql/src/resolvers/auth/unlock.ts index cfc86e214..20e4653ce 100644 --- a/packages/graphql/src/resolvers/auth/unlock.ts +++ b/packages/graphql/src/resolvers/auth/unlock.ts @@ -4,7 +4,7 @@ import { isolateObjectProperty, unlockOperation } from 'payload' import type { Context } from '../types.js' -function unlockResolver(collection: Collection) { +export function unlock(collection: Collection) { async function resolver(_, args, context: Context) { const options = { collection, @@ -18,5 +18,3 @@ function unlockResolver(collection: Collection) { return resolver } - -export default unlockResolver diff --git a/packages/graphql/src/resolvers/auth/verifyEmail.ts b/packages/graphql/src/resolvers/auth/verifyEmail.ts index c6d50b055..4cc46350e 100644 --- a/packages/graphql/src/resolvers/auth/verifyEmail.ts +++ b/packages/graphql/src/resolvers/auth/verifyEmail.ts @@ -4,7 +4,7 @@ import { isolateObjectProperty, verifyEmailOperation } from 'payload' import type { Context } from '../types.js' -function verifyEmailResolver(collection: Collection) { +export function verifyEmail(collection: Collection) { async function resolver(_, args, context: Context) { if (args.locale) context.req.locale = args.locale if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale @@ -22,5 +22,3 @@ function verifyEmailResolver(collection: Collection) { return resolver } - -export default verifyEmailResolver diff --git a/packages/graphql/src/resolvers/collections/create.ts b/packages/graphql/src/resolvers/collections/create.ts index 9bd99e5d9..17ad5180d 100644 --- a/packages/graphql/src/resolvers/collections/create.ts +++ b/packages/graphql/src/resolvers/collections/create.ts @@ -22,7 +22,7 @@ export type Resolver = ( }, ) => Promise> -export default function createResolver( +export function createResolver( collection: Collection, ): Resolver { return async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/collections/duplicate.ts b/packages/graphql/src/resolvers/collections/duplicate.ts index 922772a38..b80609b30 100644 --- a/packages/graphql/src/resolvers/collections/duplicate.ts +++ b/packages/graphql/src/resolvers/collections/duplicate.ts @@ -17,7 +17,7 @@ export type Resolver = ( }, ) => Promise -export default function duplicateResolver( +export function duplicateResolver( collection: Collection, ): Resolver> { return async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/resolvers/collections/restoreVersion.ts b/packages/graphql/src/resolvers/collections/restoreVersion.ts index 942e3e473..5fac4fae1 100644 --- a/packages/graphql/src/resolvers/collections/restoreVersion.ts +++ b/packages/graphql/src/resolvers/collections/restoreVersion.ts @@ -15,7 +15,7 @@ export type Resolver = ( }, ) => Promise -export default function restoreVersionResolver(collection: Collection): Resolver { +export function restoreVersionResolver(collection: Collection): Resolver { async function resolver(_, args, context: Context) { const options = { id: args.id, diff --git a/packages/graphql/src/resolvers/globals/findOne.ts b/packages/graphql/src/resolvers/globals/findOne.ts index b8bd357fd..a436afd73 100644 --- a/packages/graphql/src/resolvers/globals/findOne.ts +++ b/packages/graphql/src/resolvers/globals/findOne.ts @@ -4,7 +4,7 @@ import { findOneOperation, isolateObjectProperty } from 'payload' import type { Context } from '../types.js' -export default function findOneResolver(globalConfig: SanitizedGlobalConfig): Document { +export function findOne(globalConfig: SanitizedGlobalConfig): Document { return async function resolver(_, args, context: Context) { if (args.locale) context.req.locale = args.locale if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale diff --git a/packages/graphql/src/resolvers/globals/findVersionByID.ts b/packages/graphql/src/resolvers/globals/findVersionByID.ts index 32f642f42..d93552825 100644 --- a/packages/graphql/src/resolvers/globals/findVersionByID.ts +++ b/packages/graphql/src/resolvers/globals/findVersionByID.ts @@ -17,7 +17,7 @@ export type Resolver = ( }, ) => Promise -export default function findVersionByIDResolver(globalConfig: SanitizedGlobalConfig): Resolver { +export function findVersionByID(globalConfig: SanitizedGlobalConfig): Resolver { return async function resolver(_, args, context: Context) { if (args.locale) context.req.locale = args.locale if (args.fallbackLocale) context.req.fallbackLocale = args.fallbackLocale diff --git a/packages/graphql/src/resolvers/globals/findVersions.ts b/packages/graphql/src/resolvers/globals/findVersions.ts index 1a2151df3..500fe16c7 100644 --- a/packages/graphql/src/resolvers/globals/findVersions.ts +++ b/packages/graphql/src/resolvers/globals/findVersions.ts @@ -19,7 +19,7 @@ export type Resolver = ( }, ) => Promise -export default function findVersionsResolver(globalConfig: SanitizedGlobalConfig): Resolver { +export function findVersions(globalConfig: SanitizedGlobalConfig): Resolver { return async function resolver(_, args, context: Context) { const options = { depth: 0, diff --git a/packages/graphql/src/resolvers/globals/index.ts b/packages/graphql/src/resolvers/globals/index.ts index 06a1258c4..5618c59f0 100644 --- a/packages/graphql/src/resolvers/globals/index.ts +++ b/packages/graphql/src/resolvers/globals/index.ts @@ -1,7 +1,7 @@ -import findOne from './findOne.js' -import findVersionByID from './findVersionByID.js' -import findVersions from './findVersions.js' -import restoreVersion from './restoreVersion.js' -import update from './update.js' +import { findOne } from './findOne.js' +import { findVersionByID } from './findVersionByID.js' +import { findVersions } from './findVersions.js' +import { restoreVersion } from './restoreVersion.js' +import { update } from './update.js' export { findOne, findVersionByID, findVersions, restoreVersion, update } diff --git a/packages/graphql/src/resolvers/globals/restoreVersion.ts b/packages/graphql/src/resolvers/globals/restoreVersion.ts index c7c1b9216..3bc8f2a80 100644 --- a/packages/graphql/src/resolvers/globals/restoreVersion.ts +++ b/packages/graphql/src/resolvers/globals/restoreVersion.ts @@ -14,7 +14,7 @@ type Resolver = ( req: PayloadRequest }, ) => Promise -export default function restoreVersionResolver(globalConfig: SanitizedGlobalConfig): Resolver { +export function restoreVersion(globalConfig: SanitizedGlobalConfig): Resolver { return async function resolver(_, args, context: Context) { const options = { id: args.id, diff --git a/packages/graphql/src/resolvers/globals/update.ts b/packages/graphql/src/resolvers/globals/update.ts index 9edce3ff3..421da1b83 100644 --- a/packages/graphql/src/resolvers/globals/update.ts +++ b/packages/graphql/src/resolvers/globals/update.ts @@ -18,7 +18,7 @@ type Resolver = ( }, ) => Promise> -export default function updateResolver( +export function update( globalConfig: SanitizedGlobalConfig, ): Resolver { return async function resolver(_, args, context: Context) { diff --git a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts index 5b5ee0e8d..d7cf5834e 100644 --- a/packages/graphql/src/schema/buildFallbackLocaleInputType.ts +++ b/packages/graphql/src/schema/buildFallbackLocaleInputType.ts @@ -2,9 +2,9 @@ import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' -import formatName from '../utilities/formatName.js' +import { formatName } from '../utilities/formatName.js' -const buildFallbackLocaleInputType = ( +export const buildFallbackLocaleInputType = ( localization: SanitizedLocalizationConfig, ): GraphQLEnumType => { return new GraphQLEnumType({ @@ -20,5 +20,3 @@ const buildFallbackLocaleInputType = ( ), }) } - -export default buildFallbackLocaleInputType diff --git a/packages/graphql/src/schema/buildLocaleInputType.ts b/packages/graphql/src/schema/buildLocaleInputType.ts index 73d414e04..d6c36e902 100644 --- a/packages/graphql/src/schema/buildLocaleInputType.ts +++ b/packages/graphql/src/schema/buildLocaleInputType.ts @@ -3,9 +3,9 @@ import type { SanitizedLocalizationConfig } from 'payload' import { GraphQLEnumType } from 'graphql' -import formatName from '../utilities/formatName.js' +import { formatName } from '../utilities/formatName.js' -const buildLocaleInputType = ( +export const buildLocaleInputType = ( localization: SanitizedLocalizationConfig, ): GraphQLEnumType | GraphQLScalarType => { return new GraphQLEnumType({ @@ -21,5 +21,3 @@ const buildLocaleInputType = ( ), }) } - -export default buildLocaleInputType diff --git a/packages/graphql/src/schema/buildMutationInputType.ts b/packages/graphql/src/schema/buildMutationInputType.ts index 87b31e7a7..cdfb10405 100644 --- a/packages/graphql/src/schema/buildMutationInputType.ts +++ b/packages/graphql/src/schema/buildMutationInputType.ts @@ -40,10 +40,10 @@ import { flattenTopLevelFields, toWords } from 'payload' import { fieldAffectsData, optionIsObject, tabHasName } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' -import combineParentName from '../utilities/combineParentName.js' -import formatName from '../utilities/formatName.js' +import { combineParentName } from '../utilities/combineParentName.js' +import { formatName } from '../utilities/formatName.js' import { groupOrTabHasRequiredSubfield } from '../utilities/groupOrTabHasRequiredSubfield.js' -import withNullableType from './withNullableType.js' +import { withNullableType } from './withNullableType.js' const idFieldTypes = { number: GraphQLInt, diff --git a/packages/graphql/src/schema/buildObjectType.ts b/packages/graphql/src/schema/buildObjectType.ts index 9ed68e920..eef1ff61b 100644 --- a/packages/graphql/src/schema/buildObjectType.ts +++ b/packages/graphql/src/schema/buildObjectType.ts @@ -44,24 +44,11 @@ import { tabHasName } from 'payload/shared' import type { Context } from '../resolvers/types.js' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' -import combineParentName from '../utilities/combineParentName.js' -import formatName from '../utilities/formatName.js' -import formatOptions from '../utilities/formatOptions.js' -import buildWhereInputType from './buildWhereInputType.js' -import isFieldNullable from './isFieldNullable.js' -import withNullableType from './withNullableType.js' - -type LocaleInputType = { - fallbackLocale: { - type: GraphQLType - } - locale: { - type: GraphQLType - } - where: { - type: GraphQLType - } -} +import { combineParentName } from '../utilities/combineParentName.js' +import { formatName } from '../utilities/formatName.js' +import { formatOptions } from '../utilities/formatOptions.js' +import { isFieldNullable } from './isFieldNullable.js' +import { withNullableType } from './withNullableType.js' export type ObjectTypeConfig = { [path: string]: GraphQLFieldConfig @@ -297,7 +284,7 @@ export function buildObjectType({ value: { type: new GraphQLUnionType({ name: relationshipName, - resolveType(data, { req }) { + resolveType(data) { return graphqlResult.collections[data.collection].graphQL.type.name }, types, @@ -626,7 +613,7 @@ export function buildObjectType({ value: { type: new GraphQLUnionType({ name: relationshipName, - resolveType(data, { req }) { + resolveType(data) { return graphqlResult.collections[data.collection].graphQL.type.name }, types, diff --git a/packages/graphql/src/schema/buildPoliciesType.ts b/packages/graphql/src/schema/buildPoliciesType.ts index 921045cce..086ba1818 100644 --- a/packages/graphql/src/schema/buildPoliciesType.ts +++ b/packages/graphql/src/schema/buildPoliciesType.ts @@ -11,7 +11,7 @@ import { GraphQLBoolean, GraphQLNonNull, GraphQLObjectType } from 'graphql' import { toWords } from 'payload' import { GraphQLJSONObject } from '../packages/graphql-type-json/index.js' -import formatName from '../utilities/formatName.js' +import { formatName } from '../utilities/formatName.js' type OperationType = 'create' | 'delete' | 'read' | 'readVersions' | 'unlock' | 'update' @@ -199,7 +199,7 @@ export function buildPolicyType(args: BuildPolicyType): GraphQLObjectType { }) } -export default function buildPoliciesType(config: SanitizedConfig): GraphQLObjectType { +export function buildPoliciesType(config: SanitizedConfig): GraphQLObjectType { const fields = { canAccessAdmin: { type: new GraphQLNonNull(GraphQLBoolean), diff --git a/packages/graphql/src/schema/buildWhereInputType.ts b/packages/graphql/src/schema/buildWhereInputType.ts index 36627f7f9..ee8fe47af 100644 --- a/packages/graphql/src/schema/buildWhereInputType.ts +++ b/packages/graphql/src/schema/buildWhereInputType.ts @@ -4,8 +4,8 @@ import { GraphQLInputObjectType, GraphQLList } from 'graphql' import { flattenTopLevelFields } from 'payload' import { fieldAffectsData, fieldHasSubFields, fieldIsPresentationalOnly } from 'payload/shared' -import formatName from '../utilities/formatName.js' -import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' +import { formatName } from '../utilities/formatName.js' +import { fieldToSchemaMap } from './fieldToWhereInputSchemaMap.js' import { withOperators } from './withOperators.js' type Args = { @@ -28,7 +28,7 @@ type Args = { * directly searchable. Instead, we need to build a chained pathname * using dot notation so MongoDB can properly search nested paths. */ -const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputObjectType => { +export const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputObjectType => { // This is the function that builds nested paths for all // field types with nested paths. @@ -109,5 +109,3 @@ const buildWhereInputType = ({ name, fields, parentName }: Args): GraphQLInputOb }, }) } - -export default buildWhereInputType diff --git a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts index c0378c980..8a8f19a80 100644 --- a/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts +++ b/packages/graphql/src/schema/fieldToWhereInputSchemaMap.ts @@ -23,9 +23,9 @@ import type { import { GraphQLEnumType, GraphQLInputObjectType } from 'graphql' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' -import combineParentName from '../utilities/combineParentName.js' -import formatName from '../utilities/formatName.js' -import recursivelyBuildNestedPaths from './recursivelyBuildNestedPaths.js' +import { combineParentName } from '../utilities/combineParentName.js' +import { formatName } from '../utilities/formatName.js' +import { recursivelyBuildNestedPaths } from './recursivelyBuildNestedPaths.js' import { withOperators } from './withOperators.js' type Args = { @@ -33,7 +33,7 @@ type Args = { parentName: string } -const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({ +export const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({ array: (field: ArrayField) => recursivelyBuildNestedPaths({ field, @@ -161,5 +161,3 @@ const fieldToSchemaMap = ({ nestedFieldName, parentName }: Args): any => ({ } }, }) - -export default fieldToSchemaMap diff --git a/packages/graphql/src/schema/initCollections.ts b/packages/graphql/src/schema/initCollections.ts index 5b81f9838..7a97a9db0 100644 --- a/packages/graphql/src/schema/initCollections.ts +++ b/packages/graphql/src/schema/initCollections.ts @@ -18,38 +18,38 @@ import { fieldAffectsData } from 'payload/shared' import type { ObjectTypeConfig } from './buildObjectType.js' -import forgotPassword from '../resolvers/auth/forgotPassword.js' -import init from '../resolvers/auth/init.js' -import login from '../resolvers/auth/login.js' -import logout from '../resolvers/auth/logout.js' -import me from '../resolvers/auth/me.js' -import refresh from '../resolvers/auth/refresh.js' -import resetPassword from '../resolvers/auth/resetPassword.js' -import unlock from '../resolvers/auth/unlock.js' -import verifyEmail from '../resolvers/auth/verifyEmail.js' +import { forgotPassword } from '../resolvers/auth/forgotPassword.js' +import { init } from '../resolvers/auth/init.js' +import { login } from '../resolvers/auth/login.js' +import { logout } from '../resolvers/auth/logout.js' +import { me } from '../resolvers/auth/me.js' +import { refresh } from '../resolvers/auth/refresh.js' +import { resetPassword } from '../resolvers/auth/resetPassword.js' +import { unlock } from '../resolvers/auth/unlock.js' +import { verifyEmail } from '../resolvers/auth/verifyEmail.js' import { countResolver } from '../resolvers/collections/count.js' -import createResolver from '../resolvers/collections/create.js' +import { createResolver } from '../resolvers/collections/create.js' import { getDeleteResolver } from '../resolvers/collections/delete.js' import { docAccessResolver } from '../resolvers/collections/docAccess.js' -import duplicateResolver from '../resolvers/collections/duplicate.js' +import { duplicateResolver } from '../resolvers/collections/duplicate.js' import { findResolver } from '../resolvers/collections/find.js' import { findByIDResolver } from '../resolvers/collections/findByID.js' import { findVersionByIDResolver } from '../resolvers/collections/findVersionByID.js' import { findVersionsResolver } from '../resolvers/collections/findVersions.js' -import restoreVersionResolver from '../resolvers/collections/restoreVersion.js' +import { restoreVersionResolver } from '../resolvers/collections/restoreVersion.js' import { updateResolver } from '../resolvers/collections/update.js' -import formatName from '../utilities/formatName.js' +import { formatName } from '../utilities/formatName.js' import { buildMutationInputType, getCollectionIDType } from './buildMutationInputType.js' import { buildObjectType } from './buildObjectType.js' import { buildPaginatedListType } from './buildPaginatedListType.js' import { buildPolicyType } from './buildPoliciesType.js' -import buildWhereInputType from './buildWhereInputType.js' +import { buildWhereInputType } from './buildWhereInputType.js' type InitCollectionsGraphQLArgs = { config: SanitizedConfig graphqlResult: GraphQLInfo } -function initCollectionsGraphQL({ config, graphqlResult }: InitCollectionsGraphQLArgs): void { +export function initCollections({ config, graphqlResult }: InitCollectionsGraphQLArgs): void { Object.keys(graphqlResult.collections).forEach((slug) => { const collection: Collection = graphqlResult.collections[slug] const { @@ -514,5 +514,3 @@ function initCollectionsGraphQL({ config, graphqlResult }: InitCollectionsGraphQ } }) } - -export default initCollectionsGraphQL diff --git a/packages/graphql/src/schema/initGlobals.ts b/packages/graphql/src/schema/initGlobals.ts index 6f3273fbe..b70a6ee23 100644 --- a/packages/graphql/src/schema/initGlobals.ts +++ b/packages/graphql/src/schema/initGlobals.ts @@ -7,23 +7,23 @@ import type { Field, GraphQLInfo, SanitizedConfig, SanitizedGlobalConfig } from import { buildVersionGlobalFields, toWords } from 'payload' import { docAccessResolver } from '../resolvers/globals/docAccess.js' -import findOneResolver from '../resolvers/globals/findOne.js' -import findVersionByIDResolver from '../resolvers/globals/findVersionByID.js' -import findVersionsResolver from '../resolvers/globals/findVersions.js' -import restoreVersionResolver from '../resolvers/globals/restoreVersion.js' -import updateResolver from '../resolvers/globals/update.js' -import formatName from '../utilities/formatName.js' +import { findOne } from '../resolvers/globals/findOne.js' +import { findVersionByID } from '../resolvers/globals/findVersionByID.js' +import { findVersions } from '../resolvers/globals/findVersions.js' +import { restoreVersion } from '../resolvers/globals/restoreVersion.js' +import { update } from '../resolvers/globals/update.js' +import { formatName } from '../utilities/formatName.js' import { buildMutationInputType } from './buildMutationInputType.js' import { buildObjectType } from './buildObjectType.js' import { buildPaginatedListType } from './buildPaginatedListType.js' import { buildPolicyType } from './buildPoliciesType.js' -import buildWhereInputType from './buildWhereInputType.js' +import { buildWhereInputType } from './buildWhereInputType.js' type InitGlobalsGraphQLArgs = { config: SanitizedConfig graphqlResult: GraphQLInfo } -function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): void { +export function initGlobals({ config, graphqlResult }: InitGlobalsGraphQLArgs): void { Object.keys(graphqlResult.globals.config).forEach((slug) => { const global: SanitizedGlobalConfig = graphqlResult.globals.config[slug] const { fields, graphQL, versions } = global @@ -70,7 +70,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): } : {}), }, - resolve: findOneResolver(global), + resolve: findOne(global), } graphqlResult.Mutation.fields[`update${formattedName}`] = { @@ -86,7 +86,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): } : {}), }, - resolve: updateResolver(global), + resolve: update(global), } graphqlResult.Query.fields[`docAccess${formattedName}`] = { @@ -141,7 +141,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): } : {}), }, - resolve: findVersionByIDResolver(global), + resolve: findVersionByID(global), } graphqlResult.Query.fields[`versions${formattedName}`] = { type: buildPaginatedListType( @@ -166,7 +166,7 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): page: { type: GraphQLInt }, sort: { type: GraphQLString }, }, - resolve: findVersionsResolver(global), + resolve: findVersions(global), } graphqlResult.Mutation.fields[`restoreVersion${formatName(formattedName)}`] = { type: graphqlResult.globals.graphQL[slug].type, @@ -174,10 +174,8 @@ function initGlobalsGraphQL({ config, graphqlResult }: InitGlobalsGraphQLArgs): id: { type: idType }, draft: { type: GraphQLBoolean }, }, - resolve: restoreVersionResolver(global), + resolve: restoreVersion(global), } } }) } - -export default initGlobalsGraphQL diff --git a/packages/graphql/src/schema/isFieldNullable.ts b/packages/graphql/src/schema/isFieldNullable.ts index f85d64e7b..dd2ba85c6 100644 --- a/packages/graphql/src/schema/isFieldNullable.ts +++ b/packages/graphql/src/schema/isFieldNullable.ts @@ -2,7 +2,7 @@ import type { FieldAffectingData } from 'payload' import { fieldAffectsData } from 'payload/shared' -const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => { +export const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => { const hasReadAccessControl = field.access && field.access.read const condition = field.admin && field.admin.condition return !( @@ -15,5 +15,3 @@ const isFieldNullable = (field: FieldAffectingData, force: boolean): boolean => !hasReadAccessControl ) } - -export default isFieldNullable diff --git a/packages/graphql/src/schema/operators.ts b/packages/graphql/src/schema/operators.ts index 8cd663339..2cfe733c8 100644 --- a/packages/graphql/src/schema/operators.ts +++ b/packages/graphql/src/schema/operators.ts @@ -1,4 +1,4 @@ -const operators = { +export const operators = { comparison: ['greater_than_equal', 'greater_than', 'less_than_equal', 'less_than'], contains: ['in', 'not_in', 'all'], equality: ['equals', 'not_equals'], @@ -6,5 +6,3 @@ const operators = { geojson: ['within', 'intersects'], partial: ['like', 'contains'], } - -export default operators diff --git a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts index aa0d21076..199b4ee56 100644 --- a/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts +++ b/packages/graphql/src/schema/recursivelyBuildNestedPaths.ts @@ -2,7 +2,7 @@ import type { FieldWithSubFields, TabsField } from 'payload' import { fieldAffectsData, fieldIsPresentationalOnly } from 'payload/shared' -import fieldToSchemaMap from './fieldToWhereInputSchemaMap.js' +import { fieldToSchemaMap } from './fieldToWhereInputSchemaMap.js' type Args = { field: FieldWithSubFields | TabsField @@ -10,7 +10,7 @@ type Args = { parentName: string } -const recursivelyBuildNestedPaths = ({ field, nestedFieldName2, parentName }: Args) => { +export const recursivelyBuildNestedPaths = ({ field, nestedFieldName2, parentName }: Args) => { const fieldName = fieldAffectsData(field) ? field.name : undefined const nestedFieldName = fieldName || nestedFieldName2 @@ -78,5 +78,3 @@ const recursivelyBuildNestedPaths = ({ field, nestedFieldName2, parentName }: Ar return nestedPaths } - -export default recursivelyBuildNestedPaths diff --git a/packages/graphql/src/schema/withNullableType.ts b/packages/graphql/src/schema/withNullableType.ts index 84f4a21d8..5cec0a233 100644 --- a/packages/graphql/src/schema/withNullableType.ts +++ b/packages/graphql/src/schema/withNullableType.ts @@ -3,7 +3,7 @@ import type { FieldAffectingData } from 'payload' import { GraphQLNonNull } from 'graphql' -const withNullableType = ( +export const withNullableType = ( field: FieldAffectingData, type: GraphQLType, forceNullable = false, @@ -26,5 +26,3 @@ const withNullableType = ( return type } - -export default withNullableType diff --git a/packages/graphql/src/schema/withOperators.ts b/packages/graphql/src/schema/withOperators.ts index 71f9ad60f..44ff25513 100644 --- a/packages/graphql/src/schema/withOperators.ts +++ b/packages/graphql/src/schema/withOperators.ts @@ -14,9 +14,9 @@ import { DateTimeResolver, EmailAddressResolver } from 'graphql-scalars' import { optionIsObject } from 'payload/shared' import { GraphQLJSON } from '../packages/graphql-type-json/index.js' -import combineParentName from '../utilities/combineParentName.js' -import formatName from '../utilities/formatName.js' -import operators from './operators.js' +import { combineParentName } from '../utilities/combineParentName.js' +import { formatName } from '../utilities/formatName.js' +import { operators } from './operators.js' type staticTypes = | 'checkbox' diff --git a/packages/graphql/src/utilities/combineParentName.ts b/packages/graphql/src/utilities/combineParentName.ts index 18f8e68cb..1a121aa37 100644 --- a/packages/graphql/src/utilities/combineParentName.ts +++ b/packages/graphql/src/utilities/combineParentName.ts @@ -1,6 +1,4 @@ -import formatName from './formatName.js' +import { formatName } from './formatName.js' -const combineParentName = (parent: string, name: string): string => +export const combineParentName = (parent: string, name: string): string => formatName(`${parent ? `${parent}_` : ''}${name}`) - -export default combineParentName diff --git a/packages/graphql/src/utilities/formatName.spec.ts b/packages/graphql/src/utilities/formatName.spec.ts index 8ebb4a332..a45045649 100644 --- a/packages/graphql/src/utilities/formatName.spec.ts +++ b/packages/graphql/src/utilities/formatName.spec.ts @@ -1,5 +1,5 @@ /* eslint-disable jest/prefer-strict-equal */ -import formatName from './formatName' +import { formatName } from './formatName' describe('formatName', () => { it.each` diff --git a/packages/graphql/src/utilities/formatName.ts b/packages/graphql/src/utilities/formatName.ts index ebe1a20d4..5b9400c31 100644 --- a/packages/graphql/src/utilities/formatName.ts +++ b/packages/graphql/src/utilities/formatName.ts @@ -1,6 +1,6 @@ const numbers = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'] -const formatName = (string: string): string => { +export const formatName = (string: string): string => { let sanitizedString = String(string) const firstLetter = sanitizedString.substring(0, 1) @@ -25,5 +25,3 @@ const formatName = (string: string): string => { return formatted || '_' } - -export default formatName diff --git a/packages/graphql/src/utilities/formatOptions.ts b/packages/graphql/src/utilities/formatOptions.ts index 2b137289b..e6ee39921 100644 --- a/packages/graphql/src/utilities/formatOptions.ts +++ b/packages/graphql/src/utilities/formatOptions.ts @@ -1,8 +1,8 @@ import type { RadioField, SelectField } from 'payload' -import formatName from './formatName.js' +import { formatName } from './formatName.js' -const formatOptions = (field: RadioField | SelectField) => { +export const formatOptions = (field: RadioField | SelectField) => { return field.options.reduce((values, option) => { if (typeof option === 'object') { return { @@ -21,5 +21,3 @@ const formatOptions = (field: RadioField | SelectField) => { } }, {}) } - -export default formatOptions diff --git a/packages/graphql/src/utilities/getCheckIfLocaleObject.ts b/packages/graphql/src/utilities/getCheckIfLocaleObject.ts deleted file mode 100644 index 5c716b74f..000000000 --- a/packages/graphql/src/utilities/getCheckIfLocaleObject.ts +++ /dev/null @@ -1,4 +0,0 @@ -export default (localization: { locales: string[] }) => - (value: unknown): boolean => - typeof value === 'object' && - Object.keys(value).some((key) => localization.locales.indexOf(key) > -1) diff --git a/packages/graphql/src/utilities/uppercase.ts b/packages/graphql/src/utilities/uppercase.ts deleted file mode 100644 index 484160f64..000000000 --- a/packages/graphql/src/utilities/uppercase.ts +++ /dev/null @@ -1,11 +0,0 @@ -function uppercase(str: string): string { - const array1 = str.split(' ') - const newarray1 = [] - - for (let x = 0; x < array1.length; x += 1) { - newarray1.push(array1[x].charAt(0).toUpperCase() + array1[x].slice(1)) - } - return newarray1.join(' ') -} - -export default uppercase