Merge pull request #28 from nathan-knight/master

fix: correctly get schema for each element of a discriminated array

index.js

@@ -67,7 +67,7 @@ function applyGetters(schema, res, path) {
 }
 
 function getSchemaForDoc(schema, res) {
-  if (!schema.discriminatorMapping || !schema.discriminatorMapping.key) {
+  if (!schema.discriminatorMapping || !schema.discriminatorMapping.key || !schema.discriminators) {
     return schema;
   }
 
@@ -81,15 +81,18 @@ function applyGettersToDoc(schema, doc, fields, prefix) {
     return;
   }
 
-  const schemaForDoc = getSchemaForDoc(schema, doc);
-
   if (Array.isArray(doc)) {
     for (let i = 0; i < doc.length; ++i) {
-      applyGettersToDoc.call(this, schemaForDoc, doc[i], fields, prefix);
+      const currentDoc = doc[i];
+      if (currentDoc == null) continue;
+      const schemaForDoc = getSchemaForDoc(schema, currentDoc);
+      applyGettersToDoc.call(this, schemaForDoc, currentDoc, fields, prefix);
     }
     return;
   }
 
+  const schemaForDoc = getSchemaForDoc(schema, doc);
+
   schemaForDoc.eachPath((path, schematype) => {
     const pathWithPrefix = prefix ? prefix + '.' + path : path;
     if (this.selectedInclusively() &&

test/index.test.js

@@ -250,6 +250,34 @@ describe('mongoose-lean-getters', function() {
     assert.equal(docs[0].url, 'https://www.test.com discriminator field');
   });
 
+  it('should work on schemas with discriminators in arrays', async function() {
+    const options = { discriminatorKey: 'kind' };
+
+    const eventSchema = new mongoose.Schema({ time: Date }, options);
+    const clickedLinkSchema = new mongoose.Schema({
+      url: { type: String, get: v => v + ' discriminator field' }
+    });
+    eventSchema.discriminator('ClickedLink', clickedLinkSchema);
+
+    const eventListSchema = new mongoose.Schema({
+      events: [eventSchema],
+    });
+    eventListSchema.plugin(mongooseLeanGetters);
+    const EventList = mongoose.model('EventList', eventListSchema);
+
+    await EventList.deleteMany({});
+    await EventList.create({
+      events: [{
+        kind: 'ClickedLink',
+        url: 'https://www.test.com'
+      }],
+    });
+
+    const docs = await EventList.find().lean({ getters: true });
+
+    assert.equal(docs[0].events[0].url, 'https://www.test.com discriminator field');
+  });
+
   it('should call getters on arrays (gh-30)', async function() {
     function upper(value) {
       return value.toUpperCase();