Merge branch 'master' into vkarpov15/gh-15671

Author: vkarpov15

README.md

@@ -42,9 +42,29 @@ View all 400+ [contributors](https://github.com/Automattic/mongoose/graphs/contr
 
 First install [Node.js](http://nodejs.org/) and [MongoDB](https://www.mongodb.org/downloads). Then:
 
+Then install the `mongoose` package using your preferred package manager:
+
+### Using npm 
+
 ```sh
 npm install mongoose
 ```
+### Using pnpm
+
+```sh
+pnpm add mongoose
+```
+### Using Yarn
+
+```sh
+yarn add mongoose
+```
+### Using Bun
+
+```sh
+bun add mongoose
+```
+
 
 Mongoose 6.8.0 also includes alpha support for [Deno](https://deno.land/).
 

lib/helpers/query/castUpdate.js

@@ -379,8 +379,13 @@ function walkUpdatePath(schema, obj, op, options, context, filter, prefix) {
           (utils.isObject(val) && Object.keys(val).length === 0);
       }
     } else {
-      const checkPath = (key === '$each' || key === '$or' || key === '$and' || key === '$in') ?
-        prefix : prefix + key;
+      const isModifier = (key === '$each' || key === '$or' || key === '$and' || key === '$in');
+      if (isModifier && !prefix) {
+        throw new MongooseError('Invalid update: Unexpected modifier "' + key + '" as a key in operator. '
+          + 'Did you mean something like { $addToSet: { fieldName: { $each: [...] } } }? '
+          + 'Modifiers such as "$each", "$or", "$and", "$in" must appear under a valid field path.');
+      }
+      const checkPath = isModifier ? prefix : prefix + key;
       schematype = schema._getSchema(checkPath);
 
       // You can use `$setOnInsert` with immutable keys

lib/helpers/update/castArrayFilters.js

@@ -7,6 +7,9 @@ const updatedPathsByArrayFilter = require('./updatedPathsByArrayFilter');
 
 module.exports = function castArrayFilters(query) {
   const arrayFilters = query.options.arrayFilters;
+  if (!Array.isArray(arrayFilters)) {
+    return;
+  }
   const update = query.getUpdate();
   const schema = query.schema;
   const updatedPathsByFilter = updatedPathsByArrayFilter(update);
@@ -29,10 +32,6 @@ module.exports = function castArrayFilters(query) {
 };
 
 function _castArrayFilters(arrayFilters, schema, strictQuery, updatedPathsByFilter, query) {
-  if (!Array.isArray(arrayFilters)) {
-    return;
-  }
-
   // Map to store discriminator values for embedded documents in the array filters.
   // This is used to handle cases where array filters target specific embedded document types.
   const discriminatorValueMap = {};

lib/helpers/update/decorateUpdateWithVersionKey.js

@@ -1,7 +1,5 @@
 'use strict';
 
-const modifiedPaths = require('./modifiedPaths');
-
 /**
  * Decorate the update with a version key, if necessary
  * @api private
@@ -12,15 +10,26 @@ module.exports = function decorateUpdateWithVersionKey(update, options, versionK
     return;
   }
 
-  const updatedPaths = modifiedPaths(update);
-  if (!updatedPaths[versionKey]) {
-    if (options.overwrite) {
+  if (options.overwrite) {
+    if (!hasKey(update, versionKey)) {
       update[versionKey] = 0;
-    } else {
-      if (!update.$setOnInsert) {
-        update.$setOnInsert = {};
-      }
-      update.$setOnInsert[versionKey] = 0;
     }
+  } else if (
+    !hasKey(update, versionKey) &&
+    !hasKey(update?.$set, versionKey) &&
+    !hasKey(update?.$inc, versionKey) &&
+    !hasKey(update?.$setOnInsert, versionKey)
+  ) {
+    if (!update.$setOnInsert) {
+      update.$setOnInsert = {};
+    }
+    update.$setOnInsert[versionKey] = 0;
   }
 };
+
+function hasKey(obj, key) {
+  if (obj == null || typeof obj !== 'object') {
+    return false;
+  }
+  return Object.prototype.hasOwnProperty.call(obj, key);
+}

test/model.updateOne.test.js

@@ -3195,8 +3195,10 @@ describe('model: updateOne: ', function() {
     const Model = db.model('Test', schema);
 
     await Model.create({ tags: [] });
-    // This is a no-op, but should not cause an error
-    await Model.updateOne({}, { $addToSet: { $each: ['test'] } });
+    await assert.rejects(
+      Model.updateOne({}, { $addToSet: { $each: ['test'] } }),
+      /Modifiers such as "\$each", "\$or", "\$and", "\$in" must appear under a valid field path/
+    );
   });
 });