Merge branch 'master' into csfle

Author: vkarpov15

.github/workflows/benchmark.yml

@@ -19,14 +19,14 @@ permissions:
 
 jobs:
   typescript:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Benchmark TypeScript Types
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           fetch-depth: 0
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 

.github/workflows/documentation.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 
@@ -45,28 +45,28 @@ jobs:
       #   run: npm run lint-js
 
   test-documentation:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Test Generating Docs
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: git fetch --depth=1 --tags # download all tags for documentation
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 
       - run: npm install
       - name: Setup MongoDB
         run: |
-          wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz
-          tar xf mongodb-linux-x86_64-ubuntu2004-5.0.14.tgz
+          wget -q https://downloads.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2204-6.0.20.tgz
+          tar xf mongodb-linux-x86_64-ubuntu2204-6.0.20.tgz
           mkdir -p ./data/db/27017 ./data/db/27000
           printf "\n--timeout 8000" >> ./test/mocha.opts
-          ./mongodb-linux-x86_64-ubuntu2004-5.0.14/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
+          ./mongodb-linux-x86_64-ubuntu2204-6.0.20/bin/mongod --setParameter ttlMonitorSleepSecs=1 --fork --dbpath ./data/db/27017 --syslog --port 27017
           sleep 2
-          mongod --version
-          echo `pwd`/mongodb-linux-x86_64-ubuntu2004-5.0.14/bin >> $GITHUB_PATH
+          ./mongodb-linux-x86_64-ubuntu2204-6.0.20/bin/mongod --version
+          echo `pwd`/mongodb-linux-x86_64-ubuntu2204-6.0.20/bin >> $GITHUB_PATH
       - name: Setup config
         run: |
           echo "module.exports = {uri:'mongodb://127.0.0.1:27017/mongoose_test'};" > ./.config.js

.github/workflows/encryption-tests.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
       - name: Install Dependencies

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 
@@ -40,18 +40,13 @@ jobs:
       fail-fast: false
       matrix:
         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]
