mongoose 4.10.7 → 4.10.8

package/History.md

@@ -1,3 +1,13 @@
+4.10.8 / 2017-06-21
+===================
+ * docs: fix small formatting typo on schematypes #5374 [gianpaj](https://github.com/gianpaj)
+ * fix(model): allow null as an _id #5370
+ * fix(populate): don't throw async uncaught exception if model not found in populate #5364
+ * fix: correctly cast decimals in update #5361
+ * fix(error): don't use custom getter for ValidationError message #5359
+ * fix(query): handle runSettersOnQuery in built-in _id setter #5351
+ * fix(document): ensure consistent context for nested doc custom validators #5347
+
 4.10.7 / 2017-06-18
 ===================
  * docs(validation): show overriding custom validator error with 2nd cb arg #5358

package/lib/document.js

@@ -845,7 +845,7 @@ Document.prototype.$__set = function(pathToMark, path, constructing, parts, sche
   var _this = this;
 
   if (shouldModify) {
-    this.markModified(pathToMark, val);
+    this.markModified(pathToMark);
 
     // handle directly setting arrays (gh-1126)
     MongooseArray || (MongooseArray = require('./types/array'));
@@ -996,11 +996,15 @@ Document.prototype.$__path = function(path) {
  *     doc.save() // changes to mixed.type are now persisted
  *
  * @param {String} path the path to mark modified
+ * @param {Document} [scope] the scope to run validators with
  * @api public
  */
 
-Document.prototype.markModified = function(path) {
+Document.prototype.markModified = function(path, scope) {
   this.$__.activePaths.modify(path);
+  if (scope != null && !this.ownerDocument) {
+    this.$__.pathsToScopes[path] = scope;
+  }
 };
 
 /**
@@ -1018,6 +1022,7 @@ Document.prototype.markModified = function(path) {
 
 Document.prototype.unmarkModified = function(path) {
   this.$__.activePaths.init(path);
+  delete this.$__.pathsToScopes[path];
 };
 
 /**
@@ -1459,12 +1464,15 @@ Document.prototype.$__validate = function(callback) {
       }
 
       var val = _this.getValue(path);
+      var scope = path in _this.$__.pathsToScopes ?
+        _this.$__.pathsToScopes[path] :
+        _this;
       p.doValidate(val, function(err) {
         if (err) {
           _this.invalidate(path, err, undefined, true);
         }
         --total || complete();
-      }, _this);
+      }, scope);
     });
   };
 
@@ -1609,7 +1617,7 @@ Document.prototype.invalidate = function(path, err, val, kind) {
     return this.$__.validationError;
   }
 
-  this.$__.validationError.errors[path] = err;
+  this.$__.validationError.addError(path, err);
   return this.$__.validationError;
 };
 

package/lib/error/validation.js

@@ -41,13 +41,6 @@ function ValidationError(instance) {
 ValidationError.prototype = Object.create(MongooseError.prototype);
 ValidationError.prototype.constructor = MongooseError;
 
-Object.defineProperty(ValidationError.prototype, 'message', {
-  get: function() {
-    return this._message + ': ' + _generateMessage(this);
-  },
-  enumerable: true
-});
-
 /**
  * Console.log helper
  */
@@ -72,6 +65,15 @@ ValidationError.prototype.toJSON = function() {
   return utils.assign({}, this, { message: this.message });
 };
 
+/*!
+ * add message
+ */
+
+ValidationError.prototype.addError = function(path, error) {
+  this.errors[path] = error;
+  this.message = this._message + ': ' + _generateMessage(this);
+};
+
 /*!
  * ignore
  */

package/lib/internal.js

@@ -24,6 +24,7 @@ function InternalCache() {
   this.wasPopulated = false; // if this doc was the result of a population
   this.scope = undefined;
   this.activePaths = new ActiveRoster;
+  this.pathsToScopes = {};
 
   // embedded docs
   this.ownerDocument = undefined;

package/lib/model.js

@@ -128,7 +128,7 @@ Model.prototype.$__handleSave = function(options, callback) {
 
     var obj = this.toObject(toObjectOptions);
 
-    if ((obj || {})._id == null) {
+    if ((obj || {})._id === void 0) {
       // documents must have an _id else mongoose won't know
       // what to update later if more changes are made. the user
       // wouldn't know what _id was generated by mongodb either
@@ -3338,7 +3338,12 @@ function getModelsMapForPopulate(model, docs, options) {
           modelForFindSchema = utils.getValue(discriminatorKey, doc);
 
           if (modelForFindSchema) {
-            modelForCurrentDoc = model.db.model(modelForFindSchema);
+            try {
+              modelForCurrentDoc = model.db.model(modelForFindSchema);
+            } catch (error) {
+              return error;
+            }
+
             schemaForCurrentDoc = modelForCurrentDoc._getSchema(options.path);
 
             if (schemaForCurrentDoc && schemaForCurrentDoc.caster) {
@@ -3403,9 +3408,13 @@ function getModelsMapForPopulate(model, docs, options) {
       modelName = modelNames[k];
       var _doc = Array.isArray(doc) && isRefPathArray ? doc[k] : doc;
       var _ret = Array.isArray(ret) && isRefPathArray ? ret[k] : ret;
-      Model = originalModel && originalModel.modelName ?
-        originalModel :
-        model.db.model(modelName);
+      try {
+        Model = originalModel && originalModel.modelName ?
+          originalModel :
+          model.db.model(modelName);
+      } catch (error) {
+        return error;
+      }
 
       if (!available[modelName]) {
         currentOptions = {

package/lib/query.js

@@ -186,7 +186,10 @@ Query.prototype.toConstructor = function toConstructor() {
   p.op = this.op;
   p._conditions = utils.clone(this._conditions, { retainKeyOrder: true });
   p._fields = utils.clone(this._fields);
-  p._update = utils.clone(this._update);
+  p._update = utils.clone(this._update, {
+    flattenDecimals: false,
+    retainKeyOrder: true
+  });
   p._path = this._path;
   p._distinct = this._distinct;
   p._collection = this._collection;

package/lib/schema/decimal128.js

@@ -104,10 +104,14 @@ Decimal128.prototype.cast = function(value, doc, init) {
     return ret;
   }
 
-  if (value === null || value === undefined) {
+  if (value == null) {
     return value;
   }
 
+  if (typeof value === 'object' && typeof value.$numberDecimal === 'string') {
+    return Decimal128Type.fromString(value.$numberDecimal);
+  }
+
   if (value instanceof Decimal128Type) {
     return value;
   }

package/lib/schema/objectid.js

@@ -198,10 +198,15 @@ function defaultId() {
 }
 
 function resetId(v) {
-  if (v == null) {
+  Document || (Document = require('./../document'));
+
+  if (v === void 0) {
     return new oid();
   }
-  this.$__._id = null;
+
+  if (this instanceof Document) {
+    delete this.$__._id;
+  }
   return v;
 }
 

package/lib/services/query/castUpdate.js

@@ -286,6 +286,5 @@ function castUpdateVal(schema, val, op, $conditional) {
   if (/^\$/.test($conditional)) {
     return schema.castForQuery($conditional, val);
   }
-
   return schema.castForQuery(val);
 }

package/lib/services/updateValidators.js

@@ -146,7 +146,7 @@ module.exports = function(query, schema, castedDoc, options) {
       if (validationErrors.length) {
         var err = new ValidationError(null);
         for (var i = 0; i < validationErrors.length; ++i) {
-          err.errors[validationErrors[i].path] = validationErrors[i];
+          err.addError(validationErrors[i].path, validationErrors[i]);
         }
         return callback(err);
       }

package/lib/types/array.js

@@ -154,7 +154,7 @@ MongooseArray.mixin = {
         }
       }
 
-      parent.markModified(dirtyPath);
+      parent.markModified(dirtyPath, elem);
     }
 
     return this;

package/lib/types/embedded.js

@@ -196,7 +196,12 @@ EmbeddedDocument.prototype.update = function() {
  */
 
 EmbeddedDocument.prototype.inspect = function() {
-  return this.toObject({ transform: false, retainKeyOrder: true, virtuals: false });
+  return this.toObject({
+    transform: false,
+    retainKeyOrder: true,
+    virtuals: false,
+    flattenDecimals: false
+  });
 };
 
 /**

package/lib/utils.js

@@ -861,7 +861,10 @@ exports.mergeClone = function(to, fromObj) {
     if (typeof to[key] === 'undefined') {
       // 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], {retainKeyOrder: 1});
+      to[key] = exports.clone(fromObj[key], {
+        retainKeyOrder: 1,
+        flattenDecimals: false
+      });
     } else {
       if (exports.isObject(fromObj[key])) {
         var obj = fromObj[key];
@@ -875,7 +878,10 @@ exports.mergeClone = function(to, fromObj) {
       } 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], {retainKeyOrder: 1});
+        to[key] = exports.clone(fromObj[key], {
+          retainKeyOrder: 1,
+          flattenDecimals: false
+        });
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "4.10.7",
+  "version": "4.10.8",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",