fix(deps): Update mongoose and @nestjs/mongoose to latest versions

examples/package.json

@@ -21,7 +21,7 @@
     "@nestjs/core": "7.6.11",
     "@nestjs/graphql": "7.9.8",
     "@nestjs/jwt": "7.2.0",
-    "@nestjs/mongoose": "7.1.2",
+    "@nestjs/mongoose": "7.2.3",
     "@nestjs/passport": "7.1.5",
     "@nestjs/platform-express": "7.6.11",
     "@nestjs/sequelize": "0.2.0",
@@ -32,7 +32,7 @@
     "graphql": "15.5.0",
     "graphql-query-complexity": "0.7.2",
     "graphql-tools": "7.0.2",
-    "mongoose": "5.10.19",
+    "mongoose": "5.11.15",
     "mysql2": "2.2.5",
     "passport": "0.4.1",
     "passport-jwt": "4.0.0",
@@ -51,7 +51,6 @@
     "@nestjs/testing": "7.6.11",
     "@types/express": "4.17.11",
     "@types/jest": "26.0.20",
-    "@types/mongoose": "5.10.1",
     "@types/node": "13.13.5",
     "@types/passport-jwt": "3.0.4",
     "@types/passport-local": "1.0.33",

packages/query-mongoose/__tests__/services/mongoose-query.service.spec.ts

@@ -55,11 +55,11 @@ describe('MongooseQueryService', () => {
     }).compile();
   });
 
