Merge pull request #12605 from Automattic/vkarpov15/gh-12530

Correctly find paths underneath single nested document with an array of mixed
Automattic · Oct 28, 2022 · d684fd2 · d684fd2
2 parents 831c4f1 + 0b70933
commit d684fd2
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 2 deletions.
diff --git a/lib/helpers/populate/getSchemaTypes.js b/lib/helpers/populate/getSchemaTypes.js
@@ -173,6 +173,8 @@ module.exports = function getSchemaTypes(model, schema, doc, path) {
             }
           }
         }
+      } else if (foundschema.$isSchemaMap && foundschema.$__schemaType instanceof Mixed) {
+        return foundschema.$__schemaType;
       }
 
       const fullPath = nestedPath.concat([trypath]).join('.');

diff --git a/lib/schema.js b/lib/schema.js
@@ -2409,8 +2409,15 @@ Schema.prototype._getSchema = function(path) {
           if (p + 1 >= parts.length) {
             return foundschema.$__schemaType;
           }
-          const ret = search(parts.slice(p + 1), foundschema.$__schemaType.schema);
-          return ret;
+
+          if (foundschema.$__schemaType instanceof MongooseTypes.Mixed) {
+            return foundschema.$__schemaType;
+          }
+          if (foundschema.$__schemaType.schema != null) {
+            // Map of docs
+            const ret = search(parts.slice(p + 1), foundschema.$__schemaType.schema);
+            return ret;
+          }
         }
 
         foundschema.$fullPath = resultPath.join('.');

diff --git a/test/helpers/populate.getSchemaTypes.test.js b/test/helpers/populate.getSchemaTypes.test.js
@@ -178,4 +178,18 @@ describe('getSchemaTypes', function() {
     assert.equal(schemaTypes.length, 1);
     assert.equal(schemaTypes[0].options.ref, 'Enemy');
   });
+
+  it('finds path underneath nested subdocument with map of mixed (gh-12530)', function() {
+    const schema = new Schema({
+      child: new Schema({
+        testMap: {
+          type: Map,
+          of: 'Mixed'
+        }
+      })
+    });
+
+    const schemaTypes = getSchemaTypes(null, schema, null, 'child.testMap.foo.bar');
+    assert.equal(schemaTypes.instance, 'Mixed');
+  });
 });
diff --git a/test/schema.test.js b/test/schema.test.js
@@ -2885,4 +2885,17 @@ describe('schema', function() {
     assert.equal(schema.path('num').instance, 'Decimal128');
     assert.equal(schema.path('num2').instance, 'Decimal128');
   });
+
+  it('_getSchema finds path underneath nested subdocument with map of mixed (gh-12530)', function() {
+    const schema = new Schema({
+      child: new Schema({
+        testMap: {
+          type: Map,
+          of: 'Mixed'
+        }
+      })
+    });
+
+    assert.equal(schema._getSchema('child.testMap.foo.bar').instance, 'Mixed');
+  });
 });