mongoose 6.2.2 → 6.2.5

package/lib/model.js

@@ -43,6 +43,11 @@ const immediate = require('./helpers/immediate');
 const internalToObjectOptions = require('./options').internalToObjectOptions;
 const isDefaultIdIndex = require('./helpers/indexes/isDefaultIdIndex');
 const isIndexEqual = require('./helpers/indexes/isIndexEqual');
+const {
+  getRelatedDBIndexes,
+  getRelatedSchemaIndexes
+} = require('./helpers/indexes/getRelatedIndexes');
+const decorateDiscriminatorIndexOptions = require('./helpers/indexes/decorateDiscriminatorIndexOptions');
 const isPathSelectedInclusive = require('./helpers/projection/isPathSelectedInclusive');
 const leanPopulateMap = require('./helpers/populate/leanPopulateMap');
 const modifiedPaths = require('./helpers/update/modifiedPaths');
@@ -1471,8 +1476,7 @@ Model.diffIndexes = function diffIndexes(options, callback) {
 
         for (const schemaIndex of schemaIndexes) {
           const key = schemaIndex[0];
-          const options = _decorateDiscriminatorIndexOptions(this,
-            utils.clone(schemaIndex[1]));
+          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndex[1]));
           if (isIndexEqual(key, options, index)) {
             found = true;
           }
