@nullix/zod-mongoose-studio 1.0.12 → 2.0.0

package/.output/server/node_modules/mongoose/lib/query.js

@@ -20,6 +20,7 @@ const castArrayFilters = require('./helpers/update/castArrayFilters');
 const castNumber = require('./cast/number');
 const castUpdate = require('./helpers/query/castUpdate');
 const clone = require('./helpers/clone');
+const decorateUpdateWithVersionKey = require('./helpers/update/decorateUpdateWithVersionKey');
 const getDiscriminatorByValue = require('./helpers/discriminator/getDiscriminatorByValue');
 const helpers = require('./queryHelpers');
 const internalToObjectOptions = require('./options').internalToObjectOptions;
@@ -33,6 +34,7 @@ const parseProjection = require('./helpers/projection/parseProjection');
 const removeUnusedArrayFilters = require('./helpers/update/removeUnusedArrayFilters');
 const sanitizeFilter = require('./helpers/query/sanitizeFilter');
 const sanitizeProjection = require('./helpers/query/sanitizeProjection');
+const { buildMiddlewareFilter } = require('./helpers/buildMiddlewareFilter');
 const selectPopulatedFields = require('./helpers/query/selectPopulatedFields');
 const setDefaultsOnInsert = require('./helpers/setDefaultsOnInsert');
 const specialProperties = require('./helpers/specialProperties');
@@ -84,6 +86,8 @@ const opToThunk = new Map([
   ['findOneAndDelete', '_findOneAndDelete']
 ]);
 
+const queryUpdateSymbol = Symbol('mongoose#Query#update');
+
 /**
  * Query constructor used for building queries. You do not need
  * to instantiate a `Query` directly. Instead use Model functions like
@@ -100,10 +104,10 @@ const opToThunk = new Map([
  *     // this unless you're an advanced user with a very good reason to.
  *     const query = new mongoose.Query();
  *
- * @param {Object} [options]
- * @param {Object} [model]
- * @param {Object} [conditions]
- * @param {Object} [collection] Mongoose collection
+ * @param {object} [options]
+ * @param {object} [model]
+ * @param {object} [conditions]
+ * @param {object} [collection] Mongoose collection
  * @api public
  */
 
