fix: avoid setting defaults on insert on a path whose subpath is refe…

…renced in the update Fix #10624
Automattic · Sep 1, 2021 · e94d603 · e94d603
1 parent e1d4aa4
commit e94d603
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/helpers/common.js b/lib/helpers/common.js
@@ -78,7 +78,16 @@ function modifiedPaths(update, path, result) {
     const key = keys[i];
     let val = update[key];
 
-    result[path + key] = true;
+    const _path = path + key;
+    result[_path] = true;
+    if (_path.indexOf('.') !== -1) {
+      const sp = _path.split('.');
+      let cur = sp[0];
+      for (let i = 1; i < sp.length; ++i) {
+        result[cur] = true;
+        cur += '.' + sp[i];
+      }
+    }
     if (isMongooseObject(val) && !Buffer.isBuffer(val)) {
       val = val.toObject({ transform: false, virtuals: false });
     }

diff --git a/test/helpers/update.modifiedPaths.test.js b/test/helpers/update.modifiedPaths.test.js
@@ -6,7 +6,7 @@ const modifiedPaths = require('../../lib/helpers/update/modifiedPaths');
 describe('modifiedPaths', function() {
   it('works without any update operators', function(done) {
     const res = modifiedPaths({ a: 1, 'b.c': 2, d: { e: 1 } });
-    assert.deepEqual(res, { a: true, 'b.c': true, d: true, 'd.e': true });
+    assert.deepEqual(res, { a: true, b: true, 'b.c': true, d: true, 'd.e': true });
 
     done();
   });
@@ -17,7 +17,7 @@ describe('modifiedPaths', function() {
       $set: { 'b.c': 2 },
       $setOnInsert: { d: { e: 1 } }
     });
-    assert.deepEqual(res, { a: true, 'b.c': true, d: true, 'd.e': true });
+    assert.deepEqual(res, { a: true, b: true, 'b.c': true, d: true, 'd.e': true });
 
     done();
   });