@@ -1485,10 +1489,9 @@ Model.diffIndexes = function diffIndexes(options, callback) {
       // Iterate through the indexes created on the schema and
       // compare against the indexes in mongodb.
       for (const schemaIndex of schemaIndexes) {
-        const key = schemaIndex[0];
         let found = false;
-        const options = _decorateDiscriminatorIndexOptions(this,
-          utils.clone(schemaIndex[1]));
+        const key = schemaIndex[0];
+        const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndex[1]));
         for (const index of indexes) {
           if (isDefaultIdIndex(index)) {
             continue;
@@ -1525,32 +1528,33 @@ Model.cleanIndexes = function cleanIndexes(callback) {
   return this.db.base._promiseOrCallback(callback, cb => {
     const collection = this.$__collection;
 
-    this.listIndexes((err, indexes) => {
+    this.listIndexes((err, dbIndexes) => {
       if (err != null) {
         return cb(err);
       }
 
-      const schemaIndexes = this.schema.indexes();
+      dbIndexes = getRelatedDBIndexes(this, dbIndexes);
+      const schemaIndexes = getRelatedSchemaIndexes(this, this.schema.indexes());
+
       const toDrop = [];
 
-      for (const index of indexes) {
+      for (const dbIndex of dbIndexes) {
         let found = false;
         // Never try to drop `_id` index, MongoDB server doesn't allow it
-        if (isDefaultIdIndex(index)) {
+        if (isDefaultIdIndex(dbIndex)) {
           continue;
         }
 
-        for (const schemaIndex of schemaIndexes) {
-          const key = schemaIndex[0];
-          const options = _decorateDiscriminatorIndexOptions(this,
-            utils.clone(schemaIndex[1]));
-          if (isIndexEqual(key, options, index)) {
+        for (const [schemaIndexKeysObject, schemaIndexOptions] of schemaIndexes) {
+          const options = decorateDiscriminatorIndexOptions(this.schema, utils.clone(schemaIndexOptions));
+
+          if (isIndexEqual(schemaIndexKeysObject, options, dbIndex)) {
             found = true;
           }
         }
 
         if (!found) {
-          toDrop.push(index.name);
+          toDrop.push(dbIndex.name);
         }
       }
 
@@ -1729,7 +1733,17 @@ function _ensureIndexes(model, options, callback) {
   const baseSchema = model.schema._baseSchema;
   const baseSchemaIndexes = baseSchema ? baseSchema.indexes() : [];
 
-  const create = function() {
+  immediate(function() {
+    // If buffering is off, do this manually.
+    if (options._automatic && !model.collection.collection) {
+      model.collection.addQueue(create, []);
+    } else {
+      create();
+    }
+  });
+
+
+  function create() {
     if (options._automatic) {
       if (model.schema.options.autoIndex === false ||
           (model.schema.options.autoIndex == null && model.db.config.autoIndex === false)) {
@@ -1758,7 +1772,7 @@ function _ensureIndexes(model, options, callback) {
       }
     }
     delete indexOptions._autoIndex;
-    _decorateDiscriminatorIndexOptions(model, indexOptions);
+    decorateDiscriminatorIndexOptions(model.schema, indexOptions);
     applyWriteConcern(model.schema, indexOptions);
 
     indexSingleStart(indexFields, options);
@@ -1784,34 +1798,7 @@ function _ensureIndexes(model, options, callback) {
       }
       create();
     }));
-  };
-
-  immediate(function() {
-    // If buffering is off, do this manually.
-    if (options._automatic && !model.collection.collection) {
-      model.collection.addQueue(create, []);
-    } else {
-      create();
-    }
-  });
-}
-
-function _decorateDiscriminatorIndexOptions(model, indexOptions) {
-  // If the model is a discriminator and it has a unique index, add a
-  // partialFilterExpression by default so the unique index will only apply
-  // to that discriminator.
-  if (model.baseModelName != null &&
-    !('partialFilterExpression' in indexOptions) &&
-    !('sparse' in indexOptions)) {
-    const value = (
-      model.schema.discriminatorMapping &&
-      model.schema.discriminatorMapping.value
-    ) || model.modelName;
-    const discriminatorKey = model.schema.options.discriminatorKey;
-
-    indexOptions.partialFilterExpression = { [discriminatorKey]: value };
-  }
-  return indexOptions;
+  }
 }
 
 /**
@@ -2494,7 +2481,7 @@ Model.$where = function $where() {
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `runValidators`: if true, runs [update validators](/docs/validation.html#update-validators) on this command. Update validators validate the update operation against the model's schema.
  * - `setDefaultsOnInsert`: `true` by default. If `setDefaultsOnInsert` and `upsert` are true, mongoose will apply the [defaults](https://mongoosejs.com/docs/defaults.html) specified in the model's schema if a new document is created.
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -2630,7 +2617,7 @@ function _decorateUpdateWithVersionKey(update, options, versionKey) {
  * - `setDefaultsOnInsert`: `true` by default. If `setDefaultsOnInsert` and `upsert` are true, mongoose will apply the [defaults](https://mongoosejs.com/docs/defaults.html) specified in the model's schema if a new document is created.
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `select`: sets the document fields to return
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -2731,7 +2718,7 @@ Model.findByIdAndUpdate = function(id, update, options, callback) {
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
  * - `select`: sets the document fields to return, ex. `{ projection: { _id: 0 } }`
  * - `projection`: equivalent to `select`
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -2844,7 +2831,7 @@ Model.findByIdAndDelete = function(id, options, callback) {
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
  * - `select`: sets the document fields to return
  * - `projection`: like select, it determines which fields to return, ex. `{ projection: { _id: 0 } }`
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -2921,7 +2908,7 @@ Model.findOneAndReplace = function(filter, replacement, options, callback) {
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
  * - `select`: sets the document fields to return
  * - `projection`: like select, it determines which fields to return, ex. `{ projection: { _id: 0 } }`
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -2999,7 +2986,7 @@ Model.findOneAndRemove = function(conditions, options, callback) {
  *
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `select`: sets the document fields to return
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * - `strict`: overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict) for this update
  *
  * ####Examples:
@@ -3529,9 +3516,7 @@ function _setIsNew(doc, val) {
  *       },
  *       {
  *         deleteOne: {
- *           {
- *             filter: { name: 'Eddard Stark' }
- *           }
+ *           filter: { name: 'Eddard Stark' }
  *         }
  *       }
  *     ]).then(res => {
@@ -4406,6 +4391,7 @@ Model.validate = function validate(obj, pathsToValidate, context, callback) {
  * @param {Document|Array} docs Either a single document or array of documents to populate.
  * @param {Object|String} options Either the paths to populate or an object specifying all parameters
  * @param {string} [options.path=null] The path to populate.
+ * @param {string|PopulateOptions} [options.populate=null] Recursively populate paths in the populated documents. See [deep populate docs](/docs/populate.html#deep-populate).
  * @param {boolean} [options.retainNullValues=false] By default, Mongoose removes null and undefined values from populated arrays. Use this option to make `populate()` retain `null` and `undefined` array entries.
  * @param {boolean} [options.getters=false] If true, Mongoose will call any getters defined on the `localField`. By default, Mongoose gets the raw value of `localField`. For example, you would need to set this option to `true` if you wanted to [add a `lowercase` getter to your `localField`](/docs/schematypes.html#schematype-options).
  * @param {boolean} [options.clone=false] When you do `BlogPost.find().populate('author')`, blog posts with the same author will share 1 copy of an `author` doc. Enable this option to make Mongoose clone populated docs before assigning them.
@@ -4766,7 +4752,7 @@ function _assign(model, vals, mod, assignmentOpts) {
       }
       // flag each as result of population
       if (!lean) {
-        val.$__.wasPopulated = true;
+        val.$__.wasPopulated = val.$__.wasPopulated || true;
       }
     }
   }

package/lib/query.js

@@ -2980,7 +2980,7 @@ Query.prototype._remove = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.remove.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.remove.call(this, callback);
 });
 
 /**
@@ -3066,7 +3066,7 @@ Query.prototype._deleteOne = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.deleteOne.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.deleteOne.call(this, callback);
 });
 
 /**
@@ -3152,7 +3152,7 @@ Query.prototype._deleteMany = wrapThunk(function(callback) {
 
   callback = _wrapThunkCallback(this, callback);
 
-  return Query.base.deleteMany.call(this, helpers.handleDeleteWriteOpResult(callback));
+  return Query.base.deleteMany.call(this, callback);
 });
 
 /*!
@@ -3244,7 +3244,7 @@ function prepareDiscriminatorCriteria(query) {
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
  * - `runValidators`: if true, runs [update validators](/docs/validation.html#update-validators) on this command. Update validators validate the update operation against the model's schema.
  * - `setDefaultsOnInsert`: `true` by default. If `setDefaultsOnInsert` and `upsert` are true, mongoose will apply the [defaults](https://mongoosejs.com/docs/defaults.html) specified in the model's schema if a new document is created.
- * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  *
  * ####Callback Signature
  *     function(error, doc) {
@@ -3269,7 +3269,7 @@ function prepareDiscriminatorCriteria(query) {
  * @param {Object|Query} [filter]
  * @param {Object} [doc]
  * @param {Object} [options]
- * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](/docs/transactions.html).
  * @param {Boolean} [options.multipleCastError] by default, mongoose only returns the first error that occurred in casting the query. Turn on this option to aggregate all the cast errors.
@@ -3386,7 +3386,7 @@ Query.prototype._findOneAndUpdate = wrapThunk(function(callback) {
  *
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
- * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  *
  * ####Callback Signature
  *     function(error, doc) {
@@ -3408,7 +3408,7 @@ Query.prototype._findOneAndUpdate = wrapThunk(function(callback) {
  * @instance
  * @param {Object} [conditions]
  * @param {Object} [options]
- * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](/docs/transactions.html).
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {Function} [callback] optional params are (error, document)
@@ -3473,7 +3473,7 @@ Query.prototype.findOneAndRemove = function(conditions, options, callback) {
  *
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
- * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  *
  * ####Callback Signature
  *     function(error, doc) {
@@ -3494,7 +3494,7 @@ Query.prototype.findOneAndRemove = function(conditions, options, callback) {
  * @memberOf Query
  * @param {Object} [conditions]
  * @param {Object} [options]
- * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](/docs/transactions.html).
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {Function} [callback] optional params are (error, document)
@@ -3592,7 +3592,7 @@ Query.prototype._findOneAndDelete = wrapThunk(function(callback) {
  *
  * - `sort`: if multiple docs are found by the conditions, sets the sort order to choose which doc to update
  * - `maxTimeMS`: puts a time limit on the query - requires mongodb >= 2.6.0
- * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * - `rawResult`: if true, resolves to the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  *
  * ####Callback Signature
  *     function(error, doc) {
@@ -3614,7 +3614,7 @@ Query.prototype._findOneAndDelete = wrapThunk(function(callback) {
  * @param {Object} [filter]
  * @param {Object} [replacement]
  * @param {Object} [options]
- * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
+ * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.3/interfaces/ModifyResult.html)
  * @param {ClientSession} [options.session=null] The session associated with this query. See [transactions docs](/docs/transactions.html).
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {Boolean} [options.new=false] By default, `findOneAndUpdate()` returns the document as it was **before** `update` was applied. If you set `new: true`, `findOneAndUpdate()` will instead give you the object after `update` was applied.

package/lib/queryhelpers.js

@@ -308,23 +308,3 @@ function makeLean(val) {
     option.options.lean = val;
   };
 }
-
-/*!
- * Handle the `WriteOpResult` from the server
- */
-
-exports.handleDeleteWriteOpResult = function handleDeleteWriteOpResult(callback) {
-  return function _handleDeleteWriteOpResult(error, res) {
-    if (error) {
-      return callback(error);
-    }
-    const mongooseResult = Object.assign({}, res.result);
-    if ((res && res.result && res.result.n || null) != null) {
-      mongooseResult.deletedCount = res.result.n;
-    }
-    if (res.deletedCount != null) {
-      mongooseResult.deletedCount = res.deletedCount;
-    }
-    return callback(null, mongooseResult);
-  };
-};

package/lib/schema/SubdocumentPath.js

@@ -239,7 +239,7 @@ SubdocumentPath.prototype.doValidate = function(value, fn, scope, options) {
   const Constructor = getConstructor(this.caster, value);
 
   if (value && !(value instanceof Constructor)) {
-    value = new Constructor(value, null, scope);
+    value = new Constructor(value, null, (scope != null && scope.$__ != null) ? scope : null);
   }
 
   if (options && options.skipSchemaValidators) {

package/lib/schema/array.js

@@ -646,6 +646,7 @@ handle.$gte =
 handle.$lt =
 handle.$lte =
 handle.$ne =
+handle.$not =
 handle.$regex = SchemaArray.prototype.castForQuery;
 
 // `$in` is special because you can also include an empty array in the query

package/lib/schema/documentarray.js

@@ -365,6 +365,9 @@ DocumentArrayPath.prototype.getDefault = function(scope) {
   return ret;
 };
 
+const _toObjectOptions = Object.freeze({ transform: false, virtuals: false });
+const initDocumentOptions = Object.freeze({ skipId: true, willInit: true });
+
 /**
  * Casts contents
  *
@@ -384,7 +387,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
 
   let selected;
   let subdoc;
-  const _opts = { transform: false, virtuals: false };
+
   options = options || {};
 
   if (!Array.isArray(value)) {
@@ -414,9 +417,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   }
 
   const rawArray = utils.isMongooseDocumentArray(value) ? value.__array : value;
-
   const len = rawArray.length;
-  const initDocumentOptions = { skipId: true, willInit: true };
 
   for (let i = 0; i < len; ++i) {
     if (!rawArray[i]) {
@@ -464,7 +465,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
           subdoc = prev.id(rawArray[i]._id);
         }
 
-        if (prev && subdoc && utils.deepEqual(subdoc.toObject(_opts), rawArray[i])) {
+        if (prev && subdoc && utils.deepEqual(subdoc.toObject(_toObjectOptions), rawArray[i])) {
           // handle resetting doc with existing id and same data
           subdoc.set(rawArray[i]);
           // if set() is hooked it will have no return value

package/lib/schema.js

@@ -1019,6 +1019,10 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         ? cast[options.typeKey]
         : cast;
 
+      if (Array.isArray(type)) {
+        return new MongooseTypes.Array(path, this.interpretAsType(path, type, options), obj);
+      }
+
       name = typeof type === 'string'
         ? type
         : type.schemaName || utils.getFunctionName(type);

package/lib/schematype.js

@@ -10,6 +10,7 @@ const $exists = require('./schema/operators/exists');
 const $type = require('./schema/operators/type');
 const handleImmutable = require('./helpers/schematype/handleImmutable');
 const isAsyncFunction = require('./helpers/isAsyncFunction');
+const isSimpleValidator = require('./helpers/isSimpleValidator');
 const immediate = require('./helpers/immediate');
 const schemaTypeSymbol = require('./helpers/symbols').schemaTypeSymbol;
 const utils = require('./utils');
@@ -886,7 +887,7 @@ SchemaType.prototype.validate = function(obj, message, type) {
       properties = { validator: obj, message: message };
       properties.type = type || 'user defined';
     } else if (message instanceof Object && !type) {
-      properties = utils.clone(message);
+      properties = isSimpleValidator(message) ? Object.assign({}, message) : utils.clone(message);
       if (!properties.message) {
         properties.message = properties.msg;
       }
@@ -914,8 +915,8 @@ SchemaType.prototype.validate = function(obj, message, type) {
     arg = arguments[i];
     if (!utils.isPOJO(arg)) {
       const msg = 'Invalid validator. Received (' + typeof arg + ') '
-          + arg
-          + '. See https://mongoosejs.com/docs/api.html#schematype_SchemaType-validate';
+        + arg
+        + '. See https://mongoosejs.com/docs/api.html#schematype_SchemaType-validate';
 
       throw new Error(msg);
     }
@@ -1242,7 +1243,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
 
   // Avoid non-object `validators`
   const validators = this.validators.
-    filter(v => v != null && typeof v === 'object');
+    filter(v => typeof v === 'object' && v !== null);
 
   let count = validators.length;
 
@@ -1250,31 +1251,31 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
     return fn(null);
   }
 
-  const _this = this;
-  validators.forEach(function(v) {
+  for (let i = 0, len = validators.length; i < len; ++i) {
     if (err) {
-      return;
+      break;
     }
 
+    const v = validators[i];
     const validator = v.validator;
     let ok;
 
-    const validatorProperties = utils.clone(v);
+    const validatorProperties = isSimpleValidator(v) ? Object.assign({}, v) : utils.clone(v);
     validatorProperties.path = options && options.path ? options.path : path;
     validatorProperties.value = value;
 
     if (validator instanceof RegExp) {
       validate(validator.test(value), validatorProperties);
-      return;
+      continue;
     }
 
     if (typeof validator !== 'function') {
-      return;
+      continue;
     }
 
-    if (value === undefined && validator !== _this.requiredValidator) {
+    if (value === undefined && validator !== this.requiredValidator) {
       validate(true, validatorProperties);
-      return;
+      continue;
     }
 
     try {
@@ -1303,8 +1304,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
     } else {
       validate(ok, validatorProperties);
     }
-
-  });
+  }
 
   function validate(ok, validatorProperties) {
     if (err) {
@@ -1374,12 +1374,12 @@ SchemaType.prototype.doValidateSync = function(value, scope, options) {
 
     const v = validators[i];
 
-    if (v == null || typeof v !== 'object') {
+    if (v === null || typeof v !== 'object') {
       continue;
     }
 
     const validator = v.validator;
-    const validatorProperties = utils.clone(v);
+    const validatorProperties = isSimpleValidator(v) ? Object.assign({}, v) : utils.clone(v);
     validatorProperties.path = options && options.path ? options.path : path;
     validatorProperties.value = value;
     let ok = false;
@@ -1454,8 +1454,8 @@ SchemaType._isRef = function(self, value, doc, init) {
       return true;
     }
     if (!Buffer.isBuffer(value) && // buffers are objects too
-        value._bsontype !== 'Binary' // raw binary value from the db
-        && utils.isObject(value) // might have deselected _id in population query
+      value._bsontype !== 'Binary' // raw binary value from the db
+      && utils.isObject(value) // might have deselected _id in population query
     ) {
       return true;
     }
@@ -1476,7 +1476,7 @@ SchemaType.prototype._castRef = function _castRef(value, doc, init) {
   }
 
   if (value.$__ != null) {
-    value.$__.wasPopulated = true;
+    value.$__.wasPopulated = value.$__.wasPopulated || true;
     return value;
   }
 
@@ -1496,10 +1496,10 @@ SchemaType.prototype._castRef = function _castRef(value, doc, init) {
   const pop = owner.$populated(path, true);
   let ret = value;
   if (!doc.$__.populated ||
-      !doc.$__.populated[path] ||
-      !doc.$__.populated[path].options ||
-      !doc.$__.populated[path].options.options ||
-      !doc.$__.populated[path].options.options.lean) {
+    !doc.$__.populated[path] ||
+    !doc.$__.populated[path].options ||
+    !doc.$__.populated[path].options.options ||
+    !doc.$__.populated[path].options.options.lean) {
     ret = new pop.options[populateModelSymbol](value);
     ret.$__.wasPopulated = true;
   }

package/lib/types/ArraySubdocument.js

@@ -31,7 +31,7 @@ function ArraySubdocument(obj, parentArr, skipId, fields, index) {
   this.$setIndex(index);
   this.$__parent = this[documentArrayParent];
 
-  Subdocument.call(this, obj, fields, this[documentArrayParent], void 0, { isNew: true });
+  Subdocument.call(this, obj, fields, this[documentArrayParent], skipId, { isNew: true });
 }
 
 /*!

package/lib/types/map.js

@@ -82,7 +82,7 @@ class MongooseMap extends Map {
       if (value.$__ == null) {
         value = new populated.options[populateModelSymbol](value);
       }
-      value.$__.wasPopulated = true;
+      value.$__.wasPopulated = { value: populated.value };
     } else {
       try {
         value = this.$__schemaType.

package/lib/utils.js

@@ -70,7 +70,7 @@ exports.deepEqual = function deepEqual(a, b) {
     return true;
   }
 
-  if (typeof a !== 'object' && typeof b !== 'object') {
+  if (typeof a !== 'object' || typeof b !== 'object') {
     return a === b;
   }
 
@@ -102,7 +102,10 @@ exports.deepEqual = function deepEqual(a, b) {
     return false;
   }
 
-  if (a instanceof Map && b instanceof Map) {
+  if (a instanceof Map || b instanceof Map) {
+    if (!(a instanceof Map) || !(b instanceof Map)) {
+      return false;
+    }
     return deepEqual(Array.from(a.keys()), Array.from(b.keys())) &&
       deepEqual(Array.from(a.values()), Array.from(b.values()));
   }
@@ -116,7 +119,10 @@ exports.deepEqual = function deepEqual(a, b) {
     return exports.buffer.areEqual(a, b);
   }
 
-  if (Array.isArray(a) && Array.isArray(b)) {
+  if (Array.isArray(a) || Array.isArray(b)) {
+    if (!Array.isArray(a) || !Array.isArray(b)) {
+      return false;
+    }
     const len = a.length;
     if (len !== b.length) {
       return false;