mongoose 8.24.3 → 8.24.5

package/lib/helpers/discriminator/mergeDiscriminatorSchema.js

@@ -46,6 +46,11 @@ module.exports = function mergeDiscriminatorSchema(to, from, path, seen) {
     if (specialProperties.has(key)) {
       continue;
     }
+    if (key === 'parentSchema') {
+      // Skip parentSchema to avoid merging parent schema multiple times
+      // through child paths' back-references (gh-15966)
+      continue;
+    }
     if (to[key] == null) {
       to[key] = from[key];
     } else if (isObject(from[key])) {

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.
@@ -62,14 +65,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/types/documentArray/methods/index.js

@@ -209,6 +209,26 @@ const methods = {
     return this.constructor.prototype.toObject.apply(this, arguments);
   },
 
+  /**
+   * Wraps [`MongooseArray#addToSet`](https://mongoosejs.com/docs/api/array.html#MongooseArray.prototype.addToSet())
+   * with proper change tracking.
+   *
+   * @param {...object} [args]
+   * @api public
+   * @method addToSet
+   * @memberOf MongooseDocumentArray
+   */
+
+  addToSet() {
+    // Arguments are cast before duplicates are skipped, so any value added
+    // after a skipped duplicate is cast with an index that is too high.
+    const ret = ArrayMethods.addToSet.apply(this, arguments);
+
+    _updateSubdocIndexes(this);
+
+    return ret;
+  },
+
   /**
    * Wraps [`Array#push`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/push) with proper change tracking.
    *

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.24.3",
+  "version": "8.24.5",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",