chore: update

Author: meabed

jest.config.js

@@ -7,7 +7,6 @@ module.exports = {
       'ts-jest',
       {
         tsconfig: '<rootDir>/tsconfig.json',
-        isolatedModules: true,
         diagnostics: false,
       },
     ],

src/__tests__/__snapshots__/integration-test.ts.snap

@@ -1,4 +1,4 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
 
 exports[`integration tests projection should request all fields to rawData field: projection from all fields 1`] = `
 [

src/discriminators/DiscriminatorTypeComposer.ts

@@ -17,8 +17,9 @@ import { prepareBaseResolvers } from './prepareBaseResolvers';
 import { reorderFields } from './utils/reorderFields';
 import { GraphQLFieldConfig, GraphQLObjectType } from 'graphql-compose/lib/graphql';
 
-export interface ComposeWithMongooseDiscriminatorsOpts<TContext>
-  extends ComposeWithMongooseOpts<TContext> {
+export interface ComposeWithMongooseDiscriminatorsOpts<
+  TContext,
+> extends ComposeWithMongooseOpts<TContext> {
   reorderFields?: boolean | string[]; // true order: _id, DKey, DInterfaceFields, DiscriminatorFields
 }
 

src/resolvers/count.ts

@@ -1,5 +1,5 @@
 import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
-import type { Model, Document } from 'mongoose';
+import type { Model, HydratedDocument } from 'mongoose';
 import {
   filterHelper,
   filterHelperArgs,
@@ -20,7 +20,7 @@ type TArgs = {
   filter?: any;
 };
 
-export function count<TSource = any, TContext = any, TDoc extends Document = any>(
+export function count<TSource = any, TContext = any, TDoc extends HydratedDocument<any> = any>(
   model: Model<TDoc>,
   tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: CountResolverOpts
@@ -56,6 +56,7 @@ export function count<TSource = any, TContext = any, TDoc extends Document = any
         return beforeQueryHelper(resolveParams);
       } else {
         // mongoose 5 and below
+        // @ts-ignore
         resolveParams.query.count();
         return beforeQueryHelper(resolveParams);
       }

src/resolvers/findById.ts

@@ -1,6 +1,6 @@
 import { toInputType } from 'graphql-compose';
 import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
-import type { Model, Document } from 'mongoose';
+import type { Model, HydratedDocument } from 'mongoose';
 import {
   projectionHelper,
   prepareNestedAliases,
@@ -30,7 +30,7 @@ type TArgs = {
   _id: any;
 };
 
-export function findById<TSource = any, TContext = any, TDoc extends Document = any>(
+export function findById<TSource = any, TContext = any, TDoc extends HydratedDocument<any> = any>(
   model: Model<TDoc>,
   tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindByIdResolverOpts

src/resolvers/findMany.ts

@@ -1,5 +1,5 @@
 import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
-import type { Model, Document } from 'mongoose';
+import type { Model, HydratedDocument } from 'mongoose';
 import {
   limitHelper,
   limitHelperArgs,
@@ -49,7 +49,7 @@ type TArgs = {
   sort?: string | string[] | Record<string, any>;
 };
 
-export function findMany<TSource = any, TContext = any, TDoc extends Document = any>(
+export function findMany<TSource = any, TContext = any, TDoc extends HydratedDocument<any> = any>(
   model: Model<TDoc>,
   tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindManyResolverOpts

src/resolvers/findOne.ts

@@ -1,5 +1,5 @@
 import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
-import type { Model, Document } from 'mongoose';
+import type { Model, HydratedDocument } from 'mongoose';
 import {
   skipHelper,
   skipHelperArgs,
@@ -44,7 +44,7 @@ type TArgs = {
   skip?: number;
 };
 
-export function findOne<TSource = any, TContext = any, TDoc extends Document = any>(
+export function findOne<TSource = any, TContext = any, TDoc extends HydratedDocument<any> = any>(
   model: Model<TDoc>,
   tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindOneResolverOpts

src/resolvers/helpers/filter.ts

@@ -6,7 +6,7 @@ import {
   ObjectTypeComposerArgumentConfigMap,
   InputTypeComposer,
 } from 'graphql-compose';
-import type { Model, Document } from 'mongoose';
+import type { Model, HydratedDocument } from 'mongoose';
 import { isObject, toMongoFilterDottedObject, getIndexedFieldNamesForGraphQL } from '../../utils';
 import type { ExtendedResolveParams } from '../index';
 import {
@@ -66,7 +66,7 @@ export const getFilterHelperArgOptsMap = (): Record<string, string | string[]> =
   removeFields: ['string', 'string[]'],
 });
 
-export function filterHelperArgs<TDoc extends Document = any>(
+export function filterHelperArgs<TDoc extends HydratedDocument<any> = any>(
   typeComposer: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   model: Model<TDoc>,
   opts?: FilterHelperArgsOpts

src/resolvers/helpers/record.ts

@@ -5,7 +5,7 @@ import {
   InputTypeComposer,
 } from 'graphql-compose';
 import { makeFieldsRecursiveNullable } from '../../utils/makeFieldsRecursiveNullable';
-import { Document } from 'mongoose';
+import { HydratedDocument } from 'mongoose';
 
 export type RecordHelperArgsOpts = {
   /**
@@ -42,7 +42,7 @@ export const getRecordHelperArgsOptsMap = (): Record<string, string> => ({
   requiredFields: 'string[]',
 });
 
-export function recordHelperArgs<TDoc extends Document = any>(
+export function recordHelperArgs<TDoc extends HydratedDocument<any> = any>(
   tc: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   opts?: RecordHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMapDefinition<{ record: any }> {

src/resolvers/helpers/sort.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-use-before-define */
 
-import type { Document, Model } from 'mongoose';
+import type { HydratedDocument, Model } from 'mongoose';
 import {
   EnumTypeComposer,
   InterfaceTypeComposer,
@@ -24,7 +24,7 @@ export type SortHelperArgsOpts = {
   sortTypeName?: string;
 };
 
-export function sortHelperArgs<TDoc extends Document = any>(
+export function sortHelperArgs<TDoc extends HydratedDocument<any> = any>(
   tc: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   model: Model<TDoc>,
   opts?: SortHelperArgsOpts