fix merge issues from #43 and bump ESlint

Author: vkarpov15

index.js

@@ -107,26 +107,21 @@ function applyGettersToDoc(schema, doc) {
       // The path is not present (likely from projection)
       return;
     }
-    
-    const pathExists = mpath.has(path, doc);
-    if (pathExists) {
-      const val = schematype.applyGetters(mpath.get(path, doc), doc, true);
-      if (val && schematype.$isMongooseArray && !schematype.$isMongooseDocumentArray) {
-        mpath.set(
-          path,
-          val.map(subdoc => {
-            return schematype.caster.applyGetters(subdoc, doc);
-          }),
-          doc
-        );
-      } if (val && schematype.$isSingleNested) {
-        applyGettersToDoc.call(this, schematype.schema, pathVal);
+
+    const val = schematype.applyGetters(mpath.get(path, doc), doc, true);
+    if (val && schematype.$isMongooseArray) {
+      if (schematype.$isMongooseDocumentArray) {
+        val.forEach((subdoc) => applyGettersToDoc.call(this, schematype.schema, subdoc));
       } else {
-        mpath.set(path, val, doc);
+        for (let i = 0; i < val.length; ++i) {
+          val[i] = schematype.caster.applyGetters(val[i], doc);
+        }
       }
+    } if (val && schematype.$isSingleNested) {
+      applyGettersToDoc.call(this, schematype.schema, val);
+    } else {
+      mpath.set(path, val, doc);
     }
-
-    mpath.set(path, schematype.applyGetters(pathVal, doc, true), doc);
   });
 }
 

package.json

@@ -32,7 +32,7 @@
     "acquit-ignore": "0.1.0",
     "acquit-markdown": "0.1.0",
     "co": "4.6.0",
-    "eslint": "5.16.0",
+    "eslint": "8.x",
     "istanbul": "0.4.5",
     "mocha": "5.2.x"
   },
@@ -47,7 +47,7 @@
       "eslint:recommended"
     ],
     "parserOptions": {
-      "ecmaVersion": 2018
+      "ecmaVersion": 2020
     },
     "env": {
       "node": true,

test/index.test.js

@@ -430,10 +430,10 @@ describe('mongoose-lean-getters', function() {
     const DiscriminatedModel = RootModel.discriminator('Discriminated', discriminatedSchema);
 
     const entry = await DiscriminatedModel.create({
-      rootProp: { num: -0.1111111111111111111 },
-      rootArray: [{ num: -0.1111111111111111111 }],
-      discriminatedProp: { num: -0.222222222222222222 },
-      discriminatedArray: [{ num: -0.333333333333333333 }],
+      rootProp: { num: -0.1111 },
+      rootArray: [{ num: -0.1111 }],
+      discriminatedProp: { num: -0.2222 },
+      discriminatedArray: [{ num: -0.3333 }],
     });
 
     const found = await DiscriminatedModel.findById(entry._id).lean({ getters: true }).exec();