Merge pull request #14198 from Automattic/vkarpov15/gh-14178

fix(document): avoid flattening dotted paths in mixed path underneath nested path

Author: vkarpov15

lib/document.js

@@ -22,7 +22,6 @@ const cleanModifiedSubpaths = require('./helpers/document/cleanModifiedSubpaths'
 const compile = require('./helpers/document/compile').compile;
 const defineKey = require('./helpers/document/compile').defineKey;
 const flatten = require('./helpers/common').flatten;
-const flattenObjectWithDottedPaths = require('./helpers/path/flattenObjectWithDottedPaths');
 const get = require('./helpers/get');
 const getEmbeddedDiscriminatorPath = require('./helpers/document/getEmbeddedDiscriminatorPath');
 const getKeysInSchemaOrder = require('./helpers/schema/getKeysInSchemaOrder');
@@ -472,8 +471,6 @@ function $applyDefaultsToNested(val, path, doc) {
     return;
   }
 
-  flattenObjectWithDottedPaths(val);
-
   const paths = Object.keys(doc.$__schema.paths);
   const plen = paths.length;
 

lib/helpers/path/flattenObjectWithDottedPaths.js

@@ -12414,6 +12414,29 @@ describe('document', function() {
     await doc.save();
     assert.ok(doc);
   });
+
+  it('avoids overwriting dotted paths in mixed path underneath nested path (gh-14178)', async function() {
+    const testSchema = new Schema({
+      __stateBeforeSuspension: {
+        field1: String,
+        field3: { type: Schema.Types.Mixed }
+      }
+    });
+    const Test = db.model('Test', testSchema);
+    const eventObj = new Test({
+      __stateBeforeSuspension: { field1: 'test' }
+    });
+    await eventObj.save();
+    const newO = eventObj.toObject();
+    newO.__stateBeforeSuspension.field3 = { '.ippo': 5 };
+    eventObj.set(newO);
+    await eventObj.save();
+
+    assert.strictEqual(eventObj.__stateBeforeSuspension.field3['.ippo'], 5);
+
+    const fromDb = await Test.findById(eventObj._id).lean().orFail();
+    assert.strictEqual(fromDb.__stateBeforeSuspension.field3['.ippo'], 5);
+  });
 });
 
 describe('Check if instance function that is supplied in schema option is availabe', function() {