mongoose 4.10.4 → 4.10.8

package/.npmignore

@@ -15,3 +15,4 @@ bin/
 karma.*.js
 format_deps.js
 tools/31*
+*.key

package/CONTRIBUTING.md

@@ -49,7 +49,13 @@ To contribute to the [API documentation](http://mongoosejs.com/docs/api.html) ju
 
 To contribute to the [guide](http://mongoosejs.com/docs/guide.html) or [quick start](http://mongoosejs.com/docs/index.html) docs, make your changes to the appropriate `.jade` files in the [docs](https://github.com/Automattic/mongoose/tree/master/docs) directory of the master branch and submit a pull request. Again, the [Edit](https://github.com/blog/844-forking-with-the-edit-button) button might work for you here.
 
-If you'd like to preview your documentation changes, first commit your changes to your local master branch, then execute `make docs` from the project root, which switches to the gh-pages branch, merges from the master branch and builds all the static pages for you. Now execute `node static.js` from the project root which will launch a local webserver where you can browse the documentation site locally. If all looks good, submit a [pull request](https://help.github.com/articles/using-pull-requests/) to the master branch with your changes.
+If you'd like to preview your documentation changes, first commit your changes to your local master branch, then execute:
+
+* `make docclean`
+* `make gendocs`
+* `node static.js`
+
+Visit `http://localhost:8088` and you should see the docs with your local changes. Make sure you `git reset --hard` before commiting, because changes to `docs/*` should **not** be in PRs.
 
 ### Plugins website
 

package/History.md

@@ -1,3 +1,41 @@
+4.10.8 / 2017-06-21
+===================
+ * docs: fix small formatting typo on schematypes #5374 [gianpaj](https://github.com/gianpaj)
+ * fix(model): allow null as an _id #5370
+ * fix(populate): don't throw async uncaught exception if model not found in populate #5364
+ * fix: correctly cast decimals in update #5361
+ * fix(error): don't use custom getter for ValidationError message #5359
+ * fix(query): handle runSettersOnQuery in built-in _id setter #5351
+ * fix(document): ensure consistent context for nested doc custom validators #5347
+
+4.10.7 / 2017-06-18
+===================
+ * docs(validation): show overriding custom validator error with 2nd cb arg #5358
+ * fix: `parseOption` mutates user passed option map #5357 [igwejk](https://github.com/igwejk)
+ * docs: fix guide.jade typo #5356 [CalebAnderson2014](https://github.com/CalebAnderson2014)
+ * fix(populate): don't set populate virtual to ids when match fails #5336
+ * fix(query): callback with cast error if remove and delete* args have a cast error #5323
+
+4.10.6 / 2017-06-12
+===================
+ * fix(cursor): handle custom model option for populate #5334
+ * fix(populate): handle empty virtual populate with Model.populate #5331
+ * fix(model): make ensureIndexes() run with autoIndex: false unless called internally #5328 #5324 #5317
+ * fix: wait for all connections to close before resolving disconnect() promise #5316
+ * fix(document): handle setting populated path with custom typeKey in schema #5313
+ * fix(error): add toJSON helper to ValidationError so `message` shows up with JSON.stringify #5309
+ * feat: add `getPromiseConstructor()` to prevent need for `mongoose.Promise.ES6` #5305
+ * fix(document): handle conditional required with undefined props #5296
+ * fix(model): clone options before inserting in save() #5294
+ * docs(populate): clarify that multiple populate() calls on same path overwrite #5274
+
+4.10.5 / 2017-06-06
+===================
+ * chore: improve contrib guide for building docs #5312
+ * fix(populate): handle init-ing nested virtuals properly #5311
+ * fix(update): report update validator error if required path under single nested doc not set
+ * fix(schema): remove default validate pre hook that was causing issues with jest #4943
+
 4.10.4 / 2017-05-29
 ===================
  * chore: dont store test data in same directory #5303

package/lib/cast.js

@@ -4,6 +4,7 @@
 
 var StrictModeError = require('./error/strict');
 var Types = require('./schema/index');
+var util = require('util');
 var utils = require('./utils');
 
 var ALLOWED_GEOWITHIN_GEOJSON_TYPES = ['Polygon', 'MultiPolygon'];
@@ -17,15 +18,19 @@ var ALLOWED_GEOWITHIN_GEOJSON_TYPES = ['Polygon', 'MultiPolygon'];
  * @api private
  */
 module.exports = function cast(schema, obj, options) {
-  var paths = Object.keys(obj),
-      i = paths.length,
-      _keys,
-      any$conditionals,
-      schematype,
-      nested,
-      path,
-      type,
-      val;
+  if (Array.isArray(obj)) {
+    throw new Error('Query filter must be an object, got an array ', util.inspect(obj));
+  }
+
+  var paths = Object.keys(obj);
+  var i = paths.length;
+  var _keys;
+  var any$conditionals;
+  var schematype;
+  var nested;
+  var path;
+  var type;
+  var val;
 
   while (i--) {
     path = paths[i];

package/lib/{querycursor.js → cursor/QueryCursor.js}

@@ -2,9 +2,9 @@
  * Module dependencies.
  */
 
-var PromiseProvider = require('./promise_provider');
+var PromiseProvider = require('../promise_provider');
 var Readable = require('stream').Readable;
-var helpers = require('./queryhelpers');
+var helpers = require('../queryhelpers');
 var util = require('util');
 
 /**
@@ -283,9 +283,6 @@ function _next(ctx, cb) {
 
       var pop = helpers.preparePopulationOptionsMQ(ctx.query,
         ctx.query._mongooseOptions);
-      pop.forEach(function(option) {
-        delete option.model;
-      });
       pop.__noPromise = true;
       ctx.query.model.populate(doc, pop, function(err, doc) {
         if (err) {

package/lib/document.js

@@ -724,14 +724,14 @@ Document.prototype.set = function(path, val, type, options) {
 
     var popOpts;
     if (schema.options &&
-        Array.isArray(schema.options.type) &&
-        schema.options.type.length &&
-        schema.options.type[0].ref &&
+        Array.isArray(schema.options[this.schema.options.typeKey]) &&
+        schema.options[this.schema.options.typeKey].length &&
+        schema.options[this.schema.options.typeKey][0].ref &&
         Array.isArray(val) &&
         val.length > 0 &&
         val[0] instanceof Document &&
         val[0].constructor.modelName &&
-        (schema.options.type[0].ref === val[0].constructor.baseModelName || schema.options.type[0].ref === val[0].constructor.modelName)) {
+        (schema.options[this.schema.options.typeKey][0].ref === val[0].constructor.baseModelName || schema.options[this.schema.options.typeKey][0].ref === val[0].constructor.modelName)) {
       if (this.ownerDocument) {
         popOpts = { model: val[0].constructor };
         this.ownerDocument().populated(this.$__fullPath(path),
@@ -845,7 +845,7 @@ Document.prototype.$__set = function(pathToMark, path, constructing, parts, sche
   var _this = this;
 
   if (shouldModify) {
-    this.markModified(pathToMark, val);
+    this.markModified(pathToMark);
 
     // handle directly setting arrays (gh-1126)
     MongooseArray || (MongooseArray = require('./types/array'));
@@ -958,9 +958,7 @@ Document.prototype.get = function(path, type) {
     obj = adhoc.cast(obj);
   }
 
-  // Check if this path is populated - don't apply getters if it is,
-  // because otherwise its a nested object. See gh-3357
-  if (schema && !this.populated(path)) {
+  if (schema) {
     obj = schema.applyGetters(obj, this);
   }
 
@@ -998,11 +996,15 @@ Document.prototype.$__path = function(path) {
  *     doc.save() // changes to mixed.type are now persisted
  *
  * @param {String} path the path to mark modified
+ * @param {Document} [scope] the scope to run validators with
  * @api public
  */
 
-Document.prototype.markModified = function(path) {
+Document.prototype.markModified = function(path, scope) {
   this.$__.activePaths.modify(path);
+  if (scope != null && !this.ownerDocument) {
+    this.$__.pathsToScopes[path] = scope;
+  }
 };
 
 /**
@@ -1020,6 +1022,7 @@ Document.prototype.markModified = function(path) {
 
 Document.prototype.unmarkModified = function(path) {
   this.$__.activePaths.init(path);
+  delete this.$__.pathsToScopes[path];
 };
 
 /**
@@ -1461,12 +1464,15 @@ Document.prototype.$__validate = function(callback) {
       }
 
       var val = _this.getValue(path);
+      var scope = path in _this.$__.pathsToScopes ?
+        _this.$__.pathsToScopes[path] :
+        _this;
       p.doValidate(val, function(err) {
         if (err) {
           _this.invalidate(path, err, undefined, true);
         }
         --total || complete();
-      }, _this);
+      }, scope);
     });
   };
 
@@ -1611,7 +1617,7 @@ Document.prototype.invalidate = function(path, err, val, kind) {
     return this.$__.validationError;
   }
 
-  this.$__.validationError.errors[path] = err;
+  this.$__.validationError.addError(path, err);
   return this.$__.validationError;
 };
 

package/lib/drivers/node-mongodb-native/connection.js

@@ -245,7 +245,8 @@ NativeConnection.prototype.doClose = function(fn) {
  */
 
 NativeConnection.prototype.parseOptions = function(passed, connStrOpts) {
-  var o = passed || {};
+  var o = passed ? require('../../utils').clone(passed) : {};
+
   o.db || (o.db = {});
   o.auth || (o.auth = {});
   o.server || (o.server = {});

package/lib/error/validation.js

@@ -3,6 +3,7 @@
  */
 
 var MongooseError = require('../error.js');
+var utils = require('../utils');
 
 /**
  * Document Validation Error
@@ -40,13 +41,6 @@ function ValidationError(instance) {
 ValidationError.prototype = Object.create(MongooseError.prototype);
 ValidationError.prototype.constructor = MongooseError;
 
-Object.defineProperty(ValidationError.prototype, 'message', {
-  get: function() {
-    return this._message + ': ' + _generateMessage(this);
-  },
-  enumerable: true
-});
-
 /**
  * Console.log helper
  */
@@ -60,7 +54,24 @@ ValidationError.prototype.toString = function() {
  */
 
 ValidationError.prototype.inspect = function() {
-  return Object.assign(new Error(this.message), this);
+  return utils.assign(new Error(this.message), this);
+};
+
+/*!
+ * Helper for JSON.stringify
+ */
+
+ValidationError.prototype.toJSON = function() {
+  return utils.assign({}, this, { message: this.message });
+};
+
+/*!
+ * add message
+ */
+
+ValidationError.prototype.addError = function(path, error) {
+  this.errors[path] = error;
+  this.message = this._message + ': ' + _generateMessage(this);
 };
 
 /*!

package/lib/index.js

@@ -269,26 +269,29 @@ Mongoose.prototype.connect.$hasSideEffects = true;
  */
 
 Mongoose.prototype.disconnect = function(fn) {
-  var error;
-  this.connections.forEach(function(conn) {
-    conn.close(function(err) {
-      if (error) {
-        return;
-      }
-      if (err) {
-        error = err;
-      }
-    });
-  });
+  var _this = this;
 
   var Promise = PromiseProvider.get();
   return new MongooseThenable(this, new Promise.ES6(function(resolve, reject) {
-    fn && fn(error);
-    if (error) {
-      reject(error);
+    var remaining = _this.connections.length;
+    if (remaining <= 0) {
+      fn && fn();
+      resolve();
       return;
     }
-    resolve();
+    _this.connections.forEach(function(conn) {
+      conn.close(function(error) {
+        if (error) {
+          fn && fn(error);
+          reject(error);
+          return;
+        }
+        if (!--remaining) {
+          fn && fn();
+          resolve();
+        }
+      });
+    });
   }));
 };
 Mongoose.prototype.disconnect.$hasSideEffects = true;
@@ -688,6 +691,19 @@ Object.defineProperty(Mongoose.prototype, 'Promise', {
   }
 });
 
+/**
+ * Returns the current ES6-style promise constructor. In Mongoose 4.x,
+ * equivalent to `mongoose.Promise.ES6`, but will change once we get rid
+ * of the `.ES6` bit.
+ *
+ * @method Promise
+ * @api public
+ */
+
+Mongoose.prototype.getPromiseConstructor = function() {
+  return PromiseProvider.get().ES6;
+};
+
 /**
  * Storage layer for mongoose promises
  *

package/lib/internal.js

@@ -24,6 +24,7 @@ function InternalCache() {
   this.wasPopulated = false; // if this doc was the result of a population
   this.scope = undefined;
   this.activePaths = new ActiveRoster;
+  this.pathsToScopes = {};
 
   // embedded docs
   this.ownerDocument = undefined;

package/lib/model.js

@@ -114,6 +114,7 @@ Model.prototype.$__handleSave = function(options, callback) {
   if (typeof options.safe === 'boolean') {
     options.safe = null;
   }
+  var safe = options.safe ? utils.clone(options.safe, { retainKeyOrder: true }) : options.safe;
 
   if (this.isNew) {
     // send entire doc
@@ -127,7 +128,7 @@ Model.prototype.$__handleSave = function(options, callback) {
 
     var obj = this.toObject(toObjectOptions);
 
-    if ((obj || {})._id == null) {
+    if ((obj || {})._id === void 0) {
       // documents must have an _id else mongoose won't know
       // what to update later if more changes are made. the user
       // wouldn't know what _id was generated by mongodb either
@@ -140,7 +141,7 @@ Model.prototype.$__handleSave = function(options, callback) {
     }
 
     this.$__version(true, obj);
-    this.collection.insert(obj, options.safe, function(err, ret) {
+    this.collection.insert(obj, safe, function(err, ret) {
       if (err) {
         _this.isNew = true;
         _this.emit('isNew', true);
@@ -185,7 +186,7 @@ Model.prototype.$__handleSave = function(options, callback) {
         }
       }
 
-      this.collection.update(where, delta[1], options.safe, function(err, ret) {
+      this.collection.update(where, delta[1], safe, function(err, ret) {
         if (err) {
           callback(err);
           return;
@@ -956,22 +957,24 @@ function _ensureIndexes(model, options, callback) {
   };
 
   var create = function() {
-    if (model.schema.options.autoIndex === false ||
-        (model.schema.options.autoIndex == null && model.db.config.autoIndex === false)) {
-      return done();
+    if (options && options._automatic) {
+      if (model.schema.options.autoIndex === false ||
+          (model.schema.options.autoIndex == null && model.db.config.autoIndex === false)) {
+        return done();
+      }
     }
 
     var index = indexes.shift();
     if (!index) return done();
 
     var indexFields = index[0];
-    var options = index[1];
+    var indexOptions = index[1];
     _handleSafe(options);
 
     indexSingleStart(indexFields, options);
 
-    model.collection.ensureIndex(indexFields, options, utils.tick(function(err, name) {
-      indexSingleDone(err, indexFields, options, name);
+    model.collection.ensureIndex(indexFields, indexOptions, utils.tick(function(err, name) {
+      indexSingleDone(err, indexFields, indexOptions, name);
       if (err) {
         return done(err);
       }
@@ -1080,13 +1083,13 @@ Model.remove = function remove(conditions, callback) {
   }
 
   // get the mongodb collection object
-  var mq = new this.Query(conditions, {}, this, this.collection);
+  var mq = new this.Query({}, {}, this, this.collection);
 
   if (callback) {
     callback = this.$wrapCallback(callback);
   }
 
-  return mq.remove(callback);
+  return mq.remove(conditions, callback);
 };
 
 /**
@@ -3037,10 +3040,10 @@ function populate(model, docs, options, callback) {
     var subPopulate = mod.options.populate;
     var query = mod.Model.find(match, select, mod.options.options);
 
-    /* If we're doing virtual populate and projection is inclusive and foreign
-     * field is not selected, automatically select it because mongoose needs it.
-     * If projection is exclusive and client explicitly unselected the foreign
-     * field, that's the client's fault. */
+    // If we're doing virtual populate and projection is inclusive and foreign
+    // field is not selected, automatically select it because mongoose needs it.
+    // If projection is exclusive and client explicitly unselected the foreign
+    // field, that's the client's fault.
     if (mod.foreignField !== '_id' && query.selectedInclusively() &&
       !isPathSelectedInclusive(query._fields, mod.foreignField)) {
       query.select(mod.foreignField);
@@ -3184,10 +3187,14 @@ function assignVals(o) {
     }
 
     if (o.isVirtual && !o.justOne && !Array.isArray(rawIds[i])) {
-      rawIds[i] = [rawIds[i]];
+      if (rawIds[i] == null) {
+        rawIds[i] = [];
+      } else {
+        rawIds[i] = [rawIds[i]];
+      }
     }
 
-    if (o.isVirtual && docs[i].constructor.name === 'model' && docs[i].$init) {
+    if (o.isVirtual && docs[i].constructor.name === 'model') {
       // If virtual populate and doc is already init-ed, need to walk through
       // the actual doc to set rather than setting `_doc` directly
       mpath.set(o.path, rawIds[i], docs[i]);
@@ -3331,7 +3338,12 @@ function getModelsMapForPopulate(model, docs, options) {
           modelForFindSchema = utils.getValue(discriminatorKey, doc);
 
           if (modelForFindSchema) {
-            modelForCurrentDoc = model.db.model(modelForFindSchema);
+            try {
+              modelForCurrentDoc = model.db.model(modelForFindSchema);
+            } catch (error) {
+              return error;
+            }
+
             schemaForCurrentDoc = modelForCurrentDoc._getSchema(options.path);
 
             if (schemaForCurrentDoc && schemaForCurrentDoc.caster) {
@@ -3396,9 +3408,13 @@ function getModelsMapForPopulate(model, docs, options) {
       modelName = modelNames[k];
       var _doc = Array.isArray(doc) && isRefPathArray ? doc[k] : doc;
       var _ret = Array.isArray(ret) && isRefPathArray ? ret[k] : ret;
-      Model = originalModel && originalModel.modelName ?
-        originalModel :
-        model.db.model(modelName);
+      try {
+        Model = originalModel && originalModel.modelName ?
+          originalModel :
+          model.db.model(modelName);
+      } catch (error) {
+        return error;
+      }
 
       if (!available[modelName]) {
         currentOptions = {

package/lib/query.js

@@ -3,7 +3,7 @@
  */
 
 var PromiseProvider = require('./promise_provider');
-var QueryCursor = require('./querycursor');
+var QueryCursor = require('./cursor/QueryCursor');
 var QueryStream = require('./querystream');
 var cast = require('./cast');
 var castUpdate = require('./services/query/castUpdate');
@@ -186,7 +186,10 @@ Query.prototype.toConstructor = function toConstructor() {
   p.op = this.op;
   p._conditions = utils.clone(this._conditions, { retainKeyOrder: true });
   p._fields = utils.clone(this._fields);
-  p._update = utils.clone(this._update);
+  p._update = utils.clone(this._update, {
+    flattenDecimals: false,
+    retainKeyOrder: true
+  });
   p._path = this._path;
   p._distinct = this._distinct;
   p._collection = this._collection;
@@ -1591,7 +1594,7 @@ Query.prototype.sort = function(arg) {
  *     query.remove(fn) // executes
  *     query.remove()
  *
- * @param {Object|Query} [criteria] mongodb selector
+ * @param {Object|Query} [filter] mongodb selector
  * @param {Function} [callback] optional params are (error, writeOpResult)
  * @return {Query} this
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
@@ -1599,22 +1602,41 @@ Query.prototype.sort = function(arg) {
  * @api public
  */
 
-Query.prototype.remove = function(cond, callback) {
-  if (typeof cond === 'function') {
-    callback = cond;
-    cond = null;
+Query.prototype.remove = function(filter, callback) {
+  if (typeof filter === 'function') {
+    callback = filter;
+    filter = null;
   }
 
-  var cb = typeof callback === 'function';
+  filter = utils.toObject(filter, { retainKeyOrder: true });
 
   try {
-    this.cast(this.model);
+    this.cast(this.model, filter);
+    this.merge(filter);
   } catch (err) {
-    if (cb) return process.nextTick(callback.bind(null, err));
+    this._castError = err;
+  }
+
+  prepareDiscriminatorCriteria(this);
+
+  if (!callback) {
+    return Query.base.remove.call(this);
+  }
+
+  return this._remove(callback);
+};
+
+/*!
+ * ignore
+ */
+
+Query.prototype._remove = function(callback) {
+  if (this._castError) {
+    callback(this._castError);
     return this;
   }
 
-  return Query.base.remove.call(this, cond, callback);
+  return Query.base.remove.call(this, callback);
 };
 
 /**
@@ -1627,7 +1649,7 @@ Query.prototype.remove = function(cond, callback) {
  *     Character.deleteOne({ name: 'Eddard Stark' }, callback)
  *     Character.deleteOne({ name: 'Eddard Stark' }).then(next)
  *
- * @param {Object|Query} [criteria] mongodb selector
+ * @param {Object|Query} [filter] mongodb selector
  * @param {Function} [callback] optional params are (error, writeOpResult)
  * @return {Query} this
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
@@ -1635,22 +1657,41 @@ Query.prototype.remove = function(cond, callback) {
  * @api public
  */
 
-Query.prototype.deleteOne = function(cond, callback) {
-  if (typeof cond === 'function') {
-    callback = cond;
-    cond = null;
+Query.prototype.deleteOne = function(filter, callback) {
+  if (typeof filter === 'function') {
+    callback = filter;
+    filter = null;
   }
 
-  var cb = typeof callback === 'function';
+  filter = utils.toObject(filter, { retainKeyOrder: true });
 
   try {
-    this.cast(this.model);
+    this.cast(this.model, filter);
+    this.merge(filter);
   } catch (err) {
-    if (cb) return process.nextTick(callback.bind(null, err));
+    this._castError = err;
+  }
+
+  prepareDiscriminatorCriteria(this);
+
+  if (!callback) {
+    return Query.base.deleteOne.call(this);
+  }
+
+  return this._deleteOne.call(this, callback);
+};
+
+/*!
+ * ignore
+ */
+
+Query.prototype._deleteOne = function(callback) {
+  if (this._castError) {
+    callback(this._castError);
     return this;
   }
 
-  return Query.base.deleteOne.call(this, cond, callback);
+  return Query.base.deleteOne.call(this, callback);
 };
 
 /**
@@ -1663,7 +1704,7 @@ Query.prototype.deleteOne = function(cond, callback) {
  *     Character.deleteMany({ name: /Stark/, age: { $gte: 18 } }, callback)
  *     Character.deleteMany({ name: /Stark/, age: { $gte: 18 } }).then(next)
  *
- * @param {Object|Query} [criteria] mongodb selector
+ * @param {Object|Query} [filter] mongodb selector
  * @param {Function} [callback] optional params are (error, writeOpResult)
  * @return {Query} this
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
@@ -1671,22 +1712,41 @@ Query.prototype.deleteOne = function(cond, callback) {
  * @api public
  */
 
-Query.prototype.deleteMany = function(cond, callback) {
-  if (typeof cond === 'function') {
-    callback = cond;
-    cond = null;
+Query.prototype.deleteMany = function(filter, callback) {
+  if (typeof filter === 'function') {
+    callback = filter;
+    filter = null;
   }
 
-  var cb = typeof callback === 'function';
+  filter = utils.toObject(filter, { retainKeyOrder: true });
 
   try {
-    this.cast(this.model);
+    this.cast(this.model, filter);
+    this.merge(filter);
   } catch (err) {
-    if (cb) return process.nextTick(callback.bind(null, err));
+    this._castError = err;
+  }
+
+  prepareDiscriminatorCriteria(this);
+
+  if (!callback) {
+    return Query.base.deleteMany.call(this);
+  }
+
+  return this._deleteMany.call(this, callback);
+};
+
+/*!
+ * ignore
+ */
+
+Query.prototype._deleteMany = function(callback) {
+  if (this._castError) {
+    callback(this._castError);
     return this;
   }
 
-  return Query.base.deleteMany.call(this, cond, callback);
+  return Query.base.deleteMany.call(this, callback);
 };
 
 /*!

package/lib/schema/decimal128.js

@@ -104,10 +104,14 @@ Decimal128.prototype.cast = function(value, doc, init) {
     return ret;
   }
 
-  if (value === null || value === undefined) {
+  if (value == null) {
     return value;
   }
 
+  if (typeof value === 'object' && typeof value.$numberDecimal === 'string') {
+    return Decimal128Type.fromString(value.$numberDecimal);
+  }
+
   if (value instanceof Decimal128Type) {
     return value;
   }

package/lib/schema/embedded.js

@@ -83,7 +83,7 @@ function Embedded(schema, path, options) {
 
 Embedded.prototype = Object.create(SchemaType.prototype);
 
-/**
+/*!
  * Special case for when users use a common location schema to represent
  * locations for use with $geoWithin.
  * https://docs.mongodb.org/manual/reference/operator/query/geoWithin/
@@ -92,7 +92,7 @@ Embedded.prototype = Object.create(SchemaType.prototype);
  * @api private
  */
 
-Embedded.prototype.$conditionalHandlers.$geoWithin = function(val) {
+Embedded.prototype.$conditionalHandlers.$geoWithin = function handle$geoWithin(val) {
   return { $geometry: this.castForQuery(val.$geometry) };
 };
 

package/lib/schema/objectid.js

@@ -198,10 +198,15 @@ function defaultId() {
 }
 
 function resetId(v) {
-  if (v == null) {
+  Document || (Document = require('./../document'));
+
+  if (v === void 0) {
     return new oid();
   }
-  this.$__._id = null;
+
+  if (this instanceof Document) {
+    delete this.$__._id;
+  }
   return v;
 }
 

package/lib/schema.js

@@ -10,6 +10,7 @@ var MongooseTypes;
 var Kareem = require('kareem');
 var each = require('async/each');
 var SchemaType = require('./schematype');
+var mpath = require('mpath');
 
 var IS_KAREEM_HOOK = {
   count: true,
@@ -202,16 +203,6 @@ Object.defineProperty(Schema.prototype, '_defaultMiddleware', {
   enumerable: false,
   writable: false,
   value: [
-    {
-      kind: 'pre',
-      hook: 'validate',
-      isAsync: true,
-      fn: function(next, done) {
-        // Hack to ensure that we always wrap validate() in a promise
-        next();
-        done();
-      }
-    },
     {
       kind: 'pre',
       hook: 'remove',
@@ -1473,22 +1464,23 @@ Schema.prototype.virtual = function(name, options) {
     }
 
     this.pre('init', function(next, obj) {
-      if (name in obj) {
+      if (mpath.has(name, obj)) {
+        var _v = mpath.get(name, obj);
         if (!this.$$populatedVirtuals) {
           this.$$populatedVirtuals = {};
         }
 
         if (options.justOne) {
-          this.$$populatedVirtuals[name] = Array.isArray(obj[name]) ?
-            obj[name][0] :
-            obj[name];
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v[0] :
+            _v;
         } else {
-          this.$$populatedVirtuals[name] = Array.isArray(obj[name]) ?
-            obj[name] :
-            obj[name] == null ? [] : [obj[name]];
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v :
+            _v == null ? [] : [_v];
         }
 
-        delete obj[name];
+        mpath.unset(name, obj);
       }
       if (this.ownerDocument) {
         next();
@@ -1510,11 +1502,28 @@ Schema.prototype.virtual = function(name, options) {
         }
         return null;
       }).
-      set(function(v) {
+      set(function(_v) {
         if (!this.$$populatedVirtuals) {
           this.$$populatedVirtuals = {};
         }
-        this.$$populatedVirtuals[name] = v;
+
+        if (options.justOne) {
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v[0] :
+            _v;
+
+          if (typeof this.$$populatedVirtuals[name] !== 'object') {
+            this.$$populatedVirtuals[name] = null;
+          }
+        } else {
+          this.$$populatedVirtuals[name] = Array.isArray(_v) ?
+            _v :
+            _v == null ? [] : [_v];
+
+          this.$$populatedVirtuals[name] = this.$$populatedVirtuals[name].filter(function(doc) {
+            return doc && typeof doc === 'object';
+          });
+        }
       });
   }
 

package/lib/schematype.js

@@ -762,7 +762,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope) {
     if (validator instanceof RegExp) {
       validate(validator.test(value), validatorProperties);
     } else if (typeof validator === 'function') {
-      if (value === undefined && !_this.isRequired) {
+      if (value === undefined && validator !== _this.requiredValidator) {
         validate(true, validatorProperties);
         return;
       }

package/lib/services/model/applyHooks.js

@@ -86,6 +86,8 @@ function applyHooks(model, schema) {
     delete toWrap.set;
   }
 
+  toWrap.validate = toWrap.validate || { pre: [], post: [] };
+
   keys = Object.keys(toWrap);
   len = keys.length;
   for (i = 0; i < len; ++i) {

package/lib/services/query/castUpdate.js

@@ -286,6 +286,5 @@ function castUpdateVal(schema, val, op, $conditional) {
   if (/^\$/.test($conditional)) {
     return schema.castForQuery($conditional, val);
   }
-
   return schema.castForQuery(val);
 }

package/lib/services/updateValidators.js

@@ -146,7 +146,7 @@ module.exports = function(query, schema, castedDoc, options) {
       if (validationErrors.length) {
         var err = new ValidationError(null);
         for (var i = 0; i < validationErrors.length; ++i) {
-          err.errors[validationErrors[i].path] = validationErrors[i];
+          err.addError(validationErrors[i].path, validationErrors[i]);
         }
         return callback(err);
       }

package/lib/types/array.js

@@ -154,7 +154,7 @@ MongooseArray.mixin = {
         }
       }
 
-      parent.markModified(dirtyPath);
+      parent.markModified(dirtyPath, elem);
     }
 
     return this;

package/lib/types/embedded.js

@@ -196,7 +196,12 @@ EmbeddedDocument.prototype.update = function() {
  */
 
 EmbeddedDocument.prototype.inspect = function() {
-  return this.toObject({ transform: false, retainKeyOrder: true, virtuals: false });
+  return this.toObject({
+    transform: false,
+    retainKeyOrder: true,
+    virtuals: false,
+    flattenDecimals: false
+  });
 };
 
 /**

package/lib/types/subdocument.js

@@ -51,6 +51,7 @@ Subdocument.prototype.$isValid = function(path) {
   if (this.$parent) {
     return this.$parent.$isValid([this.$basePath, path].join('.'));
   }
+  return Document.prototype.$isValid.call(this, path);
 };
 
 Subdocument.prototype.markModified = function(path) {

package/lib/utils.js

@@ -289,6 +289,26 @@ exports.clone = function clone(obj, options) {
 };
 var clone = exports.clone;
 
+/*!
+ * TODO: replace with Object.assign() in 5.0
+ */
+
+exports.assign = function(target) {
+  for (var i = 1; i < arguments.length; ++i) {
+    var nextSource = arguments[i];
+
+    if (nextSource != null) {
+      for (var nextKey in nextSource) {
+        if (nextSource.hasOwnProperty(nextKey)) {
+          target[nextKey] = nextSource[nextKey];
+        }
+      }
+    }
+  }
+
+  return target;
+};
+
 /*!
  * ignore
  */
@@ -841,7 +861,10 @@ exports.mergeClone = function(to, fromObj) {
     if (typeof to[key] === 'undefined') {
       // make sure to retain key order here because of a bug handling the $each
       // operator in mongodb 2.4.4
-      to[key] = exports.clone(fromObj[key], {retainKeyOrder: 1});
+      to[key] = exports.clone(fromObj[key], {
+        retainKeyOrder: 1,
+        flattenDecimals: false
+      });
     } else {
       if (exports.isObject(fromObj[key])) {
         var obj = fromObj[key];
@@ -855,7 +878,10 @@ exports.mergeClone = function(to, fromObj) {
       } else {
         // make sure to retain key order here because of a bug handling the
         // $each operator in mongodb 2.4.4
-        to[key] = exports.clone(fromObj[key], {retainKeyOrder: 1});
+        to[key] = exports.clone(fromObj[key], {
+          retainKeyOrder: 1,
+          flattenDecimals: false
+        });
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "4.10.4",
+  "version": "4.10.8",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -24,7 +24,7 @@
     "hooks-fixed": "2.0.0",
     "kareem": "1.4.1",
     "mongodb": "2.2.27",
-    "mpath": "0.2.1",
+    "mpath": "0.3.0",
     "mpromise": "0.5.5",
     "mquery": "2.3.1",
     "ms": "2.0.0",
@@ -36,7 +36,7 @@
     "acquit": "0.4.1",
     "acquit-ignore": "0.0.3",
     "benchmark": "2.1.2",
-    "bluebird": "3.4.6",
+    "bluebird": "3.5.0",
     "co": "4.6.0",
     "dox": "0.3.1",
     "eslint": "2.4.0",