Merge pull request #13793 from Automattic/vkarpov15/gh-13774

fix(document): avoid double-calling array getters when using `.get('arr.0')`
Automattic · Aug 29, 2023 · d9a4bc4 · d9a4bc4
2 parents 29de9c4 + 41e63bd
commit d9a4bc4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/utils.js b/lib/utils.js
@@ -640,7 +640,10 @@ exports.getValue = function(path, obj, map) {
 const mapGetterOptions = Object.freeze({ getters: false });
 
 function getValueLookup(obj, part) {
-  const _from = obj?._doc || obj;
+  let _from = obj?._doc || obj;
+  if (_from != null && _from.isMongooseArrayProxy) {
+    _from = _from.__array;
+  }
   return _from instanceof Map ?
     _from.get(part, mapGetterOptions) :
     _from[part];

diff --git a/test/document.test.js b/test/document.test.js
@@ -12386,6 +12386,10 @@ describe('document', function() {
     assert.equal(oneUser.hobbies[0], 'swimming');
     assert.equal(oneUser.hobbies[0], 'swimming');
     assert.equal(oneUser.hobbies[0], 'swimming');
+
+    assert.equal(oneUser.get('hobbies.0'), 'swimming');
+    assert.equal(oneUser.get('hobbies.0'), 'swimming');
+    assert.equal(oneUser.get('hobbies.0'), 'swimming');
   });
 
   it('sets defaults on subdocs with subdoc projection (gh-13720)', async function() {