fix(document): avoid setting array default if document array projecte…

…d out by sibling projection Fix #13003
Automattic · Mar 6, 2023 · da04458 · da04458
1 parent a9a838c
commit da04458
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/lib/helpers/document/applyDefaults.js b/lib/helpers/document/applyDefaults.js
@@ -32,7 +32,7 @@ module.exports = function applyDefaults(doc, fields, exclude, hasIncludedChildre
         }
       } else if (exclude === false && fields && !included) {
         const hasSubpaths = type.$isSingleNested || type.$isMongooseDocumentArray;
-        if (curPath in fields || (hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
+        if (curPath in fields || (j === len - 1 && hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
           included = true;
         } else if (hasIncludedChildren != null && !hasIncludedChildren[curPath]) {
           break;

diff --git a/test/docs/debug.test.js b/test/docs/debug.test.js
@@ -93,10 +93,15 @@ describe('debug: shell', function() {
   });
 
   it('should avoid sending null session option with document ops (gh-13052)', async function() {
+    const m = new mongoose.Mongoose();
+    m.set('debug', true);
+    await m.connect(start.uri);
     const schema = new Schema({ name: String });
-    const Test = db.model('gh_13052', schema);
+    const Test = m.model('gh_13052', schema);
 
     await Test.create({ name: 'foo' });
     assert.equal(false, lastLog.includes('session'));
+
+    await m.disconnect();
   });
 });
diff --git a/test/document.test.js b/test/document.test.js
@@ -12162,6 +12162,23 @@ describe('document', function() {
       { $pop: { arr: -1 }, $inc: { __v: 1 } }
     );
   });
+
+  it('avoids setting array default if document array projected out by sibling projection (gh-13003)', async function() {
+    const schema = new mongoose.Schema({
+      name: String,
+      arr: [String],
+      properties: {
+        foo: String,
+        bar: [{ baz: String, qux: Boolean }],
+        baz: String
+      }
+    });
+    const Test = db.model('Test', schema);
+
+    const doc = new Test({}, { 'properties.foo': 1 });
+    doc.init({ properties: { foo: 'foo' } });
+    assert.strictEqual(doc.properties.bar, undefined);
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is availabe', function() {