mongoose 4.12.2 → 4.12.6

package/.travis.yml

@@ -18,3 +18,5 @@ script:
   - npm test
   - npm run lint
   - npm run nsp
+notifications:
+  email: false

package/History.md

@@ -1,4 +1,36 @@
-4.12.2 / 2017-10-13
+4.12.6 / 2017-11-01
+===================
+ * fix(schema): make clone() copy query helpers correctly #5752
+ * fix: undeprecate `ensureIndex()` and use it by default #3280
+
+4.12.5 / 2017-10-29
+===================
+ * fix(query): correctly handle `$in` and required for $pull and update validators #5744
+ * feat(aggegate): add $addFields pipeline operator #5740 [AyushG3112](https://github.com/AyushG3112)
+ * fix(document): catch sync errors in document pre hooks and report as error #5738
+ * fix(populate): handle slice projections correctly when automatically selecting populated fields #5737
+ * fix(discriminator): fix hooks for embedded discriminators #5706 [wlingke](https://github.com/wlingke)
+ * fix(model): throw sane error when customer calls `mongoose.Model()` over `mongoose.model()` #2005
+
+4.12.4 / 2017-10-21
+===================
+ * test(plugins): add coverage for idGetter with id as a schema property #5713 [wlingke](https://github.com/wlingke)
+ * fix(model): avoid copying recursive $$context object when creating discriminator after querying #5721
+ * fix(connection): ensure connection promise helpers are removed before emitting 'connected' #5714
+ * docs(schema): add notes about runSettersOnQuery to schema setters #5705
+ * fix(collection): ensure queued operations run on the next tick #5562
+
+4.12.3 / 2017-10-16
+===================
+ * fix(connection): emit 'reconnect' event as well as 'reconnected' for consistency with driver #5719
+ * fix: correctly bubble up left/joined events for replica set #5718
+ * fix(connection): allow passing in `autoIndex` as top-level option rather than requiring `config.autoIndex` #5711
+ * docs(connection): improve docs regarding reconnectTries, autoReconnect, and bufferMaxEntries #5711
+ * fix(query): handle null with addToSet/push/pull/pullAll update validators #5710
+ * fix(model): handle setDefaultsOnInsert option for bulkWrite updateOne and updateMany #5708
+ * fix(query): avoid infinite recursion edge case when cloning a buffer #5702
+
+4.12.2 / 2017-10-14
 ===================
  * docs(faq): add FAQ about using arrow functions for getters/setters, virtuals, and methods #5700
  * docs(schema): document the childSchemas property and add to public API #5695

package/lib/collection.js

