mongoose 9.1.6 → 9.2.1

package/lib/plugins/sharding.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const objectIdSymbol = require('../helpers/symbols').objectIdSymbol;
+const symbols = require('../schema/symbols');
 const utils = require('../utils');
 
 /*!
@@ -8,24 +9,34 @@ const utils = require('../utils');
  */
 
 module.exports = function shardingPlugin(schema) {
-  schema.post('init', function shardingPluginPostInit() {
-    storeShard.call(this);
-    return this;
-  });
-  schema.pre('save', function shardingPluginPreSave() {
-    applyWhere.call(this);
-  });
-  schema.pre('deleteOne', { document: true, query: false }, function shardingPluginPreDeleteOne() {
-    applyWhere.call(this);
-  });
-  schema.pre('updateOne', { document: true, query: false }, function shardingPluginPreUpdateOne() {
-    applyWhere.call(this);
-  });
-  schema.post('save', function shardingPluginPostSave() {
-    storeShard.call(this);
-  });
+  schema.post('init', shardingPluginPostInit);
+  schema.pre('save', shardingPluginPreSave);
+  schema.post('save', shardingPluginPostSave);
+  schema.pre('deleteOne', { document: true, query: false }, shardingPluginPreDeleteOne);
+  schema.pre('updateOne', { document: true, query: false }, shardingPluginPreUpdateOne);
 };
 
+function shardingPluginPostInit() {
+  storeShard.call(this);
+  return this;
+}
+
+function shardingPluginPreSave() {
+  applyWhere.call(this);
+}
+
+function shardingPluginPostSave() {
+  storeShard.call(this);
+}
+
+function shardingPluginPreDeleteOne() {
+  applyWhere.call(this);
+}
+
+function shardingPluginPreUpdateOne() {
+  applyWhere.call(this);
+}
+
 /*!
  * ignore
  */
@@ -82,3 +93,9 @@ function storeShard() {
     }
   }
 }
+
+shardingPluginPostInit[symbols.builtInMiddleware] = true;
+shardingPluginPreSave[symbols.builtInMiddleware] = true;
+shardingPluginPostSave[symbols.builtInMiddleware] = true;
+shardingPluginPreDeleteOne[symbols.builtInMiddleware] = true;
+shardingPluginPreUpdateOne[symbols.builtInMiddleware] = true;

package/lib/plugins/trackTransaction.js

@@ -2,34 +2,37 @@
 
 const arrayAtomicsSymbol = require('../helpers/symbols').arrayAtomicsSymbol;
 const sessionNewDocuments = require('../helpers/symbols').sessionNewDocuments;
