From 01dd4719d6bc4ab301bd21a2fe3e896b521f4a5e Mon Sep 17 00:00:00 2001
From: 0x0a0d <vandug23@gmail.com>
Date: Tue, 16 Jul 2024 06:27:39 +0700
Subject: [PATCH 001/191] Reapply "fix(cast): remove empty conditions after
 strict applied"

This reverts commit 1ca84b334f2ac8e75641eed108f5f17ad1c82f43.
---
 lib/cast.js            |  9 ++++-
 test/docs/cast.test.js | 74 ++++++++++++++++++++++++++----------------
 2 files changed, 54 insertions(+), 29 deletions(-)

diff --git a/lib/cast.js b/lib/cast.js
index e7bf5b45a05..1bb16e87c81 100644
--- a/lib/cast.js
+++ b/lib/cast.js
@@ -65,11 +65,18 @@ module.exports = function cast(schema, obj, options, context) {
       if (!Array.isArray(val)) {
         throw new CastError('Array', val, path);
       }
-      for (let k = 0; k < val.length; ++k) {
+      for (let k = val.length - 1; k >= 0; k--) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }
         val[k] = cast(schema, val[k], options, context);
+        if (Object.keys(val[k]).length === 0) {
+          val.splice(k, 1);
+        }
+      }
+
+      if (val.length === 0) {
+        delete obj[path];
       }
     } else if (path === '$where') {
       type = typeof val;
diff --git a/test/docs/cast.test.js b/test/docs/cast.test.js
index b2b9b4aef78..6184ac05cf1 100644
--- a/test/docs/cast.test.js
+++ b/test/docs/cast.test.js
@@ -101,40 +101,58 @@ describe('Cast Tutorial', function() {
     await query.exec();
   });
 
-  it('strictQuery true', async function() {
-    mongoose.deleteModel('Character');
-    const schema = new mongoose.Schema({ name: String, age: Number }, {
-      strictQuery: true
+  describe('strictQuery', function() {
+    it('strictQuery true - simple object', async function() {
+      mongoose.deleteModel('Character');
+      const schema = new mongoose.Schema({ name: String, age: Number }, {
+        strictQuery: true
+      });
+      Character = mongoose.model('Character', schema);
+
+      const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
+
+      await query.exec();
+      query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
+      // acquit:ignore:start
+      assert.deepEqual(query.getFilter(), {});
+      // acquit:ignore:end
     });
-    Character = mongoose.model('Character', schema);
 
-    const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
+    it('strictQuery true - conditions', async function() {
+      mongoose.deleteModel('Character');
+      const schema = new mongoose.Schema({ name: String, age: Number }, {
+        strictQuery: true
+      });
+      Character = mongoose.model('Character', schema);
 
-    await query.exec();
-    query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
-    // acquit:ignore:start
-    assert.deepEqual(query.getFilter(), {});
-    // acquit:ignore:end
-  });
+      const query = Character.findOne({ $or: [{ notInSchema: { $lt: 'not a number' } }], $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }] });
 
-  it('strictQuery throw', async function() {
-    mongoose.deleteModel('Character');
-    const schema = new mongoose.Schema({ name: String, age: Number }, {
-      strictQuery: 'throw'
+      await query.exec();
+      query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
+      // acquit:ignore:start
+      assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }] });
+      // acquit:ignore:end
     });
-    Character = mongoose.model('Character', schema);
 
-    const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
-
-    const err = await query.exec().then(() => null, err => err);
-    err.name; // 'StrictModeError'
-    // Path "notInSchema" is not in schema and strictQuery is 'throw'.
-    err.message;
-    // acquit:ignore:start
-    assert.equal(err.name, 'StrictModeError');
-    assert.equal(err.message, 'Path "notInSchema" is not in schema and ' +
-      'strictQuery is \'throw\'.');
-    // acquit:ignore:end
+    it('strictQuery throw', async function() {
+      mongoose.deleteModel('Character');
+      const schema = new mongoose.Schema({ name: String, age: Number }, {
+        strictQuery: 'throw'
+      });
+      Character = mongoose.model('Character', schema);
+
+      const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
+
+      const err = await query.exec().then(() => null, err => err);
+      err.name; // 'StrictModeError'
+      // Path "notInSchema" is not in schema and strictQuery is 'throw'.
+      err.message;
+      // acquit:ignore:start
+      assert.equal(err.name, 'StrictModeError');
+      assert.equal(err.message, 'Path "notInSchema" is not in schema and ' +
+        'strictQuery is \'throw\'.');
+      // acquit:ignore:end
+    });
   });
 
   it('implicit in', async function() {

From e5eb2346126097c546d45fb1363ccd52c83f636b Mon Sep 17 00:00:00 2001
From: 0x0a0d <vandug23@gmail.com>
Date: Tue, 16 Jul 2024 06:41:24 +0700
Subject: [PATCH 002/191] only remove object if it becomes empty because of
 casting

---
 lib/cast.js            | 5 ++++-
 test/docs/cast.test.js | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/cast.js b/lib/cast.js
index 1bb16e87c81..690c412a7a7 100644
--- a/lib/cast.js
+++ b/lib/cast.js
@@ -69,12 +69,15 @@ module.exports = function cast(schema, obj, options, context) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }
+
+        const beforeCastKeysLength = Object.keys(val[k]).length;
         val[k] = cast(schema, val[k], options, context);
-        if (Object.keys(val[k]).length === 0) {
+        if (Object.keys(val[k]).length === 0 && beforeCastKeysLength !== 0) {
           val.splice(k, 1);
         }
       }
 
+      // delete empty: {$or: []} -> {}
       if (val.length === 0) {
         delete obj[path];
       }
diff --git a/test/docs/cast.test.js b/test/docs/cast.test.js
index 6184ac05cf1..21775ad0cb8 100644
--- a/test/docs/cast.test.js
+++ b/test/docs/cast.test.js
@@ -125,12 +125,16 @@ describe('Cast Tutorial', function() {
       });
       Character = mongoose.model('Character', schema);
 
-      const query = Character.findOne({ $or: [{ notInSchema: { $lt: 'not a number' } }], $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }] });
+      const query = Character.findOne({
+        $or: [{ notInSchema: { $lt: 'not a number' } }],
+        $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }],
+        $nor: [{}] // should be kept
+      });
 
       await query.exec();
       query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
       // acquit:ignore:start
-      assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }] });
+      assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }], $nor: [{}] });
       // acquit:ignore:end
     });
 

From 19d694a5dd43a6d7979b60c5f9670e14117c404d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 19 Jul 2024 16:51:57 -0400
Subject: [PATCH 003/191] Update cast.test.js

---
 test/docs/cast.test.js | 100 ++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/test/docs/cast.test.js b/test/docs/cast.test.js
index 21775ad0cb8..332c7b9d88d 100644
--- a/test/docs/cast.test.js
+++ b/test/docs/cast.test.js
@@ -101,62 +101,60 @@ describe('Cast Tutorial', function() {
     await query.exec();
   });
 
-  describe('strictQuery', function() {
-    it('strictQuery true - simple object', async function() {
-      mongoose.deleteModel('Character');
-      const schema = new mongoose.Schema({ name: String, age: Number }, {
-        strictQuery: true
-      });
-      Character = mongoose.model('Character', schema);
-
-      const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
-
-      await query.exec();
-      query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
-      // acquit:ignore:start
-      assert.deepEqual(query.getFilter(), {});
-      // acquit:ignore:end
+  it('strictQuery true', async function() {
+    mongoose.deleteModel('Character');
+    const schema = new mongoose.Schema({ name: String, age: Number }, {
+      strictQuery: true
     });
+    Character = mongoose.model('Character', schema);
+
+    const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
+
+    await query.exec();
+    query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
+    // acquit:ignore:start
+    assert.deepEqual(query.getFilter(), {});
+    // acquit:ignore:end
+  });
+
+  it('strictQuery throw', async function() {
+    mongoose.deleteModel('Character');
+    const schema = new mongoose.Schema({ name: String, age: Number }, {
+      strictQuery: 'throw'
+    });
+    Character = mongoose.model('Character', schema);
+
+    const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
 
-    it('strictQuery true - conditions', async function() {
-      mongoose.deleteModel('Character');
-      const schema = new mongoose.Schema({ name: String, age: Number }, {
-        strictQuery: true
-      });
-      Character = mongoose.model('Character', schema);
-
-      const query = Character.findOne({
-        $or: [{ notInSchema: { $lt: 'not a number' } }],
-        $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }],
-        $nor: [{}] // should be kept
-      });
-
-      await query.exec();
-      query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
-      // acquit:ignore:start
-      assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }], $nor: [{}] });
-      // acquit:ignore:end
+    const err = await query.exec().then(() => null, err => err);
+    err.name; // 'StrictModeError'
+    // Path "notInSchema" is not in schema and strictQuery is 'throw'.
+    err.message;
+    // acquit:ignore:start
+    assert.equal(err.name, 'StrictModeError');
+    assert.equal(err.message, 'Path "notInSchema" is not in schema and ' +
+      'strictQuery is \'throw\'.');
+    // acquit:ignore:end
+  });
+  
+  it('strictQuery removes casted empty objects', async function() {
+    mongoose.deleteModel('Character');
+    const schema = new mongoose.Schema({ name: String, age: Number }, {
+      strictQuery: true
     });
+    Character = mongoose.model('Character', schema);
 
-    it('strictQuery throw', async function() {
-      mongoose.deleteModel('Character');
-      const schema = new mongoose.Schema({ name: String, age: Number }, {
-        strictQuery: 'throw'
-      });
-      Character = mongoose.model('Character', schema);
-
-      const query = Character.findOne({ notInSchema: { $lt: 'not a number' } });
-
-      const err = await query.exec().then(() => null, err => err);
-      err.name; // 'StrictModeError'
-      // Path "notInSchema" is not in schema and strictQuery is 'throw'.
-      err.message;
-      // acquit:ignore:start
-      assert.equal(err.name, 'StrictModeError');
-      assert.equal(err.message, 'Path "notInSchema" is not in schema and ' +
-        'strictQuery is \'throw\'.');
-      // acquit:ignore:end
+    const query = Character.findOne({
+      $or: [{ notInSchema: { $lt: 'not a number' } }],
+      $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }],
+      $nor: [{}] // should be kept
     });
+
+    await query.exec();
+    query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
+    // acquit:ignore:start
+    assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }], $nor: [{}] });
+    // acquit:ignore:end
   });
 
   it('implicit in', async function() {

From e3a9e65236b3212128fdafaa9adc6d8b22d81ecc Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 19 Jul 2024 16:58:37 -0400
Subject: [PATCH 004/191] Update cast.js

---
 lib/cast.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cast.js b/lib/cast.js
index 690c412a7a7..8eea0e0303e 100644
--- a/lib/cast.js
+++ b/lib/cast.js
@@ -65,7 +65,7 @@ module.exports = function cast(schema, obj, options, context) {
       if (!Array.isArray(val)) {
         throw new CastError('Array', val, path);
       }
-      for (let k = val.length - 1; k >= 0; k--) {
+      for (let k = 0; k < val.length; ++k) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }

From 630868671d3a2ecc71c96084afd7ebfca583f01c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 19 Jul 2024 17:04:42 -0400
Subject: [PATCH 005/191] style: fix lint

---
 test/docs/cast.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/docs/cast.test.js b/test/docs/cast.test.js
index 332c7b9d88d..b24a9db657d 100644
--- a/test/docs/cast.test.js
+++ b/test/docs/cast.test.js
@@ -136,7 +136,7 @@ describe('Cast Tutorial', function() {
       'strictQuery is \'throw\'.');
     // acquit:ignore:end
   });
-  
+
   it('strictQuery removes casted empty objects', async function() {
     mongoose.deleteModel('Character');
     const schema = new mongoose.Schema({ name: String, age: Number }, {

From 91612bb9657f97e1c981545c2266ebdca57cc751 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 12 Aug 2024 13:26:38 -0400
Subject: [PATCH 006/191] Revert "Update cast.js"

This reverts commit e3a9e65236b3212128fdafaa9adc6d8b22d81ecc.
---
 lib/cast.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cast.js b/lib/cast.js
index 8eea0e0303e..690c412a7a7 100644
--- a/lib/cast.js
+++ b/lib/cast.js
@@ -65,7 +65,7 @@ module.exports = function cast(schema, obj, options, context) {
       if (!Array.isArray(val)) {
         throw new CastError('Array', val, path);
       }
-      for (let k = 0; k < val.length; ++k) {
+      for (let k = val.length - 1; k >= 0; k--) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }

From 06839fa380c696a74abc0d5850e0310ca0a5a6d2 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sat, 17 Aug 2024 11:58:26 -0400
Subject: [PATCH 007/191] fix(connection): avoid returning `readyState =
 connected` if connection state is stale

Fix #14727
---
 lib/connection.js                             |  9 +++++++++
 lib/drivers/node-mongodb-native/connection.js | 15 +++++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/lib/connection.js b/lib/connection.js
index 6e52d6ca4a0..b4787d6ed3a 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -103,6 +103,15 @@ Object.setPrototypeOf(Connection.prototype, EventEmitter.prototype);
 
 Object.defineProperty(Connection.prototype, 'readyState', {
   get: function() {
+    // If connection thinks it is connected, but we haven't received a heartbeat in 2 heartbeat intervals,
+    // that likely means the connection is stale (potentially due to frozen AWS Lambda container)
+    if (
+      this._readyState === STATES.connected &&
+      this._lastHeartbeatAt != null &&
+      typeof this.client?.topology?.s?.description?.heartbeatFrequencyMS === 'number' &&
+      Date.now() - this._lastHeartbeatAt >= this.client.topology.s.description.heartbeatFrequencyMS * 2) {
+      return STATES.disconnected;
+    }
     return this._readyState;
   },
   set: function(val) {
diff --git a/lib/drivers/node-mongodb-native/connection.js b/lib/drivers/node-mongodb-native/connection.js
index 6a164bca8b3..9286429c022 100644
--- a/lib/drivers/node-mongodb-native/connection.js
+++ b/lib/drivers/node-mongodb-native/connection.js
@@ -23,6 +23,11 @@ const utils = require('../../utils');
 function NativeConnection() {
   MongooseConnection.apply(this, arguments);
   this._listening = false;
+  // Tracks the last time (as unix timestamp) the connection received a
+  // serverHeartbeatSucceeded or serverHeartbeatFailed event from the underlying MongoClient.
+  // If we haven't received one in a while (like due to a frozen AWS Lambda container) then
+  // `readyState` is likely stale.
+  this._lastHeartbeatAt = null;
 }
 
 /**
@@ -106,6 +111,7 @@ NativeConnection.prototype.useDb = function(name, options) {
       _opts.noListener = options.noListener;
     }
     newConn.db = _this.client.db(name, _opts);
+    newConn._lastHeartbeatAt = _this._lastHeartbeatAt;
     newConn.onOpen();
   }
 
@@ -409,6 +415,12 @@ function _setClient(conn, client, options, dbName) {
       }
     });
   }
+  client.on('serverHeartbeatSucceeded', () => {
+    conn._lastHeartbeatAt = Date.now();
+  });
+  client.on('serverHeartbeatFailed', () => {
+    conn._lastHeartbeatAt = Date.now();
+  });
 
   if (options.monitorCommands) {
     client.on('commandStarted', (data) => conn.emit('commandStarted', data));
@@ -417,6 +429,9 @@ function _setClient(conn, client, options, dbName) {
   }
 
   conn.onOpen();
+  if (client.topology?.s?.state === 'connected') {
+    conn._lastHeartbeatAt = Date.now();
+  }
 
   for (const i in conn.collections) {
     if (utils.object.hasOwnProperty(conn.collections, i)) {

From f4ee4ae7e68a450aea08bec2ee51957ceaa3ca62 Mon Sep 17 00:00:00 2001
From: hasezoey <hasezoey@gmail.com>
Date: Wed, 21 Aug 2024 13:34:00 +0200
Subject: [PATCH 008/191] docs(middleware): update some more "remove" related
 notes

22f0722a217b69ed37caa905400f15a2a1cae889 was only partially updating everything related to "remove"
---
 docs/middleware.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/docs/middleware.md b/docs/middleware.md
index 433e1fb149d..0bd7e83cdc4 100644
--- a/docs/middleware.md
+++ b/docs/middleware.md
@@ -31,7 +31,6 @@ In document middleware functions, `this` refers to the document. To access the m
 
 * [validate](api/document.html#document_Document-validate)
 * [save](api/model.html#model_Model-save)
-* [remove](api/model.html#model_Model-remove)
 * [updateOne](api/document.html#document_Document-updateOne)
 * [deleteOne](api/model.html#model_Model-deleteOne)
 * [init](api/document.html#document_Document-init) (note: init hooks are [synchronous](#synchronous))
@@ -51,7 +50,6 @@ In query middleware functions, `this` refers to the query.
 * [findOneAndRemove](api/query.html#query_Query-findOneAndRemove)
 * [findOneAndReplace](api/query.html#query_Query-findOneAndReplace)
 * [findOneAndUpdate](api/query.html#query_Query-findOneAndUpdate)
-* [remove](api/model.html#model_Model-remove)
 * [replaceOne](api/query.html#query_Query-replaceOne)
 * [update](api/query.html#query_Query-update)
 * [updateOne](api/query.html#query_Query-updateOne)
@@ -86,7 +84,6 @@ Here are the possible strings that can be passed to `pre()`
 * findOneAndUpdate
 * init
 * insertMany
-* remove
 * replaceOne
 * save
 * update
@@ -382,11 +379,11 @@ Mongoose has both query and document hooks for `deleteOne()`.
 ```javascript
 schema.pre('deleteOne', function() { console.log('Removing!'); });
 
-// Does **not** print "Removing!". Document middleware for `remove` is not executed by default
+// Does **not** print "Removing!". Document middleware for `deleteOne` is not executed by default
 await doc.deleteOne();
 
 // Prints "Removing!"
-Model.remove();
+await Model.deleteOne();
 ```
 
 You can pass options to [`Schema.pre()`](api.html#schema_Schema-pre)
@@ -400,8 +397,8 @@ schema.pre('deleteOne', { document: true, query: false }, function() {
   console.log('Deleting doc!');
 });
 
-// Only query middleware. This will get called when you do `Model.remove()`
-// but not `doc.remove()`.
+// Only query middleware. This will get called when you do `Model.deleteOne()`
+// but not `doc.deleteOne()`.
 schema.pre('deleteOne', { query: true, document: false }, function() {
   console.log('Deleting!');
 });

From 98e4ae968a31be14691b47ffa3edc0326c586862 Mon Sep 17 00:00:00 2001
From: hasezoey <hasezoey@gmail.com>
Date: Wed, 21 Aug 2024 13:44:23 +0200
Subject: [PATCH 009/191] docs(subdocs): fix invalid header id link

---
 docs/subdocs.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/subdocs.md b/docs/subdocs.md
index 2c64ba96d98..0e80970a42d 100644
--- a/docs/subdocs.md
+++ b/docs/subdocs.md
@@ -38,7 +38,7 @@ doc.child;
 ```
 
 <ul class="toc">
-  <li><a href="#what-is-a-subdocument-">What is a Subdocument?</a></li>
+  <li><a href="#what-is-a-subdocument">What is a Subdocument?</a></li>
   <li><a href="#subdocuments-versus-nested-paths">Subdocuments versus Nested Paths</a></li>
   <li><a href="#subdocument-defaults">Subdocument Defaults</a></li>
   <li><a href="#finding-a-subdocument">Finding a Subdocument</a></li>

From 8ce32c05ae2ed88266a48094ddb120c3fd56cb60 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 28 Aug 2024 12:36:08 -0400
Subject: [PATCH 010/191] fix(model): throw error if `bulkSave()` did not
 insert or update any documents

Re: #14763
---
 lib/model.js       | 48 ++++++++++++++++++++++++++++++++--------------
 test/model.test.js | 25 ++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 14 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index e0270872155..b3c79564b87 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3364,11 +3364,18 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
 };
 
 /**
- *  takes an array of documents, gets the changes and inserts/updates documents in the database
- *  according to whether or not the document is new, or whether it has changes or not.
+ * Takes an array of documents, gets the changes and inserts/updates documents in the database
+ * according to whether or not the document is new, or whether it has changes or not.
  *
  * `bulkSave` uses `bulkWrite` under the hood, so it's mostly useful when dealing with many documents (10K+)
  *
+ * `bulkSave()` throws errors under the following conditions:
+ *
+ * - `bulkWrite()` fails (for example, due to being unable to connect to MongoDB or due to duplicate key error)
+ * - `bulkWrite()` did not insert or update any documents
+ *
+ * Note that `bulkSave()` will **not** throw an error if only some of the `save()` calls succeeded.
+ *
  * @param {Array<Document>} documents
  * @param {Object} [options] options passed to the underlying `bulkWrite()`
  * @param {Boolean} [options.timestamps] defaults to `null`, when set to false, mongoose will not add/update timestamps to the documents.
@@ -3376,7 +3383,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
  * @param {String|number} [options.w=1] The [write concern](https://www.mongodb.com/docs/manual/reference/write-concern/). See [`Query#w()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.w()) for more information.
  * @param {number} [options.wtimeout=null] The [write concern timeout](https://www.mongodb.com/docs/manual/reference/write-concern/#wtimeout).
  * @param {Boolean} [options.j=true] If false, disable [journal acknowledgement](https://www.mongodb.com/docs/manual/reference/write-concern/#j-option)
- *
+ * @return {BulkWriteResult} the return value from `bulkWrite()`
  */
 Model.bulkSave = async function bulkSave(documents, options) {
   options = options || {};
@@ -3404,18 +3411,31 @@ Model.bulkSave = async function bulkSave(documents, options) {
     (err) => ({ bulkWriteResult: null, bulkWriteError: err })
   );
 
-  await Promise.all(
-    documents.map(async(document) => {
-      const documentError = bulkWriteError && bulkWriteError.writeErrors.find(writeError => {
-        const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
-        return writeErrorDocumentId.toString() === document._doc._id.toString();
-      });
+  const matchedCount = bulkWriteResult?.matchedCount ?? 0;
+  const insertedCount = bulkWriteResult?.insertedCount ?? 0;
+  if (writeOperations.length > 0 && matchedCount + insertedCount === 0 && !bulkWriteError) {
+    throw new DocumentNotFoundError(
+      writeOperations.filter(op => op.updateOne).map(op => op.updateOne.filter),
+      this.modelName,
+      writeOperations.length,
+      bulkWriteResult
+    );
+  }
 
-      if (documentError == null) {
-        await handleSuccessfulWrite(document);
-      }
-    })
-  );
+  const successfulDocuments = [];
+  for (let i = 0; i < documents.length; i++) {
+    const document = documents[i];
+    const documentError = bulkWriteError && bulkWriteError.writeErrors.find(writeError => {
+      const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
+      return writeErrorDocumentId.toString() === document._doc._id.toString();
+    });
+
+    if (documentError == null) {
+      successfulDocuments.push(document);
+    }
+  }
+
+  await Promise.all(successfulDocuments.map(document => handleSuccessfulWrite(document)));
 
   if (bulkWriteError && bulkWriteError.writeErrors && bulkWriteError.writeErrors.length) {
     throw bulkWriteError;
diff --git a/test/model.test.js b/test/model.test.js
index 855f1eecb8f..6abf9548853 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -6939,6 +6939,31 @@ describe('Model', function() {
       assert.ok(err == null);
 
     });
+    it('should error if no documents were inserted (gh-14763)', async function() {
+      const fooSchema = new mongoose.Schema({
+        bar: { type: Number }
+      }, { optimisticConcurrency: true });
+      const TestModel = db.model('Test', fooSchema);
+
+      const foo = await TestModel.create({
+        bar: 0
+      });
+
+      // update 1
+      foo.bar = 1;
+      await foo.save();
+
+      // parallel update
+      const fooCopy = await TestModel.findById(foo._id);
+      fooCopy.bar = 99;
+      await fooCopy.save();
+
+      foo.bar = 2;
+      const err = await TestModel.bulkSave([foo]).then(() => null, err => err);
+      assert.equal(err.name, 'DocumentNotFoundError');
+      assert.equal(err.numAffected, 1);
+      assert.ok(Array.isArray(err.filter));
+    });
     it('Using bulkSave should not trigger an error (gh-11071)', async function() {
 
       const pairSchema = mongoose.Schema({

From b42be657de04b9ad2eb1b13fe74c67aee9a71448 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 28 Aug 2024 12:52:31 -0400
Subject: [PATCH 011/191] add test coverage and docs re: bulkSave() handling
 validation errors

---
 lib/model.js       |  3 ++-
 test/model.test.js | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index b3c79564b87..3891bef8a13 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3371,8 +3371,9 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
  *
  * `bulkSave()` throws errors under the following conditions:
  *
+ * - one of the provided documents fails validation. In this case, `bulkSave()` does not send a `bulkWrite()`, and throws the first validation error.
  * - `bulkWrite()` fails (for example, due to being unable to connect to MongoDB or due to duplicate key error)
- * - `bulkWrite()` did not insert or update any documents
+ * - `bulkWrite()` did not insert or update any documents. In this case, `bulkSave()` will throw a DocumentNotFound error.
  *
  * Note that `bulkSave()` will **not** throw an error if only some of the `save()` calls succeeded.
  *
diff --git a/test/model.test.js b/test/model.test.js
index 6abf9548853..b9d01e387fe 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -6939,7 +6939,7 @@ describe('Model', function() {
       assert.ok(err == null);
 
     });
-    it('should error if no documents were inserted (gh-14763)', async function() {
+    it('should error if no documents were inserted or updated (gh-14763)', async function() {
       const fooSchema = new mongoose.Schema({
         bar: { type: Number }
       }, { optimisticConcurrency: true });
@@ -6964,6 +6964,23 @@ describe('Model', function() {
       assert.equal(err.numAffected, 1);
       assert.ok(Array.isArray(err.filter));
     });
+    it('should error if there is a validation error', async function() {
+      const fooSchema = new mongoose.Schema({
+        bar: { type: Number }
+      }, { optimisticConcurrency: true });
+      const TestModel = db.model('Test', fooSchema);
+
+      const docs = [
+        new TestModel({ bar: 42 }),
+        new TestModel({ bar: 'taco' })
+      ];
+      const err = await TestModel.bulkSave(docs).then(() => null, err => err);
+      assert.equal(err.name, 'ValidationError');
+
+      // bulkSave() does not save any documents if any documents fail validation
+      const fromDb = await TestModel.find();
+      assert.equal(fromDb.length, 0);
+    });
     it('Using bulkSave should not trigger an error (gh-11071)', async function() {
 
       const pairSchema = mongoose.Schema({

From 0deb2347e685f6a728ba5b0d891d809ec947f257 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 28 Aug 2024 13:36:36 -0400
Subject: [PATCH 012/191] docs: highlight idSetter as a breaking change in
 changelog re:
 https://github.com/Automattic/mongoose/commit/32a84b7a65cca90c1355ce6cd218f89a92ce1e4d#commitcomment-145631235

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 978abc41b4f..467527ad57f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -297,7 +297,7 @@
 ==================
  * perf: speed up mapOfSubdocs benchmark by 4x by avoiding unnecessary O(n^2) loop in getPathsToValidate() #13614
  * feat: upgrade to MongoDB Node.js driver 5.7.0 #13591
- * feat: add `id` setter which allows modifying `_id` by setting `id` (Note this change was reverted in Mongoose 8) #13517
+ * BREAKING CHANGE: add `id` setter which allows modifying `_id` by setting `id` (Note this change was originally shipped as a `feat`, but later reverted in Mongoose 8 due to compatibility issues) #13517
  * feat: support generating custom cast error message with a function #13608 #3162
  * feat(query): support MongoDB driver's includeResultMetadata option for findOneAndUpdate #13584 #13539
  * feat(connection): add Connection.prototype.removeDb() for removing a related connection #13580 #11821

From f87c8110a1b0e2ada22e74a01e46b6f912e3424d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 11:41:05 -0400
Subject: [PATCH 013/191] fix(document): avoid unnecessary clone() in
 `applyGetters()` that was triggering additional getters

Fix #14840
Fix #14835
Re: #14724
---
 lib/document.js      | 14 +++++++-------
 lib/helpers/clone.js |  5 -----
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/lib/document.js b/lib/document.js
index f6a6016c72e..129d59d7bca 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -3856,7 +3856,6 @@ Document.prototype.$toObject = function(options, json) {
   // Parent options should only bubble down for subdocuments, not populated docs
   options._parentOptions = this.$isSubdocument ? options : null;
 
-  options._skipSingleNestedGetters = false;
   // remember the root transform function
   // to save it from being overwritten by sub-transform functions
   // const originalTransform = options.transform;
@@ -3870,13 +3869,13 @@ Document.prototype.$toObject = function(options, json) {
     ret = clone(this._doc, options) || {};
   }
 
-  options._skipSingleNestedGetters = true;
   const getters = options._calledWithOptions.getters
     ?? options.getters
     ?? defaultOptions.getters
     ?? false;
+
   if (getters) {
-    applyGetters(this, ret, options);
+    applyGetters(this, ret);
 
     if (options.minimize) {
       ret = minimize(ret) || {};
@@ -4187,12 +4186,11 @@ function applyVirtuals(self, json, options, toObjectOptions) {
  *
  * @param {Document} self
  * @param {Object} json
- * @param {Object} [options]
  * @return {Object} `json`
  * @api private
  */
 
-function applyGetters(self, json, options) {
+function applyGetters(self, json) {
   const schema = self.$__schema;
   const paths = Object.keys(schema.paths);
   let i = paths.length;
@@ -4228,8 +4226,10 @@ function applyGetters(self, json, options) {
       if (branch != null && typeof branch !== 'object') {
         break;
       } else if (ii === last) {
-        const val = self.$get(path);
-        branch[part] = clone(val, options);
+        branch[part] = schema.paths[path].applyGetters(
+          branch[part],
+          self
+        );
         if (Array.isArray(branch[part]) && schema.paths[path].$embeddedSchemaType) {
           for (let i = 0; i < branch[part].length; ++i) {
             branch[part][i] = schema.paths[path].$embeddedSchemaType.applyGetters(
diff --git a/lib/helpers/clone.js b/lib/helpers/clone.js
index b0e37f6cfba..09204b8c8a4 100644
--- a/lib/helpers/clone.js
+++ b/lib/helpers/clone.js
@@ -40,11 +40,6 @@ function clone(obj, options, isArrayChild) {
 
   if (isMongooseObject(obj)) {
     if (options) {
-      // Single nested subdocs should apply getters later in `applyGetters()`
-      // when calling `toObject()`. See gh-7442, gh-8295
-      if (options._skipSingleNestedGetters && obj.$isSingleNested) {
-        options._calledWithOptions = Object.assign({}, options._calledWithOptions || {}, { getters: false });
-      }
       if (options.retainDocuments && obj.$__ != null) {
         const clonedDoc = obj.$clone();
         if (obj.__index != null) {

From 6356c5bd1421504e31088ba91eb485df6ad63eec Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 11:45:42 -0400
Subject: [PATCH 014/191] test: add test case for #14840

---
 test/document.test.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/document.test.js b/test/document.test.js
index 938b76a443c..c9d842f1b9a 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13843,6 +13843,36 @@ describe('document', function() {
     assert.strictEqual(requiredCalls[0], doc.config.prop);
     assert.strictEqual(requiredCalls[1], doc.config.prop);
   });
+
+  it('applies toObject() getters to 3 level deep subdocuments (gh-14840) (gh-14835)', async function() {
+    // Define nested schemas
+    const Level3Schema = new mongoose.Schema({
+      property: {
+        type: String,
+        get: (value) => value ? value.toUpperCase() : value
+      }
+    });
+
+    const Level2Schema = new mongoose.Schema({ level3: Level3Schema });
+    const Level1Schema = new mongoose.Schema({ level2: Level2Schema });
+    const MainSchema = new mongoose.Schema({ level1: Level1Schema });
+    const MainModel = db.model('Test', MainSchema);
+
+    const doc = await MainModel.create({
+      level1: {
+        level2: {
+          level3: {
+            property: 'testValue'
+          }
+        }
+      }
+    });
+
+    // Fetch and convert the document to an object with getters applied
+    const result = await MainModel.findById(doc._id);
+    const objectWithGetters = result.toObject({ getters: true, virtuals: false });
+    assert.strictEqual(objectWithGetters.level1.level2.level3.property, 'TESTVALUE');
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {

From c52f9e78ed5649f4a608adf26e0ffd3fbbe436dd Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 11:50:41 -0400
Subject: [PATCH 015/191] types(query): add $expr to RootQuerySelector

Fix #14841
Re: #14764
---
 test/types/queries.test.ts | 6 ++++++
 types/query.d.ts           | 1 +
 2 files changed, 7 insertions(+)

diff --git a/test/types/queries.test.ts b/test/types/queries.test.ts
index 5396f384cad..cafb98949cf 100644
--- a/test/types/queries.test.ts
+++ b/test/types/queries.test.ts
@@ -672,3 +672,9 @@ async function gh14545() {
   const myProjection = await M.findOne({}).select<SlimTest>({ prop: 1 }).exec();
   expectType<SlimTestDocument | null>(myProjection);
 }
+
+function gh14841() {
+  const filter: FilterQuery<{ owners: string[] }> = {
+    $expr: { $lt: [{ $size: "$owners" }, 10] },
+  };
+}
\ No newline at end of file
diff --git a/types/query.d.ts b/types/query.d.ts
index 572ec33e1df..0df0388c3d4 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -116,6 +116,7 @@ declare module 'mongoose' {
     $where?: string | Function;
     /** @see https://www.mongodb.com/docs/manual/reference/operator/query/comment/#op._S_comment */
     $comment?: string;
+    $expr?: Record<string, any>;
     // we could not find a proper TypeScript generic to support nested queries e.g. 'user.friends.name'
     // this will mark all unrecognized properties as any (including nested queries) only if
     // they include a "." (to avoid generically allowing any unexpected keys)

From 47950f42d559c18a6b9b6fb5445098ee12df955e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 15:23:30 -0400
Subject: [PATCH 016/191] style: fix lint

---
 test/types/queries.test.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/types/queries.test.ts b/test/types/queries.test.ts
index cafb98949cf..02998362434 100644
--- a/test/types/queries.test.ts
+++ b/test/types/queries.test.ts
@@ -675,6 +675,6 @@ async function gh14545() {
 
 function gh14841() {
   const filter: FilterQuery<{ owners: string[] }> = {
-    $expr: { $lt: [{ $size: "$owners" }, 10] },
+    $expr: { $lt: [{ $size: '$owners' }, 10] }
   };
-}
\ No newline at end of file
+}

From 8667bdbd6f14cf2c10913ca1dc09261a22844069 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 16:23:31 -0400
Subject: [PATCH 017/191] fix(cursor): throw error in ChangeStream constructor
 if `changeStreamThunk()` throws a sync error

---
 lib/cursor/changeStream.js | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/lib/cursor/changeStream.js b/lib/cursor/changeStream.js
index 55cdecfcdc2..508dd6e0a31 100644
--- a/lib/cursor/changeStream.js
+++ b/lib/cursor/changeStream.js
@@ -33,19 +33,34 @@ class ChangeStream extends EventEmitter {
       );
     }
 
+    let syncError = null;
     this.$driverChangeStreamPromise = new Promise((resolve, reject) => {
       // This wrapper is necessary because of buffering.
-      changeStreamThunk((err, driverChangeStream) => {
-        if (err != null) {
-          this.emit('error', err);
-          return reject(err);
-        }
+      try {
+        changeStreamThunk((err, driverChangeStream) => {
+          if (err != null) {
+            this.emit('error', err);
+            return reject(err);
+          }
 
-        this.driverChangeStream = driverChangeStream;
-        this.emit('ready');
-        resolve();
-      });
+          this.driverChangeStream = driverChangeStream;
+          this.emit('ready');
+          resolve();
+        });
+      } catch (err) {
+        syncError = err;
+        this.emit('error', err);
+        reject(err);
+      }
     });
+
+    // Because a ChangeStream is an event emitter, there's no way to register an 'error' handler
+    // that catches errors which occur in the constructor, unless we force sync errors into async
+    // errors with setImmediate(). For cleaner stack trace, we just immediately throw any synchronous
+    // errors that occurred with changeStreamThunk().
+    if (syncError != null) {
+      throw syncError;
+    }
   }
 
   _bindEvents() {

From 9fa956fa6a03b2cc2231acc887c0084286da53ea Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 29 Aug 2024 16:32:50 -0400
Subject: [PATCH 018/191] throw error if calling methods on change stream that
 errored out

---
 lib/cursor/changeStream.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/lib/cursor/changeStream.js b/lib/cursor/changeStream.js
index 508dd6e0a31..b41e2379e83 100644
--- a/lib/cursor/changeStream.js
+++ b/lib/cursor/changeStream.js
@@ -5,6 +5,7 @@
  */
 
 const EventEmitter = require('events').EventEmitter;
+const MongooseError = require('../error/mongooseError');
 
 /*!
  * ignore
@@ -25,6 +26,7 @@ class ChangeStream extends EventEmitter {
     this.bindedEvents = false;
     this.pipeline = pipeline;
     this.options = options;
+    this.errored = false;
 
     if (options && options.hydrate && !options.model) {
       throw new Error(
@@ -39,6 +41,7 @@ class ChangeStream extends EventEmitter {
       try {
         changeStreamThunk((err, driverChangeStream) => {
           if (err != null) {
+            this.errored = true;
             this.emit('error', err);
             return reject(err);
           }
@@ -49,6 +52,7 @@ class ChangeStream extends EventEmitter {
         });
       } catch (err) {
         syncError = err;
+        this.errored = true;
         this.emit('error', err);
         reject(err);
       }
@@ -107,10 +111,16 @@ class ChangeStream extends EventEmitter {
   }
 
   hasNext(cb) {
+    if (this.errored) {
+      throw new MongooseError('Cannot call hasNext() on errored ChangeStream');
+    }
     return this.driverChangeStream.hasNext(cb);
   }
 
   next(cb) {
+    if (this.errored) {
+      throw new MongooseError('Cannot call next() on errored ChangeStream');
+    }
     if (this.options && this.options.hydrate) {
       if (cb != null) {
         const originalCb = cb;
@@ -141,16 +151,25 @@ class ChangeStream extends EventEmitter {
   }
 
   addListener(event, handler) {
+    if (this.errored) {
+      throw new MongooseError('Cannot call addListener() on errored ChangeStream');
+    }
     this._bindEvents();
     return super.addListener(event, handler);
   }
 
   on(event, handler) {
+    if (this.errored) {
+      throw new MongooseError('Cannot call on() on errored ChangeStream');
+    }
     this._bindEvents();
     return super.on(event, handler);
   }
 
   once(event, handler) {
+    if (this.errored) {
+      throw new MongooseError('Cannot call once() on errored ChangeStream');
+    }
     this._bindEvents();
     return super.once(event, handler);
   }

From 3aa85eec5389a64850d05272851301d7bae803a0 Mon Sep 17 00:00:00 2001
From: Makhoul Shbeeb <makhoulshbeeb@gmail.com>
Date: Fri, 30 Aug 2024 18:29:53 +0300
Subject: [PATCH 019/191] Update populate.md to fix missing match: { }

---
 docs/populate.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/populate.md b/docs/populate.md
index 0a24878d68d..1f9d6cdfd41 100644
--- a/docs/populate.md
+++ b/docs/populate.md
@@ -246,7 +246,7 @@ the story's `author` will be `null`.
 ```javascript
 const story = await Story.
   findOne({ title: 'Casino Royale' }).
-  populate({ path: 'author', name: { $ne: 'Ian Fleming' } }).
+  populate({ path: 'author', match: { name: { $ne: 'Ian Fleming' } } }).
   exec();
 story.author; // `null`
 ```

From fed4c86cee54a32186186a5477183aba4144095d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 23:20:42 +0000
Subject: [PATCH 020/191] chore(deps-dev): bump cheerio from 1.0.0-rc.12 to
 1.0.0

Bumps [cheerio](https://github.com/cheeriojs/cheerio) from 1.0.0-rc.12 to 1.0.0.
- [Release notes](https://github.com/cheeriojs/cheerio/releases)
- [Commits](https://github.com/cheeriojs/cheerio/compare/v1.0.0-rc.12...v1.0.0)

---
updated-dependencies:
- dependency-name: cheerio
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb38af3ed03..5959bc28b8e 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "babel-loader": "8.2.5",
     "broken-link-checker": "^0.7.8",
     "buffer": "^5.6.0",
-    "cheerio": "1.0.0-rc.12",
+    "cheerio": "1.0.0",
     "crypto-browserify": "3.12.0",
     "dotenv": "16.4.5",
     "dox": "1.0.0",

From e36fb8d7f1c2b9993010b545be8b93de5faf7321 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 23:20:54 +0000
Subject: [PATCH 021/191] chore(deps-dev): bump marked from 14.0.0 to 14.1.0

Bumps [marked](https://github.com/markedjs/marked) from 14.0.0 to 14.1.0.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v14.0.0...v14.1.0)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb38af3ed03..f76a74fc42d 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "^0.13.0",
-    "marked": "14.0.0",
+    "marked": "14.1.0",
     "mkdirp": "^3.0.1",
     "mocha": "10.7.0",
     "moment": "2.30.1",

From d187a8d2b15f02a7083f0c4419a56eb176f96079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 23:21:14 +0000
Subject: [PATCH 022/191] chore(deps-dev): bump @babel/preset-env from 7.25.3
 to 7.25.4

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.25.3 to 7.25.4.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.25.4/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb38af3ed03..4a37e79ca3e 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.24.7",
-    "@babel/preset-env": "7.25.3",
+    "@babel/preset-env": "7.25.4",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
     "acquit": "1.3.0",

From 40623bbec0aec1a622b562af9a731fe5f1306c75 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 1 Sep 2024 23:21:25 +0000
Subject: [PATCH 023/191] chore(deps-dev): bump mocha from 10.7.0 to 10.7.3

Bumps [mocha](https://github.com/mochajs/mocha) from 10.7.0 to 10.7.3.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v10.7.0...v10.7.3)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eb38af3ed03..3867fa2cc6c 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "markdownlint-cli2": "^0.13.0",
     "marked": "14.0.0",
     "mkdirp": "^3.0.1",
-    "mocha": "10.7.0",
+    "mocha": "10.7.3",
     "moment": "2.30.1",
     "mongodb-memory-server": "10.0.0",
     "ncp": "^2.0.0",

From ca98dd2ce0c59d8b5c1d74f8c05476b07f27f8c3 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 2 Sep 2024 21:13:25 -0400
Subject: [PATCH 024/191] chore: bump docs workflows to node v20 for cheerio@1

---
 .github/workflows/documentation.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 0f9f032ac21..4a5073066c9 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
 
@@ -54,7 +54,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
-          node-version: 16
+          node-version: 20
 
       - run: npm install
       - name: Setup MongoDB

From adebecc041a7c99e7fef2378142b137ed2d97239 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 3 Sep 2024 01:15:19 +0000
Subject: [PATCH 025/191] chore(deps-dev): bump
 @typescript-eslint/eslint-plugin

Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 6.21.0 to 8.4.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v8.4.0/packages/eslint-plugin)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/eslint-plugin"
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 87963b7863c..c98f659fe54 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@babel/core": "7.24.7",
     "@babel/preset-env": "7.25.4",
-    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^6.21.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",

From 591c9ff0243dd9b75b46b1a06d47d89ab109d94b Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 2 Sep 2024 21:17:16 -0400
Subject: [PATCH 026/191] chore: bump typescript eslint parser

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c98f659fe54..0ee1b5704d2 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "@babel/core": "7.24.7",
     "@babel/preset-env": "7.25.4",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
-    "@typescript-eslint/parser": "^6.21.0",
+    "@typescript-eslint/parser": "^8.4.0",
     "acquit": "1.3.0",
     "acquit-ignore": "0.2.1",
     "acquit-require": "0.1.1",

From fe24bf46775f0f8a4a5bb81521eab98fe29daa1f Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 2 Sep 2024 21:32:00 -0400
Subject: [PATCH 027/191] chore: fix new lint issues

---
 .eslintrc.js | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1bf13a95d2c..b4d7d1652d9 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -56,29 +56,15 @@ module.exports = {
         '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/no-unused-vars': 'off',
         '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/indent': [
-          'warn',
-          2,
-          {
-            SwitchCase: 1,
-            ignoredNodes: ['TSTypeParameterInstantiation']
-          }
-        ],
         '@typescript-eslint/prefer-optional-chain': 'error',
-        '@typescript-eslint/brace-style': 'error',
         '@typescript-eslint/no-dupe-class-members': 'error',
         '@typescript-eslint/no-redeclare': 'error',
-        '@typescript-eslint/type-annotation-spacing': 'error',
-        '@typescript-eslint/object-curly-spacing': [
-          'error',
-          'always'
-        ],
-        '@typescript-eslint/semi': 'error',
-        '@typescript-eslint/space-before-function-paren': [
-          'error',
-          'never'
-        ],
-        '@typescript-eslint/space-infix-ops': 'off'
+        '@typescript-eslint/space-infix-ops': 'off',
+        '@typescript-eslint/no-require-imports': 'off',
+        '@typescript-eslint/no-empty-object-type': 'off',
+        '@typescript-eslint/no-wrapper-object-types': 'off',
+        '@typescript-eslint/no-unused-expressions': 'off',
+        '@typescript-eslint/no-unsafe-function-type': 'off'
       }
     },
     {

From 5b40f1b413fa9754163da83c9fcfb0bd79245b33 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 3 Sep 2024 09:40:13 -0400
Subject: [PATCH 028/191] Update lib/model.js

Co-authored-by: Hafez <a.hafez852@gmail.com>
---
 lib/model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 3891bef8a13..e567ea5d1c8 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3373,7 +3373,7 @@ Model.bulkWrite = async function bulkWrite(ops, options) {
  *
  * - one of the provided documents fails validation. In this case, `bulkSave()` does not send a `bulkWrite()`, and throws the first validation error.
  * - `bulkWrite()` fails (for example, due to being unable to connect to MongoDB or due to duplicate key error)
- * - `bulkWrite()` did not insert or update any documents. In this case, `bulkSave()` will throw a DocumentNotFound error.
+ * - `bulkWrite()` did not insert or update **any** documents. In this case, `bulkSave()` will throw a DocumentNotFound error.
  *
  * Note that `bulkSave()` will **not** throw an error if only some of the `save()` calls succeeded.
  *

From 090974f3815d8a8e027148392d515aaf04f7bf28 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 3 Sep 2024 11:43:02 -0400
Subject: [PATCH 029/191] fix(connection): avoid MaxListenersExceededWarning on
 multiple useDb() calls by avoiding using event emitters

Fix #14859
---
 lib/drivers/node-mongodb-native/connection.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/drivers/node-mongodb-native/connection.js b/lib/drivers/node-mongodb-native/connection.js
index 6a164bca8b3..505053da4fd 100644
--- a/lib/drivers/node-mongodb-native/connection.js
+++ b/lib/drivers/node-mongodb-native/connection.js
@@ -96,7 +96,7 @@ NativeConnection.prototype.useDb = function(name, options) {
   if (this.db && this._readyState === STATES.connected) {
     wireup();
   } else {
-    this.once('connected', wireup);
+    this._queue.push({ fn: wireup });
   }
 
   function wireup() {

From 088f97a121bad7d9a4b701baba2be40353f4d965 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 3 Sep 2024 12:06:41 -0400
Subject: [PATCH 030/191] chore: release 8.6.1

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef63a29ffc..671a766c3ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+8.6.1 / 2024-09-03
+==================
+ * fix(document): avoid unnecessary clone() in applyGetters() that was preventing getters from running on 3-level deep subdocuments #14844 #14840 #14835
+ * fix(model): throw error if bulkSave() did not insert or update any documents #14837 #14763
+ * fix(cursor): throw error in ChangeStream constructor if changeStreamThunk() throws a sync error #14846
+ * types(query): add $expr to RootQuerySelector #14845
+ * docs: update populate.md to fix missing match: { } #14847 [makhoulshbeeb](https://github.com/makhoulshbeeb)
+
 8.6.0 / 2024-08-28
 ==================
  * feat: upgrade mongodb -> 6.8.0, handle throwing error on closed cursor in Mongoose with `MongooseError` instead of `MongoCursorExhaustedError` #14813
diff --git a/package.json b/package.json
index 66df7c6c833..600a9dce470 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.6.0",
+  "version": "8.6.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 2fbb3b5459554f43bb317291ab598f59c4bebb42 Mon Sep 17 00:00:00 2001
From: Alejandro Torrado <aletorrado@gmail.com>
Date: Wed, 4 Sep 2024 10:03:20 -0300
Subject: [PATCH 031/191] Added the signal option to eachAsync typings

---
 types/cursor.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/types/cursor.d.ts b/types/cursor.d.ts
index 888dd04c79b..6554dc99f34 100644
--- a/types/cursor.d.ts
+++ b/types/cursor.d.ts
@@ -8,6 +8,7 @@ declare module 'mongoose' {
     parallel?: number;
     batchSize?: number;
     continueOnError?: boolean;
+    signal?: AbortSignal;
   }
 
   class Cursor<DocType = any, Options = never> extends stream.Readable {

From 350891cd5acd3b9694f217e667922a7763d1203a Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 5 Sep 2024 21:04:52 -0400
Subject: [PATCH 032/191] docs: add note explaining _queue to Connection
 constructor

---
 lib/connection.js         | 3 +++
 lib/cursor/queryCursor.js | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/connection.js b/lib/connection.js
index 6e52d6ca4a0..2e0caf5c592 100644
--- a/lib/connection.js
+++ b/lib/connection.js
@@ -71,6 +71,9 @@ function Connection(base) {
   } else {
     this.id = base.nextConnectionId;
   }
+
+  // Internal queue of objects `{ fn, ctx, args }` that Mongoose calls when this connection is successfully
+  // opened. In `onOpen()`, Mongoose calls every entry in `_queue` and empties the queue.
   this._queue = [];
 }
 
diff --git a/lib/cursor/queryCursor.js b/lib/cursor/queryCursor.js
index 6f00a316794..895919a739d 100644
--- a/lib/cursor/queryCursor.js
+++ b/lib/cursor/queryCursor.js
@@ -10,7 +10,7 @@ const eachAsync = require('../helpers/cursor/eachAsync');
 const helpers = require('../queryHelpers');
 const kareem = require('kareem');
 const immediate = require('../helpers/immediate');
-const { once } = require('node:events');
+const { once } = require('events');
 const util = require('util');
 
 /**

From c8f61d8b598771ffe67ef222a510176af8938d00 Mon Sep 17 00:00:00 2001
From: Ian Blair <ian@heydoc.co.uk>
Date: Fri, 6 Sep 2024 09:06:47 -0600
Subject: [PATCH 033/191] set merges deeply nested objects

---
 lib/document.js       |  2 +-
 test/document.test.js | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/document.js b/lib/document.js
index f6a6016c72e..e62d43511b7 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -1213,7 +1213,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
         this.$__setValue(path, null);
         cleanModifiedSubpaths(this, path);
       } else {
-        return this.$set(val, path, constructing);
+        return this.$set(val, path, constructing, options);
       }
 
       const keys = getKeysInSchemaOrder(this.$__schema, val, path);
diff --git a/test/document.test.js b/test/document.test.js
index 938b76a443c..59d117aab10 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -8177,6 +8177,38 @@ describe('document', function() {
     await person.save();
   });
 
+  it('set() merge option with double nested', async function () {
+    const PersonSchema = new Schema({
+      info: {
+        address: {
+          city: String,
+          country: { type: String, default: "UK" },
+          postcode: String
+        },
+      }
+    });
+
+    const Person = db.model('Person', PersonSchema);
+
+
+    const person = new Person({
+      info: {
+        address: {
+          country: "United States",
+          city: "New York"
+        },
+      }
+    });
+
+    const update = { info: { address: { postcode: "12H" } } };
+
+    person.set(update, undefined, { merge: true });
+  
+    assert.equal(person.info.address.city, "New York");
+    assert.equal(person.info.address.postcode, "12H");
+    assert.equal(person.info.address.country, "United States");
+  });
+
   it('setting single nested subdoc with timestamps (gh-8251)', async function() {
     const ActivitySchema = Schema({ description: String }, { timestamps: true });
     const RequestSchema = Schema({ activity: ActivitySchema });

From b6ab66f6bb5cf7864832d2a84832a518e3812304 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 6 Sep 2024 14:34:30 -0400
Subject: [PATCH 034/191] chore: release 6.13.1

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36d481adf2e..dcf3ad66899 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+6.13.1 / 2024-09-06
+===================
+ * fix: remove empty $and, $or, $not that were made empty by scrict mode #14749 #13086 [0x0a0d](https://github.com/0x0a0d)
+
 6.13.0 / 2024-06-06
 ===================
  * feat(model): add throwOnValidationError option for opting into getting MongooseBulkWriteError if all valid operations succeed in bulkWrite() and insertMany() #14599 #14587 #14572 #13410
diff --git a/package.json b/package.json
index bd1ab99dc29..cc8f15d7b29 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.13.0",
+  "version": "6.13.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 2c4b0d5bbb4c82c9f11322262802b4fced7cb220 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 6 Sep 2024 14:42:42 -0400
Subject: [PATCH 035/191] pin @sinonjs/fake-timers version for node 12

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index cc8f15d7b29..3d384ff5e11 100644
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
   "devDependencies": {
     "@babel/core": "7.20.12",
     "@babel/preset-env": "7.20.2",
+    "@sinonjs/fake-timers": "11.2.2",
     "@typescript-eslint/eslint-plugin": "5.50.0",
     "@typescript-eslint/parser": "5.50.0",
     "acquit": "1.3.0",

From fe1705628189f3f805ba6ba875a07fd6613bf0d0 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 6 Sep 2024 15:03:55 -0400
Subject: [PATCH 036/191] try fixing deno test

---
 test/query.toconstructor.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/query.toconstructor.test.js b/test/query.toconstructor.test.js
index b93c1afdecf..be31bf09d38 100644
--- a/test/query.toconstructor.test.js
+++ b/test/query.toconstructor.test.js
@@ -184,6 +184,7 @@ describe('Query:', function() {
       });
 
       const Test = db.model('Test', schema);
+      await Test.deleteMany({});
       const test = new Test({ name: 'Romero' });
       const Q = Test.findOne({}).toConstructor();
 

From c6af5ec7529a330d5bfb317778e22a3f72925d2a Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 9 Sep 2024 15:52:35 -0400
Subject: [PATCH 037/191] types: allow arbitrary keys in query filters again

Revert #14764
Fix #14863
Fix #14862
---
 test/types/models.test.ts | 28 +---------------------------
 types/query.d.ts          |  8 +++-----
 2 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/test/types/models.test.ts b/test/types/models.test.ts
index fbe411225f0..a99f6ffa020 100644
--- a/test/types/models.test.ts
+++ b/test/types/models.test.ts
@@ -216,7 +216,7 @@ function find() {
   Project.find({ name: 'Hello' });
 
   // just callback; this is no longer supported on .find()
-  expectError(Project.find((error: CallbackError, result: IProject[]) => console.log(error, result)));
+  Project.find((error: CallbackError, result: IProject[]) => console.log(error, result));
 
   // filter + projection
   Project.find({}, undefined);
@@ -977,29 +977,3 @@ function testWithLevel1NestedPaths() {
     'foo.one': string | null | undefined
   }>({} as Test2);
 }
-
-function gh14764TestFilterQueryRestrictions() {
-  const TestModel = model<{ validKey: number }>('Test', new Schema({}));
-  // A key not in the schema should be invalid
-  expectError(TestModel.find({ invalidKey: 0 }));
-  // A key not in the schema should be invalid for simple root operators
-  expectError(TestModel.find({ $and: [{ invalidKey: 0 }] }));
-
-  // Any "nested" keys should be valid
-  TestModel.find({ 'validKey.subkey': 0 });
-
-  // And deeply "nested" keys should be valid
-  TestModel.find({ 'validKey.deep.nested.key': 0 });
-  TestModel.find({ validKey: { deep: { nested: { key: 0 } } } });
-
-  // Any Query should be accepted as the root argument (due to merge support)
-  TestModel.find(TestModel.find());
-  // A Query should not be a valid type for a FilterQuery within an op like $and
-  expectError(TestModel.find({ $and: [TestModel.find()] }));
-
-  const id = new Types.ObjectId();
-  // Any ObjectId should be accepted as the root argument
-  TestModel.find(id);
-  // A ObjectId should not be a valid type for a FilterQuery within an op like $and
-  expectError(TestModel.find({ $and: [id] }));
-}
diff --git a/types/query.d.ts b/types/query.d.ts
index 0df0388c3d4..cb447f23c70 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -12,7 +12,7 @@ declare module 'mongoose' {
    */
   type RootFilterQuery<T> = FilterQuery<T> | Query<any, any> | Types.ObjectId;
 
-  type FilterQuery<T> ={
+  type FilterQuery<T> = {
     [P in keyof T]?: Condition<T[P]>;
   } & RootQuerySelector<T> & { _id?: Condition<string>; };
 
@@ -117,10 +117,8 @@ declare module 'mongoose' {
     /** @see https://www.mongodb.com/docs/manual/reference/operator/query/comment/#op._S_comment */
     $comment?: string;
     $expr?: Record<string, any>;
-    // we could not find a proper TypeScript generic to support nested queries e.g. 'user.friends.name'
-    // this will mark all unrecognized properties as any (including nested queries) only if
-    // they include a "." (to avoid generically allowing any unexpected keys)
-    [nestedSelector: `${string}.${string}`]: any;
+    // this will mark all unrecognized properties as any (including nested queries)
+    [key: string]: any;
   };
 
   interface QueryTimestampsConfig {

From 599dc13e9ef4b698ea68975eb36b0941f1bf91cf Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 9 Sep 2024 21:23:58 -0400
Subject: [PATCH 038/191] fix(transaction): avoid unnecessarily updating
 initial state in between transactions

---
 lib/plugins/trackTransaction.js |  7 -----
 test/docs/transactions.test.js  | 56 +++++++++++++++++++++++++++++++++
 test/document.test.js           | 22 ++++++-------
 3 files changed, 67 insertions(+), 18 deletions(-)

diff --git a/lib/plugins/trackTransaction.js b/lib/plugins/trackTransaction.js
index af5c7c84da4..857caac6044 100644
--- a/lib/plugins/trackTransaction.js
+++ b/lib/plugins/trackTransaction.js
@@ -27,13 +27,6 @@ module.exports = function trackTransaction(schema) {
       initialState.atomics = _getAtomics(this);
 
       session[sessionNewDocuments].set(this, initialState);
-    } else {
-      const state = session[sessionNewDocuments].get(this);
-
-      for (const path of Object.keys(this.$__.activePaths.getStatePaths('modify'))) {
-        state.modifiedPaths.add(path);
-      }
-      state.atomics = _getAtomics(this, state.atomics);
     }
   });
 };
diff --git a/test/docs/transactions.test.js b/test/docs/transactions.test.js
index de2ecfc9952..3dc4e33dbc7 100644
--- a/test/docs/transactions.test.js
+++ b/test/docs/transactions.test.js
@@ -565,6 +565,62 @@ describe('transactions', function() {
     assert.equal(i, 3);
   });
 
+  it('transaction() avoids duplicating atomic operations (gh-14848)', async function() {
+    db.deleteModel(/Test/);
+    // Define some schemas...
+    const subItemSchema = new mongoose.Schema(
+      { 
+        name: { type: String, required: true },
+      },
+      { _id: false }
+    );
+
+    const itemSchema = new mongoose.Schema(
+      {
+        name: { type: String, required: true },
+        subItems: { type: [subItemSchema], required: true },
+      },
+      { _id: false }
+    );
+
+    const schema = new mongoose.Schema({
+      items: { type: [itemSchema], required: true },
+    });
+
+    // ...and a model
+    const Test = db.model("Test", schema);
+
+
+    await Test.createCollection();
+    await Test.deleteMany({});
+
+    const { _id } = await Test.create({
+      items: [
+        { name: "test1", subItems: [{ name: "x1" }] },
+        { name: "test2", subItems: [{ name: "x2" }] },
+      ],
+    });
+    
+    let doc = await Test.findById(_id);
+    
+    doc.items.push({ name: "test3", subItems: [{ name: "x3" }] });    
+
+    let i = 0;
+    await db.transaction(async(session) => {
+      await doc.save({ session });
+      if (++i < 3) {
+        throw new mongoose.mongo.MongoServerError({
+          errorLabels: ['TransientTransactionError']
+        });
+      }
+    });
+
+    assert.equal(i, 3);
+    
+    doc = await Test.findById(_id);
+    assert.equal(doc.items.length, 3);
+  });
+
   it('doesnt apply schema write concern to transaction operations (gh-11382)', async function() {
     db.deleteModel(/Test/);
     const Test = db.model('Test', Schema({ status: String }, { writeConcern: { w: 'majority' } }));
diff --git a/test/document.test.js b/test/document.test.js
index d368246c133..6a5765fe116 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -8177,14 +8177,14 @@ describe('document', function() {
     await person.save();
   });
 
-  it('set() merge option with double nested', async function () {
+  it('set() merge option with double nested', async function() {
     const PersonSchema = new Schema({
       info: {
         address: {
           city: String,
-          country: { type: String, default: "UK" },
+          country: { type: String, default: 'UK' },
           postcode: String
-        },
+        }
       }
     });
 
@@ -8194,19 +8194,19 @@ describe('document', function() {
     const person = new Person({
       info: {
         address: {
-          country: "United States",
-          city: "New York"
-        },
+          country: 'United States',
+          city: 'New York'
+        }
       }
     });
 
-    const update = { info: { address: { postcode: "12H" } } };
+    const update = { info: { address: { postcode: '12H' } } };
 
     person.set(update, undefined, { merge: true });
-  
-    assert.equal(person.info.address.city, "New York");
-    assert.equal(person.info.address.postcode, "12H");
-    assert.equal(person.info.address.country, "United States");
+
+    assert.equal(person.info.address.city, 'New York');
+    assert.equal(person.info.address.postcode, '12H');
+    assert.equal(person.info.address.country, 'United States');
   });
 
   it('setting single nested subdoc with timestamps (gh-8251)', async function() {

From e13fc38e210fd0a2930e0d3d9f05c4be735b5365 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 9 Sep 2024 21:29:44 -0400
Subject: [PATCH 039/191] fix lint

---
 test/docs/transactions.test.js | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/test/docs/transactions.test.js b/test/docs/transactions.test.js
index 3dc4e33dbc7..2a63f07a984 100644
--- a/test/docs/transactions.test.js
+++ b/test/docs/transactions.test.js
@@ -567,28 +567,23 @@ describe('transactions', function() {
 
   it('transaction() avoids duplicating atomic operations (gh-14848)', async function() {
     db.deleteModel(/Test/);
-    // Define some schemas...
     const subItemSchema = new mongoose.Schema(
-      { 
-        name: { type: String, required: true },
+      {
+        name: { type: String, required: true }
       },
       { _id: false }
     );
-
     const itemSchema = new mongoose.Schema(
       {
         name: { type: String, required: true },
-        subItems: { type: [subItemSchema], required: true },
+        subItems: { type: [subItemSchema], required: true }
       },
       { _id: false }
     );
-
     const schema = new mongoose.Schema({
-      items: { type: [itemSchema], required: true },
+      items: { type: [itemSchema], required: true }
     });
-
-    // ...and a model
-    const Test = db.model("Test", schema);
+    const Test = db.model('Test', schema);
 
 
     await Test.createCollection();
@@ -596,14 +591,14 @@ describe('transactions', function() {
 
     const { _id } = await Test.create({
       items: [
-        { name: "test1", subItems: [{ name: "x1" }] },
-        { name: "test2", subItems: [{ name: "x2" }] },
-      ],
+        { name: 'test1', subItems: [{ name: 'x1' }] },
+        { name: 'test2', subItems: [{ name: 'x2' }] }
+      ]
     });
-    
+
     let doc = await Test.findById(_id);
-    
-    doc.items.push({ name: "test3", subItems: [{ name: "x3" }] });    
+
+    doc.items.push({ name: 'test3', subItems: [{ name: 'x3' }] });
 
     let i = 0;
     await db.transaction(async(session) => {
@@ -616,7 +611,7 @@ describe('transactions', function() {
     });
 
     assert.equal(i, 3);
-    
+
     doc = await Test.findById(_id);
     assert.equal(doc.items.length, 3);
   });

From 91788059603cd6da5ad31d388fc241f233df8c86 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 10:32:25 -0400
Subject: [PATCH 040/191] fix: backport #14870 to 6.x

---
 lib/document.js       |  2 +-
 test/document.test.js | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/lib/document.js b/lib/document.js
index e82d2e73b71..1e9cec2e87b 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -1224,7 +1224,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
         this.$__setValue(path, null);
         cleanModifiedSubpaths(this, path);
       } else {
-        return this.$set(val, path, constructing);
+        return this.$set(val, path, constructing, options);
       }
 
       const keys = getKeysInSchemaOrder(this.$__schema, val, path);
diff --git a/test/document.test.js b/test/document.test.js
index 2aa0b332e2f..cd3f67ff5df 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -8078,6 +8078,38 @@ describe('document', function() {
     await person.save();
   });
 
+  it('set() merge option with double nested', async function () {
+    const PersonSchema = new Schema({
+      info: {
+        address: {
+          city: String,
+          country: { type: String, default: "UK" },
+          postcode: String
+        },
+      }
+    });
+
+    const Person = db.model('Person', PersonSchema);
+
+
+    const person = new Person({
+      info: {
+        address: {
+          country: "United States",
+          city: "New York"
+        },
+      }
+    });
+
+    const update = { info: { address: { postcode: "12H" } } };
+
+    person.set(update, undefined, { merge: true });
+  
+    assert.equal(person.info.address.city, "New York");
+    assert.equal(person.info.address.postcode, "12H");
+    assert.equal(person.info.address.country, "United States");
+  });
+
   it('setting single nested subdoc with timestamps (gh-8251)', async function() {
     const ActivitySchema = Schema({ description: String }, { timestamps: true });
     const RequestSchema = Schema({ activity: ActivitySchema });

From 39105274123a5827169f6c8e91042db687c902e3 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 10:34:02 -0400
Subject: [PATCH 041/191] fix lint

---
 test/document.test.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/document.test.js b/test/document.test.js
index cd3f67ff5df..cf9d19d316c 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -8078,14 +8078,14 @@ describe('document', function() {
     await person.save();
   });
 
-  it('set() merge option with double nested', async function () {
+  it('set() merge option with double nested', async function() {
     const PersonSchema = new Schema({
       info: {
         address: {
           city: String,
-          country: { type: String, default: "UK" },
+          country: { type: String, default: 'UK' },
           postcode: String
-        },
+        }
       }
     });
 
@@ -8095,19 +8095,19 @@ describe('document', function() {
     const person = new Person({
       info: {
         address: {
-          country: "United States",
-          city: "New York"
-        },
+          country: 'United States',
+          city: 'New York'
+        }
       }
     });
 
-    const update = { info: { address: { postcode: "12H" } } };
+    const update = { info: { address: { postcode: '12H' } } };
 
     person.set(update, undefined, { merge: true });
-  
-    assert.equal(person.info.address.city, "New York");
-    assert.equal(person.info.address.postcode, "12H");
-    assert.equal(person.info.address.country, "United States");
+
+    assert.equal(person.info.address.city, 'New York');
+    assert.equal(person.info.address.postcode, '12H');
+    assert.equal(person.info.address.country, 'United States');
   });
 
   it('setting single nested subdoc with timestamps (gh-8251)', async function() {

From 53c8da1b57bb19603ac8131dbca26023ed0001c7 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 11:06:58 -0400
Subject: [PATCH 042/191] feat(SchemaType): add getEmbeddedSchemaType() method
 to SchemaTypes

Fix #8389
---
 lib/schemaType.js         | 18 ++++++++++++++++++
 test/schematype.test.js   |  9 +++++++++
 test/types/schema.test.ts |  7 +++++++
 types/schematypes.d.ts    |  3 +++
 4 files changed, 37 insertions(+)

diff --git a/lib/schemaType.js b/lib/schemaType.js
index f95ecbb3226..53cc8caedaf 100644
--- a/lib/schemaType.js
+++ b/lib/schemaType.js
@@ -1724,6 +1724,24 @@ SchemaType.prototype.clone = function() {
   return schematype;
 };
 
+/**
+ * Returns the embedded schema type, if any. For arrays, document arrays, and maps, `getEmbeddedSchemaType()`
+ * returns the schema type of the array's elements (or map's elements). For other types, `getEmbeddedSchemaType()`
+ * returns `undefined`.
+ *
+ * #### Example:
+ *
+ *     const schema = new Schema({ name: String, tags: [String] });
+ *     schema.path('name').getEmbeddedSchemaType(); // undefined
+ *     schema.path('tags').getEmbeddedSchemaType(); // SchemaString { path: 'tags', ... }
+ *
+ * @returns {SchemaType} embedded schematype
+ */
+
+SchemaType.prototype.getEmbeddedSchemaType = function getEmbeddedSchemaType() {
+  return this.$embeddedSchemaType;
+};
+
 /*!
  * Module exports.
  */
diff --git a/test/schematype.test.js b/test/schematype.test.js
index ad8367d0f61..725e21966a4 100644
--- a/test/schematype.test.js
+++ b/test/schematype.test.js
@@ -315,4 +315,13 @@ describe('schematype', function() {
       /password must be at least six characters/
     );
   });
+
+  it('supports getEmbeddedSchemaType() (gh-8389)', function() {
+    const schema = new Schema({ name: String, tags: [String] });
+    assert.strictEqual(schema.path('name').getEmbeddedSchemaType(), undefined);
+    const schemaType = schema.path('tags').getEmbeddedSchemaType();
+    assert.ok(schemaType);
+    assert.equal(schemaType.instance, 'String');
+    assert.equal(schemaType.path, 'tags');
+  });
 });
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index 04828bc4f17..a2164ddaa2e 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1634,3 +1634,10 @@ function gh14825() {
   type SchemaType = InferSchemaType<typeof schema>;
   expectAssignable<User>({} as SchemaType);
 }
+
+function gh8389() {
+  const schema = new Schema({ name: String, tags: [String] });
+
+  expectAssignable<SchemaType<any> | undefined>(schema.path('name').getEmbeddedSchemaType());
+  expectAssignable<SchemaType<any> | undefined>(schema.path('tags').getEmbeddedSchemaType());
+}
diff --git a/types/schematypes.d.ts b/types/schematypes.d.ts
index e8a0ecffdf0..1e270733e48 100644
--- a/types/schematypes.d.ts
+++ b/types/schematypes.d.ts
@@ -229,6 +229,9 @@ declare module 'mongoose' {
     /** Adds a getter to this schematype. */
     get(fn: Function): this;
 
+    /** Gets this SchemaType's embedded SchemaType, if any  */
+    getEmbeddedSchemaType<T = any, DocType = any>(): SchemaType<T, DocType> | undefined;
+
     /**
      * Defines this path as immutable. Mongoose prevents you from changing
      * immutable paths unless the parent document has [`isNew: true`](/docs/api/document.html#document_Document-isNew).

From c7f72739436acc09b46220aacd72274f0bb10f96 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 11:31:21 -0400
Subject: [PATCH 043/191] types: make SchemaType static `setters` property
 accessible in TypeScript

Fix #14879
---
 test/types/schema.test.ts | 4 ++++
 types/schematypes.d.ts    | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index 04828bc4f17..5a399a0c7db 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1634,3 +1634,7 @@ function gh14825() {
   type SchemaType = InferSchemaType<typeof schema>;
   expectAssignable<User>({} as SchemaType);
 }
+
+function gh14879() {
+  Schema.Types.String.setters.push((val?: unknown) => typeof val === 'string' ? val.trim() : val);
+}
diff --git a/types/schematypes.d.ts b/types/schematypes.d.ts
index e8a0ecffdf0..37e255443fc 100644
--- a/types/schematypes.d.ts
+++ b/types/schematypes.d.ts
@@ -216,6 +216,9 @@ declare module 'mongoose' {
     /** Attaches a getter for all instances of this schema type. */
     static get(getter: (value: any) => any): void;
 
+    /** Array containing default setters for all instances of this SchemaType */
+    static setters: Function[];
+
     /** The class that Mongoose uses internally to instantiate this SchemaType's `options` property. */
     OptionsConstructor: SchemaTypeOptions<T>;
 

From 180f5d9b5c1d6c7e5d187e121372f169b6f16a1f Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 12:09:48 -0400
Subject: [PATCH 044/191] type(inferrawdoctype): infer Date types as JS dates
 rather than Mongoose SchemaType Date

Fix #14839
---
 test/types/inferrawdoctype.test.ts | 25 +++++++++++++++++++++++++
 types/inferrawdoctype.d.ts         |  4 ++--
 types/inferschematype.d.ts         |  4 ++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 test/types/inferrawdoctype.test.ts

diff --git a/test/types/inferrawdoctype.test.ts b/test/types/inferrawdoctype.test.ts
new file mode 100644
index 00000000000..7d162b03975
--- /dev/null
+++ b/test/types/inferrawdoctype.test.ts
@@ -0,0 +1,25 @@
+import { InferRawDocType } from 'mongoose';
+import { expectType, expectError } from 'tsd';
+
+function gh14839() {
+  const schemaDefinition = {
+    email: {
+      type: String,
+      trim: true,
+      required: true,
+      unique: true,
+      lowercase: true
+    },
+    password: {
+      type: String,
+      required: true
+    },
+    dateOfBirth: {
+      type: Date,
+      required: true
+    }
+  };
+
+  type UserType = InferRawDocType< typeof schemaDefinition>;
+  expectType<{ email: string, password: string, dateOfBirth: Date }>({} as UserType);
+}
diff --git a/types/inferrawdoctype.d.ts b/types/inferrawdoctype.d.ts
index 5ef52e13251..605571057a0 100644
--- a/types/inferrawdoctype.d.ts
+++ b/types/inferrawdoctype.d.ts
@@ -91,8 +91,8 @@ declare module 'mongoose' {
             IfEquals<PathValueType, String> extends true ? PathEnumOrString<Options['enum']> :
               PathValueType extends NumberSchemaDefinition ? Options['enum'] extends ReadonlyArray<any> ? Options['enum'][number] : number :
                 IfEquals<PathValueType, Schema.Types.Number> extends true ? number :
-                  PathValueType extends DateSchemaDefinition ? Date :
-                    IfEquals<PathValueType, Schema.Types.Date> extends true ? Date :
+                  PathValueType extends DateSchemaDefinition ? NativeDate :
+                    IfEquals<PathValueType, Schema.Types.Date> extends true ? NativeDate :
                       PathValueType extends typeof Buffer | 'buffer' | 'Buffer' | typeof Schema.Types.Buffer ? Buffer :
                         PathValueType extends BooleanSchemaDefinition ? boolean :
                           IfEquals<PathValueType, Schema.Types.Boolean> extends true ? boolean :
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
index dbcb3ad851e..07ee5087b37 100644
--- a/types/inferschematype.d.ts
+++ b/types/inferschematype.d.ts
@@ -281,8 +281,8 @@ type ResolvePathType<PathValueType, Options extends SchemaTypeOptions<PathValueT
               IfEquals<PathValueType, String> extends true ? PathEnumOrString<Options['enum']> :
                 PathValueType extends NumberSchemaDefinition ? Options['enum'] extends ReadonlyArray<any> ? Options['enum'][number] : number :
                   IfEquals<PathValueType, Schema.Types.Number> extends true ? number :
-                    PathValueType extends DateSchemaDefinition ? Date :
-                      IfEquals<PathValueType, Schema.Types.Date> extends true ? Date :
+                    PathValueType extends DateSchemaDefinition ? NativeDate :
+                      IfEquals<PathValueType, Schema.Types.Date> extends true ? NativeDate :
                         PathValueType extends typeof Buffer | 'buffer' | 'Buffer' | typeof Schema.Types.Buffer ? Buffer :
                           PathValueType extends BooleanSchemaDefinition ? boolean :
                             IfEquals<PathValueType, Schema.Types.Boolean> extends true ? boolean :

From 5e0e36e387b6665cc40b8e9be525256f78b8ab30 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 10 Sep 2024 18:01:30 -0400
Subject: [PATCH 045/191] fix: depopulate if `push()` or `addToSet()` with an
 ObjectId on a populated array

Fix #1635
---
 lib/types/array/methods/index.js    | 26 ++++++++++++++++++++++++++
 test/model.populate.setting.test.js |  2 +-
 test/model.populate.test.js         | 26 ++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/lib/types/array/methods/index.js b/lib/types/array/methods/index.js
index cf31914bb7e..3322bbe56e8 100644
--- a/lib/types/array/methods/index.js
+++ b/lib/types/array/methods/index.js
@@ -410,6 +410,7 @@ const methods = {
 
   addToSet() {
     _checkManualPopulation(this, arguments);
+    _depopulateIfNecessary(this, arguments);
 
     const values = [].map.call(arguments, this._mapCast, this);
     const added = [];
@@ -691,6 +692,7 @@ const methods = {
     }
 
     _checkManualPopulation(this, values);
+    _depopulateIfNecessary(this, values);
 
     values = [].map.call(values, this._mapCast, this);
     let ret;
@@ -1009,6 +1011,30 @@ function _checkManualPopulation(arr, docs) {
   }
 }
 
+/*!
+ * If `docs` isn't all instances of the right model, depopulate `arr`
+ */
+
+function _depopulateIfNecessary(arr, docs) {
+  const ref = arr == null ?
+    null :
+    arr[arraySchemaSymbol] && arr[arraySchemaSymbol].caster && arr[arraySchemaSymbol].caster.options && arr[arraySchemaSymbol].caster.options.ref || null;
+  const parentDoc = arr[arrayParentSymbol];
+  const path = arr[arrayPathSymbol];
+  if (!ref || !parentDoc.populated(path)) {
+    return;
+  }
+  for (const doc of docs) {
+    if (doc == null) {
+      continue;
+    }
+    if (typeof doc !== 'object' || doc instanceof String || doc instanceof Number || doc instanceof Buffer || utils.isMongooseType(doc)) {
+      parentDoc.depopulate(path);
+      break;
+    }
+  }
+}
+
 const returnVanillaArrayMethods = [
   'filter',
   'flat',
diff --git a/test/model.populate.setting.test.js b/test/model.populate.setting.test.js
index bcf072e8d0c..d1c6700e044 100644
--- a/test/model.populate.setting.test.js
+++ b/test/model.populate.setting.test.js
@@ -152,7 +152,7 @@ describe('model: populate:', function() {
           assert.equal(doc.fans[6], null);
 
           const _id = construct[id]();
-          doc.fans.addToSet(_id);
+          doc.fans.addToSet({ _id });
           if (Buffer.isBuffer(_id)) {
             assert.equal(doc.fans[7]._id.toString('utf8'), _id.toString('utf8'));
           } else {
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
index 7f0fe844eb8..4807de6f118 100644
--- a/test/model.populate.test.js
+++ b/test/model.populate.test.js
@@ -11131,4 +11131,30 @@ describe('model: populate:', function() {
     }
     assert.equal(posts.length, 2);
   });
+
+  it('depopulates if pushing ObjectId to a populated array (gh-1635)', async function() {
+    const ParentModel = db.model('Test', mongoose.Schema({
+      name: String,
+      children: [{ type: 'ObjectId', ref: 'Child' }]
+    }));
+    const ChildModel = db.model('Child', mongoose.Schema({ name: String }));
+
+    const children = await ChildModel.create([{ name: 'Luke' }, { name: 'Leia' }]);
+    const newChild = await ChildModel.create({ name: 'Taco' });
+    const { _id } = await ParentModel.create({ name: 'Anakin', children });
+
+    const doc = await ParentModel.findById(_id).populate('children');
+    doc.children.push(newChild._id);
+
+    assert.ok(doc.children[0] instanceof mongoose.Types.ObjectId);
+    assert.ok(doc.children[1] instanceof mongoose.Types.ObjectId);
+    assert.ok(doc.children[2] instanceof mongoose.Types.ObjectId);
+
+    await doc.save();
+
+    const fromDb = await ParentModel.findById(_id);
+    assert.equal(fromDb.children[0].toHexString(), children[0]._id.toHexString());
+    assert.equal(fromDb.children[1].toHexString(), children[1]._id.toHexString());
+    assert.equal(fromDb.children[2].toHexString(), newChild._id.toHexString());
+  });
 });

From 9b91a6f46f1ce203e7b95a6840f5fd18445a1977 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 11 Sep 2024 11:34:16 -0400
Subject: [PATCH 046/191] Update lib/schemaType.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/schemaType.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/schemaType.js b/lib/schemaType.js
index 53cc8caedaf..e5aa476468f 100644
--- a/lib/schemaType.js
+++ b/lib/schemaType.js
@@ -1736,6 +1736,7 @@ SchemaType.prototype.clone = function() {
  *     schema.path('tags').getEmbeddedSchemaType(); // SchemaString { path: 'tags', ... }
  *
  * @returns {SchemaType} embedded schematype
+ * @api public
  */
 
 SchemaType.prototype.getEmbeddedSchemaType = function getEmbeddedSchemaType() {

From 60541e7480ac4ce2b3d69cc7a5f41e1d3322385e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 11 Sep 2024 11:45:38 -0400
Subject: [PATCH 047/191] types: add function args to setters property

---
 types/schematypes.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/schematypes.d.ts b/types/schematypes.d.ts
index 37e255443fc..f5ca8ec0da9 100644
--- a/types/schematypes.d.ts
+++ b/types/schematypes.d.ts
@@ -217,7 +217,7 @@ declare module 'mongoose' {
     static get(getter: (value: any) => any): void;
 
     /** Array containing default setters for all instances of this SchemaType */
-    static setters: Function[];
+    static setters: ((val?: unknown, priorVal?: unknown, doc?: Document<unknown>, options?: Record<string, any> | null) => unknown)[];
 
     /** The class that Mongoose uses internally to instantiate this SchemaType's `options` property. */
     OptionsConstructor: SchemaTypeOptions<T>;

From edc7dde5057eacb3b3e8737d3192c6d432fa0fb1 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 11 Sep 2024 11:58:18 -0400
Subject: [PATCH 048/191] docs(populate): add note about depopulating array
 when pushing objectid

---
 docs/populate.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/populate.md b/docs/populate.md
index 1f9d6cdfd41..c17710a397a 100644
--- a/docs/populate.md
+++ b/docs/populate.md
@@ -119,6 +119,33 @@ story.author = author;
 console.log(story.author.name); // prints "Ian Fleming"
 ```
 
+You can also push documents or POJOs onto a populated array, and Mongoose will add those documents if their `ref` matches.
+
+```javascript
+const fan1 = await Person.create({ name: 'Sean' });
+await Story.updateOne({ title: 'Casino Royale' }, { $push: { fans: { $each: [fan1._id] } } });
+
+const story = await Story.findOne({ title: 'Casino Royale' }).populate('fans');
+story.fans[0].name; // 'Sean'
+
+const fan2 = await Person.create({ name: 'George' });
+story.fans.push(fan2);
+story.fans[1].name; // 'George'
+
+story.fans.push({ name: 'Roger' });
+story.fans[2].name; // 'Roger'
+```
+
+If you push a non-POJO and non-document value, like an ObjectId, Mongoose `>= 8.7.0` will depopulate the entire array.
+
+```javascript
+const fan4 = await Person.create({ name: 'Timothy' });
+story.fans.push(fan4._id); // Push the `_id`, not the full document
+
+story.fans[0].name; // undefined, `fans[0]` is now an ObjectId
+story.fans[0].toString() === fan1._id.toString(); // true
+```
+
 ## Checking Whether a Field is Populated {#checking-populated}
 
 You can call the `populated()` function to check whether a field is populated.

From 5716b040d2a17b551762467f566cae4888dc8077 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 11 Sep 2024 14:41:04 -0400
Subject: [PATCH 049/191] fix(model): throw MongooseBulkSaveIncompleteError if
 bulkSave() didn't completely succeed

Fix #14763
---
 lib/error/bulkSaveIncompleteError.js | 44 ++++++++++++++++++++++++++++
 lib/model.js                         |  8 ++---
 test/model.test.js                   | 32 ++++++++++++++++++--
 3 files changed, 77 insertions(+), 7 deletions(-)
 create mode 100644 lib/error/bulkSaveIncompleteError.js

diff --git a/lib/error/bulkSaveIncompleteError.js b/lib/error/bulkSaveIncompleteError.js
new file mode 100644
index 00000000000..c4b88e5d7bb
--- /dev/null
+++ b/lib/error/bulkSaveIncompleteError.js
@@ -0,0 +1,44 @@
+/*!
+ * Module dependencies.
+ */
+
+'use strict';
+
+const MongooseError = require('./mongooseError');
+
+
+/**
+ * If the underwriting `bulkWrite()` for `bulkSave()` succeeded, but wasn't able to update or
+ * insert all documents, we throw this error.
+ *
+ * @api private
+ */
+
+class MongooseBulkSaveIncompleteError extends MongooseError {
+  constructor(modelName, documents, bulkWriteResult) {
+    const matchedCount = bulkWriteResult?.matchedCount ?? 0;
+    const insertedCount = bulkWriteResult?.insertedCount ?? 0;
+    let preview = documents.map(doc => doc._id).join(', ');
+    if (preview.length > 100) {
+      preview = preview.slice(0, 100) + '...';
+    }
+
+    const numDocumentsNotUpdated = documents.length - matchedCount - insertedCount;
+    super(`${modelName}.bulkSave() was not able to update ${numDocumentsNotUpdated} of the given documents due to incorrect version or optimistic concurrency, document ids: ${preview}`);
+
+    this.modelName = modelName;
+    this.documents = documents;
+    this.bulkWriteResult = bulkWriteResult;
+    this.numDocumentsNotUpdated = numDocumentsNotUpdated;
+  }
+}
+
+Object.defineProperty(MongooseBulkSaveIncompleteError.prototype, 'name', {
+  value: 'MongooseBulkSaveIncompleteError'
+});
+
+/*!
+ * exports
+ */
+
+module.exports = MongooseBulkSaveIncompleteError;
diff --git a/lib/model.js b/lib/model.js
index 0a1091ab2bb..6d9458b5d77 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -64,6 +64,7 @@ const STATES = require('./connectionState');
 const util = require('util');
 const utils = require('./utils');
 const minimize = require('./helpers/minimize');
+const MongooseBulkSaveIncompleteError = require('./error/bulkSaveIncompleteError');
 
 const modelCollectionSymbol = Symbol('mongoose#Model#collection');
 const modelDbSymbol = Symbol('mongoose#Model#db');
@@ -3418,11 +3419,10 @@ Model.bulkSave = async function bulkSave(documents, options) {
 
   const matchedCount = bulkWriteResult?.matchedCount ?? 0;
   const insertedCount = bulkWriteResult?.insertedCount ?? 0;
-  if (writeOperations.length > 0 && matchedCount + insertedCount === 0 && !bulkWriteError) {
-    throw new DocumentNotFoundError(
-      writeOperations.filter(op => op.updateOne).map(op => op.updateOne.filter),
+  if (writeOperations.length > 0 && matchedCount + insertedCount < writeOperations.length && !bulkWriteError) {
+    throw new MongooseBulkSaveIncompleteError(
       this.modelName,
-      writeOperations.length,
+      documents,
       bulkWriteResult
     );
   }
diff --git a/test/model.test.js b/test/model.test.js
index 8e94a876694..1e531c097b5 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -6994,9 +6994,35 @@ describe('Model', function() {
 
       foo.bar = 2;
       const err = await TestModel.bulkSave([foo]).then(() => null, err => err);
-      assert.equal(err.name, 'DocumentNotFoundError');
-      assert.equal(err.numAffected, 1);
-      assert.ok(Array.isArray(err.filter));
+      assert.equal(err.name, 'MongooseBulkSaveIncompleteError');
+      assert.equal(err.numDocumentsNotUpdated, 1);
+    });
+    it('should error if not all documents were inserted or updated (gh-14763)', async function() {
+      const fooSchema = new mongoose.Schema({
+        bar: { type: Number }
+      }, { optimisticConcurrency: true });
+      const TestModel = db.model('Test', fooSchema);
+
+      const errorDoc = await TestModel.create({ bar: 0 });
+      const okDoc = await TestModel.create({ bar: 0 });
+
+      // update 1
+      errorDoc.bar = 1;
+      await errorDoc.save();
+
+      // parallel update
+      const errorDocCopy = await TestModel.findById(errorDoc._id);
+      errorDocCopy.bar = 99;
+      await errorDocCopy.save();
+
+      errorDoc.bar = 2;
+      okDoc.bar = 2;
+      const err = await TestModel.bulkSave([errorDoc, okDoc]).then(() => null, err => err);
+      assert.equal(err.name, 'MongooseBulkSaveIncompleteError');
+      assert.equal(err.numDocumentsNotUpdated, 1);
+
+      const updatedOkDoc = await TestModel.findById(okDoc._id);
+      assert.equal(updatedOkDoc.bar, 2);
     });
     it('should error if there is a validation error', async function() {
       const fooSchema = new mongoose.Schema({

From a50264b1e9287da612122d403bbe974d309dee96 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 11 Sep 2024 14:51:18 -0400
Subject: [PATCH 050/191] chore: release 8.6.2

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 671a766c3ed..a8082d463a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+8.6.2 / 2024-09-11
+==================
+ * fix: make set merge deeply nested objects #14870 #14861 [ianHeydoc](https://github.com/ianHeydoc)
+ * types: allow arbitrary keys in query filters again (revert #14764) #14874 #14863 #14862 #14842
+ * types: make SchemaType static setters property accessible in TypeScript #14881 #14879
+ * type(inferrawdoctype): infer Date types as JS dates rather than Mongoose SchemaType Date #14882 #14839
+
 8.6.1 / 2024-09-03
 ==================
  * fix(document): avoid unnecessary clone() in applyGetters() that was preventing getters from running on 3-level deep subdocuments #14844 #14840 #14835
diff --git a/package.json b/package.json
index 600a9dce470..48eb3eab36b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.6.1",
+  "version": "8.6.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 8d424a3d1f2604ffbed6ffac4b27da0f8e8eafe3 Mon Sep 17 00:00:00 2001
From: Sean Wong <wongsean@users.noreply.github.com>
Date: Thu, 12 Sep 2024 14:44:25 +0800
Subject: [PATCH 051/191] Fix missing `Aggregate` re-exports

---
 index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.js b/index.js
index 4f4fa8ebe03..6ebbd5fd5d3 100644
--- a/index.js
+++ b/index.js
@@ -28,6 +28,7 @@ module.exports.modelNames = mongoose.modelNames;
 module.exports.plugin = mongoose.plugin;
 module.exports.connections = mongoose.connections;
 module.exports.version = mongoose.version;
+module.exports.Aggregate = mongoose.Aggregate;
 module.exports.Mongoose = mongoose.Mongoose;
 module.exports.Schema = mongoose.Schema;
 module.exports.SchemaType = mongoose.SchemaType;

From becd799e7430ba3ff7be76c3dfdd9330bc1acfa6 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 12 Sep 2024 19:25:07 -0400
Subject: [PATCH 052/191] chore: release 6.13.2

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dcf3ad66899..4f6cc66bffe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+6.13.2 / 2024-09-12
+===================
+ * fix(document): make set() respect merge option on deeply nested objects #14870 #14878
+
 6.13.1 / 2024-09-06
 ===================
  * fix: remove empty $and, $or, $not that were made empty by scrict mode #14749 #13086 [0x0a0d](https://github.com/0x0a0d)
diff --git a/package.json b/package.json
index 3d384ff5e11..476d7371620 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.13.1",
+  "version": "6.13.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 01075919b1d6b49d3c96226284beaf145a6ca3f4 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 15 Sep 2024 13:52:19 -0400
Subject: [PATCH 053/191] feat(query): cast $rename

Fix #3027
---
 lib/helpers/query/castUpdate.js | 23 ++++++++++++++++++++---
 test/model.updateOne.test.js    | 25 ++++++++++++++++++++++---
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
index eb69bc89a09..94f374d8b58 100644
--- a/lib/helpers/query/castUpdate.js
+++ b/lib/helpers/query/castUpdate.js
@@ -2,6 +2,7 @@
 
 const CastError = require('../../error/cast');
 const MongooseError = require('../../error/mongooseError');
+const SchemaString = require('../../schema/string');
 const StrictModeError = require('../../error/strict');
 const ValidationError = require('../../error/validation');
 const castNumber = require('../../cast/number');
@@ -307,6 +308,20 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
           continue;
         }
 
+        hasKeys = true;
+      } else if (op === '$rename') {
+        const schematype = new SchemaString(`${prefix}${key}.$rename`);
+        try {
+          obj[key] = castUpdateVal(schematype, val, op, key, context, prefix + key);
+        } catch (error) {
+          aggregatedError = _appendError(error, context, key, aggregatedError);
+        }
+
+        if (obj[key] === void 0) {
+          delete obj[key];
+          continue;
+        }
+
         hasKeys = true;
       } else {
         const pathToCheck = (prefix + key);
@@ -372,10 +387,12 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
           delete obj[key];
         }
       } else {
-        // gh-1845 temporary fix: ignore $rename. See gh-3027 for tracking
-        // improving this.
         if (op === '$rename') {
-          hasKeys = true;
+          if (obj[key] == null) {
+            throw new CastError('String', obj[key], `${prefix}${key}.$rename`);
+          }
+          const schematype = new SchemaString(`${prefix}${key}.$rename`);
+          obj[key] = schematype.castForQuery(null, obj[key], context);
           continue;
         }
 
diff --git a/test/model.updateOne.test.js b/test/model.updateOne.test.js
index e9ae3ce43a5..8a228208823 100644
--- a/test/model.updateOne.test.js
+++ b/test/model.updateOne.test.js
@@ -1078,9 +1078,28 @@ describe('model: updateOne:', function() {
       const Model = db.model('Test', schema);
 
       const update = { $rename: { foo: 'bar' } };
-      await Model.create({ foo: Date.now() });
-      const res = await Model.updateOne({}, update, { multi: true });
-      assert.equal(res.modifiedCount, 1);
+      const foo = Date.now();
+      const { _id } = await Model.create({ foo });
+      await Model.updateOne({}, update);
+      const doc = await Model.findById(_id);
+      assert.equal(doc.bar.valueOf(), foo.valueOf());
+    });
+
+    it('throws CastError if $rename fails to cast to string (gh-1845)', async function() {
+      const schema = new Schema({ foo: Date, bar: Date });
+      const Model = db.model('Test', schema);
+
+      let err = await Model.updateOne({}, { $rename: { foo: { prop: 'baz' } } }).then(() => null, err => err);
+      assert.equal(err.name, 'CastError');
+      assert.ok(err.message.includes('foo.$rename'));
+
+      err = await Model.updateOne({}, { $rename: { foo: null } }).then(() => null, err => err);
+      assert.equal(err.name, 'CastError');
+      assert.ok(err.message.includes('foo.$rename'));
+
+      err = await Model.updateOne({}, { $rename: { foo: undefined } }).then(() => null, err => err);
+      assert.equal(err.name, 'CastError');
+      assert.ok(err.message.includes('foo.$rename'));
     });
 
     it('allows objects with positional operator (gh-3185)', async function() {

From 762d06362baa729b73966c8866cdc1dc40b7a058 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 16 Sep 2024 14:45:34 -0400
Subject: [PATCH 054/191] fix: make getters convert uuid to string when calling
 toObject() and toJSON()

Fix #14869
---
 lib/schema/uuid.js          | 27 ++++++++++++---------------
 test/model.populate.test.js | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/lib/schema/uuid.js b/lib/schema/uuid.js
index aa72c42107f..0c64ac07eeb 100644
--- a/lib/schema/uuid.js
+++ b/lib/schema/uuid.js
@@ -26,19 +26,6 @@ function hex2buffer(hex) {
   return buff;
 }
 
-/**
- * Helper function to convert the buffer input to a string
- * @param {Buffer} buf The buffer to convert to a hex-string
- * @returns {String} The buffer as a hex-string
- * @api private
- */
-
-function binary2hex(buf) {
-  // use buffer built-in function to convert from buffer to hex-string
-  const hex = buf != null && buf.toString('hex');
-  return hex;
-}
-
 /**
  * Convert a String to Binary
  * @param {String} uuidStr The value to process
@@ -67,7 +54,7 @@ function binaryToString(uuidBin) {
   // i(hasezoey) dont quite know why, but "uuidBin" may sometimes also be the already processed string
   let hex;
   if (typeof uuidBin !== 'string' && uuidBin != null) {
-    hex = binary2hex(uuidBin);
+    hex = uuidBin != null && uuidBin.toString('hex');
     const uuidStr = hex.substring(0, 8) + '-' + hex.substring(8, 8 + 4) + '-' + hex.substring(12, 12 + 4) + '-' + hex.substring(16, 16 + 4) + '-' + hex.substring(20, 20 + 12);
     return uuidStr;
   }
@@ -90,7 +77,17 @@ function SchemaUUID(key, options) {
     if (value != null && value.$__ != null) {
       return value;
     }
-    return binaryToString(value);
+    if (Buffer.isBuffer(value)) {
+      return binaryToString(value);
+    } else if (value instanceof Binary) {
+    if (value instanceof Binary) {
+      return binaryToString(value.buffer);
+    }
+    } else if (utils.isPOJO(value) && value.type === 'Buffer' && Array.isArray(value.data)) {
+      // Cloned buffers look like `{ type: 'Buffer', data: [5, 224, ...] }`
+      return binaryToString(Buffer.from(value.data));
+    }
+    return value;
   });
 }
 
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
index 7f0fe844eb8..be7933882f1 100644
--- a/test/model.populate.test.js
+++ b/test/model.populate.test.js
@@ -11131,4 +11131,41 @@ describe('model: populate:', function() {
     }
     assert.equal(posts.length, 2);
   });
+
+  it('handles converting uuid documents to strings when calling toObject() (gh-14869)', async function() {
+    const nodeSchema = new Schema({ _id: { type: 'UUID' }, name: 'String' });
+    const rootSchema = new Schema({
+      _id: { type: 'UUID' },
+      status: 'String',
+      node: [{ type: 'UUID', ref: 'Child' }]
+    });
+
+    const Node = db.model('Child', nodeSchema);
+    const Root = db.model('Parent', rootSchema);
+
+    const node = new Node({
+      _id: '65c7953e-c6e9-4c2f-8328-fe2de7df560d',
+      name: 'test'
+    });
+    await node.save();
+
+    const root = new Root({
+      _id: '05c7953e-c6e9-4c2f-8328-fe2de7df560d',
+      status: 'ok',
+      node: [node._id]
+    });
+    await root.save();
+
+    const foundRoot = await Root.findById(root._id).populate('node');
+
+    let doc = foundRoot.toJSON({ getters: true });
+    assert.strictEqual(doc._id, '05c7953e-c6e9-4c2f-8328-fe2de7df560d');
+    assert.strictEqual(doc.node.length, 1);
+    assert.strictEqual(doc.node[0]._id, '65c7953e-c6e9-4c2f-8328-fe2de7df560d');
+
+    doc = foundRoot.toObject({ getters: true });
+    assert.strictEqual(doc._id, '05c7953e-c6e9-4c2f-8328-fe2de7df560d');
+    assert.strictEqual(doc.node.length, 1);
+    assert.strictEqual(doc.node[0]._id, '65c7953e-c6e9-4c2f-8328-fe2de7df560d');
+  });
 });

From 5b5f3d822f49908c4e257ee7350880eba9bf0bb2 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 16 Sep 2024 14:48:14 -0400
Subject: [PATCH 055/191] style: fix lint

---
 lib/schema/uuid.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/schema/uuid.js b/lib/schema/uuid.js
index 0c64ac07eeb..cbee764e4ab 100644
--- a/lib/schema/uuid.js
+++ b/lib/schema/uuid.js
@@ -80,9 +80,9 @@ function SchemaUUID(key, options) {
     if (Buffer.isBuffer(value)) {
       return binaryToString(value);
     } else if (value instanceof Binary) {
-    if (value instanceof Binary) {
-      return binaryToString(value.buffer);
-    }
+      if (value instanceof Binary) {
+        return binaryToString(value.buffer);
+      }
     } else if (utils.isPOJO(value) && value.type === 'Buffer' && Array.isArray(value.data)) {
       // Cloned buffers look like `{ type: 'Buffer', data: [5, 224, ...] }`
       return binaryToString(Buffer.from(value.data));

From 78623bafa5420805f8b8ec2e38e26392193d3110 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 16 Sep 2024 15:04:38 -0400
Subject: [PATCH 056/191] types(document): add generic param to depopulate() to
 allow updating properties

Fix #14876
---
 test/types/document.test.ts | 48 +++++++++++++++++++++++++++++++++++++
 types/document.d.ts         |  2 +-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/test/types/document.test.ts b/test/types/document.test.ts
index 84451edf0f2..cf45b9ce857 100644
--- a/test/types/document.test.ts
+++ b/test/types/document.test.ts
@@ -359,3 +359,51 @@ function gh13738() {
   expectType<Date>(person.get('dob'));
   expectType<{ theme: string; alerts: { sms: boolean } }>(person.get('settings'));
 }
+
+async function gh14876() {
+  type CarObjectInterface = {
+    make: string;
+    model: string;
+    year: number;
+    owner: Types.ObjectId;
+  };
+  const carSchema = new Schema<CarObjectInterface>({
+    make: { type: String, required: true },
+    model: { type: String, required: true },
+    year: { type: Number, required: true },
+    owner: { type: Schema.Types.ObjectId, ref: 'User' }
+  });
+
+  type UserObjectInterface = {
+    name: string;
+    age: number;
+  };
+  const userSchema = new Schema<UserObjectInterface>({
+    name: String,
+    age: Number
+  });
+
+  const Car = model<CarObjectInterface>('Car', carSchema);
+  const User = model<UserObjectInterface>('User', userSchema);
+
+  const user = await User.create({ name: 'John', age: 25 });
+  const car = await Car.create({
+    make: 'Toyota',
+    model: 'Camry',
+    year: 2020,
+    owner: user._id
+  });
+
+  const populatedCar = await Car.findById(car._id)
+    .populate<{ owner: UserObjectInterface }>('owner')
+    .exec();
+
+  if (!populatedCar) return;
+
+  console.log(populatedCar.owner.name); // outputs John
+
+  const depopulatedCar = populatedCar.depopulate<{ owner: Types.ObjectId }>('owner');
+
+  expectType<UserObjectInterface>(populatedCar.owner);
+  expectType<Types.ObjectId>(depopulatedCar.owner);
+}
diff --git a/types/document.d.ts b/types/document.d.ts
index 5557269783f..20f5de4c429 100644
--- a/types/document.d.ts
+++ b/types/document.d.ts
@@ -138,7 +138,7 @@ declare module 'mongoose' {
      * Takes a populated field and returns it to its unpopulated state. If called with
      * no arguments, then all populated fields are returned to their unpopulated state.
      */
-    depopulate(path?: string | string[]): this;
+    depopulate<Paths = {}>(path?: string | string[]): MergeType<this, Paths>;
 
     /**
      * Returns the list of paths that have been directly modified. A direct

From c2c13514bfbf8b1e422d8c300111c14b540c57f8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 16 Sep 2024 17:08:08 -0400
Subject: [PATCH 057/191] types: make __v a number, only set __v on top-level
 documents

Re: #12959
---
 test/types/document.test.ts | 16 ++++++++++++++++
 types/document.d.ts         |  3 ---
 types/index.d.ts            | 10 +++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/test/types/document.test.ts b/test/types/document.test.ts
index 84451edf0f2..af458104125 100644
--- a/test/types/document.test.ts
+++ b/test/types/document.test.ts
@@ -359,3 +359,19 @@ function gh13738() {
   expectType<Date>(person.get('dob'));
   expectType<{ theme: string; alerts: { sms: boolean } }>(person.get('settings'));
 }
+
+async function gh12959() {
+  const subdocSchema = new Schema({ foo: { type: 'string', required: true } });
+
+  const schema = new Schema({
+    subdocArray: { type: [subdocSchema], required: true },
+  });
+
+  const Model = model('test', schema);
+
+  const doc = await Model.findById('id').orFail();
+  expectType<Types.ObjectId>(doc._id);
+  expectType<number | undefined>(doc.__v);
+
+  expectError(doc.subdocArray[0].__v);
+}
\ No newline at end of file
diff --git a/types/document.d.ts b/types/document.d.ts
index 5557269783f..7bc140461ee 100644
--- a/types/document.d.ts
+++ b/types/document.d.ts
@@ -24,9 +24,6 @@ declare module 'mongoose' {
     /** This documents _id. */
     _id: T;
 
-    /** This documents __v. */
-    __v?: any;
-
     /** Assert that a given path or paths is populated. Throws an error if not populated. */
     $assertPopulated<Paths = {}>(path: string | string[], values?: Partial<Paths>): Omit<this, keyof Paths> & Paths;
 
diff --git a/types/index.d.ts b/types/index.d.ts
index 02c975a4eb3..3ec72ac281d 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -138,6 +138,10 @@ declare module 'mongoose' {
     ? IfAny<U, T & { _id: Types.ObjectId }, T & Required<{ _id: U }>>
     : T & { _id: Types.ObjectId };
 
+  export type Default__v<T> = T extends { __v?: infer U }
+    ? T
+    : T & { __v?: number };
+
   /** Helper type for getting the hydrated document type from the raw document type. The hydrated document type is what `new MyModel()` returns. */
   export type HydratedDocument<
     DocType,
@@ -147,12 +151,12 @@ declare module 'mongoose' {
     DocType,
     any,
     TOverrides extends Record<string, never> ?
-      Document<unknown, TQueryHelpers, DocType> & Require_id<DocType> :
+      Document<unknown, TQueryHelpers, DocType> & Default__v<Require_id<DocType>> :
       IfAny<
         TOverrides,
-        Document<unknown, TQueryHelpers, DocType> & Require_id<DocType>,
+        Document<unknown, TQueryHelpers, DocType> & Default__v<Require_id<DocType>>,
         Document<unknown, TQueryHelpers, DocType> & MergeType<
-          Require_id<DocType>,
+          Default__v<Require_id<DocType>>,
           TOverrides
         >
       >

From 499582a46e8680a9af084e16c5062e786282d6f9 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 11:18:46 -0400
Subject: [PATCH 058/191] Update lib/schema/uuid.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/schema/uuid.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/schema/uuid.js b/lib/schema/uuid.js
index cbee764e4ab..37906e3c4f0 100644
--- a/lib/schema/uuid.js
+++ b/lib/schema/uuid.js
@@ -80,9 +80,7 @@ function SchemaUUID(key, options) {
     if (Buffer.isBuffer(value)) {
       return binaryToString(value);
     } else if (value instanceof Binary) {
-      if (value instanceof Binary) {
-        return binaryToString(value.buffer);
-      }
+      return binaryToString(value.buffer);
     } else if (utils.isPOJO(value) && value.type === 'Buffer' && Array.isArray(value.data)) {
       // Cloned buffers look like `{ type: 'Buffer', data: [5, 224, ...] }`
       return binaryToString(Buffer.from(value.data));

From 02162ff62d13a23a2785532cabb5c3fbac2abb26 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 11:18:58 -0400
Subject: [PATCH 059/191] Update lib/schema/uuid.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/schema/uuid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/schema/uuid.js b/lib/schema/uuid.js
index 37906e3c4f0..1fbfc38654d 100644
--- a/lib/schema/uuid.js
+++ b/lib/schema/uuid.js
@@ -54,7 +54,7 @@ function binaryToString(uuidBin) {
   // i(hasezoey) dont quite know why, but "uuidBin" may sometimes also be the already processed string
   let hex;
   if (typeof uuidBin !== 'string' && uuidBin != null) {
-    hex = uuidBin != null && uuidBin.toString('hex');
+    hex = uuidBin.toString('hex');
     const uuidStr = hex.substring(0, 8) + '-' + hex.substring(8, 8 + 4) + '-' + hex.substring(12, 12 + 4) + '-' + hex.substring(16, 16 + 4) + '-' + hex.substring(20, 20 + 12);
     return uuidStr;
   }

From 176fb386f05218d9e672ad132f7f294f4f83887d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 11:25:43 -0400
Subject: [PATCH 060/191] Update test/model.updateOne.test.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/model.updateOne.test.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/model.updateOne.test.js b/test/model.updateOne.test.js
index 8a228208823..0b4223dad5c 100644
--- a/test/model.updateOne.test.js
+++ b/test/model.updateOne.test.js
@@ -1083,6 +1083,7 @@ describe('model: updateOne:', function() {
       await Model.updateOne({}, update);
       const doc = await Model.findById(_id);
       assert.equal(doc.bar.valueOf(), foo.valueOf());
+      assert.equal(doc.foo, undefined);
     });
 
     it('throws CastError if $rename fails to cast to string (gh-1845)', async function() {

From 11494c75516fe25e6914d9f687331f4f60a097a7 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 11:29:00 -0400
Subject: [PATCH 061/191] Update test/types/document.test.ts

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/types/document.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/types/document.test.ts b/test/types/document.test.ts
index af458104125..ddba9cfcdd0 100644
--- a/test/types/document.test.ts
+++ b/test/types/document.test.ts
@@ -364,7 +364,7 @@ async function gh12959() {
   const subdocSchema = new Schema({ foo: { type: 'string', required: true } });
 
   const schema = new Schema({
-    subdocArray: { type: [subdocSchema], required: true },
+    subdocArray: { type: [subdocSchema], required: true }
   });
 
   const Model = model('test', schema);

From 05a22346479d6c2fad0cb0467a8b093243bbb22c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 11:29:11 -0400
Subject: [PATCH 062/191] Update test/types/document.test.ts

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/types/document.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/types/document.test.ts b/test/types/document.test.ts
index ddba9cfcdd0..685410eafc4 100644
--- a/test/types/document.test.ts
+++ b/test/types/document.test.ts
@@ -374,4 +374,4 @@ async function gh12959() {
   expectType<number | undefined>(doc.__v);
 
   expectError(doc.subdocArray[0].__v);
-}
\ No newline at end of file
+}

From 86fea9341f824d3c72303c51c3b091f6ef4f9c3c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 12:39:05 -0400
Subject: [PATCH 063/191] fix: dont treat failed heartbeat as heartbeat

---
 lib/drivers/node-mongodb-native/connection.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/drivers/node-mongodb-native/connection.js b/lib/drivers/node-mongodb-native/connection.js
index 9286429c022..0b4e7c33852 100644
--- a/lib/drivers/node-mongodb-native/connection.js
+++ b/lib/drivers/node-mongodb-native/connection.js
@@ -418,9 +418,6 @@ function _setClient(conn, client, options, dbName) {
   client.on('serverHeartbeatSucceeded', () => {
     conn._lastHeartbeatAt = Date.now();
   });
-  client.on('serverHeartbeatFailed', () => {
-    conn._lastHeartbeatAt = Date.now();
-  });
 
   if (options.monitorCommands) {
     client.on('commandStarted', (data) => conn.emit('commandStarted', data));

From 8330f1ee0e0686ef0d3ec9328df1b0dd333b706f Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 17 Sep 2024 16:28:22 -0400
Subject: [PATCH 064/191] chore: release 8.6.3

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a8082d463a2..fccc71ad231 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+8.6.3 / 2024-09-17
+==================
+ * fix: make getters convert uuid to string when calling toObject() and toJSON() #14890 #14869
+ * fix: fix missing Aggregate re-exports for ESM #14886 [wongsean](https://github.com/wongsean)
+ * types(document): add generic param to depopulate() to allow updating properties #14891 #14876
+
 8.6.2 / 2024-09-11
 ==================
  * fix: make set merge deeply nested objects #14870 #14861 [ianHeydoc](https://github.com/ianHeydoc)
diff --git a/package.json b/package.json
index 48eb3eab36b..5b5fa843259 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.6.2",
+  "version": "8.6.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 062016e542bbbf94f5fdaa6bd5d75e309ba83587 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 18 Sep 2024 16:17:48 -0400
Subject: [PATCH 065/191] fix(projection): avoid setting projection to unknown
 exclusive/inclusive if elemMatch on a Date, ObjectId, etc.

Fix #14893
---
 lib/helpers/projection/isExclusive.js       |  9 ++++++---
 test/helpers/projection.isExclusive.test.js | 12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 test/helpers/projection.isExclusive.test.js

diff --git a/lib/helpers/projection/isExclusive.js b/lib/helpers/projection/isExclusive.js
index b55cf468458..e6ca3cad5ec 100644
--- a/lib/helpers/projection/isExclusive.js
+++ b/lib/helpers/projection/isExclusive.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const isDefiningProjection = require('./isDefiningProjection');
+const isPOJO = require('../isPOJO');
 
 /*!
  * ignore
@@ -22,10 +23,12 @@ module.exports = function isExclusive(projection) {
       // Explicitly avoid `$meta` and `$slice`
       const key = keys[ki];
       if (key !== '_id' && isDefiningProjection(projection[key])) {
-        exclude = (projection[key] != null && typeof projection[key] === 'object') ?
-          isExclusive(projection[key]) :
+        exclude = isPOJO(projection[key]) ?
+          (isExclusive(projection[key]) ?? exclude) :
           !projection[key];
-        break;
+        if (exclude != null) {
+          break;
+        }
       }
     }
   }
diff --git a/test/helpers/projection.isExclusive.test.js b/test/helpers/projection.isExclusive.test.js
new file mode 100644
index 00000000000..2fc4a16b990
--- /dev/null
+++ b/test/helpers/projection.isExclusive.test.js
@@ -0,0 +1,12 @@
+'use strict';
+
+const assert = require('assert');
+
+require('../common'); // required for side-effect setup (so that the default driver is set-up)
+const isExclusive = require('../../lib/helpers/projection/isExclusive');
+
+describe('isExclusive', function() {
+  it('handles $elemMatch (gh-14893)', function() {
+    assert.strictEqual(isExclusive({ field: { $elemMatch: { test: new Date('2024-06-01') } }, otherProp: 1 }), false);
+  });
+});

From bd4440ae55e0148b4c5274200c76f7f4546cf651 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 18 Sep 2024 16:27:04 -0400
Subject: [PATCH 066/191] fix(projection): also handle value objects in
 isInclusive

---
 lib/helpers/projection/isInclusive.js       |  3 ++-
 test/helpers/projection.isInclusive.test.js | 12 ++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 test/helpers/projection.isInclusive.test.js

diff --git a/lib/helpers/projection/isInclusive.js b/lib/helpers/projection/isInclusive.js
index eebb412c4a3..c53bac02873 100644
--- a/lib/helpers/projection/isInclusive.js
+++ b/lib/helpers/projection/isInclusive.js
@@ -1,6 +1,7 @@
 'use strict';
 
 const isDefiningProjection = require('./isDefiningProjection');
+const isPOJO = require('../isPOJO');
 
 /*!
  * ignore
@@ -26,7 +27,7 @@ module.exports = function isInclusive(projection) {
     // If field is truthy (1, true, etc.) and not an object, then this
     // projection must be inclusive. If object, assume its $meta, $slice, etc.
     if (isDefiningProjection(projection[prop]) && !!projection[prop]) {
-      if (projection[prop] != null && typeof projection[prop] === 'object') {
+      if (isPOJO(projection[prop])) {
         return isInclusive(projection[prop]);
       } else {
         return !!projection[prop];
diff --git a/test/helpers/projection.isInclusive.test.js b/test/helpers/projection.isInclusive.test.js
new file mode 100644
index 00000000000..3bb93635a50
--- /dev/null
+++ b/test/helpers/projection.isInclusive.test.js
@@ -0,0 +1,12 @@
+'use strict';
+
+const assert = require('assert');
+
+require('../common'); // required for side-effect setup (so that the default driver is set-up)
+const isInclusive = require('../../lib/helpers/projection/isInclusive');
+
+describe('isInclusive', function() {
+  it('handles $elemMatch (gh-14893)', function() {
+    assert.strictEqual(isInclusive({ field: { $elemMatch: { test: new Date('2024-06-01') } }, otherProp: 1 }), true);
+  });
+});

From 42ffada151e9aa9e9179f82753e779a77ecc49b0 Mon Sep 17 00:00:00 2001
From: Daniel Diaz <39510674+IslandRhythms@users.noreply.github.com>
Date: Fri, 20 Sep 2024 13:46:57 -0400
Subject: [PATCH 067/191] standardize comment placement

---
 lib/error/browserMissingSchema.js |  7 ++++---
 lib/error/divergentArray.js       | 12 +++++++-----
 lib/error/invalidSchemaOption.js  | 12 +++++++-----
 lib/error/missingSchema.js        | 12 +++++++-----
 lib/error/notFound.js             | 10 ++++++----
 lib/error/objectExpected.js       | 15 ++++++++-------
 lib/error/objectParameter.js      | 20 +++++++++++---------
 lib/error/overwriteModel.js       | 11 ++++++-----
 lib/error/parallelSave.js         | 15 +++++++++------
 lib/error/parallelValidate.js     | 14 ++++++++------
 lib/error/setOptionError.js       | 14 ++++++++------
 lib/error/strict.js               | 20 +++++++++++---------
 lib/error/strictPopulate.js       | 18 ++++++++++--------
 lib/error/validation.js           | 16 +++++++++-------
 lib/error/validator.js            | 15 ++++++++-------
 lib/error/version.js              | 18 ++++++++++--------
 16 files changed, 129 insertions(+), 100 deletions(-)

diff --git a/lib/error/browserMissingSchema.js b/lib/error/browserMissingSchema.js
index 608cfd983e4..ffeffc77257 100644
--- a/lib/error/browserMissingSchema.js
+++ b/lib/error/browserMissingSchema.js
@@ -6,11 +6,12 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * MissingSchema Error constructor.
+ */
 
 class MissingSchemaError extends MongooseError {
-  /**
-   * MissingSchema Error constructor.
-   */
+
   constructor() {
     super('Schema hasn\'t been registered for document.\n'
       + 'Use mongoose.Document(name, schema)');
diff --git a/lib/error/divergentArray.js b/lib/error/divergentArray.js
index f266dbde449..bc3f1816264 100644
--- a/lib/error/divergentArray.js
+++ b/lib/error/divergentArray.js
@@ -7,12 +7,14 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * DivergentArrayError constructor.
+ * @param {Array<String>} paths
+ * @api private
+ */
+
 class DivergentArrayError extends MongooseError {
-  /**
-   * DivergentArrayError constructor.
-   * @param {Array<String>} paths
-   * @api private
-   */
+
   constructor(paths) {
     const msg = 'For your own good, using `document.save()` to update an array '
             + 'which was selected using an $elemMatch projection OR '
diff --git a/lib/error/invalidSchemaOption.js b/lib/error/invalidSchemaOption.js
index 089dc6a03ef..9e7e4ff4f17 100644
--- a/lib/error/invalidSchemaOption.js
+++ b/lib/error/invalidSchemaOption.js
@@ -7,12 +7,14 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * InvalidSchemaOption Error constructor.
+ * @param {String} name
+ * @api private
+ */
+
 class InvalidSchemaOptionError extends MongooseError {
-  /**
-   * InvalidSchemaOption Error constructor.
-   * @param {String} name
-   * @api private
-   */
+
   constructor(name, option) {
     const msg = `Cannot create use schema for property "${name}" because the schema has the ${option} option enabled.`;
     super(msg);
diff --git a/lib/error/missingSchema.js b/lib/error/missingSchema.js
index 2b3bf242526..790f7853848 100644
--- a/lib/error/missingSchema.js
+++ b/lib/error/missingSchema.js
@@ -7,12 +7,14 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * MissingSchema Error constructor.
+ * @param {String} name
+ * @api private
+ */
+
 class MissingSchemaError extends MongooseError {
-  /**
-   * MissingSchema Error constructor.
-   * @param {String} name
-   * @api private
-   */
+
   constructor(name) {
     const msg = 'Schema hasn\'t been registered for model "' + name + '".\n'
             + 'Use mongoose.model(name, schema)';
diff --git a/lib/error/notFound.js b/lib/error/notFound.js
index 19a22f3a101..87fdd8bc649 100644
--- a/lib/error/notFound.js
+++ b/lib/error/notFound.js
@@ -7,11 +7,13 @@
 const MongooseError = require('./mongooseError');
 const util = require('util');
 
+/**
+ * OverwriteModel Error constructor.
+ * @api private
+ */
+
 class DocumentNotFoundError extends MongooseError {
-  /**
-   * OverwriteModel Error constructor.
-   * @api private
-   */
+
   constructor(filter, model, numAffected, result) {
     let msg;
     const messages = MongooseError.messages;
diff --git a/lib/error/objectExpected.js b/lib/error/objectExpected.js
index 9f7a8116618..bd89ffc77e1 100644
--- a/lib/error/objectExpected.js
+++ b/lib/error/objectExpected.js
@@ -6,15 +6,16 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Strict mode error constructor
+ *
+ * @param {string} type
+ * @param {string} value
+ * @api private
+ */
 
 class ObjectExpectedError extends MongooseError {
-  /**
-   * Strict mode error constructor
-   *
-   * @param {string} type
-   * @param {string} value
-   * @api private
-   */
+
   constructor(path, val) {
     const typeDescription = Array.isArray(val) ? 'array' : 'primitive value';
     super('Tried to set nested object field `' + path +
diff --git a/lib/error/objectParameter.js b/lib/error/objectParameter.js
index b3f5b80849d..0a2108e5c9b 100644
--- a/lib/error/objectParameter.js
+++ b/lib/error/objectParameter.js
@@ -6,16 +6,18 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Constructor for errors that happen when a parameter that's expected to be
+ * an object isn't an object
+ *
+ * @param {Any} value
+ * @param {String} paramName
+ * @param {String} fnName
+ * @api private
+ */
+
 class ObjectParameterError extends MongooseError {
-  /**
-   * Constructor for errors that happen when a parameter that's expected to be
-   * an object isn't an object
-   *
-   * @param {Any} value
-   * @param {String} paramName
-   * @param {String} fnName
-   * @api private
-   */
+
   constructor(value, paramName, fnName) {
     super('Parameter "' + paramName + '" to ' + fnName +
       '() must be an object, got "' + value.toString() + '" (type ' + typeof value + ')');
diff --git a/lib/error/overwriteModel.js b/lib/error/overwriteModel.js
index 8904e4e74b3..ef828f91731 100644
--- a/lib/error/overwriteModel.js
+++ b/lib/error/overwriteModel.js
@@ -7,13 +7,14 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * OverwriteModel Error constructor.
+ * @param {String} name
+ * @api private
+ */
 
 class OverwriteModelError extends MongooseError {
-  /**
-   * OverwriteModel Error constructor.
-   * @param {String} name
-   * @api private
-   */
+
   constructor(name) {
     super('Cannot overwrite `' + name + '` model once compiled.');
   }
diff --git a/lib/error/parallelSave.js b/lib/error/parallelSave.js
index 25e12481d49..fd554fa3bbc 100644
--- a/lib/error/parallelSave.js
+++ b/lib/error/parallelSave.js
@@ -6,13 +6,16 @@
 
 const MongooseError = require('./mongooseError');
 
+
+/**
+ * ParallelSave Error constructor.
+ *
+ * @param {Document} doc
+ * @api private
+ */
+
 class ParallelSaveError extends MongooseError {
-  /**
-   * ParallelSave Error constructor.
-   *
-   * @param {Document} doc
-   * @api private
-   */
+
   constructor(doc) {
     const msg = 'Can\'t save() the same doc multiple times in parallel. Document: ';
     super(msg + doc._doc._id);
diff --git a/lib/error/parallelValidate.js b/lib/error/parallelValidate.js
index 84b7940d6df..d70e296e869 100644
--- a/lib/error/parallelValidate.js
+++ b/lib/error/parallelValidate.js
@@ -7,13 +7,15 @@
 const MongooseError = require('./mongooseError');
 
 
+/**
+ * ParallelValidate Error constructor.
+ *
+ * @param {Document} doc
+ * @api private
+ */
+
 class ParallelValidateError extends MongooseError {
-  /**
-   * ParallelValidate Error constructor.
-   *
-   * @param {Document} doc
-   * @api private
-   */
+
   constructor(doc) {
     const msg = 'Can\'t validate() the same doc multiple times in parallel. Document: ';
     super(msg + doc._doc._id);
diff --git a/lib/error/setOptionError.js b/lib/error/setOptionError.js
index b38a0d30244..369096fd306 100644
--- a/lib/error/setOptionError.js
+++ b/lib/error/setOptionError.js
@@ -8,13 +8,15 @@ const MongooseError = require('./mongooseError');
 const util = require('util');
 const combinePathErrors = require('../helpers/error/combinePathErrors');
 
+/**
+ * Mongoose.set Error
+ *
+ * @api private
+ * @inherits MongooseError
+ */
+
 class SetOptionError extends MongooseError {
-  /**
-   * Mongoose.set Error
-   *
-   * @api private
-   * @inherits MongooseError
-   */
+
   constructor() {
     super('');
 
diff --git a/lib/error/strict.js b/lib/error/strict.js
index 6cf4cf91141..eda7d9ae6f5 100644
--- a/lib/error/strict.js
+++ b/lib/error/strict.js
@@ -6,17 +6,19 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Strict mode error constructor
+ *
+ * @param {String} path
+ * @param {String} [msg]
+ * @param {Boolean} [immutable]
+ * @inherits MongooseError
+ * @api private
+ */
+
 
 class StrictModeError extends MongooseError {
-  /**
-   * Strict mode error constructor
-   *
-   * @param {String} path
-   * @param {String} [msg]
-   * @param {Boolean} [immutable]
-   * @inherits MongooseError
-   * @api private
-   */
+
   constructor(path, msg, immutable) {
     msg = msg || 'Field `' + path + '` is not in schema and strict ' +
       'mode is set to throw.';
diff --git a/lib/error/strictPopulate.js b/lib/error/strictPopulate.js
index 288799897bc..d554d71271d 100644
--- a/lib/error/strictPopulate.js
+++ b/lib/error/strictPopulate.js
@@ -6,15 +6,17 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Strict mode error constructor
+ *
+ * @param {String} path
+ * @param {String} [msg]
+ * @inherits MongooseError
+ * @api private
+ */
+
 class StrictPopulateError extends MongooseError {
-  /**
-   * Strict mode error constructor
-   *
-   * @param {String} path
-   * @param {String} [msg]
-   * @inherits MongooseError
-   * @api private
-   */
+
   constructor(path, msg) {
     msg = msg || 'Cannot populate path `' + path + '` because it is not in your schema. ' + 'Set the `strictPopulate` option to false to override.';
     super(msg);
diff --git a/lib/error/validation.js b/lib/error/validation.js
index 5e222e980f9..faa4ea799aa 100644
--- a/lib/error/validation.js
+++ b/lib/error/validation.js
@@ -9,14 +9,16 @@ const getConstructorName = require('../helpers/getConstructorName');
 const util = require('util');
 const combinePathErrors = require('../helpers/error/combinePathErrors');
 
+/**
+ * Document Validation Error
+ *
+ * @api private
+ * @param {Document} [instance]
+ * @inherits MongooseError
+ */
+
 class ValidationError extends MongooseError {
-  /**
-   * Document Validation Error
-   *
-   * @api private
-   * @param {Document} [instance]
-   * @inherits MongooseError
-   */
+
   constructor(instance) {
     let _message;
     if (getConstructorName(instance) === 'model') {
diff --git a/lib/error/validator.js b/lib/error/validator.js
index f7ee2ef4761..38f98f0087d 100644
--- a/lib/error/validator.js
+++ b/lib/error/validator.js
@@ -6,15 +6,16 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Schema validator error
+ *
+ * @param {Object} properties
+ * @param {Document} doc
+ * @api private
+ */
 
 class ValidatorError extends MongooseError {
-  /**
-   * Schema validator error
-   *
-   * @param {Object} properties
-   * @param {Document} doc
-   * @api private
-   */
+
   constructor(properties, doc) {
     let msg = properties.message;
     if (!msg) {
diff --git a/lib/error/version.js b/lib/error/version.js
index 6bc2b5d3af5..4eb8054cdfb 100644
--- a/lib/error/version.js
+++ b/lib/error/version.js
@@ -6,15 +6,17 @@
 
 const MongooseError = require('./mongooseError');
 
+/**
+ * Version Error constructor.
+ *
+ * @param {Document} doc
+ * @param {Number} currentVersion
+ * @param {Array<String>} modifiedPaths
+ * @api private
+ */
+
 class VersionError extends MongooseError {
-  /**
-   * Version Error constructor.
-   *
-   * @param {Document} doc
-   * @param {Number} currentVersion
-   * @param {Array<String>} modifiedPaths
-   * @api private
-   */
+
   constructor(doc, currentVersion, modifiedPaths) {
     const modifiedPathsStr = modifiedPaths.join(', ');
     super('No matching document found for id "' + doc._doc._id +

From cd930c74d5cc40e7fd6caf990857e2f1071b8a93 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Sun, 22 Sep 2024 15:34:26 +0900
Subject: [PATCH 068/191] fix(model): skip applying static hooks by default if
 static name conflicts with aggregate middleware

---
 lib/constants.js                      | 10 ++++++++++
 lib/helpers/model/applyStaticHooks.js |  9 +++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index 83a66832b55..f5f5c5a19b3 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -34,3 +34,13 @@ const queryMiddlewareFunctions = queryOperations.concat([
 ]);
 
 exports.queryMiddlewareFunctions = queryMiddlewareFunctions;
+
+/*!
+ * ignore
+ */
+
+const aggregateMiddlewareFunctions = [
+  'aggregate'
+];
+
+exports.aggregateMiddlewareFunctions = aggregateMiddlewareFunctions;
diff --git a/lib/helpers/model/applyStaticHooks.js b/lib/helpers/model/applyStaticHooks.js
index 957e94f2288..dc88bff1747 100644
--- a/lib/helpers/model/applyStaticHooks.js
+++ b/lib/helpers/model/applyStaticHooks.js
@@ -1,7 +1,12 @@
 'use strict';
 
-const middlewareFunctions = require('../../constants').queryMiddlewareFunctions;
 const promiseOrCallback = require('../promiseOrCallback');
+const { queryMiddlewareFunctions, aggregateMiddlewareFunctions } = require('../../constants');
+
+const middlewareFunctions = [
+  ...queryMiddlewareFunctions,
+  ...aggregateMiddlewareFunctions
+];
 
 module.exports = function applyStaticHooks(model, hooks, statics) {
   const kareemOptions = {
@@ -10,7 +15,7 @@ module.exports = function applyStaticHooks(model, hooks, statics) {
   };
 
   hooks = hooks.filter(hook => {
-    // If the custom static overwrites an existing query middleware, don't apply
+    // If the custom static overwrites an existing middleware, don't apply
     // middleware to it by default. This avoids a potential backwards breaking
     // change with plugins like `mongoose-delete` that use statics to overwrite
     // built-in Mongoose functions.

From c2caa0f464b97a4354e9820227e9ceffafcb5b74 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Sun, 22 Sep 2024 15:37:48 +0900
Subject: [PATCH 069/191] fix(model): add test to skip applying static hooks by
 default when static name conflicts with aggregate middleware

---
 test/model.test.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/model.test.js b/test/model.test.js
index 8e94a876694..c2e3f68c1e8 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -10,6 +10,7 @@ const assert = require('assert');
 const { once } = require('events');
 const random = require('./util').random;
 const util = require('./util');
+const model = require('../lib/model');
 
 const mongoose = start.mongoose;
 const Schema = mongoose.Schema;
@@ -5861,6 +5862,35 @@ describe('Model', function() {
 
   });
 
+  it('custom statics that overwrite aggregate functions dont get hooks by default (gh-14903)', async function() {
+
+    const schema = new Schema({ name: String });
+
+    schema.statics.aggregate = function(pipeline) {
+      return model.aggregate.apply(this, [pipeline]);
+    };
+
+    let called = 0;
+    schema.pre('aggregate', function(next) {
+      ++called;
+      next();
+    });
+    const Model = db.model('Test', schema);
+
+    await Model.create({ name: 'foo' });
+
+    const res = await Model.aggregate([
+      {
+        $match: {
+          name: 'foo'
+        }
+      }
+    ]);
+
+    assert.ok(res[0].name);
+    assert.equal(called, 1);
+  });
+
   it('error handling middleware passes saved doc (gh-7832)', async function() {
     const schema = new Schema({ _id: Number });
 

From cf768dc73ba01485bd154bbbdc8fd54c370726cf Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Sun, 22 Sep 2024 16:12:42 +0900
Subject: [PATCH 070/191] fix: add clarifying comment

---
 lib/helpers/model/applyStaticHooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers/model/applyStaticHooks.js b/lib/helpers/model/applyStaticHooks.js
index dc88bff1747..34611c3b39c 100644
--- a/lib/helpers/model/applyStaticHooks.js
+++ b/lib/helpers/model/applyStaticHooks.js
@@ -15,7 +15,7 @@ module.exports = function applyStaticHooks(model, hooks, statics) {
   };
 
   hooks = hooks.filter(hook => {
-    // If the custom static overwrites an existing middleware, don't apply
+    // If the custom static overwrites an existing query/aggregate middleware, don't apply
     // middleware to it by default. This avoids a potential backwards breaking
     // change with plugins like `mongoose-delete` that use statics to overwrite
     // built-in Mongoose functions.

From 50b7bc99d41bbbfc3a35b5357f38903f710de24d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 22 Sep 2024 13:24:07 -0400
Subject: [PATCH 071/191] feat(model): add `Model.applyVirtuals()` to apply
 virtuals to a POJO

Fix #14818
---
 lib/helpers/document/applyVirtuals.js | 141 ++++++++++++++++++
 lib/model.js                          |  38 +++++
 test/model.test.js                    | 202 ++++++++++++++++++++++++++
 3 files changed, 381 insertions(+)
 create mode 100644 lib/helpers/document/applyVirtuals.js

diff --git a/lib/helpers/document/applyVirtuals.js b/lib/helpers/document/applyVirtuals.js
new file mode 100644
index 00000000000..e3869440b90
--- /dev/null
+++ b/lib/helpers/document/applyVirtuals.js
@@ -0,0 +1,141 @@
+'use strict';
+
+const mpath = require('mpath');
+
+module.exports = applyVirtuals;
+
+function applyVirtuals(schema, doc, virtuals, parent) {
+  if (doc == null) {
+    return doc;
+  }
+
+  let virtualsForChildren = virtuals;
+  let toApply = null;
+
+  if (Array.isArray(virtuals)) {
+    virtualsForChildren = [];
+    toApply = [];
+    const len = virtuals.length;
+    for (let i = 0; i < len; ++i) {
+      const virtual = virtuals[i];
+      if (virtual.length === 1) {
+        toApply.push(virtual[0]);
+      } else {
+        virtualsForChildren.push(virtual);
+      }
+    }
+  }
+
+  applyVirtualsToChildren(this, schema, doc, virtualsForChildren, parent);
+  return applyVirtualsToDocs(schema, doc, toApply);
+}
+
+function applyVirtualsToDocs(schema, res, toApply) {
+  if (Array.isArray(res)) {
+    const len = res.length;
+    for (let i = 0; i < len; ++i) {
+      applyVirtualsToDoc(schema, res[i], toApply);
+    }
+    return res;
+  } else {
+    return applyVirtualsToDoc(schema, res, toApply);
+  }
+}
+
+function applyVirtualsToChildren(doc, schema, res, virtuals, parent) {
+  const len = schema.childSchemas.length;
+  let attachedVirtuals = false;
+  for (let i = 0; i < len; ++i) {
+    const _path = schema.childSchemas[i].model.path;
+    const _schema = schema.childSchemas[i].schema;
+    if (!_path) {
+      continue;
+    }
+    const _doc = mpath.get(_path, res);
+    if (_doc == null || (Array.isArray(_doc) && _doc.flat(Infinity).length === 0)) {
+      continue;
+    }
+
+    let virtualsForChild = null;
+    if (Array.isArray(virtuals)) {
+      virtualsForChild = [];
+      const len = virtuals.length;
+      for (let i = 0; i < len; ++i) {
+        const virtual = virtuals[i];
+        if (virtual[0] == _path) {
+          virtualsForChild.push(virtual.slice(1));
+        }
+      }
+
+      if (virtualsForChild.length === 0) {
+        continue;
+      }
+    }
+
+    applyVirtuals.call(doc, _schema, _doc, virtualsForChild, res);
+    attachedVirtuals = true;
+  }
+
+  if (virtuals && virtuals.length && !attachedVirtuals) {
+    applyVirtualsToDoc(schema, res, virtuals, parent);
+  }
+}
+
+function applyVirtualsToDoc(schema, doc, virtuals) {
+  if (doc == null || typeof doc !== 'object') {
+    return;
+  }
+  if (Array.isArray(doc)) {
+    for (let i = 0; i < doc.length; ++i) {
+      applyVirtualsToDoc(schema, doc[i], virtuals);
+    }
+    return;
+  }
+
+  if (schema.discriminators && Object.keys(schema.discriminators).length > 0) {
+    for (const discriminatorKey of Object.keys(schema.discriminators)) {
+      const discriminator = schema.discriminators[discriminatorKey];
+      const key = discriminator.discriminatorMapping.key;
+      const value = discriminator.discriminatorMapping.value;
+      if (doc[key] == value) {
+        schema = discriminator;
+        break;
+      }
+    }
+  }
+
+  if (virtuals == null) {
+    virtuals = Object.keys(schema.virtuals);
+  }
+  const numVirtuals = virtuals.length;
+  for (let i = 0; i < numVirtuals; ++i) {
+    const virtual = virtuals[i];
+    if (schema.virtuals[virtual] == null) {
+      continue;
+    }
+    const virtualType = schema.virtuals[virtual];
+    const sp = Array.isArray(virtual)
+      ? virtual :
+      virtual.indexOf('.') === -1
+        ? [virtual]
+        : virtual.split('.');
+    let cur = doc;
+    for (let j = 0; j < sp.length - 1; ++j) {
+      cur[sp[j]] = sp[j] in cur ? cur[sp[j]] : {};
+      cur = cur[sp[j]];
+    }
+    let val = virtualType.applyGetters(cur[sp[sp.length - 1]], doc);
+    if (isPopulateVirtual(virtualType) && val === undefined) {
+      if (virtualType.options.justOne) {
+        val = null;
+      } else {
+        val = [];
+      }
+    }
+    cur[sp[sp.length - 1]] = val;
+  }
+}
+
+function isPopulateVirtual(virtualType) {
+  return virtualType.options && (virtualType.options.ref || virtualType.options.refPath);
+}
diff --git a/lib/model.js b/lib/model.js
index 6d9458b5d77..777a36607a9 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -31,6 +31,7 @@ const applySchemaCollation = require('./helpers/indexes/applySchemaCollation');
 const applyStaticHooks = require('./helpers/model/applyStaticHooks');
 const applyStatics = require('./helpers/model/applyStatics');
 const applyWriteConcern = require('./helpers/schema/applyWriteConcern');
+const applyVirtualsHelper = require('./helpers/document/applyVirtuals');
 const assignVals = require('./helpers/populate/assignVals');
 const castBulkWrite = require('./helpers/model/castBulkWrite');
 const clone = require('./helpers/clone');
@@ -3488,6 +3489,9 @@ function handleSuccessfulWrite(document) {
  */
 
 Model.applyDefaults = function applyDefaults(doc) {
+  if (doc == null) {
+    return doc;
+  }
   if (doc.$__ != null) {
     applyDefaultsHelper(doc, doc.$__.fields, doc.$__.exclude);
 
@@ -3503,6 +3507,40 @@ Model.applyDefaults = function applyDefaults(doc) {
   return doc;
 };
 
+/**
+ * Apply this model's virtuals to a given POJO. Virtuals execute with the POJO as the context `this`.
+ *
+ * #### Example:
+ *
+ *     const userSchema = new Schema({ name: String });
+ *     userSchema.virtual('upper').get(function() { return this.name.toUpperCase(); });
+ *     const User = mongoose.model('User', userSchema);
+ *
+ *     const obj = { name: 'John' };
+ *     User.applyVirtuals(obj);
+ *     obj.name; // 'John'
+ *     obj.upper; // 'JOHN', Mongoose applied the return value of the virtual to the given object
+ *
+ * @param {Object} obj object or document to apply virtuals on
+ * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
+ * @returns {Object} obj
+ * @api public
+ */
+
+Model.applyVirtuals = function applyVirtuals(doc, virtualsToApply) {
+  if (doc == null) {
+    return doc;
+  }
+  // Nothing to do if this is already a hydrated document - it should already have virtuals
+  if (doc.$__ != null) {
+    return doc;
+  }
+
+  applyVirtualsHelper(this.schema, doc, virtualsToApply, null);
+
+  return doc;
+};
+
 /**
  * Cast the given POJO to the model's schema
  *
diff --git a/test/model.test.js b/test/model.test.js
index 1e531c097b5..242cd2333c2 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -7781,6 +7781,208 @@ describe('Model', function() {
     docs = await User.find();
     assert.deepStrictEqual(docs.map(doc => doc.age), [12, 12]);
   });
+
+  describe('applyVirtuals', function() {
+    it('handles basic top-level virtuals', async function() {
+      const userSchema = new Schema({
+        name: String
+      });
+      userSchema.virtual('lowercase').get(function() {
+        return this.name.toLowerCase();
+      });
+      userSchema.virtual('uppercase').get(function() {
+        return this.name.toUpperCase();
+      });
+      const User = db.model('User', userSchema);
+
+      const res = User.applyVirtuals({ name: 'Taco' });
+      assert.equal(res.name, 'Taco');
+      assert.equal(res.lowercase, 'taco');
+      assert.equal(res.uppercase, 'TACO');
+    });
+
+    it('handles virtuals in subdocuments', async function() {
+      const userSchema = new Schema({
+        name: String
+      });
+      userSchema.virtual('lowercase').get(function() {
+        return this.name.toLowerCase();
+      });
+      userSchema.virtual('uppercase').get(function() {
+        return this.name.toUpperCase();
+      });
+      const groupSchema = new Schema({
+        name: String,
+        leader: userSchema,
+        members: [userSchema]
+      });
+      const Group = db.model('Group', groupSchema);
+
+      const res = Group.applyVirtuals({
+        name: 'Microsoft',
+        leader: { name: 'Bill' },
+        members: [{ name: 'John' }, { name: 'Steve' }]
+      });
+      assert.equal(res.name, 'Microsoft');
+      assert.equal(res.leader.name, 'Bill');
+      assert.equal(res.leader.uppercase, 'BILL');
+      assert.equal(res.leader.lowercase, 'bill');
+      assert.equal(res.members[0].name, 'John');
+      assert.equal(res.members[0].uppercase, 'JOHN');
+      assert.equal(res.members[0].lowercase, 'john');
+      assert.equal(res.members[1].name, 'Steve');
+      assert.equal(res.members[1].uppercase, 'STEVE');
+      assert.equal(res.members[1].lowercase, 'steve');
+    });
+
+    it('handles virtuals on nested paths', async function() {
+      const userSchema = new Schema({
+        name: {
+          first: String,
+          last: String
+        }
+      });
+      userSchema.virtual('name.firstUpper').get(function() {
+        return this.name.first.toUpperCase();
+      });
+      userSchema.virtual('name.lastLower').get(function() {
+        return this.name.last.toLowerCase();
+      });
+      const User = db.model('User', userSchema);
+
+      const res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        }
+      });
+      assert.equal(res.name.first, 'Bill');
+      assert.equal(res.name.last, 'Gates');
+      assert.equal(res.name.firstUpper, 'BILL');
+      assert.equal(res.name.lastLower, 'gates');
+    });
+
+    it('supports passing an array of virtuals to apply', async function() {
+      const userSchema = new Schema({
+        name: {
+          first: String,
+          last: String
+        }
+      });
+      userSchema.virtual('fullName').get(function() {
+        return `${this.name.first} ${this.name.last}`;
+      });
+      userSchema.virtual('name.firstUpper').get(function() {
+        return this.name.first.toUpperCase();
+      });
+      userSchema.virtual('name.lastLower').get(function() {
+        return this.name.last.toLowerCase();
+      });
+      const User = db.model('User', userSchema);
+
+      let res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        }
+      }, ['fullName', 'name.firstUpper']);
+      assert.strictEqual(res.name.first, 'Bill');
+      assert.strictEqual(res.name.last, 'Gates');
+      assert.strictEqual(res.fullName, 'Bill Gates');
+      assert.strictEqual(res.name.firstUpper, 'BILL');
+      assert.strictEqual(res.name.lastLower, undefined);
+
+      res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        }
+      }, ['name.lastLower']);
+      assert.strictEqual(res.name.first, 'Bill');
+      assert.strictEqual(res.name.last, 'Gates');
+      assert.strictEqual(res.fullName, undefined);
+      assert.strictEqual(res.name.firstUpper, undefined);
+      assert.strictEqual(res.name.lastLower, 'gates');
+    });
+
+    it('supports passing an array of virtuals to apply', async function() {
+      const userSchema = new Schema({
+        name: {
+          first: String,
+          last: String
+        }
+      });
+      userSchema.virtual('fullName').get(function() {
+        return `${this.name.first} ${this.name.last}`;
+      });
+      userSchema.virtual('name.firstUpper').get(function() {
+        return this.name.first.toUpperCase();
+      });
+      userSchema.virtual('name.lastLower').get(function() {
+        return this.name.last.toLowerCase();
+      });
+      const User = db.model('User', userSchema);
+
+      let res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        }
+      }, ['fullName', 'name.firstUpper']);
+      assert.strictEqual(res.name.first, 'Bill');
+      assert.strictEqual(res.name.last, 'Gates');
+      assert.strictEqual(res.fullName, 'Bill Gates');
+      assert.strictEqual(res.name.firstUpper, 'BILL');
+      assert.strictEqual(res.name.lastLower, undefined);
+
+      res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        }
+      }, ['name.lastLower']);
+      assert.strictEqual(res.name.first, 'Bill');
+      assert.strictEqual(res.name.last, 'Gates');
+      assert.strictEqual(res.fullName, undefined);
+      assert.strictEqual(res.name.firstUpper, undefined);
+      assert.strictEqual(res.name.lastLower, 'gates');
+    });
+
+    it('sets populate virtuals to `null` if `justOne`', async function() {
+      const userSchema = new Schema({
+        name: {
+          first: String,
+          last: String
+        },
+        friendId: {
+          type: 'ObjectId'
+        }
+      });
+      userSchema.virtual('fullName').get(function() {
+        return `${this.name.first} ${this.name.last}`;
+      });
+      userSchema.virtual('friend', {
+        ref: 'User',
+        localField: 'friendId',
+        foreignField: '_id',
+        justOne: true
+      });
+      const User = db.model('User', userSchema);
+
+      const friendId = new mongoose.Types.ObjectId();
+      const res = User.applyVirtuals({
+        name: {
+          first: 'Bill',
+          last: 'Gates'
+        },
+        friendId
+      });
+      assert.strictEqual(res.name.first, 'Bill');
+      assert.strictEqual(res.name.last, 'Gates');
+      assert.strictEqual(res.fullName, 'Bill Gates');
+      assert.strictEqual(res.friend, null);
+    });
+  });
 });
 
 

From 8655c6c8ac72e3acb083a6539f50f6c538b22fe6 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Tue, 24 Sep 2024 22:28:35 +0900
Subject: [PATCH 072/191] fix(model): skip applying static hooks by default if
 static name conflicts with model,document middleware

---
 lib/constants.js                      | 27 +++++++++++++++++++++++++++
 lib/helpers/model/applyStaticHooks.js | 18 +++++++++++-------
 2 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/lib/constants.js b/lib/constants.js
index f5f5c5a19b3..3a03bd502fc 100644
--- a/lib/constants.js
+++ b/lib/constants.js
@@ -44,3 +44,30 @@ const aggregateMiddlewareFunctions = [
 ];
 
 exports.aggregateMiddlewareFunctions = aggregateMiddlewareFunctions;
+
+/*!
+ * ignore
+ */
+
+const modelMiddlewareFunctions = [
+  'bulkWrite',
+  'createCollection',
+  'insertMany'
+];
+
+exports.modelMiddlewareFunctions = modelMiddlewareFunctions;
+
+/*!
+ * ignore
+ */
+
+const documentMiddlewareFunctions = [
+  'validate',
+  'save',
+  'remove',
+  'updateOne',
+  'deleteOne',
+  'init'
+];
+
+exports.documentMiddlewareFunctions = documentMiddlewareFunctions;
diff --git a/lib/helpers/model/applyStaticHooks.js b/lib/helpers/model/applyStaticHooks.js
index 34611c3b39c..8e2c33a3bf9 100644
--- a/lib/helpers/model/applyStaticHooks.js
+++ b/lib/helpers/model/applyStaticHooks.js
@@ -1,11 +1,15 @@
 'use strict';
 
 const promiseOrCallback = require('../promiseOrCallback');
-const { queryMiddlewareFunctions, aggregateMiddlewareFunctions } = require('../../constants');
+const { queryMiddlewareFunctions, aggregateMiddlewareFunctions, modelMiddlewareFunctions, documentMiddlewareFunctions } = require('../../constants');
 
 const middlewareFunctions = [
-  ...queryMiddlewareFunctions,
-  ...aggregateMiddlewareFunctions
+  ...[
+    ...queryMiddlewareFunctions,
+    ...aggregateMiddlewareFunctions,
+    ...modelMiddlewareFunctions,
+    ...documentMiddlewareFunctions
+  ].reduce((s, hook) => s.add(hook), new Set())
 ];
 
 module.exports = function applyStaticHooks(model, hooks, statics) {
@@ -14,8 +18,11 @@ module.exports = function applyStaticHooks(model, hooks, statics) {
     numCallbackParams: 1
   };
 
+  model.$__insertMany = hooks.createWrapper('insertMany',
+    model.$__insertMany, model, kareemOptions);
+
   hooks = hooks.filter(hook => {
-    // If the custom static overwrites an existing query/aggregate middleware, don't apply
+    // If the custom static overwrites an existing middleware, don't apply
     // middleware to it by default. This avoids a potential backwards breaking
     // change with plugins like `mongoose-delete` that use statics to overwrite
     // built-in Mongoose functions.
@@ -25,9 +32,6 @@ module.exports = function applyStaticHooks(model, hooks, statics) {
     return hook.model !== false;
   });
 
-  model.$__insertMany = hooks.createWrapper('insertMany',
-    model.$__insertMany, model, kareemOptions);
-
   for (const key of Object.keys(statics)) {
     if (hooks.hasHooks(key)) {
       const original = model[key];

From c647a051c5dcf61d0a3123dc28502afd39331fd1 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Tue, 24 Sep 2024 22:29:46 +0900
Subject: [PATCH 073/191] fix(model): skip applying static hooks by default if
 static name conflicts with model,document middleware

---
 test/model.test.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/test/model.test.js b/test/model.test.js
index c2e3f68c1e8..f162ea8f005 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -5891,6 +5891,54 @@ describe('Model', function() {
     assert.equal(called, 1);
   });
 
+  it('custom statics that overwrite model functions dont get hooks by default', async function() {
+
+    const schema = new Schema({ name: String });
+
+    schema.statics.insertMany = function(docs) {
+      return model.insertMany.apply(this, [docs]);
+    };
+
+    let called = 0;
+    schema.pre('insertMany', function(next) {
+      ++called;
+      next();
+    });
+    const Model = db.model('Test', schema);
+
+    const res = await Model.insertMany([
+      { name: 'foo' },
+      { name: 'boo' }
+    ]);
+
+    assert.ok(res[0].name);
+    assert.ok(res[1].name);
+    assert.equal(called, 1);
+  });
+
+  it('custom statics that overwrite document functions dont get hooks by default', async function() {
+
+    const schema = new Schema({ name: String });
+
+    schema.statics.save = async function() {
+      return 'foo';
+    };
+
+    let called = 0;
+    schema.pre('save', function(next) {
+      ++called;
+      next();
+    });
+
+    const Model = db.model('Test', schema);
+
+    const doc = await Model.save();
+
+    assert.ok(doc);
+    assert.equal(doc, 'foo');
+    assert.equal(called, 0);
+  });
+
   it('error handling middleware passes saved doc (gh-7832)', async function() {
     const schema = new Schema({ _id: Number });
 

From a06debe2363490bb140001a570ced20a4a0227e8 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Tue, 24 Sep 2024 23:46:34 +0900
Subject: [PATCH 074/191] fix: remove redundant async

---
 test/model.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/model.test.js b/test/model.test.js
index f162ea8f005..cca70e32fd8 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -5920,7 +5920,7 @@ describe('Model', function() {
 
     const schema = new Schema({ name: String });
 
-    schema.statics.save = async function() {
+    schema.statics.save = function() {
       return 'foo';
     };
 

From 328ddaacced5ac0ecf4fb10e054a8609d9d6c4e9 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 15:49:14 -0400
Subject: [PATCH 075/191] fix(document): avoid massive perf degradation when
 saving new doc with 10 level deep subdocs

Fix #14897
---
 lib/document.js       |  4 +++-
 test/document.test.js | 21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lib/document.js b/lib/document.js
index 64e65df8494..c12e0f03fb6 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -2724,7 +2724,9 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
       }
 
       if (doc.$isModified(fullPathToSubdoc, null, modifiedPaths) &&
-            !doc.isDirectModified(fullPathToSubdoc) &&
+            // Avoid using isDirectModified() here because that does additional checks on whether the parent path
+            // is direct modified, which can cause performance issues re: gh-14897
+            !doc.$__.activePaths.getStatePaths('modify').hasOwnProperty(fullPathToSubdoc) &&
             !doc.$isDefault(fullPathToSubdoc)) {
         paths.add(fullPathToSubdoc);
 
diff --git a/test/document.test.js b/test/document.test.js
index 6a5765fe116..7150ffe64b4 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13905,6 +13905,27 @@ describe('document', function() {
     const objectWithGetters = result.toObject({ getters: true, virtuals: false });
     assert.strictEqual(objectWithGetters.level1.level2.level3.property, 'TESTVALUE');
   });
+
+  it('handles inserting and saving large document with 10-level deep subdocs (gh-14897)', async function() {
+    const levels = 10;
+
+    let schema = new Schema({ test: { type: String, required: true } });
+    let doc = { test: 'gh-14897' };
+    for (let i = 0; i < levels; ++i) {
+      schema = new Schema({ level: Number, subdocs: [schema] });
+      doc = { level: (levels - i), subdocs: [{ ...doc }, { ...doc }] };
+    }
+
+    const Test = db.model('Test', schema);
+    const savedDoc = await Test.create(doc);
+
+    let cur = savedDoc;
+    for (let i = 0; i < levels - 1; ++i) {
+      cur = cur.subdocs[0];
+    }
+    cur.subdocs[0] = { test: 'updated' };
+    await savedDoc.save();
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {

From 04263295351f32e2b0c08d3ce79c9cd36fdf98ae Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 16:00:48 -0400
Subject: [PATCH 076/191] perf: add createDeepNestedDocArray benchmark re:
 #14897

---
 benchmarks/createDeepNestedDocArray.js | 37 ++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 benchmarks/createDeepNestedDocArray.js

diff --git a/benchmarks/createDeepNestedDocArray.js b/benchmarks/createDeepNestedDocArray.js
new file mode 100644
index 00000000000..0f3ac6d4a7b
--- /dev/null
+++ b/benchmarks/createDeepNestedDocArray.js
@@ -0,0 +1,37 @@
+'use strict';
+
+const mongoose = require('../');
+
+run().catch(err => {
+  console.error(err);
+  process.exit(-1);
+});
+
+async function run() {
+  await mongoose.connect('mongodb://127.0.0.1:27017/mongoose_benchmark');
+
+  const levels = 12;
+
+  let schema = new mongoose.Schema({ test: { type: String, required: true } });
+  let doc = { test: 'gh-14897' };
+  for (let i = 0; i < levels; ++i) {
+    schema = new mongoose.Schema({ level: Number, subdocs: [schema] });
+    doc = { level: (levels - i), subdocs: [{ ...doc }, { ...doc }] };
+  }
+  const Test = mongoose.model('Test', schema);
+
+  if (!process.env.MONGOOSE_BENCHMARK_SKIP_SETUP) {
+    await Test.deleteMany({});
+  }
+
+  const insertStart = Date.now();
+  await Test.create(doc);
+  const insertEnd = Date.now();
+
+  const results = {
+    'create() time ms': +(insertEnd - insertStart).toFixed(2)
+  };
+
+  console.log(JSON.stringify(results, null, '  '));
+  process.exit(0);
+}
\ No newline at end of file

From 5851261c1501fc58d3722513f708a1e87da63f4e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 17:30:33 -0400
Subject: [PATCH 077/191] perf(document): avoid unnecessarily pulling all
 subdocs when validating a subdoc

---
 lib/document.js | 66 ++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 31 deletions(-)

diff --git a/lib/document.js b/lib/document.js
index c12e0f03fb6..f17e0800ff7 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -2689,7 +2689,7 @@ function _evaluateRequiredFunctions(doc) {
  * ignore
  */
 
-function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
+function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate) {
   const doValidateOptions = {};
 
   _evaluateRequiredFunctions(doc);
@@ -2709,37 +2709,40 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
   Object.keys(doc.$__.activePaths.getStatePaths('default')).forEach(addToPaths);
   function addToPaths(p) { paths.add(p); }
 
-  const subdocs = doc.$getAllSubdocs();
-  const modifiedPaths = doc.modifiedPaths();
-  for (const subdoc of subdocs) {
-    if (subdoc.$basePath) {
-      const fullPathToSubdoc = subdoc.$isSingleNested ? subdoc.$__pathRelativeToParent() : subdoc.$__fullPathWithIndexes();
-
-      // Remove child paths for now, because we'll be validating the whole
-      // subdoc.
-      // The following is a faster take on looping through every path in `paths`
-      // and checking if the path starts with `fullPathToSubdoc` re: gh-13191
-      for (const modifiedPath of subdoc.modifiedPaths()) {
-        paths.delete(fullPathToSubdoc + '.' + modifiedPath);
-      }
+  if (!isNestedValidate) {
+    // If we're validating a subdocument, all this logic will run anyway on the top-level document, so skip for subdocuments
+    const subdocs = doc.$getAllSubdocs();
+    const modifiedPaths = doc.modifiedPaths();
+    for (const subdoc of subdocs) {
+      if (subdoc.$basePath) {
+        const fullPathToSubdoc = subdoc.$isSingleNested ? subdoc.$__pathRelativeToParent() : subdoc.$__fullPathWithIndexes();
+
+        // Remove child paths for now, because we'll be validating the whole
+        // subdoc.
+        // The following is a faster take on looping through every path in `paths`
+        // and checking if the path starts with `fullPathToSubdoc` re: gh-13191
+        for (const modifiedPath of subdoc.modifiedPaths()) {
+          paths.delete(fullPathToSubdoc + '.' + modifiedPath);
+        }
 
-      if (doc.$isModified(fullPathToSubdoc, null, modifiedPaths) &&
-            // Avoid using isDirectModified() here because that does additional checks on whether the parent path
-            // is direct modified, which can cause performance issues re: gh-14897
-            !doc.$__.activePaths.getStatePaths('modify').hasOwnProperty(fullPathToSubdoc) &&
-            !doc.$isDefault(fullPathToSubdoc)) {
-        paths.add(fullPathToSubdoc);
+        if (doc.$isModified(fullPathToSubdoc, null, modifiedPaths) &&
+              // Avoid using isDirectModified() here because that does additional checks on whether the parent path
+              // is direct modified, which can cause performance issues re: gh-14897
+              !doc.$__.activePaths.getStatePaths('modify').hasOwnProperty(fullPathToSubdoc) &&
+              !doc.$isDefault(fullPathToSubdoc)) {
+          paths.add(fullPathToSubdoc);
 
-        if (doc.$__.pathsToScopes == null) {
-          doc.$__.pathsToScopes = {};
-        }
-        doc.$__.pathsToScopes[fullPathToSubdoc] = subdoc.$isDocumentArrayElement ?
-          subdoc.__parentArray :
-          subdoc.$parent();
+          if (doc.$__.pathsToScopes == null) {
+            doc.$__.pathsToScopes = {};
+          }
+          doc.$__.pathsToScopes[fullPathToSubdoc] = subdoc.$isDocumentArrayElement ?
+            subdoc.__parentArray :
+            subdoc.$parent();
 
-        doValidateOptions[fullPathToSubdoc] = { skipSchemaValidators: true };
-        if (subdoc.$isDocumentArrayElement && subdoc.__index != null) {
-          doValidateOptions[fullPathToSubdoc].index = subdoc.__index;
+          doValidateOptions[fullPathToSubdoc] = { skipSchemaValidators: true };
+          if (subdoc.$isDocumentArrayElement && subdoc.__index != null) {
+            doValidateOptions[fullPathToSubdoc].index = subdoc.__index;
+          }
         }
       }
     }
@@ -2974,7 +2977,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
     paths = [...paths];
     doValidateOptionsByPath = {};
   } else {
-    const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
+    const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip, options && options._nestedValidate);
     paths = shouldValidateModifiedOnly ?
       pathDetails[0].filter((path) => this.$isModified(path)) :
       pathDetails[0];
@@ -3061,7 +3064,8 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
       const doValidateOptions = {
         ...doValidateOptionsByPath[path],
         path: path,
-        validateAllPaths
+        validateAllPaths,
+        _nestedValidate: true
       };
 
       schemaType.doValidate(val, function(err) {

From bcbc9e0bbf2b2cf4cac452d577d205b6521353b0 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 17:33:43 -0400
Subject: [PATCH 078/191] Update lib/model.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 777a36607a9..849ecb13340 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3521,7 +3521,7 @@ Model.applyDefaults = function applyDefaults(doc) {
  *     obj.name; // 'John'
  *     obj.upper; // 'JOHN', Mongoose applied the return value of the virtual to the given object
  *
- * @param {Object} obj object or document to apply virtuals on
+ * @param {Object} doc object or document to apply virtuals on
  * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
  * @returns {Object} obj
  * @api public

From a19992962a2c9ba000bae49b5a16586808ce7299 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 17:33:48 -0400
Subject: [PATCH 079/191] Update lib/model.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 849ecb13340..8978718d5bb 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3523,7 +3523,7 @@ Model.applyDefaults = function applyDefaults(doc) {
  *
  * @param {Object} doc object or document to apply virtuals on
  * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
- * @returns {Object} obj
+ * @returns {Object} doc
  * @api public
  */
 

From c143d8ec59ff912f7bb3ef8ca0ebb485f25c565d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 24 Sep 2024 17:34:38 -0400
Subject: [PATCH 080/191] remove duplicate test

---
 test/model.test.js | 43 -------------------------------------------
 1 file changed, 43 deletions(-)

diff --git a/test/model.test.js b/test/model.test.js
index 242cd2333c2..8921bf9cd80 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -7905,49 +7905,6 @@ describe('Model', function() {
       assert.strictEqual(res.name.lastLower, 'gates');
     });
 
-    it('supports passing an array of virtuals to apply', async function() {
-      const userSchema = new Schema({
-        name: {
-          first: String,
-          last: String
-        }
-      });
-      userSchema.virtual('fullName').get(function() {
-        return `${this.name.first} ${this.name.last}`;
-      });
-      userSchema.virtual('name.firstUpper').get(function() {
-        return this.name.first.toUpperCase();
-      });
-      userSchema.virtual('name.lastLower').get(function() {
-        return this.name.last.toLowerCase();
-      });
-      const User = db.model('User', userSchema);
-
-      let res = User.applyVirtuals({
-        name: {
-          first: 'Bill',
-          last: 'Gates'
-        }
-      }, ['fullName', 'name.firstUpper']);
-      assert.strictEqual(res.name.first, 'Bill');
-      assert.strictEqual(res.name.last, 'Gates');
-      assert.strictEqual(res.fullName, 'Bill Gates');
-      assert.strictEqual(res.name.firstUpper, 'BILL');
-      assert.strictEqual(res.name.lastLower, undefined);
-
-      res = User.applyVirtuals({
-        name: {
-          first: 'Bill',
-          last: 'Gates'
-        }
-      }, ['name.lastLower']);
-      assert.strictEqual(res.name.first, 'Bill');
-      assert.strictEqual(res.name.last, 'Gates');
-      assert.strictEqual(res.fullName, undefined);
-      assert.strictEqual(res.name.firstUpper, undefined);
-      assert.strictEqual(res.name.lastLower, 'gates');
-    });
-
     it('sets populate virtuals to `null` if `justOne`', async function() {
       const userSchema = new Schema({
         name: {

From 660aad0ec15782eb2ffc8f6a20a0daf281ecd693 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 10:29:20 -0400
Subject: [PATCH 081/191] docs(applyVirtuals): add jsdoc comments and clean up
 some unnecessary code

---
 lib/helpers/document/applyVirtuals.js | 89 ++++++++++++++-------------
 lib/model.js                          | 18 +++---
 2 files changed, 56 insertions(+), 51 deletions(-)

diff --git a/lib/helpers/document/applyVirtuals.js b/lib/helpers/document/applyVirtuals.js
index e3869440b90..43cb0a047cd 100644
--- a/lib/helpers/document/applyVirtuals.js
+++ b/lib/helpers/document/applyVirtuals.js
@@ -4,7 +4,16 @@ const mpath = require('mpath');
 
 module.exports = applyVirtuals;
 
-function applyVirtuals(schema, doc, virtuals, parent) {
+/**
+ * Apply a given schema's virtuals to a given POJO
+ *
+ * @param {Schema} schema
+ * @param {Object} doc
+ * @param {Array<string>} [virtuals] optional whitelist of virtuals to apply
+ * @returns
+ */
+
+function applyVirtuals(schema, doc, virtuals) {
   if (doc == null) {
     return doc;
   }
@@ -15,9 +24,7 @@ function applyVirtuals(schema, doc, virtuals, parent) {
   if (Array.isArray(virtuals)) {
     virtualsForChildren = [];
     toApply = [];
-    const len = virtuals.length;
-    for (let i = 0; i < len; ++i) {
-      const virtual = virtuals[i];
+    for (const virtual of virtuals) {
       if (virtual.length === 1) {
         toApply.push(virtual[0]);
       } else {
@@ -26,28 +33,23 @@ function applyVirtuals(schema, doc, virtuals, parent) {
     }
   }
 
-  applyVirtualsToChildren(this, schema, doc, virtualsForChildren, parent);
-  return applyVirtualsToDocs(schema, doc, toApply);
+  applyVirtualsToChildren(schema, doc, virtualsForChildren);
+  return applyVirtualsToDoc(schema, doc, toApply);
 }
 
-function applyVirtualsToDocs(schema, res, toApply) {
-  if (Array.isArray(res)) {
-    const len = res.length;
-    for (let i = 0; i < len; ++i) {
-      applyVirtualsToDoc(schema, res[i], toApply);
-    }
-    return res;
-  } else {
-    return applyVirtualsToDoc(schema, res, toApply);
-  }
-}
+/**
+ * Apply virtuals to any subdocuments
+ *
+ * @param {Schema} schema subdocument schema
+ * @param {Object} res subdocument
+ * @param {Array<String>} [virtuals] optional whitelist of virtuals to apply
+ */
 
-function applyVirtualsToChildren(doc, schema, res, virtuals, parent) {
-  const len = schema.childSchemas.length;
+function applyVirtualsToChildren(schema, res, virtuals) {
   let attachedVirtuals = false;
-  for (let i = 0; i < len; ++i) {
-    const _path = schema.childSchemas[i].model.path;
-    const _schema = schema.childSchemas[i].schema;
+  for (const childSchema of schema.childSchemas) {
+    const _path = childSchema.model.path;
+    const _schema = childSchema.schema;
     if (!_path) {
       continue;
     }
@@ -59,9 +61,7 @@ function applyVirtualsToChildren(doc, schema, res, virtuals, parent) {
     let virtualsForChild = null;
     if (Array.isArray(virtuals)) {
       virtualsForChild = [];
-      const len = virtuals.length;
-      for (let i = 0; i < len; ++i) {
-        const virtual = virtuals[i];
+      for (const virtual of virtuals) {
         if (virtual[0] == _path) {
           virtualsForChild.push(virtual.slice(1));
         }
@@ -72,22 +72,31 @@ function applyVirtualsToChildren(doc, schema, res, virtuals, parent) {
       }
     }
 
-    applyVirtuals.call(doc, _schema, _doc, virtualsForChild, res);
+    applyVirtuals(_schema, _doc, virtualsForChild);
     attachedVirtuals = true;
   }
 
   if (virtuals && virtuals.length && !attachedVirtuals) {
-    applyVirtualsToDoc(schema, res, virtuals, parent);
+    applyVirtualsToDoc(schema, res, virtuals);
   }
 }
 
+/**
+ * Apply virtuals to a given document. Does not apply virtuals to subdocuments: use `applyVirtualsToChildren` instead
+ *
+ * @param {Schema} schema
+ * @param {Object} doc
+ * @param {Array<String>} [virtuals] optional whitelist of virtuals to apply
+ * @returns
+ */
+
 function applyVirtualsToDoc(schema, doc, virtuals) {
   if (doc == null || typeof doc !== 'object') {
     return;
   }
   if (Array.isArray(doc)) {
-    for (let i = 0; i < doc.length; ++i) {
-      applyVirtualsToDoc(schema, doc[i], virtuals);
+    for (const el of doc) {
+      applyVirtualsToDoc(schema, el, virtuals);
     }
     return;
   }
@@ -107,25 +116,25 @@ function applyVirtualsToDoc(schema, doc, virtuals) {
   if (virtuals == null) {
     virtuals = Object.keys(schema.virtuals);
   }
-  const numVirtuals = virtuals.length;
-  for (let i = 0; i < numVirtuals; ++i) {
-    const virtual = virtuals[i];
+  for (const virtual of virtuals) {
     if (schema.virtuals[virtual] == null) {
       continue;
     }
     const virtualType = schema.virtuals[virtual];
     const sp = Array.isArray(virtual)
-      ? virtual :
-      virtual.indexOf('.') === -1
+      ? virtual
+      : virtual.indexOf('.') === -1
         ? [virtual]
         : virtual.split('.');
     let cur = doc;
-    for (let j = 0; j < sp.length - 1; ++j) {
-      cur[sp[j]] = sp[j] in cur ? cur[sp[j]] : {};
-      cur = cur[sp[j]];
+    for (let i = 0; i < sp.length - 1; ++i) {
+      cur[sp[i]] = sp[i] in cur ? cur[sp[i]] : {};
+      cur = cur[sp[i]];
     }
     let val = virtualType.applyGetters(cur[sp[sp.length - 1]], doc);
-    if (isPopulateVirtual(virtualType) && val === undefined) {
+    const isPopulateVirtual =
+      virtualType.options && (virtualType.options.ref || virtualType.options.refPath);
+    if (isPopulateVirtual && val === undefined) {
       if (virtualType.options.justOne) {
         val = null;
       } else {
@@ -135,7 +144,3 @@ function applyVirtualsToDoc(schema, doc, virtuals) {
     cur[sp[sp.length - 1]] = val;
   }
 }
-
-function isPopulateVirtual(virtualType) {
-  return virtualType.options && (virtualType.options.ref || virtualType.options.refPath);
-}
diff --git a/lib/model.js b/lib/model.js
index 8978718d5bb..1c361bcb495 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3521,24 +3521,24 @@ Model.applyDefaults = function applyDefaults(doc) {
  *     obj.name; // 'John'
  *     obj.upper; // 'JOHN', Mongoose applied the return value of the virtual to the given object
  *
- * @param {Object} doc object or document to apply virtuals on
+ * @param {Object} obj object or document to apply virtuals on
  * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
- * @returns {Object} doc
+ * @returns {Object} obj
  * @api public
  */
 
-Model.applyVirtuals = function applyVirtuals(doc, virtualsToApply) {
-  if (doc == null) {
-    return doc;
+Model.applyVirtuals = function applyVirtuals(obj, virtualsToApply) {
+  if (obj == null) {
+    return obj;
   }
   // Nothing to do if this is already a hydrated document - it should already have virtuals
-  if (doc.$__ != null) {
-    return doc;
+  if (obj.$__ != null) {
+    return obj;
   }
 
-  applyVirtualsHelper(this.schema, doc, virtualsToApply, null);
+  applyVirtualsHelper(this.schema, obj, virtualsToApply);
 
-  return doc;
+  return obj;
 };
 
 /**

From fdfb3856ef8833ca86f7f1f53c7cddc5a4518886 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 10:33:06 -0400
Subject: [PATCH 082/191] refactor: rename doc to obj in applyVirtuals helper

---
 lib/helpers/document/applyVirtuals.js | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lib/helpers/document/applyVirtuals.js b/lib/helpers/document/applyVirtuals.js
index 43cb0a047cd..5fbe7ca82ba 100644
--- a/lib/helpers/document/applyVirtuals.js
+++ b/lib/helpers/document/applyVirtuals.js
@@ -8,14 +8,14 @@ module.exports = applyVirtuals;
  * Apply a given schema's virtuals to a given POJO
  *
  * @param {Schema} schema
- * @param {Object} doc
+ * @param {Object} obj
  * @param {Array<string>} [virtuals] optional whitelist of virtuals to apply
  * @returns
  */
 
-function applyVirtuals(schema, doc, virtuals) {
-  if (doc == null) {
-    return doc;
+function applyVirtuals(schema, obj, virtuals) {
+  if (obj == null) {
+    return obj;
   }
 
   let virtualsForChildren = virtuals;
@@ -33,8 +33,8 @@ function applyVirtuals(schema, doc, virtuals) {
     }
   }
 
-  applyVirtualsToChildren(schema, doc, virtualsForChildren);
-  return applyVirtualsToDoc(schema, doc, toApply);
+  applyVirtualsToChildren(schema, obj, virtualsForChildren);
+  return applyVirtualsToDoc(schema, obj, toApply);
 }
 
 /**
@@ -53,8 +53,8 @@ function applyVirtualsToChildren(schema, res, virtuals) {
     if (!_path) {
       continue;
     }
-    const _doc = mpath.get(_path, res);
-    if (_doc == null || (Array.isArray(_doc) && _doc.flat(Infinity).length === 0)) {
+    const _obj = mpath.get(_path, res);
+    if (_obj == null || (Array.isArray(_obj) && _obj.flat(Infinity).length === 0)) {
       continue;
     }
 
@@ -72,7 +72,7 @@ function applyVirtualsToChildren(schema, res, virtuals) {
       }
     }
 
-    applyVirtuals(_schema, _doc, virtualsForChild);
+    applyVirtuals(_schema, _obj, virtualsForChild);
     attachedVirtuals = true;
   }
 
@@ -90,12 +90,12 @@ function applyVirtualsToChildren(schema, res, virtuals) {
  * @returns
  */
 
-function applyVirtualsToDoc(schema, doc, virtuals) {
-  if (doc == null || typeof doc !== 'object') {
+function applyVirtualsToDoc(schema, obj, virtuals) {
+  if (obj == null || typeof obj !== 'object') {
     return;
   }
-  if (Array.isArray(doc)) {
-    for (const el of doc) {
+  if (Array.isArray(obj)) {
+    for (const el of obj) {
       applyVirtualsToDoc(schema, el, virtuals);
     }
     return;
@@ -106,7 +106,7 @@ function applyVirtualsToDoc(schema, doc, virtuals) {
       const discriminator = schema.discriminators[discriminatorKey];
       const key = discriminator.discriminatorMapping.key;
       const value = discriminator.discriminatorMapping.value;
-      if (doc[key] == value) {
+      if (obj[key] == value) {
         schema = discriminator;
         break;
       }
@@ -126,12 +126,12 @@ function applyVirtualsToDoc(schema, doc, virtuals) {
       : virtual.indexOf('.') === -1
         ? [virtual]
         : virtual.split('.');
-    let cur = doc;
+    let cur = obj;
     for (let i = 0; i < sp.length - 1; ++i) {
       cur[sp[i]] = sp[i] in cur ? cur[sp[i]] : {};
       cur = cur[sp[i]];
     }
-    let val = virtualType.applyGetters(cur[sp[sp.length - 1]], doc);
+    let val = virtualType.applyGetters(cur[sp[sp.length - 1]], obj);
     const isPopulateVirtual =
       virtualType.options && (virtualType.options.ref || virtualType.options.refPath);
     if (isPopulateVirtual && val === undefined) {

From 1f7c742c31e9763ca4ffa65bbd799d46aba81d57 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 10:36:33 -0400
Subject: [PATCH 083/191] Update applyStaticHooks.js

---
 lib/helpers/model/applyStaticHooks.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/helpers/model/applyStaticHooks.js b/lib/helpers/model/applyStaticHooks.js
index 8e2c33a3bf9..3d0e1297160 100644
--- a/lib/helpers/model/applyStaticHooks.js
+++ b/lib/helpers/model/applyStaticHooks.js
@@ -3,14 +3,14 @@
 const promiseOrCallback = require('../promiseOrCallback');
 const { queryMiddlewareFunctions, aggregateMiddlewareFunctions, modelMiddlewareFunctions, documentMiddlewareFunctions } = require('../../constants');
 
-const middlewareFunctions = [
-  ...[
+const middlewareFunctions = Array.from(
+  new Set([
     ...queryMiddlewareFunctions,
     ...aggregateMiddlewareFunctions,
     ...modelMiddlewareFunctions,
     ...documentMiddlewareFunctions
-  ].reduce((s, hook) => s.add(hook), new Set())
-];
+  ])  
+);
 
 module.exports = function applyStaticHooks(model, hooks, statics) {
   const kareemOptions = {

From 95500b606765147cb92751b092d69463df55d40a Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 12:23:59 -0400
Subject: [PATCH 084/191] perf(document): remove unnecessary reset logic

Re: #14897
Re: #10295
---
 lib/document.js | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/lib/document.js b/lib/document.js
index f17e0800ff7..8fe85a5a143 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -3484,44 +3484,9 @@ Document.prototype.$__reset = function reset() {
   // Skip for subdocuments
   const subdocs = !this.$isSubdocument ? this.$getAllSubdocs() : null;
   if (subdocs && subdocs.length > 0) {
-    const resetArrays = new Set();
     for (const subdoc of subdocs) {
-      const fullPathWithIndexes = subdoc.$__fullPathWithIndexes();
       subdoc.$__reset();
-      if (this.isModified(fullPathWithIndexes) || isParentInit(fullPathWithIndexes)) {
-        if (subdoc.$isDocumentArrayElement) {
-          resetArrays.add(subdoc.parentArray());
-        } else {
-          const parent = subdoc.$parent();
-          if (parent === this) {
-            this.$__.activePaths.clearPath(subdoc.$basePath);
-          } else if (parent != null && parent.$isSubdocument) {
-            // If map path underneath subdocument, may end up with a case where
-            // map path is modified but parent still needs to be reset. See gh-10295
-            parent.$__reset();
-          }
-        }
-      }
     }
-
-    for (const array of resetArrays) {
-      this.$__.activePaths.clearPath(array.$path());
-      array[arrayAtomicsBackupSymbol] = array[arrayAtomicsSymbol];
-      array[arrayAtomicsSymbol] = {};
-    }
-  }
-
-  function isParentInit(path) {
-    path = path.indexOf('.') === -1 ? [path] : path.split('.');
-    let cur = '';
-    for (let i = 0; i < path.length; ++i) {
-      cur += (cur.length ? '.' : '') + path[i];
-      if (_this.$__.activePaths[cur] === 'init') {
-        return true;
-      }
-    }
-
-    return false;
   }
 
   // clear atomics

From 8522f39f1cac3cb3f14aa82023e93f710966a0f1 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 12:26:49 -0400
Subject: [PATCH 085/191] style: fix lint

---
 lib/helpers/model/applyStaticHooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers/model/applyStaticHooks.js b/lib/helpers/model/applyStaticHooks.js
index 3d0e1297160..40116462f26 100644
--- a/lib/helpers/model/applyStaticHooks.js
+++ b/lib/helpers/model/applyStaticHooks.js
@@ -9,7 +9,7 @@ const middlewareFunctions = Array.from(
     ...aggregateMiddlewareFunctions,
     ...modelMiddlewareFunctions,
     ...documentMiddlewareFunctions
-  ])  
+  ])
 );
 
 module.exports = function applyStaticHooks(model, hooks, statics) {

From 3ede837b6c2446d9be89ec83f54ce269c5b813cb Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 14:01:42 -0400
Subject: [PATCH 086/191] chore: release 7.8.2

---
 CHANGELOG.md | 4 ++++
 package.json | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c03b7a48d8..7dba26f3222 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+7.8.2 / 2024-09-25
+==================
+ * fix(projection): avoid setting projection to unknown exclusive/inclusive if elemMatch on a Date, ObjectId, etc. #14894 #14893
+
 6.13.2 / 2024-09-12
 ===================
  * fix(document): make set() respect merge option on deeply nested objects #14870 #14878
diff --git a/package.json b/package.json
index 92169d360ca..8535736c6b1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.8.1",
+  "version": "7.8.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 5b86fa39d3253253498edad5e6a26ea862b3432c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 25 Sep 2024 15:25:55 -0400
Subject: [PATCH 087/191] feat: upgrade mongodb -> 6.9.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5b5fa843259..ad2a28ff31d 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "bson": "^6.7.0",
     "kareem": "2.6.3",
-    "mongodb": "6.8.0",
+    "mongodb": "6.9.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",

From 54844e31540079550a522abde157cb9f7fcbe815 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 26 Sep 2024 11:43:27 -0400
Subject: [PATCH 088/191] types: add applyVirtuals() to types

---
 types/models.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/types/models.d.ts b/types/models.d.ts
index 4c2403fd51b..0a5e6e3a585 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -290,6 +290,9 @@ declare module 'mongoose' {
     applyDefaults(obj: AnyObject): AnyObject;
     applyDefaults(obj: TRawDocType): TRawDocType;
 
+    /* Apply virtuals to the given POJO. */
+    applyVirtuals(obj: AnyObject, virtalsToApply?: string[]): AnyObject;
+
     /**
      * Sends multiple `insertOne`, `updateOne`, `updateMany`, `replaceOne`,
      * `deleteOne`, and/or `deleteMany` operations to the MongoDB server in one

From c4d96eac3c72ee620064337373b5b82b8608fcbe Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 26 Sep 2024 13:33:18 -0400
Subject: [PATCH 089/191] chore: release 8.6.4

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 67e0ae75260..f7083ac3ed4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+8.6.4 / 2024-09-26
+==================
+ * fix(document): avoid massive perf degradation when saving new doc with 10 level deep subdocs #14910 #14897
+ * fix(model): skip applying static hooks by default if static name conflicts with aggregate middleware #14904 [dragontaek-lee](https://github.com/dragontaek-lee)
+ * fix(model): filter applying static hooks by default if static name conflicts with mongoose middleware #14908 [dragontaek-lee](https://github.com/dragontaek-lee)
+
 7.8.2 / 2024-09-25
 ==================
  * fix(projection): avoid setting projection to unknown exclusive/inclusive if elemMatch on a Date, ObjectId, etc. #14894 #14893
diff --git a/package.json b/package.json
index 5b5fa843259..abfd730669d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.6.3",
+  "version": "8.6.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 136cab562bb6f09a6e53b1b4124f99a93fc20679 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 27 Sep 2024 10:56:56 -0400
Subject: [PATCH 090/191] chore: release 8.7.0

---
 CHANGELOG.md | 11 +++++++++++
 package.json |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7083ac3ed4..290b535fd8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+8.7.0 / 2024-09-27
+==================
+ * feat(model): add Model.applyVirtuals() to apply virtuals to a POJO #14905 #14818
+ * feat: upgrade mongodb -> 6.9.0 #14914
+ * feat(query): cast $rename to string #14887 #3027
+ * feat(SchemaType): add getEmbeddedSchemaType() method to SchemaTypes #14880 #8389
+ * fix(model): throw MongooseBulkSaveIncompleteError if bulkSave() didn't completely succeed #14884 #14763
+ * fix(connection): avoid returning readyState = connected if connection state is stale #14812 #14727
+ * fix: depopulate if push() or addToSet() with an ObjectId on a populated array #14883 #1635
+ * types: make __v a number, only set __v on top-level documents #14892
+
 8.6.4 / 2024-09-26
 ==================
  * fix(document): avoid massive perf degradation when saving new doc with 10 level deep subdocs #14910 #14897
diff --git a/package.json b/package.json
index ee29538ad81..d51943ee627 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.6.4",
+  "version": "8.7.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From fdda2dbea0bd418bfed0ae248dcd49f2b2050a51 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:40:16 +0000
Subject: [PATCH 091/191] chore(deps): bump actions/setup-node from 4.0.3 to
 4.0.4

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.3 to 4.0.4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/1e60f620b9541d16bece96c5465dc8ee9832be0b...0a44ba7841725637a19e28fa30b79a866c81b0a6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/benchmark.yml          | 2 +-
 .github/workflows/documentation.yml      | 4 ++--
 .github/workflows/test.yml               | 8 ++++----
 .github/workflows/tidelift-alignment.yml | 2 +-
 .github/workflows/tsd.yml                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 052b34b1075..0ca22711966 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 16
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 4a5073066c9..f95f3697a25 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 20
 
@@ -52,7 +52,7 @@ jobs:
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 20
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7bd4ceea192..bd7c7187439 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 18
 
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: ${{ matrix.node }}
 
@@ -96,7 +96,7 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 16
       - name: Load MongoDB binary cache
@@ -124,7 +124,7 @@ jobs:
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 16
       - run: npm install
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
index f79e17a20bf..ab4008f2db0 100644
--- a/.github/workflows/tidelift-alignment.yml
+++ b/.github/workflows/tidelift-alignment.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 16
       - name: Alignment
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
index e5102805477..1e1d478b017 100644
--- a/.github/workflows/tsd.yml
+++ b/.github/workflows/tsd.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 18
 
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
       - name: Setup node
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
           node-version: 16
 

From 5129c801ced7b20932734bc1f63b1c8bd735494b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:40:21 +0000
Subject: [PATCH 092/191] chore(deps): bump actions/checkout from 4.1.7 to
 4.2.0

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.7 to 4.2.0.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/692973e3d937129bcbf40652eb9f2f61becf3332...d632683dd7b4114ad314bca15554477dd762a938)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/benchmark.yml          |  2 +-
 .github/workflows/codeql.yml             |  2 +-
 .github/workflows/documentation.yml      |  4 ++--
 .github/workflows/test.yml               | 10 +++++-----
 .github/workflows/tidelift-alignment.yml |  2 +-
 .github/workflows/tsd.yml                |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 052b34b1075..00da2c2437e 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Benchmark TypeScript Types
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
         with:
           fetch-depth: 0
       - name: Setup node
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index efa77ce7fa8..e11f457af01 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 4a5073066c9..c1a8f453e18 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint Markdown files
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Test Generating Docs
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7bd4ceea192..248636dd77b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint JS-Files
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
@@ -58,7 +58,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
@@ -94,7 +94,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
@@ -122,7 +122,7 @@ jobs:
     env:
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
@@ -139,6 +139,6 @@ jobs:
       contents: read
     steps:
       - name: Check out repo
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Dependency review
         uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
index f79e17a20bf..d78dd4c8341 100644
--- a/.github/workflows/tidelift-alignment.yml
+++ b/.github/workflows/tidelift-alignment.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'Automattic/mongoose'
     steps:
       - name: Checkout
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
index e5102805477..298be68e633 100644
--- a/.github/workflows/tsd.yml
+++ b/.github/workflows/tsd.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint TS-Files
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Test Typescript Types
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
         uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3

From aca5f3d483e9ffe28db3cf00c61095914176cd92 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:48:56 +0000
Subject: [PATCH 093/191] chore(deps-dev): bump markdownlint-cli2 from 0.13.0
 to 0.14.0

Bumps [markdownlint-cli2](https://github.com/DavidAnson/markdownlint-cli2) from 0.13.0 to 0.14.0.
- [Changelog](https://github.com/DavidAnson/markdownlint-cli2/blob/main/CHANGELOG.md)
- [Commits](https://github.com/DavidAnson/markdownlint-cli2/compare/v0.13.0...v0.14.0)

---
updated-dependencies:
- dependency-name: markdownlint-cli2
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d51943ee627..ffab1ba1a78 100644
--- a/package.json
+++ b/package.json
@@ -52,7 +52,7 @@
     "highlight.js": "11.10.0",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "^0.13.0",
+    "markdownlint-cli2": "^0.14.0",
     "marked": "14.1.0",
     "mkdirp": "^3.0.1",
     "mocha": "10.7.3",

From 8309a5fd28b70ffa5cadc5175163923edd7be233 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:49:16 +0000
Subject: [PATCH 094/191] chore(deps-dev): bump webpack from 5.94.0 to 5.95.0

Bumps [webpack](https://github.com/webpack/webpack) from 5.94.0 to 5.95.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.94.0...v5.95.0)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d51943ee627..4165c499d5f 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "tsd": "0.31.1",
     "typescript": "5.5.4",
     "uuid": "10.0.0",
-    "webpack": "5.94.0"
+    "webpack": "5.95.0"
   },
   "directories": {
     "lib": "./lib/mongoose"

From 5e56caaf061520d55e4f705ac03fd85a8fe8a29b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:49:33 +0000
Subject: [PATCH 095/191] chore(deps-dev): bump mongodb-memory-server from
 10.0.0 to 10.0.1

Bumps [mongodb-memory-server](https://github.com/typegoose/mongodb-memory-server/tree/HEAD/packages/mongodb-memory-server) from 10.0.0 to 10.0.1.
- [Release notes](https://github.com/typegoose/mongodb-memory-server/releases)
- [Changelog](https://github.com/typegoose/mongodb-memory-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/typegoose/mongodb-memory-server/commits/v10.0.1/packages/mongodb-memory-server)

---
updated-dependencies:
- dependency-name: mongodb-memory-server
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d51943ee627..d5dc5ec66ba 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "mkdirp": "^3.0.1",
     "mocha": "10.7.3",
     "moment": "2.30.1",
-    "mongodb-memory-server": "10.0.0",
+    "mongodb-memory-server": "10.0.1",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.3",

From 22f10897f5e6d2c3c521a610d5c322531a464b24 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Oct 2024 23:50:29 +0000
Subject: [PATCH 096/191] chore(deps-dev): bump sinon from 18.0.0 to 19.0.2

Bumps [sinon](https://github.com/sinonjs/sinon) from 18.0.0 to 19.0.2.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v18.0.0...v19.0.2)

---
updated-dependencies:
- dependency-name: sinon
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d51943ee627..1eabe5b4af4 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "nyc": "15.1.0",
     "pug": "3.0.3",
     "q": "1.5.1",
-    "sinon": "18.0.0",
+    "sinon": "19.0.2",
     "stream-browserify": "3.0.0",
     "tsd": "0.31.1",
     "typescript": "5.5.4",

From 4757bcdc53fa11af658d1c9acbdbb6292f055618 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 1 Oct 2024 21:19:34 -0400
Subject: [PATCH 097/191] fix: handle buffers stored in MongoDB as EJSON
 representation with { $binary }

Fix #14911
---
 lib/schema/buffer.js  |  8 ++++++++
 test/document.test.js | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/lib/schema/buffer.js b/lib/schema/buffer.js
index 6444ebd8835..e5cec2e0158 100644
--- a/lib/schema/buffer.js
+++ b/lib/schema/buffer.js
@@ -219,6 +219,14 @@ SchemaBuffer.prototype.cast = function(value, doc, init) {
     return ret;
   }
 
+  if (utils.isPOJO(value) && (value.$binary instanceof Binary || typeof value.$binary === 'string')) {
+    const buf = this.cast(Buffer.from(value.$binary, 'base64'));
+    if (value.$type != null) {
+      buf._subtype = value.$type;
+      return buf;
+    }
+  }
+
   throw new CastError('Buffer', value, this.path, null, this);
 };
 
diff --git a/test/document.test.js b/test/document.test.js
index 7150ffe64b4..d3c3f4a86ff 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13926,6 +13926,35 @@ describe('document', function() {
     cur.subdocs[0] = { test: 'updated' };
     await savedDoc.save();
   });
+
+  it('handles buffers stored as EJSON POJO (gh-14911)', async function() {
+    const pdfSchema = new mongoose.Schema({
+      pdfSettings: {
+        type: {
+          _id: false,
+          fileContent: { type: Buffer, required: true },
+          filePreview: { type: Buffer, required: true },
+          fileName: { type: String, required: true }
+        }
+      }
+    });
+    const PdfModel = db.model('Test', pdfSchema);
+
+    const _id = new mongoose.Types.ObjectId();
+    const buf = { $binary: Buffer.from('hello', 'utf8').toString('base64'), $type: '00' };
+    await PdfModel.collection.insertOne({
+      _id,
+      pdfSettings: {
+        fileContent: buf,
+        filePreview: buf,
+        fileName: 'sample.pdf'
+      }
+    });
+
+    const reloaded = await PdfModel.findById(_id);
+    assert.ok(Buffer.isBuffer(reloaded.pdfSettings.fileContent));
+    assert.strictEqual(reloaded.pdfSettings.fileContent.toString('utf8'), 'hello');
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {

From 13e1610cd952523b2b0814cd5314a27efe406eb2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:41:06 +0000
Subject: [PATCH 098/191] chore(deps-dev): bump marked from 14.1.0 to 14.1.2

Bumps [marked](https://github.com/markedjs/marked) from 14.1.0 to 14.1.2.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v14.1.0...v14.1.2)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cd4faf5b49e..baa4d2533d1 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "^0.14.0",
-    "marked": "14.1.0",
+    "marked": "14.1.2",
     "mkdirp": "^3.0.1",
     "mocha": "10.7.3",
     "moment": "2.30.1",

From 944031c948d0313a867c7bb833ca4170f6822b01 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:45:31 +0000
Subject: [PATCH 099/191] chore(deps-dev): bump typescript from 5.5.4 to 5.6.2

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.5.4 to 5.6.2.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.5.4...v5.6.2)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8c7e7303ad0..ae657c8a6d8 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "sinon": "19.0.2",
     "stream-browserify": "3.0.0",
     "tsd": "0.31.1",
-    "typescript": "5.5.4",
+    "typescript": "5.6.2",
     "uuid": "10.0.0",
     "webpack": "5.95.0"
   },

From e04c7f65114892e588e6290a6023f620140f1d9b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 3 Oct 2024 17:45:32 +0000
Subject: [PATCH 100/191] chore(deps-dev): bump tsd from 0.31.1 to 0.31.2

Bumps [tsd](https://github.com/tsdjs/tsd) from 0.31.1 to 0.31.2.
- [Release notes](https://github.com/tsdjs/tsd/releases)
- [Commits](https://github.com/tsdjs/tsd/compare/v0.31.1...v0.31.2)

---
updated-dependencies:
- dependency-name: tsd
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8c7e7303ad0..40a5ab2c41b 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "q": "1.5.1",
     "sinon": "19.0.2",
     "stream-browserify": "3.0.0",
-    "tsd": "0.31.1",
+    "tsd": "0.31.2",
     "typescript": "5.5.4",
     "uuid": "10.0.0",
     "webpack": "5.95.0"

From af0f01186aca344d8d47e08a8be00703529e000b Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 6 Oct 2024 12:22:59 -0400
Subject: [PATCH 101/191] fix: add mongodb 8 to test matrix

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cb5776a2516..12a1fdd10d4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -41,7 +41,7 @@ jobs:
       matrix:
         node: [16, 18, 20]
         os: [ubuntu-20.04, ubuntu-22.04]
-        mongodb: [4.4.29, 5.0.26, 6.0.15, 7.0.12]
+        mongodb: [4.4.29, 5.0.26, 6.0.15, 7.0.12, 8.0.0]
         include:
           - os: ubuntu-20.04 # customize on which matrix the coverage will be collected on
             mongodb: 5.0.26

From 682a9e9060961e2909b76ab7b81d2ba6c9b9d478 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 6 Oct 2024 12:25:42 -0400
Subject: [PATCH 102/191] docs: indicate that Mongoose 8.7 is required for full
 MongoDB 8 support

---
 docs/compatibility.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/compatibility.md b/docs/compatibility.md
index f183a4f67b1..a343a470131 100644
--- a/docs/compatibility.md
+++ b/docs/compatibility.md
@@ -18,6 +18,7 @@ Below are the [semver](http://semver.org/) ranges representing which versions of
 
 | MongoDB Server |                Mongoose                 |
 | :------------: | :-------------------------------------: |
+|     `8.x`      |                 `^8.7.0`                |
 |     `7.x`      |            `^7.4.0 \| ^8.0.0`           |
 |     `6.x`      |      `^6.5.0 \| ^7.0.0 \| ^8.0.0`       |
 |     `5.x`      | `^5.13.0` \| `^6.0.0 \| ^7.0.0 \| ^8.0.0`|

From 47c3b469c26635e7c8e9bbe652ccfcf7c0a4e346 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 6 Oct 2024 14:06:58 -0400
Subject: [PATCH 103/191] fix: set flattenObjectIds to false when calling
 toObject() for internal purposes

Fix #14935
---
 lib/model.js          |  3 +--
 lib/options.js        |  3 ++-
 test/document.test.js | 26 ++++++++++++++++++++++++++
 3 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index 1c361bcb495..e2c4d68c7fa 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -75,8 +75,7 @@ const subclassedSymbol = Symbol('mongoose#Model#subclassed');
 const { VERSION_INC, VERSION_WHERE, VERSION_ALL } = Document;
 
 const saveToObjectOptions = Object.assign({}, internalToObjectOptions, {
-  bson: true,
-  flattenObjectIds: false
+  bson: true
 });
 
 /**
diff --git a/lib/options.js b/lib/options.js
index 3bae58e1200..bbdcda8b97e 100644
--- a/lib/options.js
+++ b/lib/options.js
@@ -12,5 +12,6 @@ exports.internalToObjectOptions = {
   depopulate: true,
   flattenDecimals: false,
   useProjection: false,
-  versionKey: true
+  versionKey: true,
+  flattenObjectIds: false
 };
diff --git a/test/document.test.js b/test/document.test.js
index 7150ffe64b4..84f0a73ebf0 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13926,6 +13926,32 @@ describe('document', function() {
     cur.subdocs[0] = { test: 'updated' };
     await savedDoc.save();
   });
+
+  it('avoids flattening objectids on insertMany (gh-14935)', async function() {
+    const TestSchema = new Schema(
+      {
+        professionalId: {
+          type: Schema.Types.ObjectId
+        },
+        firstName: {
+          type: String
+        },
+        nested: {
+          test: String
+        }
+      },
+      {
+        toObject: { flattenObjectIds: true }
+      }
+    );
+    const Test = db.model('Test', TestSchema);
+
+    const professionalId = new mongoose.Types.ObjectId();
+    await Test.insertMany([{ professionalId, name: 'test' }]);
+
+    const doc = await Test.findOne({ professionalId }).lean().orFail();
+    assert.ok(doc.professionalId instanceof mongoose.Types.ObjectId);
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {

From 80441c00f5bb8e192fe1f16c49c5c3dca1826e4a Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 8 Oct 2024 12:54:54 -0400
Subject: [PATCH 104/191] style: fix lint

---
 test/document.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/document.test.js b/test/document.test.js
index b08abad27ee..6aa5e98413d 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13952,7 +13952,7 @@ describe('document', function() {
     const doc = await Test.findOne({ professionalId }).lean().orFail();
     assert.ok(doc.professionalId instanceof mongoose.Types.ObjectId);
   });
-    
+
   it('handles buffers stored as EJSON POJO (gh-14911)', async function() {
     const pdfSchema = new mongoose.Schema({
       pdfSettings: {

From 8d66fa98b28e193441b37410158efd1adeafbca7 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 8 Oct 2024 14:23:29 -0400
Subject: [PATCH 105/191] feat(model): add applyTimestamps() function to apply
 all schema timestamps, including subdocuments, to a given POJO

Fix #14698
---
 lib/helpers/document/applyTimestamps.js | 105 ++++++++++++++++++++++++
 lib/model.js                            |  34 ++++++++
 test/model.test.js                      | 102 +++++++++++++++++++++++
 types/models.d.ts                       |   5 ++
 4 files changed, 246 insertions(+)
 create mode 100644 lib/helpers/document/applyTimestamps.js

diff --git a/lib/helpers/document/applyTimestamps.js b/lib/helpers/document/applyTimestamps.js
new file mode 100644
index 00000000000..db9161fe528
--- /dev/null
+++ b/lib/helpers/document/applyTimestamps.js
@@ -0,0 +1,105 @@
+'use strict';
+
+const handleTimestampOption = require('../schema/handleTimestampOption');
+const mpath = require('mpath');
+
+module.exports = applyTimestamps;
+
+/**
+ * Apply a given schema's timestamps to the given POJO
+ *
+ * @param {Schema} schema
+ * @param {Object} obj
+ * @param {Object} [options]
+ * @param {Boolean} [options.isUpdate=false] if true, treat this as an update: just set updatedAt, skip setting createdAt. If false, set both createdAt and updatedAt
+ * @param {Function} [options.currentTime] if set, Mongoose will call this function to get the current time.
+ */
+
+function applyTimestamps(schema, obj, options) {
+  if (obj == null) {
+    return obj;
+  }
+
+  applyTimestampsToChildren(schema, obj, options);
+  return applyTimestampsToDoc(schema, obj, options);
+}
+
+/**
+ * Apply timestamps to any subdocuments
+ *
+ * @param {Schema} schema subdocument schema
+ * @param {Object} res subdocument
+ * @param {Object} [options]
+ * @param {Boolean} [options.isUpdate=false] if true, treat this as an update: just set updatedAt, skip setting createdAt. If false, set both createdAt and updatedAt
+ * @param {Function} [options.currentTime] if set, Mongoose will call this function to get the current time.
+ */
+
+function applyTimestampsToChildren(schema, res, options) {
+  for (const childSchema of schema.childSchemas) {
+    const _path = childSchema.model.path;
+    const _schema = childSchema.schema;
+    if (!_path) {
+      continue;
+    }
+    const _obj = mpath.get(_path, res);
+    if (_obj == null || (Array.isArray(_obj) && _obj.flat(Infinity).length === 0)) {
+      continue;
+    }
+
+    applyTimestamps(_schema, _obj, options);
+  }
+}
+
+/**
+ * Apply timestamps to a given document. Does not apply timestamps to subdocuments: use `applyVirtualsToTimestamps` instead
+ *
+ * @param {Schema} schema
+ * @param {Object} doc
+ * @param {Object} [options]
+ * @param {Boolean} [options.isUpdate=false] if true, treat this as an update: just set updatedAt, skip setting createdAt. If false, set both createdAt and updatedAt
+ * @param {Function} [options.currentTime] if set, Mongoose will call this function to get the current time.
+ */
+
+function applyTimestampsToDoc(schema, obj, options) {
+  if (obj == null || typeof obj !== 'object') {
+    return;
+  }
+  if (Array.isArray(obj)) {
+    for (const el of obj) {
+      applyTimestampsToDoc(schema, el, options);
+    }
+    return;
+  }
+
+  if (schema.discriminators && Object.keys(schema.discriminators).length > 0) {
+    for (const discriminatorKey of Object.keys(schema.discriminators)) {
+      const discriminator = schema.discriminators[discriminatorKey];
+      const key = discriminator.discriminatorMapping.key;
+      const value = discriminator.discriminatorMapping.value;
+      if (obj[key] == value) {
+        schema = discriminator;
+        break;
+      }
+    }
+  }
+
+  const createdAt = handleTimestampOption(schema.options.timestamps, 'createdAt');
+  const updatedAt = handleTimestampOption(schema.options.timestamps, 'updatedAt');
+  const currentTime = options?.currentTime;
+
+  let ts = null;
+  if (currentTime != null) {
+    ts = currentTime();
+  } else if (schema.base?.now) {
+    ts = schema.base.now();
+  } else {
+    ts = new Date();
+  }
+
+  if (createdAt && obj[createdAt] == null && !options?.isUpdate) {
+    obj[createdAt] = ts;
+  }
+  if (updatedAt) {
+    obj[updatedAt] = ts;
+  }
+}
diff --git a/lib/model.js b/lib/model.js
index 1c361bcb495..dba37ab6c7a 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -30,6 +30,7 @@ const applyReadConcern = require('./helpers/schema/applyReadConcern');
 const applySchemaCollation = require('./helpers/indexes/applySchemaCollation');
 const applyStaticHooks = require('./helpers/model/applyStaticHooks');
 const applyStatics = require('./helpers/model/applyStatics');
+const applyTimestampsHelper = require('./helpers/document/applyTimestamps');
 const applyWriteConcern = require('./helpers/schema/applyWriteConcern');
 const applyVirtualsHelper = require('./helpers/document/applyVirtuals');
 const assignVals = require('./helpers/populate/assignVals');
@@ -3541,6 +3542,39 @@ Model.applyVirtuals = function applyVirtuals(obj, virtualsToApply) {
   return obj;
 };
 
+/**
+ * Apply this model's timestamps to a given POJO, including subdocument timestamps
+ *
+ * #### Example:
+ *
+ *     const userSchema = new Schema({ name: String }, { timestamps: true });
+ *     const User = mongoose.model('User', userSchema);
+ *
+ *     const obj = { name: 'John' };
+ *     User.applyTimestamps(obj);
+ *     obj.createdAt; // 2024-06-01T18:00:00.000Z
+ *     obj.updatedAt; // 2024-06-01T18:00:00.000Z
+ *
+ * @param {Object} obj object or document to apply virtuals on
+ * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
+ * @returns {Object} obj
+ * @api public
+ */
+
+Model.applyTimestamps = function applyTimestamps(obj, options) {
+  if (obj == null) {
+    return obj;
+  }
+  // Nothing to do if this is already a hydrated document - it should already have timestamps
+  if (obj.$__ != null) {
+    return obj;
+  }
+
+  applyTimestampsHelper(this.schema, obj, options);
+
+  return obj;
+};
+
 /**
  * Cast the given POJO to the model's schema
  *
diff --git a/test/model.test.js b/test/model.test.js
index b81cf8ff609..63f0a8cdcb2 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -8018,6 +8018,108 @@ describe('Model', function() {
       assert.strictEqual(res.friend, null);
     });
   });
+
+  describe('applyTimestamps', function() {
+    it('handles basic top-level timestamps', async function() {
+      const startTime = new Date();
+      const userSchema = new Schema({
+        name: String
+      }, { timestamps: true });
+      const User = db.model('User', userSchema);
+
+      const obj = { name: 'test' };
+      User.applyTimestamps(obj);
+      assert.equal(obj.name, 'test');
+      assert.ok(obj.createdAt instanceof Date);
+      assert.ok(obj.updatedAt instanceof Date);
+      assert.ok(obj.createdAt.valueOf() >= startTime.valueOf());
+      assert.ok(obj.updatedAt.valueOf() >= startTime.valueOf());
+    });
+
+    it('no-op if timestamps not set', async function() {
+      const userSchema = new Schema({
+        name: String
+      });
+      const User = db.model('User', userSchema);
+
+      const obj = { name: 'test' };
+      User.applyTimestamps(obj);
+      assert.equal(obj.name, 'test');
+      assert.ok(!('createdAt' in obj));
+      assert.ok(!('updatedAt' in obj));
+    });
+
+    it('handles custom timestamp property names', async function() {
+      const startTime = new Date();
+      const userSchema = new Schema({
+        name: String
+      }, { timestamps: { createdAt: 'createdOn', updatedAt: 'updatedOn' } });
+      const User = db.model('User', userSchema);
+
+      const obj = { name: 'test' };
+      User.applyTimestamps(obj);
+      assert.equal(obj.name, 'test');
+      assert.ok(obj.createdOn instanceof Date);
+      assert.ok(obj.updatedOn instanceof Date);
+      assert.ok(obj.createdOn.valueOf() >= startTime.valueOf());
+      assert.ok(obj.updatedOn.valueOf() >= startTime.valueOf());
+    });
+
+    it('applies timestamps to subdocs', async function() {
+      const startTime = new Date();
+      const userSchema = new Schema({
+        name: String,
+        posts: [new Schema({
+          title: String,
+          content: String
+        }, { timestamps: true })],
+        address: new Schema({
+          city: String,
+          country: String
+        }, { timestamps: true })
+      }, { timestamps: true });
+      const User = db.model('User', userSchema);
+
+      const obj = {
+        name: 'test',
+        posts: [{ title: 'Post 1', content: 'Content 1' }],
+        address: { city: 'New York', country: 'USA' }
+      };
+      User.applyTimestamps(obj);
+      assert.equal(obj.name, 'test');
+      assert.ok(obj.createdAt instanceof Date);
+      assert.ok(obj.updatedAt instanceof Date);
+      assert.ok(obj.createdAt.valueOf() >= startTime.valueOf());
+      assert.ok(obj.updatedAt.valueOf() >= startTime.valueOf());
+      assert.ok(obj.posts[0].createdAt instanceof Date);
+      assert.ok(obj.posts[0].updatedAt instanceof Date);
+      assert.ok(obj.address.createdAt instanceof Date);
+      assert.ok(obj.address.updatedAt instanceof Date);
+    });
+
+    it('supports isUpdate and currentTime options', async function() {
+      const userSchema = new Schema({
+        name: String,
+        post: new Schema({
+          title: String,
+          content: String
+        }, { timestamps: true })
+      }, { timestamps: true });
+      const User = db.model('User', userSchema);
+
+      const obj = {
+        name: 'test',
+        post: { title: 'Post 1', content: 'Content 1' }
+      };
+      User.applyTimestamps(obj, { isUpdate: true, currentTime: () => new Date('2023-06-01T18:00:00.000Z') });
+      assert.equal(obj.name, 'test');
+      assert.ok(!('createdAt' in obj));
+      assert.ok(obj.updatedAt instanceof Date);
+      assert.equal(obj.updatedAt.valueOf(), new Date('2023-06-01T18:00:00.000Z').valueOf());
+      assert.ok(!('createdAt' in obj.post));
+      assert.ok(obj.post.updatedAt.valueOf(), new Date('2023-06-01T18:00:00.000Z').valueOf());
+    });
+  });
 });
 
 
diff --git a/types/models.d.ts b/types/models.d.ts
index 0a5e6e3a585..fd25412293e 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -293,6 +293,11 @@ declare module 'mongoose' {
     /* Apply virtuals to the given POJO. */
     applyVirtuals(obj: AnyObject, virtalsToApply?: string[]): AnyObject;
 
+    /**
+     * Apply this model's timestamps to a given POJO, including subdocument timestamps
+     */
+    applyTimestamps(obj: AnyObject, options?: { isUpdate?: boolean, currentTime?: () => Date }): AnyObject;
+
     /**
      * Sends multiple `insertOne`, `updateOne`, `updateMany`, `replaceOne`,
      * `deleteOne`, and/or `deleteMany` operations to the MongoDB server in one

From 8068c6a61d3ad7e1b748cc7101147d136bae0cdd Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 11:22:50 -0400
Subject: [PATCH 106/191] Update test/document.test.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/document.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/document.test.js b/test/document.test.js
index 6aa5e98413d..b12f19ea686 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13947,7 +13947,7 @@ describe('document', function() {
     const Test = db.model('Test', TestSchema);
 
     const professionalId = new mongoose.Types.ObjectId();
-    await Test.insertMany([{ professionalId, name: 'test' }]);
+    await Test.insertMany([{ professionalId, firstName: 'test' }]);
 
     const doc = await Test.findOne({ professionalId }).lean().orFail();
     assert.ok(doc.professionalId instanceof mongoose.Types.ObjectId);

From 6aecc016e84904d9dfce278b5458c7edc35b83da Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 11:22:56 -0400
Subject: [PATCH 107/191] Update test/document.test.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/document.test.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/document.test.js b/test/document.test.js
index b12f19ea686..f3869b8e58c 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13935,9 +13935,6 @@ describe('document', function() {
         },
         firstName: {
           type: String
-        },
-        nested: {
-          test: String
         }
       },
       {

From 02c5efd7ee19eca0f0e5744719b36e19cba0f58d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 12:02:58 -0400
Subject: [PATCH 108/191] chore: release 8.7.1

---
 CHANGELOG.md | 7 +++++++
 package.json | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 290b535fd8e..96fab663acd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+8.7.1 / 2024-10-09
+==================
+ * fix: set flattenObjectIds to false when calling toObject() for internal purposes #14938
+ * fix: add mongodb 8 to test matrix #14937
+ * fix: handle buffers stored in MongoDB as EJSON representation with { $binary } #14932
+ * docs: indicate that Mongoose 8.7 is required for full MongoDB 8 support #14937
+
 8.7.0 / 2024-09-27
 ==================
  * feat(model): add Model.applyVirtuals() to apply virtuals to a POJO #14905 #14818
diff --git a/package.json b/package.json
index 8f78859ad3c..c3645b8b557 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 68418d85bce146da3eff40f1adfaf0f1677e9212 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 14:06:47 -0400
Subject: [PATCH 109/191] types: re-export DeleteResult and UpdateResult from
 MongoDB Node.js driver

Fix #14946
---
 test/types/models.test.ts | 6 +++---
 types/models.d.ts         | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/types/models.test.ts b/test/types/models.test.ts
index a99f6ffa020..2575ad31330 100644
--- a/test/types/models.test.ts
+++ b/test/types/models.test.ts
@@ -14,8 +14,8 @@ import mongoose, {
   UpdateWriteOpResult,
   AggregateOptions,
   WithLevel1NestedPaths,
-  NestedPaths,
-  InferSchemaType
+  InferSchemaType,
+  DeleteResult
 } from 'mongoose';
 import { expectAssignable, expectError, expectType } from 'tsd';
 import { AutoTypedSchemaType, autoTypedSchema } from './schema.test';
@@ -514,7 +514,7 @@ function gh12100() {
 function modelRemoveOptions() {
   const cmodel = model('Test', new Schema());
 
-  cmodel.deleteOne({}, {});
+  const res: DeleteResult = await cmodel.deleteOne({}, {});
 }
 
 async function gh12286() {
diff --git a/types/models.d.ts b/types/models.d.ts
index 0a5e6e3a585..36a09cbb1c3 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -72,6 +72,8 @@ declare module 'mongoose' {
   };
 
   type UpdateWriteOpResult = mongodb.UpdateResult;
+  export type UpdateResult = mongodb.UpdateResult;
+  export type DeleteResult = mongodb.DeleteResult;
 
   interface MapReduceOptions<T, K, R> {
     map: Function | string;

From da75251ce10dab5eefed335e05c4026520929b96 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 18:29:04 -0400
Subject: [PATCH 110/191] Update lib/helpers/document/applyTimestamps.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/helpers/document/applyTimestamps.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/helpers/document/applyTimestamps.js b/lib/helpers/document/applyTimestamps.js
index db9161fe528..7536177d58e 100644
--- a/lib/helpers/document/applyTimestamps.js
+++ b/lib/helpers/document/applyTimestamps.js
@@ -54,7 +54,7 @@ function applyTimestampsToChildren(schema, res, options) {
  * Apply timestamps to a given document. Does not apply timestamps to subdocuments: use `applyVirtualsToTimestamps` instead
  *
  * @param {Schema} schema
- * @param {Object} doc
+ * @param {Object} obj
  * @param {Object} [options]
  * @param {Boolean} [options.isUpdate=false] if true, treat this as an update: just set updatedAt, skip setting createdAt. If false, set both createdAt and updatedAt
  * @param {Function} [options.currentTime] if set, Mongoose will call this function to get the current time.

From c52041b17f78fd787db2e9e5dbf48094a4e2a78f Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 9 Oct 2024 18:31:40 -0400
Subject: [PATCH 111/191] fix code review comments

---
 lib/helpers/document/applyTimestamps.js | 2 +-
 lib/model.js                            | 4 +++-
 test/model.test.js                      | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/helpers/document/applyTimestamps.js b/lib/helpers/document/applyTimestamps.js
index db9161fe528..ad6897f596d 100644
--- a/lib/helpers/document/applyTimestamps.js
+++ b/lib/helpers/document/applyTimestamps.js
@@ -51,7 +51,7 @@ function applyTimestampsToChildren(schema, res, options) {
 }
 
 /**
- * Apply timestamps to a given document. Does not apply timestamps to subdocuments: use `applyVirtualsToTimestamps` instead
+ * Apply timestamps to a given document. Does not apply timestamps to subdocuments: use `applyTimestampsToChildren` instead
  *
  * @param {Schema} schema
  * @param {Object} doc
diff --git a/lib/model.js b/lib/model.js
index dba37ab6c7a..22a45affc05 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3556,7 +3556,9 @@ Model.applyVirtuals = function applyVirtuals(obj, virtualsToApply) {
  *     obj.updatedAt; // 2024-06-01T18:00:00.000Z
  *
  * @param {Object} obj object or document to apply virtuals on
- * @param {Array<string>} [virtualsToApply] optional whitelist of virtuals to apply
+ * @param {Object} [options]
+ * @param {Boolean} [options.isUpdate=false] if true, treat this as an update: just set updatedAt, skip setting createdAt. If false, set both createdAt and updatedAt
+ * @param {Function} [options.currentTime] if set, Mongoose will call this function to get the current time.
  * @returns {Object} obj
  * @api public
  */
diff --git a/test/model.test.js b/test/model.test.js
index 63f0a8cdcb2..fc8d9619f46 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -8063,6 +8063,8 @@ describe('Model', function() {
       assert.ok(obj.updatedOn instanceof Date);
       assert.ok(obj.createdOn.valueOf() >= startTime.valueOf());
       assert.ok(obj.updatedOn.valueOf() >= startTime.valueOf());
+      assert.ok(!('createdAt' in obj));
+      assert.ok(!('updatedAt' in obj));
     });
 
     it('applies timestamps to subdocs', async function() {

From cb544ed003f505c196e20b925bd4b95bd3b42e12 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 11 Oct 2024 12:52:15 -0400
Subject: [PATCH 112/191] feat: allow defining virtuals on arrays, not just
 array elements

---
 lib/schema.js                    | 10 ++++++++
 lib/schema/array.js              | 35 ++++++++++++++++++++++++++
 lib/schema/documentArray.js      |  2 +-
 lib/types/array/index.js         |  5 ++++
 lib/types/documentArray/index.js |  7 +++++-
 test/document.test.js            | 43 ++++++++++++++++++++++++++++++++
 types/index.d.ts                 |  3 +++
 7 files changed, 103 insertions(+), 2 deletions(-)

diff --git a/lib/schema.js b/lib/schema.js
index bb3480088c6..a9d23fd6199 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -2304,6 +2304,7 @@ Schema.prototype.indexes = function() {
  * @param {Boolean} [options.count=false] Only works with populate virtuals. If [truthy](https://masteringjs.io/tutorials/fundamentals/truthy), this populate virtual will contain the number of documents rather than the documents themselves when you `populate()`.
  * @param {Function|null} [options.get=null] Adds a [getter](https://mongoosejs.com/docs/tutorials/getters-setters.html) to this virtual to transform the populated doc.
  * @param {Object|Function} [options.match=null] Apply a default [`match` option to populate](https://mongoosejs.com/docs/populate.html#match), adding an additional filter to the populate query.
+ * @param {Boolean} [options.applyToArray=false] If true and the given `name` is a direct child of an array, apply the virtual to the array rather than the elements.
  * @return {VirtualType}
  */
 
@@ -2416,6 +2417,15 @@ Schema.prototype.virtual = function(name, options) {
     return mem[part];
   }, this.tree);
 
+  if (options && options.applyToArray && parts.length > 1) {
+    const path = this.path(parts.slice(0, -1).join('.'));
+    if (path && path.$isMongooseArray) {
+      return path.virtual(parts[parts.length - 1], options);
+    } else {
+      throw new MongooseError(`Path "${path}" is not an array`);
+    }
+  }
+
   return virtuals[name];
 };
 
diff --git a/lib/schema/array.js b/lib/schema/array.js
index 00774ee3147..e424731e4d6 100644
--- a/lib/schema/array.js
+++ b/lib/schema/array.js
@@ -11,9 +11,12 @@ const SchemaArrayOptions = require('../options/schemaArrayOptions');
 const SchemaType = require('../schemaType');
 const CastError = SchemaType.CastError;
 const Mixed = require('./mixed');
+const VirtualOptions = require('../options/virtualOptions');
+const VirtualType = require('../virtualType');
 const arrayDepth = require('../helpers/arrayDepth');
 const cast = require('../cast');
 const clone = require('../helpers/clone');
+const getConstructorName = require('../helpers/getConstructorName');
 const isOperator = require('../helpers/query/isOperator');
 const util = require('util');
 const utils = require('../utils');
@@ -217,6 +220,12 @@ SchemaArray._checkRequired = SchemaType.prototype.checkRequired;
 
 SchemaArray.checkRequired = SchemaType.checkRequired;
 
+/*!
+ * Virtuals defined on this array itself.
+ */
+
+SchemaArray.prototype.virtuals = null;
+
 /**
  * Check if the given value satisfies the `required` validator.
  *
@@ -575,6 +584,32 @@ SchemaArray.prototype.castForQuery = function($conditional, val, context) {
   }
 };
 
+/**
+ * Add a virtual to this array. Specifically to this array, not the individual elements.
+ *
+ * @param {String} name
+ * @param {Object} [options]
+ * @api private
+ */
+
+SchemaArray.prototype.virtual = function virtual(name, options) {
+  if (name instanceof VirtualType || getConstructorName(name) === 'VirtualType') {
+    return this.virtual(name.path, name.options);
+  }
+  options = new VirtualOptions(options);
+
+  if (utils.hasUserDefinedProperty(options, ['ref', 'refPath'])) {
+    throw new MongooseError('Cannot set populate virtual as a property of an array');
+  }
+
+  const virtual = new VirtualType(options, name);
+  if (this.virtuals === null) {
+    this.virtuals = {};
+  }
+  this.virtuals[name] = virtual;
+  return virtual;
+};
+
 function cast$all(val, context) {
   if (!Array.isArray(val)) {
     val = [val];
diff --git a/lib/schema/documentArray.js b/lib/schema/documentArray.js
index aa0c0d7984a..9a7a5d3181d 100644
--- a/lib/schema/documentArray.js
+++ b/lib/schema/documentArray.js
@@ -429,7 +429,7 @@ SchemaDocumentArray.prototype.cast = function(value, doc, init, prev, options) {
   // We need to create a new array, otherwise change tracking will
   // update the old doc (gh-4449)
   if (!options.skipDocumentArrayCast || utils.isMongooseDocumentArray(value)) {
-    value = new MongooseDocumentArray(value, path, doc);
+    value = new MongooseDocumentArray(value, path, doc, this);
   }
 
   if (prev != null) {
diff --git a/lib/types/array/index.js b/lib/types/array/index.js
index 4a8c98823a7..1f6e6a54d88 100644
--- a/lib/types/array/index.js
+++ b/lib/types/array/index.js
@@ -90,6 +90,9 @@ function MongooseArray(values, path, doc, schematype) {
       if (mongooseArrayMethods.hasOwnProperty(prop)) {
         return mongooseArrayMethods[prop];
       }
+      if (schematype && schematype.virtuals && schematype.virtuals.hasOwnProperty(prop)) {
+        return schematype.virtuals[prop].applyGetters(undefined, target);
+      }
       if (typeof prop === 'string' && numberRE.test(prop) && schematype?.$embeddedSchemaType != null) {
         return schematype.$embeddedSchemaType.applyGetters(__array[prop], doc);
       }
@@ -101,6 +104,8 @@ function MongooseArray(values, path, doc, schematype) {
         mongooseArrayMethods.set.call(proxy, prop, value, false);
       } else if (internals.hasOwnProperty(prop)) {
         internals[prop] = value;
+      } else if (schematype && schematype.virtuals && schematype.virtuals.hasOwnProperty(prop)) {
+        schematype.virtuals[prop].applySetters(value, target);
       } else {
         __array[prop] = value;
       }
diff --git a/lib/types/documentArray/index.js b/lib/types/documentArray/index.js
index 4877f1a30ef..863d40ae62b 100644
--- a/lib/types/documentArray/index.js
+++ b/lib/types/documentArray/index.js
@@ -28,7 +28,7 @@ const numberRE = /^\d+$/;
  * @see https://bit.ly/f6CnZU
  */
 
-function MongooseDocumentArray(values, path, doc) {
+function MongooseDocumentArray(values, path, doc, schematype) {
   const __array = [];
 
   const internals = {
@@ -84,6 +84,9 @@ function MongooseDocumentArray(values, path, doc) {
       if (DocumentArrayMethods.hasOwnProperty(prop)) {
         return DocumentArrayMethods[prop];
       }
+      if (schematype && schematype.virtuals && schematype.virtuals.hasOwnProperty(prop)) {
+        return schematype.virtuals[prop].applyGetters(undefined, target);
+      }
       if (ArrayMethods.hasOwnProperty(prop)) {
         return ArrayMethods[prop];
       }
@@ -95,6 +98,8 @@ function MongooseDocumentArray(values, path, doc) {
         DocumentArrayMethods.set.call(proxy, prop, value, false);
       } else if (internals.hasOwnProperty(prop)) {
         internals[prop] = value;
+      } else if (schematype && schematype.virtuals && schematype.virtuals.hasOwnProperty(prop)) {
+        schematype.virtuals[prop].applySetters(value, target);
       } else {
         __array[prop] = value;
       }
diff --git a/test/document.test.js b/test/document.test.js
index f3869b8e58c..5bc50fdd287 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13978,6 +13978,49 @@ describe('document', function() {
     assert.ok(Buffer.isBuffer(reloaded.pdfSettings.fileContent));
     assert.strictEqual(reloaded.pdfSettings.fileContent.toString('utf8'), 'hello');
   });
+
+  describe('gh-2306', function() {
+    it('allow define virtual on non-object path', function() {
+      const schema = new mongoose.Schema({ num: Number, str: String, nums: [Number] });
+      schema.path('nums').virtual('last').get(function() {
+        return this[this.length - 1];
+      });
+      schema.virtual('nums.first', { applyToArray: true }).get(function() {
+        return this[0];
+      });
+      schema.virtual('nums.selectedIndex', { applyToArray: true })
+        .get(function() {
+          return this.__selectedIndex;
+        })
+        .set(function(v) {
+          this.__selectedIndex = v;
+        });
+      const M = db.model('gh2306', schema);
+      const m = new M({ num: 2, str: 'a', nums: [1, 2, 3] });
+
+      assert.strictEqual(m.nums.last, 3);
+      assert.strictEqual(m.nums.first, 1);
+
+      assert.strictEqual(m.nums.selectedIndex, undefined);
+      m.nums.selectedIndex = 42;
+      assert.strictEqual(m.nums.__selectedIndex, 42);
+    });
+
+    it('works on document arrays', function() {
+      const schema = new mongoose.Schema({ books: [{ title: String, author: String }] });
+      schema.path('books').virtual('last').get(function() {
+        return this[this.length - 1];
+      });
+      schema.virtual('books.first', { applyToArray: true }).get(function() {
+        return this[0];
+      });
+      const M = db.model('Test', schema);
+      const m = new M({ books: [{ title: 'Casino Royale', author: 'Ian Fleming' }, { title: 'The Man With The Golden Gun', author: 'Ian Fleming' }] });
+
+      assert.strictEqual(m.books.first.title, 'Casino Royale');
+      assert.strictEqual(m.books.last.title, 'The Man With The Golden Gun');
+    });
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {
diff --git a/types/index.d.ts b/types/index.d.ts
index 3ec72ac281d..91044d30b1b 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -623,6 +623,9 @@ declare module 'mongoose' {
     /** Additional options like `limit` and `lean`. */
     options?: QueryOptions<DocType> & { match?: AnyObject };
 
+    /** If true and the given `name` is a direct child of an array, apply the virtual to the array rather than the elements. */
+    applyToArray?: boolean;
+
     /** Additional options for plugins */
     [extra: string]: any;
   }

From c187fd84d197e2f29759a157c798538661d36079 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 11 Oct 2024 17:13:09 -0400
Subject: [PATCH 113/191] types: correct schema type inference when using
 nested typeKey like `type: { type: String }`

Fix #14950
---
 test/types/schema.test.ts  | 18 ++++++++++++++++++
 types/inferschematype.d.ts | 12 ++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index f1b9c3c0d03..ec20ce689ef 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1645,3 +1645,21 @@ function gh8389() {
 function gh14879() {
   Schema.Types.String.setters.push((val?: unknown) => typeof val === 'string' ? val.trim() : val);
 }
+
+async function gh14950() {
+  const SightingSchema = new Schema(
+    {
+      _id: { type: Schema.Types.ObjectId, required: true },
+      location: {
+        type: { type: String, required: true },
+        coordinates: [{ type: Number }]
+      }
+    }
+  );
+
+  const TestModel = model('Test', SightingSchema);
+  const doc = await TestModel.findOne().orFail();
+
+  expectType<string>(doc.location!.type);
+  expectType<number[]>(doc.location!.coordinates);
+}
diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
index 07ee5087b37..a34c355f490 100644
--- a/types/inferschematype.d.ts
+++ b/types/inferschematype.d.ts
@@ -183,8 +183,16 @@ type TypeHint<T> = T extends { __typehint: infer U } ? U: never;
  * @param {TypeKey} TypeKey A generic refers to document definition.
  */
 type ObtainDocumentPathType<PathValueType, TypeKey extends string = DefaultTypeKey> = ResolvePathType<
-PathValueType extends PathWithTypePropertyBaseType<TypeKey> ? PathValueType[TypeKey] : PathValueType,
-PathValueType extends PathWithTypePropertyBaseType<TypeKey> ? Omit<PathValueType, TypeKey> : {},
+  PathValueType extends PathWithTypePropertyBaseType<TypeKey>
+    ? PathValueType[TypeKey] extends PathWithTypePropertyBaseType<TypeKey>
+      ? PathValueType
+      : PathValueType[TypeKey]
+    : PathValueType,
+  PathValueType extends PathWithTypePropertyBaseType<TypeKey>
+    ? PathValueType[TypeKey] extends PathWithTypePropertyBaseType<TypeKey>
+      ? {}
+      : Omit<PathValueType, TypeKey>
+    : {},
 TypeKey,
 TypeHint<PathValueType>
 >;

From b7f33e749986f0e7416146eb463287435e38b65b Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 11 Oct 2024 17:34:58 -0400
Subject: [PATCH 114/191] docs(model): add more info on acknowledged: false,
 specifically that Mongoose may return that if the update was empty

Fix #14951
---
 lib/model.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index e2c4d68c7fa..3f242e7f815 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3771,7 +3771,7 @@ Model.hydrate = function(obj, projection, options) {
  *     const res = await Person.updateMany({ name: /Stark$/ }, { isDeleted: true });
  *     res.matchedCount; // Number of documents matched
  *     res.modifiedCount; // Number of documents modified
- *     res.acknowledged; // Boolean indicating everything went smoothly.
+ *     res.acknowledged; // Boolean indicating the MongoDB server received the operation. This may be false if Mongoose did not send an update to the server because the update was empty.
  *     res.upsertedId; // null or an id containing a document that had to be upserted.
  *     res.upsertedCount; // Number indicating how many documents had to be upserted. Will either be 0 or 1.
  *
@@ -3811,7 +3811,7 @@ Model.updateMany = function updateMany(conditions, doc, options) {
  *     const res = await Person.updateOne({ name: 'Jean-Luc Picard' }, { ship: 'USS Enterprise' });
  *     res.matchedCount; // Number of documents matched
  *     res.modifiedCount; // Number of documents modified
- *     res.acknowledged; // Boolean indicating everything went smoothly.
+ *     res.acknowledged; // Boolean indicating the MongoDB server received the operation. This may be false if Mongoose did not send an update to the server because the update was empty.
  *     res.upsertedId; // null or an id containing a document that had to be upserted.
  *     res.upsertedCount; // Number indicating how many documents had to be upserted. Will either be 0 or 1.
  *
@@ -3849,7 +3849,7 @@ Model.updateOne = function updateOne(conditions, doc, options) {
  *     const res = await Person.replaceOne({ _id: 24601 }, { name: 'Jean Valjean' });
  *     res.matchedCount; // Number of documents matched
  *     res.modifiedCount; // Number of documents modified
- *     res.acknowledged; // Boolean indicating everything went smoothly.
+ *     res.acknowledged; // Boolean indicating the MongoDB server received the operation.
  *     res.upsertedId; // null or an id containing a document that had to be upserted.
  *     res.upsertedCount; // Number indicating how many documents had to be upserted. Will either be 0 or 1.
  *

From 081d9ea8902d2c9ffa4b067c7802caf0a6fc5c23 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sat, 12 Oct 2024 21:51:28 -0400
Subject: [PATCH 115/191] Update types/models.d.ts

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 types/models.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/models.d.ts b/types/models.d.ts
index 36a09cbb1c3..84fc412ba08 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -72,8 +72,8 @@ declare module 'mongoose' {
   };
 
   type UpdateWriteOpResult = mongodb.UpdateResult;
-  export type UpdateResult = mongodb.UpdateResult;
-  export type DeleteResult = mongodb.DeleteResult;
+  type UpdateResult = mongodb.UpdateResult;
+  type DeleteResult = mongodb.DeleteResult;
 
   interface MapReduceOptions<T, K, R> {
     map: Function | string;

From e6c9dd3eb7c5ec8f104f9b62eca85bd6e5887dda Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 14 Oct 2024 14:17:14 -0400
Subject: [PATCH 116/191] fix(document): recursively clear modified subpaths
 when setting deeply nested subdoc to null

Fix #14952
---
 lib/helpers/document/cleanModifiedSubpaths.js | 16 +++-
 test/document.test.js                         | 78 +++++++++++++++++++
 2 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/lib/helpers/document/cleanModifiedSubpaths.js b/lib/helpers/document/cleanModifiedSubpaths.js
index 43c225e4fd2..c12b5e2eea5 100644
--- a/lib/helpers/document/cleanModifiedSubpaths.js
+++ b/lib/helpers/document/cleanModifiedSubpaths.js
@@ -25,11 +25,21 @@ module.exports = function cleanModifiedSubpaths(doc, path, options) {
       ++deleted;
 
       if (doc.$isSubdocument) {
-        const owner = doc.ownerDocument();
-        const fullPath = doc.$__fullPath(modifiedPath);
-        owner.$__.activePaths.clearPath(fullPath);
+        cleanParent(doc, modifiedPath);
       }
     }
   }
   return deleted;
 };
+
+function cleanParent(doc, path, seen = new Set()) {
+  if (seen.has(doc)) {
+    throw new Error('Infinite subdocument loop: subdoc with _id ' + doc._id + ' is a parent of itself');
+  }
+  const parent = doc.$parent();
+  const newPath = doc.$__pathRelativeToParent(void 0, false) + '.' + path;
+  parent.$__.activePaths.clearPath(newPath);
+  if (parent.$isSubdocument) {
+    cleanParent(parent, newPath, seen);
+  }
+}
diff --git a/test/document.test.js b/test/document.test.js
index f3869b8e58c..f866b618d4b 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -13978,6 +13978,84 @@ describe('document', function() {
     assert.ok(Buffer.isBuffer(reloaded.pdfSettings.fileContent));
     assert.strictEqual(reloaded.pdfSettings.fileContent.toString('utf8'), 'hello');
   });
+
+  it('clears modified subpaths when setting deeply nested subdoc to null (gh-14952)', async function() {
+    const currentMilestoneSchema = new Schema(
+      {
+        id: { type: String, required: true }
+      },
+      {
+        _id: false
+      }
+    );
+
+    const milestoneSchema = new Schema(
+      {
+        current: {
+          type: currentMilestoneSchema,
+          required: true
+        }
+      },
+      {
+        _id: false
+      }
+    );
+
+    const campaignSchema = new Schema(
+      {
+        milestones: {
+          type: milestoneSchema,
+          required: false
+        }
+      },
+      {
+        _id: false
+      }
+    );
+    const questSchema = new Schema(
+      {
+        campaign: { type: campaignSchema, required: false }
+      },
+      {
+        _id: false
+      }
+    );
+
+    const parentSchema = new Schema({
+      quests: [questSchema]
+    });
+
+    const ParentModel = db.model('Parent', parentSchema);
+    const doc = new ParentModel({
+      quests: [
+        {
+          campaign: {
+            milestones: {
+              current: {
+                id: 'milestone1'
+              }
+            }
+          }
+        }
+      ]
+    });
+
+    await doc.save();
+
+    // Set the nested schema to null
+    doc.quests[0].campaign.milestones.current = {
+      id: 'milestone1'
+    };
+    doc.quests[0].campaign.milestones.current = {
+      id: ''
+    };
+
+    doc.quests[0].campaign.milestones = null;
+    await doc.save();
+
+    const fromDb = await ParentModel.findById(doc._id).orFail();
+    assert.strictEqual(fromDb.quests[0].campaign.milestones, null);
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is available', function() {

From 304c791c32525b0f02aaa2fe2afa12357982d23d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 15 Oct 2024 15:45:27 -0400
Subject: [PATCH 117/191] fix(populate): handle array of ids with parent
 refPath

Re: #10983
---
 .../populate/getModelsMapForPopulate.js       | 24 ++++--
 lib/helpers/populate/modelNamesFromRefPath.js |  2 -
 test/model.populate.test.js                   | 85 +++++++++++++++++++
 3 files changed, 104 insertions(+), 7 deletions(-)

diff --git a/lib/helpers/populate/getModelsMapForPopulate.js b/lib/helpers/populate/getModelsMapForPopulate.js
index 2b2a2b40312..16d920366a8 100644
--- a/lib/helpers/populate/getModelsMapForPopulate.js
+++ b/lib/helpers/populate/getModelsMapForPopulate.js
@@ -478,9 +478,10 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
     return;
   }
 
-  let k = modelNames.length;
+  const flatModelNames = utils.array.flatten(modelNames);
+  let k = flatModelNames.length;
   while (k--) {
-    let modelName = modelNames[k];
+    let modelName = flatModelNames[k];
     if (modelName == null) {
       continue;
     }
@@ -503,11 +504,10 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
     }
 
     let ids = ret;
-    const flat = Array.isArray(ret) ? utils.array.flatten(ret) : [];
 
     const modelNamesForRefPath = data.modelNamesInOrder ? data.modelNamesInOrder : modelNames;
-    if (data.isRefPath && Array.isArray(ret) && flat.length === modelNamesForRefPath.length) {
-      ids = flat.filter((val, i) => modelNamesForRefPath[i] === modelName);
+    if (data.isRefPath && Array.isArray(ret) && ret.length === modelNamesForRefPath.length) {
+      ids = matchIdsToRefPaths(ret, modelNamesForRefPath, modelName);
     }
 
     const perDocumentLimit = options.perDocumentLimit == null ?
@@ -569,6 +569,20 @@ function _getModelFromConn(conn, modelName) {
   return conn.model(modelName);
 }
 
+function matchIdsToRefPaths(ids, refPaths, refPathToFind) {
+  if (!Array.isArray(refPaths)) {
+    return refPaths === refPathToFind
+      ? Array.isArray(ids)
+        ? utils.array.flatten(ids)
+        : [ids]
+      : [];
+  }
+  if (Array.isArray(ids) && Array.isArray(refPaths)) {
+    return ids.flatMap((id, index) => matchIdsToRefPaths(id, refPaths[index], refPathToFind));
+  }
+  return [];
+}
+
 /*!
  * ignore
  */
diff --git a/lib/helpers/populate/modelNamesFromRefPath.js b/lib/helpers/populate/modelNamesFromRefPath.js
index df643b234ae..a5b02859346 100644
--- a/lib/helpers/populate/modelNamesFromRefPath.js
+++ b/lib/helpers/populate/modelNamesFromRefPath.js
@@ -62,7 +62,5 @@ module.exports = function modelNamesFromRefPath(refPath, doc, populatedPath, mod
     modelNames = Array.isArray(refValue) ? refValue : [refValue];
   }
 
-  modelNames = utils.array.flatten(modelNames);
-
   return modelNames;
 };
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
index c32c23d9cce..ef827fbc3bf 100644
--- a/test/model.populate.test.js
+++ b/test/model.populate.test.js
@@ -2582,6 +2582,91 @@ describe('model: populate:', function() {
       assert.strictEqual(doc.parts[0].contents[1].item.url, 'https://youtube.com');
     });
 
+    it('with refPath and array of ids with parent refPath', async function() {
+      const Child = db.model(
+        'Child',
+        new mongoose.Schema({
+          fetched: Boolean
+        })
+      );
+
+      const Parent = db.model(
+        'Parent',
+        new mongoose.Schema({
+          docArray: [
+            {
+              type: {
+                type: String,
+                enum: ['Child', 'OtherModel']
+              },
+              ids: [
+                {
+                  type: mongoose.Schema.ObjectId,
+                  refPath: 'docArray.type'
+                }
+              ]
+            }
+          ]
+        })
+      );
+      await Child.insertMany([
+        { _id: new mongoose.Types.ObjectId('6671a008596112f0729c2045'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('667195f3596112f0728abe24'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('6671bd39596112f072cda69c'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('6672c351596112f072868565'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('66734edd596112f0727304a2'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('66726eff596112f072f8e834'), fetched: true },
+        { _id: new mongoose.Types.ObjectId('667267ff596112f072ed56b1'), fetched: true }
+      ]);
+      const { _id } = await Parent.create(
+        {
+          docArray: [
+            {},
+            {
+              type: 'Child',
+              ids: [
+                new mongoose.Types.ObjectId('6671a008596112f0729c2045'),
+                new mongoose.Types.ObjectId('667195f3596112f0728abe24'),
+                new mongoose.Types.ObjectId('6671bd39596112f072cda69c'),
+                new mongoose.Types.ObjectId('6672c351596112f072868565')
+              ]
+            },
+            {
+              type: 'Child',
+              ids: [new mongoose.Types.ObjectId('66734edd596112f0727304a2')]
+            },
+            {},
+            {
+              type: 'Child',
+              ids: [new mongoose.Types.ObjectId('66726eff596112f072f8e834')]
+            },
+            {},
+            {
+              type: 'Child',
+              ids: [new mongoose.Types.ObjectId('667267ff596112f072ed56b1')]
+            }
+          ]
+        }
+      );
+
+      const doc = await Parent.findById(_id).populate('docArray.ids').orFail();
+      assert.strictEqual(doc.docArray.length, 7);
+      assert.strictEqual(doc.docArray[0].ids.length, 0);
+      assert.strictEqual(doc.docArray[1].ids.length, 4);
+      assert.ok(doc.docArray[1].ids[0].fetched);
+      assert.ok(doc.docArray[1].ids[1].fetched);
+      assert.ok(doc.docArray[1].ids[2].fetched);
+      assert.ok(doc.docArray[1].ids[3].fetched);
+      assert.strictEqual(doc.docArray[2].ids.length, 1);
+      assert.ok(doc.docArray[2].ids[0].fetched);
+      assert.strictEqual(doc.docArray[3].ids.length, 0);
+      assert.strictEqual(doc.docArray[4].ids.length, 1);
+      assert.ok(doc.docArray[4].ids[0].fetched);
+      assert.strictEqual(doc.docArray[5].ids.length, 0);
+      assert.strictEqual(doc.docArray[6].ids.length, 1);
+      assert.ok(doc.docArray[6].ids[0].fetched);
+    });
+
     it('with nested nonexistant refPath (gh-6457)', async function() {
       const CommentSchema = new Schema({
         text: String,

From 8825b76be5e901e57676b415cfdee2e7df123164 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 16 Oct 2024 14:12:57 -0400
Subject: [PATCH 118/191] types: make Buffers into mongodb.Binary in lean
 result type to match runtime behavior

Fix #14902
---
 test/types/schema.test.ts | 17 +++++++++++++++--
 types/index.d.ts          | 10 +++++++++-
 types/query.d.ts          |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index ec20ce689ef..f957232934a 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -20,8 +20,10 @@ import {
   Types,
   Query,
   model,
-  ValidateOpts
+  ValidateOpts,
+  BufferToBinary
 } from 'mongoose';
+import { Binary } from 'mongodb';
 import { IsPathRequired } from '../../types/inferschematype';
 import { expectType, expectError, expectAssignable } from 'tsd';
 import { ObtainDocumentPathType, ResolvePathType } from '../../types/inferschematype';
@@ -917,7 +919,7 @@ async function gh12593() {
   expectType<Buffer | undefined | null>(doc2.x);
 
   const doc3 = await Test.findOne({}).orFail().lean();
-  expectType<Buffer | undefined | null>(doc3.x);
+  expectType<Binary | undefined | null>(doc3.x);
 
   const arrSchema = new Schema({ arr: [{ type: Schema.Types.UUID }] });
 
@@ -1663,3 +1665,14 @@ async function gh14950() {
   expectType<string>(doc.location!.type);
   expectType<number[]>(doc.location!.coordinates);
 }
+
+async function gh14902() {
+  const def = {
+    image: { type: Buffer }
+  } as const;
+  const exampleSchema = new Schema(def);
+  const Test = model('Test', exampleSchema);
+
+  const doc = await Test.findOne().lean().orFail();
+  expectType<Binary | null | undefined>(doc.image);
+}
diff --git a/types/index.d.ts b/types/index.d.ts
index 3ec72ac281d..521fe17f81d 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -706,6 +706,14 @@ declare module 'mongoose' {
     [K in keyof T]: FlattenProperty<T[K]>;
   };
 
+  export type BufferToBinary<T> = T extends object ? {
+    [K in keyof T]: T[K] extends Buffer
+      ? mongodb.Binary
+      : T[K] extends (Buffer | null | undefined)
+        ? mongodb.Binary | null | undefined
+        : T[K];
+  } : T;
+
   /**
    * Separate type is needed for properties of union type (for example, Types.DocumentArray | undefined) to apply conditional check to each member of it
    * https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types
@@ -716,7 +724,7 @@ declare module 'mongoose' {
         ? Types.DocumentArray<FlattenMaps<ItemType>> : FlattenMaps<T>;
 
   export type actualPrimitives = string | boolean | number | bigint | symbol | null | undefined;
-  export type TreatAsPrimitives = actualPrimitives | NativeDate | RegExp | symbol | Error | BigInt | Types.ObjectId | Buffer | Function;
+  export type TreatAsPrimitives = actualPrimitives | NativeDate | RegExp | symbol | Error | BigInt | Types.ObjectId | Buffer | Function | mongodb.Binary;
 
   export type SchemaDefinitionType<T> = T extends Document ? Omit<T, Exclude<keyof Document, '_id' | 'id' | '__v'>> : T;
 
diff --git a/types/query.d.ts b/types/query.d.ts
index cb447f23c70..95b29aba4ea 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -211,7 +211,7 @@ declare module 'mongoose' {
   type QueryOpThatReturnsDocument = 'find' | 'findOne' | 'findOneAndUpdate' | 'findOneAndReplace' | 'findOneAndDelete';
 
   type GetLeanResultType<RawDocType, ResultType, QueryOp> = QueryOp extends QueryOpThatReturnsDocument
-    ? (ResultType extends any[] ? Require_id<FlattenMaps<RawDocType>>[] : Require_id<FlattenMaps<RawDocType>>)
+    ? (ResultType extends any[] ? Require_id<FlattenMaps<BufferToBinary<RawDocType>>>[] : Require_id<FlattenMaps<BufferToBinary<RawDocType>>>)
     : ResultType;
 
   type MergePopulatePaths<RawDocType, ResultType, QueryOp, Paths, TQueryHelpers, TInstanceMethods = Record<string, never>> = QueryOp extends QueryOpThatReturnsDocument

From 5c003f8d100399be24d45bb93f3bc00cb1e123e7 Mon Sep 17 00:00:00 2001
From: Emily M Klassen <forivall@gmail.com>
Date: Wed, 16 Oct 2024 12:33:18 -0700
Subject: [PATCH 119/191] types: improve goto definition for inferred schema
 definitions

---
 types/inferschematype.d.ts | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/types/inferschematype.d.ts b/types/inferschematype.d.ts
index a34c355f490..d73ad4cb81c 100644
--- a/types/inferschematype.d.ts
+++ b/types/inferschematype.d.ts
@@ -146,9 +146,10 @@ type RequiredPathKeys<T, TypeKey extends string = DefaultTypeKey> = {
  * @param {TypeKey} TypeKey A generic of literal string type."Refers to the property used for path type definition".
  * @returns a record contains required paths with the corresponding type.
  */
-type RequiredPaths<T, TypeKey extends string = DefaultTypeKey> = {
-  [K in RequiredPathKeys<T, TypeKey>]: T[K];
-};
+type RequiredPaths<T, TypeKey extends string = DefaultTypeKey> = Pick<
+  { -readonly [K in keyof T]: T[K] },
+  RequiredPathKeys<T, TypeKey>
+>;
 
 /**
  * @summary A Utility to obtain schema's optional path keys.
@@ -166,9 +167,10 @@ type OptionalPathKeys<T, TypeKey extends string = DefaultTypeKey> = {
  * @param {TypeKey} TypeKey A generic of literal string type."Refers to the property used for path type definition".
  * @returns a record contains optional paths with the corresponding type.
  */
-type OptionalPaths<T, TypeKey extends string = DefaultTypeKey> = {
-  [K in OptionalPathKeys<T, TypeKey>]?: T[K];
-};
+type OptionalPaths<T, TypeKey extends string = DefaultTypeKey> = Pick<
+  { -readonly [K in keyof T]?: T[K] },
+  OptionalPathKeys<T, TypeKey>
+>;
 
 /**
  * @summary Allows users to optionally choose their own type for a schema field for stronger typing.

From 0b152ee9bbc98e73ed4ec1a7e0631ef03acd3b62 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 17 Oct 2024 10:53:34 -0400
Subject: [PATCH 120/191] recursively convert buffer to binary

---
 test/types/schema.test.ts | 13 +++++++++----
 types/index.d.ts          |  8 ++++++--
 types/query.d.ts          |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index f957232934a..467e6192363 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1667,12 +1667,17 @@ async function gh14950() {
 }
 
 async function gh14902() {
-  const def = {
-    image: { type: Buffer }
-  } as const;
-  const exampleSchema = new Schema(def);
+  const exampleSchema = new Schema({
+    image: { type: Buffer },
+    subdoc: {
+      type: new Schema({
+        testBuf: Buffer
+      })
+    }
+  });
   const Test = model('Test', exampleSchema);
 
   const doc = await Test.findOne().lean().orFail();
   expectType<Binary | null | undefined>(doc.image);
+  expectType<Binary | null | undefined>(doc.subdoc!.testBuf);
 }
diff --git a/types/index.d.ts b/types/index.d.ts
index 521fe17f81d..c6655b802fa 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -706,12 +706,16 @@ declare module 'mongoose' {
     [K in keyof T]: FlattenProperty<T[K]>;
   };
 
-  export type BufferToBinary<T> = T extends object ? {
+  export type BufferToBinary<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends Buffer
       ? mongodb.Binary
       : T[K] extends (Buffer | null | undefined)
         ? mongodb.Binary | null | undefined
-        : T[K];
+        : T[K] extends Types.DocumentArray<infer ItemType>
+            ? Types.DocumentArray<BufferToBinary<ItemType>>
+            : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
+              ? HydratedSingleSubdocument<SubdocType>
+              : BufferToBinary<T[K]>;
   } : T;
 
   /**
diff --git a/types/query.d.ts b/types/query.d.ts
index 95b29aba4ea..9d2114edff4 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -211,7 +211,7 @@ declare module 'mongoose' {
   type QueryOpThatReturnsDocument = 'find' | 'findOne' | 'findOneAndUpdate' | 'findOneAndReplace' | 'findOneAndDelete';
 
   type GetLeanResultType<RawDocType, ResultType, QueryOp> = QueryOp extends QueryOpThatReturnsDocument
-    ? (ResultType extends any[] ? Require_id<FlattenMaps<BufferToBinary<RawDocType>>>[] : Require_id<FlattenMaps<BufferToBinary<RawDocType>>>)
+    ? (ResultType extends any[] ? Require_id<BufferToBinary<FlattenMaps<RawDocType>>>[] : Require_id<BufferToBinary<FlattenMaps<RawDocType>>>)
     : ResultType;
 
   type MergePopulatePaths<RawDocType, ResultType, QueryOp, Paths, TQueryHelpers, TInstanceMethods = Record<string, never>> = QueryOp extends QueryOpThatReturnsDocument

From e6119def9735d28ee407dacdbb8786d21c5b4dd8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 17 Oct 2024 11:42:28 -0400
Subject: [PATCH 121/191] docs(documents): add section on setting deeply nested
 properties, including warning about nullish coalescing assignment

Fix #14944
---
 docs/documents.md | 49 +++++++++++++++++++++++++++++++++++++++++++++++
 package.json      |  2 +-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/docs/documents.md b/docs/documents.md
index 20764c6dbef..6aca0814253 100644
--- a/docs/documents.md
+++ b/docs/documents.md
@@ -8,6 +8,7 @@ to documents as stored in MongoDB. Each document is an instance of its
   <li><a href="#documents-vs-models">Documents vs Models</a></li>
   <li><a href="#retrieving">Retrieving</a></li>
   <li><a href="#updating-using-save">Updating Using <code>save()</code></a></li>
+  <li><a href="#setting-nested-properties">Setting Nested Properties</a></li>
   <li><a href="#updating-using-queries">Updating Using Queries</a></li>
   <li><a href="#validating">Validating</a></li>
   <li><a href="#overwriting">Overwriting</a></li>
@@ -81,6 +82,54 @@ doc.name = 'foo';
 await doc.save(); // Throws DocumentNotFoundError
 ```
 
+## Setting Nested Properties
+
+Mongoose documents have a `set()` function that you can use to safely set deeply nested properties.
+
+```javascript
+const schema = new Schema({
+  nested: {
+    subdoc: new Schema({
+      name: String
+    })
+  }
+});
+const TestModel = mongoose.model('Test', schema);
+
+const doc = new TestModel();
+doc.set('nested.subdoc.name', 'John Smith');
+doc.nested.subdoc.name; // 'John Smith'
+```
+
+Mongoose documents also have a `get()` function that lets you safely read deeply nested properties. `get()` lets you avoid having to explicitly check for nullish values, similar to JavaScript's [optional chaining operator `?.`](https://masteringjs.io/tutorials/fundamentals/optional-chaining-array).
+
+```javascript
+const doc2 = new TestModel();
+
+doc2.get('nested.subdoc.name'); // undefined
+doc2.nested?.subdoc?.name; // undefined
+
+doc2.set('nested.subdoc.name', 'Will Smith');
+doc2.get('nested.subdoc.name'); // 'Will Smith'
+```
+
+You can use optional chaining `?.` and nullish coalescing `??` with Mongoose documents.
+However, be careful when using [nullish coalescing assignments `??=`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/Nullish_coalescing_assignment) to create nested paths with Mongoose documents.
+
+```javascript
+// The following works fine
+const doc3 = new TestModel();
+doc3.nested.subdoc ??= {};
+doc3.nested.subdoc.name = 'John Smythe';
+
+// The following does **NOT** work.
+// Do not use the following pattern with Mongoose documents.
+const doc4 = new TestModel();
+(doc4.nested.subdoc ??= {}).name = 'Charlie Smith';
+doc.nested.subdoc; // Empty object
+doc.nested.subdoc.name; // undefined.
+```
+
 ## Updating Using Queries {#updating-using-queries}
 
 The [`save()`](api/model.html#model_Model-save) function is generally the right
diff --git a/package.json b/package.json
index c3645b8b557..cb5c6a4c4b5 100644
--- a/package.json
+++ b/package.json
@@ -92,7 +92,7 @@
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js --ext .cjs",
     "lint-ts": "eslint . --ext .ts",
-    "lint-md": "markdownlint-cli2 \"**/*.md\"",
+    "lint-md": "markdownlint-cli2 \"**/*.md\" \"#node_modules\" \"#benchmarks\"",
     "build-browser": "(rm ./dist/* || true) && node ./scripts/build-browser.js",
     "prepublishOnly": "npm run build-browser",
     "release": "git pull && git push origin master --tags && npm publish",

From 830b010c848cd35e7aafe32656dac7e8178dcb92 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 17 Oct 2024 14:38:43 -0400
Subject: [PATCH 122/191] chore: release 8.7.2

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96fab663acd..053448f74ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+8.7.2 / 2024-10-17
+==================
+ * fix(document): recursively clear modified subpaths when setting deeply nested subdoc to null #14963 #14952
+ * fix(populate): handle array of ids with parent refPath #14965
+ * types: make Buffers into mongodb.Binary in lean result type to match runtime behavior #14967
+ * types: correct schema type inference when using nested typeKey like type: { type: String } #14956 #14950
+ * types: re-export DeleteResult and UpdateResult from MongoDB Node.js driver #14947 #14946
+ * docs(documents): add section on setting deeply nested properties, including warning about nullish coalescing assignment #14972
+ * docs(model): add more info on acknowledged: false, specifically that Mongoose may return that if the update was empty #14957
+
 8.7.1 / 2024-10-09
 ==================
  * fix: set flattenObjectIds to false when calling toObject() for internal purposes #14938
diff --git a/package.json b/package.json
index cb5c6a4c4b5..4a35751bbcc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.7.1",
+  "version": "8.7.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From aa0d561f349607cda30fe99526d9dc1c0848bfa6 Mon Sep 17 00:00:00 2001
From: Rahul Bhooteshwar <rahul.bhooteshwar@nutanix.com>
Date: Fri, 18 Oct 2024 18:19:51 +0530
Subject: [PATCH 123/191] docs(migration-guide-v7): correct link to the section
 "Id Setter"

Currently link to the section "Id Setter" is not working due to missing id & the auto-generated one is not the correct one!
---
 docs/migrating_to_7.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/migrating_to_7.md b/docs/migrating_to_7.md
index ffab6f46e9a..21c3aa377c6 100644
--- a/docs/migrating_to_7.md
+++ b/docs/migrating_to_7.md
@@ -200,7 +200,7 @@ In Mongoose 7, `ObjectId` is now a [JavaScript class](https://masteringjs.io/tut
 const oid = new mongoose.Types.ObjectId('0'.repeat(24));
 ```
 
-## `id` Setter
+## `id` Setter {#id-setter}
 
 Starting in Mongoose 7.4, Mongoose's built-in `id` virtual (which stores the document's `_id` as a string) has a setter which allows modifying the document's `_id` property via `id`.
 

From 57b38f8f125c91e9727e2e435a44729c06f1a221 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 20 Oct 2024 08:35:54 -0400
Subject: [PATCH 124/191] types(connection): add missing sanitizeFilter option

---
 types/connection.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/types/connection.d.ts b/types/connection.d.ts
index 08165549a86..e37914bdb4f 100644
--- a/types/connection.d.ts
+++ b/types/connection.d.ts
@@ -50,6 +50,12 @@ declare module 'mongoose' {
     autoIndex?: boolean;
     /** Set to `false` to disable Mongoose automatically calling `createCollection()` on every model created on this connection. */
     autoCreate?: boolean;
+    /**
+     * Sanitizes query filters against [query selector injection attacks](
+     * https://thecodebarbarian.com/2014/09/04/defending-against-query-selector-injection-attacks.html
+     * ) by wrapping any nested objects that have a property whose name starts with $ in a $eq.
+     */
+    sanitizeFilter?: boolean;
   }
 
   class Connection extends events.EventEmitter implements SessionStarter {

From 9b1164c091c1c01239dfe394587b8e0dbd9ae1c0 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 21 Oct 2024 08:04:20 -0400
Subject: [PATCH 125/191] types(model): convert InsertManyResult to interface
 and remove unnecessary insertedIds override

---
 types/models.d.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/types/models.d.ts b/types/models.d.ts
index 84fc412ba08..2011f136fc0 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -64,12 +64,9 @@ declare module 'mongoose' {
     throwOnValidationError?: boolean;
   }
 
-  type InsertManyResult<T> = mongodb.InsertManyResult<T> & {
-    insertedIds: {
-      [key: number]: InferId<T>;
-    };
+  interface InsertManyResult<T> extends mongodb.InsertManyResult<T> {
     mongoose?: { validationErrors?: Array<Error.CastError | Error.ValidatorError> };
-  };
+  }
 
   type UpdateWriteOpResult = mongodb.UpdateResult;
   type UpdateResult = mongodb.UpdateResult;

From ff24d8689c9c0457337b23179febaf214a97e76b Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 23 Oct 2024 13:44:23 -0400
Subject: [PATCH 126/191] types: add JSONSerialized helper that can convert
 HydratedDocument to JSON output type

Fix #14451
---
 test/types/check-types-filename.js |  2 +-
 test/types/schema.test.ts          | 26 ++++++++++++++++++
 types/index.d.ts                   | 44 ++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/test/types/check-types-filename.js b/test/types/check-types-filename.js
index 8dc0f3f6de8..303c0b05dd0 100644
--- a/test/types/check-types-filename.js
+++ b/test/types/check-types-filename.js
@@ -18,7 +18,7 @@ const checkFolder = (folder) => {
         }
         continue;
       } else {
-        console.error('File ' + entry + ' is not having a valid file-extension.\n');
+        console.error('File ' + entry + ' does not have a valid extension, must be .d.ts or .gitignore.\n');
         process.exit(1);
       }
     }
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index 467e6192363..cc16a523412 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -10,6 +10,7 @@ import {
   InferRawDocType,
   InferSchemaType,
   InsertManyOptions,
+  JSONSerialized,
   ObtainDocumentType,
   ObtainSchemaGeneric,
   ResolveSchemaOptions,
@@ -1681,3 +1682,28 @@ async function gh14902() {
   expectType<Binary | null | undefined>(doc.image);
   expectType<Binary | null | undefined>(doc.subdoc!.testBuf);
 }
+
+async function gh14451() {
+  const exampleSchema = new Schema({
+    myId: { type: 'ObjectId' },
+    myRequiredId: { type: 'ObjectId', required: true },
+    subdoc: {
+      type: new Schema({
+        subdocProp: Date
+      })
+    }
+    // docArr: [{ nums: [Number], times: [Date] }]
+  });
+
+  const Test = model('Test', exampleSchema);
+
+  type TestJSON = JSONSerialized<InferSchemaType<typeof exampleSchema>>;
+  expectType<{
+    myId?: string | undefined | null,
+    myRequiredId: string,
+    subdoc?: {
+      subdocProp?: string | undefined | null
+    } | null,
+    // docArr: { nums: number[], times: string[] }[]
+  }>({} as TestJSON);
+}
diff --git a/types/index.d.ts b/types/index.d.ts
index c6655b802fa..2b557a7d3d2 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -718,6 +718,50 @@ declare module 'mongoose' {
               : BufferToBinary<T[K]>;
   } : T;
 
+  export type ObjectIdToString<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
+    [K in keyof T]: T[K] extends mongodb.ObjectId
+      ? string
+      : T[K] extends (mongodb.ObjectId | null | undefined)
+        ? string | null | undefined
+        : T[K] extends Types.DocumentArray<infer ItemType>
+            ? Types.DocumentArray<ObjectIdToString<ItemType>>
+            : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
+              ? HydratedSingleSubdocument<ObjectIdToString<SubdocType>>
+              : ObjectIdToString<T[K]>;
+  } : T;
+
+  export type DateToString<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
+    [K in keyof T]: T[K] extends NativeDate
+      ? string
+      : T[K] extends (NativeDate | null | undefined)
+        ? string | null | undefined
+        : T[K] extends Types.DocumentArray<infer ItemType>
+            ? Types.DocumentArray<DateToString<ItemType>>
+            : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
+              ? HydratedSingleSubdocument<DateToString<SubdocType>>
+              : DateToString<T[K]>;
+  } : T;
+
+  export type SubdocsToPOJOs<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
+    [K in keyof T]: T[K] extends NativeDate
+      ? string
+      : T[K] extends (NativeDate | null | undefined)
+        ? string | null | undefined
+        : T[K] extends Types.DocumentArray<infer ItemType>
+            ? ItemType
+            : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
+              ? SubdocType
+              : SubdocsToPOJOs<T[K]>;
+  } : T;
+
+  export type JSONSerialized<T> = SubdocsToPOJOs<
+    FlattenMaps<
+      ObjectIdToString<
+        DateToString<T>
+      >
+    >
+  >;
+
   /**
    * Separate type is needed for properties of union type (for example, Types.DocumentArray | undefined) to apply conditional check to each member of it
    * https://www.typescriptlang.org/docs/handbook/2/conditional-types.html#distributive-conditional-types

From 50b2670d0102fa0686890e2fe6e282a6bb5b694c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 23 Oct 2024 14:03:03 -0400
Subject: [PATCH 127/191] types: handle buffers in JSONSerialized and fix issue
 with DocumentArrays

---
 test/types/schema.test.ts |  8 +++++---
 types/index.d.ts          | 20 +++++++++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index cc16a523412..2639c19f6cd 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1687,12 +1687,13 @@ async function gh14451() {
   const exampleSchema = new Schema({
     myId: { type: 'ObjectId' },
     myRequiredId: { type: 'ObjectId', required: true },
+    myBuf: { type: Buffer, required: true },
     subdoc: {
       type: new Schema({
         subdocProp: Date
       })
-    }
-    // docArr: [{ nums: [Number], times: [Date] }]
+    },
+    docArr: [{ nums: [Number], times: [{ type: Date }] }]
   });
 
   const Test = model('Test', exampleSchema);
@@ -1701,9 +1702,10 @@ async function gh14451() {
   expectType<{
     myId?: string | undefined | null,
     myRequiredId: string,
+    myBuf: { type: 'buffer', data: number[] },
     subdoc?: {
       subdocProp?: string | undefined | null
     } | null,
-    // docArr: { nums: number[], times: string[] }[]
+    docArr: { nums: number[], times: string[] }[]
   }>({} as TestJSON);
 }
diff --git a/types/index.d.ts b/types/index.d.ts
index 2b557a7d3d2..1f9692b14d1 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -718,6 +718,18 @@ declare module 'mongoose' {
               : BufferToBinary<T[K]>;
   } : T;
 
+  export type BufferToJSON<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
+    [K in keyof T]: T[K] extends Buffer
+      ? { type: 'buffer', data: number[] }
+      : T[K] extends (Buffer | null | undefined)
+        ? { type: 'buffer', data: number[] } | null | undefined
+        : T[K] extends Types.DocumentArray<infer ItemType>
+            ? Types.DocumentArray<BufferToBinary<ItemType>>
+            : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
+              ? HydratedSingleSubdocument<SubdocType>
+              : BufferToBinary<T[K]>;
+  } : T;
+
   export type ObjectIdToString<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends mongodb.ObjectId
       ? string
@@ -748,7 +760,7 @@ declare module 'mongoose' {
       : T[K] extends (NativeDate | null | undefined)
         ? string | null | undefined
         : T[K] extends Types.DocumentArray<infer ItemType>
-            ? ItemType
+            ? ItemType[]
             : T[K] extends Types.Subdocument<unknown, unknown, infer SubdocType>
               ? SubdocType
               : SubdocsToPOJOs<T[K]>;
@@ -756,8 +768,10 @@ declare module 'mongoose' {
 
   export type JSONSerialized<T> = SubdocsToPOJOs<
     FlattenMaps<
-      ObjectIdToString<
-        DateToString<T>
+      BufferToJSON<
+        ObjectIdToString<
+          DateToString<T>
+        >
       >
     >
   >;

From 1a2fd2b33530ef508c411355ddd8d8d0e8997266 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 23 Oct 2024 14:57:23 -0400
Subject: [PATCH 128/191] fix(cursor): close underlying query cursor when
 calling `destroy()`

Fix #14966
---
 lib/cursor/queryCursor.js | 21 +++++++++++++++++++++
 test/query.cursor.test.js | 16 ++++++++++++++++
 types/cursor.d.ts         |  6 ++++++
 3 files changed, 43 insertions(+)

diff --git a/lib/cursor/queryCursor.js b/lib/cursor/queryCursor.js
index 895919a739d..7c2ac4f1d27 100644
--- a/lib/cursor/queryCursor.js
+++ b/lib/cursor/queryCursor.js
@@ -238,6 +238,27 @@ QueryCursor.prototype.close = async function close() {
   }
 };
 
+/**
+ * Marks this cursor as destroyed. Will stop streaming and subsequent calls to
+ * `next()` will error.
+ *
+ * @return {this}
+ * @api private
+ * @method _destroy
+ */
+
+QueryCursor.prototype._destroy = function _destroy(_err, callback) {
+  this.cursor.close()
+    .then(() => {
+      this._closed = false;
+      callback();
+    })
+    .catch(error => {
+      callback(error);
+    });
+  return this;
+};
+
 /**
  * Rewind this cursor to its uninitialized state. Any options that are present on the cursor will
  * remain in effect. Iterating this cursor will cause new queries to be sent to the server, even
diff --git a/test/query.cursor.test.js b/test/query.cursor.test.js
index d80264c5f2d..11056621a8f 100644
--- a/test/query.cursor.test.js
+++ b/test/query.cursor.test.js
@@ -4,6 +4,7 @@
 
 'use strict';
 
+const { once } = require('events');
 const start = require('./common');
 
 const assert = require('assert');
@@ -920,6 +921,21 @@ describe('QueryCursor', function() {
     assert.ok(cursor.cursor);
     assert.equal(driverCursor, cursor.cursor);
   });
+
+  it('handles destroy() (gh-14966)', async function() {
+    db.deleteModel(/Test/);
+    const TestModel = db.model('Test', mongoose.Schema({ name: String }));
+
+    const stream = await TestModel.find().cursor();
+    await once(stream, 'cursor');
+    assert.ok(!stream.cursor.closed);
+
+    stream.destroy();
+
+    await once(stream.cursor, 'close');
+    assert.ok(stream.destroyed);
+    assert.ok(stream.cursor.closed);
+  });
 });
 
 async function delay(ms) {
diff --git a/types/cursor.d.ts b/types/cursor.d.ts
index 6554dc99f34..268bb8f6783 100644
--- a/types/cursor.d.ts
+++ b/types/cursor.d.ts
@@ -26,6 +26,12 @@ declare module 'mongoose' {
      */
     close(): Promise<void>;
 
+    /**
+     * Destroy this cursor, closing the underlying cursor. Will stop streaming
+     * and subsequent calls to `next()` will error.
+     */
+    destroy(): this;
+
     /**
      * Rewind this cursor to its uninitialized state. Any options that are present on the cursor will
      * remain in effect. Iterating this cursor will cause new queries to be sent to the server, even

From 1c59f25d41457671c1440126236f88cbc52f83b4 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 23 Oct 2024 15:28:42 -0400
Subject: [PATCH 129/191] fix(cursor): make aggregation cursors handle
 destroy() and handle destroy() before cursor created

Fix #14966
---
 lib/cursor/aggregationCursor.js | 31 +++++++++++++++++++++++++++++++
 lib/cursor/queryCursor.js       | 14 +++++++++++++-
 test/query.cursor.test.js       | 13 +++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/lib/cursor/aggregationCursor.js b/lib/cursor/aggregationCursor.js
index 5462a6e60e6..2ff048d4b61 100644
--- a/lib/cursor/aggregationCursor.js
+++ b/lib/cursor/aggregationCursor.js
@@ -196,6 +196,37 @@ AggregationCursor.prototype.close = async function close() {
   this.emit('close');
 };
 
+/**
+ * Marks this cursor as destroyed. Will stop streaming and subsequent calls to
+ * `next()` will error.
+ *
+ * @return {this}
+ * @api private
+ * @method _destroy
+ */
+
+AggregationCursor.prototype._destroy = function _destroy(_err, callback) {
+  let waitForCursor = null;
+  if (!this.cursor) {
+    waitForCursor = new Promise((resolve) => {
+      this.once('cursor', resolve);
+    });
+  } else {
+    waitForCursor = Promise.resolve();
+  }
+
+  waitForCursor
+    .then(() => this.cursor.close())
+    .then(() => {
+      this._closed = false;
+      callback();
+    })
+    .catch(error => {
+      callback(error);
+    });
+  return this;
+};
+
 /**
  * Get the next document from this cursor. Will return `null` when there are
  * no documents left.
diff --git a/lib/cursor/queryCursor.js b/lib/cursor/queryCursor.js
index 7c2ac4f1d27..6bca50763f3 100644
--- a/lib/cursor/queryCursor.js
+++ b/lib/cursor/queryCursor.js
@@ -248,7 +248,19 @@ QueryCursor.prototype.close = async function close() {
  */
 
 QueryCursor.prototype._destroy = function _destroy(_err, callback) {
-  this.cursor.close()
+  let waitForCursor = null;
+  if (!this.cursor) {
+    waitForCursor = new Promise((resolve) => {
+      this.once('cursor', resolve);
+    });
+  } else {
+    waitForCursor = Promise.resolve();
+  }
+
+  waitForCursor
+    .then(() => {
+      this.cursor.close();
+    })
     .then(() => {
       this._closed = false;
       callback();
diff --git a/test/query.cursor.test.js b/test/query.cursor.test.js
index 11056621a8f..e7265be1d06 100644
--- a/test/query.cursor.test.js
+++ b/test/query.cursor.test.js
@@ -936,6 +936,19 @@ describe('QueryCursor', function() {
     assert.ok(stream.destroyed);
     assert.ok(stream.cursor.closed);
   });
+
+  it('handles destroy() before cursor is created (gh-14966)', async function() {
+    db.deleteModel(/Test/);
+    const TestModel = db.model('Test', mongoose.Schema({ name: String }));
+
+    const stream = await TestModel.find().cursor();
+    assert.ok(!stream.cursor);
+    stream.destroy();
+
+    await once(stream, 'cursor');
+    assert.ok(stream.destroyed);
+    assert.ok(stream.cursor.closed);
+  });
 });
 
 async function delay(ms) {

From b9c34d5dff14f82e01cfe304849894565a88e1d4 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 25 Oct 2024 13:32:48 -0400
Subject: [PATCH 130/191] set _closed to true

---
 lib/cursor/aggregationCursor.js | 2 +-
 lib/cursor/queryCursor.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cursor/aggregationCursor.js b/lib/cursor/aggregationCursor.js
index 2ff048d4b61..fd795526ca1 100644
--- a/lib/cursor/aggregationCursor.js
+++ b/lib/cursor/aggregationCursor.js
@@ -218,7 +218,7 @@ AggregationCursor.prototype._destroy = function _destroy(_err, callback) {
   waitForCursor
     .then(() => this.cursor.close())
     .then(() => {
-      this._closed = false;
+      this._closed = true;
       callback();
     })
     .catch(error => {
diff --git a/lib/cursor/queryCursor.js b/lib/cursor/queryCursor.js
index 6bca50763f3..5d05868f59e 100644
--- a/lib/cursor/queryCursor.js
+++ b/lib/cursor/queryCursor.js
@@ -262,7 +262,7 @@ QueryCursor.prototype._destroy = function _destroy(_err, callback) {
       this.cursor.close();
     })
     .then(() => {
-      this._closed = false;
+      this._closed = true;
       callback();
     })
     .catch(error => {

From 858cc0aeb92ffa9506d3d25f8b19d4bd4638084e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 25 Oct 2024 13:39:05 -0400
Subject: [PATCH 131/191] add docs and test coverage for maps

---
 test/types/schema.test.ts |  9 +++++++--
 types/index.d.ts          | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index 2639c19f6cd..90bcfce7f5f 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1693,7 +1693,11 @@ async function gh14451() {
         subdocProp: Date
       })
     },
-    docArr: [{ nums: [Number], times: [{ type: Date }] }]
+    docArr: [{ nums: [Number], times: [{ type: Date }] }],
+    myMap: {
+      type: Map,
+      of: String
+    }
   });
 
   const Test = model('Test', exampleSchema);
@@ -1706,6 +1710,7 @@ async function gh14451() {
     subdoc?: {
       subdocProp?: string | undefined | null
     } | null,
-    docArr: { nums: number[], times: string[] }[]
+    docArr: { nums: number[], times: string[] }[],
+    myMap?: Record<string, string> | null | undefined
   }>({} as TestJSON);
 }
diff --git a/types/index.d.ts b/types/index.d.ts
index 1f9692b14d1..cabb62630fc 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -706,6 +706,9 @@ declare module 'mongoose' {
     [K in keyof T]: FlattenProperty<T[K]>;
   };
 
+  /**
+   * Converts any Buffer properties into mongodb.Binary instances, which is what `lean()` returns
+   */
   export type BufferToBinary<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends Buffer
       ? mongodb.Binary
@@ -718,6 +721,9 @@ declare module 'mongoose' {
               : BufferToBinary<T[K]>;
   } : T;
 
+  /**
+   * Converts any Buffer properties into { type: 'buffer', data: [1, 2, 3] } format for JSON serialization
+   */
   export type BufferToJSON<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends Buffer
       ? { type: 'buffer', data: number[] }
@@ -730,6 +736,9 @@ declare module 'mongoose' {
               : BufferToBinary<T[K]>;
   } : T;
 
+  /**
+   * Converts any ObjectId properties into strings for JSON serialization
+   */
   export type ObjectIdToString<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends mongodb.ObjectId
       ? string
@@ -742,6 +751,9 @@ declare module 'mongoose' {
               : ObjectIdToString<T[K]>;
   } : T;
 
+  /**
+   * Converts any Date properties into strings for JSON serialization
+   */
   export type DateToString<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends NativeDate
       ? string
@@ -754,6 +766,9 @@ declare module 'mongoose' {
               : DateToString<T[K]>;
   } : T;
 
+  /**
+   * Converts any Mongoose subdocuments (single nested or doc arrays) into POJO equivalents
+   */
   export type SubdocsToPOJOs<T> = T extends TreatAsPrimitives ? T : T extends Record<string, any> ? {
     [K in keyof T]: T[K] extends NativeDate
       ? string

From f8489e39f391ce4e5dcc7a69927b77b87bcfcc34 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 25 Oct 2024 13:46:24 -0400
Subject: [PATCH 132/191] chore: release 8.7.3

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 053448f74ab..e3e97e30291 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+8.7.3 / 2024-10-25
+==================
+ * fix(cursor): close underlying query cursor when calling destroy() #14982 #14966
+ * types: add JSONSerialized helper that can convert HydratedDocument to JSON output type #14981 #14451
+ * types(model): convert InsertManyResult to interface and remove unnecessary insertedIds override #14977
+ * types(connection): add missing sanitizeFilter option #14975
+ * types: improve goto definition for inferred schema definitions #14968 [forivall](https://github.com/forivall)
+ * docs(migration-guide-v7): correct link to the section "Id Setter" #14973 [rb-ntnx](https://github.com/rb-ntnx)
+
 8.7.2 / 2024-10-17
 ==================
  * fix(document): recursively clear modified subpaths when setting deeply nested subdoc to null #14963 #14952
diff --git a/package.json b/package.json
index 4a35751bbcc..8a14afbead6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.7.2",
+  "version": "8.7.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 6076d1f8ba2072af210a1b4cb607777afac33150 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sat, 26 Oct 2024 18:59:59 -0400
Subject: [PATCH 133/191] fix(query): make sanitizeFilter disable implicit $in

Re: #14657
---
 lib/cast.js        |  3 ++-
 lib/query.js       |  3 +++
 test/query.test.js | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/cast.js b/lib/cast.js
index bcb13b8d7d1..03cbb3415c2 100644
--- a/lib/cast.js
+++ b/lib/cast.js
@@ -28,6 +28,7 @@ const ALLOWED_GEOWITHIN_GEOJSON_TYPES = ['Polygon', 'MultiPolygon'];
  * @param {Object} [options] the query options
  * @param {Boolean|"throw"} [options.strict] Wheter to enable all strict options
  * @param {Boolean|"throw"} [options.strictQuery] Enable strict Queries
+ * @param {Boolean} [options.sanitizeFilter] avoid adding implict query selectors ($in)
  * @param {Boolean} [options.upsert]
  * @param {Query} [context] passed to setters
  * @api private
@@ -372,7 +373,7 @@ module.exports = function cast(schema, obj, options, context) {
 
           }
         }
-      } else if (Array.isArray(val) && ['Buffer', 'Array'].indexOf(schematype.instance) === -1) {
+      } else if (Array.isArray(val) && ['Buffer', 'Array'].indexOf(schematype.instance) === -1 && !options.sanitizeFilter) {
         const casted = [];
         const valuesArray = val;
 
diff --git a/lib/query.js b/lib/query.js
index dec846a2dcb..50652b18971 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -4863,6 +4863,9 @@ Query.prototype.cast = function(model, obj) {
       opts.strictQuery = this.options.strictQuery;
     }
   }
+  if ('sanitizeFilter' in this._mongooseOptions) {
+    opts.sanitizeFilter = this._mongooseOptions.sanitizeFilter;
+  }
 
   try {
     return cast(model.schema, obj, opts, this);
diff --git a/test/query.test.js b/test/query.test.js
index a3de50044e3..099cd47746e 100644
--- a/test/query.test.js
+++ b/test/query.test.js
@@ -3520,6 +3520,21 @@ describe('Query', function() {
     assert.ifError(q.error());
     assert.deepEqual(q._conditions, { username: 'val', pwd: { $gt: null } });
   });
+
+  it('sanitizeFilter disables implicit $in (gh-14657)', function() {
+    const schema = new mongoose.Schema({
+      name: {
+        type: String
+      }
+    });
+    const Test = db.model('Test', schema);
+
+    const q = Test.find({ name: ['foobar'] }).setOptions({ sanitizeFilter: true });
+    q._castConditions();
+    assert.ok(q.error());
+    assert.equal(q.error().name, 'CastError');
+  });
+
   it('should not error when $not is used with $size (gh-10716)', async function() {
     const barSchema = Schema({
       bar: String

From a5fedd3ab1b2ae16fec25436feb81c7b94582601 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 27 Oct 2024 13:11:16 -0400
Subject: [PATCH 134/191] feat(query): add schemaLevelProjections option to
 query to disable schema-level select: false

Fix #11474
---
 lib/query.js       | 43 +++++++++++++++++++++++++++++++++-
 test/query.test.js | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index dec846a2dcb..102c675a2f1 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -1142,6 +1142,38 @@ Query.prototype.select = function select() {
   throw new TypeError('Invalid select() argument. Must be string or object.');
 };
 
+/**
+ * Enable or disable schema level projections for this query. Enabled by default.
+ * Set to `false` to include fields with `select: false` in the query result by default.
+ *
+ * #### Example:
+ *
+ *     const userSchema = new Schema({
+ *       email: { type: String, required: true },
+ *       passwordHash: { type: String, select: false, required: true }
+ *     });
+ *     const UserModel = mongoose.model('User', userSchema);
+ *
+ *     const doc = await UserModel.findOne().orFail().schemaLevelProjections(false);
+ *
+ *     // Contains password hash, because `schemaLevelProjections()` overrides `select: false`
+ *     doc.passwordHash;
+ *
+ * @method schemaLevelProjections
+ * @memberOf Query
+ * @instance
+ * @param {Boolean} value
+ * @return {Query} this
+ * @see SchemaType https://mongoosejs.com/docs/api/schematype.html
+ * @api public
+ */
+
+Query.prototype.schemaLevelProjections = function schemaLevelProjections(value) {
+  this._mongooseOptions.schemaLevelProjections = value;
+
+  return this;
+};
+
 /**
  * Sets this query's `sanitizeProjection` option. If set, `sanitizeProjection` does
  * two things:
@@ -1689,6 +1721,10 @@ Query.prototype.setOptions = function(options, overwrite) {
     this._mongooseOptions.translateAliases = options.translateAliases;
     delete options.translateAliases;
   }
+  if ('schemaLevelProjections' in options) {
+    this._mongooseOptions.schemaLevelProjections = options.schemaLevelProjections;
+    delete options.schemaLevelProjections;
+  }
 
   if (options.lean == null && this.schema && 'lean' in this.schema.options) {
     this._mongooseOptions.lean = this.schema.options.lean;
@@ -2222,6 +2258,7 @@ Query.prototype._unsetCastError = function _unsetCastError() {
  * - `strict`: controls how Mongoose handles keys that aren't in the schema for updates. This option is `true` by default, which means Mongoose will silently strip any paths in the update that aren't in the schema. See the [`strict` mode docs](https://mongoosejs.com/docs/guide.html#strict) for more information.
  * - `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
  *
  * Mongoose maintains a separate object for internal options because
  * Mongoose sends `Query.prototype.options` to the MongoDB server, and the
@@ -4946,7 +4983,11 @@ Query.prototype._applyPaths = function applyPaths() {
     sanitizeProjection = this._mongooseOptions.sanitizeProjection;
   }
 
-  helpers.applyPaths(this._fields, this.model.schema, sanitizeProjection);
+  const schemaLevelProjections = this._mongooseOptions.schemaLevelProjections ?? true;
+
+  if (schemaLevelProjections) {
+    helpers.applyPaths(this._fields, this.model.schema, sanitizeProjection);
+  }
 
   let _selectPopulatedPaths = true;
 
diff --git a/test/query.test.js b/test/query.test.js
index a3de50044e3..e77d01c39bf 100644
--- a/test/query.test.js
+++ b/test/query.test.js
@@ -4339,4 +4339,62 @@ describe('Query', function() {
     await Person.find({ $and: filter });
     assert.deepStrictEqual(filter, [{ name: 'Me', age: '20' }, { name: 'You', age: '50' }]);
   });
+
+  describe('schemaLevelProjections (gh-11474)', function() {
+    it('disables schema-level select: false', async function() {
+      const userSchema = new Schema({
+        email: { type: String, required: true },
+        passwordHash: { type: String, select: false, required: true }
+      });
+      const UserModel = db.model('User', userSchema);
+
+      const { _id } = await UserModel.create({ email: 'test', passwordHash: 'gh-11474' });
+
+      const doc = await UserModel.findById(_id).orFail().schemaLevelProjections(false);
+      assert.strictEqual(doc.email, 'test');
+      assert.strictEqual(doc.passwordHash, 'gh-11474');
+    });
+
+    it('disables schema-level select: true', async function() {
+      const userSchema = new Schema({
+        email: { type: String, required: true, select: true },
+        otherProp: String
+      });
+      const UserModel = db.model('User', userSchema);
+
+      const { _id } = await UserModel.create({ email: 'test', otherProp: 'gh-11474 select true' });
+
+      const doc = await UserModel.findById(_id).select('otherProp').orFail().schemaLevelProjections(false);
+      assert.strictEqual(doc.email, undefined);
+      assert.strictEqual(doc.otherProp, 'gh-11474 select true');
+    });
+
+    it('works via setOptions()', async function() {
+      const userSchema = new Schema({
+        email: { type: String, required: true },
+        passwordHash: { type: String, select: false, required: true }
+      });
+      const UserModel = db.model('User', userSchema);
+
+      const { _id } = await UserModel.create({ email: 'test', passwordHash: 'gh-11474' });
+
+      const doc = await UserModel.findById(_id).orFail().setOptions({ schemaLevelProjections: false });
+      assert.strictEqual(doc.email, 'test');
+      assert.strictEqual(doc.passwordHash, 'gh-11474');
+    });
+
+    it('disabled via truthy value', async function() {
+      const userSchema = new Schema({
+        email: { type: String, required: true },
+        passwordHash: { type: String, select: false, required: true }
+      });
+      const UserModel = db.model('User', userSchema);
+
+      const { _id } = await UserModel.create({ email: 'test', passwordHash: 'gh-11474' });
+
+      const doc = await UserModel.findById(_id).orFail().schemaLevelProjections(true);
+      assert.strictEqual(doc.email, 'test');
+      assert.strictEqual(doc.passwordHash, undefined);
+    });
+  });
 });

From 7798bad3727beb21647098c163008f42ba151bc5 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 27 Oct 2024 13:23:07 -0400
Subject: [PATCH 135/191] types: add schemaLevelProjections to types re: #11474

---
 types/query.d.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/types/query.d.ts b/types/query.d.ts
index 9d2114edff4..17c109972a1 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -24,6 +24,7 @@ declare module 'mongoose' {
     | 'runValidators'
     | 'sanitizeProjection'
     | 'sanitizeFilter'
+    | 'schemaLevelProjections'
     | 'setDefaultsOnInsert'
     | 'strict'
     | 'strictQuery'
@@ -179,6 +180,11 @@ declare module 'mongoose' {
      * aren't explicitly allowed using `mongoose.trusted()`.
      */
     sanitizeFilter?: boolean;
+    /**
+     * Enable or disable schema level projections for this query. Enabled by default.
+     * Set to `false` to include fields with `select: false` in the query result by default.
+     */
+    schemaLevelProjections?: boolean;
     setDefaultsOnInsert?: boolean;
     skip?: number;
     sort?: any;
@@ -734,6 +740,12 @@ declare module 'mongoose' {
      */
     sanitizeProjection(value: boolean): this;
 
+    /**
+     * Enable or disable schema level projections for this query. Enabled by default.
+     * Set to `false` to include fields with `select: false` in the query result by default.
+     */
+    schemaLevelProjections(value: boolean): this;
+
     /** Specifies which document fields to include or exclude (also known as the query "projection") */
     select<RawDocTypeOverride extends { [P in keyof RawDocType]?: any } = {}>(
       arg: string | string[] | Record<string, number | boolean | string | object>

From a11cbbc013e50930dc70ed09e882084e3f59b2f6 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 27 Oct 2024 20:15:56 -0400
Subject: [PATCH 136/191] feat(model): add hideIndexes option to syncIndexes()
 and cleanIndexes()

Fix #14868
---
 lib/model.js       | 28 ++++++++++++++++++++--------
 test/model.test.js | 25 +++++++++++++++++++++++++
 types/indexes.d.ts |  3 ++-
 3 files changed, 47 insertions(+), 9 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index 60e6ee2e147..09e953ba9a7 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -1220,6 +1220,7 @@ Model.createCollection = async function createCollection(options) {
  *
  * @param {Object} [options] options to pass to `ensureIndexes()`
  * @param {Boolean} [options.background=null] if specified, overrides each index's `background` property
+ * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping
  * @return {Promise}
  * @api public
  */
@@ -1440,8 +1441,10 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
  *
  * The returned promise resolves to a list of the dropped indexes' names as an array
  *
- * @param {Function} [callback] optional callback
- * @return {Promise|undefined} Returns `undefined` if callback is specified, returns a promise if no callback.
+ * @param {Object} [options]
+ * @param {Array<String>} [options.toDrop] if specified, contains a list of index names to drop
+ * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping
+ * @return {Promise<String>} list of dropped index names
  * @api public
  */
 
@@ -1452,23 +1455,32 @@ Model.cleanIndexes = async function cleanIndexes(options) {
   }
   const model = this;
 
-  const collection = model.$__collection;
-
   if (Array.isArray(options && options.toDrop)) {
-    const res = await _dropIndexes(options.toDrop, collection);
+    const res = await _dropIndexes(options.toDrop, model, options);
     return res;
   }
 
   const res = await model.diffIndexes();
-  return await _dropIndexes(res.toDrop, collection);
+  return await _dropIndexes(res.toDrop, model, options);
 };
 
-async function _dropIndexes(toDrop, collection) {
+async function _dropIndexes(toDrop, model, options) {
   if (toDrop.length === 0) {
     return [];
   }
 
-  await Promise.all(toDrop.map(indexName => collection.dropIndex(indexName)));
+  const collection = model.$__collection;
+  if (options && options.hideIndexes) {
+    await Promise.all(toDrop.map(indexName => {
+      return model.db.db.command({
+        collMod: collection.collectionName,
+        index: { name: indexName, hidden: true }
+      });
+    }));
+  } else {
+    await Promise.all(toDrop.map(indexName => collection.dropIndex(indexName)));
+  }
+
   return toDrop;
 }
 
diff --git a/test/model.test.js b/test/model.test.js
index fc8d9619f46..17fb0873712 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4962,6 +4962,31 @@ describe('Model', function() {
         assert.strictEqual(indexes[1].background, false);
       });
 
+      it('syncIndexes() supports hideIndexes (gh-14868)', async function() {
+        const opts = { autoIndex: false };
+        const schema = new Schema({ name: String }, opts);
+        schema.index({ name: 1 });
+
+        let M = db.model('Test', schema);
+        await M.syncIndexes({});
+
+        let indexes = await M.listIndexes();
+        assert.deepEqual(indexes[1].key, { name: 1 });
+        assert.ok(!indexes[1].hidden);
+
+        db.deleteModel(/Test/);
+        M = db.model('Test', new Schema({ name: String }, opts));
+        await M.syncIndexes({ hideIndexes: true });
+        indexes = await M.listIndexes();
+        assert.deepEqual(indexes[1].key, { name: 1 });
+        assert.ok(indexes[1].hidden);
+
+        await M.syncIndexes({});
+        indexes = await M.listIndexes();
+        assert.equal(indexes.length, 1);
+        assert.deepEqual(indexes[0].key, { _id: 1 });
+      });
+
       it('should not drop a text index on .syncIndexes() call (gh-10850)', async function() {
         const collation = { collation: { locale: 'simple' } };
         const someSchema = new Schema({
diff --git a/types/indexes.d.ts b/types/indexes.d.ts
index f0891f081eb..805705905a2 100644
--- a/types/indexes.d.ts
+++ b/types/indexes.d.ts
@@ -57,7 +57,8 @@ declare module 'mongoose' {
   type IndexDefinition = Record<string, IndexDirection>;
 
   interface SyncIndexesOptions extends mongodb.CreateIndexesOptions {
-    continueOnError?: boolean
+    continueOnError?: boolean;
+    hideIndexes?: boolean;
   }
   type ConnectionSyncIndexesResult = Record<string, OneCollectionSyncIndexesResult>;
   type OneCollectionSyncIndexesResult = Array<string> & mongodb.MongoServerError;

From 100e896de204556cb2fadb044b2cee3303104170 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Sun, 27 Oct 2024 20:20:18 -0400
Subject: [PATCH 137/191] docs: make quick note about version compatibility

---
 lib/model.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index 09e953ba9a7..80fa8849fd0 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -1220,7 +1220,7 @@ Model.createCollection = async function createCollection(options) {
  *
  * @param {Object} [options] options to pass to `ensureIndexes()`
  * @param {Boolean} [options.background=null] if specified, overrides each index's `background` property
- * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping
+ * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping. Requires MongoDB server 4.4 or higher
  * @return {Promise}
  * @api public
  */
@@ -1443,7 +1443,7 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
  *
  * @param {Object} [options]
  * @param {Array<String>} [options.toDrop] if specified, contains a list of index names to drop
- * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping
+ * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping. Requires MongoDB server 4.4 or higher
  * @return {Promise<String>} list of dropped index names
  * @api public
  */

From ca8b52d3557d7d808b930f57d9ecea881ba7219b Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 28 Oct 2024 09:35:08 -0400
Subject: [PATCH 138/191] Update lib/model.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/model.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 80fa8849fd0..83dac2168c8 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -1444,7 +1444,7 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
  * @param {Object} [options]
  * @param {Array<String>} [options.toDrop] if specified, contains a list of index names to drop
  * @param {Boolean} [options.hideIndexes=false] set to `true` to hide indexes instead of dropping. Requires MongoDB server 4.4 or higher
- * @return {Promise<String>} list of dropped index names
+ * @return {Promise<String>} list of dropped or hidden index names
  * @api public
  */
 

From 6a7d98e775695ded79efb2a3d7971e31ccca1cbb Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 28 Oct 2024 09:43:56 -0400
Subject: [PATCH 139/191] docs: improve @see link for SchemaLevelProjections
 re: #11474

---
 lib/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index 102c675a2f1..0b56c5591e8 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -1164,7 +1164,7 @@ Query.prototype.select = function select() {
  * @instance
  * @param {Boolean} value
  * @return {Query} this
- * @see SchemaType https://mongoosejs.com/docs/api/schematype.html
+ * @see SchemaTypeOptions https://mongoosejs.com/docs/schematypes.html#all-schema-types
  * @api public
  */
 

From f1607b08ca84d5cf06b099c9cf2629213d760c5b Mon Sep 17 00:00:00 2001
From: Oguzhan <cfmelun@gmail.com>
Date: Mon, 28 Oct 2024 18:11:42 +0300
Subject: [PATCH 140/191] types: added toJSON:flattenObjectIds effect

---
 types/document.d.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/types/document.d.ts b/types/document.d.ts
index 0d263ce1dd1..e52169dfca4 100644
--- a/types/document.d.ts
+++ b/types/document.d.ts
@@ -256,10 +256,17 @@ declare module 'mongoose' {
     set(value: string | Record<string, any>): this;
 
     /** The return value of this method is used in calls to JSON.stringify(doc). */
-    toJSON(options?: ToObjectOptions & { flattenMaps?: true }): FlattenMaps<Require_id<DocType>>;
+    toJSON(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<Require_id<DocType>>;
+    toJSON(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<Require_id<DocType>>;
+    toJSON(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<Require_id<DocType>>>;
     toJSON(options: ToObjectOptions & { flattenMaps: false }): Require_id<DocType>;
-    toJSON<T = Require_id<DocType>>(options?: ToObjectOptions & { flattenMaps?: true }): FlattenMaps<T>;
+    toJSON(options: ToObjectOptions & { flattenMaps: false; flattenObjectIds: true }): ObjectIdToString<Require_id<DocType>>;
+
+    toJSON<T = Require_id<DocType>>(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<T>;
+    toJSON<T = Require_id<DocType>>(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<T>;
+    toJSON<T = Require_id<DocType>>(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<T>>;
     toJSON<T = Require_id<DocType>>(options: ToObjectOptions & { flattenMaps: false }): T;
+    toJSON<T = Require_id<DocType>>(options: ToObjectOptions & { flattenMaps: false; flattenObjectIds: true }): ObjectIdToString<T>;
 
     /** Converts this document into a plain-old JavaScript object ([POJO](https://masteringjs.io/tutorials/fundamentals/pojo)). */
     toObject(options?: ToObjectOptions): Require_id<DocType>;

From bfc226caa17dfed50bc8b5ca009e1873026a0242 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 28 Oct 2024 11:57:04 -0400
Subject: [PATCH 141/191] types: add __v to lean() result type and ModifyResult

Re: #12959
---
 test/types/document.test.ts |  2 +-
 test/types/models.test.ts   |  6 +++---
 test/types/populate.test.ts |  1 -
 test/types/schema.test.ts   | 10 ++++++++++
 types/index.d.ts            |  2 +-
 types/models.d.ts           |  2 +-
 types/query.d.ts            |  2 +-
 7 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/test/types/document.test.ts b/test/types/document.test.ts
index 48456bf4806..19ca1083296 100644
--- a/test/types/document.test.ts
+++ b/test/types/document.test.ts
@@ -371,7 +371,7 @@ async function gh12959() {
 
   const doc = await Model.findById('id').orFail();
   expectType<Types.ObjectId>(doc._id);
-  expectType<number | undefined>(doc.__v);
+  expectType<number>(doc.__v);
 
   expectError(doc.subdocArray[0].__v);
 }
diff --git a/test/types/models.test.ts b/test/types/models.test.ts
index 2575ad31330..2e7c536eb33 100644
--- a/test/types/models.test.ts
+++ b/test/types/models.test.ts
@@ -623,9 +623,9 @@ async function gh13151() {
 
   const TestModel = model<ITest>('Test', TestSchema);
   const test = await TestModel.findOne().lean();
-  expectType<ITest & { _id: Types.ObjectId } | null>(test);
+  expectType<ITest & { _id: Types.ObjectId } & { __v: number } | null>(test);
   if (!test) return;
-  expectType<ITest & { _id: Types.ObjectId }>(test);
+  expectType<ITest & { _id: Types.ObjectId } & { __v: number }>(test);
 }
 
 function gh13206() {
@@ -661,7 +661,7 @@ async function gh13705() {
   const schema = new Schema({ name: String });
   const TestModel = model('Test', schema);
 
-  type ExpectedLeanDoc = (mongoose.FlattenMaps<{ name?: string | null }> & { _id: mongoose.Types.ObjectId });
+  type ExpectedLeanDoc = (mongoose.FlattenMaps<{ name?: string | null }> & { _id: mongoose.Types.ObjectId } & { __v: number });
 
   const findByIdRes = await TestModel.findById('0'.repeat(24), undefined, { lean: true });
   expectType<ExpectedLeanDoc | null>(findByIdRes);
diff --git a/test/types/populate.test.ts b/test/types/populate.test.ts
index 5ac5f76e83a..9829fa82791 100644
--- a/test/types/populate.test.ts
+++ b/test/types/populate.test.ts
@@ -248,7 +248,6 @@ async function _11532() {
 
   if (!leanResult) return;
   expectType<string>(leanResult.child.name);
-  expectError(leanResult?.__v);
 }
 
 async function gh11710() {
diff --git a/test/types/schema.test.ts b/test/types/schema.test.ts
index 90bcfce7f5f..82988a05b12 100644
--- a/test/types/schema.test.ts
+++ b/test/types/schema.test.ts
@@ -1714,3 +1714,13 @@ async function gh14451() {
     myMap?: Record<string, string> | null | undefined
   }>({} as TestJSON);
 }
+
+async function gh12959() {
+  const schema = new Schema({ name: String });
+  const TestModel = model('Test', schema);
+
+  const doc = await TestModel.findOne().orFail();
+  expectType<number>(doc.__v);
+  const leanDoc = await TestModel.findOne().lean().orFail();
+  expectType<number>(leanDoc.__v);
+}
diff --git a/types/index.d.ts b/types/index.d.ts
index cb1087ea919..90afdd8b180 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -140,7 +140,7 @@ declare module 'mongoose' {
 
   export type Default__v<T> = T extends { __v?: infer U }
     ? T
-    : T & { __v?: number };
+    : T & { __v: number };
 
   /** Helper type for getting the hydrated document type from the raw document type. The hydrated document type is what `new MyModel()` returns. */
   export type HydratedDocument<
diff --git a/types/models.d.ts b/types/models.d.ts
index 5cc38840d8c..5a5ced60944 100644
--- a/types/models.d.ts
+++ b/types/models.d.ts
@@ -126,7 +126,7 @@ declare module 'mongoose' {
   }
 
   interface ModifyResult<T> {
-    value: Require_id<T> | null;
+    value: Default__v<Require_id<T>> | null;
     /** see https://www.mongodb.com/docs/manual/reference/command/findAndModify/#lasterrorobject */
     lastErrorObject?: {
       updatedExisting?: boolean;
diff --git a/types/query.d.ts b/types/query.d.ts
index 17c109972a1..67129e6c7b6 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -217,7 +217,7 @@ declare module 'mongoose' {
   type QueryOpThatReturnsDocument = 'find' | 'findOne' | 'findOneAndUpdate' | 'findOneAndReplace' | 'findOneAndDelete';
 
   type GetLeanResultType<RawDocType, ResultType, QueryOp> = QueryOp extends QueryOpThatReturnsDocument
-    ? (ResultType extends any[] ? Require_id<BufferToBinary<FlattenMaps<RawDocType>>>[] : Require_id<BufferToBinary<FlattenMaps<RawDocType>>>)
+    ? (ResultType extends any[] ? Default__v<Require_id<BufferToBinary<FlattenMaps<RawDocType>>>>[] : Default__v<Require_id<BufferToBinary<FlattenMaps<RawDocType>>>>)
     : ResultType;
 
   type MergePopulatePaths<RawDocType, ResultType, QueryOp, Paths, TQueryHelpers, TInstanceMethods = Record<string, never>> = QueryOp extends QueryOpThatReturnsDocument

From de3da48e7ccb0378bfe00996f6f6261b0b833f7d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 28 Oct 2024 12:04:05 -0400
Subject: [PATCH 142/191] feat: upgrade mongodb -> ~6.10

Fix #14877
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8a14afbead6..4a7d24ac130 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "dependencies": {
     "bson": "^6.7.0",
     "kareem": "2.6.3",
-    "mongodb": "6.9.0",
+    "mongodb": "~6.10.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",

From 8b5bbe8c2e37b8a1a8ef4a4f21020b38157ac803 Mon Sep 17 00:00:00 2001
From: Bl4sio <31994530+Bl4sio@users.noreply.github.com>
Date: Tue, 29 Oct 2024 10:53:33 +0100
Subject: [PATCH 143/191] types: use globalThis instead of global for
 NativeDate

Fix for issue #14988
The global is defined in the @types/node package, which is not in the dependencies.
Without the package, NativeDate would be interpreted as any by typescript, and resolves the types in the Schema incorrectly.
---
 types/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/types/index.d.ts b/types/index.d.ts
index cabb62630fc..43d3897ae78 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -25,7 +25,7 @@
 /// <reference path="./virtuals.d.ts" />
 /// <reference path="./augmentations.d.ts" />
 
-declare class NativeDate extends global.Date { }
+declare class NativeDate extends globalThis.Date { }
 
 declare module 'mongoose' {
   import Kareem = require('kareem');

From 8a584907bce0e0c8a6ba0a796bff5ea0d635c023 Mon Sep 17 00:00:00 2001
From: dragontaek-lee <dragontaek98@naver.com>
Date: Tue, 29 Oct 2024 22:32:31 +0900
Subject: [PATCH 144/191] docs(change-streams): fix markdown syntax
 highlighting for script output example

---
 docs/change-streams.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/change-streams.md b/docs/change-streams.md
index cc6d3d36c94..885279050e2 100644
--- a/docs/change-streams.md
+++ b/docs/change-streams.md
@@ -21,7 +21,7 @@ await Person.create({ name: 'Axl Rose' });
 
 The above script will print output that looks like:
 
-```no-highlight
+```javascript
 {
   _id: {
     _data: '8262408DAC000000012B022C0100296E5A10042890851837DB4792BE6B235E8B85489F46645F6964006462408DAC6F5C42FF5EE087A20004'

From 63525bb2c600a47dcd2fb738bfab74e3feb62d49 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 29 Oct 2024 09:34:01 -0400
Subject: [PATCH 145/191] fix(model): avoid throwing TypeError if bulkSave()'s
 bulkWrite() fails with a non-BulkWriteError

---
 lib/model.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 3f242e7f815..9807c433873 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3430,7 +3430,13 @@ Model.bulkSave = async function bulkSave(documents, options) {
   const successfulDocuments = [];
   for (let i = 0; i < documents.length; i++) {
     const document = documents[i];
-    const documentError = bulkWriteError && bulkWriteError.writeErrors.find(writeError => {
+    const hasWriteErrors = bulkWriteError && Array.isArray(bulkWriteError.writeErrors);
+    // If there is an error, but the error doesn't have a list of `writeErrors`, then treat the error as
+    // indicating that all documents failed. This might happen because of a MongooseServerSelectionError.
+    if (!hasWriteErrors) {
+      continue;
+    }
+    const documentError = bulkWriteError.writeErrors.find(writeError => {
       const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
       return writeErrorDocumentId.toString() === document._doc._id.toString();
     });

From 669798b209bd78facfa719bb942734f3b1ae651e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 29 Oct 2024 10:00:12 -0400
Subject: [PATCH 146/191] fix(model): avoid unhandled error if `createIndex()`
 throws a sync error

---
 lib/model.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/model.js b/lib/model.js
index 3f242e7f815..597c70c6c9e 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -1653,7 +1653,24 @@ function _ensureIndexes(model, options, callback) {
       }
     }
 
-    model.collection.createIndex(indexFields, indexOptions).then(
+    // Just in case `createIndex()` throws a sync error
+    let promise = null;
+    try {
+      promise = model.collection.createIndex(indexFields, indexOptions);
+    } catch (err) {
+      if (!indexError) {
+        indexError = err;
+      }
+      if (!model.$caught) {
+        model.emit('error', err);
+      }
+
+      indexSingleDone(err, indexFields, indexOptions);
+      create();
+      return;
+    }
+
+    promise.then(
       name => {
         indexSingleDone(null, indexFields, indexOptions, name);
         create();

From 66b44b5152bcf6861644cc4a9989191cc31ddcf8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 29 Oct 2024 11:41:00 -0400
Subject: [PATCH 147/191] fix: better way to handle non-MongoBulkWriteErrors

---
 lib/model.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/model.js b/lib/model.js
index 9807c433873..1d3dd8f071d 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -10,6 +10,7 @@ const Document = require('./document');
 const DocumentNotFoundError = require('./error/notFound');
 const EventEmitter = require('events').EventEmitter;
 const Kareem = require('kareem');
+const { MongoBulkWriteError } = require('mongodb');
 const MongooseBulkWriteError = require('./error/bulkWriteError');
 const MongooseError = require('./error/index');
 const ObjectParameterError = require('./error/objectParameter');
@@ -3417,6 +3418,11 @@ Model.bulkSave = async function bulkSave(documents, options) {
     (err) => ({ bulkWriteResult: null, bulkWriteError: err })
   );
 
+  // If not a MongoBulkWriteError, treat this as all documents failed to save.
+  if (bulkWriteError != null && !(bulkWriteError instanceof MongoBulkWriteError)) {
+    throw bulkWriteError;
+  }
+
   const matchedCount = bulkWriteResult?.matchedCount ?? 0;
   const insertedCount = bulkWriteResult?.insertedCount ?? 0;
   if (writeOperations.length > 0 && matchedCount + insertedCount < writeOperations.length && !bulkWriteError) {
@@ -3430,13 +3436,7 @@ Model.bulkSave = async function bulkSave(documents, options) {
   const successfulDocuments = [];
   for (let i = 0; i < documents.length; i++) {
     const document = documents[i];
-    const hasWriteErrors = bulkWriteError && Array.isArray(bulkWriteError.writeErrors);
-    // If there is an error, but the error doesn't have a list of `writeErrors`, then treat the error as
-    // indicating that all documents failed. This might happen because of a MongooseServerSelectionError.
-    if (!hasWriteErrors) {
-      continue;
-    }
-    const documentError = bulkWriteError.writeErrors.find(writeError => {
+    const documentError = bulkWriteError && bulkWriteError.writeErrors.find(writeError => {
       const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
       return writeErrorDocumentId.toString() === document._doc._id.toString();
     });

From 326f9ab364a87b4e3d63ab681712c03ed8a702cc Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 31 Oct 2024 10:05:46 -0400
Subject: [PATCH 148/191] chore: bump max num of instantiations for typescript

---
 scripts/tsc-diagnostics-check.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/tsc-diagnostics-check.js b/scripts/tsc-diagnostics-check.js
index a1c4408cb79..a13c884ee02 100644
--- a/scripts/tsc-diagnostics-check.js
+++ b/scripts/tsc-diagnostics-check.js
@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 const stdin = fs.readFileSync(0).toString('utf8');
-const maxInstantiations = isNaN(process.argv[2]) ? 250000 : parseInt(process.argv[2], 10);
+const maxInstantiations = isNaN(process.argv[2]) ? 275000 : parseInt(process.argv[2], 10);
 
 console.log(stdin);
 

From 10a3aeda6bfb15f04fc2dd5698826a80005460da Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 31 Oct 2024 10:15:49 -0400
Subject: [PATCH 149/191] chore: release 8.8.0

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e3e97e30291..4a786d7b570 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+8.8.0 / 2024-10-31
+==================
+ * feat: upgrade mongodb -> ~6.10 #14991 #14877
+ * feat(query): add schemaLevelProjections option to query to disable schema-level select: false #14986 #11474
+ * feat: allow defining virtuals on arrays, not just array elements #14955 #2326
+ * feat(model): add applyTimestamps() function to apply all schema timestamps, including subdocuments, to a given POJO #14943 #14698
+ * feat(model): add hideIndexes option to syncIndexes() and cleanIndexes() #14987 #14868
+ * fix(query): make sanitizeFilter disable implicit $in #14985 #14657
+ * fix(model): avoid unhandled error if createIndex() throws a sync error #14995
+ * fix(model): avoid throwing TypeError if bulkSave()'s bulkWrite() fails with a non-BulkWriteError #14993
+ * types: added toJSON:flattenObjectIds effect #14989
+ * types: add `__v` to lean() result type and ModifyResult #14990 #12959
+ * types: use globalThis instead of global for NativeDate #14992 #14988
+ * docs(change-streams): fix markdown syntax highlighting for script output example #14994
+
+
 8.7.3 / 2024-10-25
 ==================
  * fix(cursor): close underlying query cursor when calling destroy() #14982 #14966
diff --git a/package.json b/package.json
index 4a7d24ac130..085d0655a7a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.7.3",
+  "version": "8.8.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 693ff082c25aed6c0fd9ce88b3e9f233d1235d7b Mon Sep 17 00:00:00 2001
From: hasezoey <hasezoey@gmail.com>
Date: Fri, 1 Nov 2024 17:34:59 +0100
Subject: [PATCH 150/191] deps(mongodb-memory-server): upgrade to 9.5.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8535736c6b1..ddcd16ac5df 100644
--- a/package.json
+++ b/package.json
@@ -58,7 +58,7 @@
     "mkdirp": "^3.0.1",
     "mocha": "10.2.0",
     "moment": "2.x",
-    "mongodb-memory-server": "9.2.0",
+    "mongodb-memory-server": "9.5.0",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.2",

From 50628425920970c7c057b1f7d6cec588ec19f3fa Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 1 Nov 2024 14:21:04 -0400
Subject: [PATCH 151/191] fix(query): add `overwriteImmutable` option to allow
 updating immutable properties without disabling strict mode

Fix #8619
---
 docs/timestamps.md                   | 17 +++++++++++++++++
 lib/helpers/query/castUpdate.js      |  4 ++--
 lib/helpers/query/handleImmutable.js |  5 ++++-
 lib/query.js                         | 11 ++++++++++-
 test/model.updateOne.test.js         | 23 +++++++++++++++++++++++
 types/query.d.ts                     |  6 ++++++
 6 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/docs/timestamps.md b/docs/timestamps.md
index 17706a6e0f9..4f8b4433f74 100644
--- a/docs/timestamps.md
+++ b/docs/timestamps.md
@@ -236,3 +236,20 @@ await User.findOneAndUpdate({}, { $setOnInsert: { updatedAt: new Date() } }, {
   timestamps: { createdAt: true, updatedAt: false }
 });
 ```
+
+## Updating Timestamps
+
+If you need to disable Mongoose's timestamps and update a document's timestamps to a different value using `updateOne()` or `findOneAndUpdate()`, you need to do the following:
+
+1. Set the `timestamps` option to `false` to prevent Mongoose from setting `updatedAt`.
+2. Set `overwriteImmutable` to `false` to allow overwriting `createdAt`, which is an immutable property by default.
+
+```javascript
+const createdAt = new Date('2011-06-01');
+// Update a document's `createdAt` to a custom value. Normally Mongoose would prevent doing this because `createdAt`
+// is immutable.
+await Model.updateOne({ _id: doc._id }, { createdAt }, { overwriteImmutable: true, timestamps: false });
+
+doc = await Model.collection.findOne({ _id: doc._id });
+doc.createdAt.valueOf() === createdAt.valueOf(); // true
+```
\ No newline at end of file
diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
index 94f374d8b58..d48c5927559 100644
--- a/lib/helpers/query/castUpdate.js
+++ b/lib/helpers/query/castUpdate.js
@@ -245,7 +245,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
       }
 
       if (op !== '$setOnInsert' &&
-          handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
+          handleImmutable(schematype, strict, obj, key, prefix + key, options, context)) {
         continue;
       }
 
@@ -353,7 +353,7 @@ function walkUpdatePath(schema, obj, op, options, context, filter, pref) {
 
       // You can use `$setOnInsert` with immutable keys
       if (op !== '$setOnInsert' &&
-          handleImmutable(schematype, strict, obj, key, prefix + key, context)) {
+          handleImmutable(schematype, strict, obj, key, prefix + key, options, context)) {
         continue;
       }
 
diff --git a/lib/helpers/query/handleImmutable.js b/lib/helpers/query/handleImmutable.js
index 22adb3c50de..3dfd4d24b7d 100644
--- a/lib/helpers/query/handleImmutable.js
+++ b/lib/helpers/query/handleImmutable.js
@@ -2,7 +2,7 @@
 
 const StrictModeError = require('../../error/strict');
 
-module.exports = function handleImmutable(schematype, strict, obj, key, fullPath, ctx) {
+module.exports = function handleImmutable(schematype, strict, obj, key, fullPath, options, ctx) {
   if (schematype == null || !schematype.options || !schematype.options.immutable) {
     return false;
   }
@@ -15,6 +15,9 @@ module.exports = function handleImmutable(schematype, strict, obj, key, fullPath
     return false;
   }
 
+  if (options && options.overwriteImmutable) {
+    return false;
+  }
   if (strict === false) {
     return false;
   }
diff --git a/lib/query.js b/lib/query.js
index d853c0828fe..2c00c92f52b 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -1626,6 +1626,7 @@ Query.prototype.getOptions = function() {
  * - [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.
  * - 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.
  *
  * The following options are only for `find()`, `findOne()`, `findById()`, `findOneAndUpdate()`, `findOneAndReplace()`, `findOneAndDelete()`, and `findByIdAndUpdate()`:
  *
@@ -1697,6 +1698,10 @@ Query.prototype.setOptions = function(options, overwrite) {
     this._mongooseOptions.overwriteDiscriminatorKey = options.overwriteDiscriminatorKey;
     delete options.overwriteDiscriminatorKey;
   }
+  if ('overwriteImmutable' in options) {
+    this._mongooseOptions.overwriteImmutable = options.overwriteImmutable;
+    delete options.overwriteImmutable;
+  }
   if ('sanitizeProjection' in options) {
     if (options.sanitizeProjection && !this._mongooseOptions.sanitizeProjection) {
       sanitizeProjection(this._fields);
@@ -3318,6 +3323,7 @@ function prepareDiscriminatorCriteria(query) {
  * @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.
  * @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
@@ -4016,6 +4022,7 @@ Query.prototype._replaceOne = async function _replaceOne() {
  * @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 {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()
@@ -4086,6 +4093,7 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
  * @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 {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()
@@ -4707,7 +4715,8 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
     strict: this._mongooseOptions.strict,
     upsert: upsert,
     arrayFilters: this.options.arrayFilters,
-    overwriteDiscriminatorKey: this._mongooseOptions.overwriteDiscriminatorKey
+    overwriteDiscriminatorKey: this._mongooseOptions.overwriteDiscriminatorKey,
+    overwriteImmutable: this._mongooseOptions.overwriteImmutable
   }, this, this._conditions);
 };
 
diff --git a/test/model.updateOne.test.js b/test/model.updateOne.test.js
index 0b4223dad5c..e1fdcef1447 100644
--- a/test/model.updateOne.test.js
+++ b/test/model.updateOne.test.js
@@ -2526,6 +2526,29 @@ describe('model: updateOne: ', function() {
     assert.ok(doc.createdAt.valueOf() >= start);
   });
 
+  it('overwriting immutable createdAt (gh-8619)', async function() {
+    const start = new Date().valueOf();
+    const schema = Schema({
+      createdAt: {
+        type: mongoose.Schema.Types.Date,
+        immutable: true
+      },
+      name: String
+    }, { timestamps: true });
+
+    const Model = db.model('Test', schema);
+
+    await Model.create({ name: 'gh-8619' });
+    let doc = await Model.collection.findOne({ name: 'gh-8619' });
+    assert.ok(doc.createdAt.valueOf() >= start);
+
+    const createdAt = new Date('2011-06-01');
+    assert.ok(createdAt.valueOf() < start.valueOf());
+    await Model.updateOne({ _id: doc._id }, { name: 'gh-8619 update', createdAt }, { overwriteImmutable: true, timestamps: false });
+    doc = await Model.collection.findOne({ name: 'gh-8619 update' });
+    assert.equal(doc.createdAt.valueOf(), createdAt.valueOf());
+  });
+
   it('conditional immutable (gh-8001)', async function() {
     const schema = Schema({
       test: {
diff --git a/types/query.d.ts b/types/query.d.ts
index 67129e6c7b6..b2d4da347b7 100644
--- a/types/query.d.ts
+++ b/types/query.d.ts
@@ -20,6 +20,7 @@ declare module 'mongoose' {
     | 'context'
     | 'multipleCastError'
     | 'overwriteDiscriminatorKey'
+    | 'overwriteImmutable'
     | 'populate'
     | 'runValidators'
     | 'sanitizeProjection'
@@ -154,6 +155,11 @@ declare module 'mongoose' {
     new?: boolean;
 
     overwriteDiscriminatorKey?: boolean;
+    /**
+     * Mongoose removes updated immutable properties from `update` by default (excluding $setOnInsert).
+     * Set `overwriteImmutable` to `true` to allow updating immutable properties using other update operators.
+     */
+    overwriteImmutable?: boolean;
     projection?: ProjectionType<DocType>;
     /**
      * if true, returns the full ModifyResult rather than just the document

From 008f708360ac7e9bbb1353bd470734c1ff5207e8 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 1 Nov 2024 16:10:23 -0400
Subject: [PATCH 152/191] fix md lint

---
 docs/timestamps.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/timestamps.md b/docs/timestamps.md
index 4f8b4433f74..dcb4a47be83 100644
--- a/docs/timestamps.md
+++ b/docs/timestamps.md
@@ -252,4 +252,4 @@ await Model.updateOne({ _id: doc._id }, { createdAt }, { overwriteImmutable: tru
 
 doc = await Model.collection.findOne({ _id: doc._id });
 doc.createdAt.valueOf() === createdAt.valueOf(); // true
-```
\ No newline at end of file
+```

From 6a73d2568d2dd4b7a6c0fd70db64731e64a32245 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 1 Nov 2024 16:46:10 -0400
Subject: [PATCH 153/191] fix: apply embedded discriminators to subdoc schemas
 before compiling top level model so middleware applies correctly

Fix #14961
---
 lib/mongoose.js       |  4 +--
 test/document.test.js | 62 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/lib/mongoose.js b/lib/mongoose.js
index f314e4c399a..2a03b638209 100644
--- a/lib/mongoose.js
+++ b/lib/mongoose.js
@@ -661,6 +661,8 @@ Mongoose.prototype._model = function(name, schema, collection, options) {
       utils.toCollectionName(name, _mongoose.pluralize());
   }
 
+  applyEmbeddedDiscriminators(schema);
+
   const connection = options.connection || _mongoose.connection;
   model = _mongoose.Model.compile(model || name, schema, collection, connection, _mongoose);
   // Errors handled internally, so safe to ignore error
@@ -678,8 +680,6 @@ Mongoose.prototype._model = function(name, schema, collection, options) {
     }
   }
 
-  applyEmbeddedDiscriminators(schema);
-
   return model;
 };
 
diff --git a/test/document.test.js b/test/document.test.js
index 71e43ababff..813b34ebff9 100644
--- a/test/document.test.js
+++ b/test/document.test.js
@@ -12996,6 +12996,68 @@ describe('document', function() {
     );
   });
 
+  it('handles middleware on embedded discriminators on nested path defined using Schema.prototype.discriminator (gh-14961)', async function() {
+    const eventSchema = new Schema(
+      { message: String },
+      { discriminatorKey: 'kind', _id: false }
+    );
+
+    const clickedSchema = new Schema({
+      element: String
+    }, { _id: false });
+
+    // This is the discriminator which we will use to test middleware
+    const purchasedSchema = new Schema({
+      product: String
+    }, { _id: false });
+
+    let eventSchemaPreValidateCalls = 0;
+    let eventSchemaPreSaveCalls = 0;
+    eventSchema.pre('validate', function() {
+      ++eventSchemaPreValidateCalls;
+    });
+    eventSchema.pre('save', function() {
+      ++eventSchemaPreSaveCalls;
+    });
+
+    let purchasedSchemaPreValidateCalls = 0;
+    let purchasedSchemaPreSaveCalls = 0;
+    purchasedSchema.pre('validate', function() {
+      ++purchasedSchemaPreValidateCalls;
+    });
+    purchasedSchema.pre('save', function() {
+      ++purchasedSchemaPreSaveCalls;
+    });
+
+    eventSchema.discriminator('Clicked', clickedSchema);
+    eventSchema.discriminator('Purchased', purchasedSchema);
+
+    const trackSchema = new Schema({
+      event: eventSchema
+    });
+
+    // Test
+
+    const MyModel = db.model('track', trackSchema);
+    const doc = new MyModel({
+      event: {
+        kind: 'Purchased',
+        message: 'Test',
+        product: 'iPhone'
+      }
+    });
+
+    await doc.save();
+    assert.equal(doc.event.message, 'Test');
+    assert.equal(doc.event.kind, 'Purchased');
+    assert.equal(doc.event.product, 'iPhone');
+
+    assert.strictEqual(eventSchemaPreValidateCalls, 1);
+    assert.strictEqual(eventSchemaPreSaveCalls, 1);
+    assert.strictEqual(purchasedSchemaPreValidateCalls, 1);
+    assert.strictEqual(purchasedSchemaPreSaveCalls, 1);
+  });
+
   it('handles reusing schema with embedded discriminators defined using Schema.prototype.discriminator (gh-14162)', async function() {
     const discriminated = new Schema({
       type: { type: Number, required: true }

From 698c19e9027e17a982d72d5524481435380dbcf2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:22:46 +0000
Subject: [PATCH 154/191] chore(deps): bump actions/setup-node from 4.0.4 to
 4.1.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4.0.4 to 4.1.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/0a44ba7841725637a19e28fa30b79a866c81b0a6...39370e3970a6d050c480ffad4ff0ed4d3fdee5af)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/benchmark.yml          | 2 +-
 .github/workflows/documentation.yml      | 4 ++--
 .github/workflows/test.yml               | 8 ++++----
 .github/workflows/tidelift-alignment.yml | 2 +-
 .github/workflows/tsd.yml                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 3f29ced8956..9dc40375251 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -26,7 +26,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 16
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index a8faeb3f66a..b5ec992e9b3 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 20
 
@@ -52,7 +52,7 @@ jobs:
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 20
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12a1fdd10d4..b3fd78af6ba 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 18
 
@@ -61,7 +61,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: ${{ matrix.node }}
 
@@ -96,7 +96,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 16
       - name: Load MongoDB binary cache
@@ -124,7 +124,7 @@ jobs:
     steps:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 16
       - run: npm install
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
index 03b7b7bce50..15c8da3bbce 100644
--- a/.github/workflows/tidelift-alignment.yml
+++ b/.github/workflows/tidelift-alignment.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 16
       - name: Alignment
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
index 9c803daba83..a95c7860ffd 100644
--- a/.github/workflows/tsd.yml
+++ b/.github/workflows/tsd.yml
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 18
 
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
 
       - name: Setup node
-        uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: 16
 

From 9482c35270ef3dc06a6be3cd819af03d35dc98c3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:22:51 +0000
Subject: [PATCH 155/191] chore(deps): bump actions/checkout from 4.2.0 to
 4.2.2

Bumps [actions/checkout](https://github.com/actions/checkout) from 4.2.0 to 4.2.2.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/d632683dd7b4114ad314bca15554477dd762a938...11bd71901bbe5b1630ceea73d27597364c9af683)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/benchmark.yml          |  2 +-
 .github/workflows/codeql.yml             |  2 +-
 .github/workflows/documentation.yml      |  4 ++--
 .github/workflows/test.yml               | 10 +++++-----
 .github/workflows/tidelift-alignment.yml |  2 +-
 .github/workflows/tsd.yml                |  4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 3f29ced8956..31b4a5c7f07 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Benchmark TypeScript Types
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Setup node
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index e11f457af01..d0cd8cca68d 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index a8faeb3f66a..74a3edafffc 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint Markdown files
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-20.04
     name: Test Generating Docs
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12a1fdd10d4..bf7b505ec24 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint JS-Files
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -58,7 +58,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -94,7 +94,7 @@ jobs:
       MONGOMS_PREFER_GLOBAL_PATH: 1
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
@@ -122,7 +122,7 @@ jobs:
     env:
       FORCE_COLOR: true
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
@@ -139,6 +139,6 @@ jobs:
       contents: read
     steps:
       - name: Check out repo
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Dependency review
         uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
index 03b7b7bce50..6fa868bf9a0 100644
--- a/.github/workflows/tidelift-alignment.yml
+++ b/.github/workflows/tidelift-alignment.yml
@@ -15,7 +15,7 @@ jobs:
     if: github.repository == 'Automattic/mongoose'
     steps:
       - name: Checkout
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
         with:
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
index 9c803daba83..3a6de93d150 100644
--- a/.github/workflows/tsd.yml
+++ b/.github/workflows/tsd.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Lint TS-Files
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     name: Test Typescript Types
     steps:
-      - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
         uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4

From 1ed2a32ebf5aeb1660ce0c8f971d5a8dab7157ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:22:54 +0000
Subject: [PATCH 156/191] chore(deps): bump denoland/setup-deno from 1 to 2

Bumps [denoland/setup-deno](https://github.com/denoland/setup-deno) from 1 to 2.
- [Release notes](https://github.com/denoland/setup-deno/releases)
- [Commits](https://github.com/denoland/setup-deno/compare/v1...v2)

---
updated-dependencies:
- dependency-name: denoland/setup-deno
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 12a1fdd10d4..491897b2f76 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -106,7 +106,7 @@ jobs:
           path: ~/.cache/mongodb-binaries
           key: deno-${{ env.MONGOMS_VERSION }}
       - name: Setup Deno
-        uses: denoland/setup-deno@v1
+        uses: denoland/setup-deno@v2
         with:
           deno-version: v1.37.x
       - run: deno --version

From 6dfd52e5703af05580be74264042b18e8987b696 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:46:21 +0000
Subject: [PATCH 157/191] chore(deps-dev): bump mongodb-memory-server from
 10.0.1 to 10.1.2

Bumps [mongodb-memory-server](https://github.com/typegoose/mongodb-memory-server/tree/HEAD/packages/mongodb-memory-server) from 10.0.1 to 10.1.2.
- [Release notes](https://github.com/typegoose/mongodb-memory-server/releases)
- [Changelog](https://github.com/typegoose/mongodb-memory-server/blob/master/CHANGELOG.md)
- [Commits](https://github.com/typegoose/mongodb-memory-server/commits/v10.1.2/packages/mongodb-memory-server)

---
updated-dependencies:
- dependency-name: mongodb-memory-server
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 085d0655a7a..042706f9a6c 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "mkdirp": "^3.0.1",
     "mocha": "10.7.3",
     "moment": "2.30.1",
-    "mongodb-memory-server": "10.0.1",
+    "mongodb-memory-server": "10.1.2",
     "ncp": "^2.0.0",
     "nyc": "15.1.0",
     "pug": "3.0.3",

From b41afd139d5c38aba6939c3f2f4d1936ab233933 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:46:32 +0000
Subject: [PATCH 158/191] chore(deps-dev): bump uuid from 10.0.0 to 11.0.2

Bumps [uuid](https://github.com/uuidjs/uuid) from 10.0.0 to 11.0.2.
- [Release notes](https://github.com/uuidjs/uuid/releases)
- [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/uuidjs/uuid/compare/v10.0.0...v11.0.2)

---
updated-dependencies:
- dependency-name: uuid
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 085d0655a7a..151c8a908b0 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "stream-browserify": "3.0.0",
     "tsd": "0.31.2",
     "typescript": "5.6.2",
-    "uuid": "10.0.0",
+    "uuid": "11.0.2",
     "webpack": "5.95.0"
   },
   "directories": {

From b7e67dde0e2830d8291bde2c4c385a332497df0d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:46:46 +0000
Subject: [PATCH 159/191] chore(deps-dev): bump @babel/preset-env from 7.25.4
 to 7.26.0

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.25.4 to 7.26.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 085d0655a7a..19c0359abe1 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
   },
   "devDependencies": {
     "@babel/core": "7.24.7",
-    "@babel/preset-env": "7.25.4",
+    "@babel/preset-env": "7.26.0",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",
     "acquit": "1.3.0",

From 4a973dfe0c790e7e714757d0bd0ebcb91dfdf7c5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:47:49 +0000
Subject: [PATCH 160/191] chore(deps-dev): bump marked from 14.1.2 to 14.1.3

Bumps [marked](https://github.com/markedjs/marked) from 14.1.2 to 14.1.3.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/.releaserc.json)
- [Commits](https://github.com/markedjs/marked/compare/v14.1.2...v14.1.3)

---
updated-dependencies:
- dependency-name: marked
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 085d0655a7a..a71eefe3b38 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
     "markdownlint-cli2": "^0.14.0",
-    "marked": "14.1.2",
+    "marked": "14.1.3",
     "mkdirp": "^3.0.1",
     "mocha": "10.7.3",
     "moment": "2.30.1",

From 4e28929f6766d19e8be7aceccde00c5f88bf04f0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 1 Nov 2024 23:48:42 +0000
Subject: [PATCH 161/191] chore(deps-dev): bump crypto-browserify from 3.12.0
 to 3.12.1

Bumps [crypto-browserify](https://github.com/browserify/crypto-browserify) from 3.12.0 to 3.12.1.
- [Commits](https://github.com/browserify/crypto-browserify/compare/v3.12.0...v3.12.1)

---
updated-dependencies:
- dependency-name: crypto-browserify
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 085d0655a7a..4acb8a21413 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "broken-link-checker": "^0.7.8",
     "buffer": "^5.6.0",
     "cheerio": "1.0.0",
-    "crypto-browserify": "3.12.0",
+    "crypto-browserify": "3.12.1",
     "dotenv": "16.4.5",
     "dox": "1.0.0",
     "eslint": "8.57.0",

From 2706aeba606df44d7aceaf95d6ffeb470ca8bc90 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:40:58 -0500
Subject: [PATCH 162/191] chore: bump max instantiations re: #14999

---
 scripts/tsc-diagnostics-check.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/tsc-diagnostics-check.js b/scripts/tsc-diagnostics-check.js
index 2f74bf39b92..c23da8c1f55 100644
--- a/scripts/tsc-diagnostics-check.js
+++ b/scripts/tsc-diagnostics-check.js
@@ -3,7 +3,7 @@
 const fs = require('fs');
 
 const stdin = fs.readFileSync(0).toString('utf8');
-const maxInstantiations = isNaN(process.argv[2]) ? 125000 : parseInt(process.argv[2], 10);
+const maxInstantiations = isNaN(process.argv[2]) ? 135000 : parseInt(process.argv[2], 10);
 
 console.log(stdin);
 

From 5dc355b88428454f947333546e8af1c8319ae532 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:47:17 -0500
Subject: [PATCH 163/191] Update docs/timestamps.md

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 docs/timestamps.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/timestamps.md b/docs/timestamps.md
index dcb4a47be83..344996d6099 100644
--- a/docs/timestamps.md
+++ b/docs/timestamps.md
@@ -242,7 +242,7 @@ await User.findOneAndUpdate({}, { $setOnInsert: { updatedAt: new Date() } }, {
 If you need to disable Mongoose's timestamps and update a document's timestamps to a different value using `updateOne()` or `findOneAndUpdate()`, you need to do the following:
 
 1. Set the `timestamps` option to `false` to prevent Mongoose from setting `updatedAt`.
-2. Set `overwriteImmutable` to `false` to allow overwriting `createdAt`, which is an immutable property by default.
+2. Set `overwriteImmutable` to `true` to allow overwriting `createdAt`, which is an immutable property by default.
 
 ```javascript
 const createdAt = new Date('2011-06-01');

From 50daffd025c22c3a1535c0fae1d292f160e498df Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:47:57 -0500
Subject: [PATCH 164/191] Update docs/timestamps.md

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 docs/timestamps.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/timestamps.md b/docs/timestamps.md
index 344996d6099..8a722b4b356 100644
--- a/docs/timestamps.md
+++ b/docs/timestamps.md
@@ -246,8 +246,8 @@ If you need to disable Mongoose's timestamps and update a document's timestamps
 
 ```javascript
 const createdAt = new Date('2011-06-01');
-// Update a document's `createdAt` to a custom value. Normally Mongoose would prevent doing this because `createdAt`
-// is immutable.
+// Update a document's `createdAt` to a custom value.
+// Normally Mongoose would prevent doing this because `createdAt` is immutable.
 await Model.updateOne({ _id: doc._id }, { createdAt }, { overwriteImmutable: true, timestamps: false });
 
 doc = await Model.collection.findOne({ _id: doc._id });

From 49d07f5669f1246d1b2909da07316bf4f15483b3 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:48:09 -0500
Subject: [PATCH 165/191] Update lib/query.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index 2c00c92f52b..88b518d9ea9 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -3323,7 +3323,7 @@ function prepareDiscriminatorCriteria(query) {
  * @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.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

From 03a45ba157188192a9fd05b19db786578c5cf101 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:48:15 -0500
Subject: [PATCH 166/191] Update lib/query.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index 88b518d9ea9..4a3babe2cf2 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -4022,7 +4022,7 @@ Query.prototype._replaceOne = async function _replaceOne() {
  * @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.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 {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()

From af3ef645738af7eb3f5607daea55b7dabe3898c5 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:48:20 -0500
Subject: [PATCH 167/191] Update lib/query.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 lib/query.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index 4a3babe2cf2..6333c153c68 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -4093,7 +4093,7 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
  * @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.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 {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update https://mongoosejs.com/docs/api/model.html#Model.update()

From 388c5b299d98949f8d78d09fac426c8497c1a360 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 4 Nov 2024 13:54:07 -0500
Subject: [PATCH 168/191] docs: add documentation for query/handleImmutable

---
 lib/helpers/query/handleImmutable.js | 13 +++++++++++++
 test/types/queries.test.ts           |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/helpers/query/handleImmutable.js b/lib/helpers/query/handleImmutable.js
index 3dfd4d24b7d..0102db42a46 100644
--- a/lib/helpers/query/handleImmutable.js
+++ b/lib/helpers/query/handleImmutable.js
@@ -2,6 +2,19 @@
 
 const StrictModeError = require('../../error/strict');
 
+/**
+ * Handle immutable option for a given path when casting updates based on options
+ *
+ * @param {SchemaType} schematype the resolved schematype for this path
+ * @param {Boolean | 'throw' | null} strict whether strict mode is set for this query
+ * @param {Object} obj the object containing the value being checked so we can delete
+ * @param {String} key the key in `obj` which we are checking for immutability
+ * @param {String} fullPath the full path being checked
+ * @param {Object} options the query options
+ * @param {Query} ctx the query. Passed as `this` and first param to the `immutable` option, if `immutable` is a function
+ * @returns true if field was removed, false otherwise
+ */
+
 module.exports = function handleImmutable(schematype, strict, obj, key, fullPath, options, ctx) {
   if (schematype == null || !schematype.options || !schematype.options.immutable) {
     return false;
diff --git a/test/types/queries.test.ts b/test/types/queries.test.ts
index 02998362434..35ff6f24d6e 100644
--- a/test/types/queries.test.ts
+++ b/test/types/queries.test.ts
@@ -334,7 +334,7 @@ function gh14397() {
     age: number;
   };
 
-  const id: string = 'Test Id';
+  const id = 'Test Id';
 
   let idCondition: Condition<WithId<TestUser>['id']>;
   let filter: FilterQuery<WithId<TestUser>>;

From 0ea33d6d0cd064b0d2a702fada52aa1127189aeb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:21:00 +0000
Subject: [PATCH 169/191] chore(deps-dev): bump @babel/core from 7.24.7 to
 7.26.0

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.24.7 to 7.26.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39c07c01e3c..1da4b7c15eb 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@babel/core": "7.24.7",
+    "@babel/core": "7.26.0",
     "@babel/preset-env": "7.26.0",
     "@typescript-eslint/eslint-plugin": "^8.4.0",
     "@typescript-eslint/parser": "^8.4.0",

From 35a65e75a28ac8a56b360c71f9f3d9676866a778 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:21:22 +0000
Subject: [PATCH 170/191] chore(deps-dev): bump typescript from 5.6.2 to 5.6.3

Bumps [typescript](https://github.com/microsoft/TypeScript) from 5.6.2 to 5.6.3.
- [Release notes](https://github.com/microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/microsoft/TypeScript/compare/v5.6.2...v5.6.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39c07c01e3c..81d64cff565 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "sinon": "19.0.2",
     "stream-browserify": "3.0.0",
     "tsd": "0.31.2",
-    "typescript": "5.6.2",
+    "typescript": "5.6.3",
     "uuid": "11.0.2",
     "webpack": "5.95.0"
   },

From 51952b6cf4d4edbc5392951417d7bf06e99e0ca9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:23:49 +0000
Subject: [PATCH 171/191] chore(deps-dev): bump webpack from 5.95.0 to 5.96.1

Bumps [webpack](https://github.com/webpack/webpack) from 5.95.0 to 5.96.1.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v5.95.0...v5.96.1)

---
updated-dependencies:
- dependency-name: webpack
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7432515236..f42cf4e4757 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
     "tsd": "0.31.2",
     "typescript": "5.6.3",
     "uuid": "11.0.2",
-    "webpack": "5.95.0"
+    "webpack": "5.96.1"
   },
   "directories": {
     "lib": "./lib/mongoose"

From 8e3f2dcccabfae207f6a3b98336b22dde24e6af2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Nov 2024 19:24:16 +0000
Subject: [PATCH 172/191] chore(deps-dev): bump mocha from 10.7.3 to 10.8.2

Bumps [mocha](https://github.com/mochajs/mocha) from 10.7.3 to 10.8.2.
- [Release notes](https://github.com/mochajs/mocha/releases)
- [Changelog](https://github.com/mochajs/mocha/blob/main/CHANGELOG.md)
- [Commits](https://github.com/mochajs/mocha/compare/v10.7.3...v10.8.2)

---
updated-dependencies:
- dependency-name: mocha
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d7432515236..0e7f71a10ed 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "markdownlint-cli2": "^0.14.0",
     "marked": "14.1.3",
     "mkdirp": "^3.0.1",
-    "mocha": "10.7.3",
+    "mocha": "10.8.2",
     "moment": "2.30.1",
     "mongodb-memory-server": "10.1.2",
     "ncp": "^2.0.0",

From 31104f827ca6fcb9913a58ad2c94c5c52ced0b65 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 6 Nov 2024 16:55:11 -0500
Subject: [PATCH 173/191] perf: make a few micro-optimizations to help speed up
 findOne()

Re: #14906
---
 lib/helpers/isBsonType.js               |  3 +--
 lib/helpers/schema/applyReadConcern.js  |  4 +---
 lib/helpers/schema/applyWriteConcern.js |  4 +---
 lib/query.js                            | 24 +++++++++++++-----------
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/lib/helpers/isBsonType.js b/lib/helpers/isBsonType.js
index f75fd40169d..ab6ceba58e6 100644
--- a/lib/helpers/isBsonType.js
+++ b/lib/helpers/isBsonType.js
@@ -7,8 +7,7 @@
 
 function isBsonType(obj, typename) {
   return (
-    typeof obj === 'object' &&
-    obj !== null &&
+    obj != null &&
     obj._bsontype === typename
   );
 }
diff --git a/lib/helpers/schema/applyReadConcern.js b/lib/helpers/schema/applyReadConcern.js
index 80d4da6eb20..050fa9c6df0 100644
--- a/lib/helpers/schema/applyReadConcern.js
+++ b/lib/helpers/schema/applyReadConcern.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const get = require('../get');
-
 module.exports = function applyReadConcern(schema, options) {
   if (options.readConcern !== undefined) {
     return;
@@ -15,7 +13,7 @@ module.exports = function applyReadConcern(schema, options) {
     return;
   }
 
-  const level = get(schema, 'options.readConcern.level', null);
+  const level = schema.options?.readConcern?.level;
   if (level != null) {
     options.readConcern = { level };
   }
diff --git a/lib/helpers/schema/applyWriteConcern.js b/lib/helpers/schema/applyWriteConcern.js
index 27098110872..28338cf58c3 100644
--- a/lib/helpers/schema/applyWriteConcern.js
+++ b/lib/helpers/schema/applyWriteConcern.js
@@ -1,7 +1,5 @@
 'use strict';
 
-const get = require('../get');
-
 module.exports = function applyWriteConcern(schema, options) {
   if (options.writeConcern != null) {
     return;
@@ -12,7 +10,7 @@ module.exports = function applyWriteConcern(schema, options) {
   if (options && options.session && options.session.transaction) {
     return;
   }
-  const writeConcern = get(schema, 'options.writeConcern', {});
+  const writeConcern = schema.options.writeConcern ?? {};
   if (Object.keys(writeConcern).length != 0) {
     options.writeConcern = {};
     if (!('w' in options) && writeConcern.w != null) {
diff --git a/lib/query.js b/lib/query.js
index 6333c153c68..ff86fa9389a 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -2248,6 +2248,9 @@ Query.prototype.error = function error(err) {
  */
 
 Query.prototype._unsetCastError = function _unsetCastError() {
+  if (this._error == null) {
+    return;
+  }
   if (this._error != null && !(this._error instanceof CastError)) {
     return;
   }
@@ -2291,9 +2294,9 @@ Query.prototype.mongooseOptions = function(v) {
 
 Query.prototype._castConditions = function() {
   let sanitizeFilterOpt = undefined;
-  if (this.model != null && utils.hasUserDefinedProperty(this.model.db.options, 'sanitizeFilter')) {
+  if (this.model != null && this.model.db.options?.sanitizeFilter != null) {
     sanitizeFilterOpt = this.model.db.options.sanitizeFilter;
-  } else if (this.model != null && utils.hasUserDefinedProperty(this.model.base.options, 'sanitizeFilter')) {
+  } else if (this.model != null && this.model.base.options?.sanitizeFilter != null) {
     sanitizeFilterOpt = this.model.base.options.sanitizeFilter;
   } else {
     sanitizeFilterOpt = this._mongooseOptions.sanitizeFilter;
@@ -2536,13 +2539,12 @@ Query.prototype.collation = function(value) {
  * @api private
  */
 
-Query.prototype._completeOne = function(doc, res, callback) {
+Query.prototype._completeOne = function(doc, res, projection, callback) {
   if (!doc && !this.options.includeResultMetadata) {
     return callback(null, null);
   }
 
   const model = this.model;
-  const projection = clone(this._fields);
   const userProvidedFields = this._userProvidedFields || {};
   // `populate`, `lean`
   const mongooseOptions = this._mongooseOptions;
@@ -2643,7 +2645,7 @@ Query.prototype._findOne = async function _findOne() {
   // don't pass in the conditions because we already merged them in
   const doc = await this.mongooseCollection.findOne(this._conditions, options);
   return new Promise((resolve, reject) => {
-    this._completeOne(doc, null, (err, res) => {
+    this._completeOne(doc, null, options.projection, (err, res) => {
       if (err) {
         return reject(err);
       }
@@ -3238,7 +3240,7 @@ function completeOne(model, doc, res, options, fields, userProvidedFields, pop,
 
   function _init(err, casted) {
     if (err) {
-      return immediate(() => callback(err));
+      return callback(err);
     }
 
 
@@ -3251,12 +3253,12 @@ function completeOne(model, doc, res, options, fields, userProvidedFields, pop,
       } else {
         res.value = null;
       }
-      return immediate(() => callback(null, res));
+      return callback(null, res);
     }
     if (options.session != null) {
       casted.$session(options.session);
     }
-    immediate(() => callback(null, casted));
+    callback(null, casted);
   }
 }
 
@@ -3465,7 +3467,7 @@ Query.prototype._findOneAndUpdate = async function _findOneAndUpdate() {
   const doc = !options.includeResultMetadata ? res : res.value;
 
   return new Promise((resolve, reject) => {
-    this._completeOne(doc, res, (err, res) => {
+    this._completeOne(doc, res, options.projection, (err, res) => {
       if (err) {
         return reject(err);
       }
@@ -3561,7 +3563,7 @@ Query.prototype._findOneAndDelete = async function _findOneAndDelete() {
   const doc = !includeResultMetadata ? res : res.value;
 
   return new Promise((resolve, reject) => {
-    this._completeOne(doc, res, (err, res) => {
+    this._completeOne(doc, res, options.projection, (err, res) => {
       if (err) {
         return reject(err);
       }
@@ -3715,7 +3717,7 @@ Query.prototype._findOneAndReplace = async function _findOneAndReplace() {
 
   const doc = !includeResultMetadata ? res : res.value;
   return new Promise((resolve, reject) => {
-    this._completeOne(doc, res, (err, res) => {
+    this._completeOne(doc, res, options.projection, (err, res) => {
       if (err) {
         return reject(err);
       }

From 9f4def3fe6e44f3c2536a32f83021d365dbd5407 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 6 Nov 2024 17:02:53 -0500
Subject: [PATCH 174/191] fix lint

---
 lib/query.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/query.js b/lib/query.js
index ff86fa9389a..212cffd7949 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -22,7 +22,6 @@ const castUpdate = require('./helpers/query/castUpdate');
 const clone = require('./helpers/clone');
 const getDiscriminatorByValue = require('./helpers/discriminator/getDiscriminatorByValue');
 const helpers = require('./queryHelpers');
-const immediate = require('./helpers/immediate');
 const internalToObjectOptions = require('./options').internalToObjectOptions;
 const isExclusive = require('./helpers/projection/isExclusive');
 const isInclusive = require('./helpers/projection/isInclusive');

From e40a09064bfd8cfcc99008a601f001c91684d4c3 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 7 Nov 2024 09:36:51 -0500
Subject: [PATCH 175/191] address code review comments

---
 lib/query.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/query.js b/lib/query.js
index 212cffd7949..99a67d55ddb 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -2293,9 +2293,9 @@ Query.prototype.mongooseOptions = function(v) {
 
 Query.prototype._castConditions = function() {
   let sanitizeFilterOpt = undefined;
-  if (this.model != null && this.model.db.options?.sanitizeFilter != null) {
+  if (this.model?.db.options?.sanitizeFilter != null) {
     sanitizeFilterOpt = this.model.db.options.sanitizeFilter;
-  } else if (this.model != null && this.model.base.options?.sanitizeFilter != null) {
+  } else if (this.model?.base.options?.sanitizeFilter != null) {
     sanitizeFilterOpt = this.model.base.options.sanitizeFilter;
   } else {
     sanitizeFilterOpt = this._mongooseOptions.sanitizeFilter;

From a0fdb9e2e17b9444e9ac02b4c21dbf10d073cb3f Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 8 Nov 2024 13:31:51 -0500
Subject: [PATCH 176/191] chore: release 8.8.1

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a786d7b570..68d8d7bc47d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+8.8.1 / 2024-11-08
+==================
+ * perf: make a few micro-optimizations to help speed up findOne() #15022 #14906
+ * fix: apply embedded discriminators to subdoc schemas before compiling top level model so middleware applies correctly #15001 #14961
+ * fix(query): add overwriteImmutable option to allow updating immutable properties without disabling strict mode #15000 #8619
+
 8.8.0 / 2024-10-31
 ==================
  * feat: upgrade mongodb -> ~6.10 #14991 #14877
diff --git a/package.json b/package.json
index 6bf50dd9c44..aef109be3a6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.8.0",
+  "version": "8.8.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From e76885dbe99183a9e354ecef3a833f40682c320b Mon Sep 17 00:00:00 2001
From: Sampo Silvennoinen <20028934+stscoundrel@users.noreply.github.com>
Date: Sat, 9 Nov 2024 11:17:19 +0200
Subject: [PATCH 177/191] CI: add Node 22

---
 .github/workflows/benchmark.yml          | 2 +-
 .github/workflows/documentation.yml      | 4 ++--
 .github/workflows/test.yml               | 8 ++++----
 .github/workflows/tidelift-alignment.yml | 2 +-
 .github/workflows/tsd.yml                | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
index 6f5d37c1dff..5afe4965aeb 100644
--- a/.github/workflows/benchmark.yml
+++ b/.github/workflows/benchmark.yml
@@ -28,7 +28,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 16
+          node-version: 22
 
       - run: npm install
 
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index 4d994c50143..134fbe5ed5e 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 20
+          node-version: 22
 
       - run: npm install
 
@@ -54,7 +54,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 20
+          node-version: 22
 
       - run: npm install
       - name: Setup MongoDB
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index cd1d6f5cf74..f17b792e2b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18
+          node-version: 22
 
       - run: npm install
 
@@ -39,7 +39,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [16, 18, 20]
+        node: [16, 18, 20, 22]
         os: [ubuntu-20.04, ubuntu-22.04]
         mongodb: [4.4.29, 5.0.26, 6.0.15, 7.0.12, 8.0.0]
         include:
@@ -98,7 +98,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 16
+          node-version: 22
       - name: Load MongoDB binary cache
         id: cache-mongodb-binaries
         uses: actions/cache@v4
@@ -126,7 +126,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 16
+          node-version: 22
       - run: npm install
       - name: Test
         run: npm run test-rs
diff --git a/.github/workflows/tidelift-alignment.yml b/.github/workflows/tidelift-alignment.yml
index e97b2e1da01..552493a7cbc 100644
--- a/.github/workflows/tidelift-alignment.yml
+++ b/.github/workflows/tidelift-alignment.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 16
+          node-version: 22
       - name: Alignment
         uses: tidelift/alignment-action@8d7700fe795fc01179c1f9fa05b72a089873027d # main
         env:
diff --git a/.github/workflows/tsd.yml b/.github/workflows/tsd.yml
index 2146f63d020..672bd36229f 100644
--- a/.github/workflows/tsd.yml
+++ b/.github/workflows/tsd.yml
@@ -25,7 +25,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 18
+          node-version: 22
 
       - run: npm install
 
@@ -43,7 +43,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
-          node-version: 16
+          node-version: 22
 
       - run: npm install
 

From 6a5ee7159156f76dc536d02a0e21e24d7786c92e Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 12 Nov 2024 15:55:04 -0500
Subject: [PATCH 178/191] fix(model): make diffIndexes() avoid trying to drop
 default timeseries collection index

Fix #14984
---
 lib/helpers/indexes/isTimeseriesIndex.js | 16 ++++++++++
 lib/model.js                             | 11 +++++--
 test/model.test.js                       | 40 ++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 lib/helpers/indexes/isTimeseriesIndex.js

diff --git a/lib/helpers/indexes/isTimeseriesIndex.js b/lib/helpers/indexes/isTimeseriesIndex.js
new file mode 100644
index 00000000000..0a4512b91ed
--- /dev/null
+++ b/lib/helpers/indexes/isTimeseriesIndex.js
@@ -0,0 +1,16 @@
+'use strict';
+
+/**
+ * Returns `true` if the given index matches the schema's `timestamps` options
+ */
+
+module.exports = function isTimeseriesIndex(dbIndex, schemaOptions) {
+  if (schemaOptions.timeseries == null) {
+    return false;
+  }
+  const { timeField, metaField } = schemaOptions.timeseries;
+  if (typeof timeField !== 'string' || typeof metaField !== 'string') {
+    return false;
+  }
+  return Object.keys(dbIndex.key).length === 2 && dbIndex.key[timeField] === 1 && dbIndex.key[metaField] === 1;
+};
diff --git a/lib/model.js b/lib/model.js
index c7b3956f6aa..dd7f3227d83 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -51,6 +51,7 @@ const immediate = require('./helpers/immediate');
 const internalToObjectOptions = require('./options').internalToObjectOptions;
 const isDefaultIdIndex = require('./helpers/indexes/isDefaultIdIndex');
 const isIndexEqual = require('./helpers/indexes/isIndexEqual');
+const isTimeseriesIndex = require('./helpers/indexes/isTimeseriesIndex');
 const {
   getRelatedDBIndexes,
   getRelatedSchemaIndexes
@@ -1418,6 +1419,10 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
     if (isDefaultIdIndex(dbIndex)) {
       continue;
     }
+    // Timeseries collections have a default index on { timeField: 1, metaField: 1 }.
+    if (isTimeseriesIndex(dbIndex, schema.options)) {
+      continue;
+    }
 
     for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
       const options = decorateDiscriminatorIndexOptions(schema, clone(schemaIndexOptions));
@@ -1429,9 +1434,11 @@ function getIndexesToDrop(schema, schemaIndexes, dbIndexes) {
       }
     }
 
-    if (!found) {
-      toDrop.push(dbIndex.name);
+    if (found) {
+      continue;
     }
+
+    toDrop.push(dbIndex.name);
   }
 
   return toDrop;
diff --git a/test/model.test.js b/test/model.test.js
index 17fb0873712..69e42ded9b3 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -8147,6 +8147,46 @@ describe('Model', function() {
       assert.ok(obj.post.updatedAt.valueOf(), new Date('2023-06-01T18:00:00.000Z').valueOf());
     });
   });
+
+  describe('diffIndexes()', function() {
+    it('avoids trying to drop timeseries collections (gh-14984)', async function() {
+      const schema = new mongoose.Schema(
+        {
+          time: {
+            type: Date
+          },
+          deviceId: {
+            type: String
+          }
+        },
+        {
+          timeseries: {
+            timeField: 'time',
+            metaField: 'deviceId',
+            granularity: 'seconds'
+          },
+          autoCreate: false
+        }
+      );
+
+      const TestModel = db.model(
+        'TimeSeriesTest',
+        schema,
+        'gh14984'
+      );
+
+      await db.dropCollection('gh14984').catch(err => {
+        if (err.codeName === 'NamespaceNotFound') {
+          return;
+        }
+        throw err;
+      });
+      await TestModel.createCollection();
+
+      const { toDrop } = await TestModel.diffIndexes();
+      assert.deepStrictEqual(toDrop, []);
+    });
+  });
 });
 
 

From 61df30c705445e5b03f2e5d63874a17b98a67f05 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 12 Nov 2024 16:04:58 -0500
Subject: [PATCH 179/191] chore: skip #14984 test on old MongoDB versions that
 dont have timeseries

---
 test/model.test.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/model.test.js b/test/model.test.js
index 69e42ded9b3..8584b08a852 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -8150,6 +8150,12 @@ describe('Model', function() {
 
   describe('diffIndexes()', function() {
     it('avoids trying to drop timeseries collections (gh-14984)', async function() {
+      const version = await start.mongodVersion();
+      if (version[0] < 5) {
+        this.skip();
+        return;
+      }
+
       const schema = new mongoose.Schema(
         {
           time: {

From f386004c061ebaeda767fbd094180a42d6f9092a Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 12 Nov 2024 17:14:35 -0500
Subject: [PATCH 180/191] fix(model): handle array filters when casting
 bulkWrite

Fix #14978
---
 lib/helpers/model/castBulkWrite.js |  6 ++--
 test/model.test.js                 | 48 ++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/lib/helpers/model/castBulkWrite.js b/lib/helpers/model/castBulkWrite.js
index 1afb36987fa..6420ad7e2e6 100644
--- a/lib/helpers/model/castBulkWrite.js
+++ b/lib/helpers/model/castBulkWrite.js
@@ -103,7 +103,8 @@ module.exports = function castBulkWrite(originalModel, op, options) {
         });
         op['updateOne']['update'] = castUpdate(model.schema, update, {
           strict: strict,
-          upsert: op['updateOne'].upsert
+          upsert: op['updateOne'].upsert,
+          arrayFilters: op['updateOne'].arrayFilters
         }, model, op['updateOne']['filter']);
       } catch (error) {
         return callback(error, null);
@@ -162,7 +163,8 @@ module.exports = function castBulkWrite(originalModel, op, options) {
 
         op['updateMany']['update'] = castUpdate(model.schema, op['updateMany']['update'], {
           strict: strict,
-          upsert: op['updateMany'].upsert
+          upsert: op['updateMany'].upsert,
+          arrayFilters: op['updateMany'].arrayFilters
         }, model, op['updateMany']['filter']);
       } catch (error) {
         return callback(error, null);
diff --git a/test/model.test.js b/test/model.test.js
index 17fb0873712..49fef3016aa 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4125,6 +4125,54 @@ describe('Model', function() {
         assert.equal(err.validationErrors[0].errors['num'].name, 'CastError');
       });
 
+      it('handles array filters (gh-14978)', async function() {
+        const embedDiscriminatorSchema = new mongoose.Schema({
+          field1: String
+        });
+
+        const embedSchema = new mongoose.Schema({
+          field: String,
+          key: String
+        }, { discriminatorKey: 'key' });
+        embedSchema.discriminator('Type1', embedDiscriminatorSchema);
+
+        const testSchema = new mongoose.Schema({
+          testArray: [embedSchema]
+        });
+        const TestModel = db.model('Test', testSchema);
+
+        const test = new TestModel({
+          testArray: [{
+            key: 'Type1',
+            field: 'field',
+            field1: 'field1'
+          }]
+        });
+        const r1 = await test.save();
+        assert.equal(r1.testArray[0].field1, 'field1');
+
+        const field1update = 'field1 update';
+        await TestModel.bulkWrite([{
+          updateOne: {
+            filter: { _id: r1._id },
+            update: {
+              $set: {
+                'testArray.$[element].field1': field1update
+              }
+            },
+            arrayFilters: [
+              {
+                'element._id': r1.testArray[0]._id,
+                'element.key': 'Type1'
+              }
+            ]
+          }
+        }]);
+        const r2 = await TestModel.findById(r1._id);
+        assert.equal(r2.testArray[0].field1, field1update);
+
+      });
+
       it('with child timestamps and array filters (gh-7032)', async function() {
         const childSchema = new Schema({ name: String }, { timestamps: true });
 

From 98edf8b1ac5501d45df8ba33c94cc74fa01ea0b4 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 13 Nov 2024 11:47:38 -0500
Subject: [PATCH 181/191] Update test/model.test.js

Co-authored-by: hasezoey <hasezoey@gmail.com>
---
 test/model.test.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/model.test.js b/test/model.test.js
index 49fef3016aa..4aa6e6f1d29 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4170,7 +4170,6 @@ describe('Model', function() {
         }]);
         const r2 = await TestModel.findById(r1._id);
         assert.equal(r2.testArray[0].field1, field1update);
-
       });
 
       it('with child timestamps and array filters (gh-7032)', async function() {

From c9cbea055905a98d2b7a2588523b74a38c84c66d Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 13 Nov 2024 11:53:01 -0500
Subject: [PATCH 182/191] test: add test showing that bulkWrite strips out keys
 that arent in schema by default re: code review on #15036

---
 test/model.test.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/model.test.js b/test/model.test.js
index 4aa6e6f1d29..1d5f4d44ea7 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4157,7 +4157,8 @@ describe('Model', function() {
             filter: { _id: r1._id },
             update: {
               $set: {
-                'testArray.$[element].field1': field1update
+                'testArray.$[element].field1': field1update,
+                'testArray.$[element].nonexistentProp': field1update
               }
             },
             arrayFilters: [
@@ -4168,8 +4169,9 @@ describe('Model', function() {
             ]
           }
         }]);
-        const r2 = await TestModel.findById(r1._id);
+        const r2 = await TestModel.findById(r1._id).lean();
         assert.equal(r2.testArray[0].field1, field1update);
+        assert.strictEqual(r2.testArray[0].nonexistentProp, undefined);
       });
 
       it('with child timestamps and array filters (gh-7032)', async function() {

From 48407d93aa8574e2e4d382b2fa590a5995b3f2b5 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Wed, 13 Nov 2024 15:13:28 -0500
Subject: [PATCH 183/191] types(cursor): correct `asyncIterator` and
 `asyncDispose` for TypeScript with lib: 'esnext'

Fix #14976
---
 types/cursor.d.ts | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/types/cursor.d.ts b/types/cursor.d.ts
index 268bb8f6783..8c76599e584 100644
--- a/types/cursor.d.ts
+++ b/types/cursor.d.ts
@@ -11,8 +11,10 @@ declare module 'mongoose' {
     signal?: AbortSignal;
   }
 
-  class Cursor<DocType = any, Options = never> extends stream.Readable {
-    [Symbol.asyncIterator](): AsyncIterableIterator<DocType>;
+  class Cursor<DocType = any, Options = never, NextResultType = DocType | null> extends stream.Readable {
+    [Symbol.asyncIterator](): Cursor<IteratorResult<DocType>, Options, IteratorResult<DocType>>;
+
+    [Symbol.asyncDispose](): Promise<void>;
 
     /**
      * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/4.9/classes/FindCursor.html#addCursorFlag).
@@ -58,7 +60,7 @@ declare module 'mongoose' {
      * Get the next document from this cursor. Will return `null` when there are
      * no documents left.
      */
-    next(): Promise<DocType | null>;
+    next(): Promise<NextResultType>;
 
     options: Options;
   }

From 85c538d3f2cf173552a9bd7b703b65bb9dd29cff Mon Sep 17 00:00:00 2001
From: Durran Jordan <durran@gmail.com>
Date: Wed, 13 Nov 2024 23:22:09 +0100
Subject: [PATCH 184/191] fix: save execution stack in query as string

---
 lib/query.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/query.js b/lib/query.js
index 99a67d55ddb..32d8b1187a6 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -4433,10 +4433,10 @@ Query.prototype.exec = async function exec(op) {
       str = str.slice(0, 60) + '...';
     }
     const err = new MongooseError('Query was already executed: ' + str);
-    err.originalStack = this._executionStack.stack;
+    err.originalStack = this._executionStack;
     throw err;
   } else {
-    this._executionStack = new Error();
+    this._executionStack = new Error().stack;
   }
 
   let skipWrappedFunction = null;

From f45008358dfe08d582e2f45dcd999c099550545c Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 14 Nov 2024 10:55:00 -0500
Subject: [PATCH 185/191] docs(migrating_to_8): add note about removing
 findByIdAndRemove

Fix #15024
---
 docs/migrating_to_8.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/migrating_to_8.md b/docs/migrating_to_8.md
index 5914318003e..e2748dcb9cd 100644
--- a/docs/migrating_to_8.md
+++ b/docs/migrating_to_8.md
@@ -87,6 +87,9 @@ In Mongoose 7, `findOneAndRemove()` was an alias for `findOneAndDelete()` that M
 Mongoose 8 no longer supports `findOneAndRemove()`.
 Use `findOneAndDelete()` instead.
 
+Similarly, Mongoose 8 no longer supports `findByIdAndRemove()`, which was an alias for `findByIdAndDelete()`.
+Please use `findByIdAndDelete()` instead.
+
 ## Removed `count()` {#removed-count}
 
 `Model.count()` and `Query.prototype.count()` were removed in Mongoose 8. Use `Model.countDocuments()` and `Query.prototype.countDocuments()` instead.

From b34aba65bd64540e330665477f542eb79c877909 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Mon, 18 Nov 2024 16:07:52 -0500
Subject: [PATCH 186/191] chore: release 8.8.2

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68d8d7bc47d..7f099dd85f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+8.8.2 / 2024-11-18
+==================
+ * fix(model): handle array filters when casting bulkWrite #15036 #14978
+ * fix(model): make diffIndexes() avoid trying to drop default timeseries collection index #15035 #14984
+ * fix: save execution stack in query as string #15039 [durran](https://github.com/durran)
+ * types(cursor): correct asyncIterator and asyncDispose for TypeScript with lib: 'esnext' #15038
+ * docs(migrating_to_8): add note about removing findByIdAndRemove #15024 [dragontaek-lee](https://github.com/dragontaek-lee)
+
 8.8.1 / 2024-11-08
 ==================
  * perf: make a few micro-optimizations to help speed up findOne() #15022 #14906
diff --git a/package.json b/package.json
index aef109be3a6..fa68b61d990 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.8.1",
+  "version": "8.8.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",

From 83db6139771585e97d94b432d69848072c08f546 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 19 Nov 2024 17:11:42 -0500
Subject: [PATCH 187/191] fix(model+query): support overwriteDiscriminatorKey
 for bulkWrite updateOne and updateMany, allow inferring discriminator key
 from update

Fix #15040
---
 lib/helpers/model/castBulkWrite.js |  6 ++--
 lib/helpers/query/castUpdate.js    | 22 +++++++++++++++
 lib/query.js                       | 12 --------
 test/model.test.js                 | 45 ++++++++++++++++++++++++++++++
 4 files changed, 71 insertions(+), 14 deletions(-)

diff --git a/lib/helpers/model/castBulkWrite.js b/lib/helpers/model/castBulkWrite.js
index 6420ad7e2e6..6d7a780a812 100644
--- a/lib/helpers/model/castBulkWrite.js
+++ b/lib/helpers/model/castBulkWrite.js
@@ -104,7 +104,8 @@ module.exports = function castBulkWrite(originalModel, op, options) {
         op['updateOne']['update'] = castUpdate(model.schema, update, {
           strict: strict,
           upsert: op['updateOne'].upsert,
-          arrayFilters: op['updateOne'].arrayFilters
+          arrayFilters: op['updateOne'].arrayFilters,
+          overwriteDiscriminatorKey: op['updateOne'].overwriteDiscriminatorKey
         }, model, op['updateOne']['filter']);
       } catch (error) {
         return callback(error, null);
@@ -164,7 +165,8 @@ module.exports = function castBulkWrite(originalModel, op, options) {
         op['updateMany']['update'] = castUpdate(model.schema, op['updateMany']['update'], {
           strict: strict,
           upsert: op['updateMany'].upsert,
-          arrayFilters: op['updateMany'].arrayFilters
+          arrayFilters: op['updateMany'].arrayFilters,
+          overwriteDiscriminatorKey: op['updateMany'].overwriteDiscriminatorKey
         }, model, op['updateMany']['filter']);
       } catch (error) {
         return callback(error, null);
diff --git a/lib/helpers/query/castUpdate.js b/lib/helpers/query/castUpdate.js
index d48c5927559..3cf30cb0e17 100644
--- a/lib/helpers/query/castUpdate.js
+++ b/lib/helpers/query/castUpdate.js
@@ -8,6 +8,7 @@ const ValidationError = require('../../error/validation');
 const castNumber = require('../../cast/number');
 const cast = require('../../cast');
 const getConstructorName = require('../getConstructorName');
+const getDiscriminatorByValue = require('../discriminator/getDiscriminatorByValue');
 const getEmbeddedDiscriminatorPath = require('./getEmbeddedDiscriminatorPath');
 const handleImmutable = require('./handleImmutable');
 const moveImmutableProperties = require('../update/moveImmutableProperties');
@@ -62,6 +63,27 @@ module.exports = function castUpdate(schema, obj, options, context, filter) {
     return obj;
   }
 
+  if (schema != null &&
+      filter != null &&
+      utils.hasUserDefinedProperty(filter, schema.options.discriminatorKey) &&
+      typeof filter[schema.options.discriminatorKey] !== 'object' &&
+      schema.discriminators != null) {
+    const discriminatorValue = filter[schema.options.discriminatorKey];
+    const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
+    schema = schema.discriminators[discriminatorValue] ||
+      (byValue && byValue.schema) ||
+      schema;
+  } else if (schema != null &&
+      options.overwriteDiscriminatorKey &&
+      utils.hasUserDefinedProperty(obj, schema.options.discriminatorKey) &&
+      schema.discriminators != null) {
+    const discriminatorValue = obj[schema.options.discriminatorKey];
+    const byValue = getDiscriminatorByValue(context.model.discriminators, discriminatorValue);
+    schema = schema.discriminators[discriminatorValue] ||
+      (byValue && byValue.schema) ||
+      schema;
+  }
+
   if (options.upsert) {
     moveImmutableProperties(schema, obj, context);
   }
diff --git a/lib/query.js b/lib/query.js
index 32d8b1187a6..a45d32fb91d 100644
--- a/lib/query.js
+++ b/lib/query.js
@@ -4700,18 +4700,6 @@ Query.prototype._castUpdate = function _castUpdate(obj) {
     upsert = this.options.upsert;
   }
 
-  const filter = this._conditions;
-  if (schema != null &&
-      utils.hasUserDefinedProperty(filter, schema.options.discriminatorKey) &&
-      typeof filter[schema.options.discriminatorKey] !== 'object' &&
-      schema.discriminators != null) {
-    const discriminatorValue = filter[schema.options.discriminatorKey];
-    const byValue = getDiscriminatorByValue(this.model.discriminators, discriminatorValue);
-    schema = schema.discriminators[discriminatorValue] ||
-      (byValue && byValue.schema) ||
-      schema;
-  }
-
   return castUpdate(schema, obj, {
     strict: this._mongooseOptions.strict,
     upsert: upsert,
diff --git a/test/model.test.js b/test/model.test.js
index 5bc1317e523..73d2e809ef2 100644
--- a/test/model.test.js
+++ b/test/model.test.js
@@ -4174,6 +4174,51 @@ describe('Model', function() {
         assert.strictEqual(r2.testArray[0].nonexistentProp, undefined);
       });
 
+      it('handles overwriteDiscriminatorKey (gh-15040)', async function() {
+        const dSchema1 = new mongoose.Schema({
+          field1: String
+        });
+        const dSchema2 = new mongoose.Schema({
+          field2: String
+        });
+        const baseSchema = new mongoose.Schema({
+          field: String,
+          key: String
+        }, { discriminatorKey: 'key' });
+        const type1Key = 'Type1';
+        const type2Key = 'Type2';
+
+        baseSchema.discriminator(type1Key, dSchema1);
+        baseSchema.discriminator(type2Key, dSchema2);
+
+        const TestModel = db.model('Test', baseSchema);
+
+        const test = new TestModel({
+          field: 'base field',
+          key: type1Key,
+          field1: 'field1'
+        });
+        const r1 = await test.save();
+        assert.equal(r1.field1, 'field1');
+        assert.equal(r1.key, type1Key);
+
+        const field2 = 'field2';
+        await TestModel.bulkWrite([{
+          updateOne: {
+            filter: { _id: r1._id },
+            update: {
+              key: type2Key,
+              field2
+            },
+            overwriteDiscriminatorKey: true
+          }
+        }]);
+
+        const r2 = await TestModel.findById(r1._id);
+        assert.equal(r2.key, type2Key);
+        assert.equal(r2.field2, field2);
+      });
+
       it('with child timestamps and array filters (gh-7032)', async function() {
         const childSchema = new Schema({ name: String }, { timestamps: true });
 

From 7639fc6a85cd9ebe2cbf3a8a16ec2c8fcc2ea202 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Fri, 22 Nov 2024 14:24:23 -0500
Subject: [PATCH 188/191] perf: cache results from getAllSubdocs() on
 saveOptions, only loop through known subdoc properties

Fix #15029
---
 benchmarks/saveSimple.js   | 57 +++++++++++++++++++++++++++
 lib/document.js            | 79 +++++++++++++++++---------------------
 lib/model.js               |  2 +-
 lib/options/saveOptions.js |  2 +
 lib/plugins/saveSubdocs.js |  6 ++-
 lib/schema.js              | 17 ++++++--
 6 files changed, 114 insertions(+), 49 deletions(-)
 create mode 100644 benchmarks/saveSimple.js

diff --git a/benchmarks/saveSimple.js b/benchmarks/saveSimple.js
new file mode 100644
index 00000000000..0029559cdb9
--- /dev/null
+++ b/benchmarks/saveSimple.js
@@ -0,0 +1,57 @@
+'use strict';
+
+const mongoose = require('../');
+
+run().catch(err => {
+  console.error(err);
+  process.exit(-1);
+});
+
+async function run() {
+  await mongoose.connect('mongodb://127.0.0.1:27017/mongoose_benchmark');
+  const FooSchema = new mongoose.Schema({
+    prop1: String,
+    prop2: String,
+    prop3: String,
+    prop4: String,
+    prop5: String,
+    prop6: String,
+    prop7: String,
+    prop8: String,
+    prop9: String,
+    prop10: String
+  });
+  const FooModel = mongoose.model('Foo', FooSchema);
+
+  if (!process.env.MONGOOSE_BENCHMARK_SKIP_SETUP) {
+    await FooModel.deleteMany({});
+  }
+
+  const numIterations = 500;
+  const saveStart = Date.now();
+  for (let i = 0; i < numIterations; ++i) {
+    for (let j = 0; j < 10; ++j) {
+      const doc = new FooModel({
+        prop1: `test ${i}`,
+        prop2: `test ${i}`,
+        prop3: `test ${i}`,
+        prop4: `test ${i}`,
+        prop5: `test ${i}`,
+        prop6: `test ${i}`,
+        prop7: `test ${i}`,
+        prop8: `test ${i}`,
+        prop9: `test ${i}`,
+        prop10: `test ${i}`
+      });
+      await doc.save();
+    }
+  }
+  const saveEnd = Date.now();
+
+  const results = {
+    'Average save time ms': +((saveEnd - saveStart) / numIterations).toFixed(2)
+  };
+
+  console.log(JSON.stringify(results, null, '  '));
+  process.exit(0);
+}
diff --git a/lib/document.js b/lib/document.js
index 8fe85a5a143..ef35b6ca78b 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -2711,7 +2711,7 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
 
   if (!isNestedValidate) {
     // If we're validating a subdocument, all this logic will run anyway on the top-level document, so skip for subdocuments
-    const subdocs = doc.$getAllSubdocs();
+    const subdocs = doc.$getAllSubdocs({ useCache: true });
     const modifiedPaths = doc.modifiedPaths();
     for (const subdoc of subdocs) {
       if (subdoc.$basePath) {
@@ -3482,7 +3482,7 @@ Document.prototype.$__reset = function reset() {
   let _this = this;
 
   // Skip for subdocuments
-  const subdocs = !this.$isSubdocument ? this.$getAllSubdocs() : null;
+  const subdocs = !this.$isSubdocument ? this.$getAllSubdocs({ useCache: true }) : null;
   if (subdocs && subdocs.length > 0) {
     for (const subdoc of subdocs) {
       subdoc.$__reset();
@@ -3679,57 +3679,50 @@ Document.prototype.$__getArrayPathsToValidate = function() {
  * @instance
  */
 
-Document.prototype.$getAllSubdocs = function() {
+Document.prototype.$getAllSubdocs = function(options) {
+  if (options?.useCache && this.$__.saveOptions?.__subdocs) {
+    return this.$__.saveOptions.__subdocs;
+  }
+
   DocumentArray || (DocumentArray = require('./types/documentArray'));
   Embedded = Embedded || require('./types/arraySubdocument');
 
-  function docReducer(doc, seed, path) {
-    let val = doc;
-    let isNested = false;
-    if (path) {
-      if (doc instanceof Document && doc[documentSchemaSymbol].paths[path]) {
-        val = doc._doc[path];
-      } else if (doc instanceof Document && doc[documentSchemaSymbol].nested[path]) {
-        val = doc._doc[path];
-        isNested = true;
-      } else {
-        val = doc[path];
+  const subDocs = [];
+  function getSubdocs(doc) {
+    const newSubdocs = [];
+    for (const { path } of doc.$__schema.childSchemas) {
+      const val = doc.$__getValue(path);
+      if (val == null) {
+        continue;
       }
-    }
-    if (val instanceof Embedded) {
-      seed.push(val);
-    } else if (val instanceof Map) {
-      seed = Array.from(val.keys()).reduce(function(seed, path) {
-        return docReducer(val.get(path), seed, null);
-      }, seed);
-    } else if (val && !Array.isArray(val) && val.$isSingleNested) {
-      seed = Object.keys(val._doc).reduce(function(seed, path) {
-        return docReducer(val, seed, path);
-      }, seed);
-      seed.push(val);
-    } else if (val && utils.isMongooseDocumentArray(val)) {
-      val.forEach(function _docReduce(doc) {
-        if (!doc || !doc._doc) {
-          return;
+      if (val.$__) {
+        newSubdocs.push(val);
+      }
+      if (Array.isArray(val)) {
+        for (const el of val) {
+          if (el != null && el.$__) {
+            newSubdocs.push(el);
+          }
         }
-        seed = Object.keys(doc._doc).reduce(function(seed, path) {
-          return docReducer(doc._doc, seed, path);
-        }, seed);
-        if (doc instanceof Embedded) {
-          seed.push(doc);
+      }
+      if (val instanceof Map) {
+        for (const el of val.values()) {
+          if (el != null && el.$__) {
+            newSubdocs.push(el);
+          }
         }
-      });
-    } else if (isNested && val != null) {
-      for (const path of Object.keys(val)) {
-        docReducer(val, seed, path);
       }
     }
-    return seed;
+    for (const subdoc of newSubdocs) {
+      getSubdocs(subdoc);
+    }
+    subDocs.push(...newSubdocs);
   }
 
-  const subDocs = [];
-  for (const path of Object.keys(this._doc)) {
-    docReducer(this, subDocs, path);
+  getSubdocs(this);
+
+  if (this.$__.saveOptions) {
+    this.$__.saveOptions.__subdocs = subDocs;
   }
 
   return subDocs;
diff --git a/lib/model.js b/lib/model.js
index dd7f3227d83..45c273a221f 100644
--- a/lib/model.js
+++ b/lib/model.js
@@ -3146,7 +3146,7 @@ function _setIsNew(doc, val) {
   doc.$emit('isNew', val);
   doc.constructor.emit('isNew', val);
 
-  const subdocs = doc.$getAllSubdocs();
+  const subdocs = doc.$getAllSubdocs({ useCache: true });
   for (const subdoc of subdocs) {
     subdoc.$isNew = val;
     subdoc.$emit('isNew', val);
diff --git a/lib/options/saveOptions.js b/lib/options/saveOptions.js
index 66c1608b1d5..286987ee1e4 100644
--- a/lib/options/saveOptions.js
+++ b/lib/options/saveOptions.js
@@ -11,4 +11,6 @@ class SaveOptions {
   }
 }
 
+SaveOptions.prototype.__subdocs = null;
+
 module.exports = SaveOptions;
diff --git a/lib/plugins/saveSubdocs.js b/lib/plugins/saveSubdocs.js
index 4b47bd73320..6dc0cc9e2e7 100644
--- a/lib/plugins/saveSubdocs.js
+++ b/lib/plugins/saveSubdocs.js
@@ -15,7 +15,7 @@ module.exports = function saveSubdocs(schema) {
     }
 
     const _this = this;
-    const subdocs = this.$getAllSubdocs();
+    const subdocs = this.$getAllSubdocs({ useCache: true });
 
     if (!subdocs.length) {
       next();
@@ -27,6 +27,8 @@ module.exports = function saveSubdocs(schema) {
         cb(err);
       });
     }, function(error) {
+      // Bust subdocs cache because subdoc pre hooks can add new subdocuments
+      _this.$__.saveOptions.__subdocs = null;
       if (error) {
         return _this.$__schema.s.hooks.execPost('save:error', _this, [_this], { error: error }, function(error) {
           next(error);
@@ -64,7 +66,7 @@ module.exports = function saveSubdocs(schema) {
     }
 
     const _this = this;
-    const subdocs = this.$getAllSubdocs();
+    const subdocs = this.$getAllSubdocs({ useCache: true });
 
     if (!subdocs.length) {
       return;
diff --git a/lib/schema.js b/lib/schema.js
index a9d23fd6199..7caaac75920 100644
--- a/lib/schema.js
+++ b/lib/schema.js
@@ -1126,6 +1126,13 @@ Schema.prototype.path = function(path, obj) {
 
     this.paths[mapPath] = schemaType.$__schemaType;
     this.mapPaths.push(this.paths[mapPath]);
+    if (schemaType.$__schemaType.$isSingleNested) {
+      this.childSchemas.push({
+        schema: schemaType.$__schemaType.schema,
+        model: schemaType.$__schemaType.caster,
+        path: path
+      });
+    }
   }
 
   if (schemaType.$isSingleNested) {
@@ -1154,7 +1161,8 @@ Schema.prototype.path = function(path, obj) {
     schemaType.caster.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
-      model: schemaType.caster
+      model: schemaType.caster,
+      path: path
     });
   } else if (schemaType.$isMongooseDocumentArray) {
     Object.defineProperty(schemaType.schema, 'base', {
@@ -1167,7 +1175,8 @@ Schema.prototype.path = function(path, obj) {
     schemaType.casterConstructor.base = this.base;
     this.childSchemas.push({
       schema: schemaType.schema,
-      model: schemaType.casterConstructor
+      model: schemaType.casterConstructor,
+      path: path
     });
   }
 
@@ -1235,7 +1244,9 @@ function gatherChildSchemas(schema) {
   for (const path of Object.keys(schema.paths)) {
     const schematype = schema.paths[path];
     if (schematype.$isMongooseDocumentArray || schematype.$isSingleNested) {
-      childSchemas.push({ schema: schematype.schema, model: schematype.caster });
+      childSchemas.push({ schema: schematype.schema, model: schematype.caster, path: path });
+    } else if (schematype.$isSchemaMap && schematype.$__schemaType.$isSingleNested) {
+      childSchemas.push({ schema: schematype.$__schemaType.schema, model: schematype.$__schemaType.caster, path: path });
     }
   }
 

From c9e86bff7eef477da75a29af62a06d41a835a156 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Thu, 21 Nov 2024 17:10:56 -0500
Subject: [PATCH 189/191] fix: disallow using $where in match

Fix CVE-2024-53900
---
 lib/helpers/populate/assignVals.js            |  6 +--
 .../populate/getModelsMapForPopulate.js       | 19 ++++++++
 test/model.populate.test.js                   | 46 +++++++++++++++++++
 3 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/lib/helpers/populate/assignVals.js b/lib/helpers/populate/assignVals.js
index 9aff29fd538..62b3863b583 100644
--- a/lib/helpers/populate/assignVals.js
+++ b/lib/helpers/populate/assignVals.js
@@ -249,7 +249,7 @@ function numDocs(v) {
 
 function valueFilter(val, assignmentOpts, populateOptions, allIds) {
   const userSpecifiedTransform = typeof populateOptions.transform === 'function';
-  const transform = userSpecifiedTransform ? populateOptions.transform : noop;
+  const transform = userSpecifiedTransform ? populateOptions.transform : v => v;
   if (Array.isArray(val)) {
     // find logic
     const ret = [];
@@ -341,7 +341,3 @@ function isPopulatedObject(obj) {
     obj.$__ != null ||
     leanPopulateMap.has(obj);
 }
-
-function noop(v) {
-  return v;
-}
diff --git a/lib/helpers/populate/getModelsMapForPopulate.js b/lib/helpers/populate/getModelsMapForPopulate.js
index 16d920366a8..bd748ed0722 100644
--- a/lib/helpers/populate/getModelsMapForPopulate.js
+++ b/lib/helpers/populate/getModelsMapForPopulate.js
@@ -184,6 +184,15 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     if (hasMatchFunction) {
       match = match.call(doc, doc);
     }
+    if (Array.isArray(match)) {
+      for (const item of match) {
+        if (item != null && item.$where) {
+          throw new MongooseError('Cannot use $where filter with populate() match');
+        }
+      }
+    } else if (match != null && match.$where != null) {
+      throw new MongooseError('Cannot use $where filter with populate() match');
+    }
     data.match = match;
     data.hasMatchFunction = hasMatchFunction;
     data.isRefPath = isRefPath;
@@ -447,6 +456,16 @@ function _virtualPopulate(model, docs, options, _virtualRes) {
     data.match = match;
     data.hasMatchFunction = hasMatchFunction;
 
+    if (Array.isArray(match)) {
+      for (const item of match) {
+        if (item != null && item.$where) {
+          throw new MongooseError('Cannot use $where filter with populate() match');
+        }
+      }
+    } else if (match != null && match.$where != null) {
+      throw new MongooseError('Cannot use $where filter with populate() match');
+    }
+
     // Get local fields
     const ret = _getLocalFieldValues(doc, localField, model, options, virtual);
 
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
index ef827fbc3bf..f62e5886c9e 100644
--- a/test/model.populate.test.js
+++ b/test/model.populate.test.js
@@ -3641,6 +3641,52 @@ describe('model: populate:', function() {
         assert.deepEqual(band.members.map(b => b.name).sort(), ['AA', 'AB']);
       });
 
+      it('match prevents using $where', async function() {
+        const ParentSchema = new Schema({
+          name: String,
+          child: {
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Child'
+          },
+          children: [{
+            type: mongoose.Schema.Types.ObjectId,
+            ref: 'Child'
+          }]
+        });
+
+        const ChildSchema = new Schema({
+          name: String
+        });
+        ChildSchema.virtual('parent', {
+          ref: 'Parent',
+          localField: '_id',
+          foreignField: 'parent'
+        });
+
+        const Parent = db.model('Parent', ParentSchema);
+        const Child = db.model('Child', ChildSchema);
+
+        const child = await Child.create({ name: 'Luke' });
+        const parent = await Parent.create({ name: 'Anakin', child: child._id });
+
+        await assert.rejects(
+          () => Parent.findOne().populate({ path: 'child', match: { $where: 'console.log("oops!");' } }),
+          /Cannot use \$where filter with populate\(\) match/
+        );
+        await assert.rejects(
+          () => Parent.find().populate({ path: 'child', match: { $where: 'console.log("oops!");' } }),
+          /Cannot use \$where filter with populate\(\) match/
+        );
+        await assert.rejects(
+          () => parent.populate({ path: 'child', match: { $where: 'console.log("oops!");' } }),
+          /Cannot use \$where filter with populate\(\) match/
+        );
+        await assert.rejects(
+          () => Child.find().populate({ path: 'parent', match: { $where: 'console.log("oops!");' } }),
+          /Cannot use \$where filter with populate\(\) match/
+        );
+      });
+
       it('multiple source docs', async function() {
         const PersonSchema = new Schema({
           name: String,

From 8f774f0cfbb792d739ff273ff4c3813c7be34828 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 26 Nov 2024 06:50:49 -0500
Subject: [PATCH 190/191] address code review comments

---
 lib/document.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/document.js b/lib/document.js
index ef35b6ca78b..06204519db9 100644
--- a/lib/document.js
+++ b/lib/document.js
@@ -3672,6 +3672,7 @@ Document.prototype.$__getArrayPathsToValidate = function() {
 /**
  * Get all subdocs (by bfs)
  *
+ * @param {Object} [options] options. Currently for internal use.
  * @return {Array}
  * @api public
  * @method $getAllSubdocs

From bb98dcf859b2cf0cc7da9d16d9d09afe445321f3 Mon Sep 17 00:00:00 2001
From: Valeri Karpov <val@karpov.io>
Date: Tue, 26 Nov 2024 08:20:46 -0500
Subject: [PATCH 191/191] chore: release 8.8.3

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f099dd85f6..4db645d514e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+8.8.3 / 2024-11-26
+==================
+ * fix: disallow using $where in match
+ * perf: cache results from getAllSubdocs() on saveOptions, only loop through known subdoc properties #15055 #15029
+ * fix(model+query): support overwriteDiscriminatorKey for bulkWrite updateOne and updateMany, allow inferring discriminator key from update #15046 #15040 
+
 8.8.2 / 2024-11-18
 ==================
  * fix(model): handle array filters when casting bulkWrite #15036 #14978
diff --git a/package.json b/package.json
index fa68b61d990..10bffe5cf55 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.8.2",
+  "version": "8.8.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",