-  function convertDocument<Doc extends Document>(doc: Doc): Doc {
+  function convertDocument<Doc extends Document>(doc: Doc) {
     return doc.toObject({ virtuals: true });
   }
 
-  function convertDocuments<Doc extends Document>(docs: Doc[]): Doc[] {
+  function convertDocuments<Doc extends Document>(docs: Doc[]) {
     return docs.map((doc) => convertDocument(doc));
   }
 

packages/query-mongoose/package.json

@@ -30,16 +30,15 @@
   },
   "devDependencies": {
     "@nestjs/common": "7.6.11",
-    "@nestjs/mongoose": "7.1.2",
     "@nestjs/testing": "7.6.11",
     "@types/lodash.escaperegexp": "4.1.6",
     "@types/lodash.merge": "4.6.6",
     "@types/mongodb": "3.6.6",
-    "@types/mongoose": "5.10.1",
+    "@nestjs/mongoose": "7.2.3",
     "class-transformer": "0.3.2",
     "mongodb": "3.6.4",
     "mongodb-memory-server": "6.9.3",
-    "mongoose": "5.10.19",
+    "mongoose": "5.11.15",
     "ts-mockito": "2.6.1",
     "typescript": "4.1.3"
   },

packages/query-mongoose/src/index.ts

@@ -1,2 +1,2 @@
-export { MongooseQueryService, MongooseQueryServiceOpts } from './services';
+export { MongooseQueryService } from './services';
 export { NestjsQueryMongooseModule } from './module';

packages/query-mongoose/src/services/mongoose-query.service.ts

@@ -14,18 +14,17 @@ import {
   UpdateOneOptions,
 } from '@nestjs-query/core';
 import { NotFoundException } from '@nestjs/common';
-import { CreateQuery, Document, DocumentToObjectOptions, Model as MongooseModel, UpdateQuery } from 'mongoose';
+import { Document, Model as MongooseModel, UpdateQuery } from 'mongoose';
 import { AggregateBuilder, FilterQueryBuilder } from '../query';
 import { ReferenceQueryService } from './reference-query.service';
 
 type MongoDBUpdatedOutput = {
   nModified: number;
 };
 
-export interface MongooseQueryServiceOpts {
-  documentToObjectOptions?: DocumentToObjectOptions;
-}
-
+type MongoDBDeletedOutput = {
+  deletedCount: number;
+};
 /**
  * Base class for all query services that use Typegoose.
  *
@@ -135,7 +134,7 @@ export class MongooseQueryService<Entity extends Document>
    */
   async createOne(record: DeepPartial<Entity>): Promise<Entity> {
     this.ensureIdIsNotPresent(record);
-    return this.Model.create(record as CreateQuery<Entity>);
+    return this.Model.create(record);
   }
 
   /**
@@ -152,7 +151,7 @@ export class MongooseQueryService<Entity extends Document>
    */
   async createMany(records: DeepPartial<Entity>[]): Promise<Entity[]> {
     records.forEach((r) => this.ensureIdIsNotPresent(r));
-    return this.Model.create(records as CreateQuery<Entity>[]);
+    return this.Model.create(records);
   }
 
   /**
@@ -234,7 +233,7 @@ export class MongooseQueryService<Entity extends Document>
    */
   async deleteMany(filter: Filter<Entity>): Promise<DeleteManyResponse> {
     const filterQuery = this.filterQueryBuilder.buildFilterQuery(filter);
-    const res = await this.Model.deleteMany(filterQuery).exec();
+    const res = (await this.Model.deleteMany(filterQuery).exec()) as MongoDBDeletedOutput;
     return { deletedCount: res.deletedCount || 0 };
   }
 

packages/query-mongoose/src/services/reference-query.service.ts

@@ -11,7 +11,7 @@ import {
   Query,
   AssemblerFactory,
 } from '@nestjs-query/core';
-import { Document, Model as MongooseModel } from 'mongoose';
+import { Document, Model as MongooseModel, UpdateQuery } from 'mongoose';
 import { AggregateBuilder, FilterQueryBuilder } from '../query';
 import {
   isEmbeddedSchemaTypeOptions,
@@ -198,7 +198,7 @@ export abstract class ReferenceQueryService<Entity extends Document> {
     if (relationIds.length !== refCount) {
       throw new Error(`Unable to find all ${relationName} to add to ${this.Model.modelName}`);
     }
-    await entity.updateOne({ $push: { [relationName]: { $each: relationIds } } }).exec();
+    await entity.updateOne({ $push: { [relationName]: { $each: relationIds } } } as UpdateQuery<Entity>).exec();
     // reload the document
     return this.getById(id);
   }
@@ -215,7 +215,7 @@ export abstract class ReferenceQueryService<Entity extends Document> {
     if (refCount !== 1) {
       throw new Error(`Unable to find ${relationName} to set on ${this.Model.modelName}`);
     }
-    await entity.updateOne({ [relationName]: relationId }).exec();
+    await entity.updateOne({ [relationName]: relationId } as UpdateQuery<Entity>).exec();
     // reload the document
     return this.getById(id);
   }
@@ -235,7 +235,7 @@ export abstract class ReferenceQueryService<Entity extends Document> {
     await entity
       .updateOne({
         $unset: { [relationName]: relationId },
-      })
+      } as UpdateQuery<Entity>)
       .exec();
     // reload the document
     return this.getById(id);
@@ -259,7 +259,7 @@ export abstract class ReferenceQueryService<Entity extends Document> {
     await entity
       .updateOne({
         $pullAll: { [relationName]: relationIds },
-      })
+      } as UpdateQuery<Entity>)
       .exec();
     // reload the document
     return this.getById(id);
@@ -291,18 +291,19 @@ export abstract class ReferenceQueryService<Entity extends Document> {
   }
 
   private getReferenceModel<Ref extends Document>(refName: string): MongooseModel<Ref> {
+    const { db } = this.Model;
     if (this.isReferencePath(refName)) {
       const schemaType = this.Model.schema.path(refName);
       if (isEmbeddedSchemaTypeOptions(schemaType)) {
-        return this.Model.model<Ref>(schemaType.$embeddedSchemaType.options.ref);
+        return db.model<Ref>(schemaType.$embeddedSchemaType.options.ref);
       }
       if (isSchemaTypeWithReferenceOptions(schemaType)) {
-        return this.Model.model<Ref>(schemaType.options.ref);
+        return db.model<Ref>(schemaType.options.ref);
       }
     } else if (this.isVirtualPath(refName)) {
       const schemaType = this.Model.schema.virtualpath(refName);
       if (isVirtualTypeWithReferenceOptions(schemaType)) {
-        return this.Model.model<Ref>(schemaType.options.ref);
+        return db.model<Ref>(schemaType.options.ref);
       }
     }
     throw new Error(`Unable to lookup reference type for ${refName}`);