Merge branch '6.x' into 7.x

Author: vkarpov15

CHANGELOG.md

@@ -1,3 +1,7 @@
+6.13.2 / 2024-09-12
+===================
+ * fix(document): make set() respect merge option on deeply nested objects #14870 #14878
+
 7.8.1 / 2024-08-19
 ==================
  * fix(query): handle casting $switch in $expr #14761
@@ -12,6 +16,10 @@
 ==================
  * feat(model): add throwOnValidationError option for opting into getting MongooseBulkWriteError if all valid operations succeed in bulkWrite() and insertMany() #14599 #14587 #14572 #13410
 
+6.13.1 / 2024-09-06
+===================
+ * fix: remove empty $and, $or, $not that were made empty by scrict mode #14749 #13086 [0x0a0d](https://github.com/0x0a0d)
+
 6.13.0 / 2024-06-06
 ===================
  * feat(model): add throwOnValidationError option for opting into getting MongooseBulkWriteError if all valid operations succeed in bulkWrite() and insertMany() #14599 #14587 #14572 #13410

lib/cast.js

@@ -65,17 +65,27 @@ module.exports = function cast(schema, obj, options, context) {
       if (!Array.isArray(val)) {
         throw new CastError('Array', val, path);
       }
-      for (let k = 0; k < val.length; ++k) {
+      for (let k = val.length - 1; k >= 0; k--) {
         if (val[k] == null || typeof val[k] !== 'object') {
           throw new CastError('Object', val[k], path + '.' + k);
         }
+        const beforeCastKeysLength = Object.keys(val[k]).length;
         const discriminatorValue = val[k][schema.options.discriminatorKey];
         if (discriminatorValue == null) {
           val[k] = cast(schema, val[k], options, context);
         } else {
           const discriminatorSchema = getSchemaDiscriminatorByValue(context.schema, discriminatorValue);
           val[k] = cast(discriminatorSchema ? discriminatorSchema : schema, val[k], options, context);
         }
+
+        if (Object.keys(val[k]).length === 0 && beforeCastKeysLength !== 0) {
+          val.splice(k, 1);
+        }
+      }
+
+      // delete empty: {$or: []} -> {}
+      if (val.length === 0) {
+        delete obj[path];
       }
     } else if (path === '$where') {
       type = typeof val;

lib/document.js

@@ -1204,7 +1204,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
         this.$__setValue(path, null);
         cleanModifiedSubpaths(this, path);
       } else {
-        return this.$set(val, path, constructing);
+        return this.$set(val, path, constructing, options);
       }
 
       const keys = getKeysInSchemaOrder(this.$__schema, val, path);

test/docs/cast.test.js

@@ -137,6 +137,26 @@ describe('Cast Tutorial', function() {
     // acquit:ignore:end
   });
 
+  it('strictQuery removes casted empty objects', async function() {
+    mongoose.deleteModel('Character');
+    const schema = new mongoose.Schema({ name: String, age: Number }, {
+      strictQuery: true
+    });
+    Character = mongoose.model('Character', schema);
+
+    const query = Character.findOne({
+      $or: [{ notInSchema: { $lt: 'not a number' } }],
+      $and: [{ name: 'abc' }, { age: { $gt: 18 } }, { notInSchema: { $lt: 'not a number' } }],
+      $nor: [{}] // should be kept
+    });
+
+    await query.exec();
+    query.getFilter(); // Empty object `{}`, Mongoose removes `notInSchema`
+    // acquit:ignore:start
+    assert.deepEqual(query.getFilter(), { $and: [{ name: 'abc' }, { age: { $gt: 18 } }], $nor: [{}] });
+    // acquit:ignore:end
+  });
+
   it('implicit in', async function() {
     // Normally wouldn't find anything because `name` is a string, but
     // Mongoose automatically inserts `$in`

test/document.test.js

@@ -8048,6 +8048,38 @@ describe('document', function() {
     await person.save();
   });
 
+  it('set() merge option with double nested', async function() {
+    const PersonSchema = new Schema({
+      info: {
+        address: {
+          city: String,
+          country: { type: String, default: 'UK' },
+          postcode: String
+        }
+      }
+    });
+
+    const Person = db.model('Person', PersonSchema);
+
+
+    const person = new Person({
+      info: {
+        address: {
+          country: 'United States',
+          city: 'New York'
+        }
+      }
+    });
+
+    const update = { info: { address: { postcode: '12H' } } };
+
+    person.set(update, undefined, { merge: true });
+
+    assert.equal(person.info.address.city, 'New York');
+    assert.equal(person.info.address.postcode, '12H');
+    assert.equal(person.info.address.country, 'United States');
+  });
+
   it('setting single nested subdoc with timestamps (gh-8251)', async function() {
     const ActivitySchema = Schema({ description: String }, { timestamps: true });
     const RequestSchema = Schema({ activity: ActivitySchema });