@@ -80,7 +80,10 @@ Collection.prototype.conn;
 
 Collection.prototype.onOpen = function() {
   this.buffer = false;
-  this.doQueue();
+  var _this = this;
+  setImmediate(function() {
+    _this.doQueue();
+  });
 };
 
 /**

package/lib/connection.js

@@ -763,9 +763,13 @@ Connection.prototype.openUri = function(uri, options, callback) {
   if (options) {
     options = utils.clone(options, { retainKeyOrder: true });
     delete options.useMongoClient;
-    if (options.config && options.config.autoIndex != null) {
-      this.config.autoIndex = options.config.autoIndex !== false;
+    var autoIndex = options.config && options.config.autoIndex != null ?
+      options.config.autoIndex :
+      options.autoIndex;
+    if (autoIndex != null) {
+      this.config.autoIndex = autoIndex !== false;
       delete options.config;
+      delete options.autoIndex;
     }
 
     // Backwards compat
@@ -795,6 +799,7 @@ Connection.prototype.openUri = function(uri, options, callback) {
       // Backwards compat for mongoose 4.x
       db.on('reconnect', function() {
         _this.readyState = STATES.connected;
+        _this.emit('reconnect');
         _this.emit('reconnected');
       });
       db.s.topology.on('reconnectFailed', function() {
@@ -808,6 +813,9 @@ Connection.prototype.openUri = function(uri, options, callback) {
         _this.emit('timeout');
       });
 
+      delete _this.then;
+      delete _this.catch;
+
       _this.db = db;
       _this.readyState = STATES.connected;
 
@@ -818,8 +826,6 @@ Connection.prototype.openUri = function(uri, options, callback) {
       }
 
       callback && callback(null, _this);
-      delete _this.then;
-      delete _this.catch;
       resolve(_this);
       _this.emit('open');
     });

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

@@ -4,7 +4,6 @@
 
 var MongooseCollection = require('../../collection');
 var Collection = require('mongodb').Collection;
-var util = require('util');
 var utils = require('../../utils');
 
 /**
@@ -156,13 +155,6 @@ for (var i in Collection.prototype) {
   iter(i);
 }
 
-/*!
- * ignore
- */
-
-Collection.prototype.ensureIndex = util.deprecate(Collection.prototype.ensureIndex,
-  '`ensureIndex()` is deprecated in Mongoose >= 4.12.0, use `createIndex()` instead');
-
 /**
  * Debug print helper
  *

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

@@ -162,6 +162,7 @@ function listen(conn) {
   });
   conn.db.on('reconnect', function() {
     conn.readyState = STATES.connected;
+    conn.emit('reconnect');
     conn.emit('reconnected');
     conn.onOpen();
   });
@@ -171,6 +172,7 @@ function listen(conn) {
   conn.db.on('open', function(err, db) {
     if (STATES.disconnected === conn.readyState && db && db.databaseName) {
       conn.readyState = STATES.connected;
+      conn.emit('reconnect');
       conn.emit('reconnected');
     }
   });
@@ -204,6 +206,14 @@ NativeConnection.prototype.doOpenSet = function(fn) {
     : new ReplSetServers(servers, this.options.replset || this.options.replSet);
   this.db = new Db(this.name, server, this.options.db);
 
+  this.db.s.topology.on('left', function(data) {
+    _this.emit('left', data);
+  });
+
+  this.db.s.topology.on('joined', function(data) {
+    _this.emit('joined', data);
+  });
+
   this.db.on('fullsetup', function() {
     _this.emit('fullsetup');
   });

package/lib/error/browserMissingSchema.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /*!
  * MissingSchema Error constructor.

package/lib/error/cast.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 var util = require('util');
 
 /**

package/lib/error/disconnected.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Casting Error constructor.

package/lib/error/divergentArray.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /*!
  * DivergentArrayError constructor.

package/lib/{error.js → error/index.js}

@@ -37,7 +37,7 @@ module.exports = exports = MongooseError;
  * @api public
  */
 
-MongooseError.messages = require('./error/messages');
+MongooseError.messages = require('./messages');
 
 // backward compat
 MongooseError.Messages = MongooseError.messages;
@@ -51,16 +51,16 @@ MongooseError.Messages = MongooseError.messages;
  * @api public
  */
 
-MongooseError.DocumentNotFoundError = require('./error/notFound');
+MongooseError.DocumentNotFoundError = require('./notFound');
 
 /*!
  * Expose subclasses
  */
 
-MongooseError.CastError = require('./error/cast');
-MongooseError.ValidationError = require('./error/validation');
-MongooseError.ValidatorError = require('./error/validator');
-MongooseError.VersionError = require('./error/version');
-MongooseError.OverwriteModelError = require('./error/overwriteModel');
-MongooseError.MissingSchemaError = require('./error/missingSchema');
-MongooseError.DivergentArrayError = require('./error/divergentArray');
+MongooseError.CastError = require('./cast');
+MongooseError.ValidationError = require('./validation');
+MongooseError.ValidatorError = require('./validator');
+MongooseError.VersionError = require('./version');
+MongooseError.OverwriteModelError = require('./overwriteModel');
+MongooseError.MissingSchemaError = require('./missingSchema');
+MongooseError.DivergentArrayError = require('./divergentArray');

package/lib/error/missingSchema.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /*!
  * MissingSchema Error constructor.

package/lib/error/notFound.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 var util = require('util');
 
 /*!

package/lib/error/objectExpected.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Strict mode error constructor

package/lib/error/objectParameter.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Constructor for errors that happen when a parameter that's expected to be

package/lib/error/overwriteModel.js

@@ -3,7 +3,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /*!
  * OverwriteModel Error constructor.

package/lib/error/strict.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Strict mode error constructor

package/lib/error/validation.js

@@ -2,7 +2,7 @@
  * Module requirements
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 var utils = require('../utils');
 
 /**

package/lib/error/validator.js

@@ -2,7 +2,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Schema validator error

package/lib/error/version.js

@@ -4,7 +4,7 @@
  * Module dependencies.
  */
 
