mongoose 9.10.3 → 9.10.4

package/lib/helpers/indexes/isIndexEqual.js

@@ -2,6 +2,9 @@
 
 const get = require('../get');
 const utils = require('../../utils');
+
+const simpleCollation = Object.freeze({ locale: 'simple' });
+
 /**
  * Given a Mongoose index definition (key + options objects) and a MongoDB server
  * index definition, determine if the two indexes are equal.
@@ -61,14 +64,13 @@ module.exports = function isIndexEqual(schemaIndexKeysObject, options, dbIndex)
       continue;
     }
     if (key === 'collation') {
-      if (options[key] == null || dbIndex[key] == null) {
-        return options[key] == null && dbIndex[key] == null;
-      }
-      const definedKeys = Object.keys(options.collation);
-      const schemaCollation = options.collation;
-      const dbCollation = dbIndex.collation;
-      for (const opt of definedKeys) {
-        if (get(schemaCollation, opt) !== get(dbCollation, opt)) {
+      // No collation is equivalent to { locale: 'simple' }. MongoDB server 9
+      // reports { locale: 'simple' } for indexes created with no collation,
+      // older versions omit it.
+      const schemaCollation = options.collation ?? simpleCollation;
+      const dbCollation = dbIndex.collation ?? simpleCollation;
+      for (const opt of Object.keys(schemaCollation)) {
+        if (schemaCollation[opt] !== dbCollation[opt]) {
           return false;
         }
       }

package/lib/helpers/query/cast$expr.js

@@ -97,7 +97,15 @@ function _castExpression(val, schema, strictQuery) {
     val.$ifNull.map(v => _castExpression(v, schema, strictQuery));
   } else if (val.$switch != null) {
     if (Array.isArray(val.$switch.branches)) {
-      val.$switch.branches = val.$switch.branches.map(v => _castExpression(v, schema, strictQuery));
+      for (const branch of val.$switch.branches) {
+        if (branch?.case != null) {
+          branch.case = _castExpression(branch.case, schema, strictQuery);
+        }
+        if (branch?.then != null) {
+          branch.then = _castExpression(branch.then, schema, strictQuery);
+        }
+        omitUndefined(branch);
+      }
     }
     if ('default' in val.$switch) {
       val.$switch.default = _castExpression(val.$switch.default, schema, strictQuery);

package/lib/model.js

@@ -4769,7 +4769,10 @@ async function _populatePath(model, docs, populateOptions) {
       // Get the assigned (filtered) children from parent docs
       const childDocsToPopulate = [];
       for (const doc of mod.docs) {
-        const childVal = doc.$__ != null ? doc.get(mod.options.path) : doc[mod.options.path];
+        // `utils.getValue()` rather than a bracket lookup, because `mod.options.path` may be
+        // a dotted path like 'children.child', which a lean result does not store as a
+        // single key.
+        const childVal = doc.$__ != null ? doc.get(mod.options.path) : utils.getValue(mod.options.path, doc);
         if (Array.isArray(childVal)) {
           childDocsToPopulate.push(...childVal);
         } else if (childVal != null) {

package/lib/types/array/methods/index.js

@@ -544,11 +544,13 @@ const methods = {
     if (isBsonType(obj, 'ObjectId')) {
       obj = obj.toString();
     }
+    // Compare dates by timestamp like `addToSet()` does, so `pull()` works on date arrays
+    const isDate = obj instanceof Date;
 
     fromIndex = fromIndex == null ? 0 : fromIndex;
     const len = this.length;
     for (let i = fromIndex; i < len; ++i) {
-      if (obj == this[i]) {
+      if (obj == this[i] || (isDate && this[i] instanceof Date && +obj === +this[i])) {
         return i;
       }
     }

package/lib/types/map.js

@@ -4,6 +4,7 @@ const Mixed = require('../schema/mixed');
 const MongooseError = require('../error/mongooseError');
 const clone = require('../helpers/clone');
 const deepEqual = require('../utils').deepEqual;
+const isMongooseArray = require('../utils').isMongooseArray;
 const getConstructorName = require('../helpers/getConstructorName');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
 const util = require('util');
@@ -160,6 +161,11 @@ class MongooseMap extends Map {
     if (parent?.$__ != null && !deepEqual(value, priorVal)) {
       const path = fullPath.call(this);
       parent.markModified(path);
+      // Replacing the whole array means later push(), pull() or addToSet() calls must not be sent as
+      // atomics against the array that was in the database, same as Document#$set re: gh-1126
+      if (isMongooseArray(value)) {
+        value._registerAtomic('$set', value);
+      }
       // If overwriting the full document array or subdoc, make sure to clean up any paths that were modified
       // before re: #15108
       if (this.$__schemaType.$isMongooseDocumentArray || this.$__schemaType.$isSingleNested) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "9.10.3",
+  "version": "9.10.4",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -29,9 +29,9 @@
     "sift": "17.1.3"
   },
   "devDependencies": {
-    "@ark/attest": "0.56.3",
+    "@ark/attest": "0.56.5",
     "@eslint/js": "^9.39.3",
-    "@mongodb-js/mongodb-downloader": "^1.0.0",
+    "@mongodb-js/mongodb-downloader": "^2.0.2",
     "@types/node": "^20.19.0",
     "acquit": "1.4.0",
     "acquit-ignore": "0.2.2",
@@ -40,7 +40,7 @@
     "c8": "12.0.0",
     "cheerio": "1.2.0",
     "dox": "1.0.0",
-    "eslint": "10.9.1",
+    "eslint": "10.11.0",
     "eslint-plugin-mocha-no-only": "1.2.0",
     "express": "5.2.1",
     "fs-extra": "~11.4.0",
@@ -50,13 +50,13 @@
     "linkinator": "8.x",
     "lodash.isequal": "4.5.0",
     "lodash.isequalwith": "4.4.0",
-    "markdownlint-cli2": "0.23.2",
-    "marked": "18.0.11",
+    "markdownlint-cli2": "0.23.3",
+    "marked": "18.0.14",
     "mkdirp": "^3.0.1",
-    "mocha": "12.0.0-rc.6",
-    "moment": "2.30.1",
+    "mocha": "12.0.2",
+    "moment": "2.31.0",
     "mongodb-client-encryption": "^7.2.0",
-    "mongodb-memory-server": "11.2.0",
+    "mongodb-memory-server": "11.3.0",
     "mongodb-runner": "^6.0.0",
     "ncp": "^2.0.0",
     "pug": "3.0.4",