mongoose 9.10.2 → 9.10.4

package/lib/collection.js

@@ -5,7 +5,6 @@
  */
 
 const EventEmitter = require('events').EventEmitter;
-const STATES = require('./connectionState');
 const immediate = require('./helpers/immediate');
 
 /**
@@ -32,7 +31,7 @@ function Collection(name, conn, opts) {
   this.buffer = !conn?._hasOpened;
   this.emitter = new EventEmitter();
 
-  if (STATES.connected === this.conn.readyState) {
+  if (conn?._hasOpened) {
     this.onOpen();
   }
 }

package/lib/drivers/node-mongodb-native/connection.js

@@ -495,6 +495,11 @@ function _setClient(conn, client, options, dbName) {
         otherDb._flushQueue();
       }
     }
+    for (const collection of Object.values(conn.collections)) {
+      if (collection.buffer) {
+        collection.onOpen();
+      }
+    }
   });
 
   if (options.monitorCommands) {

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/model/castBulkWrite.js

@@ -149,7 +149,7 @@ module.exports.castUpdateOne = function castUpdateOne(originalModel, updateOne,
     model.schema.options.versionKey
   );
 
-  updateOne['filter'] = cast(model.schema, updateOne['filter'], {
+  updateOne['filter'] = _castFilter(model, updateOne['filter'], {
     strict: strict,
     upsert: updateOne.upsert
   });
@@ -176,11 +176,13 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
   const schema = model.schema;
   const strict = options.strict ?? model.schema.options.strict;
 
+  const update = clone(updateMany['update']);
+
   const globalSetDefaultsOnInsert = originalModel.base.options.setDefaultsOnInsert;
   const shouldSetDefaultsOnInsert = updateMany.setDefaultsOnInsert ?? globalSetDefaultsOnInsert;
 
   if (shouldSetDefaultsOnInsert !== false) {
-    setDefaultsOnInsert(updateMany['filter'], model.schema, updateMany['update'], {
+    setDefaultsOnInsert(updateMany['filter'], model.schema, update, {
       setDefaultsOnInsert: true,
       upsert: updateMany.upsert
     });
@@ -191,29 +193,29 @@ module.exports.castUpdateMany = function castUpdateMany(originalModel, updateMan
   if (model.schema.$timestamps != null && doInitTimestamps) {
     const createdAt = model.schema.$timestamps.createdAt;
     const updatedAt = model.schema.$timestamps.updatedAt;
-    applyTimestampsToUpdate(now, createdAt, updatedAt, updateMany['update'], {
+    applyTimestampsToUpdate(now, createdAt, updatedAt, update, {
       timestamps: updateMany.timestamps,
       overwriteImmutable: updateMany.overwriteImmutable
     }, updateMany.upsert);
   }
   if (doInitTimestamps) {
-    applyTimestampsToChildren(now, updateMany['update'], model.schema);
+    applyTimestampsToChildren(now, update, model.schema);
   }
 
   _addDiscriminatorToObject(schema, updateMany['filter']);
 
   decorateUpdateWithVersionKey(
-    updateMany['update'],
+    update,
     updateMany,
     model.schema.options.versionKey
   );
 
-  updateMany['filter'] = cast(model.schema, updateMany['filter'], {
+  updateMany['filter'] = _castFilter(model, updateMany['filter'], {
     strict: strict,
     upsert: updateMany.upsert
   });
 
-  updateMany['update'] = castUpdate(model.schema, updateMany['update'], {
+  updateMany['update'] = castUpdate(model.schema, update, {
     strict: strict,
     upsert: updateMany.upsert,
     arrayFilters: updateMany.arrayFilters,
@@ -228,7 +230,7 @@ module.exports.castReplaceOne = async function castReplaceOne(originalModel, rep
   const strict = options.strict ?? model.schema.options.strict;
 
   _addDiscriminatorToObject(schema, replaceOne['filter']);
-  replaceOne['filter'] = cast(model.schema, replaceOne['filter'], {
+  replaceOne['filter'] = _castFilter(model, replaceOne['filter'], {
     strict: strict,
     upsert: replaceOne.upsert
   });
@@ -262,7 +264,7 @@ module.exports.castDeleteOne = function castDeleteOne(originalModel, deleteOne)
 
   _addDiscriminatorToObject(schema, deleteOne['filter']);
 
-  deleteOne['filter'] = cast(model.schema, deleteOne['filter']);
+  deleteOne['filter'] = _castFilter(model, deleteOne['filter']);
 };
 
 module.exports.castDeleteMany = function castDeleteMany(originalModel, deleteMany) {
@@ -271,7 +273,7 @@ module.exports.castDeleteMany = function castDeleteMany(originalModel, deleteMan
 
   _addDiscriminatorToObject(schema, deleteMany['filter']);
 
-  deleteMany['filter'] = cast(model.schema, deleteMany['filter']);
+  deleteMany['filter'] = _castFilter(model, deleteMany['filter']);
 };
 
 module.exports.cast = {
@@ -283,6 +285,19 @@ module.exports.cast = {
   deleteMany: module.exports.castDeleteMany
 };
 
+function _castFilter(model, filter, options) {
+  try {
+    return cast(model.schema, filter, options);
+  } catch (err) {
+    // Set the model on cast errors so `{MODEL}` gets replaced, like it is for
+    // query filter casting (gh-8300)
+    if (typeof err.setModel === 'function') {
+      err.setModel(model);
+    }
+    throw err;
+  }
+}
+
 function _addDiscriminatorToObject(schema, obj) {
   if (schema == null) {
     return;

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/helpers/query/castUpdate.js

@@ -262,7 +262,16 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
         }
       }
       if (schematype?.schema != null) {
-        obj[key] = cast(schematype.schema, obj[key], options, context);
+        try {
+          obj[key] = cast(schematype.schema, obj[key], options, context);
+        } catch (error) {
+          if (error instanceof CastError) {
+            aggregatedError = _appendError(error, context, key, aggregatedError);
+            continue;
+          } else {
+            throw error;
+          }
+        }
         hasKeys = true;
         continue;
       }
@@ -446,11 +455,15 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
         }
       } else {
         if (op === '$rename') {
-          if (obj[key] == null) {
-            throw new CastError('String', obj[key], `${prefix}${key}.$rename`);
+          try {
+            if (obj[key] == null) {
+              throw new CastError('String', obj[key], `${prefix}${key}.$rename`);
+            }
+            const schematype = new SchemaString(`${prefix}${key}.$rename`, null, null, schema);
+            obj[key] = schematype.castForQuery(null, obj[key], context);
+          } catch (error) {
+            aggregatedError = _appendError(error, context, key, aggregatedError);
           }
-          const schematype = new SchemaString(`${prefix}${key}.$rename`, null, null, schema);
-          obj[key] = schematype.castForQuery(null, obj[key], context);
           continue;
         }
 
@@ -499,6 +512,14 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
  */
 
 function _appendError(error, query, key, aggregatedError) {
+  // Set the model on cast errors so `{MODEL}` gets replaced, like it is for
+  // query filter casting and document validation (gh-8300). `query` is a
+  // Query, or the model itself when casting a `bulkWrite()` operation.
+  const model = query?.modelName != null ? query : query?.model;
+  if (model != null && typeof error.setModel === 'function') {
+    error.setModel(model);
+  }
+
   if (typeof query !== 'object' || !query.options.multipleCastError) {
     throw error;
   }

package/lib/model.js

@@ -3676,7 +3676,8 @@ Model.bulkSave = async function bulkSave(documents, options) {
 
   await Promise.all(documents.map(doc => buildPreSavePromise(doc, options)));
 
-  const writeOperations = this.buildBulkWriteOperations(documents, options);
+  const documentIndexes = [];
+  const writeOperations = this.buildBulkWriteOperations(documents, options, documentIndexes);
   const opts = { skipValidation: true, _skipCastBulkWrite: true, ...options };
   const { bulkWriteResult, bulkWriteError } = await this.bulkWrite(writeOperations, opts).then(
     (res) => ({ bulkWriteResult: res, bulkWriteError: null }),
@@ -3697,20 +3698,22 @@ Model.bulkSave = async function bulkSave(documents, options) {
     );
   }
 
-  const failedDocumentIds = documents.length >= 25 ? new Set(bulkWriteError?.writeErrors?.map(writeError => {
-    const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
-    return writeErrorDocumentId.toString();
-  })) : null;
-  const successfulDocuments = [];
-  for (let i = 0; i < documents.length; i++) {
-    const document = documents[i];
-    const documentId = document._doc._id.toString();
-    const failed = failedDocumentIds == null ? bulkWriteError?.writeErrors.find(writeError => {
-      const writeErrorDocumentId = writeError.err.op._id || writeError.err.op.q._id;
-      return writeErrorDocumentId.toString() === documentId;
-    }) != null : failedDocumentIds.has(documentId);
-    if (!failed) {
-      successfulDocuments.push(document);
+  const writeErrors = bulkWriteError?.writeErrors || [];
+  let successfulDocuments = documents;
+  if (writeErrors.length > 0) {
+    if (options.ordered !== false) {
+      // Unchanged documents don't generate operations, so map back to the input before slicing.
+      successfulDocuments = documents.slice(0, documentIndexes[writeErrors[0].index]);
+    } else {
+      const failedDocumentIndexes = documents.length >= 25 ? {} : null;
+      if (failedDocumentIndexes != null) {
+        for (const writeError of writeErrors) {
+          failedDocumentIndexes[documentIndexes[writeError.index]] = true;
+        }
+      }
+      successfulDocuments = documents.filter((document, i) => failedDocumentIndexes == null ?
+        !writeErrors.some(writeError => documentIndexes[writeError.index] === i) :
+        !failedDocumentIndexes[i]);
     }
   }
   await Promise.all(successfulDocuments.map(document => handleSuccessfulWrite(document, options)));
@@ -3976,11 +3979,12 @@ Model.castObject = function castObject(obj, options) {
  * @param {object} options
  * @param {boolean} options.skipValidation defaults to `false`, when set to true, building the write operations will bypass validating the documents.
  * @param {boolean} options.timestamps defaults to `null`, when set to false, mongoose will not add/update timestamps to the documents.
+ * @param {number[]} [documentIndexes] If provided, receives the input document index for each generated operation in order.
  * @return {Promise[]} Returns a array of all Promises the function executes to be awaited.
  * @api private
  */
 
-Model.buildBulkWriteOperations = function buildBulkWriteOperations(documents, options) {
+Model.buildBulkWriteOperations = function buildBulkWriteOperations(documents, options, documentIndexes) {
   if (!Array.isArray(documents)) {
     throw new MongooseError(`bulkSave expects an array of documents to be passed, received \`${documents}\` instead`);
   }
@@ -4010,6 +4014,7 @@ Model.buildBulkWriteOperations = function buildBulkWriteOperations(documents, op
       }
       const writeOperation = { insertOne: { document } };
       utils.injectTimestampsOption(writeOperation.insertOne, options.timestamps);
+      documentIndexes?.push(i);
       return writeOperation;
     }
 
@@ -4036,6 +4041,7 @@ Model.buildBulkWriteOperations = function buildBulkWriteOperations(documents, op
       document.$__version(where, delta);
       const writeOperation = { updateOne: { filter: where, update: changes } };
       utils.injectTimestampsOption(writeOperation.updateOne, options.timestamps);
+      documentIndexes?.push(i);
       return writeOperation;
     }
 
@@ -4763,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/schema/union.js

@@ -60,6 +60,10 @@ class Union extends SchemaType {
 
   // Setters also need to be aware of casting - we need to apply the setters of the entry in the union we choose.
   applySetters(val, doc, init, prev, options) {
+    // Setters on the union path itself run first, so they can change which entry
+    // in the union the value resolves to.
+    val = this._applySetters(val, doc, init, prev, options);
+
     let firstValue = firstValueSymbol;
     let lastError;
     // Loop through each schema type in the union. If one of the schematypes returns a value that is `=== val`, then

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.2",
+  "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",