+        os: [ubuntu-22.04, ubuntu-24.04]
+        mongodb: [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
-            node: 16
+          - os: ubuntu-22.04 # customize on which matrix the coverage will be collected on
+            mongodb: 6.0.15
+            node: 22
             coverage: true
-        exclude:
-          - os: ubuntu-22.04 # exclude because there are no 4.x mongodb builds for 2204
-            mongodb: 4.4.29
-          - os: ubuntu-22.04 # exclude because there are no 5.x mongodb builds for 2204
-            mongodb: 5.0.26
     name: Node ${{ matrix.node }} MongoDB ${{ matrix.mongodb }} OS ${{ matrix.os }}
     env:
       MONGOMS_VERSION: ${{ matrix.mongodb }}
@@ -61,7 +56,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: ${{ matrix.node }}
 
@@ -87,7 +82,7 @@ jobs:
           path: coverage
 
   test-deno:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Deno tests
     env:
       MONGOMS_VERSION: 6.0.15
@@ -96,7 +91,7 @@ jobs:
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
       - name: Load MongoDB binary cache
@@ -117,14 +112,14 @@ jobs:
   test-replica-sets:
     needs:
       - test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: Replica Set tests
     env:
       FORCE_COLOR: true
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
       - run: npm install

.github/workflows/tidelift-alignment.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
       - name: Alignment

.github/workflows/tsd.yml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 
@@ -41,7 +41,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
       - name: Setup node
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
         with:
           node-version: 22
 

CHANGELOG.md

@@ -1,3 +1,27 @@
+8.13.2 / 2025-04-03
+===================
+ * fix: avoid double calling validators on paths in document arrays underneath subdocuments #15338 #15335
+
+8.13.1 / 2025-03-28
+===================
+ * fix(populate): handle virtual populate on array of UUIDs #15329 #15315
+ * types: allow default function returning undefined with DocType override #15328
+
+8.13.0 / 2025-03-24
+===================
+ * feat: bump mongodb driver -> 6.15.0
+ * feat: support custom types exported from driver #15321
+
+8.12.2 / 2025-03-21
+===================
+ * fix(document): avoid stripping out fields in discriminator schema after select: false field #15322 #15308
+ * fix(AggregationCursor): make next() error if schema pre('aggregate') middleware throws error #15293 #15279
+ * fix(populate): correctly get schematypes when deep populating under a map #15302 #9359
+ * fix(model): avoid returning null from bulkSave() if error doesn't have writeErrors property #15323
+ * types: add WithTimestamps utility type #15318 [baruchiro](https://github.com/baruchiro)
+ * docs: update references to the ms module in date schema documentation #15319 [baruchiro](https://github.com/baruchiro)
+ * docs: fix typo in schematypes.md #15305 [skyran1278](https://github.com/skyran1278)
+
 8.12.1 / 2025-03-04
 ===================
  * fix: match bson version with mongodb's bson version #15297 [hasezoey](https://github.com/hasezoey)

docs/migrating_to_7.md

@@ -106,6 +106,7 @@ They always return promises.
 * `Model.aggregate`
 * `Model.bulkWrite`
 * `Model.cleanIndexes`
+* `Model.count`
 * `Model.countDocuments`
 * `Model.create`
 * `Model.createCollection`
@@ -130,6 +131,7 @@ They always return promises.
 * `Model.syncIndexes`
 * `Model.updateMany`
 * `Model.updateOne`
+* `Query.prototype.count`
 * `Query.prototype.find`
 * `Query.prototype.findOne`
 * `Query.prototype.findOneAndDelete`
@@ -156,7 +158,7 @@ conn.startSession(function(err, session) {
 // After
 const session = await conn.startSession();
 // Or:
-conn.startSession().then(sesson => { /* ... */ });
+conn.startSession().then(session => { /* ... */ });
 
 // With error handling
 try {

lib/document.js

@@ -747,16 +747,16 @@ function init(self, obj, doc, opts, prefix) {
   for (let index = 0; index < len; ++index) {
     i = keys[index];
     // avoid prototype pollution
-    if (i === '__proto__' || i === 'constructor') {
-      return;
+    if (specialProperties.has(i)) {
+      continue;
     }
     path = prefix ? prefix + i : i;
     schemaType = docSchema.path(path);
     // Should still work if not a model-level discriminator, but should not be
     // necessary. This is *only* to catch the case where we queried using the
     // base model and the discriminated model has a projection
     if (docSchema.$isRootDiscriminator && !self.$__isSelected(path)) {
-      return;
+      continue;
     }
 
     const value = obj[i];
@@ -1720,7 +1720,7 @@ Document.prototype.$__set = function(pathToMark, path, options, constructing, pa
     const last = next === l;
     cur += (cur ? '.' + parts[i] : parts[i]);
     if (specialProperties.has(parts[i])) {
-      return;
+      continue;
     }
 
     if (last) {
@@ -2721,12 +2721,33 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
   function addToPaths(p) { paths.add(p); }
 
   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({ useCache: true });
+    // If we're validating a subdocument, all this logic will run anyway on the top-level document, so skip for subdocuments.
+    // But only run for top-level subdocuments, because we're looking for subdocuments that are not modified at top-level but
+    // have a modified path. If that is the case, we will run validation on the top-level subdocument, and via that run validation
+    // on any subdocuments down to the modified path.
+    const topLevelSubdocs = [];
+    for (const path of Object.keys(doc.$__schema.paths)) {
+      const schemaType = doc.$__schema.path(path);
+      if (schemaType.$isSingleNested) {
+        const subdoc = doc.$get(path);
+        if (subdoc) {
+          topLevelSubdocs.push(subdoc);
+        }
+      } else if (schemaType.$isMongooseDocumentArray) {
+        const arr = doc.$get(path);
+        if (arr && arr.length) {
+          for (const subdoc of arr) {
+            if (subdoc) {
+              topLevelSubdocs.push(subdoc);
+            }
+          }
+        }
+      }
+    }
     const modifiedPaths = doc.modifiedPaths();
-    for (const subdoc of subdocs) {
+    for (const subdoc of topLevelSubdocs) {
       if (subdoc.$basePath) {
-        const fullPathToSubdoc = subdoc.$isSingleNested ? subdoc.$__pathRelativeToParent() : subdoc.$__fullPathWithIndexes();
+        const fullPathToSubdoc = subdoc.$__pathRelativeToParent();
 
         // Remove child paths for now, because we'll be validating the whole
         // subdoc.
@@ -2736,11 +2757,12 @@ function _getPathsToValidate(doc, pathsToValidate, pathsToSkip, isNestedValidate
           paths.delete(fullPathToSubdoc + '.' + modifiedPath);
         }
 
+        const subdocParent = subdoc.$parent();
         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)) {
+              !subdocParent.$__.activePaths.getStatePaths('modify').hasOwnProperty(fullPathToSubdoc) &&
+              !subdocParent.$isDefault(fullPathToSubdoc)) {
           paths.add(fullPathToSubdoc);
 
           if (doc.$__.pathsToScopes == null) {

lib/helpers/populate/assignRawDocsToIdStructure.js

@@ -78,7 +78,12 @@ function assignRawDocsToIdStructure(rawIds, resultDocs, resultOrder, options, re
       continue;
     }
 
-    sid = String(id);
+    if (id?.constructor?.name === 'Binary' && id.sub_type === 4 && typeof id.toUUID === 'function') {
+      // Workaround for gh-15315 because Mongoose UUIDs don't use BSON UUIDs yet.
+      sid = String(id.toUUID());
+    } else {
+      sid = String(id);
+    }
     doc = resultDocs[sid];
     // If user wants separate copies of same doc, use this option
     if (options.clone && doc != null) {