+const symbols = require('../schema/symbols');
 const utils = require('../utils');
 
 module.exports = function trackTransaction(schema) {
-  schema.pre('save', function trackTransactionPreSave() {
-    const session = this.$session();
-    if (session == null) {
-      return;
+  schema.pre('save', trackTransactionPreSave);
+};
+
+function trackTransactionPreSave() {
+  const session = this.$session();
+  if (session == null) {
+    return;
+  }
+  if (session.transaction == null || session[sessionNewDocuments] == null) {
+    return;
+  }
+
+  if (!session[sessionNewDocuments].has(this)) {
+    const initialState = {};
+    if (this.isNew) {
+      initialState.isNew = true;
     }
-    if (session.transaction == null || session[sessionNewDocuments] == null) {
-      return;
+    if (this.$__schema.options.versionKey) {
+      initialState.versionKey = this.get(this.$__schema.options.versionKey);
     }
 
-    if (!session[sessionNewDocuments].has(this)) {
-      const initialState = {};
-      if (this.isNew) {
-        initialState.isNew = true;
-      }
-      if (this.$__schema.options.versionKey) {
-        initialState.versionKey = this.get(this.$__schema.options.versionKey);
-      }
-
-      initialState.modifiedPaths = new Set(Object.keys(this.$__.activePaths.getStatePaths('modify')));
-      initialState.atomics = _getAtomics(this);
+    initialState.modifiedPaths = new Set(Object.keys(this.$__.activePaths.getStatePaths('modify')));
+    initialState.atomics = _getAtomics(this);
 
-      session[sessionNewDocuments].set(this, initialState);
-    }
-  });
-};
+    session[sessionNewDocuments].set(this, initialState);
+  }
+}
 
 function _getAtomics(doc, previous) {
   const pathToAtomics = new Map();
@@ -82,3 +85,5 @@ function mergeAtomics(destination, source) {
 
   return destination;
 }
+
+trackTransactionPreSave[symbols.builtInMiddleware] = true;

package/lib/plugins/validateBeforeSave.js

@@ -1,41 +1,47 @@
 'use strict';
 
+const symbols = require('../schema/symbols');
+
 /*!
  * ignore
  */
 
 module.exports = function validateBeforeSave(schema) {
   const unshift = true;
-  schema.pre('save', false, async function validateBeforeSave(options) {
-    // Nested docs have their own presave
-    if (this.$isSubdocument) {
-      return;
-    }
+  schema.pre('save', false, validateBeforeSavePreSave, null, unshift);
+};
+
+async function validateBeforeSavePreSave(options) {
+  // Nested docs have their own presave
+  if (this.$isSubdocument) {
+    return;
+  }
+
+  const hasValidateBeforeSaveOption = options &&
+      (typeof options === 'object') &&
+      ('validateBeforeSave' in options);
 
-    const hasValidateBeforeSaveOption = options &&
+  let shouldValidate;
+  if (hasValidateBeforeSaveOption) {
+    shouldValidate = !!options.validateBeforeSave;
+  } else {
+    shouldValidate = this.$__schema.options.validateBeforeSave;
+  }
+
+  // Validate
+  if (shouldValidate) {
+    const hasValidateModifiedOnlyOption = options &&
         (typeof options === 'object') &&
-        ('validateBeforeSave' in options);
-
-    let shouldValidate;
-    if (hasValidateBeforeSaveOption) {
-      shouldValidate = !!options.validateBeforeSave;
-    } else {
-      shouldValidate = this.$__schema.options.validateBeforeSave;
-    }
-
-    // Validate
-    if (shouldValidate) {
-      const hasValidateModifiedOnlyOption = options &&
-          (typeof options === 'object') &&
-          ('validateModifiedOnly' in options);
-      const validateOptions = hasValidateModifiedOnlyOption ?
-        { validateModifiedOnly: options.validateModifiedOnly } :
-        null;
-      await this.$validate(validateOptions).then(
-        () => {
-          this.$op = 'save';
-        }
-      );
-    }
-  }, null, unshift);
-};
+        ('validateModifiedOnly' in options);
+    const validateOptions = hasValidateModifiedOnlyOption ?
+      { validateModifiedOnly: options.validateModifiedOnly } :
+      null;
+    await this.$validate(validateOptions).then(
+      () => {
+        this.$op = 'save';
+      }
+    );
+  }
+}
+
+validateBeforeSavePreSave[symbols.builtInMiddleware] = true;

package/lib/query.js

@@ -33,6 +33,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');
@@ -1623,7 +1624,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
@@ -1697,6 +1698,7 @@ 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
  * @return {Query} this
@@ -1826,7 +1828,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
  */
@@ -3404,13 +3406,14 @@ function prepareDiscriminatorCriteria(query) {
  * @param {Object} [update]
  * @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 {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 {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`.
+ * @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.
@@ -3463,9 +3466,14 @@ Query.prototype.findOneAndUpdate = function(filter, update, options) {
     delete options.fields;
   }
 
-  const returnOriginal = 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;
@@ -3598,7 +3606,7 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
  * @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 {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
@@ -3692,13 +3700,14 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
  * @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 {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 {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|'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`.
+ * @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
@@ -3730,9 +3739,14 @@ Query.prototype.findOneAndReplace = function(filter, replacement, options) {
 
   options = options || {};
 
-  const returnOriginal = 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);
@@ -3858,13 +3872,14 @@ Query.prototype.findById = function(id, projection, options) {
  * @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 {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 {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`.
+ * @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.
@@ -3895,7 +3910,7 @@ Query.prototype.findByIdAndUpdate = function(id, update, options) {
  * @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 {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
@@ -3913,10 +3928,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'];
   }
@@ -4222,7 +4247,7 @@ Query.prototype._replaceOne = async function _replaceOne() {
  * @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|'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.
@@ -4297,7 +4322,7 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
  * @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|'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.
@@ -4366,7 +4391,7 @@ Query.prototype.updateOne = function(conditions, doc, options, callback) {
  * @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|'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.
@@ -4685,19 +4710,27 @@ Query.prototype.exec = async function exec(op) {
  * 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;
+  }
 
-  const opts = error ? { error } : {};
-  return query._queryMiddleware.execPost(op || query.op, query, [res], opts).then((res) => {
-    // `res` is array of return args, but queries only return one result.
-    return res[0];
-  });
+  // `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;
 }
 
 /*!
@@ -4708,8 +4741,13 @@ function _executePreHooks(query, op) {
   if (query._queryMiddleware == null) {
     return;
   }
-
-  return query._queryMiddleware.execPre(op || query.op, query, []);
+  const filter = buildMiddlewareFilter(query.options, 'pre');
+  return query._queryMiddleware.execPre(
+    op || query.op,
+    query,
+    [],
+    { filter }
+  );
 }
 
 /**

package/lib/queryHelpers.js

@@ -90,7 +90,8 @@ exports.createModel = function createModel(model, doc, fields, userProvidedField
     if (discriminator) {
       const _fields = clone(userProvidedFields);
       exports.applyPaths(_fields, discriminator.schema);
-      return new discriminator(undefined, _fields, { skipId: true });
+      const _opts = { strict: options?.strict };
+      return new discriminator(undefined, _fields, _opts);
     }
   }
 
@@ -113,9 +114,13 @@ exports.createModel = function createModel(model, doc, fields, userProvidedField
  */
 
 exports.createModelAndInit = function createModelAndInit(model, doc, fields, userProvidedFields, options, populatedIds, callback) {
-  const initOpts = populatedIds ?
-    { populated: populatedIds } :
-    undefined;
+  const initOpts = {};
+  if (populatedIds) {
+    initOpts.populated = populatedIds;
+  }
+  if (options?.middleware != null) {
+    initOpts.middleware = options.middleware;
+  }
 
   const casted = exports.createModel(model, doc, fields, userProvidedFields, options);
   try {

package/lib/schema.js

@@ -604,12 +604,12 @@ Schema.prototype.omit = function(paths, options) {
 Schema.prototype.defaultOptions = function(options) {
   this._userProvidedOptions = options == null ? {} : clone(options);
   const baseOptions = this.base?.options || {};
-  const strict = 'strict' in baseOptions ? baseOptions.strict : true;
-  const strictQuery = 'strictQuery' in baseOptions ? baseOptions.strictQuery : false;
-  const id = 'id' in baseOptions ? baseOptions.id : true;
+  const defaultStrict = baseOptions.strict ?? true;
+  const defaultStrictQuery = baseOptions.strictQuery ?? false;
+  const defaultId = baseOptions.id ?? true;
   options = {
-    strict,
-    strictQuery,
+    strict: defaultStrict,
+    strictQuery: defaultStrictQuery,
     bufferCommands: true,
     capped: false, // { size, max, autoIndexId }
     versionKey: '__v',
@@ -623,11 +623,16 @@ Schema.prototype.defaultOptions = function(options) {
     validateModifiedOnly: false,
     // the following are only applied at construction time
     _id: true,
-    id: id,
+    id: defaultId,
     typeKey: 'type',
     ...options
   };
 
+  // Treat `undefined` as "not provided" for these options
+  options.strict ??= defaultStrict;
+  options.strictQuery ??= defaultStrictQuery;
+  options.id ??= defaultId;
+
   if (options.versionKey && typeof options.versionKey !== 'string') {
     throw new MongooseError('`versionKey` must be falsy or string, got `' + (typeof options.versionKey) + '`');
   }
@@ -2344,12 +2349,6 @@ Schema.prototype.index = function(fields, options) {
     }
   }
 
-  for (const existingIndex of this.indexes()) {
-    if (options.name == null && existingIndex[1].name == null && isIndexSpecEqual(existingIndex[0], fields)) {
-      utils.warn(`Duplicate schema index on ${JSON.stringify(fields)} found. This is often due to declaring an index using both "index: true" and "schema.index()". Please remove the duplicate index definition.`);
-    }
-  }
-
   this._indexes.push([fields, options]);
   return this;
 };

package/lib/types/subdocument.js

@@ -60,7 +60,11 @@ Subdocument.prototype.toBSON = function() {
  *
  * _This is a no-op. Does not actually save the doc to the db._
  *
- * @param {Function} [fn]
+ * @param {Object} [options]
+ * @param {Boolean} [options.suppressWarning=false] If `true`, suppress the warning about calling `save()` on a subdoc.
+ * @param {Boolean|Object} [options.middleware=true] set to `false` to skip all user-defined middleware
+ * @param {Boolean} [options.middleware.pre=true] set to `false` to skip only pre hooks
+ * @param {Boolean} [options.middleware.post=true] set to `false` to skip only post hooks
  * @return {Promise} resolved Promise
  * @api private
  */
@@ -75,7 +79,7 @@ Subdocument.prototype.save = async function save(options) {
       'if you\'re sure this behavior is right for your app.');
   }
 
-  return await this.$__save();
+  return await this.$__save(options);
 };
 
 /**
@@ -132,15 +136,15 @@ Subdocument.prototype.$__pathRelativeToParent = function(p) {
  * @api private
  */
 
-Subdocument.prototype.$__save = async function $__save() {
+Subdocument.prototype.$__save = async function $__save(options) {
   try {
-    await this._execDocumentPreHooks('save');
+    await this._execDocumentPreHooks('save', options, [options]);
   } catch (error) {
-    await this._execDocumentPostHooks('save', error);
+    await this._execDocumentPostHooks('save', options, error);
     return;
   }
 
-  await this._execDocumentPostHooks('save');
+  await this._execDocumentPostHooks('save', options);
 };
 
 /*!

package/lib/validOptions.js

@@ -22,6 +22,7 @@ const VALID_OPTIONS = Object.freeze([
   'maxTimeMS',
   'objectIdGetter',
   'overwriteModels',
+  'returnDocument',
   'returnOriginal',
   'runValidators',
   'sanitizeFilter',