mongoose 6.6.0 → 6.6.2

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/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/query/cast$expr.js

@@ -77,8 +77,8 @@ module.exports = function cast$expr(val, schema, strictQuery) {
 };
 
 function _castExpression(val, schema, strictQuery) {
-  if (isPath(val)) {
-    // Assume path
+  // Preserve the value if it represents a path or if it's null
+  if (isPath(val) || val === null) {
     return val;
   }
 

package/lib/helpers/timestamps/setupTimestamps.js

@@ -39,7 +39,7 @@ module.exports = function setupTimestamps(schema, timestamps) {
 
   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({
@@ -5069,8 +5071,9 @@ Model.compile = function compile(name, schema, collectionName, connection, base)
   model.Query = function() {
     Query.apply(this, arguments);
   };
-  model.Query.prototype = Object.create(Query.prototype);
+  Object.setPrototypeOf(model.Query.prototype, Query.prototype);
   model.Query.base = Query.base;
+  model.Query.prototype.constructor = Query;
   applyQueryMiddleware(model.Query, model);
   applyQueryMethods(model, schema.query);
 

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

@@ -280,7 +280,7 @@ Query.prototype.clone = function clone() {
   const model = this.model;
   const collection = this.mongooseCollection;
 
-  const q = new this.constructor({}, {}, model, collection);
+  const q = new this.model.Query({}, {}, model, collection);
 
   // Need to handle `sort()` separately because entries-style `sort()` syntax
   // `sort([['prop1', 1]])` confuses mquery into losing the outer nested array.
@@ -3340,7 +3340,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 +3486,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 +3574,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 +3696,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 +4863,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/SubdocumentPath.js

@@ -9,6 +9,7 @@ const EventEmitter = require('events').EventEmitter;
 const ObjectExpectedError = require('../error/objectExpected');
 const SchemaSubdocumentOptions = require('../options/SchemaSubdocumentOptions');
 const SchemaType = require('../schematype');
+const applyDefaults = require('../helpers/document/applyDefaults');
 const $exists = require('./operators/exists');
 const castToNumber = require('./operators/helpers').castToNumber;
 const discriminator = require('../helpers/model/discriminator');
@@ -170,8 +171,9 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   }, null);
   options = Object.assign({}, options, { priorDoc: priorVal });
   if (init) {
-    subdoc = new Constructor(void 0, selected, doc);
+    subdoc = new Constructor(void 0, selected, doc, false, { defaults: false });
     subdoc.$init(val);
+    applyDefaults(subdoc, selected);
   } else {
     if (Object.keys(val).length === 0) {
       return new Constructor({}, selected, doc, undefined, options);

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

@@ -5,6 +5,7 @@ const ArraySubdocument = require('../../ArraySubdocument');
 const MongooseError = require('../../../error/mongooseError');
 const cleanModifiedSubpaths = require('../../../helpers/document/cleanModifiedSubpaths');
 const internalToObjectOptions = require('../../../options').internalToObjectOptions;
+const mpath = require('mpath');
 const utils = require('../../../utils');
 const isBsonType = require('../../../helpers/isBsonType');
 
@@ -341,8 +342,23 @@ const methods = {
       const pullOp = atomics['$pull'] || (atomics['$pull'] = {});
       if (val[0] instanceof ArraySubdocument) {
         selector = pullOp['$or'] || (pullOp['$or'] = []);
-        Array.prototype.push.apply(selector, val.map(function(v) {
-          return v.toObject({ transform: false, virtuals: false });
+        Array.prototype.push.apply(selector, val.map(v => {
+          return v.toObject({
+            transform: (doc, ret) => {
+              if (v == null || v.$__ == null) {
+                return ret;
+              }
+
+              Object.keys(v.$__.activePaths.getStatePaths('default')).forEach(path => {
+                mpath.unset(path, ret);
+
+                _minimizePath(ret, path);
+              });
+
+              return ret;
+            },
+            virtuals: false
+          });
         }));
       } else {
         selector = pullOp['_id'] || (pullOp['_id'] = { $in: [] });
@@ -541,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' })
@@ -590,7 +606,11 @@ const methods = {
 
     if (values[0] instanceof ArraySubdocument) {
       this._registerAtomic('$pullDocs', values.map(function(v) {
-        return v.$__getValue('_id') || v;
+        const _id = v.$__getValue('_id');
+        if (_id === undefined || v.$isDefault('_id')) {
+          return v;
+        }
+        return _id;
       }));
     } else {
       this._registerAtomic('$pullAll', values);
@@ -920,6 +940,40 @@ function _isAllSubdocs(docs, ref) {
   return true;
 }
 
+/*!
+ * Minimize _just_ empty objects along the path chain specified
+ * by `parts`, ignoring all other paths. Useful in cases where
+ * you want to minimize after unsetting a path.
+ *
+ * #### Example:
+ *
+ *     const obj = { foo: { bar: { baz: {} } }, a: {} };
+ *     _minimizePath(obj, 'foo.bar.baz');
+ *     obj; // { a: {} }
+ */
+
+function _minimizePath(obj, parts, i) {
+  if (typeof parts === 'string') {
+    if (parts.indexOf('.') === -1) {
+      return;
+    }
+
+    parts = mpath.stringToParts(parts);
+  }
+  i = i || 0;
+  if (i >= parts.length) {
+    return;
+  }
+  if (obj == null || typeof obj !== 'object') {
+    return;
+  }
+
+  _minimizePath(obj[parts[0]], parts, i + 1);
+  if (obj[parts[0]] != null && typeof obj[parts[0]] === 'object' && Object.keys(obj[parts[0]]).length === 0) {
+    delete obj[parts[0]];
+  }
+}
+
 /*!
  * ignore
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.6.0",
+  "version": "6.6.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -28,9 +28,9 @@
     "sift": "16.0.0"
   },
   "devDependencies": {
-    "@babel/core": "7.18.13",
-    "@typescript-eslint/eslint-plugin": "5.36.1",
-    "@typescript-eslint/parser": "5.36.1",
+    "@babel/core": "7.19.0",
+    "@typescript-eslint/eslint-plugin": "5.36.2",
+    "@typescript-eslint/parser": "5.36.2",
     "acquit": "1.2.1",
     "acquit-ignore": "0.2.0",
     "acquit-require": "0.1.1",
@@ -62,8 +62,8 @@
     "stream-browserify": "3.0.0",
     "ts-benchmark": "^1.1.10",
     "tsd": "0.23.0",
-    "typescript": "4.8.2",
-    "uuid": "8.3.2",
+    "typescript": "4.8.3",
+    "uuid": "9.0.0",
     "webpack": "5.74.0"
   },
   "directories": {

package/scripts/create-tarball.js

@@ -4,4 +4,4 @@ const { execSync } = require('child_process');
 const { name, version } = require('../package.json');
 
 execSync('npm pack');
-execSync(`mv ${name}-${version}.tgz ${name}.tgz`);
+execSync(`mv ${name}-${version}.tgz ${name}.tgz`);

package/types/expressions.d.ts

@@ -2835,7 +2835,8 @@ declare module 'mongoose' {
     Expression.Push |
     Expression.StdDevPop |
     Expression.StdDevSamp |
-    Expression.Sum;
+    Expression.Sum |
+    Expression.TopN;
 
   export type tzExpression = UTCOffset | StringExpressionOperatorReturningBoolean | string;
 

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;
   }

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 :