mongoose 5.0.2 → 5.0.6

package/lib/schema.js

@@ -122,16 +122,20 @@ function aliasFields(schema) {
 
     if (alias) {
       if ('string' === typeof alias && alias.length > 0) {
-        if (schema.aliases[alias])
+        if (schema.aliases[alias]) {
           throw new Error('Duplicate alias, alias ' + alias + ' is used more than once');
-        else
+        } else {
           schema.aliases[alias] = prop;
+        }
 
         schema
           .virtual(alias)
           .get((function(p) {
             return function() {
-              return this.get(p);
+              if (typeof this.get === 'function') {
+                return this.get(p);
+              }
+              return this[p];
             };
           })(prop))
           .set((function(p) {
@@ -231,7 +235,6 @@ Schema.prototype.tree;
 
 Schema.prototype.clone = function() {
   var s = new Schema(this.paths, this.options);
-  // Clone the call queue
   var cloneOpts = {};
   s.callQueue = this.callQueue.map(function(f) { return f; });
   s.methods = utils.clone(this.methods, cloneOpts);
@@ -240,6 +243,7 @@ Schema.prototype.clone = function() {
   s.plugins = Array.prototype.slice.call(this.plugins);
   s._indexes = utils.clone(this._indexes, cloneOpts);
   s.s.hooks = this.s.hooks.clone();
+  s.virtuals = utils.clone(this.virtuals, cloneOpts);
   return s;
 };
 

package/lib/schematype.js

@@ -773,7 +773,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope) {
     }
     if (ok === undefined || ok) {
       if (--count <= 0) {
-        setImmediate(function() {
+        utils.immediate(function() {
           fn(null);
         });
       }
@@ -781,7 +781,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope) {
       var ErrorConstructor = validatorProperties.ErrorConstructor || ValidatorError;
       err = new ErrorConstructor(validatorProperties);
       err.$isValidatorError = true;
-      setImmediate(function() {
+      utils.immediate(function() {
         fn(err);
       });
     }

package/lib/services/model/discriminator.js

@@ -55,7 +55,7 @@ module.exports = function discriminator(model, name, schema) {
       delete schema.paths._id;
       delete schema.tree._id;
     }
-    utils.merge(schema, baseSchema);
+    utils.merge(schema, baseSchema, { omit: { discriminators: true } });
 
     var obj = {};
     obj[key] = {

package/lib/services/projection/isExclusive.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const isDefiningProjection = require('./isDefiningProjection');
+
+/*!
+ * ignore
+ */
+
+module.exports = function isExclusive(projection) {
+  let keys = Object.keys(projection);
+  let ki = keys.length;
+  let exclude = null;
+
+  if (ki === 1 && keys[0] === '_id') {
+    exclude = !!projection[keys[ki]];
+  } else {
+    while (ki--) {
+      // Does this projection explicitly define inclusion/exclusion?
+      // Explicitly avoid `$meta` and `$slice`
+      if (keys[ki] !== '_id' && isDefiningProjection(projection[keys[ki]])) {
+        exclude = !projection[keys[ki]];
+        break;
+      }
+    }
+  }
+
+  return exclude;
+};

package/lib/services/query/castUpdate.js

@@ -66,8 +66,10 @@ module.exports = function castUpdate(schema, obj, options, context) {
     op = ops[i];
     val = ret[op];
     hasDollarKey = hasDollarKey || op.charAt(0) === '$';
+
     if (val &&
         typeof val === 'object' &&
+        !Buffer.isBuffer(val) &&
         (!overwrite || hasDollarKey)) {
       hasKeys |= walkUpdatePath(schema, val, op, options.strict, context);
     } else if (overwrite && ret && typeof ret === 'object') {
@@ -111,8 +113,7 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
   var key;
   var val;
 
-  var hasError = false;
-  var aggregatedError = new ValidationError();
+  var aggregatedError = null;
 
   var useNestedStrict = schema.options.useNestedStrict;
 
@@ -133,8 +134,7 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
               $each: castUpdateVal(schematype, val.$each, op, context)
             };
           } catch (error) {
-            hasError = true;
-            _handleCastError(error, context, key, aggregatedError);
+            aggregatedError = _handleCastError(error, context, key, aggregatedError);
           }
 
           if (val.$slice != null) {
@@ -152,8 +152,7 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
           try {
             obj[key] = castUpdateVal(schematype, val, op, context);
           } catch (error) {
-            hasError = true;
-            _handleCastError(error, context, key, aggregatedError);
+            aggregatedError = _handleCastError(error, context, key, aggregatedError);
           }
         }
       } else if ((op === '$currentDate') || (op in castOps && schematype)) {
@@ -161,8 +160,7 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
         try {
           obj[key] = castUpdateVal(schematype, val, op, context);
         } catch (error) {
-          hasError = true;
-          _handleCastError(error, context, key, aggregatedError);
+          aggregatedError = _handleCastError(error, context, key, aggregatedError);
         }
 
         hasKeys = true;
@@ -228,14 +226,17 @@ function walkUpdatePath(schema, obj, op, strict, context, pref) {
         try {
           obj[key] = castUpdateVal(schematype, val, op, key, context);
         } catch (error) {
-          hasError = true;
-          _handleCastError(error, context, key, aggregatedError);
+          aggregatedError = _handleCastError(error, context, key, aggregatedError);
+        }
+
+        if (Array.isArray(obj[key]) && (op === '$addToSet' || op === '$push') && key !== '$each') {
+          obj[key] = { $each: obj[key] };
         }
       }
     }
   }
 
-  if (hasError) {
+  if (aggregatedError != null) {
     throw aggregatedError;
   }
 
@@ -250,7 +251,9 @@ function _handleCastError(error, query, key, aggregatedError) {
   if (typeof query !== 'object' || !query.options.multipleCastError) {
     throw error;
   }
+  aggregatedError = aggregatedError || new ValidationError();
   aggregatedError.addError(key, error);
+  return aggregatedError;
 }
 
 /*!

package/lib/types/array.js

@@ -9,7 +9,7 @@ const cleanModifiedSubpaths = require('../services/document/cleanModifiedSubpath
 const internalToObjectOptions = require('../options').internalToObjectOptions;
 const utils = require('../utils');
 
-var isMongooseObject = utils.isMongooseObject;
+const isMongooseObject = utils.isMongooseObject;
 
 /**
  * Mongoose Array constructor.
@@ -237,8 +237,10 @@ MongooseArray.mixin = {
     var keys = Object.keys(this._atomics);
     var i = keys.length;
 
+    const opts = Object.assign({}, internalToObjectOptions, { _isNested: true });
+
     if (i === 0) {
-      ret[0] = ['$set', this.toObject({depopulate: 1, transform: false, _isNested: true, virtuals: false})];
+      ret[0] = ['$set', this.toObject(opts)];
       return ret;
     }
 
@@ -250,9 +252,11 @@ MongooseArray.mixin = {
       // need to convert their elements as if they were MongooseArrays
       // to handle populated arrays versus DocumentArrays properly.
       if (isMongooseObject(val)) {
-        val = val.toObject({depopulate: 1, transform: false, _isNested: true, virtuals: false});
+        val = val.toObject(opts);
       } else if (Array.isArray(val)) {
-        val = this.toObject.call(val, {depopulate: 1, transform: false, _isNested: true});
+        val = this.toObject.call(val, opts);
+      } else if (val != null && Array.isArray(val.$each)) {
+        val.$each = this.toObject.call(val.$each, opts);
       } else if (val.valueOf) {
         val = val.valueOf();
       }

package/lib/types/embedded.js

@@ -6,7 +6,7 @@
 
 const Document = require('../document_provider')();
 const EventEmitter = require('events').EventEmitter;
-var internalToObjectOptions = require('../options').internalToObjectOptions;
+const internalToObjectOptions = require('../options').internalToObjectOptions;
 const utils = require('../utils');
 
 /**
@@ -126,7 +126,7 @@ EmbeddedDocument.prototype.save = function(fn) {
  */
 
 EmbeddedDocument.prototype.$__save = function(fn) {
-  return setImmediate(() => fn(null, this));
+  return utils.immediate(() => fn(null, this));
 };
 
 /*!

package/lib/types/subdocument.js

@@ -55,7 +55,7 @@ Subdocument.prototype.save = function(fn) {
  */
 
 Subdocument.prototype.$__save = function(fn) {
-  return setImmediate(() => fn(null, this));
+  return utils.immediate(() => fn(null, this));
 };
 
 Subdocument.prototype.$isValid = function(path) {

package/lib/utils.js

@@ -210,7 +210,7 @@ exports.promiseOrCallback = function promiseOrCallback(callback, fn) {
     try {
       return fn(callback);
     } catch (error) {
-      return setImmediate(() => {
+      return process.nextTick(() => {
         throw error;
       });
     }
@@ -316,9 +316,15 @@ exports.merge = function merge(to, from, options) {
 
   while (i < len) {
     key = keys[i++];
+    if (options.omit && options.omit[key]) {
+      continue;
+    }
     if (to[key] == null) {
       to[key] = from[key];
     } else if (exports.isObject(from[key])) {
+      if (!exports.isObject(to[key])) {
+        to[key] = {};
+      }
       merge(to[key], from[key], options);
     } else if (options.overwrite) {
       to[key] = from[key];
@@ -756,9 +762,13 @@ exports.mergeClone = function(to, fromObj) {
         flattenDecimals: false
       });
     } else {
-      if (exports.isObject(fromObj[key])) {
-        var obj = fromObj[key];
-        if (isMongooseObject(fromObj[key]) && !fromObj[key].isMongooseBuffer) {
+      var val = fromObj[key];
+      if (val != null && val.valueOf) {
+        val = val.valueOf();
+      }
+      if (exports.isObject(val)) {
+        var obj = val;
+        if (isMongooseObject(val) && !val.isMongooseBuffer) {
           obj = obj.toObject({
             transform: false,
             virtuals: false,
@@ -767,14 +777,12 @@ exports.mergeClone = function(to, fromObj) {
             flattenDecimals: false
           });
         }
-        if (fromObj[key].isMongooseBuffer) {
+        if (val.isMongooseBuffer) {
           obj = new Buffer(obj);
         }
         exports.mergeClone(to[key], obj);
       } else {
-        // make sure to retain key order here because of a bug handling the
-        // $each operator in mongodb 2.4.4
-        to[key] = exports.clone(fromObj[key], {
+        to[key] = exports.clone(val, {
           flattenDecimals: false
         });
       }
@@ -796,6 +804,17 @@ exports.each = function(arr, fn) {
   }
 };
 
+/*!
+ * Centralize this so we can more easily work around issues with people
+ * stubbing out `process.nextTick()` in tests using sinon:
+ * https://github.com/sinonjs/lolex#automatically-incrementing-mocked-time
+ * See gh-6074
+ */
+
+exports.immediate = function immediate(cb) {
+  return process.nextTick(cb);
+};
+
 /*!
  * ignore
  */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.0.2",
+  "version": "5.0.6",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -21,10 +21,10 @@
   "dependencies": {
     "async": "2.1.4",
     "bson": "~1.0.4",
-    "kareem": "2.0.2",
+    "kareem": "2.0.4",
     "lodash.get": "4.4.2",
-    "mongodb": "3.0.1",
-    "mongoose-legacy-pluralize": "1.0.1",
+    "mongodb": "3.0.2",
+    "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.3.0",
     "mquery": "3.0.0",
     "ms": "2.0.0",
@@ -65,7 +65,7 @@
     "lint": "eslint . --quiet",
     "nsp": "nsp check",
     "release": "git push origin master --tags && npm publish",
-    "release-legacy": "git push origin 4.x --tags && npm publish --tag 4.x",
+    "release-legacy": "git push origin 4.x --tags && npm publish --tag legacy",
     "test": "mocha --exit test/*.test.js test/**/*.test.js",
     "test-cov": "nyc --reporter=html --reporter=text npm test"
   },