From 3e8fa9c5875a899be96be05ad51f2e6b4213637b Mon Sep 17 00:00:00 2001 From: Mohamed Meabed Date: Wed, 1 Nov 2023 03:05:54 -0400 Subject: [PATCH] chore: update mongoose 8 --- src/composeMongoose.ts | 2 +- src/fieldsConverter.ts | 35 +++++++++++--------- src/resolvers/helpers/__tests__/sort-test.ts | 5 ++- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/composeMongoose.ts b/src/composeMongoose.ts index dc243c75..0a3cbbec 100644 --- a/src/composeMongoose.ts +++ b/src/composeMongoose.ts @@ -100,7 +100,7 @@ export type GenerateResolverType = { export type ObjectTypeComposerWithMongooseResolvers< TDoc extends Document, - TContext = any + TContext = any, > = ObjectTypeComposer & { mongooseResolvers: GenerateResolverType; }; diff --git a/src/fieldsConverter.ts b/src/fieldsConverter.ts index 4222d165..3c95dc64 100644 --- a/src/fieldsConverter.ts +++ b/src/fieldsConverter.ts @@ -1,13 +1,13 @@ /* eslint-disable no-use-before-define */ +import type { Model, Schema } from 'mongoose'; import mongoose, { Document } from 'mongoose'; -import type { Schema, Model } from 'mongoose'; import type { - SchemaComposer, - ObjectTypeComposer, - EnumTypeComposer, ComposeOutputTypeDefinition, + EnumTypeComposer, + ObjectTypeComposer, ObjectTypeComposerFieldConfigAsObjectDefinition, + SchemaComposer, } from 'graphql-compose'; import { upperFirst } from 'graphql-compose'; import type { GraphQLScalarType } from 'graphql-compose/lib/graphql'; @@ -386,18 +386,21 @@ export function enumToGraphQL( const desc = _getFieldDescription(field); if (desc) etc.setDescription(desc); - const fields = valueList.reduce((result, value) => { - let key; - if (value === null) { - key = 'NULL'; - } else if (value === '') { - key = 'EMPTY_STRING'; - } else { - key = value.replace(/[^_a-zA-Z0-9]/g, '_').replace(/(^[0-9])(.*)/g, 'a_$1$2'); - } - result[key] = { value }; - return result; - }, {} as Record); + const fields = valueList.reduce( + (result, value) => { + let key; + if (value === null) { + key = 'NULL'; + } else if (value === '') { + key = 'EMPTY_STRING'; + } else { + key = value.replace(/[^_a-zA-Z0-9]/g, '_').replace(/(^[0-9])(.*)/g, 'a_$1$2'); + } + result[key] = { value }; + return result; + }, + {} as Record + ); etc.setFields(fields); }); } diff --git a/src/resolvers/helpers/__tests__/sort-test.ts b/src/resolvers/helpers/__tests__/sort-test.ts index 8f81578c..9accbf8d 100644 --- a/src/resolvers/helpers/__tests__/sort-test.ts +++ b/src/resolvers/helpers/__tests__/sort-test.ts @@ -1,9 +1,8 @@ -import { EnumTypeComposer, schemaComposer, ObjectTypeComposer } from 'graphql-compose'; -import { sortHelperArgs, sortHelper, getSortTypeFromModel } from '../sort'; +import { EnumTypeComposer, ObjectTypeComposer, schemaComposer } from 'graphql-compose'; +import { getSortTypeFromModel, sortHelper, sortHelperArgs } from '../sort'; import { UserModel } from '../../../__mocks__/userModel'; import { convertModelToGraphQL } from '../../../fieldsConverter'; import { getIndexesFromModel } from '../../../utils'; -import * as console from 'console'; describe('Resolver helper `sort` ->', () => { let UserTC: ObjectTypeComposer;