mongoose 5.5.0 → 5.5.4

package/lib/model.js

@@ -1120,14 +1120,6 @@ Model.init = function init(callback) {
     return this.$init;
   }
 
-  // If `dropDatabase()` is called, this model's collection will not be
-  // init-ed. It is sufficiently common to call `dropDatabase()` after
-  // `mongoose.connect()` but before creating models that we want to
-  // support this. See gh-6967
-  this.db.$internalEmitter.once('dropDatabase', () => {
-    delete this.$init;
-  });
-
   const Promise = PromiseProvider.get();
   const autoIndex = this.schema.options.autoIndex == null ?
     this.db.config.autoIndex :
@@ -2611,7 +2603,8 @@ Model.findByIdAndDelete = function(id, options, callback) {
  *
  * - defaults. Use the `setDefaultsOnInsert` option to override.
  *
- * @param {Object} conditions
+ * @param {Object} filter Replace the first document that matches this filter
+ * @param {Object} [replacement] Replace with this document
  * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
  * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](http://mongoosejs.com/docs/api.html#query_Query-lean).
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
@@ -2621,18 +2614,24 @@ Model.findByIdAndDelete = function(id, options, callback) {
  * @api public
  */
 
-Model.findOneAndReplace = function(conditions, options, callback) {
-  if (arguments.length === 1 && typeof conditions === 'function') {
-    const msg = 'Model.findOneAndDelete(): First argument must not be a function.\n\n'
-        + '  ' + this.modelName + '.findOneAndDelete(conditions, callback)\n'
-        + '  ' + this.modelName + '.findOneAndDelete(conditions)\n'
-        + '  ' + this.modelName + '.findOneAndDelete()\n';
+Model.findOneAndReplace = function(filter, replacement, options, callback) {
+  if (arguments.length === 1 && typeof filter === 'function') {
+    const msg = 'Model.findOneAndReplace(): First argument must not be a function.\n\n'
+        + '  ' + this.modelName + '.findOneAndReplace(conditions, callback)\n'
+        + '  ' + this.modelName + '.findOneAndReplace(conditions)\n'
+        + '  ' + this.modelName + '.findOneAndReplace()\n';
     throw new TypeError(msg);
   }
 
-  if (typeof options === 'function') {
+  if (arguments.length === 3 && typeof options === 'function') {
     callback = options;
-    options = undefined;
+    options = replacement;
+    replacement = void 0;
+  }
+  if (arguments.length === 2 && typeof replacement === 'function') {
+    callback = replacement;
+    replacement = void 0;
+    options = void 0;
   }
   if (callback) {
     callback = this.$wrapCallback(callback);
@@ -2647,7 +2646,7 @@ Model.findOneAndReplace = function(conditions, options, callback) {
   const mq = new this.Query({}, {}, this, this.collection);
   mq.select(fields);
 
-  return mq.findOneAndReplace(conditions, options, callback);
+  return mq.findOneAndReplace(filter, replacement, options, callback);
 };
 
 /**
@@ -2897,6 +2896,11 @@ Model.create = function create(doc, options, callback) {
           }
         }
 
+        // Make sure session is available in middleware
+        if (options.session != null) {
+          toSave.$session(options.session);
+        }
+
         toSave.save(options, callbackWrapper);
       });
     });
@@ -3171,7 +3175,32 @@ Model.$__insertMany = function(arr, options, callback) {
  *      console.log(res.insertedCount, res.modifiedCount, res.deletedCount);
  *     });
  *
+ * The [supported operations](https://docs.mongodb.com/manual/reference/method/db.collection.bulkWrite/#db.collection.bulkWrite) are:
+ *
+ * - `insertOne`
+ * - `updateOne`
+ * - `updateMany`
+ * - `deleteOne`
+ * - `deleteMany`
+ * - `replaceOne`
+ *
  * @param {Array} ops
+ * @param {Object} [ops.insertOne.document] The document to insert
+ * @param {Object} [opts.updateOne.filter] Update the first document that matches this filter
+ * @param {Object} [opts.updateOne.update] An object containing [update operators](https://docs.mongodb.com/manual/reference/operator/update/)
+ * @param {Boolean} [opts.updateOne.upsert=false] If true, insert a doc if none match
+ * @param {Object} [opts.updateOne.collation] The [MongoDB collation](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-34-collations) to use
+ * @param {Array} [opts.updateOne.arrayFilters] The [array filters](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-36-array-filters.html) used in `update`
+ * @param {Object} [opts.updateMany.filter] Update all the documents that match this filter
+ * @param {Object} [opts.updateMany.update] An object containing [update operators](https://docs.mongodb.com/manual/reference/operator/update/)
+ * @param {Boolean} [opts.updateMany.upsert=false] If true, insert a doc if no documents match `filter`
+ * @param {Object} [opts.updateMany.collation] The [MongoDB collation](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-34-collations) to use
+ * @param {Array} [opts.updateMany.arrayFilters] The [array filters](https://thecodebarbarian.com/a-nodejs-perspective-on-mongodb-36-array-filters.html) used in `update`
+ * @param {Object} [opts.deleteOne.filter] Delete the first document that matches this filter
+ * @param {Object} [opts.deleteMany.filter] Delete all documents that match this filter
+ * @param {Object} [opts.replaceOne.filter] Replace the first document that matches this filter
+ * @param {Object} [opts.replaceOne.replacement] The replacement document
+ * @param {Boolean} [opts.replaceOne.upsert=false] If true, insert a doc if no documents match `filter`
  * @param {Object} [options]
  * @param {Boolean} [options.ordered=true] If true, execute writes in order and stop at the first error. If false, execute writes in parallel and continue until all writes have either succeeded or errored.
  * @param {ClientSession} [options.session=null] The session associated with this bulk write. See [transactions docs](/docs/transactions.html).
@@ -3308,9 +3337,17 @@ Model.hydrate = function(obj) {
  * @param {Object} conditions
  * @param {Object} doc
  * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] params are (error, writeOpResult)
  * @param {Function} [callback]
  * @return {Query}
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
+ * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @api public
  */
 
@@ -3339,10 +3376,15 @@ Model.update = function update(conditions, doc, options, callback) {
  * @param {Object} doc
  * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
- * @param {Function} [callback]
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] `function(error, res) {}` where `res` has 3 properties: `n`, `nModified`, `ok`.
  * @return {Query}
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
+ * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @api public
  */
 
@@ -3370,10 +3412,15 @@ Model.updateMany = function updateMany(conditions, doc, options, callback) {
  * @param {Object} doc
  * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
- * @param {Function} [callback]
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] params are (error, writeOpResult)
  * @return {Query}
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
+ * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @api public
  */
 
@@ -3398,8 +3445,14 @@ Model.updateOne = function updateOne(conditions, doc, options, callback) {
  * @param {Object} doc
  * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
- * @param {Function} [callback]
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] `function(error, res) {}` where `res` has 3 properties: `n`, `nModified`, `ok`.
+ * @return {Query}
+ * @see Query docs https://mongoosejs.com/docs/queries.html
+ * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @return {Query}
  * @api public
  */
@@ -4440,8 +4493,8 @@ function convertTo_id(val) {
         val[i] = val[i]._id;
       }
     }
-    if (val.isMongooseArray && val._schema) {
-      return val._schema.cast(val, val._parent);
+    if (val.isMongooseArray && val.$schema()) {
+      return val.$schema().cast(val, val.$parent());
     }
 
     return [].concat(val);
@@ -4550,7 +4603,8 @@ Model.compile = function compile(name, schema, collectionName, connection, base)
 
   const collectionOptions = {
     bufferCommands: bufferCommands,
-    capped: schema.options.capped
+    capped: schema.options.capped,
+    Promise: model.base.Promise
   };
 
   model.prototype.collection = connection.collection(

package/lib/query.js

@@ -3118,16 +3118,17 @@ Query.prototype._findOneAndDelete = wrapThunk(function(callback) {
  *
  * ####Examples
  *
- *     A.where().findOneAndReplace(conditions, options, callback) // executes
- *     A.where().findOneAndReplace(conditions, options)  // return Query
- *     A.where().findOneAndReplace(conditions, callback) // executes
- *     A.where().findOneAndReplace(conditions) // returns Query
- *     A.where().findOneAndReplace(callback)   // executes
- *     A.where().findOneAndReplace()           // returns Query
+ *     A.where().findOneAndReplace(filter, replacement, options, callback); // executes
+ *     A.where().findOneAndReplace(filter, replacement, options); // return Query
+ *     A.where().findOneAndReplace(filter, replacement, callback); // executes
+ *     A.where().findOneAndReplace(filter); // returns Query
+ *     A.where().findOneAndReplace(callback); // executes
+ *     A.where().findOneAndReplace(); // returns Query
  *
  * @method findOneAndReplace
  * @memberOf Query
- * @param {Object} [conditions]
+ * @param {Object} [filter]
+ * @param {Object} [replacement]
  * @param {Object} [options]
  * @param {Boolean} [options.rawResult] if true, returns the [raw result from the MongoDB driver](http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#findAndModify)
  * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
@@ -3138,28 +3139,39 @@ Query.prototype._findOneAndDelete = wrapThunk(function(callback) {
  * @api public
  */
 
-Query.prototype.findOneAndReplace = function(conditions, options, callback) {
+Query.prototype.findOneAndReplace = function(filter, replacement, options, callback) {
   this.op = 'findOneAndReplace';
   this._validate();
 
   switch (arguments.length) {
-    case 2:
+    case 3:
       if (typeof options === 'function') {
         callback = options;
-        options = {};
+        options = void 0;
+      }
+      break;
+    case 2:
+      if (typeof replacement === 'function') {
+        callback = replacement;
+        replacement = void 0;
       }
       break;
     case 1:
-      if (typeof conditions === 'function') {
-        callback = conditions;
-        conditions = undefined;
-        options = undefined;
+      if (typeof filter === 'function') {
+        callback = filter;
+        filter = void 0;
+        replacement = void 0;
+        options = void 0;
       }
       break;
   }
 
-  if (mquery.canMerge(conditions)) {
-    this.merge(conditions);
+  if (mquery.canMerge(filter)) {
+    this.merge(filter);
+  }
+
+  if (replacement != null) {
+    this._mergeUpdate(replacement);
   }
 
   options && this.setOptions(options);
@@ -3419,12 +3431,7 @@ Query.prototype._findAndModify = function(type, callback) {
       if (error) {
         return callback(error);
       }
-      if (castedDoc && castedDoc.toBSON) {
-        castedDoc = castedDoc.toBSON();
-      }
-      _this._collection.findAndModify(castedQuery, castedDoc, opts, _wrapThunkCallback(_this, function(error, res) {
-        return cb(error, res ? res.value : res, res);
-      }));
+      _legacyFindAndModify.call(_this, castedQuery, castedDoc, opts, cb);
     };
 
     try {
@@ -3433,12 +3440,7 @@ Query.prototype._findAndModify = function(type, callback) {
       callback(error);
     }
   } else {
-    if (castedDoc && castedDoc.toBSON) {
-      castedDoc = castedDoc.toBSON();
-    }
-    this._collection.findAndModify(castedQuery, castedDoc, opts, _wrapThunkCallback(_this, function(error, res) {
-      return cb(error, res ? res.value : res, res);
-    }));
+    _legacyFindAndModify.call(_this, castedQuery, castedDoc, opts, cb);
   }
 
   return this;
@@ -3455,6 +3457,23 @@ function _completeOneLean(doc, res, opts, callback) {
   return callback(null, doc);
 }
 
+
+/*!
+ * ignore
+ */
+
+const _legacyFindAndModify = util.deprecate(function(filter, update, opts, cb) {
+  if (update && update.toBSON) {
+    update = update.toBSON();
+  }
+  const collection = this._collection;
+  collection.findAndModify(filter, update, opts, _wrapThunkCallback(this, function(error, res) {
+    return cb(error, res ? res.value : res, res);
+  }));
+}, 'Mongoose: `findOneAndUpdate()` and `findOneAndDelete()` without the ' +
+  '`useFindAndModify` option set to false are deprecated. See: ' +
+  'https://mongoosejs.com/docs/deprecations.html#-findandmodify-');
+
 /*!
  * Override mquery.prototype._mergeUpdate to handle mongoose objects in
  * updates.
@@ -3716,9 +3735,16 @@ Query.prototype._replaceOne = wrapThunk(function(callback) {
  * @param {Object} [doc] the update command
  * @param {Object} [options]
  * @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.
- * @param {Function} [callback] optional, params are (error, writeOpResult)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update #model_Model.update
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update http://docs.mongodb.org/manual/reference/method/db.collection.update/
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
@@ -3776,9 +3802,15 @@ Query.prototype.update = function(conditions, doc, options, callback) {
  * @param {Object} [options]
  * @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.
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
- * @param {Function} [callback] optional params are (error, writeOpResult)
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update #model_Model.update
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update http://docs.mongodb.org/manual/reference/method/db.collection.update/
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
@@ -3837,9 +3869,15 @@ Query.prototype.updateMany = function(conditions, doc, options, callback) {
  * @param {Object} [options]
  * @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.
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
  * @param {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update #model_Model.update
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update http://docs.mongodb.org/manual/reference/method/db.collection.update/
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output
@@ -3894,10 +3932,17 @@ Query.prototype.updateOne = function(conditions, doc, options, callback) {
  * @param {Object} [criteria]
  * @param {Object} [doc] the update command
  * @param {Object} [options]
+ * @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.
  * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
- * @param {Function} [callback] optional params are (error, writeOpResult)
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean} [options.upsert=false] if true, and no documents found, insert a new document
+ * @param {Object} [options.writeConcern=null] sets the [write concern](https://docs.mongodb.com/manual/reference/write-concern/) for replica sets. Overrides the [schema-level write concern](/docs/guide.html#writeConcern)
+ * @param {Boolean} [options.omitUndefined=false] If true, delete any properties whose value is `undefined` when casting an update. In other words, if this is set, Mongoose will delete `baz` from the update in `Model.updateOne({}, { foo: 'bar', baz: undefined })` before sending the update to the server.
+ * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Does nothing if schema-level timestamps are not set.
+ * @param {Function} [callback] params are (error, writeOpResult)
  * @return {Query} this
  * @see Model.update #model_Model.update
+ * @see Query docs https://mongoosejs.com/docs/queries.html
  * @see update http://docs.mongodb.org/manual/reference/method/db.collection.update/
  * @see writeOpResult http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#~WriteOpResult
  * @see MongoDB docs https://docs.mongodb.com/manual/reference/command/update/#update-command-output

package/lib/schema/array.js

@@ -146,6 +146,56 @@ SchemaArray.options = { castNonArrays: true };
 SchemaArray.prototype = Object.create(SchemaType.prototype);
 SchemaArray.prototype.constructor = SchemaArray;
 
+/*!
+ * ignore
+ */
+
+SchemaArray._checkRequired = SchemaType.prototype.checkRequired;
+
+/**
+ * Override the function the required validator uses to check whether an array
+ * passes the `required` check.
+ *
+ * ####Example:
+ *
+ *     // Require non-empty array to pass `required` check
+ *     mongoose.Schema.Types.Array.checkRequired(v => Array.isArray(v) && v.length);
+ *
+ *     const M = mongoose.model({ arr: { type: Array, required: true } });
+ *     new M({ arr: [] }).validateSync(); // `null`, validation fails!
+ *
+ * @param {Function} fn
+ * @return {Function}
+ * @function checkRequired
+ * @static
+ * @api public
+ */
+
+SchemaArray.checkRequired = SchemaType.checkRequired;
+
+/**
+ * Check if the given value satisfies the `required` validator.
+ *
+ * @param {Any} value
+ * @param {Document} doc
+ * @return {Boolean}
+ * @api public
+ */
+
+SchemaArray.prototype.checkRequired = function checkRequired(value, doc) {
+  if (SchemaType._isRef(this, value, doc, true)) {
+    return !!value;
+  }
+
+  // `require('util').inherits()` does **not** copy static properties, and
+  // plugins like mongoose-float use `inherits()` for pre-ES6.
+  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+    this.constructor.checkRequired() :
+    SchemaArray.checkRequired();
+
+  return _checkRequired(value);
+};
+
 /**
  * Adds an enum validator if this is an array of strings. Equivalent to
  * `SchemaString.prototype.enum()`

package/lib/schema/documentarray.js

@@ -13,6 +13,8 @@ const util = require('util');
 const utils = require('../utils');
 const getDiscriminatorByValue = require('../queryhelpers').getDiscriminatorByValue;
 
+const arrayParentSymbol = require('../helpers/symbols').arrayParentSymbol;
+
 let MongooseDocumentArray;
 let Subdocument;
 
@@ -207,8 +209,8 @@ DocumentArray.prototype.doValidate = function(array, fn, scope, options) {
       // If you set the array index directly, the doc might not yet be
       // a full fledged mongoose subdoc, so make it into one.
       if (!(doc instanceof Subdocument)) {
-        doc = array[i] = new _this.casterConstructor(doc, array, undefined,
-          undefined, i);
+        const Constructor = getConstructor(_this, array[i]);
+        doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
       }
 
       doc.$__validate(callback);
@@ -255,8 +257,8 @@ DocumentArray.prototype.doValidateSync = function(array, scope) {
     // If you set the array index directly, the doc might not yet be
     // a full fledged mongoose subdoc, so make it into one.
     if (!(doc instanceof Subdocument)) {
-      doc = array[i] = new this.casterConstructor(doc, array, undefined,
-        undefined, i);
+      const Constructor = getConstructor(this, array[i]);
+      doc = array[i] = new Constructor(doc, array, undefined, undefined, i);
     }
 
     const subdocValidateError = doc.validateSync();
@@ -290,15 +292,16 @@ DocumentArray.prototype.getDefault = function(scope) {
   }
 
   ret = new MongooseDocumentArray(ret, this.path, scope);
-  const _parent = ret._parent;
-  ret._parent = null;
+  const _parent = ret[arrayParentSymbol];
+  ret[arrayParentSymbol] = null;
 
   for (let i = 0; i < ret.length; ++i) {
-    ret[i] = new this.Constructor(ret[i], ret, undefined,
+    const Constructor = getConstructor(this, ret[i]);
+    ret[i] = new Constructor(ret[i], ret, undefined,
       undefined, i);
   }
 
-  ret._parent = _parent;
+  ret[arrayParentSymbol] = _parent;
 
   return ret;
 };
@@ -349,30 +352,19 @@ DocumentArray.prototype.cast = function(value, doc, init, prev, options) {
       continue;
     }
 
-    let Constructor = this.casterConstructor;
-    if (Constructor.discriminators &&
-        Constructor.schema &&
-        Constructor.schema.options &&
-        typeof value[i][Constructor.schema.options.discriminatorKey] === 'string') {
-      if (Constructor.discriminators[value[i][Constructor.schema.options.discriminatorKey]]) {
-        Constructor = Constructor.discriminators[value[i][Constructor.schema.options.discriminatorKey]];
-      } else {
-        const constructorByValue = getDiscriminatorByValue(Constructor, value[i][Constructor.schema.options.discriminatorKey]);
-        if (constructorByValue) {
-          Constructor = constructorByValue;
-        }
-      }
-    }
+    const Constructor = getConstructor(this, value[i]);
 
     // Check if the document has a different schema (re gh-3701)
     if ((value[i].$__) &&
-        value[i].schema !== Constructor.schema) {
+        !(value[i] instanceof Constructor)) {
       value[i] = value[i].toObject({ transform: false, virtuals: false });
     }
 
     if (value[i] instanceof Subdocument) {
       // Might not have the correct index yet, so ensure it does.
-      value[i].$setIndex(i);
+      if (value[i].__index == null) {
+        value[i].$setIndex(i);
+      }
     } else if (value[i] != null) {
       if (init) {
         if (doc) {
@@ -417,6 +409,30 @@ DocumentArray.prototype.cast = function(value, doc, init, prev, options) {
   return value;
 };
 
+/*!
+ * Find the correct subdoc constructor, taking into account discriminators
+ */
+
+function getConstructor(docArray, subdoc) {
+  let Constructor = docArray.casterConstructor;
+  const schema = Constructor.schema;
+  const discriminatorKey = schema.options.discriminatorKey;
+  const discriminatorValue = subdoc[discriminatorKey];
+  if (Constructor.discriminators && typeof discriminatorValue === 'string') {
+    if (Constructor.discriminators[discriminatorValue]) {
+      Constructor = Constructor.discriminators[discriminatorValue];
+    } else {
+      const constructorByValue = getDiscriminatorByValue(Constructor,
+        discriminatorValue);
+      if (constructorByValue) {
+        Constructor = constructorByValue;
+      }
+    }
+  }
+
+  return Constructor;
+}
+
 /*!
  * ignore
  */
@@ -432,12 +448,12 @@ DocumentArray.prototype.clone = function() {
  */
 
 function _clearListeners(arr) {
-  if (arr == null || arr._parent == null) {
+  if (arr == null || arr[arrayParentSymbol] == null) {
     return;
   }
 
   for (const key in arr._handlers) {
-    arr._parent.removeListener(key, arr._handlers[key]);
+    arr[arrayParentSymbol].removeListener(key, arr._handlers[key]);
   }
 }
 

package/lib/schema.js

@@ -1049,11 +1049,12 @@ Schema.prototype.setupTimestamp = function(timestamps) {
 
   _setTimestampsOnUpdate[symbols.builtInMiddleware] = true;
 
-  this.pre('findOneAndUpdate', _setTimestampsOnUpdate);
-  this.pre('replaceOne', _setTimestampsOnUpdate);
-  this.pre('update', _setTimestampsOnUpdate);
-  this.pre('updateOne', _setTimestampsOnUpdate);
-  this.pre('updateMany', _setTimestampsOnUpdate);
+  const opts = { query: true, model: false };
+  this.pre('findOneAndUpdate', opts, _setTimestampsOnUpdate);
+  this.pre('replaceOne', opts, _setTimestampsOnUpdate);
+  this.pre('update', opts, _setTimestampsOnUpdate);
+  this.pre('updateOne', opts, _setTimestampsOnUpdate);
+  this.pre('updateMany', opts, _setTimestampsOnUpdate);
 
   function _setTimestampsOnUpdate(next) {
     const now = this.model.base.now();