fix(update): quick improvement for #7909

Automattic · Jun 22, 2019 · 4c4973a · 4c4973a
1 parent 0314b02
commit 4c4973a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/helpers/setDefaultsOnInsert.js b/lib/helpers/setDefaultsOnInsert.js
@@ -70,7 +70,9 @@ module.exports = function(filter, schema, castedDoc, options) {
 
   schema.eachPath(function(path, schemaType) {
     // Skip single nested paths if underneath a map
-    if (schemaType.$isSingleNested && !schemaType.path.endsWith('.$*')) {
+    const isUnderneathMap = schemaType.path.endsWith('.$*') ||
+      schemaType.path.indexOf('.$*.') !== -1;
+    if (schemaType.$isSingleNested && !isUnderneathMap) {
       // Only handle nested schemas 1-level deep to avoid infinite
       // recursion re: https://github.com/mongodb-js/mongoose-autopopulate/issues/11
       schemaType.schema.eachPath(function(_path, _schemaType) {

diff --git a/test/model.findOneAndUpdate.test.js b/test/model.findOneAndUpdate.test.js
@@ -1228,7 +1228,7 @@ describe('model: findOneAndUpdate:', function() {
     });
 
     it('skips setting defaults within maps (gh-7909)', function() {
-      const socialMediaHandleSchema = Schema({ links: [String] });      
+      const socialMediaHandleSchema = Schema({ links: [String] });
       const profileSchema = Schema({
         username: String,
         socialMediaHandles: {