mongoose 6.11.0 → 6.11.1

package/lib/helpers/printJestWarning.js

@@ -2,16 +2,20 @@
 
 const utils = require('../utils');
 
-if (typeof jest !== 'undefined' && typeof window !== 'undefined') {
-  utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
-    'with Jest\'s default jsdom test environment. Please make sure you read ' +
-    'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
-    'https://mongoosejs.com/docs/jest.html');
-}
+if (typeof jest !== 'undefined' && !process.env.SUPPRESS_JEST_WARNINGS) {
+  if (typeof window !== 'undefined') {
+    utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
+      'with Jest\'s default jsdom test environment. Please make sure you read ' +
+      'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
+      'https://mongoosejs.com/docs/jest.html. Set the SUPPRESS_JEST_WARNINGS to true ' +
+      'to hide this warning.');
+  }
 
-if (typeof jest !== 'undefined' && setTimeout.clock != null && typeof setTimeout.clock.Date === 'function') {
-  utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
-    'with Jest\'s mock timers enabled. Please make sure you read ' +
-    'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
-    'https://mongoosejs.com/docs/jest.html');
+  if (setTimeout.clock != null && typeof setTimeout.clock.Date === 'function') {
+    utils.warn('Mongoose: looks like you\'re trying to test a Mongoose app ' +
+      'with Jest\'s mock timers enabled. Please make sure you read ' +
+      'Mongoose\'s docs on configuring Jest to test Node.js apps: ' +
+      'https://mongoosejs.com/docs/jest.html. Set the SUPPRESS_JEST_WARNINGS to true ' +
+      'to hide this warning.');
+  }
 }

package/lib/query.js

@@ -2003,9 +2003,13 @@ Query.prototype._optionsForExec = function(model) {
     }
   }
 