-var MongooseError = require('../error.js');
+var MongooseError = require('./');
 
 /**
  * Version Error constructor.

package/lib/model.js

@@ -23,6 +23,7 @@ var isPathSelectedInclusive = require('./services/projection/isPathSelectedInclu
 var mpath = require('mpath');
 var parallel = require('async/parallel');
 var parallelLimit = require('async/parallelLimit');
+var setDefaultsOnInsert = require('./services/setDefaultsOnInsert');
 var util = require('util');
 var utils = require('./utils');
 
@@ -45,6 +46,11 @@ var VERSION_WHERE = 1,
  */
 
 function Model(doc, fields, skipId) {
+  if (fields instanceof Schema) {
+    throw new TypeError('2nd argument to `Model` must be a POJO or string, ' +
+      '**not** a schema. Make sure you\'re calling `mongoose.model()`, not ' +
+      '`mongoose.Model()`.');
+  }
   Document.call(this, doc, fields, skipId, true);
 }
 
@@ -929,7 +935,7 @@ Model.init = function init(callback) {
  *
  * ####Example:
  *
- *     Event.createIndexes(function (err) {
+ *     Event.ensureIndexes(function (err) {
  *       if (err) return handleError(err);
  *     });
  *
@@ -952,14 +958,14 @@ Model.init = function init(callback) {
  * @api public
  */
 
-Model.createIndexes = Model.ensureIndexes = function createIndexes(options, callback) {
+Model.ensureIndexes = function ensureIndexes(options, callback) {
   if (typeof options === 'function') {
     callback = options;
     options = null;
   }
 
   if (options && options.__noPromise) {
-    _createIndexes(this, options, callback);
+    _ensureIndexes(this, options, callback);
     return;
   }
 
@@ -970,7 +976,7 @@ Model.createIndexes = Model.ensureIndexes = function createIndexes(options, call
   var _this = this;
   var Promise = PromiseProvider.get();
   return new Promise.ES6(function(resolve, reject) {
-    _createIndexes(_this, options || {}, function(error) {
+    _ensureIndexes(_this, options || {}, function(error) {
       if (error) {
         callback && callback(error);
         reject(error);
@@ -981,8 +987,31 @@ Model.createIndexes = Model.ensureIndexes = function createIndexes(options, call
   });
 };
 
-function _createIndexes(model, options, callback) {
+/**
+ * Similar to `ensureIndexes()`, except for it uses the [`createIndex`](http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#createIndex)
+ * function. The `ensureIndex()` function checks to see if an index with that
+ * name already exists, and, if not, does not attempt to create the index.
+ * `createIndex()` bypasses this check.
+ *
+ * @param {Object} [options] internal options
+ * @param {Function} [cb] optional callback
+ * @return {Promise}
+ * @api public
+ */
+
+Model.createIndexes = function createIndexes(options, callback) {
+  if (typeof options === 'function') {
+    callback = options;
+    options = {};
+  }
+  options = options || {};
+  options.createIndex = true;
+  return this.ensureIndexes(options, callback);
+};
+
+function _ensureIndexes(model, options, callback) {
   var indexes = model.schema.indexes();
+  options = options || {};
 
   var done = function(err) {
     if (err && model.schema.options.emitIndexErrors) {
@@ -1009,7 +1038,7 @@ function _createIndexes(model, options, callback) {
   };
 
   var create = function() {
-    if (options && options._automatic) {
+    if (options._automatic) {
       if (model.schema.options.autoIndex === false ||
           (model.schema.options.autoIndex == null && model.db.config.autoIndex === false)) {
         return done();
@@ -1024,7 +1053,8 @@ function _createIndexes(model, options, callback) {
     _handleSafe(options);
 
     indexSingleStart(indexFields, options);
-    model.collection.createIndex(indexFields, indexOptions, utils.tick(function(err, name) {
+    var methodName = options.createIndex ? 'createIndex' : 'ensureIndex';
+    model.collection[methodName](indexFields, indexOptions, utils.tick(function(err, name) {
       indexSingleDone(err, indexFields, indexOptions, name);
       if (err) {
         return done(err);
@@ -2239,12 +2269,18 @@ Model.bulkWrite = function(ops, options, callback) {
         });
       };
     } else if (op['updateOne']) {
+      op = op['updateOne'];
       return function(callback) {
         try {
-          op['updateOne']['filter'] = cast(_this.schema,
-            op['updateOne']['filter']);
-          op['updateOne']['update'] = castUpdate(_this.schema,
-            op['updateOne']['update'], _this.schema.options.strict);
+          op['filter'] = cast(_this.schema, op['filter']);
+          op['update'] = castUpdate(_this.schema, op['update'],
+            _this.schema.options.strict);
+          if (op.setDefaultsOnInsert) {
+            setDefaultsOnInsert(op['filter'], _this.schema, op['update'], {
+              setDefaultsOnInsert: true,
+              upsert: op.upsert
+            });
+          }
         } catch (error) {
           return callback(error);
         }
@@ -2252,14 +2288,20 @@ Model.bulkWrite = function(ops, options, callback) {
         callback(null);
       };
     } else if (op['updateMany']) {
+      op = op['updateMany'];
       return function(callback) {
         try {
-          op['updateMany']['filter'] = cast(_this.schema,
-            op['updateMany']['filter']);
-          op['updateMany']['update'] = castUpdate(_this.schema, op['updateMany']['update'], {
+          op['filter'] = cast(_this.schema, op['filter']);
+          op['update'] = castUpdate(_this.schema, op['update'], {
             strict: _this.schema.options.strict,
             overwrite: false
           });
+          if (op.setDefaultsOnInsert) {
+            setDefaultsOnInsert(op['filter'], _this.schema, op['update'], {
+              setDefaultsOnInsert: true,
+              upsert: op.upsert
+            });
+          }
         } catch (error) {
           return callback(error);
         }

package/lib/query.js

@@ -15,6 +15,7 @@ var mquery = require('mquery');
 var readPref = require('./drivers').ReadPreference;
 var selectPopulatedFields = require('./services/query/selectPopulatedFields');
 var setDefaultsOnInsert = require('./services/setDefaultsOnInsert');
+var slice = require('sliced');
 var updateValidators = require('./services/updateValidators');
 var util = require('util');
 var utils = require('./utils');
@@ -263,6 +264,49 @@ Query.prototype.toConstructor = function toConstructor() {
  * @api public
  */
 
+Query.prototype.slice = function() {
+  if (arguments.length === 0) {
+    return this;
+  }
+
+  this._validate('slice');
+
+  var path;
+  var val;
+
+  if (arguments.length === 1) {
+    var arg = arguments[0];
+    if (typeof arg === 'object' && !Array.isArray(arg)) {
+      var keys = Object.keys(arg);
+      var numKeys = keys.length;
+      for (var i = 0; i < numKeys; ++i) {
+        this.slice(keys[i], arg[keys[i]]);
+      }
+      return this;
+    }
+    this._ensurePath('slice');
+    path = this._path;
+    val = arguments[0];
+  } else if (arguments.length === 2) {
+    if ('number' === typeof arguments[0]) {
+      this._ensurePath('slice');
+      path = this._path;
+      val = slice(arguments);
+    } else {
+      path = arguments[0];
+      val = arguments[1];
+    }
+  } else if (arguments.length === 3) {
+    path = arguments[0];
+    val = slice(arguments, 1);
+  }
+
+  var p = {};
+  p[path] = { $slice: val };
+  return this.select(p);
+};
+
+
 /**
  * Specifies the complementary comparison value for paths specified with `where()`
  *
@@ -2227,7 +2271,7 @@ Query.prototype._findAndModify = function(type, callback) {
       };
     } else {
       castedDoc = castDoc(this, opts.overwrite);
-      castedDoc = setDefaultsOnInsert(this, schema, castedDoc, opts);
+      castedDoc = setDefaultsOnInsert(this._conditions, schema, castedDoc, opts);
       if (!castedDoc) {
         if (opts.upsert) {
           // still need to do the upsert to empty doc
@@ -2939,7 +2983,7 @@ function _update(query, op, conditions, doc, options, callback) {
     }
   }
 
-  castedDoc = setDefaultsOnInsert(query, query.schema, castedDoc, options);
+  castedDoc = setDefaultsOnInsert(query._conditions, query.schema, castedDoc, options);
   if (!castedDoc) {
     // Make sure promises know that this is still an update, see gh-2796
     query.op = op;

package/lib/schema/documentarray.js

@@ -11,6 +11,7 @@ var EventEmitter = require('events').EventEmitter;
 var MongooseDocumentArray = require('../types/documentarray');
 var SchemaType = require('../schematype');
 var Subdocument = require('../types/embedded');
+var applyHooks = require('../services/model/applyHooks');
 var discriminator = require('../services/model/discriminator');
 var util = require('util');
 var utils = require('../utils');
@@ -119,6 +120,8 @@ DocumentArray.prototype.discriminator = function(name, schema) {
 
   this.casterConstructor.discriminators[name] = EmbeddedDocument;
 
+  applyHooks(EmbeddedDocument, schema);
+
   return this.casterConstructor.discriminators[name];
 };
 

package/lib/schema/embedded.js

@@ -8,6 +8,7 @@ var $exists = require('./operators/exists');
 var EventEmitter = require('events').EventEmitter;
 var SchemaType = require('../schematype');
 var Subdocument = require('../types/subdocument');
+var applyHooks = require('../services/model/applyHooks');
 var castToNumber = require('./operators/helpers').castToNumber;
 var discriminator = require('../services/model/discriminator');
 var geospatial = require('./operators/geospatial');
@@ -253,5 +254,8 @@ Embedded.prototype.discriminator = function(name, schema) {
   discriminator(this.caster, name, schema);
 
   this.caster.discriminators[name] = _createConstructor(schema);
+
+  applyHooks(this.caster.discriminators[name], schema);
+
   return this.caster.discriminators[name];
 };

package/lib/schema/objectid.js

@@ -20,7 +20,7 @@ var SchemaType = require('../schematype'),
  */
 
 function ObjectId(key, options) {
-  var isKeyHexStr = typeof key === 'string' && /^a-f0-9$/i.test(key);
+  var isKeyHexStr = typeof key === 'string' && key.length === 24 && /^a-f0-9$/i.test(key);
   var suppressWarning = options && options.suppressWarning;
   if ((isKeyHexStr || typeof key === 'undefined') && !suppressWarning) {
     console.warn('mongoose: To create a new ObjectId please try ' +

package/lib/schema/string.js

@@ -116,7 +116,7 @@ SchemaString.prototype.enum = function() {
 };
 
 /**
- * Adds a lowercase setter.
+ * Adds a lowercase [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * ####Example:
  *
@@ -125,6 +125,12 @@ SchemaString.prototype.enum = function() {
  *     var m = new M({ email: 'SomeEmail@example.COM' });
  *     console.log(m.email) // someemail@example.com
  *
+ * NOTE: Setters do not run on queries by default. Use the `runSettersOnQuery` option:
+ *
+ *      // Must use `runSettersOnQuery` as shown below, otherwise `email` will
+ *      // **not** be lowercased.
+ *      M.updateOne({}, { $set: { email: 'SomeEmail@example.COM' } }, { runSettersOnQuery: true });
+ *
  * @api public
  * @return {SchemaType} this
  */
@@ -145,7 +151,7 @@ SchemaString.prototype.lowercase = function(shouldApply) {
 };
 
 /**
- * Adds an uppercase setter.
+ * Adds an uppercase [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * ####Example:
  *
@@ -154,6 +160,12 @@ SchemaString.prototype.lowercase = function(shouldApply) {
  *     var m = new M({ caps: 'an example' });
  *     console.log(m.caps) // AN EXAMPLE
  *
+ * NOTE: Setters do not run on queries by default. Use the `runSettersOnQuery` option:
+ *
+ *      // Must use `runSettersOnQuery` as shown below, otherwise `email` will
+ *      // **not** be lowercased.
+ *      M.updateOne({}, { $set: { email: 'SomeEmail@example.COM' } }, { runSettersOnQuery: true });
+ *
  * @api public
  * @return {SchemaType} this
  */
@@ -174,7 +186,7 @@ SchemaString.prototype.uppercase = function(shouldApply) {
 };
 
 /**
- * Adds a trim setter.
+ * Adds a trim [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * The string value will be trimmed when set.
  *
@@ -187,6 +199,12 @@ SchemaString.prototype.uppercase = function(shouldApply) {
  *     var m = new M({ name: string })
  *     console.log(m.name.length) // 9
  *
+ * NOTE: Setters do not run on queries by default. Use the `runSettersOnQuery` option:
+ *
+ *      // Must use `runSettersOnQuery` as shown below, otherwise `email` will
+ *      // **not** be lowercased.
+ *      M.updateOne({}, { $set: { email: 'SomeEmail@example.COM' } }, { runSettersOnQuery: true });
+ *
  * @api public
  * @return {SchemaType} this
  */

package/lib/schema.js

@@ -298,11 +298,13 @@ Schema.prototype.tree;
 Schema.prototype.clone = function() {
   var s = new Schema(this.paths, this.options);
   // Clone the call queue
+  var cloneOpts = { retainKeyOrder: true };
   s.callQueue = this.callQueue.map(function(f) { return f; });
-  s.methods = utils.clone(this.methods);
-  s.statics = utils.clone(this.statics);
+  s.methods = utils.clone(this.methods, cloneOpts);
+  s.statics = utils.clone(this.statics, cloneOpts);
+  s.query = utils.clone(this.query, cloneOpts);
   s.plugins = Array.prototype.slice.call(this.plugins);
-  s._indexes = utils.clone(this._indexes);
+  s._indexes = utils.clone(this._indexes, cloneOpts);
   s.s.hooks = this.s.hooks.clone();
   return s;
 };

package/lib/schematype.js

@@ -42,6 +42,13 @@ function SchemaType(path, options, instance) {
       this[i].apply(this, opts);
     }
   }
+
+  Object.defineProperty(this, '$$context', {
+    enumerable: false,
+    configurable: false,
+    writable: true,
+    value: null
+  });
 }
 
 /**
@@ -237,25 +244,37 @@ SchemaType.prototype.sparse = function(bool) {
  *
  * You can set up email lower case normalization easily via a Mongoose setter.
  *
- *     function toLower (v) {
+ *     function toLower(v) {
  *       return v.toLowerCase();
  *     }
  *
  *     var UserSchema = new Schema({
  *       email: { type: String, set: toLower }
- *     })
+ *     });
  *
- *     var User = db.model('User', UserSchema)
+ *     var User = db.model('User', UserSchema);
  *
- *     var user = new User({email: 'AVENUE@Q.COM'})
+ *     var user = new User({email: 'AVENUE@Q.COM'});
  *     console.log(user.email); // 'avenue@q.com'
  *
  *     // or
- *     var user = new User
- *     user.email = 'Avenue@Q.com'
- *     console.log(user.email) // 'avenue@q.com'
+ *     var user = new User();
+ *     user.email = 'Avenue@Q.com';
+ *     console.log(user.email); // 'avenue@q.com'
  *
- * As you can see above, setters allow you to transform the data before it gets to the raw mongodb document and is set as a value on an actual key.
+ * As you can see above, setters allow you to transform the data before it stored in MongoDB.
+ *
+ * NOTE: setters by default do **not** run on queries by default.
+ *
+ *     // Will **not** run the `toLower()` setter by default.
+ *     User.updateOne({ _id: _id }, { $set: { email: 'AVENUE@Q.COM' } });
+ *
+ * Use the `runSettersOnQuery` option to opt-in to running setters on `User.update()`:
+ *
+ *     // Turn on `runSettersOnQuery` to run the setters from your schema.
+ *     User.updateOne({ _id: _id }, { $set: { email: 'AVENUE@Q.COM' } }, {
+ *       runSettersOnQuery: true
+ *     });
  *
  * _NOTE: we could have also just used the built-in `lowercase: true` SchemaType option instead of defining our own function._
  *

package/lib/services/query/selectPopulatedFields.js

@@ -41,5 +41,5 @@ function isPathInFields(userProvidedFields, path) {
     }
     cur += '.' + pieces[i];
   }
-  return false;
+  return userProvidedFields[cur] != null;
 }

package/lib/services/setDefaultsOnInsert.js

@@ -5,7 +5,7 @@ var modifiedPaths = require('./common').modifiedPaths;
 /**
  * Applies defaults to update and findOneAndUpdate operations.
  *
- * @param {Query} query
+ * @param {Object} filter
  * @param {Schema} schema
  * @param {Object} castedDoc
  * @param {Object} options
@@ -13,7 +13,7 @@ var modifiedPaths = require('./common').modifiedPaths;
  * @api private
  */
 
-module.exports = function(query, schema, castedDoc, options) {
+module.exports = function(filter, schema, castedDoc, options) {
   var keys = Object.keys(castedDoc || {});
   var updatedKeys = {};
   var updatedValues = {};
@@ -33,11 +33,11 @@ module.exports = function(query, schema, castedDoc, options) {
       modifiedPaths(castedDoc, '', modified);
     }
 
-    var paths = Object.keys(query._conditions);
+    var paths = Object.keys(filter);
     var numPaths = paths.length;
     for (i = 0; i < numPaths; ++i) {
       var path = paths[i];
-      var condition = query._conditions[path];
+      var condition = filter[path];
       if (condition && typeof condition === 'object') {
         var conditionKeys = Object.keys(condition);
         var numConditionKeys = conditionKeys.length;

package/lib/services/updateValidators.js

@@ -29,19 +29,22 @@ module.exports = function(query, schema, castedDoc, options) {
   var numKeys = keys.length;
   var hasDollarUpdate = false;
   var modified = {};
+  var currentUpdate;
+  var key;
 
   for (var i = 0; i < numKeys; ++i) {
     if (keys[i].charAt(0) === '$') {
-      if (keys[i] === '$push' || keys[i] === '$addToSet' ||
-          keys[i] === '$pull' || keys[i] === '$pullAll') {
+      hasDollarUpdate = true;
+      if (keys[i] === '$push' || keys[i] === '$addToSet') {
         _keys = Object.keys(castedDoc[keys[i]]);
         for (var ii = 0; ii < _keys.length; ++ii) {
-          if (castedDoc[keys[i]][_keys[ii]].$each) {
+          currentUpdate = castedDoc[keys[i]][_keys[ii]];
+          if (currentUpdate && currentUpdate.$each) {
             arrayAtomicUpdates[_keys[ii]] = (arrayAtomicUpdates[_keys[ii]] || []).
-              concat(castedDoc[keys[i]][_keys[ii]].$each);
+              concat(currentUpdate.$each);
           } else {
             arrayAtomicUpdates[_keys[ii]] = (arrayAtomicUpdates[_keys[ii]] || []).
-              concat([castedDoc[keys[i]][_keys[ii]]]);
+              concat([currentUpdate]);
           }
         }
         continue;
@@ -53,14 +56,15 @@ module.exports = function(query, schema, castedDoc, options) {
       for (var j = 0; j < numPaths; ++j) {
         var updatedPath = paths[j].replace('.$.', '.0.');
         updatedPath = updatedPath.replace(/\.\$$/, '.0');
-        if (keys[i] === '$set' || keys[i] === '$setOnInsert') {
+        key = keys[i];
+        if (key === '$set' || key === '$setOnInsert' ||
+            key === '$pull' || key === '$pullAll') {
           updatedValues[updatedPath] = flat[paths[j]];
-        } else if (keys[i] === '$unset') {
+        } else if (key === '$unset') {
           updatedValues[updatedPath] = undefined;
         }
         updatedKeys[updatedPath] = true;
       }
-      hasDollarUpdate = true;
     }
   }
 

package/lib/types/buffer.js

@@ -46,9 +46,18 @@ function MongooseBuffer(value, encode, offset) {
 
   // make sure these internal props don't show up in Object.keys()
   Object.defineProperties(buf, {
-    validators: {value: []},
-    _path: {value: path},
-    _parent: {value: doc}
+    validators: {
+      value: [],
+      enumerable: false
+    },
+    _path: {
+      value: path,
+      enumerable: false
+    },
+    _parent: {
+      value: doc,
+      enumerable: false
+    }
   });
 
   if (doc && typeof path === 'string') {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "4.12.2",
+  "version": "4.12.6",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -21,7 +21,7 @@
   "dependencies": {
     "async": "2.1.4",
     "bson": "~1.0.4",
-    "hooks-fixed": "2.0.0",
+    "hooks-fixed": "2.0.2",
     "kareem": "1.5.0",
     "mongodb": "2.2.33",
     "mpath": "0.3.0",
@@ -52,7 +52,7 @@
     "node-static": "0.7.7",
     "nsp": "~2.8.1",
     "power-assert": "1.4.1",
-    "q": "1.4.1",
+    "q": "1.5.1",
     "tbd": "0.6.4",
     "uglify-js": "2.7.0",
     "uuid": "2.0.3",