Changes

node_modules/mongoose/lib/helpers/populate/assignVals.js

@@ -18,6 +18,7 @@ module.exports = function assignVals(o) {
     justOne: o.justOne
   });
   populateOptions.$nullIfNotFound = o.isVirtual;
+  const populatedModel = o.populatedModel;
 
   const originalIds = [].concat(o.rawIds);
 
@@ -39,12 +40,31 @@ module.exports = function assignVals(o) {
     if (val instanceof SkipPopulateValue) {
       return val.val;
     }
+
     if (o.justOne === true && Array.isArray(val)) {
-      return valueFilter(val[0], options, populateOptions);
+      // Might be an embedded discriminator (re: gh-9244) with multiple models, so make sure to pick the right
+      // model before assigning.
+      const ret = [];
+      for (const doc of val) {
+        const _docPopulatedModel = leanPopulateMap.get(doc);
+        if (_docPopulatedModel == null || _docPopulatedModel === populatedModel) {
+          ret.push(doc);
+        }
+      }
+      // Since we don't want to have to create a new mongoosearray, make sure to
+      // modify the array in place
+      while (val.length > ret.length) {
+        Array.prototype.pop.apply(val, []);
+      }
+      for (let i = 0; i < ret.length; ++i) {
+        val[i] = ret[i];
+      }
+
+      return valueFilter(val[0], options, populateOptions, populatedModel);
     } else if (o.justOne === false && !Array.isArray(val)) {
-      return valueFilter([val], options, populateOptions);
+      return valueFilter([val], options, populateOptions, populatedModel);
     }
-    return valueFilter(val, options, populateOptions);
+    return valueFilter(val, options, populateOptions, populatedModel);
   }
 
   for (let i = 0; i < docs.length; ++i) {
@@ -84,6 +104,16 @@ module.exports = function assignVals(o) {
       }, new Map());
     }
 
+    if (isDoc && Array.isArray(valueToSet)) {
+      for (const val of valueToSet) {
+        if (val != null && val.$__ != null) {
+          val.$__.parent = docs[i];
+        }
+      }
+    } else if (isDoc && valueToSet != null && valueToSet.$__ != null) {
+      valueToSet.$__.parent = docs[i];
+    }
+
     if (o.isVirtual && isDoc) {
       docs[i].populated(o.path, o.justOne ? originalIds[0] : originalIds, o.allOptions);
       // If virtual populate and doc is already init-ed, need to walk through

node_modules/mongoose/lib/helpers/populate/getModelsMapForPopulate.js

@@ -40,6 +40,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
 
   for (i = 0; i < len; i++) {
     doc = docs[i];
+    let justOne = null;
 
     schema = getSchemaTypes(modelSchema, doc, options.path);
     // Special case: populating a path that's a DocumentArray unless
@@ -76,6 +77,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
           isRefPath = isRefPath || res.isRefPath;
           normalizedRefPath = normalizeRefPath(normalizedRefPath, doc, options.path) ||
             res.refPath;
+          justOne = res.justOne;
         } catch (error) {
           return error;
         }
@@ -99,6 +101,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
         modelNames = res.modelNames;
         isRefPath = res.isRefPath;
         normalizedRefPath = res.refPath;
+        justOne = res.justOne;
       } catch (error) {
         return error;
       }
@@ -142,7 +145,6 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     // `justOne = null` means we don't know from the schema whether the end
     // result should be an array or a single doc. This can result from
     // populating a POJO using `Model.populate()`
-    let justOne = null;
     if ('justOne' in options && options.justOne !== void 0) {
       justOne = options.justOne;
     } else if (virtual && virtual.options && virtual.options.refPath) {
@@ -339,6 +341,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     let modelNames;
     let discriminatorKey;
     let isRefPath = false;
+    let justOne = null;
 
     if (schema && schema.caster) {
       schema = schema.caster;
@@ -407,6 +410,10 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
       const _virtualRes = getVirtual(modelForCurrentDoc.schema, options.path);
       const virtual = _virtualRes == null ? null : _virtualRes.virtual;
 
+      if (schemaForCurrentDoc != null) {
+        justOne = !schemaForCurrentDoc.$isMongooseArray && !schemaForCurrentDoc._arrayPath;
+      }
+
       let ref;
       let refPath;
 
@@ -440,14 +447,14 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
     }
 
     if (!modelNames) {
-      return { modelNames: modelNames, isRefPath: isRefPath, refPath: normalizedRefPath };
+      return { modelNames: modelNames, isRefPath: isRefPath, refPath: normalizedRefPath, justOne: justOne };
     }
 
     if (!Array.isArray(modelNames)) {
       modelNames = [modelNames];
     }
 
-    return { modelNames: modelNames, isRefPath: isRefPath, refPath: normalizedRefPath };
+    return { modelNames: modelNames, isRefPath: isRefPath, refPath: normalizedRefPath, justOne: justOne };
   }
 };