fix(model): correct handling for $push on a nested array

Fix #11108

Author: vkarpov15

lib/model.js

@@ -589,18 +589,22 @@ function operand(self, where, delta, data, val, op) {
   // editing the correct array element.
   // only increment the version if an array position changes.
   // modifying elements of an array is ok if position does not change.
-  if (/\.\d+\.|\.\d+$/.test(data.path)) {
-    // now handling $set, $unset
-    // subpath of array
-    self.$__.version = VERSION_WHERE;
-  } else if (op === '$push' || op === '$addToSet' || op === '$pullAll' || op === '$pull') {
-    self.$__.version = VERSION_INC;
+  if (op === '$push' || op === '$addToSet' || op === '$pullAll' || op === '$pull') {
+    if (/\.\d+\.|\.\d+$/.test(data.path)) {
+      increment.call(self);
+    } else {
+      self.$__.version = VERSION_INC;
+    }
   } else if (/^\$p/.test(op)) {
     // potentially changing array positions
     increment.call(self);
   } else if (Array.isArray(val)) {
     // $set an array
     increment.call(self);
+  } else if (/\.\d+\.|\.\d+$/.test(data.path)) {
+    // now handling $set, $unset
+    // subpath of array
+    self.$__.version = VERSION_WHERE;
   }
 }
 

test/versioning.test.js

@@ -664,10 +664,16 @@ describe('versioning', function() {
     post1.comments = [{ likedBy: ['test'] }];
     await post1.save();
 
-    const comment = post2.comments[0];
+    let comment = post2.comments[0];
     comment.likedBy.push('Some User');
 
     const err = await post2.save().then(() => null, err => err);
     assert.equal(err.name, 'VersionError');
+
+    const post3 = await Test.findById(entry._id).exec();
+    comment = post3.comments[0];
+    comment.likedBy.push('Some User');
+    await post3.save();
+    assert.equal(post3.__v, 2);
   });
 });