feat: add mongoose v6 support

Author: nodkz

package.json

@@ -30,7 +30,7 @@
   },
   "peerDependencies": {
     "graphql-compose": "^7.21.4 || ^8.0.0 || ^9.0.0",
-    "mongoose": "^5.0.0 || ^4.4.0"
+    "mongoose": "^6.0.0 || ^5.0.0 || ^4.4.0"
   },
   "devDependencies": {
     "@types/jest": "26.0.24",
@@ -44,8 +44,8 @@
     "graphql": "15.5.1",
     "graphql-compose": "9.0.1",
     "jest": "27.0.6",
-    "mongodb-memory-server": "7.3.2",
-    "mongoose": "5.13.3",
+    "mongodb-memory-server": "7.3.6",
+    "mongoose": "6.0.2",
     "prettier": "2.3.2",
     "request": "2.88.2",
     "rimraf": "3.0.2",

src/composeMongoose.ts

@@ -109,7 +109,7 @@ export function composeMongoose<TDoc extends Document, TContext = any>(
   model: Model<TDoc>,
   opts: ComposeMongooseOpts<TContext> = {}
 ): ObjectTypeComposerWithMongooseResolvers<TDoc, TContext> {
-  const m: Model<any> = model;
+  const m = model as Model<any>;
   const name: string = (opts && opts.name) || m.modelName;
 
   const sc = opts.schemaComposer || globalSchemaComposer;

src/composeWithMongoose.ts

@@ -31,10 +31,10 @@ export type TransformRecordIdFn<TContext = any> = (
 ) => any;
 
 export function composeWithMongoose<TDoc extends Document, TContext = any>(
-  model: Model<TDoc>,
+  model: Model<any>,
   opts: ComposeWithMongooseOpts<TContext> = {}
 ): ObjectTypeComposer<TDoc, TContext> {
-  const m: Model<any> = model;
+  const m = model as Model<any>;
   const name: string = (opts && opts.name) || m.modelName;
 
   const sc = opts.schemaComposer || globalSchemaComposer;

src/discriminators/DiscriminatorTypeComposer.ts

@@ -181,7 +181,7 @@ export class DiscriminatorTypeComposer<TSource, TContext> extends ObjectTypeComp
     this.schemaComposer.addSchemaMustHaveType(childTC);
     this.childTCs.push(childTC);
 
-    return childTC;
+    return childTC as any;
   }
 
   setFields(fields: ObjectTypeComposerFieldConfigMapDefinition<any, any>): this {

src/fieldsConverter.ts

@@ -47,6 +47,11 @@ export enum ComplexTypes {
   DECIMAL = 'DECIMAL',
 }
 
+// In mongoose@6 Embedded type was renamed to Subdocument
+// So keep backward compatibility with old mongoose versions
+const SubdocumentTypeClass =
+  (mongoose.Schema.Types as any)?.Embedded || (mongoose.Schema.Types as any).Subdocument;
+
 function _getFieldName(field: MongooseFieldT): string {
   return field.path || '__unknownField__';
 }
@@ -278,7 +283,7 @@ export function deriveComplexType(field: MongooseFieldT): ComplexTypes {
     (fieldType === 'Array' && field?.schema?.paths)
   ) {
     return ComplexTypes.DOCUMENT_ARRAY;
-  } else if (field instanceof mongoose.Schema.Types.Embedded || fieldType === 'Embedded') {
+  } else if (field instanceof SubdocumentTypeClass || fieldType === 'Embedded') {
     return ComplexTypes.EMBEDDED;
   } else if (field instanceof mongoose.Schema.Types.Array || field?.caster?.instance) {
     return ComplexTypes.ARRAY;

src/resolvers/createMany.ts

@@ -21,7 +21,7 @@ type TArgs = {
 };
 
 export function createMany<TSource = any, TContext = any, TDoc extends Document = any>(
-  model: Model<TDoc>,
+  model: Model<any>,
   tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: CreateManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {

src/resolvers/removeMany.ts

@@ -94,12 +94,17 @@ export function removeMany<TSource = any, TContext = any, TDoc extends Document
 
       const res = await beforeQueryHelper(resolveParams);
 
-      if (res.ok) {
-        // mongoose 5
+      if (res.deletedCount) {
+        // mongoose v6
+        return {
+          numAffected: res.deletedCount,
+        };
+      } else if (res.ok) {
+        // mongoose v5
         return {
           numAffected: res.n,
         };
-      } else if (res.result && res.result.ok) {
+      } else if (res?.result?.ok) {
         // mongoose 4
         return {
           numAffected: res.result.n,

src/resolvers/updateMany.ts

@@ -133,7 +133,12 @@ export function updateMany<TSource = any, TContext = any, TDoc extends Document
 
       const res = await beforeQueryHelper(resolveParams);
 
-      if (res.ok) {
+      if (res.modifiedCount || res.acknowledged) {
+        // mongoose v6
+        return {
+          numAffected: res.modifiedCount,
+        };
+      } else if (res.ok) {
         return {
           numAffected: res.n || res.nModified,
         };