fix(populate): find connect justOne when double-populating underneath…

… an array
Automattic · Sep 12, 2018 · a01b827 · a01b827
1 parent b5841c2
commit a01b827
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 11 deletions.
diff --git a/lib/helpers/populate/getSchemaTypes.js b/lib/helpers/populate/getSchemaTypes.js
@@ -17,12 +17,13 @@ const mpath = require('mpath');
 
 module.exports = function getSchemaTypes(schema, doc, path) {
   const pathschema = schema.path(path);
+  const topLevelDoc = doc;
 
   if (pathschema) {
     return pathschema;
   }
 
-  function search(parts, schema, subdoc) {
+  function search(parts, schema, subdoc, nestedPath) {
     let p = parts.length + 1;
     let foundschema;
     let trypath;
@@ -70,7 +71,12 @@ module.exports = function getSchemaTypes(schema, doc, path) {
               return foundschema;
             }
             // comments.$.comments.$.title
-            ret = search(parts.slice(p + 1), schema, subdoc ? mpath.get(trypath, subdoc) : null);
+            ret = search(
+              parts.slice(p + 1),
+              schema,
+              subdoc ? mpath.get(trypath, subdoc) : null,
+              nestedPath.concat(parts.slice(0, p))
+            );
             if (ret) {
               ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
                 !foundschema.schema.$isSingleNested;
@@ -81,7 +87,12 @@ module.exports = function getSchemaTypes(schema, doc, path) {
           if (schemas != null && schemas.length > 0) {
             ret = [];
             for (let i = 0; i < schemas.length; ++i) {
-              const _ret = search(parts.slice(p), schemas[i], subdoc ? mpath.get(trypath, subdoc) : null);
+              const _ret = search(
+                parts.slice(p),
+                schemas[i],
+                subdoc ? mpath.get(trypath, subdoc) : null,
+                nestedPath.concat(parts.slice(0, p))
+              );
               if (_ret != null) {
                 _ret.$isUnderneathDocArray = _ret.$isUnderneathDocArray ||
                   !foundschema.schema.$isSingleNested;
@@ -93,7 +104,12 @@ module.exports = function getSchemaTypes(schema, doc, path) {
             }
             return ret;
           } else {
-            ret = search(parts.slice(p), foundschema.schema, subdoc ? mpath.get(trypath, subdoc) : null);
+            ret = search(
+              parts.slice(p),
+              foundschema.schema,
+              subdoc ? mpath.get(trypath, subdoc) : null,
+              nestedPath.concat(parts.slice(0, p))
+            );
 
             if (ret) {
               ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
@@ -105,10 +121,16 @@ module.exports = function getSchemaTypes(schema, doc, path) {
         }
       }
 
-      if (doc.$__ && doc.populated(trypath) && p < parts.length) {
-        const schema = get(doc.$__.populated[trypath], 'options.model.schema');
+      const fullPath = nestedPath.concat([trypath]).join('.');
+      if (topLevelDoc.$__ && topLevelDoc.populated(fullPath) && p < parts.length) {
+        const schema = get(doc.$__.populated[fullPath], 'options.model.schema');
         if (schema != null) {
-          const ret = search(parts.slice(p), schema, subdoc ? mpath.get(trypath, subdoc) : null);
+          const ret = search(
+            parts.slice(p),
+            schema,
+            subdoc ? mpath.get(trypath, subdoc) : null,
+            nestedPath.concat(parts.slice(0, p))
+          );
 
           if (ret) {
             ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
@@ -119,12 +141,17 @@ module.exports = function getSchemaTypes(schema, doc, path) {
         }
       }
 
-      const _val = get(doc, trypath);
+      const _val = get(topLevelDoc, trypath);
       if (_val != null && _val[leanPopulateSymbol] != null) {
         // Populated using lean, `_val[leanPopulateSymbol]` is the foreign model
         const schema = _val[leanPopulateSymbol].schema;
         if (schema != null) {
-          const ret = search(parts.slice(p), schema, subdoc ? mpath.get(trypath, subdoc) : null);
+          const ret = search(
+            parts.slice(p),
+            schema,
+            subdoc ? mpath.get(trypath, subdoc) : null,
+            nestedPath.concat(parts.slice(0, p))
+          );
 
           if (ret) {
             ret.$isUnderneathDocArray = ret.$isUnderneathDocArray ||
@@ -147,5 +174,5 @@ module.exports = function getSchemaTypes(schema, doc, path) {
       parts[i] = '0';
     }
   }
-  return search(parts, schema, doc);
+  return search(parts, schema, doc, []);
 };
diff --git a/test/model.populate.test.js b/test/model.populate.test.js
@@ -7599,7 +7599,7 @@ describe('model: populate:', function() {
         { make: 'Ford', versions: [{ type: 'F150', editions: [editions[0]] }] },
         { make: 'BMW', versions: [{ type: 'i8', editions: [editions[1]] }] }
       ]);
-    
+
       cars = yield Car.find().sort({ make: 1 });
       cars = yield Car.populate(cars, 'versions.editions');
       cars = yield Car.populate(cars, 'versions.editions.editionOptions.image');