mongoose 6.6.1 → 6.6.3

package/.eslintrc.json

@@ -25,6 +25,7 @@
       "rules": {
         "@typescript-eslint/triple-slash-reference": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-empty-function": "off",
         "spaced-comment": [
           "error",
           "always",

package/lib/aggregate.js

@@ -126,7 +126,7 @@ Aggregate.prototype.model = function(model) {
 /**
  * Appends new operators to this aggregate pipeline
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.append({ $project: { field: 1 }}, { $limit: 2 });
  *
@@ -157,7 +157,7 @@ Aggregate.prototype.append = function() {
  * Appends a new $addFields operator to this aggregate pipeline.
  * Requires MongoDB v3.4+ to work
  *
- * #### Examples:
+ * #### Example:
   *
  *     // adding new fields based on existing fields
  *     aggregate.addFields({
@@ -188,7 +188,7 @@ Aggregate.prototype.addFields = function(arg) {
  *
  * Mongoose query [selection syntax](#query_Query-select) is also supported.
  *
- * #### Examples:
+ * #### Example:
  *
  *     // include a, include b, exclude _id
  *     aggregate.project("a b -_id");
@@ -243,7 +243,7 @@ Aggregate.prototype.project = function(arg) {
 /**
  * Appends a new custom $group operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.group({ _id: "$department" });
  *
@@ -259,7 +259,7 @@ Aggregate.prototype.project = function(arg) {
 /**
  * Appends a new custom $match operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.match({ department: { $in: [ "sales", "engineering" ] } });
  *
@@ -275,7 +275,7 @@ Aggregate.prototype.project = function(arg) {
 /**
  * Appends a new $skip operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.skip(10);
  *
@@ -291,7 +291,7 @@ Aggregate.prototype.project = function(arg) {
 /**
  * Appends a new $limit operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.limit(10);
  *
@@ -308,7 +308,7 @@ Aggregate.prototype.project = function(arg) {
 /**
  * Appends a new $densify operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *      aggregate.densify({
  *        field: 'timestamp',
@@ -335,7 +335,7 @@ Aggregate.prototype.project = function(arg) {
  *
  * **MUST** be used as the first operator in the pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.near({
  *       near: [40.724, -73.997],
@@ -380,7 +380,7 @@ Aggregate.prototype.near = function(arg) {
  * Note that the `$unwind` operator requires the path name to start with '$'.
  * Mongoose will prepend '$' if the specified field doesn't start '$'.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.unwind("tags");
  *     aggregate.unwind("a", "b", "c");
@@ -419,7 +419,7 @@ Aggregate.prototype.unwind = function() {
  * If you are passing in a string Mongoose will prepend '$' if the specified field doesn't start '$'.
  * If you are passing in an object the strings in your expression will not be altered.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.replaceRoot("user");
  *
@@ -450,7 +450,7 @@ Aggregate.prototype.replaceRoot = function(newRoot) {
 /**
  * Appends a new $count operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.count("userCount");
  *
@@ -471,7 +471,7 @@ Aggregate.prototype.count = function(fieldName) {
  * Note that the `$sortByCount` operator requires the new root to start with '$'.
  * Mongoose will prepend '$' if the specified field name doesn't start with '$'.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.sortByCount('users');
  *     aggregate.sortByCount({ $mergeObjects: [ "$employee", "$business" ] })
@@ -498,7 +498,7 @@ Aggregate.prototype.sortByCount = function(arg) {
 /**
  * Appends new custom $lookup operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.lookup({ from: 'users', localField: 'userId', foreignField: '_id', as: 'users' });
  *
@@ -517,7 +517,7 @@ Aggregate.prototype.lookup = function(options) {
  *
  * Note that graphLookup can only consume at most 100MB of memory, and does not allow disk use even if `{ allowDiskUse: true }` is specified.
  *
- * #### Examples:
+ * #### Example:
  *
  *      // Suppose we have a collection of courses, where a document might look like `{ _id: 0, name: 'Calculus', prerequisite: 'Trigonometry'}` and `{ _id: 0, name: 'Trigonometry', prerequisite: 'Algebra' }`
  *      aggregate.graphLookup({ from: 'courses', startWith: '$prerequisite', connectFromField: 'prerequisite', connectToField: 'name', as: 'prerequisites', maxDepth: 3 }) // this will recursively search the 'courses' collection up to 3 prerequisites
@@ -551,7 +551,7 @@ Aggregate.prototype.graphLookup = function(options) {
 /**
  * Appends new custom $sample operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.sample(3); // Add a pipeline that picks 3 random documents
  *
@@ -572,7 +572,7 @@ Aggregate.prototype.sample = function(size) {
  *
  * If a string is passed, it must be a space delimited list of path names. The sort order of each path is ascending unless the path name is prefixed with `-` which will be treated as descending.
  *
- * #### Examples:
+ * #### Example:
  *
  *     // these are equivalent
  *     aggregate.sort({ field: 'asc', test: -1 });
@@ -620,7 +620,7 @@ Aggregate.prototype.sort = function(arg) {
 /**
  * Appends new $unionWith operator to this aggregate pipeline.
  *
- * #### Examples:
+ * #### Example:
  *
  *     aggregate.unionWith({ coll: 'users', pipeline: [ { $match: { _id: 1 } } ] });
  *

package/lib/document.js

@@ -851,11 +851,12 @@ Document.prototype.update = function update() {
 
 Document.prototype.updateOne = function updateOne(doc, options, callback) {
   const query = this.constructor.updateOne({ _id: this._id }, doc, options);
-  query.pre(cb => {
-    this.constructor._middleware.execPre('updateOne', this, [this], cb);
+  const self = this;
+  query.pre(function queryPreUpdateOne(cb) {
+    self.constructor._middleware.execPre('updateOne', self, [self], cb);
   });
-  query.post(cb => {
-    this.constructor._middleware.execPost('updateOne', this, [this], {}, cb);
+  query.post(function queryPostUpdateOne(cb) {
+    self.constructor._middleware.execPost('updateOne', self, [self], {}, cb);
   });
 
   if (this.$session() != null) {
@@ -1735,7 +1736,7 @@ Document.prototype.$inc = function $inc(path, val) {
     this.invalidate(path, new MongooseError.CastError('number', val, path, err));
   }
 
-  const currentValue = this.$__getValue(path);
+  const currentValue = this.$__getValue(path) || 0;
 
   this.$__setValue(path, currentValue + val);
 

package/lib/helpers/discriminator/mergeDiscriminatorSchema.js

@@ -0,0 +1,63 @@
+'use strict';
+const schemaMerge = require('../schema/merge');
+const specialProperties = require('../../helpers/specialProperties');
+const isBsonType = require('../../helpers/isBsonType');
+const ObjectId = require('../../types/objectid');
+const isObject = require('../../helpers/isObject');
+/**
+ * Merges `from` into `to` without overwriting existing properties.
+ *
+ * @param {Object} to
+ * @param {Object} from
+ * @param {String} [path]
+ * @api private
+ */
+
+module.exports = function mergeDiscriminatorSchema(to, from, path) {
+  const keys = Object.keys(from);
+  let i = 0;
+  const len = keys.length;
+  let key;
+
+  path = path || '';
+
+  while (i < len) {
+    key = keys[i++];
+    if (key === 'discriminators' || key === 'base' || key === '_applyDiscriminators') {
+      continue;
+    }
+    if (path === 'tree' && from != null && from.instanceOfSchema) {
+      continue;
+    }
+    if (specialProperties.has(key)) {
+      continue;
+    }
+    if (to[key] == null) {
+      to[key] = from[key];
+    } else if (isObject(from[key])) {
+      if (!isObject(to[key])) {
+        to[key] = {};
+      }
+      if (from[key] != null) {
+        // Skip merging schemas if we're creating a discriminator schema and
+        // base schema has a given path as a single nested but discriminator schema
+        // has the path as a document array, or vice versa (gh-9534)
+        if ((from[key].$isSingleNested && to[key].$isMongooseDocumentArray) ||
+              (from[key].$isMongooseDocumentArray && to[key].$isSingleNested)) {
+          continue;
+        } else if (from[key].instanceOfSchema) {
+          if (to[key].instanceOfSchema) {
+            schemaMerge(to[key], from[key].clone(), true);
+          } else {
+            to[key] = from[key].clone();
+          }
+          continue;
+        } else if (isBsonType(from[key], 'ObjectID')) {
+          to[key] = new ObjectId(from[key]);
+          continue;
+        }
+      }
+      mergeDiscriminatorSchema(to[key], from[key], path ? path + '.' + key : key);
+    }
+  }
+};

package/lib/helpers/model/applyMethods.js

@@ -12,6 +12,8 @@ const utils = require('../../utils');
  */
 
 module.exports = function applyMethods(model, schema) {
+  const Model = require('../../model');
+
   function apply(method, schema) {
     Object.defineProperty(model.prototype, method, {
       get: function() {
@@ -34,7 +36,8 @@ module.exports = function applyMethods(model, schema) {
     // Avoid making custom methods if user sets a method to itself, e.g.
     // `schema.method(save, Document.prototype.save)`. Can happen when
     // calling `loadClass()` with a class that `extends Document`. See gh-12254
-    if (typeof fn === 'function' && model.prototype[method] === fn) {
+    if (typeof fn === 'function' &&
+        Model.prototype[method] === fn) {
       delete schema.methods[method];
       continue;
     }

package/lib/helpers/model/discriminator.js

@@ -4,6 +4,7 @@ const Mixed = require('../../schema/mixed');
 const defineKey = require('../document/compile').defineKey;
 const get = require('../get');
 const utils = require('../../utils');
+const mergeDiscriminatorSchema = require('../../helpers/discriminator/mergeDiscriminatorSchema');
 
 const CUSTOMIZABLE_DISCRIMINATOR_OPTIONS = {
   toJSON: true,
@@ -108,8 +109,7 @@ module.exports = function discriminator(model, name, schema, tiedValue, applyPlu
       }
     }
 
-    utils.merge(schema, baseSchema, {
-      isDiscriminatorSchemaMerge: true,
+    mergeDiscriminatorSchema(schema, baseSchema, {
       omit: { discriminators: true, base: true, _applyDiscriminators: true },
       omitNested: conflictingPaths.reduce((cur, path) => {
         cur['tree.' + path] = true;

package/lib/helpers/timestamps/setupTimestamps.js

@@ -27,19 +27,19 @@ module.exports = function setupTimestamps(schema, timestamps) {
 
   schema.$timestamps = { createdAt: createdAt, updatedAt: updatedAt };
 
-  if (updatedAt && !schema.paths[updatedAt]) {
-    schemaAdditions[updatedAt] = Date;
-  }
-
   if (createdAt && !schema.paths[createdAt]) {
     const baseImmutableCreatedAt = schema.base.get('timestamps.createdAt.immutable');
     const immutable = baseImmutableCreatedAt != null ? baseImmutableCreatedAt : true;
     schemaAdditions[createdAt] = { [schema.options.typeKey || 'type']: Date, immutable };
   }
 
+  if (updatedAt && !schema.paths[updatedAt]) {
+    schemaAdditions[updatedAt] = Date;
+  }
+
   schema.add(schemaAdditions);
 
-  schema.pre('save', function(next) {
+  schema.pre('save', function timestampsPreSave(next) {
     const timestampOption = get(this, '$__.saveOptions.timestamps');
     if (timestampOption === false) {
       return next();

package/lib/model.js

@@ -2172,7 +2172,7 @@ Model.deleteMany = function deleteMany(conditions, options, callback) {
  * See our [query casting tutorial](/docs/tutorials/query_casting.html) for
  * more information on how Mongoose casts `filter`.
  *
- * #### Examples:
+ * #### Example:
  *
  *     // find all documents
  *     await MyModel.find({});
@@ -2537,7 +2537,7 @@ Model.$where = function $where() {
  *
  * Finds a matching document, updates it according to the `update` arg, passing any `options`, and returns the found document (if any) to the callback. The query executes if `callback` is passed else a Query object is returned.
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findOneAndUpdate(conditions, update, options, callback) // executes
  *     A.findOneAndUpdate(conditions, update, options)  // returns Query
@@ -2558,6 +2558,7 @@ Model.$where = function $where() {
  *     Model.findOneAndUpdate(query, { $set: { name: 'jason bourne' }}, options, callback)
  *
  * This helps prevent accidentally overwriting your document with `{ name: 'jason bourne' }`.
+ * To prevent this behaviour, see the `overwrite` option
  *
  * #### Note:
  *
@@ -2670,7 +2671,7 @@ function _decorateUpdateWithVersionKey(update, options, versionKey) {
  *
  * - `findOneAndUpdate()`
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findByIdAndUpdate(id, update, options, callback) // executes
  *     A.findByIdAndUpdate(id, update, options)  // returns Query
@@ -2690,6 +2691,7 @@ function _decorateUpdateWithVersionKey(update, options, versionKey) {
  *     Model.findByIdAndUpdate(id, { $set: { name: 'jason bourne' }}, options, callback)
  *
  * This helps prevent accidentally overwriting your document with `{ name: 'jason bourne' }`.
+ * To prevent this behaviour, see the `overwrite` option
  *
  * #### Note:
  *
@@ -2767,7 +2769,7 @@ Model.findByIdAndUpdate = function(id, update, options, callback) {
  * this distinction is purely pedantic. You should use `findOneAndDelete()`
  * unless you have a good reason not to.
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findOneAndDelete(conditions, options, callback) // executes
  *     A.findOneAndDelete(conditions, options)  // return Query
@@ -2873,7 +2875,7 @@ Model.findByIdAndDelete = function(id, options, callback) {
  *
  * - `findOneAndReplace()`
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findOneAndReplace(filter, replacement, options, callback) // executes
  *     A.findOneAndReplace(filter, replacement, options)  // return Query
@@ -2947,7 +2949,7 @@ Model.findOneAndReplace = function(filter, replacement, options, callback) {
  *
  * - `findOneAndRemove()`
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findOneAndRemove(conditions, options, callback) // executes
  *     A.findOneAndRemove(conditions, options)  // return Query
@@ -3020,7 +3022,7 @@ Model.findOneAndRemove = function(conditions, options, callback) {
  *
  * - `findOneAndRemove()`
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.findByIdAndRemove(id, options, callback) // executes
  *     A.findByIdAndRemove(id, options)  // return Query
@@ -3967,7 +3969,7 @@ Model.hydrate = function(obj, projection, options) {
  *
  * This method is deprecated. See [Deprecation Warnings](../deprecations.html#update) for details.
  *
- * #### Examples:
+ * #### Example:
  *
  *     MyModel.update({ age: { $gt: 18 } }, { oldEnough: true }, fn);
  *
@@ -4524,7 +4526,7 @@ Model.validate = function validate(obj, pathsToValidate, context, callback) {
  * - justOne: optional boolean, if true Mongoose will always set `path` to an array. Inferred from schema by default.
  * - strictPopulate: optional boolean, set to `false` to allow populating paths that aren't in the schema.
  *
- * #### Examples:
+ * #### Example:
  *
  *     const Dog = mongoose.model('Dog', new Schema({ name: String, breed: String }));
  *     const Person = mongoose.model('Person', new Schema({

package/lib/plugins/clearValidating.js

@@ -4,11 +4,11 @@
  * ignore
  */
 
-module.exports = function(schema) {
+module.exports = function clearValidating(schema) {
   // `this.$__.validating` tracks whether there are multiple validations running
   // in parallel. We need to clear `this.$__.validating` before post hooks for gh-8597
   const unshift = true;
-  schema.s.hooks.post('validate', false, function() {
+  schema.s.hooks.post('validate', false, function clearValidatingPostValidate() {
     if (this.$isSubdocument) {
       return;
     }
@@ -16,7 +16,7 @@ module.exports = function(schema) {
     this.$__.validating = null;
   }, unshift);
 
-  schema.s.hooks.post('validate', false, function(error, res, next) {
+  schema.s.hooks.post('validate', false, function clearValidatingPostValidateError(error, res, next) {
     if (this.$isSubdocument) {
       next();
       return;

package/lib/plugins/removeSubdocs.js

@@ -6,9 +6,9 @@ const each = require('../helpers/each');
  * ignore
  */
 
-module.exports = function(schema) {
+module.exports = function removeSubdocs(schema) {
   const unshift = true;
-  schema.s.hooks.pre('remove', false, function(next) {
+  schema.s.hooks.pre('remove', false, function removeSubDocsPreRemove(next) {
     if (this.$isSubdocument) {
       next();
       return;

package/lib/plugins/saveSubdocs.js

@@ -6,9 +6,9 @@ const each = require('../helpers/each');
  * ignore
  */
 
-module.exports = function(schema) {
+module.exports = function saveSubdocs(schema) {
   const unshift = true;
-  schema.s.hooks.pre('save', false, function(next) {
+  schema.s.hooks.pre('save', false, function saveSubdocsPreSave(next) {
     if (this.$isSubdocument) {
       next();
       return;
@@ -36,7 +36,7 @@ module.exports = function(schema) {
     });
   }, null, unshift);
 
-  schema.s.hooks.post('save', function(doc, next) {
+  schema.s.hooks.post('save', function saveSubdocsPostSave(doc, next) {
     if (this.$isSubdocument) {
       next();
       return;

package/lib/plugins/sharding.js

@@ -8,19 +8,19 @@ const utils = require('../utils');
  */
 
 module.exports = function shardingPlugin(schema) {
-  schema.post('init', function() {
+  schema.post('init', function shardingPluginPostInit() {
     storeShard.call(this);
     return this;
   });
-  schema.pre('save', function(next) {
+  schema.pre('save', function shardingPluginPreSave(next) {
     applyWhere.call(this);
     next();
   });
-  schema.pre('remove', function(next) {
+  schema.pre('remove', function shardingPluginPreRemove(next) {
     applyWhere.call(this);
     next();
   });
-  schema.post('save', function() {
+  schema.post('save', function shardingPluginPostSave() {
     storeShard.call(this);
   });
 };

package/lib/plugins/trackTransaction.js

@@ -5,7 +5,7 @@ const sessionNewDocuments = require('../helpers/symbols').sessionNewDocuments;
 const utils = require('../utils');
 
 module.exports = function trackTransaction(schema) {
-  schema.pre('save', function() {
+  schema.pre('save', function trackTransactionPreSave() {
     const session = this.$session();
     if (session == null) {
       return;

package/lib/plugins/validateBeforeSave.js

@@ -4,7 +4,7 @@
  * ignore
  */
 
-module.exports = function(schema) {
+module.exports = function validateBeforeSave(schema) {
   const unshift = true;
   schema.pre('save', false, function validateBeforeSave(next, options) {
     const _this = this;

package/lib/query.js

@@ -2402,6 +2402,10 @@ Query.prototype.merge = function(source) {
 
     utils.merge(this._mongooseOptions, source._mongooseOptions);
 
+    return this;
+  } else if (this.model != null && source instanceof this.model.base.Types.ObjectId) {
+    utils.merge(this._conditions, { _id: source }, opts);
+
     return this;
   }
 
@@ -2951,11 +2955,14 @@ Query.prototype.distinct = function(field, conditions, callback) {
  *     // equivalent
  *     query.sort('field -test');
  *
+ *     // also possible is to use a array with array key-value pairs
+ *     query.sort([['field', 'asc']]);
+ *
  * #### Note:
  *
  * Cannot be used with `distinct()`
  *
- * @param {Object|String} arg
+ * @param {Object|String|Array<Array<(string | number)>>} arg
  * @return {Query} this
  * @see cursor.sort https://docs.mongodb.org/manual/reference/method/cursor.sort/
  * @api public
@@ -3340,7 +3347,7 @@ function prepareDiscriminatorCriteria(query) {
  *       // doc: the document before updates are applied if `new: false`, or after updates if `new = true`
  *     }
  *
- * #### Examples:
+ * #### Example:
  *
  *     query.findOneAndUpdate(conditions, update, options, callback) // executes
  *     query.findOneAndUpdate(conditions, update, options)  // returns Query
@@ -3486,7 +3493,7 @@ Query.prototype._findOneAndUpdate = wrapThunk(function(callback) {
  *       // doc: the document before updates are applied if `new: false`, or after updates if `new = true`
  *     }
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.where().findOneAndRemove(conditions, options, callback) // executes
  *     A.where().findOneAndRemove(conditions, options)  // return Query
@@ -3574,7 +3581,7 @@ Query.prototype.findOneAndRemove = function(conditions, options, callback) {
  *       // doc: the document before updates are applied if `new: false`, or after updates if `new = true`
  *     }
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.where().findOneAndDelete(conditions, options, callback) // executes
  *     A.where().findOneAndDelete(conditions, options)  // return Query
@@ -3696,7 +3703,7 @@ Query.prototype._findOneAndDelete = wrapThunk(function(callback) {
  *       // doc: the document before updates are applied if `new: false`, or after updates if `new = true`
  *     }
  *
- * #### Examples:
+ * #### Example:
  *
  *     A.where().findOneAndReplace(filter, replacement, options, callback); // executes
  *     A.where().findOneAndReplace(filter, replacement, options); // return Query
@@ -4863,7 +4870,7 @@ function _orFailError(err, query) {
 /**
  * Executes the query
  *
- * #### Examples:
+ * #### Example:
  *
  *     const promise = query.exec();
  *     const promise = query.exec('update');

package/lib/queryhelpers.js

@@ -232,6 +232,9 @@ exports.applyPaths = function applyPaths(fields, schema) {
     schema.eachPath(function(path, type) {
       if (prefix) path = prefix + '.' + path;
       if (type.$isSchemaMap || path.endsWith('.$*')) {
+        if (type.options && type.options.select === false) {
+          excluded.push(path);
+        }
         return;
       }
       let addedPath = analyzePath(path, type);

package/lib/schema.js

@@ -2013,7 +2013,7 @@ Schema.prototype.virtual = function(name, options) {
       throw new Error('Reference virtuals require `foreignField` option');
     }
 
-    this.pre('init', function(obj) {
+    this.pre('init', function virtualPreInit(obj) {
       if (mpath.has(name, obj)) {
         const _v = mpath.get(name, obj);
         if (!this.$$populatedVirtuals) {

package/lib/schematype.js

@@ -793,7 +793,7 @@ SchemaType.prototype.get = function(fn) {
  *
  * The error message argument is optional. If not passed, the [default generic error message template](#error_messages_MongooseError-messages) will be used.
  *
- * #### Examples:
+ * #### Example:
  *
  *     // make sure every value is equal to "something"
  *     function validator (val) {

package/lib/types/array/methods/index.js

@@ -557,7 +557,7 @@ const methods = {
    * the provided value to an embedded document and comparing using
    * [the `Document.equals()` function.](/docs/api.html#document_Document-equals)
    *
-   * #### Examples:
+   * #### Example:
    *
    *     doc.array.pull(ObjectId)
    *     doc.array.pull({ _id: 'someId' })

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.6.1",
+  "version": "6.6.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -53,7 +53,7 @@
     "mkdirp": "^1.0.4",
     "mocha": "10.0.0",
     "moment": "2.x",
-    "mongodb-memory-server": "8.9.1",
+    "mongodb-memory-server": "8.9.3",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.2",

package/types/index.d.ts

@@ -58,6 +58,12 @@ declare module 'mongoose' {
    */
   export function deleteModel(name: string | RegExp): Mongoose;
 
+  /**
+   * Sanitizes query filters against query selector injection attacks by wrapping
+   * any nested objects that have a property whose name starts with `$` in a `$eq`.
+   */
+  export function sanitizeFilter<T>(filter: FilterQuery<T>): FilterQuery<T>;
+
   /** Gets mongoose options */
   export function get<K extends keyof MongooseOptions>(key: K): MongooseOptions[K];
 
@@ -118,6 +124,12 @@ declare module 'mongoose' {
 
   export type HydratedDocument<DocType, TMethodsAndOverrides = {}, TVirtuals = {}> = DocType extends Document ? Require_id<DocType> : (Document<unknown, any, DocType> & Require_id<DocType> & TVirtuals & TMethodsAndOverrides);
 
+  export type HydratedDocumentFromSchema<TSchema extends Schema> = HydratedDocument<
+  InferSchemaType<TSchema>,
+  ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
+  ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>
+  >;
+
   export interface TagSet {
     [k: string]: string;
   }
@@ -150,19 +162,20 @@ declare module 'mongoose' {
       : M
     : M;
 
-  export type DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, T> = T extends Schema<infer T1, infer T2, infer T3, infer T4, infer T5>
-    ? Schema<Omit<DocType, keyof T1> & T1, DiscriminatorModel<T2, M>, T3 | TInstanceMethods, T4 | TQueryHelpers, T5 | TVirtuals>
-    : Schema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals>;
+  export type DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods, DisSchema> =
+    DisSchema extends Schema<infer DisSchemaEDocType, infer DisSchemaM, infer DisSchemaInstanceMethods, infer DisSchemaQueryhelpers, infer DisSchemaVirtuals, infer DisSchemaStatics>
+      ? Schema<Omit<DocType, keyof DisSchemaEDocType> & DisSchemaEDocType, DiscriminatorModel<DisSchemaM, M>, DisSchemaInstanceMethods | TInstanceMethods, DisSchemaQueryhelpers | TQueryHelpers, DisSchemaVirtuals | TVirtuals, DisSchemaStatics & TStaticMethods>
+      : Schema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods>;
 
   type QueryResultType<T> = T extends Query<infer ResultType, any> ? ResultType : never;
 
   type PluginFunction<
     DocType,
-    M = Model<DocType, any, any, any>,
-    TInstanceMethods = {},
-    TQueryHelpers = {},
-    TVirtuals = {},
-    TStaticMethods = {}> = (schema: Schema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods>, opts?: any) => void;
+    M,
+    TInstanceMethods,
+    TQueryHelpers,
+    TVirtuals,
+    TStaticMethods> = (schema: Schema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods>, opts?: any) => void;
 
   export class Schema<
     EnforcedDocType = any,
@@ -195,7 +208,7 @@ declare module 'mongoose' {
     /** Returns a copy of this schema */
     clone<T = this>(): T;
 
-    discriminator<T = Schema>(name: string, schema: T): DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, T>;
+    discriminator<DisSchema = Schema>(name: string, schema: DisSchema): DiscriminatorSchema<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods, DisSchema>;
 
     /** Returns a new schema that has the picked `paths` from this schema. */
     pick<T = this>(paths: string[], options?: SchemaOptions): T;
@@ -251,7 +264,7 @@ declare module 'mongoose' {
     pathType(path: string): string;
 
     /** Registers a plugin for this schema. */
-    plugin<PFunc extends PluginFunction<DocType, M, TInstanceMethods, TQueryHelpers, TVirtuals, TStaticMethods>, POptions extends Parameters<PFunc>[1] = Parameters<PFunc>[1]>(fn: PFunc, opts?: POptions): this;
+    plugin<PFunc extends PluginFunction<DocType, M, any, any, any, any>, POptions extends Parameters<PFunc>[1] = Parameters<PFunc>[1]>(fn: PFunc, opts?: POptions): this;
 
     /** Defines a post hook for the model. */
     post<T = HydratedDocument<DocType, TInstanceMethods>>(method: MongooseDocumentMiddleware | MongooseDocumentMiddleware[] | RegExp, fn: PostMiddlewareFunction<T, T>): this;

package/types/inferschematype.d.ts

@@ -156,7 +156,7 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
   PathValueType extends Schema ? InferSchemaType<PathValueType> :
     PathValueType extends (infer Item)[] ? IfEquals<Item, never, any[], Item extends Schema ? Types.DocumentArray<ResolvePathType<Item>> : ResolvePathType<Item>[]> :
       PathValueType extends StringSchemaDefinition ? PathEnumOrString<Options['enum']> :
-        PathValueType extends NumberSchemaDefinition ? number :
+        PathValueType extends NumberSchemaDefinition ? Options['enum'] extends ReadonlyArray<any> ? Options['enum'][number] : number :
           PathValueType extends DateSchemaDefinition ? Date :
             PathValueType extends typeof Buffer | 'buffer' | 'Buffer' | typeof Schema.Types.Buffer ? Buffer :
               PathValueType extends BooleanSchemaDefinition ? boolean :

package/types/query.d.ts

@@ -601,7 +601,7 @@ declare module 'mongoose' {
     snapshot(val?: boolean): this;
 
     /** Sets the sort order. If an object is passed, values allowed are `asc`, `desc`, `ascending`, `descending`, `1`, and `-1`. */
-    sort(arg?: string | { [key: string]: SortOrder | { $meta: 'textScore' } } | undefined | null): this;
+    sort(arg?: string | { [key: string]: SortOrder | { $meta: 'textScore' } } | [string, SortOrder][] | undefined | null): this;
 
     /** Sets the tailable option (for use with capped collections). */
     tailable(bool?: boolean, opts?: {

package/types/schematypes.d.ts

@@ -100,7 +100,7 @@ declare module 'mongoose' {
      * If [truthy](https://masteringjs.io/tutorials/fundamentals/truthy), Mongoose will
      * build an index on this path when the model is compiled.
      */
-    index?: boolean | number | IndexOptions | '2d' | '2dsphere' | 'hashed' | 'text';
+    index?: boolean | IndexDirection;
 
     /**
      * If [truthy](https://masteringjs.io/tutorials/fundamentals/truthy), Mongoose