@@ -116,7 +120,7 @@ function Query(conditions, options, model, collection) {
 
   this._transforms = [];
   this._hooks = new Kareem();
-  this._executionStack = null;
+  this._execCount = 0;
 
   // this is the case where we have a CustomQuery, we need to check if we got
   // options passed in, and if we did, merge them in
@@ -136,7 +140,7 @@ function Query(conditions, options, model, collection) {
 
   // this is needed because map reduce returns a model that can be queried, but
   // all of the queries on said model should be lean
-  if (this.model && this.model._mapreduce) {
+  if (this.model?._mapreduce) {
     this.lean();
   }
 
@@ -156,10 +160,7 @@ function Query(conditions, options, model, collection) {
   // versions of MongoDB
   this.$useProjection = true;
 
-  const collation = this &&
-    this.schema &&
-    this.schema.options &&
-    this.schema.options.collation || null;
+  const collation = this?.schema?.options?.collation || null;
   if (collation != null) {
     this.options.collation = collation;
   }
@@ -169,7 +170,7 @@ function Query(conditions, options, model, collection) {
 function isEmptyFilter(obj) {
   if (obj == null) return true;
   if (typeof obj !== 'object') return true;
-  if (Object.keys(obj).length === 0) return true;
+  if (utils.hasOwnKeys(obj) === false) return true;
 
   // Check $and, $or, $nor arrays
   for (const key of ['$and', '$or', '$nor']) {
@@ -186,8 +187,8 @@ function isEmptyFilter(obj) {
 
 // Helper function to check for empty/invalid filter
 function checkRequireFilter(filter, options) {
-  if (options && options.requireFilter && isEmptyFilter(filter)) {
-    throw new Error('Empty or invalid filter not allowed with requireFilter enabled');
+  if (options?.requireFilter && isEmptyFilter(filter)) {
+    throw new MongooseError('Empty or invalid filter not allowed with requireFilter enabled');
   }
 }
 
@@ -198,6 +199,18 @@ function checkRequireFilter(filter, options) {
 Query.prototype = new mquery();
 Query.prototype.constructor = Query;
 
+Object.defineProperty(Query.prototype, '_update', {
+  configurable: true,
+  enumerable: true,
+  get: function() {
+    _cloneUpdateIfShared(this);
+    return this[queryUpdateSymbol];
+  },
+  set: function(v) {
+    this[queryUpdateSymbol] = v;
+  }
+});
+
 // Remove some legacy methods that we removed in Mongoose 8, but
 // are still in mquery 5.
 Query.prototype.count = undefined;
@@ -300,10 +313,9 @@ Query.prototype.toConstructor = function toConstructor() {
   p.setOptions(options);
 
   p.op = this.op;
-  p._validateOp();
   p._conditions = clone(this._conditions);
   p._fields = clone(this._fields);
-  p._update = clone(this._update, {
+  p[queryUpdateSymbol] = clone(this[queryUpdateSymbol], {
     flattenDecimals: false
   });
   p._path = this._path;
@@ -349,10 +361,9 @@ Query.prototype.clone = function() {
   q.setOptions(options);
 
   q.op = this.op;
-  q._validateOp();
   q._conditions = clone(this._conditions);
   q._fields = clone(this._fields);
-  q._update = clone(this._update, {
+  q[queryUpdateSymbol] = clone(this[queryUpdateSymbol], {
     flattenDecimals: false
   });
   q._path = this._path;
@@ -383,7 +394,7 @@ Query.prototype.clone = function() {
  *
  * @see $where https://www.mongodb.com/docs/manual/reference/operator/where/
  * @method $where
- * @param {String|Function} js javascript string or function
+ * @param {string|Function} js javascript string or function
  * @return {Query} this
  * @memberOf Query
  * @instance
@@ -415,7 +426,7 @@ Query.prototype.clone = function() {
  * @method where
  * @memberOf Query
  * @instance
- * @param {String|Object} [path]
+ * @param {string|object} [path]
  * @param {any} [val]
  * @return {Query} this
  * @api public
@@ -451,16 +462,16 @@ Query.prototype.clone = function() {
  * @method slice
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number|Array} val number of elements to slice or array with number of elements to skip and number of elements to slice
+ * @param {string} [path]
+ * @param {number|Array} val number of elements to slice or array with number of elements to skip and number of elements to slice
  * @return {Query} this
  * @see mongodb https://www.mongodb.com/docs/manual/tutorial/query-documents/#projection
  * @see $slice https://www.mongodb.com/docs/manual/reference/projection/slice/#prj._S_slice
  * @api public
  */
 
-Query.prototype.slice = function() {
-  if (arguments.length === 0) {
+Query.prototype.slice = function(...args) {
+  if (args.length === 0) {
     return this;
   }
 
@@ -469,8 +480,8 @@ Query.prototype.slice = function() {
   let path;
   let val;
 
-  if (arguments.length === 1) {
-    const arg = arguments[0];
+  if (args.length === 1) {
+    const arg = args[0];
     if (typeof arg === 'object' && !Array.isArray(arg)) {
       const keys = Object.keys(arg);
       const numKeys = keys.length;
@@ -481,19 +492,19 @@ Query.prototype.slice = function() {
     }
     this._ensurePath('slice');
     path = this._path;
-    val = arguments[0];
-  } else if (arguments.length === 2) {
-    if ('number' === typeof arguments[0]) {
+    val = args[0];
+  } else if (args.length === 2) {
+    if ('number' === typeof args[0]) {
       this._ensurePath('slice');
       path = this._path;
-      val = [arguments[0], arguments[1]];
+      val = [args[0], args[1]];
     } else {
-      path = arguments[0];
-      val = arguments[1];
+      path = args[0];
+      val = args[1];
     }
-  } else if (arguments.length === 3) {
-    path = arguments[0];
-    val = [arguments[1], arguments[2]];
+  } else if (args.length === 3) {
+    path = args[0];
+    val = [args[1], args[2]];
   }
 
   const p = {};
@@ -513,6 +524,10 @@ Query.prototype._validateOp = function() {
   if (this.op != null && !validOpsSet.has(this.op)) {
     this.error(new Error('Query has invalid `op`: "' + this.op + '"'));
   }
+
+  if (this.op !== 'estimatedDocumentCount' && this._conditions == null) {
+    throw new ObjectParameterError(this._conditions, 'filter', this.op);
+  }
 };
 
 /**
@@ -529,7 +544,7 @@ Query.prototype._validateOp = function() {
  * @method equals
  * @memberOf Query
  * @instance
- * @param {Object} val
+ * @param {object} val
  * @return {Query} this
  * @api public
  */
@@ -597,8 +612,8 @@ Query.prototype._validateOp = function() {
  * @method gt
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @see $gt https://www.mongodb.com/docs/manual/reference/operator/gt/
  * @api public
  */
@@ -611,8 +626,8 @@ Query.prototype._validateOp = function() {
  * @method gte
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @see $gte https://www.mongodb.com/docs/manual/reference/operator/gte/
  * @api public
  */
@@ -625,8 +640,8 @@ Query.prototype._validateOp = function() {
  * @method lt
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @see $lt https://www.mongodb.com/docs/manual/reference/operator/lt/
  * @api public
  */
@@ -640,8 +655,8 @@ Query.prototype._validateOp = function() {
  * @see $lte https://www.mongodb.com/docs/manual/reference/operator/lte/
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @api public
  */
 
@@ -654,7 +669,7 @@ Query.prototype._validateOp = function() {
  * @method ne
  * @memberOf Query
  * @instance
- * @param {String} [path]
+ * @param {string} [path]
  * @param {any} val
  * @api public
  */
@@ -668,7 +683,7 @@ Query.prototype._validateOp = function() {
  * @method in
  * @memberOf Query
  * @instance
- * @param {String} [path]
+ * @param {string} [path]
  * @param {Array} val
  * @api public
  */
@@ -682,7 +697,7 @@ Query.prototype._validateOp = function() {
  * @method nin
  * @memberOf Query
  * @instance
- * @param {String} [path]
+ * @param {string} [path]
  * @param {Array} val
  * @api public
  */
@@ -702,7 +717,7 @@ Query.prototype._validateOp = function() {
  * @method all
  * @memberOf Query
  * @instance
- * @param {String} [path]
+ * @param {string} [path]
  * @param {Array} val
  * @api public
  */
@@ -722,8 +737,8 @@ Query.prototype._validateOp = function() {
  * @method size
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @api public
  */
 
@@ -736,8 +751,8 @@ Query.prototype._validateOp = function() {
  * @method regex
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {String|RegExp} val
+ * @param {string} [path]
+ * @param {string|RegExp} val
  * @api public
  */
 
@@ -750,8 +765,8 @@ Query.prototype._validateOp = function() {
  * @method maxDistance
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Number} val
+ * @param {string} [path]
+ * @param {number} val
  * @api public
  */
 
@@ -770,7 +785,7 @@ Query.prototype._validateOp = function() {
  * @method mod
  * @memberOf Query
  * @instance
- * @param {String} [path]
+ * @param {string} [path]
  * @param {Array} val must be of length 2, first element is `divisor`, 2nd element is `remainder`.
  * @return {Query} this
  * @see $mod https://www.mongodb.com/docs/manual/reference/operator/mod/
@@ -819,8 +834,8 @@ Query.prototype.mod = function() {
  * @method exists
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Boolean} val
+ * @param {string} [path]
+ * @param {boolean} val
  * @return {Query} this
  * @see $exists https://www.mongodb.com/docs/manual/reference/operator/exists/
  * @api public
@@ -848,8 +863,8 @@ Query.prototype.mod = function() {
  * @method elemMatch
  * @memberOf Query
  * @instance
- * @param {String|Object|Function} path
- * @param {Object|Function} filter
+ * @param {string|object|Function} path
+ * @param {object|Function} filter
  * @return {Query} this
  * @see $elemMatch https://www.mongodb.com/docs/manual/reference/operator/elemMatch/
  * @api public
@@ -908,7 +923,7 @@ Query.prototype.mod = function() {
  * @method limit
  * @memberOf Query
  * @instance
- * @param {Number} val
+ * @param {number} val
  * @api public
  */
 
@@ -918,7 +933,7 @@ Query.prototype.limit = function limit(v) {
   if (typeof v === 'string') {
     try {
       v = castNumber(v);
-    } catch (err) {
+    } catch {
       throw new CastError('Number', v, 'limit');
     }
   }
@@ -941,7 +956,7 @@ Query.prototype.limit = function limit(v) {
  * @method skip
  * @memberOf Query
  * @instance
- * @param {Number} val
+ * @param {number} val
  * @see cursor.skip https://www.mongodb.com/docs/manual/reference/method/cursor.skip/
  * @api public
  */
@@ -952,7 +967,7 @@ Query.prototype.skip = function skip(v) {
   if (typeof v === 'string') {
     try {
       v = castNumber(v);
-    } catch (err) {
+    } catch {
       throw new CastError('Number', v, 'skip');
     }
   }
@@ -975,7 +990,7 @@ Query.prototype.skip = function skip(v) {
  * @method batchSize
  * @memberOf Query
  * @instance
- * @param {Number} val
+ * @param {number} val
  * @see batchSize https://www.mongodb.com/docs/manual/reference/method/cursor.batchSize/
  * @api public
  */
@@ -994,7 +1009,7 @@ Query.prototype.skip = function skip(v) {
  * @method comment
  * @memberOf Query
  * @instance
- * @param {String} val
+ * @param {string} val
  * @see comment https://www.mongodb.com/docs/manual/reference/operator/comment/
  * @api public
  */
@@ -1013,7 +1028,7 @@ Query.prototype.skip = function skip(v) {
  * @method hint
  * @memberOf Query
  * @instance
- * @param {Object} val a hint object
+ * @param {object} val a hint object
  * @return {Query} this
  * @see $hint https://www.mongodb.com/docs/manual/reference/operator/hint/
  * @api public
@@ -1044,8 +1059,8 @@ Query.prototype.skip = function skip(v) {
  * @method projection
  * @memberOf Query
  * @instance
- * @param {Object|null} arg
- * @return {Object} the current projection
+ * @param {object|null} arg
+ * @return {object} the current projection
  * @api public
  */
 
@@ -1102,7 +1117,7 @@ Query.prototype.projection = function(arg) {
  * @method select
  * @memberOf Query
  * @instance
- * @param {Object|String|String[]} arg
+ * @param {object|string|Array<string>} arg
  * @return {Query} this
  * @see SchemaType https://mongoosejs.com/docs/api/schematype.html
  * @api public
@@ -1113,7 +1128,7 @@ Query.prototype.select = function select() {
   if (!arg) return this;
 
   if (arguments.length !== 1) {
-    throw new Error('Invalid select: select only takes 1 argument');
+    throw new MongooseError('Invalid select: select only takes 1 argument');
   }
 
   this._validate('select');
@@ -1206,7 +1221,7 @@ Query.prototype.select = function select() {
  * @method schemaLevelProjections
  * @memberOf Query
  * @instance
- * @param {Boolean} value
+ * @param {boolean} value
  * @return {Query} this
  * @see SchemaTypeOptions https://mongoosejs.com/docs/schematypes.html#all-schema-types
  * @api public
@@ -1259,7 +1274,7 @@ Query.prototype.schemaLevelProjections = function schemaLevelProjections(value)
  * @method sanitizeProjection
  * @memberOf Query
  * @instance
- * @param {Boolean} value
+ * @param {boolean} value
  * @return {Query} this
  * @see sanitizeProjection https://thecodebarbarian.com/whats-new-in-mongoose-5-13-sanitizeprojection.html
  * @api public
@@ -1319,7 +1334,7 @@ Query.prototype.sanitizeProjection = function sanitizeProjection(value) {
  * @method read
  * @memberOf Query
  * @instance
- * @param {String} mode one of the listed preference options or aliases
+ * @param {string} mode one of the listed preference options or aliases
  * @param {Array} [tags] optional tags for this query
  * @see mongodb https://www.mongodb.com/docs/manual/applications/replication/#read-preference
  * @return {Query} this
@@ -1365,7 +1380,7 @@ Query.prototype.toString = function toString() {
       this.op === 'update' ||
       this.op === 'updateMany' ||
       this.op === 'updateOne') {
-    return `${this.model.modelName}.${this.op}(${util.inspect(this._conditions)}, ${util.inspect(this._update)})`;
+    return `${this.model.modelName}.${this.op}(${util.inspect(this._conditions)}, ${util.inspect(this[queryUpdateSymbol])})`;
   }
 
   // 'estimatedDocumentCount' or any others
@@ -1432,8 +1447,8 @@ Query.prototype.session = function session(v) {
  * @method writeConcern
  * @memberOf Query
  * @instance
- * @param {Object} writeConcern the write concern value to set
- * @see WriteConcernSettings https://mongodb.github.io/node-mongodb-native/4.9/interfaces/WriteConcernSettings.html
+ * @param {object} writeConcern the write concern value to set
+ * @see WriteConcernSettings https://mongodb.github.io/node-mongodb-native/7.0/interfaces/WriteConcernSettings.html
  * @return {Query} this
  * @api public
  */
@@ -1473,7 +1488,7 @@ Query.prototype.writeConcern = function writeConcern(val) {
  * @method w
  * @memberOf Query
  * @instance
- * @param {String|number} val 0 for fire-and-forget, 1 for acknowledged by one server, 'majority' for majority of the replica set, or [any of the more advanced options](https://www.mongodb.com/docs/manual/reference/write-concern/#w-option).
+ * @param {string|number} val 0 for fire-and-forget, 1 for acknowledged by one server, 'majority' for majority of the replica set, or [any of the more advanced options](https://www.mongodb.com/docs/manual/reference/write-concern/#w-option).
  * @see mongodb https://www.mongodb.com/docs/manual/reference/write-concern/#w-option
  * @return {Query} this
  * @api public
@@ -1624,7 +1639,7 @@ Query.prototype.wtimeout = function wtimeout(ms) {
  *
  * @memberOf Query
  * @method readConcern
- * @param {String} level one of the listed read concern level or their aliases
+ * @param {'local'|'available'|'majority'|'snapshot'|'linearizable'|'l'|'a'|'m'|'s'|'lz'} level one of the listed read concern level or their aliases
  * @see mongodb https://www.mongodb.com/docs/manual/reference/read-concern/
  * @return {Query} this
  * @api public
@@ -1640,7 +1655,7 @@ Query.prototype.wtimeout = function wtimeout(ms) {
  *     query.setOptions({ maxTimeMS: 1000 });
  *     query.getOptions(); // { limit: 10, maxTimeMS: 1000 }
  *
- * @return {Object} the options
+ * @return {object} the options
  * @api public
  */
 
@@ -1669,6 +1684,7 @@ Query.prototype.getOptions = function() {
  * - [upsert](https://www.mongodb.com/docs/manual/reference/method/db.collection.update/)
  * - [writeConcern](https://www.mongodb.com/docs/manual/reference/method/db.collection.update/)
  * - [timestamps](https://mongoosejs.com/docs/guide.html#timestamps): If `timestamps` is set in the schema, set this option to `false` to skip timestamps for that particular update. Has no effect if `timestamps` is not enabled in the schema options.
+ * - cloneUpdate: set to `false` to skip cloning the update before executing the query.
  * - overwriteDiscriminatorKey: allow setting the discriminator key in the update. Will use the correct discriminator schema if the update changes the discriminator key.
  * - overwriteImmutable: allow overwriting properties that are set to `immutable` in the schema. Defaults to false.
  *
@@ -1679,6 +1695,7 @@ Query.prototype.getOptions = function() {
  * - [projection](https://mongoosejs.com/docs/api/query.html#Query.prototype.projection())
  * - sanitizeProjection
  * - useBigInt64
+ * - defaults: if `false`, skip applying default values to the returned document(s). Defaults to true.
  *
  * The following options are only for all operations **except** `updateOne()`, `updateMany()`, `deleteOne()`, and `deleteMany()`:
  *
@@ -1698,8 +1715,9 @@ Query.prototype.getOptions = function() {
  * - [collation](https://www.mongodb.com/docs/manual/reference/collation/)
  * - [session](https://www.mongodb.com/docs/manual/reference/server-sessions/)
  * - [explain](https://www.mongodb.com/docs/manual/reference/method/cursor.explain/)
+ * - [middleware](https://mongoosejs.com/docs/middleware.html#skipping): set to `false` to skip all user-defined middleware, or `{ pre: false }` / `{ post: false }` to skip only pre or post hooks
  *
- * @param {Object} options
+ * @param {object} options
  * @return {Query} this
  * @api public
  */
@@ -1720,7 +1738,7 @@ Query.prototype.setOptions = function(options, overwrite) {
     return this;
   }
   if (typeof options !== 'object') {
-    throw new Error('Options must be an object, got "' + options + '"');
+    throw new MongooseError('Options must be an object, got "' + options + '"');
   }
 
   options = Object.assign({}, options);
@@ -1746,6 +1764,14 @@ Query.prototype.setOptions = function(options, overwrite) {
     this._mongooseOptions.overwriteImmutable = options.overwriteImmutable;
     delete options.overwriteImmutable;
   }
+  if ('updatePipeline' in options) {
+    this._mongooseOptions.updatePipeline = options.updatePipeline;
+    delete options.updatePipeline;
+  }
+  if ('cloneUpdate' in options) {
+    this._mongooseOptions.cloneUpdate = options.cloneUpdate;
+    delete options.cloneUpdate;
+  }
   if ('sanitizeProjection' in options) {
     if (options.sanitizeProjection && !this._mongooseOptions.sanitizeProjection) {
       sanitizeProjection(this._fields);
@@ -1782,14 +1808,14 @@ Query.prototype.setOptions = function(options, overwrite) {
   if (typeof options.limit === 'string') {
     try {
       options.limit = castNumber(options.limit);
-    } catch (err) {
+    } catch {
       throw new CastError('Number', options.limit, 'limit');
     }
   }
   if (typeof options.skip === 'string') {
     try {
       options.skip = castNumber(options.skip);
-    } catch (err) {
+    } catch {
       throw new CastError('Number', options.skip, 'skip');
     }
   }
@@ -1823,7 +1849,7 @@ Query.prototype.setOptions = function(options, overwrite) {
  *     const res = await query.find({ a: 1 }).explain('queryPlanner');
  *     console.log(res);
  *
- * @param {String} [verbose] The verbosity mode. Either 'queryPlanner', 'executionStats', or 'allPlansExecution'. The default is 'queryPlanner'
+ * @param {'queryPlanner'|'executionStats'|'allPlansExecution'} [verbose] The verbosity mode. The default is 'queryPlanner'
  * @return {Query} this
  * @api public
  */
@@ -1855,7 +1881,7 @@ Query.prototype.explain = function explain(verbose) {
  *     // Equivalent:
  *     await query.find().sort({ name: 1 }).allowDiskUse();
  *
- * @param {Boolean} [v] Enable/disable `allowDiskUse`. If called with 0 arguments, sets `allowDiskUse: true`
+ * @param {boolean} [v] Enable/disable `allowDiskUse`. If called with 0 arguments, sets `allowDiskUse: true`
  * @return {Query} this
  * @api public
  */
@@ -1885,7 +1911,7 @@ Query.prototype.allowDiskUse = function(v) {
  *     // >= 1 doc in the queried collection
  *     const res = await query.find({ $where: 'sleep(1000) || true' }).maxTimeMS(100);
  *
- * @param {Number} [ms] The number of milliseconds
+ * @param {number} [ms] The number of milliseconds
  * @return {Query} this
  * @api public
  */
@@ -1904,7 +1930,7 @@ Query.prototype.maxTimeMS = function(ms) {
  *     query.find({ a: 1 }).where('b').gt(2);
  *     query.getFilter(); // { a: 1, b: { $gt: 2 } }
  *
- * @return {Object} current query filter
+ * @return {object} current query filter
  * @api public
  */
 
@@ -1924,7 +1950,7 @@ Query.prototype.getFilter = function() {
  *     query.find({ a: 1 }).where('b').gt(2);
  *     query.getQuery(); // { a: 1, b: { $gt: 2 } }
  *
- * @return {Object} current query filter
+ * @return {object} current query filter
  * @api public
  */
 
@@ -1942,7 +1968,7 @@ Query.prototype.getQuery = function() {
  *     query.setQuery({ a: 2 });
  *     query.getQuery(); // { a: 2 }
  *
- * @param {Object} new query conditions
+ * @param {object} new query conditions
  * @return {undefined}
  * @api public
  */
@@ -1960,7 +1986,7 @@ Query.prototype.setQuery = function(val) {
  *     query.updateOne({}, { $set: { a: 5 } });
  *     query.getUpdate(); // { $set: { a: 5 } }
  *
- * @return {Object} current update operations
+ * @return {object} current update operations
  * @api public
  */
 
@@ -1978,20 +2004,25 @@ Query.prototype.getUpdate = function() {
  *     query.setUpdate({ $set: { b: 6 } });
  *     query.getUpdate(); // { $set: { b: 6 } }
  *
- * @param {Object} new update operation
+ * @param {object} new update operation
+ * @param {boolean} [cloneUpdate=true] if `false`, Mongoose will not clone the update
  * @return {undefined}
  * @api public
  */
 
-Query.prototype.setUpdate = function(val) {
-  this._update = val;
+Query.prototype.setUpdate = function(val, cloneUpdate) {
+  this[queryUpdateSymbol] = cloneUpdate === false ? val : clone(val);
+  if (cloneUpdate != null) {
+    this._mongooseOptions.cloneUpdate = cloneUpdate;
+  }
+  this._updateIsShared = false;
 };
 
 /**
  * Returns fields selection for this query.
  *
  * @method _fieldsForExec
- * @return {Object}
+ * @return {object}
  * @api private
  * @memberOf Query
  */
@@ -2000,7 +2031,7 @@ Query.prototype._fieldsForExec = function() {
   if (this._fields == null) {
     return null;
   }
-  if (Object.keys(this._fields).length === 0) {
+  if (utils.hasOwnKeys(this._fields) === false) {
     return null;
   }
   return clone(this._fields);
@@ -2011,13 +2042,13 @@ Query.prototype._fieldsForExec = function() {
  * Return an update document with corrected `$set` operations.
  *
  * @method _updateForExec
- * @return {Object}
+ * @return {object}
  * @api private
  * @memberOf Query
  */
 
 Query.prototype._updateForExec = function() {
-  const update = clone(this._update, {
+  const update = clone(this[queryUpdateSymbol], {
     transform: false,
     depopulate: true
   });
@@ -2058,7 +2089,7 @@ Query.prototype._updateForExec = function() {
  * This method is inherited by `mquery`
  *
  * @method _ensurePath
- * @param {String} method
+ * @param {string} method
  * @api private
  * @memberOf Query
  */
@@ -2069,8 +2100,8 @@ Query.prototype._updateForExec = function() {
  * @method canMerge
  * @memberOf Query
  * @instance
- * @param {Object} conds
- * @return {Boolean}
+ * @param {object} conds
+ * @return {boolean}
  * @api private
  */
 
@@ -2098,10 +2129,7 @@ Query.prototype._optionsForExec = function(model) {
     options.session = asyncLocalStorage.session;
   }
 
-  const readPreference = model &&
-  model.schema &&
-  model.schema.options &&
-  model.schema.options.read;
+  const readPreference = model?.schema?.options?.read;
   if (!('readPreference' in options) && readPreference) {
     options.readPreference = readPreference;
   }
@@ -2186,7 +2214,7 @@ Query.prototype._optionsForExec = function(model) {
  * - [mongoose-lean-getters](https://plugins.mongoosejs.io/plugins/lean-getters)
  * - [mongoose-lean-defaults](https://www.npmjs.com/package/mongoose-lean-defaults)
  *
- * @param {Boolean|Object} bool defaults to true
+ * @param {boolean|object} bool defaults to true
  * @return {Query} this
  * @api public
  */
@@ -2207,13 +2235,15 @@ Query.prototype.lean = function(v) {
  *     new Query().updateOne({}, {}).set('updatedAt', new Date());
  *     new Query().updateMany({}, {}).set({ updatedAt: new Date() });
  *
- * @param {String|Object} path path or object of key/value pairs to set
- * @param {Any} [val] the value to set
+ * @param {string|object} path path or object of key/value pairs to set
+ * @param {any} [val] the value to set
  * @return {Query} this
  * @api public
  */
 
 Query.prototype.set = function(path, val) {
+  _cloneUpdateIfShared(this);
+
   if (typeof path === 'object') {
     const keys = Object.keys(path);
     for (const key of keys) {
@@ -2222,12 +2252,16 @@ Query.prototype.set = function(path, val) {
     return this;
   }
 
-  this._update = this._update || {};
-  if (path in this._update) {
-    delete this._update[path];
+  let update = this[queryUpdateSymbol];
+  if (update == null) {
+    update = {};
+    this[queryUpdateSymbol] = update;
+  }
+  if (path in update) {
+    delete update[path];
   }
-  this._update.$set = this._update.$set || {};
-  this._update.$set[path] = val;
+  update.$set = update.$set || {};
+  update.$set[path] = val;
   return this;
 };
 
@@ -2241,13 +2275,13 @@ Query.prototype.set = function(path, val) {
  *     const query = Model.updateOne({}, { $set: { name: 'Jean-Luc Picard' } });
  *     query.get('name'); // 'Jean-Luc Picard'
  *
- * @param {String|Object} path path or object of key/value pairs to get
+ * @param {string|object} path path or object of key/value pairs to get
  * @return {Query} this
  * @api public
  */
 
 Query.prototype.get = function get(path) {
-  const update = this._update;
+  const update = this[queryUpdateSymbol];
   if (update == null) {
     return void 0;
   }
@@ -2331,13 +2365,14 @@ Query.prototype._unsetCastError = function _unsetCastError() {
  * - `strictQuery`: controls how Mongoose handles keys that aren't in the schema for the query `filter`. This option is `false` by default, which means Mongoose will allow `Model.find({ foo: 'bar' })` even if `foo` is not in the schema. See the [`strictQuery` docs](https://mongoosejs.com/docs/guide.html#strictQuery) for more information.
  * - `nearSphere`: use `$nearSphere` instead of `near()`. See the [`Query.prototype.nearSphere()` docs](https://mongoosejs.com/docs/api/query.html#Query.prototype.nearSphere())
  * - `schemaLevelProjections`: if `false`, Mongoose will not apply schema-level `select: false` or `select: true` for this query
+ * - `cloneUpdate`: if `false`, Mongoose will not clone updates before executing the query
  *
  * Mongoose maintains a separate object for internal options because
  * Mongoose sends `Query.prototype.options` to the MongoDB server, and the
  * above options are not relevant for the MongoDB server.
  *
- * @param {Object} options if specified, overwrites the current options
- * @return {Object} the options
+ * @param {object} options if specified, overwrites the current options
+ * @return {object} the options
  * @api public
  */
 
@@ -2407,16 +2442,24 @@ Query.prototype._find = async function _find() {
   const mongooseOptions = this._mongooseOptions;
   const userProvidedFields = this._userProvidedFields || {};
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   // Separate options to pass down to `completeMany()` in case we need to
   // set a session on the document
   const completeManyOptions = {
-    session: this && this.options && this.options.session || null,
+    session: this?.options?.session || null,
     lean: mongooseOptions.lean || null
   };
 
+  // Only pass `defaults` through when it is non-nullish; `null` and
+  // `undefined` are treated as "not set" and omitted from `createModel()`.
+  if (mongooseOptions.defaults != null) {
+    completeManyOptions.defaults = mongooseOptions.defaults;
+  }
+
   const options = this._optionsForExec();
 
   const filter = this._conditions;
@@ -2434,7 +2477,7 @@ Query.prototype._find = async function _find() {
 
   if (!mongooseOptions.populate) {
     const versionKey = this.schema.options.versionKey;
-    if (mongooseOptions.lean && mongooseOptions.lean.versionKey === false && versionKey) {
+    if (mongooseOptions.lean?.versionKey === false && versionKey) {
       docs.forEach((doc) => {
         if (versionKey in doc) {
           delete doc[versionKey];
@@ -2448,6 +2491,16 @@ Query.prototype._find = async function _find() {
 
   const pop = helpers.preparePopulationOptionsMQ(this, mongooseOptions);
 
+  // _deferPopulate is used internally when we need to defer populate until after
+  // filtering (when using match functions with nested populate via hooks)
+  if (this.options?._deferPopulate) {
+    docs = mongooseOptions.lean ?
+      docs :
+      await this._completeMany(docs, fields, userProvidedFields, completeManyOptions);
+    this._deferredPopulate = pop;
+    return docs;
+  }
+
   if (mongooseOptions.lean) {
     return this.model.populate(docs, pop);
   }
@@ -2468,7 +2521,7 @@ Query.prototype._find = async function _find() {
  *
  *     const arr = await Movie.find({ year: { $gte: 1980, $lte: 1989 } });
  *
- * @param {Object|ObjectId} [filter] mongodb filter. If not specified, returns all documents.
+ * @param {object|ObjectId} [filter] mongodb filter. If not specified, returns all documents.
  * @return {Query} this
  * @api public
  */
@@ -2481,7 +2534,7 @@ Query.prototype.find = function(conditions) {
 
   this.op = 'find';
 
-  if (mquery.canMerge(conditions)) {
+  if (canMerge(conditions)) {
     this.merge(conditions);
 
     prepareDiscriminatorCriteria(this);
@@ -2497,15 +2550,20 @@ Query.prototype.find = function(conditions) {
  *
  * When a Query is passed, conditions, field selection and options are merged.
  *
- * @param {Query|Object} source
+ * @param {Query|object} source
  * @return {Query} this
  */
 
 Query.prototype.merge = function(source) {
   if (!source) {
+    if (source === null) {
+      this._conditions = null;
+    }
     return this;
   }
 
+  this._conditions = this._conditions ?? {};
+
   const opts = { overwrite: true };
 
   if (source instanceof Query) {
@@ -2534,9 +2592,10 @@ Query.prototype.merge = function(source) {
       utils.merge(this.options, source.options, opts);
     }
 
-    if (source._update) {
-      this._update || (this._update = {});
-      utils.mergeClone(this._update, source._update);
+    if (source[queryUpdateSymbol] != null) {
+      _cloneUpdateIfShared(this);
+      this[queryUpdateSymbol] || (this[queryUpdateSymbol] = {});
+      utils.mergeClone(this[queryUpdateSymbol], source[queryUpdateSymbol]);
     }
 
     if (source._distinct) {
@@ -2550,7 +2609,7 @@ Query.prototype.merge = function(source) {
     utils.merge(this._conditions, { _id: source }, opts);
 
     return this;
-  } else if (source && source.$__) {
+  } else if (source?.$__) {
     source = source.toObject(internalToObjectOptions);
   }
 
@@ -2583,7 +2642,7 @@ Query.prototype.merge = function(source) {
 /**
  * Adds a collation to this op (MongoDB 3.4 and up)
  *
- * @param {Object} value
+ * @param {object} value
  * @return {Query} this
  * @see MongoDB docs https://www.mongodb.com/docs/manual/reference/method/cursor.collation/#cursor.collation
  * @api public
@@ -2624,7 +2683,7 @@ Query.prototype._completeOne = function(doc, res, projection, callback) {
 
   if (!mongooseOptions.populate) {
     const versionKey = this.schema.options.versionKey;
-    if (mongooseOptions.lean && mongooseOptions.lean.versionKey === false && versionKey) {
+    if (mongooseOptions.lean?.versionKey === false && versionKey) {
       if (versionKey in doc) {
         delete doc[versionKey];
       }
@@ -2660,9 +2719,9 @@ Query.prototype._completeOne = function(doc, res, projection, callback) {
  * of the model. Used to initialize docs returned from the db from `find()`
  *
  * @param {Array} docs
- * @param {Object} fields the projection used, including `select` from schemas
- * @param {Object} userProvidedFields the user-specified projection
- * @param {Object} [opts]
+ * @param {object} fields the projection used, including `select` from schemas
+ * @param {object} userProvidedFields the user-specified projection
+ * @param {object} [opts]
  * @param {Array} [opts.populated]
  * @param {ClientSession} [opts.session]
  * @api private
@@ -2672,7 +2731,7 @@ Query.prototype._completeMany = async function _completeMany(docs, fields, userP
   const model = this.model;
   return Promise.all(docs.map(doc => new Promise((resolve, reject) => {
     const rawDoc = doc;
-    doc = helpers.createModel(model, doc, fields, userProvidedFields);
+    doc = helpers.createModel(model, doc, fields, userProvidedFields, opts);
     if (opts.session != null) {
       doc.$session(opts.session);
     }
@@ -2701,8 +2760,10 @@ Query.prototype._findOne = async function _findOne() {
     throw err;
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -2737,10 +2798,10 @@ Query.prototype._findOne = async function _findOne() {
  *     const query = Kitten.where({ color: 'white' });
  *     const kitten = await query.findOne();
  *
- * @param {Object} [filter] mongodb selector
- * @param {Object} [projection] optional fields to return
- * @param {Object} [options] see [`setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {object} [filter] mongodb selector
+ * @param {object} [projection] optional fields to return
+ * @param {object} [options] see [`setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
  * @return {Query} this
  * @see findOne https://www.mongodb.com/docs/manual/reference/method/db.collection.findOne/
  * @see Query.select https://mongoosejs.com/docs/api/query.html#Query.prototype.select()
@@ -2756,7 +2817,6 @@ Query.prototype.findOne = function(conditions, projection, options) {
   }
 
   this.op = 'findOne';
-  this._validateOp();
 
   if (options) {
     this.setOptions(options);
@@ -2766,7 +2826,7 @@ Query.prototype.findOne = function(conditions, projection, options) {
     this.select(projection);
   }
 
-  if (mquery.canMerge(conditions)) {
+  if (canMerge(conditions)) {
     this.merge(conditions);
 
     prepareDiscriminatorCriteria(this);
@@ -2781,7 +2841,7 @@ Query.prototype.findOne = function(conditions, projection, options) {
 /**
  * Execute a countDocuments query
  *
- * @see countDocuments https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#countDocuments
+ * @see countDocuments https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#countDocuments
  * @api private
  */
 
@@ -2798,8 +2858,10 @@ Query.prototype._countDocuments = async function _countDocuments() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -2826,10 +2888,11 @@ Query.prototype._applyTranslateAliases = function _applyTranslateAliases() {
     return;
   }
 
-  if (this.model?.schema?.aliases && Object.keys(this.model.schema.aliases).length > 0) {
+  if (this.model?.schema?.aliases && utils.hasOwnKeys(this.model.schema.aliases)) {
+    _cloneUpdateIfShared(this);
     this.model.translateAliases(this._conditions, true);
     this.model.translateAliases(this._fields, true);
-    this.model.translateAliases(this._update, true);
+    this.model.translateAliases(this[queryUpdateSymbol], true);
     if (this._distinct != null && this.model.schema.aliases[this._distinct] != null) {
       this._distinct = this.model.schema.aliases[this._distinct];
     }
@@ -2839,7 +2902,7 @@ Query.prototype._applyTranslateAliases = function _applyTranslateAliases() {
 /**
  * Execute a estimatedDocumentCount() query
  *
- * @see estimatedDocumentCount https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#estimatedDocumentCount
+ * @see estimatedDocumentCount https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#estimatedDocumentCount
  * @api private
  */
 
@@ -2870,9 +2933,9 @@ Query.prototype._estimatedDocumentCount = async function _estimatedDocumentCount
  *
  *     await Model.find().estimatedDocumentCount();
  *
- * @param {Object} [options] passed transparently to the [MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/EstimatedDocumentCountOptions.html)
+ * @param {object} [options] passed transparently to the [MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/EstimatedDocumentCountOptions.html)
  * @return {Query} this
- * @see estimatedDocumentCount https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#estimatedDocumentCount
+ * @see estimatedDocumentCount https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#estimatedDocumentCount
  * @api public
  */
 
@@ -2883,7 +2946,6 @@ Query.prototype.estimatedDocumentCount = function(options) {
   }
 
   this.op = 'estimatedDocumentCount';
-  this._validateOp();
 
   if (options != null) {
     this.setOptions(options);
@@ -2897,7 +2959,7 @@ Query.prototype.estimatedDocumentCount = function(options) {
  * except it always does a full collection scan when passed an empty filter `{}`.
  *
  * There are also minor differences in how `countDocuments()` handles
- * [`$where` and a couple geospatial operators](https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#countDocuments).
+ * [`$where` and a couple geospatial operators](https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#countDocuments).
  * versus `count()`.
  *
  * This function triggers the following middleware.
@@ -2915,7 +2977,7 @@ Query.prototype.estimatedDocumentCount = function(options) {
  *     query.where('color', 'black').countDocuments().exec();
  *
  * The `countDocuments()` function is similar to `count()`, but there are a
- * [few operators that `countDocuments()` does not support](https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#countDocuments).
+ * [few operators that `countDocuments()` does not support](https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#countDocuments).
  * Below are the operators that `count()` supports but `countDocuments()` does not,
  * and the suggested replacement:
  *
@@ -2923,10 +2985,10 @@ Query.prototype.estimatedDocumentCount = function(options) {
  * - `$near`: [`$geoWithin`](https://www.mongodb.com/docs/manual/reference/operator/query/geoWithin/) with [`$center`](https://www.mongodb.com/docs/manual/reference/operator/query/center/#op._S_center)
  * - `$nearSphere`: [`$geoWithin`](https://www.mongodb.com/docs/manual/reference/operator/query/geoWithin/) with [`$centerSphere`](https://www.mongodb.com/docs/manual/reference/operator/query/centerSphere/#op._S_centerSphere)
  *
- * @param {Object} [filter] mongodb selector
- * @param {Object} [options]
+ * @param {object} [filter] mongodb selector
+ * @param {object} [options]
  * @return {Query} this
- * @see countDocuments https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#countDocuments
+ * @see countDocuments https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#countDocuments
  * @api public
  */
 
@@ -2938,9 +3000,8 @@ Query.prototype.countDocuments = function(conditions, options) {
   }
 
   this.op = 'countDocuments';
-  this._validateOp();
 
-  if (mquery.canMerge(conditions)) {
+  if (canMerge(conditions)) {
     this.merge(conditions);
   }
 
@@ -2966,8 +3027,10 @@ Query.prototype.__distinct = async function __distinct() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   const options = this._optionsForExec();
 
@@ -2987,9 +3050,9 @@ Query.prototype.__distinct = async function __distinct() {
  *     distinct(field)
  *     distinct()
  *
- * @param {String} [field]
- * @param {Object|Query} [filter]
- * @param {Object} [options]
+ * @param {string} [field]
+ * @param {object|Query} [filter]
+ * @param {object} [options]
  * @return {Query} this
  * @see distinct https://www.mongodb.com/docs/manual/reference/method/db.collection.distinct/
  * @api public
@@ -3004,9 +3067,8 @@ Query.prototype.distinct = function(field, conditions, options) {
   }
 
   this.op = 'distinct';
-  this._validateOp();
 
-  if (mquery.canMerge(conditions)) {
+  if (canMerge(conditions)) {
     this.merge(conditions);
 
     prepareDiscriminatorCriteria(this);
@@ -3049,9 +3111,9 @@ Query.prototype.distinct = function(field, conditions, options) {
  *
  * Cannot be used with `distinct()`
  *
- * @param {Object|String|Array<Array<(string | number)>>} arg
- * @param {Object} [options]
- * @param {Boolean} [options.override=false] If true, replace existing sort options with `arg`
+ * @param {object|string|Array<Array<(string | number)>>} arg
+ * @param {object} [options]
+ * @param {boolean} [options.override=false] If true, replace existing sort options with `arg`
  * @return {Query} this
  * @see cursor.sort https://www.mongodb.com/docs/manual/reference/method/cursor.sort/
  * @api public
@@ -3059,16 +3121,16 @@ Query.prototype.distinct = function(field, conditions, options) {
 
 Query.prototype.sort = function(arg, options) {
   if (arguments.length > 2) {
-    throw new Error('sort() takes at most 2 arguments');
+    throw new MongooseError('sort() takes at most 2 arguments');
   }
   if (options != null && typeof options !== 'object') {
-    throw new Error('sort() options argument must be an object or nullish');
+    throw new MongooseError('sort() options argument must be an object or nullish');
   }
 
   if (this.options.sort == null) {
     this.options.sort = {};
   }
-  if (options && options.override) {
+  if (options?.override) {
     this.options.sort = {};
   }
   const sort = this.options.sort;
@@ -3145,7 +3207,7 @@ function _handleSortValue(val, key) {
  *
  *     await Character.deleteOne({ name: 'Eddard Stark' });
  *
- * This function calls the MongoDB driver's [`Collection#deleteOne()` function](https://mongodb.github.io/node-mongodb-native/6.15/classes/Collection.html#deleteOne).
+ * This function calls the MongoDB driver's [`Collection#deleteOne()` function](https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#deleteOne).
  * The returned [promise](https://mongoosejs.com/docs/queries.html) resolves to an
  * object that contains 2 properties:
  *
@@ -3158,12 +3220,12 @@ function _handleSortValue(val, key) {
  *     // `1` if MongoDB deleted a doc, `0` if no docs matched the filter `{ name: ... }`
  *     res.deletedCount;
  *
- * @param {Object|Query} [filter] mongodb selector
- * @param {Object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object|Query} [filter] mongodb selector
+ * @param {object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
- * @see DeleteResult https://mongodb.github.io/node-mongodb-native/6.15/interfaces/DeleteResult.html
- * @see deleteOne https://mongodb.github.io/node-mongodb-native/6.15/classes/Collection.html#deleteOne
+ * @see DeleteResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/DeleteResult.html
+ * @see deleteOne https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#deleteOne
  * @api public
  */
 
@@ -3174,7 +3236,7 @@ Query.prototype.deleteOne = function deleteOne(filter, options) {
   this.op = 'deleteOne';
   this.setOptions(options);
 
-  if (mquery.canMerge(filter)) {
+  if (canMerge(filter)) {
     this.merge(filter);
 
     prepareDiscriminatorCriteria(this);
@@ -3221,7 +3283,7 @@ Query.prototype._deleteOne = async function _deleteOne() {
  *
  *     await Character.deleteMany({ name: /Stark/, age: { $gte: 18 } });
  *
- * This function calls the MongoDB driver's [`Collection#deleteMany()` function](https://mongodb.github.io/node-mongodb-native/6.15/classes/Collection.html#deleteMany).
+ * This function calls the MongoDB driver's [`Collection#deleteMany()` function](https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#deleteMany).
  * The returned [promise](https://mongoosejs.com/docs/queries.html) resolves to an
  * object that contains 2 properties:
  *
@@ -3234,12 +3296,12 @@ Query.prototype._deleteOne = async function _deleteOne() {
  *     // `0` if no docs matched the filter, number of docs deleted otherwise
  *     res.deletedCount;
  *
- * @param {Object|Query} [filter] mongodb selector
- * @param {Object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object|Query} [filter] mongodb selector
+ * @param {object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
- * @see DeleteResult https://mongodb.github.io/node-mongodb-native/6.15/interfaces/DeleteResult.html
- * @see deleteMany https://mongodb.github.io/node-mongodb-native/6.15/classes/Collection.html#deleteMany
+ * @see DeleteResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/DeleteResult.html
+ * @see deleteMany https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#deleteMany
  * @api public
  */
 
@@ -3250,7 +3312,7 @@ Query.prototype.deleteMany = function(filter, options) {
   this.setOptions(options);
   this.op = 'deleteMany';
 
-  if (mquery.canMerge(filter)) {
+  if (canMerge(filter)) {
     this.merge(filter);
 
     prepareDiscriminatorCriteria(this);
@@ -3291,8 +3353,8 @@ Query.prototype._deleteMany = async function _deleteMany() {
  *
  * @param {Model} model
  * @param {Document} doc
- * @param {Object} res 3rd parameter to callback
- * @param {Object} fields
+ * @param {object} res 3rd parameter to callback
+ * @param {object} fields
  * @param {Query} self
  * @param {Array} [pop] array of paths used in population
  * @param {Function} callback
@@ -3338,13 +3400,13 @@ function completeOne(model, doc, res, options, fields, userProvidedFields, pop,
  */
 
 function prepareDiscriminatorCriteria(query) {
-  if (!query || !query.model || !query.model.schema) {
+  if (!query?.model?.schema) {
     return;
   }
 
   const schema = query.model.schema;
 
-  if (schema && schema.discriminatorMapping && !schema.discriminatorMapping.isRoot) {
+  if (schema?.discriminatorMapping && !schema.discriminatorMapping.isRoot) {
     query._conditions[schema.discriminatorMapping.key] = schema.discriminatorMapping.value;
   }
 }
@@ -3381,39 +3443,40 @@ function prepareDiscriminatorCriteria(query) {
  * @method findOneAndUpdate
  * @memberOf Query
  * @instance
- * @param {Object|Query} [filter]
- * @param {Object} [doc]
- * @param {Object} [options]
- * @param {Boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {object|Query} [filter]
+ * @param {object} [update]
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
- * @param {Boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied.
- * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
- * @param {Boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
+ * @param {boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied. **Deprecated:** Use `returnDocument: 'after'` instead of `new: true`, or `returnDocument: 'before'` instead of `new: false`.
+ * @param {object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`. **Deprecated:** Use `returnDocument: 'after'` instead of `returnOriginal: false`, or `returnDocument: 'before'` instead of `returnOriginal: true`.
+ * @param {'before'|'after'} [options.returnDocument='before'] Has two possible values, `'before'` and `'after'`. By default, it will return the document before the update was applied.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
+ * @param {boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @see Tutorial https://mongoosejs.com/docs/tutorials/findoneandupdate.html
  * @see findAndModify command https://www.mongodb.com/docs/manual/reference/command/findAndModify/
- * @see ModifyResult https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html
- * @see findOneAndUpdate https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#findOneAndUpdate
+ * @see ModifyResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html
+ * @see findOneAndUpdate https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#findOneAndUpdate
  * @return {Query} this
  * @api public
  */
 
-Query.prototype.findOneAndUpdate = function(filter, doc, options) {
+Query.prototype.findOneAndUpdate = function(filter, update, options) {
   if (typeof filter === 'function' ||
-      typeof doc === 'function' ||
+      typeof update === 'function' ||
       typeof options === 'function' ||
       typeof arguments[3] === 'function') {
     throw new MongooseError('Query.prototype.findOneAndUpdate() no longer accepts a callback');
   }
 
   this.op = 'findOneAndUpdate';
-  this._validateOp();
   this._validate();
 
   switch (arguments.length) {
@@ -3421,12 +3484,12 @@ Query.prototype.findOneAndUpdate = function(filter, doc, options) {
       options = undefined;
       break;
     case 1:
-      doc = filter;
+      update = filter;
       filter = options = undefined;
       break;
   }
 
-  if (mquery.canMerge(filter)) {
+  if (canMerge(filter)) {
     this.merge(filter);
   } else if (filter != null) {
     this.error(
@@ -3434,11 +3497,6 @@ Query.prototype.findOneAndUpdate = function(filter, doc, options) {
     );
   }
 
-  // apply doc
-  if (doc) {
-    this._mergeUpdate(doc);
-  }
-
   options = options ? clone(options) : {};
 
   if (options.projection) {
@@ -3450,17 +3508,37 @@ Query.prototype.findOneAndUpdate = function(filter, doc, options) {
     delete options.fields;
   }
 
-  const returnOriginal = this &&
-    this.model &&
-    this.model.base &&
-    this.model.base.options &&
-    this.model.base.options.returnOriginal;
-  if (options.new == null && options.returnDocument == null && options.returnOriginal == null && returnOriginal != null) {
-    options.returnOriginal = returnOriginal;
+  const globalReturnDocument = this?.model?.base?.options?.returnDocument;
+  const globalReturnOriginal = this?.model?.base?.options?.returnOriginal;
+  if (options.new == null && options.returnDocument == null && options.returnOriginal == null) {
+    if (globalReturnDocument != null) {
+      options.returnDocument = globalReturnDocument;
+    } else if (globalReturnOriginal != null) {
+      options.returnOriginal = globalReturnOriginal;
+    }
+  }
+
+  const updatePipeline = this?.model?.base?.options?.updatePipeline;
+  if (options.updatePipeline == null && updatePipeline != null) {
+    options.updatePipeline = updatePipeline;
+  }
+
+  if (!options.updatePipeline && Array.isArray(update)) {
+    throw new MongooseError('Cannot pass an array to query updates unless the `updatePipeline` option is set.');
   }
 
   this.setOptions(options);
 
+  // apply doc
+  if (update) {
+    if (this[queryUpdateSymbol] == null || utils.isEmptyObject(this[queryUpdateSymbol])) {
+      this[queryUpdateSymbol] = update;
+      this._updateIsShared = true;
+    } else {
+      this._mergeUpdate(update);
+    }
+  }
+
   return this;
 };
 
@@ -3485,8 +3563,10 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
     throw this.error();
   }
 
-  applyGlobalMaxTimeMS(this.options, this.model.db.options, this.model.base.options);
-  applyGlobalDiskUse(this.options, this.model.db.options, this.model.base.options);
+  const dbOptions = this.model.db.options;
+  const baseOptions = this.model.base.options;
+  applyGlobalMaxTimeMS(this.options, dbOptions, baseOptions);
+  applyGlobalDiskUse(this.options, dbOptions, baseOptions);
 
   if ('strict' in this.options) {
     this._mongooseOptions.strict = this.options.strict;
@@ -3494,46 +3574,51 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
   const options = this._optionsForExec(this.model);
   convertNewToReturnDocument(options);
 
-  this._update = this._castUpdate(this._update);
+  this[queryUpdateSymbol] = this._castUpdate(this[queryUpdateSymbol]);
+  this._updateIsShared = false;
+  decorateUpdateWithVersionKey(this[queryUpdateSymbol], options, this.schema.options.versionKey);
 
-  const _opts = Object.assign({}, options, {
-    setDefaultsOnInsert: this._mongooseOptions.setDefaultsOnInsert
-  });
-  this._update = setDefaultsOnInsert(this._conditions, this.model.schema,
-    this._update, _opts);
+  this[queryUpdateSymbol] = setDefaultsOnInsert(
+    this._conditions,
+    this.model.schema,
+    this[queryUpdateSymbol],
+    options,
+    this._mongooseOptions,
+    this
+  );
 
-  if (!this._update || Object.keys(this._update).length === 0) {
+  if (!this[queryUpdateSymbol] || utils.hasOwnKeys(this[queryUpdateSymbol]) === false) {
     if (options.upsert) {
       // still need to do the upsert to empty doc
-      const $set = clone(this._update);
+      const $set = clone(this[queryUpdateSymbol]);
       delete $set._id;
-      this._update = { $set };
+      this[queryUpdateSymbol] = { $set };
     } else {
-      this._executionStack = null;
+      this._execCount = 0;
       const res = await this._findOne();
       return res;
     }
-  } else if (this._update instanceof Error) {
-    throw this._update;
+  } else if (this[queryUpdateSymbol] instanceof Error) {
+    throw this[queryUpdateSymbol];
   } else {
     // In order to make MongoDB 2.6 happy (see
     // https://jira.mongodb.org/browse/SERVER-12266 and related issues)
     // if we have an actual update document but $set is empty, junk the $set.
-    if (this._update.$set && Object.keys(this._update.$set).length === 0) {
-      delete this._update.$set;
+    if (this[queryUpdateSymbol].$set && utils.hasOwnKeys(this[queryUpdateSymbol].$set) === false) {
+      delete this[queryUpdateSymbol].$set;
     }
   }
 
   const runValidators = _getOption(this, 'runValidators', false);
   if (runValidators) {
-    await this.validate(this._update, options, false);
+    await this.validate(this[queryUpdateSymbol], options, false);
   }
 
-  if (this._update.toBSON) {
-    this._update = this._update.toBSON();
+  if (typeof this[queryUpdateSymbol].toBSON === 'function') {
+    this[queryUpdateSymbol] = this[queryUpdateSymbol].toBSON();
   }
 
-  let res = await this.mongooseCollection.findOneAndUpdate(this._conditions, this._update, options);
+  let res = await this.mongooseCollection.findOneAndUpdate(this._conditions, this[queryUpdateSymbol], options);
   for (const fn of this._transforms) {
     res = fn(res);
   }
@@ -3572,12 +3657,12 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
  *
  * @method findOneAndDelete
  * @memberOf Query
- * @param {Object} [filter]
- * @param {Object} [options]
- * @param {Boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object} [filter]
+ * @param {object} [options]
+ * @param {boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @return {Query} this
  * @see findAndModify command https://www.mongodb.com/docs/manual/reference/command/findAndModify/
  * @api public
@@ -3591,10 +3676,9 @@ Query.prototype.findOneAndDelete = function(filter, options) {
   }
 
   this.op = 'findOneAndDelete';
-  this._validateOp();
   this._validate();
 
-  if (mquery.canMerge(filter)) {
+  if (canMerge(filter)) {
     this.merge(filter);
   }
 
@@ -3656,7 +3740,7 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
  *
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
- * - `includeResultMetadata`: if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
+ * - `includeResultMetadata`: if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
  * - `requireFilter`: bool - if true, throws an error if the filter is empty (`{}`). Defaults to false.
  *
  * #### Example:
@@ -3667,20 +3751,22 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
  *
  * @method findOneAndReplace
  * @memberOf Query
- * @param {Object} [filter]
- * @param {Object} [replacement]
- * @param {Object} [options]
- * @param {Boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
+ * @param {object} [filter]
+ * @param {object} [replacement]
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
- * @param {Boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied.
- * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied. **Deprecated:** Use `returnDocument: 'after'` instead of `new: true`, or `returnDocument: 'before'` instead of `new: false`.
+ * @param {object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`. **Deprecated:** Use `returnDocument: 'after'` instead of `returnOriginal: false`, or `returnDocument: 'before'` instead of `returnOriginal: true`.
+ * @param {'before'|'after'} [options.returnDocument='before'] Has two possible values, `'before'` and `'after'`. By default, it will return the document before the update was applied.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
  * @api public
  */
@@ -3694,10 +3780,9 @@ Query.prototype.findOneAndReplace = function(filter, replacement, options) {
   }
 
   this.op = 'findOneAndReplace';
-  this._validateOp();
   this._validate();
 
-  if (mquery.canMerge(filter)) {
+  if (canMerge(filter)) {
     this.merge(filter);
   } else if (filter != null) {
     this.error(
@@ -3711,14 +3796,16 @@ Query.prototype.findOneAndReplace = function(filter, replacement, options) {
 
   options = options || {};
 
-  const returnOriginal = this &&
-  this.model &&
-  this.model.base &&
-  this.model.base.options &&
-  this.model.base.options.returnOriginal;
-  if (options.new == null && options.returnDocument == null && options.returnOriginal == null && returnOriginal != null) {
-    options.returnOriginal = returnOriginal;
+  const globalReturnDocument = this?.model?.base?.options?.returnDocument;
+  const globalReturnOriginal = this?.model?.base?.options?.returnOriginal;
+  if (options.new == null && options.returnDocument == null && options.returnOriginal == null) {
+    if (globalReturnDocument != null) {
+      options.returnDocument = globalReturnDocument;
+    } else if (globalReturnOriginal != null) {
+      options.returnOriginal = globalReturnOriginal;
+    }
   }
+
   this.setOptions(options);
 
   return this;
@@ -3763,13 +3850,13 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
   const runValidators = _getOption(this, 'runValidators', false);
 
   try {
-    const update = new this.model(this._update, null, modelOpts);
+    const update = new this.model(this[queryUpdateSymbol], null, modelOpts);
     if (runValidators) {
       await update.validate();
     } else if (update.$__.validationError) {
       throw update.$__.validationError;
     }
-    this._update = update.toBSON();
+    this[queryUpdateSymbol] = update.toBSON();
   } catch (err) {
     if (err instanceof ValidationError) {
       throw err;
@@ -3779,7 +3866,7 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
     throw validationError;
   }
 
-  let res = await this.mongooseCollection.findOneAndReplace(filter, this._update, options);
+  let res = await this.mongooseCollection.findOneAndReplace(filter, this[queryUpdateSymbol], options);
 
   for (const fn of this._transforms) {
     res = fn(res);
@@ -3809,10 +3896,10 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
  * @method findById
  * @memberOf Query
  * @instance
- * @param {Any} id value of `_id` to query by
- * @param {Object} [projection] optional fields to return
- * @param {Object} [options] see [`setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {any} id value of `_id` to query by
+ * @param {object} [projection] optional fields to return
+ * @param {object} [options] see [`setOptions()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.setOptions())
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
  * @return {Query} this
  * @see findOne https://www.mongodb.com/docs/manual/reference/method/db.collection.findOne/
  * @see Query.select https://mongoosejs.com/docs/api/query.html#Query.prototype.select()
@@ -3838,24 +3925,26 @@ Query.prototype.findById = function(id, projection, options) {
  * @method findByIdAndUpdate
  * @memberOf Query
  * @instance
- * @param {Any} id value of `_id` to query by
- * @param {Object} [doc]
- * @param {Object} [options]
- * @param {Boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {any} id value of `_id` to query by
+ * @param {object} [doc]
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
- * @param {Boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied.
- * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
- * @param {Boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
+ * @param {boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
+ * @param {boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied. **Deprecated:** Use `returnDocument: 'after'` instead of `new: true`, or `returnDocument: 'before'` instead of `new: false`.
+ * @param {object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and [the Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.returnOriginal=null] An alias for the `new` option. `returnOriginal: false` is equivalent to `new: true`. **Deprecated:** Use `returnDocument: 'after'` instead of `returnOriginal: false`, or `returnDocument: 'before'` instead of `returnOriginal: true`.
+ * @param {'before'|'after'} [options.returnDocument='before'] Has two possible values, `'before'` and `'after'`. By default, it will return the document before the update was applied.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
+ * @param {boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
  * @see Tutorial https://mongoosejs.com/docs/tutorials/findoneandupdate.html
  * @see findAndModify command https://www.mongodb.com/docs/manual/reference/command/findAndModify/
- * @see ModifyResult https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html
- * @see findOneAndUpdate https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#findOneAndUpdate
+ * @see ModifyResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html
+ * @see findOneAndUpdate https://mongodb.github.io/node-mongodb-native/7.0/classes/Collection.html#findOneAndUpdate
  * @return {Query} this
  * @api public
  */
@@ -3876,10 +3965,10 @@ Query.prototype.findByIdAndUpdate = function(id, update, options) {
  * @method findByIdAndDelete
  * @memberOf Query
  * @param {any} id value of `_id` to query by
- * @param {Object} [options]
- * @param {Boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/ModifyResult.html) rather than just the document
+ * @param {object} [options]
+ * @param {boolean} [options.includeResultMetadata] if true, returns the full [ModifyResult from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/7.0/interfaces/ModifyResult.html) rather than just the document
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](https://mongoosejs.com/docs/transactions.html).
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @return {Query} this
  * @see findAndModify command https://www.mongodb.com/docs/manual/reference/command/findAndModify/
  * @api public
@@ -3897,10 +3986,20 @@ Query.prototype.findByIdAndDelete = function(id, options) {
 
 function convertNewToReturnDocument(options) {
   if ('new' in options) {
+    const replacement = options['new'] ? '\'after\'' : '\'before\'';
+    utils.warn(
+      'mongoose: the `new` option for `findOneAndUpdate()` and `findOneAndReplace()` is deprecated. ' +
+      'Use `returnDocument: ' + replacement + '` instead.'
+    );
     options.returnDocument = options['new'] ? 'after' : 'before';
     delete options['new'];
   }
   if ('returnOriginal' in options) {
+    const replacement = options['returnOriginal'] ? '\'before\'' : '\'after\'';
+    utils.warn(
+      'mongoose: the `returnOriginal` option for `findOneAndUpdate()` and `findOneAndReplace()` is deprecated. ' +
+      'Use `returnDocument: ' + replacement + '` instead.'
+    );
     options.returnDocument = options['returnOriginal'] ? 'before' : 'after';
     delete options['returnOriginal'];
   }
@@ -3913,8 +4012,8 @@ function convertNewToReturnDocument(options) {
 /**
  * Get options from query opts, falling back to the base mongoose object.
  * @param {Query} query
- * @param {Object} option
- * @param {Any} def
+ * @param {object} option
+ * @param {any} def
  * @api private
  */
 
@@ -3997,104 +4096,76 @@ function _completeManyLean(schema, docs, path, opts) {
  * Override mquery.prototype._mergeUpdate to handle mongoose objects in
  * updates.
  *
- * @param {Object} doc
+ * @param {object} update
  * @method _mergeUpdate
  * @memberOf Query
  * @instance
  * @api private
  */
 
-Query.prototype._mergeUpdate = function(doc) {
-  if (!this._update) {
-    this._update = Array.isArray(doc) ? [] : {};
+Query.prototype._mergeUpdate = function(update) {
+  _cloneUpdateIfShared(this);
+
+  const updatePipeline = this._mongooseOptions.updatePipeline;
+  if (!updatePipeline && Array.isArray(update)) {
+    throw new MongooseError('Cannot pass an array to query updates unless the `updatePipeline` option is set.');
+  }
+  if (!this[queryUpdateSymbol]) {
+    this[queryUpdateSymbol] = Array.isArray(update) ? [] : {};
   }
 
-  if (doc == null || (typeof doc === 'object' && Object.keys(doc).length === 0)) {
+  if (update == null || (typeof update === 'object' && utils.hasOwnKeys(update) === false)) {
     return;
   }
 
-  if (doc instanceof Query) {
-    if (Array.isArray(this._update)) {
-      throw new Error('Cannot mix array and object updates');
+  if (update instanceof Query) {
+    if (Array.isArray(this[queryUpdateSymbol])) {
+      throw new MongooseError(`Cannot mix array and object updates (current: ${_previewUpdate(this[queryUpdateSymbol])}, incoming: ${_previewUpdate(update[queryUpdateSymbol])})`);
     }
-    if (doc._update) {
-      utils.mergeClone(this._update, doc._update);
+    if (update[queryUpdateSymbol]) {
+      utils.mergeClone(this[queryUpdateSymbol], update[queryUpdateSymbol]);
     }
-  } else if (Array.isArray(doc)) {
-    if (!Array.isArray(this._update)) {
-      throw new Error('Cannot mix array and object updates');
+  } else if (Array.isArray(update)) {
+    if (!Array.isArray(this[queryUpdateSymbol])) {
+      // `_update` may be empty object by default, like in `doc.updateOne()`
+      // because we create the query first, then run hooks, then apply the update.
+      if (this[queryUpdateSymbol] == null || utils.isEmptyObject(this[queryUpdateSymbol])) {
+        this[queryUpdateSymbol] = [];
+      } else {
+        throw new MongooseError(`Cannot mix array and object updates (current: ${_previewUpdate(this[queryUpdateSymbol])}, incoming: ${_previewUpdate(update)})`);
+      }
     }
-    this._update = this._update.concat(doc);
+    this[queryUpdateSymbol] = this[queryUpdateSymbol].concat(update);
   } else {
-    if (Array.isArray(this._update)) {
-      throw new Error('Cannot mix array and object updates');
+    if (Array.isArray(this[queryUpdateSymbol])) {
+      throw new MongooseError(`Cannot mix array and object updates (current: ${_previewUpdate(this[queryUpdateSymbol])}, incoming: ${_previewUpdate(update)})`);
     }
-    utils.mergeClone(this._update, doc);
+    utils.mergeClone(this[queryUpdateSymbol], update);
   }
 };
 
-/*!
- * ignore
- */
-
-async function _updateThunk(op) {
-  this._applyTranslateAliases();
-
-  this._castConditions();
-
-  // Check for empty/invalid filter with requireFilter option
-  checkRequireFilter(this._conditions, this.options);
-
-  _castArrayFilters(this);
-
-  if (this.error() != null) {
-    throw this.error();
-  }
-
-  const castedQuery = this._conditions;
-  const options = this._optionsForExec(this.model);
-
-  this._update = clone(this._update, options);
-  const isOverwriting = op === 'replaceOne';
-  if (isOverwriting) {
-    this._update = new this.model(this._update, null, true);
-  } else {
-    this._update = this._castUpdate(this._update);
-
-    if (this._update == null || Object.keys(this._update).length === 0) {
-      return { acknowledged: false };
-    }
-
-    const _opts = Object.assign({}, options, {
-      setDefaultsOnInsert: this._mongooseOptions.setDefaultsOnInsert
-    });
-    this._update = setDefaultsOnInsert(this._conditions, this.model.schema,
-      this._update, _opts);
-  }
-
-  if (Array.isArray(options.arrayFilters)) {
-    options.arrayFilters = removeUnusedArrayFilters(this._update, options.arrayFilters);
-  }
-
-  const runValidators = _getOption(this, 'runValidators', false);
-  if (runValidators) {
-    await this.validate(this._update, options, isOverwriting);
-  }
+function _previewUpdate(update) {
+  const preview = util.inspect(update, {
+    depth: 2,
+    maxArrayLength: 5,
+    breakLength: 80,
+    compact: true
+  });
 
-  if (this._update.toBSON) {
-    this._update = this._update.toBSON();
+  if (preview.length > 200) {
+    return `${preview.slice(0, 197)}...`;
   }
 
-  return this.mongooseCollection[op](castedQuery, this._update, options);
+  return preview;
 }
 
 /**
  * Mongoose calls this function internally to validate the query if
  * `runValidators` is set
  *
- * @param {Object} castedDoc the update, after casting
- * @param {Object} options the options from `_optionsForExec()`
- * @param {Boolean} isOverwriting
+ * @param {object} castedDoc the update, after casting
+ * @param {object} options the options from `_optionsForExec()`
+ * @param {boolean} isOverwriting
  * @method validate
  * @memberOf Query
  * @instance
@@ -4111,14 +4182,14 @@ Query.prototype.validate = async function validate(castedDoc, options, isOverwri
   if (isOverwriting) {
     await castedDoc.$validate();
   } else {
-    await new Promise((resolve, reject) => {
-      updateValidators(this, this.model.schema, castedDoc, options, (err) => {
-        if (err != null) {
-          return reject(err);
-        }
-        resolve();
-      });
-    });
+    const validationErrors = await updateValidators(this, this.model.schema, castedDoc, options);
+    if (validationErrors.length > 0) {
+      const err = new ValidationError(null);
+      for (const validationError of validationErrors) {
+        err.addError(validationError.path, validationError);
+      }
+      throw err;
+    }
   }
 
   await _executePostHooks(this, null, null, 'validate');
@@ -4134,7 +4205,40 @@ Query.prototype.validate = async function validate(castedDoc, options, isOverwri
  * @api private
  */
 Query.prototype._updateMany = async function _updateMany() {
-  return _updateThunk.call(this, 'updateMany');
+  this._applyTranslateAliases();
+  this._castConditions();
+  checkRequireFilter(this._conditions, this.options);
+  _castArrayFilters(this);
+  if (this.error() != null) {
+    throw this.error();
+  }
+
+  const options = this._optionsForExec(this.model);
+  _cloneUpdateIfShared(this);
+  this[queryUpdateSymbol] = this._castUpdate(this[queryUpdateSymbol]);
+  if (this[queryUpdateSymbol] == null || utils.hasOwnKeys(this[queryUpdateSymbol]) === false) {
+    return { acknowledged: false };
+  }
+  removeUnusedArrayFilters(this[queryUpdateSymbol], options);
+
+  this[queryUpdateSymbol] = setDefaultsOnInsert(
+    this._conditions,
+    this.model.schema,
+    this[queryUpdateSymbol],
+    options,
+    this._mongooseOptions,
+    this
+  );
+
+  if (_getOption(this, 'runValidators', false)) {
+    await this.validate(this[queryUpdateSymbol], options, false);
+  }
+
+  if (typeof this[queryUpdateSymbol].toBSON === 'function') {
+    this[queryUpdateSymbol] = this[queryUpdateSymbol].toBSON();
+  }
+
+  return this.mongooseCollection.updateMany(this._conditions, this[queryUpdateSymbol], options);
 };
 
 /**
@@ -4147,7 +4251,40 @@ Query.prototype._updateMany = async function _updateMany() {
  * @api private
  */
 Query.prototype._updateOne = async function _updateOne() {
-  return _updateThunk.call(this, 'updateOne');
+  this._applyTranslateAliases();
+  this._castConditions();
+  checkRequireFilter(this._conditions, this.options);
+  _castArrayFilters(this);
+  if (this.error() != null) {
+    throw this.error();
+  }
+
+  const options = this._optionsForExec(this.model);
+  _cloneUpdateIfShared(this);
+  this[queryUpdateSymbol] = this._castUpdate(this[queryUpdateSymbol]);
+  if (this[queryUpdateSymbol] == null || utils.hasOwnKeys(this[queryUpdateSymbol]) === false) {
+    return { acknowledged: false };
+  }
+  removeUnusedArrayFilters(this[queryUpdateSymbol], options);
+
+  this[queryUpdateSymbol] = setDefaultsOnInsert(
+    this._conditions,
+    this.model.schema,
+    this[queryUpdateSymbol],
+    options,
+    this._mongooseOptions,
+    this
+  );
+
+  if (_getOption(this, 'runValidators', false)) {
+    await this.validate(this[queryUpdateSymbol], options, false);
+  }
+
+  if (typeof this[queryUpdateSymbol].toBSON === 'function') {
+    this[queryUpdateSymbol] = this[queryUpdateSymbol].toBSON();
+  }
+
+  return this.mongooseCollection.updateOne(this._conditions, this[queryUpdateSymbol], options);
 };
 
 /**
@@ -4160,7 +4297,27 @@ Query.prototype._updateOne = async function _updateOne() {
  * @api private
  */
 Query.prototype._replaceOne = async function _replaceOne() {
-  return _updateThunk.call(this, 'replaceOne');
+  this._applyTranslateAliases();
+  this._castConditions();
+  checkRequireFilter(this._conditions, this.options);
+  _castArrayFilters(this);
+  if (this.error() != null) {
+    throw this.error();
+  }
+
+  const options = this._optionsForExec(this.model);
+  this[queryUpdateSymbol] = new this.model(this[queryUpdateSymbol], null, { skipId: true });
+  removeUnusedArrayFilters(this[queryUpdateSymbol], options);
+
+  if (_getOption(this, 'runValidators', false)) {
+    await this.validate(this[queryUpdateSymbol], options, true);
+  }
+
+  if (typeof this[queryUpdateSymbol].toBSON === 'function') {
+    this[queryUpdateSymbol] = this[queryUpdateSymbol].toBSON();
+  }
+
+  return this.mongooseCollection.replaceOne(this._conditions, this[queryUpdateSymbol], options);
 };
 
 /**
@@ -4184,23 +4341,24 @@ Query.prototype._replaceOne = async function _replaceOne() {
  *
  * - `updateMany()`
  *
- * @param {Object} [filter]
- * @param {Object|Array} [update] the update command. If array, this update will be treated as an update pipeline and not casted.
- * @param {Object} [options]
- * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
- * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
- * @param {Object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
- * @param {Boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object} [filter]
+ * @param {object|Array} [update] the update command. If array, this update will be treated as an update pipeline and not casted.
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
+ * @param {boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()
  * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update https://www.mongodb.com/docs/manual/reference/method/db.collection.update/
- * @see UpdateResult https://mongodb.github.io/node-mongodb-native/4.9/interfaces/UpdateResult.html
+ * @see UpdateResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/UpdateResult.html
  * @see MongoDB docs https://www.mongodb.com/docs/manual/reference/command/update/#update-command-output
  * @api public
  */
@@ -4209,13 +4367,13 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
   if (typeof options === 'function') {
     // .update(conditions, doc, callback)
     callback = options;
-    options = null;
+    options = undefined;
   } else if (typeof doc === 'function') {
     // .update(doc, callback);
     callback = doc;
     doc = conditions;
     conditions = {};
-    options = null;
+    options = undefined;
   } else if (typeof conditions === 'function') {
     // .update(callback)
     callback = conditions;
@@ -4259,23 +4417,24 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
  *
  * - `updateOne()`
  *
- * @param {Object} [filter]
- * @param {Object|Array} [update] the update command. If array, this update will be treated as an update pipeline and not casted.
- * @param {Object} [options]
- * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
- * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
- * @param {Object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
- * @param {Boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object} [filter]
+ * @param {object|Array} [update] the update command. If array, this update will be treated as an update pipeline and not casted.
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.overwriteDiscriminatorKey=false] Mongoose removes discriminator key updates from `update` by default, set `overwriteDiscriminatorKey` to `true` to allow updating the discriminator key
+ * @param {boolean} [options.overwriteImmutable=false] Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert). Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()
  * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update https://www.mongodb.com/docs/manual/reference/method/db.collection.update/
- * @see UpdateResult https://mongodb.github.io/node-mongodb-native/4.9/interfaces/UpdateResult.html
+ * @see UpdateResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/UpdateResult.html
  * @see MongoDB docs https://www.mongodb.com/docs/manual/reference/command/update/#update-command-output
  * @api public
  */
@@ -4284,13 +4443,13 @@ Query.prototype.updateOne = function(conditions, doc, options, callback) {
   if (typeof options === 'function') {
     // .update(conditions, doc, callback)
     callback = options;
-    options = null;
+    options = undefined;
   } else if (typeof doc === 'function') {
     // .update(doc, callback);
     callback = doc;
     doc = conditions;
     conditions = {};
-    options = null;
+    options = undefined;
   } else if (typeof conditions === 'function') {
     // .update(callback)
     callback = conditions;
@@ -4328,21 +4487,22 @@ Query.prototype.updateOne = function(conditions, doc, options, callback) {
  *
  * - `replaceOne()`
  *
- * @param {Object} [filter]
- * @param {Object} [doc] the update command
- * @param {Object} [options]
- * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
- * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
- * @param {Object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
- * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
- * @param {Boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
- * @param {Boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
+ * @param {object} [filter]
+ * @param {object} [doc] the update command
+ * @param {object} [options]
+ * @param {boolean} [options.cloneUpdate=true] if `false`, Mongoose will not clone the update before executing the query
+ * @param {boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
+ * @param {boolean|'throw'} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
+ * @param {boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {object} [options.writeConcern=null] sets the [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](https://mongoosejs.com/docs/guide.html#writeConcern)
+ * @param {boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {boolean} [options.translateAliases=null] If set to `true`, translates any schema-defined aliases in `filter`, `projection`, `update`, and `distinct`. Throws an error if there are any conflicts where both alias and raw property are defined on the same object.
+ * @param {boolean} [options.requireFilter=false] If true, throws an error if the filter is empty (`{}`)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()
  * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update https://www.mongodb.com/docs/manual/reference/method/db.collection.update/
- * @see UpdateResult https://mongodb.github.io/node-mongodb-native/4.9/interfaces/UpdateResult.html
+ * @see UpdateResult https://mongodb.github.io/node-mongodb-native/7.0/interfaces/UpdateResult.html
  * @see MongoDB docs https://www.mongodb.com/docs/manual/reference/command/update/#update-command-output
  * @api public
  */
@@ -4351,13 +4511,13 @@ Query.prototype.replaceOne = function(conditions, doc, options, callback) {
   if (typeof options === 'function') {
     // .update(conditions, doc, callback)
     callback = options;
-    options = null;
+    options = undefined;
   } else if (typeof doc === 'function') {
     // .update(doc, callback);
     callback = doc;
     doc = conditions;
     conditions = {};
-    options = null;
+    options = undefined;
   } else if (typeof conditions === 'function') {
     // .update(callback)
     callback = conditions;
@@ -4378,10 +4538,10 @@ Query.prototype.replaceOne = function(conditions, doc, options, callback) {
 /**
  * Internal helper for update, updateMany, updateOne, replaceOne
  * @param {Query} query
- * @param {String} op
- * @param {Object} filter
+ * @param {string} op
+ * @param {object} filter
  * @param {Document} [doc]
- * @param {Object} [options]
+ * @param {object} [options]
  * @param {Function} callback
  * @api private
  */
@@ -4389,7 +4549,6 @@ Query.prototype.replaceOne = function(conditions, doc, options, callback) {
 function _update(query, op, filter, doc, options, callback) {
   // make sure we don't send in the whole Document to merge()
   query.op = op;
-  query._validateOp();
   doc = doc || {};
 
   // strict is an option used in the update checking, make sure it gets set
@@ -4407,11 +4566,26 @@ function _update(query, op, filter, doc, options, callback) {
     query.merge(filter);
   }
 
+  const updatePipeline = query?.model?.base?.options?.updatePipeline;
+  if (updatePipeline != null && options?.updatePipeline == null) {
+    options = options || {};
+    options.updatePipeline = updatePipeline;
+  }
+
+  if (!options?.updatePipeline && Array.isArray(doc)) {
+    throw new MongooseError('Cannot pass an array to query updates unless the `updatePipeline` option is set.');
+  }
+
   if (utils.isObject(options)) {
     query.setOptions(options);
   }
 
-  query._mergeUpdate(doc);
+  if (query[queryUpdateSymbol] == null || utils.isEmptyObject(query[queryUpdateSymbol])) {
+    query[queryUpdateSymbol] = doc;
+    query._updateIsShared = true;
+  } else {
+    query._mergeUpdate(doc);
+  }
 
   // Hooks
   if (callback) {
@@ -4497,7 +4671,7 @@ Query.prototype.orFail = function(err) {
       case 'replaceOne':
       case 'updateMany':
       case 'updateOne':
-        if (res && res.matchedCount === 0) {
+        if (res?.matchedCount === 0) {
           throw _orFailError(err, this);
         }
         break;
@@ -4547,8 +4721,8 @@ function _orFailError(err, query) {
 
 /**
  * Wrapper function to call isPathSelectedInclusive on a query.
- * @param {String} path
- * @return {Boolean}
+ * @param {string} path
+ * @return {boolean}
  * @api public
  */
 
@@ -4564,7 +4738,7 @@ Query.prototype.isPathSelectedInclusive = function(path) {
  *     const promise = query.exec();
  *     const promise = query.exec('update');
  *
- * @param {String|Function} [operation]
+ * @param {string|Function} [operation]
  * @return {Promise}
  * @api public
  */
@@ -4574,6 +4748,7 @@ Query.prototype.exec = async function exec(op) {
     throw new MongooseError('Query.prototype.exec() no longer accepts a callback');
   }
 
+  this._validateOp();
   if (typeof op === 'string') {
     this.op = op;
   }
@@ -4590,27 +4765,22 @@ Query.prototype.exec = async function exec(op) {
     throw new MongooseError('Query has invalid `op`: "' + this.op + '"');
   }
 
-  if (this.options && this.options.sort && typeof this.options.sort === 'object' && Object.hasOwn(this.options.sort, '')) {
-    throw new Error('Invalid field "" passed to sort()');
+  if (this.options?.sort && typeof this.options.sort === 'object' && Object.hasOwn(this.options.sort, '')) {
+    throw new MongooseError('Invalid field "" passed to sort()');
   }
 
-  if (this._executionStack != null) {
+  if (this._execCount > 0) {
     let str = this.toString();
     if (str.length > 60) {
       str = str.slice(0, 60) + '...';
     }
-    const err = new MongooseError('Query was already executed: ' + str);
-    if (!this.model.base.options.skipOriginalStackTraces) {
-      err.originalStack = this._executionStack;
-    }
-    throw err;
-  } else {
-    this._executionStack = this.model.base.options.skipOriginalStackTraces ? true : new Error().stack;
+    throw new MongooseError('Query was already executed: ' + str);
   }
+  this._execCount++;
 
   let skipWrappedFunction = null;
   try {
-    await _executePreExecHooks(this);
+    await this._hooks.execPre('exec', this, []);
   } catch (err) {
     if (err instanceof Kareem.skipWrappedFunction) {
       skipWrappedFunction = err;
@@ -4641,7 +4811,7 @@ Query.prototype.exec = async function exec(op) {
 
   res = await _executePostHooks(this, res, error);
 
-  await _executePostExecHooks(this);
+  await this._hooks.execPost('exec', this, []);
 
   return res;
 };
@@ -4650,56 +4820,27 @@ Query.prototype.exec = async function exec(op) {
  * ignore
  */
 
-function _executePostExecHooks(query) {
-  return new Promise((resolve, reject) => {
-    query._hooks.execPost('exec', query, [], {}, (error) => {
-      if (error) {
-        return reject(error);
-      }
-
-      resolve();
-    });
-  });
-}
-
-/*!
- * ignore
- */
-
-function _executePostHooks(query, res, error, op) {
+async function _executePostHooks(query, res, error, op) {
   if (query._queryMiddleware == null) {
     if (error != null) {
       throw error;
     }
     return res;
   }
+  const filter = buildMiddlewareFilter(query.options, 'post');
+  const opts = { filter };
+  if (error) {
+    opts.error = error;
+  }
 
-  return new Promise((resolve, reject) => {
-    const opts = error ? { error } : {};
-
-    query._queryMiddleware.execPost(op || query.op, query, [res], opts, (error, res) => {
-      if (error) {
-        return reject(error);
-      }
-
-      resolve(res);
-    });
-  });
-}
-
-/*!
- * ignore
- */
-
-function _executePreExecHooks(query) {
-  return new Promise((resolve, reject) => {
-    query._hooks.execPre('exec', query, [], (error) => {
-      if (error != null) {
-        return reject(error);
-      }
-      resolve();
-    });
-  });
+  // `result` is array of return args, but queries only return one result.
+  const [result] = await query._queryMiddleware.execPost(
+    op || query.op,
+    query,
+    [res],
+    opts
+  );
+  return result;
 }
 
 /*!
@@ -4710,15 +4851,27 @@ function _executePreHooks(query, op) {
   if (query._queryMiddleware == null) {
     return;
   }
+  const filter = buildMiddlewareFilter(query.options, 'pre');
+  return query._queryMiddleware.execPre(
+    op || query.op,
+    query,
+    [],
+    { filter }
+  );
+}
 
-  return new Promise((resolve, reject) => {
-    query._queryMiddleware.execPre(op || query.op, query, [], (error) => {
-      if (error != null) {
-        return reject(error);
-      }
-      resolve();
-    });
+function _cloneUpdateIfShared(query) {
+  if (!query._updateIsShared) {
+    return;
+  }
+  if (query.mongooseOptions().cloneUpdate === false) {
+    return;
+  }
+
+  query[queryUpdateSymbol] = clone(query[queryUpdateSymbol], {
+    flattenDecimals: false
   });
+  query._updateIsShared = false;
 }
 
 /**
@@ -4777,7 +4930,7 @@ Query.prototype.finally = function(onFinally) {
  *     const q = Model.find();
  *     console.log(q); // Prints "Query { find }"
  *
- * @return {String}
+ * @return {string}
  * @api public
  * @method [Symbol.toStringTag]
  * @memberOf Query
@@ -4842,8 +4995,8 @@ Query.prototype.post = function(fn) {
 /**
  * Casts obj for an update command.
  *
- * @param {Object} obj
- * @return {Object} obj after casting its values
+ * @param {object} obj
+ * @return {object} obj after casting its values
  * @method _castUpdate
  * @memberOf Query
  * @instance
@@ -4854,7 +5007,7 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
   let schema = this.schema;
 
   const discriminatorKey = schema.options.discriminatorKey;
-  const baseSchema = schema._baseSchema ? schema._baseSchema : schema;
+  const baseSchema = schema._baseSchema || schema;
   if (this._mongooseOptions.overwriteDiscriminatorKey &&
       obj[discriminatorKey] != null &&
       baseSchema.discriminators) {
@@ -4913,18 +5066,18 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
  * a response for each query has also been returned, the results are passed to
  * the callback.
  *
- * @param {Object|String|String[]} path either the path(s) to populate or an object specifying all parameters
- * @param {Object|String} [select] Field selection for the population query
+ * @param {object|string|Array<string>} path either the path(s) to populate or an object specifying all parameters
+ * @param {object|string} [select] Field selection for the population query
  * @param {Model} [model] The model you wish to use for population. If not specified, populate will look up the model by the name in the Schema's `ref` field.
- * @param {Object} [match] Conditions for the population query
- * @param {Object} [options] Options for the population query (sort, etc)
- * @param {String} [options.path=null] The path to populate.
+ * @param {object} [match] Conditions for the population query
+ * @param {object} [options] Options for the population query (sort, etc)
+ * @param {string} [options.path=null] The path to populate.
  * @param {boolean} [options.retainNullValues=false] by default, Mongoose removes null and undefined values from populated arrays. Use this option to make `populate()` retain `null` and `undefined` array entries.
  * @param {boolean} [options.getters=false] if true, Mongoose will call any getters defined on the `localField`. By default, Mongoose gets the raw value of `localField`. For example, you would need to set this option to `true` if you wanted to [add a `lowercase` getter to your `localField`](https://mongoosejs.com/docs/schematypes.html#schematype-options).
  * @param {boolean} [options.clone=false] When you do `BlogPost.find().populate('author')`, blog posts with the same author will share 1 copy of an `author` doc. Enable this option to make Mongoose clone populated docs before assigning them.
- * @param {Object|Function} [options.match=null] Add an additional filter to the populate query. Can be a filter object containing [MongoDB query syntax](https://www.mongodb.com/docs/manual/tutorial/query-documents/), or a function that returns a filter object.
+ * @param {object|Function} [options.match=null] Add an additional filter to the populate query. Can be a filter object containing [MongoDB query syntax](https://www.mongodb.com/docs/manual/tutorial/query-documents/), or a function that returns a filter object.
  * @param {Function} [options.transform=null] Function that Mongoose will call on every populated document that allows you to transform the populated document.
- * @param {Object} [options.options=null] Additional options like `limit` and `lean`.
+ * @param {object} [options.options=null] Additional options like `limit` and `lean`.
  * @see population https://mongoosejs.com/docs/populate.html
  * @see Query#select https://mongoosejs.com/docs/api/query.html#Query.prototype.select()
  * @see Model.populate https://mongoosejs.com/docs/api/model.html#Model.populate()
@@ -4932,8 +5085,7 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
  * @api public
  */
 
-Query.prototype.populate = function() {
-  const args = Array.from(arguments);
+Query.prototype.populate = function(...args) {
   // Bail when given no truthy arguments
   if (!args.some(Boolean)) {
     return this;
@@ -4946,7 +5098,7 @@ Query.prototype.populate = function() {
   if (opts.lean != null) {
     const lean = opts.lean;
     for (const populateOptions of res) {
-      if ((populateOptions && populateOptions.options && populateOptions.options.lean) == null) {
+      if (populateOptions?.options?.lean == null) {
         populateOptions.options = populateOptions.options || {};
         populateOptions.options.lean = lean;
       }
@@ -4961,7 +5113,7 @@ Query.prototype.populate = function() {
 
   for (const populateOptions of res) {
     const path = populateOptions.path;
-    if (pop[path] && pop[path].populate && populateOptions.populate) {
+    if (pop[path]?.populate && populateOptions.populate) {
       populateOptions.populate = pop[path].populate.concat(populateOptions.populate);
     }
 
@@ -5029,8 +5181,8 @@ function _getPopulatedPaths(list, arr, prefix) {
  * If `obj` is present, it is cast instead of this query.
  *
  * @param {Model} [model] the model to cast to. If not set, defaults to `this.model`
- * @param {Object} [obj]
- * @return {Object}
+ * @param {object} [obj]
+ * @return {object}
  * @api public
  */
 
@@ -5043,7 +5195,7 @@ Query.prototype.cast = function(model, obj) {
     model = getDiscriminatorByValue(model.discriminators, obj[discriminatorKey]) || model;
   }
 
-  const opts = { upsert: this.options && this.options.upsert };
+  const opts = { upsert: this.options?.upsert };
   if (this.options) {
     if ('strict' in this.options) {
       opts.strict = this.options.strict;
@@ -5072,7 +5224,7 @@ Query.prototype.cast = function(model, obj) {
  *
  *     query.select({ ids: { $elemMatch: { $in: [hexString] }})
  *
- * @param {Object} fields
+ * @param {object} fields
  * @see https://github.com/Automattic/mongoose/issues/1091
  * @see https://www.mongodb.com/docs/manual/reference/projection/elemMatch/
  * @api private
@@ -5159,7 +5311,7 @@ Query.prototype._applyPaths = function applyPaths() {
 };
 
 /**
- * Returns a wrapper around a [mongodb driver cursor](https://mongodb.github.io/node-mongodb-native/4.9/classes/FindCursor.html).
+ * Returns a wrapper around a [mongodb driver cursor](https://mongodb.github.io/node-mongodb-native/7.0/classes/FindCursor.html).
  * A QueryCursor exposes a Streams3 interface, as well as a `.next()` function.
  *
  * The `.cursor()` function triggers pre find hooks, but **not** post find hooks.
@@ -5193,7 +5345,7 @@ Query.prototype._applyPaths = function applyPaths() {
  *   - `transform`: optional function which accepts a mongoose document. The return value of the function will be emitted on `data` and returned by `.next()`.
  *
  * @return {QueryCursor}
- * @param {Object} [options]
+ * @param {object} [options]
  * @see QueryCursor https://mongoosejs.com/docs/api/querycursor.html
  * @api public
  */
@@ -5230,10 +5382,10 @@ Query.prototype.cursor = function cursor(opts) {
  *
  * Cannot be used with `distinct()`
  *
- * @param {Boolean} bool defaults to true
- * @param {Object} [opts] options to set
- * @param {Boolean} [opts.awaitData] false by default. Set to true to keep the cursor open even if there's no data.
- * @param {Number} [opts.maxAwaitTimeMS] the maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `tailable` and `awaitData` to be true
+ * @param {boolean} bool defaults to true
+ * @param {object} [opts] options to set
+ * @param {boolean} [opts.awaitData] false by default. Set to true to keep the cursor open even if there's no data.
+ * @param {number} [opts.maxAwaitTimeMS] the maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `tailable` and `awaitData` to be true
  * @see tailable https://www.mongodb.com/docs/manual/tutorial/create-tailable-cursor/
  * @api public
  */
@@ -5241,7 +5393,7 @@ Query.prototype.cursor = function cursor(opts) {
 Query.prototype.tailable = function(val, opts) {
   // we need to support the tailable({ awaitData : true }) as well as the
   // tailable(true, {awaitData :true}) syntax that mquery does not support
-  if (val != null && typeof val.constructor === 'function' && val.constructor.name === 'Object') {
+  if (typeof val?.constructor === 'function' && val.constructor.name === 'Object') {
     opts = val;
     val = true;
   }
@@ -5292,7 +5444,7 @@ Query.prototype.tailable = function(val, opts) {
  * @method intersects
  * @memberOf Query
  * @instance
- * @param {Object} [arg]
+ * @param {object} [arg]
  * @return {Query} this
  * @see $geometry https://www.mongodb.com/docs/manual/reference/operator/geometry/
  * @see geoIntersects https://www.mongodb.com/docs/manual/reference/operator/geoIntersects/
@@ -5331,7 +5483,7 @@ Query.prototype.tailable = function(val, opts) {
  * @method geometry
  * @memberOf Query
  * @instance
- * @param {Object} object Must contain a `type` property which is a String and a `coordinates` property which is an Array. See the examples.
+ * @param {object} object Must contain a `type` property which is a String and a `coordinates` property which is an Array. See the examples.
  * @return {Query} this
  * @see $geometry https://www.mongodb.com/docs/manual/reference/operator/geometry/
  * @see Geospatial Support Enhancements https://www.mongodb.com/docs/manual/release-notes/2.4/#geospatial-support-enhancements
@@ -5354,8 +5506,8 @@ Query.prototype.tailable = function(val, opts) {
  * @method near
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Object} val
+ * @param {string} [path]
+ * @param {object} val
  * @return {Query} this
  * @see $near https://www.mongodb.com/docs/manual/reference/operator/near/
  * @see $nearSphere https://www.mongodb.com/docs/manual/reference/operator/nearSphere/
@@ -5467,26 +5619,17 @@ Query.prototype.nearSphere = function() {
  *       console.log(doc.name);
  *     }
  *
- * Node.js 10.x supports async iterators natively without any flags. You can
- * enable async iterators in Node.js 8.x using the [`--harmony_async_iteration` flag](https://github.com/tc39/proposal-async-iteration/issues/117#issuecomment-346695187).
- *
- * **Note:** This function is not if `Symbol.asyncIterator` is undefined. If
- * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
- * support async iterators.
- *
  * @method [Symbol.asyncIterator]
  * @memberOf Query
  * @instance
  * @api public
  */
 
-if (Symbol.asyncIterator != null) {
-  Query.prototype[Symbol.asyncIterator] = function queryAsyncIterator() {
-    // Set so QueryCursor knows it should transform results for async iterators into `{ value, done }` syntax
-    this._mongooseOptions._asyncIterator = true;
-    return this.cursor();
-  };
-}
+Query.prototype[Symbol.asyncIterator] = function queryAsyncIterator() {
+  // Set so QueryCursor knows it should transform results for async iterators into `{ value, done }` syntax
+  this._mongooseOptions._asyncIterator = true;
+  return this.cursor();
+};
 
 /**
  * Specifies a `$polygon` condition
@@ -5499,8 +5642,8 @@ if (Symbol.asyncIterator != null) {
  * @method polygon
  * @memberOf Query
  * @instance
- * @param {String|Array} [path]
- * @param {...Array|Object} [coordinatePairs]
+ * @param {string|Array} [path]
+ * @param {...Array|object} [coordinatePairs]
  * @return {Query} this
  * @see $polygon https://www.mongodb.com/docs/manual/reference/operator/polygon/
  * @see MongoDB Geospatial Indexing https://www.mongodb.com/docs/manual/core/geospatial-indexes/
@@ -5524,8 +5667,8 @@ if (Symbol.asyncIterator != null) {
  * @see $box https://www.mongodb.com/docs/manual/reference/operator/box/
  * @see within() Query#within https://mongoosejs.com/docs/api/query.html#Query.prototype.within()
  * @see MongoDB Geospatial Indexing https://www.mongodb.com/docs/manual/core/geospatial-indexes/
- * @param {Object|Array<Number>} val1 Lower Left Coordinates OR a object of lower-left(ll) and upper-right(ur) Coordinates
- * @param {Array<Number>} [val2] Upper Right Coordinates
+ * @param {object|Array<number>} val1 Lower Left Coordinates OR an object of lower-left(ll) and upper-right(ur) Coordinates
+ * @param {Array<number>} [val2] Upper Right Coordinates
  * @return {Query} this
  * @api public
  */
@@ -5568,8 +5711,8 @@ Query.prototype.box = function(ll, ur) {
  * @method circle
  * @memberOf Query
  * @instance
- * @param {String} [path]
- * @param {Object} area
+ * @param {string} [path]
+ * @param {object} area
  * @return {Query} this
  * @see $center https://www.mongodb.com/docs/manual/reference/operator/center/
  * @see $centerSphere https://www.mongodb.com/docs/manual/reference/operator/centerSphere/
@@ -5603,8 +5746,8 @@ Query.prototype.center = Query.base.circle;
  *     query.where('loc').within().centerSphere(area);
  *
  * @deprecated
- * @param {String} [path]
- * @param {Object} val
+ * @param {string} [path]
+ * @param {object} val
  * @return {Query} this
  * @see MongoDB Geospatial Indexing https://www.mongodb.com/docs/manual/core/geospatial-indexes/
  * @see $centerSphere https://www.mongodb.com/docs/manual/reference/operator/centerSphere/
@@ -5612,11 +5755,11 @@ Query.prototype.center = Query.base.circle;
  */
 
 Query.prototype.centerSphere = function() {
-  if (arguments[0] != null && typeof arguments[0].constructor === 'function' && arguments[0].constructor.name === 'Object') {
+  if (typeof arguments[0]?.constructor === 'function' && arguments[0].constructor.name === 'Object') {
     arguments[0].spherical = true;
   }
 
-  if (arguments[1] != null && typeof arguments[1].constructor === 'function' && arguments[1].constructor.name === 'Object') {
+  if (typeof arguments[1]?.constructor === 'function' && arguments[1].constructor.name === 'Object') {
     arguments[1].spherical = true;
   }
 
@@ -5629,7 +5772,7 @@ Query.prototype.centerSphere = function() {
  * @method selected
  * @memberOf Query
  * @instance
- * @return {Boolean}
+ * @return {boolean}
  * @api public
  */
 
@@ -5643,7 +5786,7 @@ Query.prototype.centerSphere = function() {
  * @method selectedInclusively
  * @memberOf Query
  * @instance
- * @return {Boolean}
+ * @return {boolean}
  * @api public
  */
 
@@ -5662,7 +5805,7 @@ Query.prototype.selectedInclusively = function selectedInclusively() {
  * @method selectedExclusively
  * @memberOf Query
  * @instance
- * @return {Boolean}
+ * @return {boolean}
  * @api public
  */
 
@@ -5686,6 +5829,15 @@ Query.prototype.selectedExclusively = function selectedExclusively() {
 
 Query.prototype.model;
 
+/**
+ * Determine if we can merge the given value as a query filter. Override for mquery.canMerge() to allow null
+ */
+
+function canMerge(value) {
+  return value instanceof Query || utils.isObject(value) || value === null;
+
+}
+
 /*!
  * Export
  */