fix(populate): correctly get schema type underneath map of mixed in g…

…etSchemaTypes
Automattic · Oct 27, 2022 · 0b70933 · 0b70933
1 parent 5740c2c
commit 0b70933
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 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/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');
+  });
 });