mongoose 7.0.0 → 7.0.2

package/lib/aggregate.js

@@ -1049,7 +1049,7 @@ Aggregate.prototype.exec = async function exec() {
   const options = clone(this.options || {});
   let result;
   try {
-    const cursor = collection.aggregate(this._pipeline, options);
+    const cursor = await collection.aggregate(this._pipeline, options);
     result = await cursor.toArray();
   } catch (error) {
     await new Promise((resolve, reject) => {
@@ -1127,7 +1127,7 @@ Aggregate.prototype.catch = function(reject) {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf Aggregate
  * @instance
  * @api public

package/lib/cast.js

@@ -64,18 +64,11 @@ module.exports = function cast(schema, obj, options, context) {
       if (!Array.isArray(val)) {
         throw new CastError('Array', val, path);
       }
-      for (let k = val.length - 1; k >= 0; k--) {
+      for (let k = 0; k < val.length; ++k) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }
         val[k] = cast(schema, val[k], options, context);
-        if (Object.keys(val[k]).length === 0) {
-          val.splice(k, 1);
-        }
-      }
-
-      if (val.length === 0) {
-        delete obj[path];
       }
     } else if (path === '$where') {
       type = typeof val;

package/lib/connection.js

@@ -1057,6 +1057,16 @@ Connection.prototype._close = async function _close(force, destroy) {
   return this;
 };
 
+/**
+ * Abstract method that drivers must implement.
+ *
+ * @api private
+ */
+
+Connection.prototype.doClose = function() {
+  throw new Error('Connection#doClose unimplemented by driver');
+};
+
 /**
  * Called when the connection closes
  *

package/lib/cursor/AggregationCursor.js

@@ -263,7 +263,7 @@ AggregationCursor.prototype.eachAsync = function(fn, opts, callback) {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf AggregationCursor
  * @instance
  * @api public

package/lib/cursor/QueryCursor.js

@@ -347,7 +347,7 @@ QueryCursor.prototype._transformForAsyncIterator = function() {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf QueryCursor
  * @instance
  * @api public

package/lib/document.js

@@ -2557,7 +2557,7 @@ function _evaluateRequiredFunctions(doc) {
  * ignore
  */
 
-function _getPathsToValidate(doc) {
+function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
   const skipSchemaValidators = {};
 
   _evaluateRequiredFunctions(doc);
@@ -2628,6 +2628,22 @@ function _getPathsToValidate(doc) {
     }
   }
 
+  for (const path of paths) {
+    // Single nested paths (paths embedded under single nested subdocs) will
+    // be validated on their own when we call `validate()` on the subdoc itself.
+    // Re: gh-8468
+    if (doc.$__schema.singleNestedPaths.hasOwnProperty(path)) {
+      paths.delete(path);
+      continue;
+    }
+  }
+
+  if (Array.isArray(pathsToValidate)) {
+    paths = _handlePathsToValidate(paths, pathsToValidate);
+  } else if (Array.isArray(pathsToSkip)) {
+    paths = _handlePathsToSkip(paths, pathsToSkip);
+  }
+
   // from here on we're not removing items from paths
 
   // gh-661: if a whole array is modified, make sure to run validation on all
@@ -2687,13 +2703,6 @@ function _getPathsToValidate(doc) {
   }
 
   for (const path of paths) {
-    // Single nested paths (paths embedded under single nested subdocs) will
-    // be validated on their own when we call `validate()` on the subdoc itself.
-    // Re: gh-8468
-    if (doc.$__schema.singleNestedPaths.hasOwnProperty(path)) {
-      paths.delete(path);
-      continue;
-    }
     const _pathType = doc.$__schema.path(path);
     if (!_pathType || !_pathType.$isSchemaMap) {
       continue;
@@ -2776,7 +2785,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   };
 
   // only validate required fields when necessary
-  const pathDetails = _getPathsToValidate(this);
+  const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
   let paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
@@ -2784,11 +2793,6 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   if (typeof pathsToValidate === 'string') {
     pathsToValidate = pathsToValidate.split(' ');
   }
-  if (Array.isArray(pathsToValidate)) {
-    paths = _handlePathsToValidate(paths, pathsToValidate);
-  } else if (pathsToSkip) {
-    paths = _handlePathsToSkip(paths, pathsToSkip);
-  }
 
   if (paths.length === 0) {
     return immediate(function() {
@@ -2907,12 +2911,12 @@ function _handlePathsToValidate(paths, pathsToValidate) {
     }
   }
 
-  const ret = [];
+  const ret = new Set();
   for (const path of paths) {
     if (_pathsToValidate.has(path)) {
-      ret.push(path);
+      ret.add(path);
     } else if (parentPaths.has(path)) {
-      ret.push(parentPaths.get(path));
+      ret.add(parentPaths.get(path));
     }
   }
   return ret;
@@ -2924,8 +2928,8 @@ function _handlePathsToValidate(paths, pathsToValidate) {
 
 function _handlePathsToSkip(paths, pathsToSkip) {
   pathsToSkip = new Set(pathsToSkip);
-  paths = paths.filter(p => !pathsToSkip.has(p));
-  return paths;
+  paths = Array.from(paths).filter(p => !pathsToSkip.has(p));
+  return new Set(paths);
 }
 
 /**
@@ -2981,17 +2985,12 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
   }
 
   // only validate required fields when necessary
-  const pathDetails = _getPathsToValidate(this);
+  const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
   let paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
   const skipSchemaValidators = pathDetails[1];
 
-  if (Array.isArray(pathsToValidate)) {
-    paths = _handlePathsToValidate(paths, pathsToValidate);
-  } else if (Array.isArray(pathsToSkip)) {
-    paths = _handlePathsToSkip(paths, pathsToSkip);
-  }
   const validating = {};
 
   for (let i = 0, len = paths.length; i < len; ++i) {

package/lib/helpers/document/applyDefaults.js

@@ -32,7 +32,7 @@ module.exports = function applyDefaults(doc, fields, exclude, hasIncludedChildre
         }
       } else if (exclude === false && fields && !included) {
         const hasSubpaths = type.$isSingleNested || type.$isMongooseDocumentArray;
-        if (curPath in fields || (hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
+        if (curPath in fields || (j === len - 1 && hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
           included = true;
         } else if (hasIncludedChildren != null && !hasIncludedChildren[curPath]) {
           break;

package/lib/model.js

@@ -1252,9 +1252,11 @@ for (const i in EventEmitter.prototype) {
  * Mongoose calls this function automatically when a model is created using
  * [`mongoose.model()`](/docs/api/mongoose.html#mongoose_Mongoose-model) or
  * [`connection.model()`](/docs/api/connection.html#connection_Connection-model), so you
- * don't need to call it. This function is also idempotent, so you may call it
- * to get back a promise that will resolve when your indexes are finished
- * building as an alternative to [`MyModel.on('index')`](/docs/guide.html#indexes)
+ * don't need to call `init()` to trigger index builds.
+ *
+ * However, you _may_ need to call `init()`  to get back a promise that will resolve when your indexes are finished.
+ * Calling `await Model.init()` is helpful if you need to wait for indexes to build before continuing.
+ * For example, if you want to wait for unique indexes to build before continuing with a test case.
  *
  * #### Example:
  *
@@ -1263,11 +1265,8 @@ for (const i in EventEmitter.prototype) {
  *     // `Event.init()` on your own.
  *     const Event = mongoose.model('Event', eventSchema);
  *
- *     Event.init().then(function(Event) {
- *       // You can also use `Event.on('index')` if you prefer event emitters
- *       // over promises.
- *       console.log('Indexes are done building!');
- *     });
+ *     await Event.init();
+ *     console.log('Indexes are done building!');
  *
  * @api public
  * @returns {Promise}
@@ -2110,10 +2109,9 @@ Model.findById = function findById(id, projection, options) {
  *     // Find one adventure whose `country` is 'Croatia', otherwise `null`
  *     await Adventure.findOne({ country: 'Croatia' }).exec();
  *
- *     // using callback
- *     Adventure.findOne({ country: 'Croatia' }, function (err, adventure) {});
+ *     // Model.findOne() no longer accepts a callback
  *
- *     // select only the adventures name and length
+ *     // Select only the adventures name and length
  *     await Adventure.findOne({ country: 'Croatia' }, 'name length').exec();
  *
  * @param {Object} [conditions]

package/lib/query.js

@@ -4482,7 +4482,8 @@ Query.prototype.finally = function(onFinally) {
  *
  * @return {String}
  * @api public
- * @method toStringTag
+ * @method [Symbol.toStringTag]
+ * @memberOf Query
  */
 
 Query.prototype[Symbol.toStringTag] = function toString() {
@@ -5192,7 +5193,7 @@ Query.prototype.nearSphere = function() {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf Query
  * @instance
  * @api public

package/lib/schema/documentarray.js

@@ -416,6 +416,8 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
 
   options = options || {};
 
+  const path = options.path || this.path;
+
   if (!Array.isArray(value)) {
     if (!init && !DocumentArrayPath.options.castNonArrays) {
       throw new CastError('DocumentArray', value, this.path, null, this);
@@ -423,7 +425,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
     // gh-2442 mark whole array as modified if we're initializing a doc from
     // the db and the path isn't an array in the document
     if (!!doc && init) {
-      doc.markModified(this.path);
+      doc.markModified(path);
     }
     return this.cast([value], doc, init, prev, options);
   }
@@ -431,7 +433,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   // We need to create a new array, otherwise change tracking will
   // update the old doc (gh-4449)
   if (!options.skipDocumentArrayCast || utils.isMongooseDocumentArray(value)) {
-    value = new MongooseDocumentArray(value, this.path, doc);
+    value = new MongooseDocumentArray(value, path, doc);
   }
 
   if (prev != null) {
@@ -439,7 +441,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   }
 
   if (options.arrayPathIndex != null) {
-    value[arrayPathSymbol] = this.path + '.' + options.arrayPathIndex;
+    value[arrayPathSymbol] = path + '.' + options.arrayPathIndex;
   }
 
   const rawArray = utils.isMongooseDocumentArray(value) ? value.__array : value;

package/lib/schema/uuid.js

@@ -231,7 +231,10 @@ SchemaUUID.checkRequired = SchemaType.checkRequired;
  */
 
 SchemaUUID.prototype.checkRequired = function checkRequired(value) {
-  return UUID_FORMAT.test(value);
+  if (Buffer.isBuffer(value)) {
+    value = binaryToString(value);
+  }
+  return value != null && UUID_FORMAT.test(value);
 };
 
 /**

package/lib/schema.js

@@ -734,8 +734,15 @@ Schema.prototype.add = function add(obj, prefix) {
         if (prefix) {
           this.nested[prefix.substring(0, prefix.length - 1)] = true;
         }
-        const _schema = new Schema(_typeDef);
-        const schemaWrappedPath = Object.assign({}, val, { type: _schema });
+
+        const childSchemaOptions = {};
+        if (this._userProvidedOptions.typeKey) {
+          childSchemaOptions.typeKey = this._userProvidedOptions.typeKey;
+        }
+
+        const _schema = new Schema(_typeDef, childSchemaOptions);
+        _schema.$implicitlyCreated = true;
+        const schemaWrappedPath = Object.assign({}, val, { [typeKey]: _schema });
         this.path(prefix + key, schemaWrappedPath);
       } else {
         // Either the type is non-POJO or we interpret it as Mixed anyway
@@ -1322,6 +1329,7 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         } else if (Schema.Types.DocumentArray.defaultOptions._id != null) {
           childSchemaOptions._id = Schema.Types.DocumentArray.defaultOptions._id;
         }
+
         const childSchema = new Schema(castFromTypeKey, childSchemaOptions);
         childSchema.$implicitlyCreated = true;
         return new MongooseTypes.DocumentArray(path, childSchema, obj);
@@ -1365,7 +1373,6 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
   }
 
   if (type && type.instanceOfSchema) {
-
     return new MongooseTypes.Subdocument(type, path, obj);
   }
 

package/lib/schematype.js

@@ -180,7 +180,7 @@ SchemaType.prototype.validators;
  * @memberOf SchemaType
  */
 
-SchemaType.prototype.validators;
+SchemaType.prototype.isRequired;
 
 /**
  * Split the current dottet path into segments

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.0.0",
+  "version": "7.0.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -28,10 +28,10 @@
     "sift": "16.0.1"
   },
   "devDependencies": {
-    "@babel/core": "7.20.12",
+    "@babel/core": "7.21.0",
     "@babel/preset-env": "7.20.2",
-    "@typescript-eslint/eslint-plugin": "5.50.0",
-    "@typescript-eslint/parser": "5.50.0",
+    "@typescript-eslint/eslint-plugin": "5.54.0",
+    "@typescript-eslint/parser": "5.54.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",
@@ -45,7 +45,8 @@
     "crypto-browserify": "3.12.0",
     "dotenv": "16.0.3",
     "dox": "1.0.0",
-    "eslint": "8.33.0",
+    "eslint": "8.35.0",
+    "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
     "highlight.js": "11.7.0",
@@ -55,7 +56,7 @@
     "mkdirp": "^2.1.3",
     "mocha": "10.2.0",
     "moment": "2.x",
-    "mongodb-memory-server": "8.11.4",
+    "mongodb-memory-server": "8.11.5",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.2",
@@ -75,12 +76,12 @@
     "docs:clean:stable": "rimraf index.html && rimraf -rf ./docs/*.html  && rimraf -rf ./docs/api && rimraf -rf ./docs/tutorials/*.html && rimraf -rf ./docs/typescript/*.html && rimraf -rf ./docs/*.html && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
     "docs:clean:5x": "rimraf index.html && rimraf -rf ./docs/5.x && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
     "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 && 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 && cp index.html ./tmp",
+    "docs:copy:tmp": "mkdirp ./tmp/docs/css && mkdirp ./tmp/docs/js && mkdirp ./tmp/docs/images && mkdirp ./tmp/docs/tutorials && mkdirp ./tmp/docs/typescript && 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 && cp index.html ./tmp && cp docs/*.html ./tmp/docs/",
     "docs:copy:tmp:5x": "rimraf ./docs/5.x && ncp ./tmp ./docs/5.x",
-    "docs:copy:tmp:6x": "rimraf ./docs/5.x && ncp ./tmp ./docs/5.x",
+    "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",
-    "docs:checkout:6x": "git checkout 5.x",
+    "docs:checkout:6x": "git checkout 6.x",
     "docs:generate": "node ./scripts/website.js",
     "docs:generate:search": "node ./scripts/generateSearch.js",
     "docs:merge:stable": "git merge master",
@@ -89,16 +90,18 @@
     "docs:test": "npm run docs:generate && npm run docs:generate:search",
     "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 && docs:checkout:gh-pages && 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 && docs:checkout:gh-pages && docs:copy:tmp:6x",
+    "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:check-links": "blc http://127.0.0.1:8089 -ro",
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js",
     "lint-ts": "eslint . --ext .ts",
+    "lint-md": "eslint . --ext .md",
     "build-browser": "(rm ./dist/* || true) && node ./scripts/build-browser.js",
     "prepublishOnly": "npm run build-browser",
     "release": "git pull && git push origin master --tags && npm publish",
-    "release-5x": "git pull origin 5.x && git push origin 5.x --tags && npm publish --tag 5x",
+    "release-5x": "git pull origin 5.x && git push origin 5.x && git push origin 5.x --tags && npm publish --tag 5x",
+    "release-6x": "git pull origin 6.x && git push origin 6.x && git push origin 6.x --tags && npm publish --tag legacy",
     "mongo": "node ./tools/repl.js",
     "test": "mocha --exit ./test/*.test.js",
     "test-deno": "deno run --allow-env --allow-read --allow-net --allow-run --allow-sys --allow-write ./test/deno.js",

package/scripts/generateSearch.js

@@ -1,6 +1,14 @@
 'use strict';
 
-const config = require('../.config');
+let config;
+try {
+  config = require('../.config.js');
+} finally {
+  if (!config || !config.uri) {
+    console.error('No Config or config.URI given, please create a .config.js file with those values in the root of the repository');
+    process.exit(-1);
+  }
+}
 const cheerio = require('cheerio');
 const filemap = require('../docs/source');
 const fs = require('fs');
@@ -16,8 +24,6 @@ markdown.setOptions({
   }
 });
 
-mongoose.set('strictQuery', false);
-
 // 5.13.5 -> 5.x, 6.8.2 -> 6.x, etc.
 version = version.slice(0, version.indexOf('.')) + '.x';
 
@@ -32,25 +38,27 @@ const Content = mongoose.model('Content', contentSchema, 'Content');
 
 const contents = [];
 
-for (const [filename, file] of Object.entries(filemap)) {
-  if (file.api) {
-    // API docs are special, raw content is in the `docs` property
-    for (const _class of file.docs) {
-      for (const prop of _class.props) {
-        const content = new Content({
-          title: `API: ${prop.string}`,
-          body: prop.description,
-          url: `api/${_class.fileName}.html#${prop.anchorId}`
-        });
-        const err = content.validateSync();
-        if (err != null) {
-          console.error(content);
-          throw err;
-        }
-        contents.push(content);
-      }
+const api = require('../docs/source/api');
+
+// API docs are special, because they are not added to the file-map individually currently and use different properties
+for (const _class of api.docs) {
+  for (const prop of _class.props) {
+    const content = new Content({
+      title: `API: ${prop.name}`,
+      body: prop.description,
+      url: `api/${_class.fileName}.html#${prop.anchorId}`
+    });
+    const err = content.validateSync();
+    if (err != null) {
+      console.error(content);
+      throw err;
     }
-  } else if (file.markdown) {
+    contents.push(content);
+  }
+}
+
+for (const [filename, file] of Object.entries(filemap)) {
+  if (file.markdown) {
     let text = fs.readFileSync(filename, 'utf8');
     text = markdown.parse(text);
 
@@ -122,12 +130,7 @@ run().catch(async error => {
 });
 
 async function run() {
-  if (!config || !config.uri) {
-    console.error('No Config or config.URI given, please create a .config.js file with those values');
-    process.exit(-1);
-  }
-
-  await mongoose.connect(config.uri, { dbName: 'mongoose' });
+  await mongoose.connect(config.uri, { dbName: 'mongoose', serverSelectionTimeoutMS: 5000 });
 
   // wait for the index to be created
   await Content.init();
@@ -154,5 +157,7 @@ async function run() {
 
   console.log(results.map(res => res.url));
 
+  console.log(`Added ${contents.length} Content`);
+
   process.exit(0);
 }

package/types/cursor.d.ts

@@ -38,8 +38,8 @@ declare module 'mongoose' {
      * will wait for the promise to resolve before iterating on to the next one.
      * Returns a promise that resolves when done.
      */
-    eachAsync(fn: (doc: DocType[]) => any, options: EachAsyncOptions & { batchSize: number }): Promise<void>;
-    eachAsync(fn: (doc: DocType) => any, options?: EachAsyncOptions): Promise<void>;
+    eachAsync(fn: (doc: DocType[], i: number) => any, options: EachAsyncOptions & { batchSize: number }): Promise<void>;
+    eachAsync(fn: (doc: DocType, i: number) => any, options?: EachAsyncOptions): Promise<void>;
 
     /**
      * Registers a transform function which subsequently maps documents retrieved

package/types/index.d.ts

@@ -139,12 +139,14 @@ declare module 'mongoose' {
     TOverrides = {},
     TQueryHelpers = {}
   > = IfAny<
-  DocType,
-  any,
-  Document<unknown, TQueryHelpers, DocType> & MergeType<
-  Require_id<DocType>,
-  IfAny<TOverrides, {}>
-  >
+    DocType,
+    any,
+    Document<unknown, TQueryHelpers, DocType> & MergeType<
+      Require_id<DocType>,
+      TOverrides extends Record<string, never> ?
+        {} :
+        IfAny<TOverrides, {}>
+    >
   >;
   export type HydratedSingleSubdocument<DocType, TOverrides = {}> = Types.Subdocument<unknown> & Require_id<DocType> & TOverrides;
   export type HydratedArraySubdocument<DocType, TOverrides = {}> = Types.ArraySubdocument<unknown> & Require_id<DocType> & TOverrides;

package/types/models.d.ts

@@ -11,8 +11,16 @@ declare module 'mongoose' {
 
   export interface AcceptsDiscriminator {
     /** Adds a discriminator type. */
-    discriminator<D>(name: string | number, schema: Schema, value?: string | number | ObjectId | DiscriminatorOptions): Model<D>;
-    discriminator<T, U>(name: string | number, schema: Schema<T, U>, value?: string | number | ObjectId | DiscriminatorOptions): U;
+    discriminator<D>(
+      name: string | number,
+      schema: Schema,
+      value?: string | number | ObjectId | DiscriminatorOptions
+    ): Model<D>;
+    discriminator<T, U>(
+      name: string | number,
+      schema: Schema<T, U>,
+      value?: string | number | ObjectId | DiscriminatorOptions
+    ): U;
   }
 
   interface MongooseBulkWriteOptions {
@@ -342,6 +350,13 @@ declare module 'mongoose' {
     populate(
       doc: any, options: PopulateOptions | Array<PopulateOptions> | string
     ): Promise<THydratedDocumentType>;
+    populate<Paths>(
+      docs: Array<any>,
+      options: PopulateOptions | Array<PopulateOptions> | string
+    ): Promise<Array<MergeType<THydratedDocumentType, Paths>>>;
+    populate<Paths>(
+      doc: any, options: PopulateOptions | Array<PopulateOptions> | string
+    ): Promise<MergeType<THydratedDocumentType, Paths>>;
 
     /** Casts and validates the given object against this model's schema, passing the given `context` to custom validators. */
     validate(): Promise<void>;

package/types/query.d.ts

@@ -109,7 +109,7 @@ declare module 'mongoose' {
     /**
      * If truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document.
      */
-    lean?: boolean | any;
+    lean?: boolean | Record<string, any>;
     limit?: number;
     maxTimeMS?: number;
     multi?: boolean;
@@ -532,7 +532,7 @@ declare module 'mongoose' {
     replaceOne(filter?: FilterQuery<DocType>, replacement?: DocType | AnyObject, options?: QueryOptions<DocType> | null): QueryWithHelpers<any, DocType, THelpers, RawDocType>;
 
     /** Specifies which document fields to include or exclude (also known as the query "projection") */
-    select(arg: string | any): this;
+    select(arg: string | string[] | Record<string, number | boolean | object>): this;
 
     /** Determines if field selection has been made. */
     selected(): boolean;
@@ -594,9 +594,6 @@ declare module 'mongoose' {
     /** Converts this query to a customized, reusable query constructor with all arguments and options retained. */
     toConstructor<RetType = typeof Query>(): RetType;
 
-    /** Declare and/or execute this query as an update() operation. */
-    update(filter?: FilterQuery<DocType>, update?: UpdateQuery<DocType> | UpdateWithAggregationPipeline, options?: QueryOptions<DocType> | null): QueryWithHelpers<UpdateWriteOpResult, DocType, THelpers, RawDocType>;
-
     /**
      * Declare and/or execute this query as an updateMany() operation. Same as
      * `update()`, except MongoDB will update _all_ documents that match

package/types/types.d.ts

@@ -61,7 +61,7 @@ declare module 'mongoose' {
 
     class DocumentArray<T> extends Types.Array<T extends Types.Subdocument ? T : Types.Subdocument<InferId<T>> & T> {
       /** DocumentArray constructor */
-      constructor(values: any[]);
+      constructor(values: (AnyKeys<T> & AnyObject)[]);
 
       isMongooseDocumentArray: true;