mongoose 5.11.13 → 5.11.17

package/lib/schema/array.js

@@ -261,12 +261,19 @@ SchemaArray.prototype.enum = function() {
  */
 
 SchemaArray.prototype.applyGetters = function(value, scope) {
-  if (this.caster.options && this.caster.options.ref) {
+  if (scope != null && scope.populated(this.path)) {
     // means the object id was populated
     return value;
   }
 
-  return SchemaType.prototype.applyGetters.call(this, value, scope);
+  const ret = SchemaType.prototype.applyGetters.call(this, value, scope);
+  if (Array.isArray(ret)) {
+    const len = ret.length;
+    for (let i = 0; i < len; ++i) {
+      ret[i] = this.caster.applyGetters(ret[i], scope);
+    }
+  }
+  return ret;
 };
 
 SchemaArray.prototype._applySetters = function(value, scope, init, priorVal) {
@@ -348,7 +355,7 @@ SchemaArray.prototype.cast = function(value, doc, init, prev, options) {
     }
 
     const isPopulated = doc != null && doc.$__ != null && doc.populated(this.path);
-    if (isPopulated) {
+    if (isPopulated && init) {
       return value;
     }
 

package/lib/schema/documentarray.js

@@ -479,6 +479,14 @@ DocumentArrayPath.prototype.clone = function() {
   return schematype;
 };
 
+/*!
+ * ignore
+ */
+
+DocumentArrayPath.prototype.applyGetters = function(value, scope) {
+  return SchemaType.prototype.applyGetters.call(this, value, scope);
+};
+
 /*!
  * Scopes paths selected in a query to this array.
  * Necessary for proper default application of subdocument values.

package/lib/schema.js

@@ -694,18 +694,18 @@ Schema.prototype.path = function(path, obj) {
   }
 
   if (schemaType.$isSingleNested) {
-    for (const key in schemaType.schema.paths) {
+    for (const key of Object.keys(schemaType.schema.paths)) {
       this.singleNestedPaths[path + '.' + key] = schemaType.schema.paths[key];
     }
-    for (const key in schemaType.schema.singleNestedPaths) {
+    for (const key of Object.keys(schemaType.schema.singleNestedPaths)) {
       this.singleNestedPaths[path + '.' + key] =
         schemaType.schema.singleNestedPaths[key];
     }
-    for (const key in schemaType.schema.subpaths) {
+    for (const key of Object.keys(schemaType.schema.subpaths)) {
       this.singleNestedPaths[path + '.' + key] =
         schemaType.schema.subpaths[key];
     }
-    for (const key in schemaType.schema.nested) {
+    for (const key of Object.keys(schemaType.schema.nested)) {
       this.singleNestedPaths[path + '.' + key] = 'nested';
     }
 
@@ -1156,7 +1156,7 @@ Schema.prototype.hasMixedParent = function(path) {
   path = '';
   for (let i = 0; i < subpaths.length; ++i) {
     path = i > 0 ? path + '.' + subpaths[i] : subpaths[i];
-    if (path in this.paths &&
+    if (this.paths.hasOwnProperty(path) &&
         this.paths[path] instanceof MongooseTypes.Mixed) {
       return this.paths[path];
     }

package/lib/schematype.js

@@ -15,8 +15,6 @@ const schemaTypeSymbol = require('./helpers/symbols').schemaTypeSymbol;
 const util = require('util');
 const utils = require('./utils');
 const validatorErrorSymbol = require('./helpers/symbols').validatorErrorSymbol;
-
-const documentIsSelected = require('./helpers/symbols').documentIsSelected;
 const documentIsModified = require('./helpers/symbols').documentIsModified;
 
 const CastError = MongooseError.CastError;
@@ -953,7 +951,7 @@ SchemaType.prototype.required = function(required, message) {
     const cachedRequired = get(this, '$__.cachedRequired');
 
     // no validation when this path wasn't selected in the query.
-    if (cachedRequired != null && !this[documentIsSelected](_this.path) && !this[documentIsModified](_this.path)) {
+    if (cachedRequired != null && !this.$__isSelected(_this.path) && !this[documentIsModified](_this.path)) {
       return true;
     }
 
@@ -1051,8 +1049,11 @@ SchemaType.prototype.getDefault = function(scope, init) {
  * @api private
  */
 
-SchemaType.prototype._applySetters = function(value, scope) {
+SchemaType.prototype._applySetters = function(value, scope, init) {
   let v = value;
+  if (init) {
+    return v;
+  }
   const setters = this.setters;
 
   for (const setter of utils.clone(setters).reverse()) {

package/lib/types/core_array.js

@@ -284,7 +284,7 @@ class CoreMongooseArray extends Array {
    * @memberOf MongooseArray
    */
 
-  _markModified(elem, embeddedPath) {
+  _markModified(elem) {
     const parent = this[arrayParentSymbol];
     let dirtyPath;
 
@@ -292,13 +292,7 @@ class CoreMongooseArray extends Array {
       dirtyPath = this[arrayPathSymbol];
 
       if (arguments.length) {
-        if (embeddedPath != null) {
-          // an embedded doc bubbled up the change
-          dirtyPath = dirtyPath + '.' + this.indexOf(elem) + '.' + embeddedPath;
-        } else {
-          // directly set an index
-          dirtyPath = dirtyPath + '.' + elem;
-        }
+        dirtyPath = dirtyPath + '.' + elem;
       }
 
       if (dirtyPath != null && dirtyPath.endsWith('.$')) {

package/lib/types/documentarray.js

@@ -330,6 +330,34 @@ class CoreDocumentArray extends CoreMongooseArray {
       }
     };
   }
+
+  _markModified(elem, embeddedPath) {
+    const parent = this[arrayParentSymbol];
+    let dirtyPath;
+
+    if (parent) {
+      dirtyPath = this[arrayPathSymbol];
+
+      if (arguments.length) {
+        if (embeddedPath != null) {
+          // an embedded doc bubbled up the change
+          const index = elem.__index;
+          dirtyPath = dirtyPath + '.' + index + '.' + embeddedPath;
+        } else {
+          // directly set an index
+          dirtyPath = dirtyPath + '.' + elem;
+        }
+      }
+
+      if (dirtyPath != null && dirtyPath.endsWith('.$')) {
+        return this;
+      }
+
+      parent.markModified(dirtyPath, arguments.length > 0 ? elem : parent);
+    }
+
+    return this;
+  }
 }
 
 if (util.inspect.custom) {

package/lib/types/embedded.js

@@ -106,7 +106,7 @@ EmbeddedDocument.prototype.markModified = function(path) {
   }
 
   const pathToCheck = this.__parentArray.$path() + '.0.' + path;
-  if (this.isNew && this.ownerDocument().isSelected(pathToCheck)) {
+  if (this.isNew && this.ownerDocument().$__isSelected(pathToCheck)) {
     // Mark the WHOLE parent array as modified
     // if this is a new document (i.e., we are initializing
     // a document),
@@ -201,6 +201,9 @@ function registerRemoveListener(sub) {
  */
 
 EmbeddedDocument.prototype.$__remove = function(cb) {
+  if (cb == null) {
+    return;
+  }
   return cb(null, this);
 };
 
@@ -218,7 +221,7 @@ EmbeddedDocument.prototype.remove = function(options, fn) {
     options = undefined;
   }
   if (!this.__parentArray || (options && options.noop)) {
-    fn && fn(null);
+    this.$__remove(fn);
     return this;
   }
 
@@ -234,9 +237,7 @@ EmbeddedDocument.prototype.remove = function(options, fn) {
     registerRemoveListener(this);
   }
 
-  if (fn) {
-    fn(null);
-  }
+  this.$__remove(fn);
 
   return this;
 };

package/lib/types/map.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const Mixed = require('../schema/mixed');
+const ObjectId = require('./objectid');
 const deepEqual = require('../utils').deepEqual;
 const get = require('../helpers/get');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
@@ -19,7 +20,6 @@ class MongooseMap extends Map {
       v = Object.keys(v).reduce((arr, key) => arr.concat([[key, v[key]]]), []);
     }
     super(v);
-
     this.$__parent = doc != null && doc.$__ != null ? doc : null;
     this.$__path = path;
     this.$__schemaType = schemaType == null ? new Mixed(path) : schemaType;
@@ -42,6 +42,10 @@ class MongooseMap extends Map {
   }
 
   get(key, options) {
+    if (key instanceof ObjectId) {
+      key = key.toString();
+    }
+
     options = options || {};
     if (options.getters === false) {
       return super.get(key);
@@ -50,6 +54,10 @@ class MongooseMap extends Map {
   }
 
   set(key, value) {
+    if (key instanceof ObjectId) {
+      key = key.toString();
+    }
+
     checkValidKey(key);
     value = handleSpreadDoc(value);
 
@@ -77,7 +85,7 @@ class MongooseMap extends Map {
     } else {
       try {
         value = this.$__schemaType.
-          applySetters(value, this.$__parent, false, this.get(key));
+          applySetters(value, this.$__parent, false, this.get(key), { path: fullPath });
       } catch (error) {
         if (this.$__parent != null && this.$__parent.$__ != null) {
           this.$__parent.invalidate(fullPath, error);
@@ -108,6 +116,10 @@ class MongooseMap extends Map {
   }
 
   delete(key) {
+    if (key instanceof ObjectId) {
+      key = key.toString();
+    }
+
     this.set(key, undefined);
     super.delete(key);
   }

package/lib/types/subdocument.js

@@ -18,7 +18,9 @@ module.exports = Subdocument;
 
 function Subdocument(value, fields, parent, skipId, options) {
   this.$isSingleNested = true;
-
+  if (options != null && options.path != null) {
+    this.$basePath = options.path;
+  }
   const hasPriorDoc = options != null && options.priorDoc;
   let initedPaths = null;
   if (hasPriorDoc) {
@@ -253,7 +255,6 @@ Subdocument.prototype.remove = function(options, callback) {
     callback = options;
     options = null;
   }
-
   registerRemoveListener(this);
 
   // If removing entire doc, no need to remove subdoc

package/lib/utils.js

@@ -332,7 +332,7 @@ exports.toObject = function toObject(obj) {
   if (exports.isPOJO(obj)) {
     ret = {};
 
-    for (const k in obj) {
+    for (const k of Object.keys(obj)) {
       if (specialProperties.has(k)) {
         continue;
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.11.13",
+  "version": "5.11.17",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -22,10 +22,10 @@
     "@types/mongodb": "^3.5.27",
     "bson": "^1.1.4",
     "kareem": "2.3.2",
-    "mongodb": "3.6.3",
+    "mongodb": "3.6.4",
     "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.8.3",
-    "mquery": "3.2.3",
+    "mquery": "3.2.4",
     "ms": "2.1.2",
     "regexp-clone": "1.0.0",
     "safe-buffer": "5.2.1",
@@ -120,7 +120,8 @@
         ],
         "rules": {
           "@typescript-eslint/no-explicit-any": "off",
-          "@typescript-eslint/ban-types": "off"
+          "@typescript-eslint/ban-types": "off",
+          "@typescript-eslint/no-unused-vars": "off"
         }
       }
     ],