-  const projection = this._fieldsForExec();
-  if (projection != null) {
-    options.projection = projection;
+  this._applyPaths();
+  if (this._fields != null) {
+    this._fields = this._castFields(this._fields);
+    const projection = this._fieldsForExec();
+    if (projection != null) {
+      options.projection = projection;
+    }
   }
 
   return options;
@@ -2258,10 +2262,6 @@ Query.prototype._find = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  this._applyPaths();
-  this._fields = this._castFields(this._fields);
-
-  const fields = this._fieldsForExec();
   const mongooseOptions = this._mongooseOptions;
   const _this = this;
   const userProvidedFields = _this._userProvidedFields || {};
@@ -2276,6 +2276,10 @@ Query.prototype._find = wrapThunk(function(callback) {
     lean: mongooseOptions.lean || null
   });
 
+  const options = this._optionsForExec();
+  const filter = this._conditions;
+  const fields = options.projection;
+
   const cb = (err, docs) => {
     if (err) {
       return callback(err);
@@ -2317,8 +2321,6 @@ Query.prototype._find = wrapThunk(function(callback) {
     });
   };
 
-  const options = this._optionsForExec();
-  const filter = this._conditions;
 
   this._collection.collection.find(filter, options, (err, cursor) => {
     if (err != null) {
@@ -2531,8 +2533,6 @@ Query.prototype._findOne = wrapThunk(function(callback) {
     return null;
   }
 
-  this._applyPaths();
-  this._fields = this._castFields(this._fields);
   applyGlobalMaxTimeMS(this.options, this.model);
   applyGlobalDiskUse(this.options, this.model);
 
@@ -3852,17 +3852,6 @@ Query.prototype._findOneAndReplace = wrapThunk(function(callback) {
   const filter = this._conditions;
   const options = this._optionsForExec();
   convertNewToReturnDocument(options);
-  let fields = null;
-
-  this._applyPaths();
-  if (this._fields != null) {
-    options.projection = this._castFields(utils.clone(this._fields));
-    fields = options.projection;
-    if (fields instanceof Error) {
-      callback(fields);
-      return null;
-    }
-  }
 
   const runValidators = _getOption(this, 'runValidators', false);
   if (runValidators === false) {
@@ -3991,7 +3980,6 @@ Query.prototype._findAndModify = function(type, callback) {
   const model = this.model;
   const schema = model.schema;
   const _this = this;
-  let fields;
 
   const castedQuery = castQuery(this);
   if (castedQuery instanceof Error) {
@@ -4062,18 +4050,6 @@ Query.prototype._findAndModify = function(type, callback) {
     }
   }
 
-  this._applyPaths();
-  if (this._fields) {
-    this._fields = this._castFields(this._fields);
-    fields = this._fieldsForExec();
-    if (fields != null) {
-      opts.projection = fields;
-    }
-    if (opts.projection instanceof Error) {
-      return callback(opts.projection);
-    }
-  }
-
   if (opts.sort) convertSortToArray(opts);
 
   const cb = function(err, doc, res) {
@@ -5442,6 +5418,9 @@ Query.prototype._castFields = function _castFields(fields) {
  */
 
 Query.prototype._applyPaths = function applyPaths() {
+  if (!this.model) {
+    return;
+  }
   this._fields = this._fields || {};
   helpers.applyPaths(this._fields, this.model.schema);
 
@@ -5500,9 +5479,6 @@ Query.prototype._applyPaths = function applyPaths() {
  */
 
 Query.prototype.cursor = function cursor(opts) {
-  this._applyPaths();
-  this._fields = this._castFields(this._fields);
-
   if (opts) {
     this.setOptions(opts);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.11.0",
+  "version": "6.11.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -80,6 +80,7 @@
     "docs:clean:6x": "rimraf index.html && rimraf -rf ./docs/6.x && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
     "docs:copy:tmp": "mkdirp ./tmp/docs/css && mkdirp ./tmp/docs/js && mkdirp ./tmp/docs/images && mkdirp ./tmp/docs/tutorials && mkdirp ./tmp/docs/typescript && mkdirp ./tmp/docs/api && ncp ./docs/css ./tmp/docs/css --filter=.css$ && ncp ./docs/js ./tmp/docs/js --filter=.js$ && ncp ./docs/images ./tmp/docs/images && ncp ./docs/tutorials ./tmp/docs/tutorials && ncp ./docs/typescript ./tmp/docs/typescript && ncp ./docs/api ./tmp/docs/api && cp index.html ./tmp && cp docs/*.html ./tmp/docs/",
     "docs:copy:tmp:5x": "rimraf ./docs/5.x && ncp ./tmp ./docs/5.x",
+    "docs:move:6x:tmp": "mv ./docs/6.x ./tmp",
     "docs:copy:tmp:6x": "rimraf ./docs/6.x && ncp ./tmp ./docs/6.x",
     "docs:checkout:gh-pages": "git checkout gh-pages",
     "docs:checkout:5x": "git checkout 5.x",
@@ -94,7 +95,7 @@
     "docs:view": "node ./scripts/static.js",
     "docs:prepare:publish:stable": "npm run docs:checkout:gh-pages && npm run docs:merge:stable && npm run docs:clean:stable && npm run docs:generate && npm run docs:generate:search",
     "docs:prepare:publish:5x": "npm run docs:checkout:5x && npm run docs:merge:5x && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && npm run docs:checkout:gh-pages && npm run docs:copy:tmp:5x",
-    "docs:prepare:publish:6x": "npm run docs:checkout:6x && npm run docs:merge:6x && npm run docs:clean:stable && npm run docs:generate && npm run docs:copy:tmp && npm run docs:checkout:gh-pages && npm run docs:copy:tmp:6x",
+    "docs:prepare:publish:6x": "npm run docs:checkout:6x && npm run docs:merge:6x && npm run docs:clean:stable && env DOCS_DEPLOY=true npm run docs:generate && npm run docs:move:6x:tmp && npm run docs:checkout:gh-pages && npm run docs:copy:tmp:6x",
     "docs:check-links": "blc http://127.0.0.1:8089 -ro",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js",

package/types/models.d.ts

@@ -162,12 +162,12 @@ declare module 'mongoose' {
      * if you use `create()`) because with `bulkWrite()` there is only one network
      * round trip to the MongoDB server.
      */
-    bulkWrite(
-      writes: Array<mongodb.AnyBulkWriteOperation<T extends Document ? any : (T extends {} ? T : any)>>,
+    bulkWrite<DocContents = T>(
+      writes: Array<mongodb.AnyBulkWriteOperation<DocContents extends Document ? any : (DocContents extends {} ? DocContents : any)>>,
       options: mongodb.BulkWriteOptions & MongooseBulkWriteOptions & { ordered: false }
     ): Promise<mongodb.BulkWriteResult & { mongoose?: { validationErrors: Error[] } }>;
-    bulkWrite(
-      writes: Array<mongodb.AnyBulkWriteOperation<T extends Document ? any : (T extends {} ? T : any)>>,
+    bulkWrite<DocContents = T>(
+      writes: Array<mongodb.AnyBulkWriteOperation<DocContents extends Document ? any : (DocContents extends {} ? DocContents : any)>>,
       options?: mongodb.BulkWriteOptions & MongooseBulkWriteOptions
     ): Promise<mongodb.BulkWriteResult>;