mongoose 4.12.2 → 4.12.3

package/History.md

@@ -1,4 +1,14 @@
-4.12.2 / 2017-10-13
+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/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() {

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');
 
@@ -2239,12 +2240,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 +2259,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

@@ -2227,7 +2227,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 +2939,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/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,6 +29,7 @@ module.exports = function(query, schema, castedDoc, options) {
   var numKeys = keys.length;
   var hasDollarUpdate = false;
   var modified = {};
+  var currentUpdate;
 
   for (var i = 0; i < numKeys; ++i) {
     if (keys[i].charAt(0) === '$') {
@@ -36,12 +37,13 @@ module.exports = function(query, schema, castedDoc, options) {
           keys[i] === '$pull' || keys[i] === '$pullAll') {
         _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;

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.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",