mongoose 5.0.17 → 5.1.2

package/lib/types/map.js

@@ -0,0 +1,149 @@
+'use strict';
+
+/*!
+ * ignore
+ */
+
+class MongooseMap extends Map {
+  constructor(v, path, doc, schemaType) {
+    if (v != null && v.constructor.name === 'Object') {
+      v = Object.keys(v).reduce((arr, key) => arr.concat([[key, v[key]]]), []);
+    }
+    super(v);
+
+    this.$__parent = doc;
+    this.$__path = path;
+    this.$__schemaType = schemaType;
+
+    this.$__runDeferred();
+  }
+
+  $init(key, value) {
+    if (key.startsWith('$')) {
+      throw new Error('Mongoose maps do not support keys that start with ' +
+        '`$`, got "' + key + '"');
+    }
+    if (key.indexOf('.') !== -1) {
+      throw new Error('Mongoose maps do not support keys that contain `.`, ' +
+        'got "' + key + '"');
+    }
+
+    super.set(key, value);
+
+    if (value != null && value.$isSingleNested) {
+      value.$basePath = this.$__path + '.' + key;
+    }
+  }
+
+  set(key, value) {
+    if (key.startsWith('$')) {
+      throw new Error('Mongoose maps do not support keys that start with ' +
+        '`$`, got "' + key + '"');
+    }
+    if (key.indexOf('.') !== -1) {
+      throw new Error('Mongoose maps do not support keys that contain `.`, ' +
+        'got "' + key + '"');
+    }
+
+    // Weird, but because you can't assign to `this` before calling `super()`
+    // you can't get access to `$__schemaType` to cast in the initial call to
+    // `set()` from the `super()` constructor.
+
+    if (this.$__schemaType == null) {
+      this.$__deferred = this.$__deferred || [];
+      this.$__deferred.push({ key: key, value: value });
+      return;
+    }
+
+    const fullPath = this.$__path + '.' + key;
+    const populated = this.$__parent != null && this.$__parent.$__ ?
+      this.$__parent.populated(fullPath) || this.$__parent.populated(this.$__path) :
+      null;
+
+    if (populated != null) {
+      if (value.$__ == null) {
+        value = new populated.options.model(value);
+      }
+      value.$__.wasPopulated = true;
+    } else {
+      try {
+        value = this.$__schemaType.
+          applySetters(value, this.$__parent, false, this.get(key));
+      } catch (error) {
+        this.$__parent.invalidate(fullPath, error);
+        return;
+      }
+    }
+
+    super.set(key, value);
+
+    if (value != null && value.$isSingleNested) {
+      value.$basePath = this.$__path + '.' + key;
+    }
+
+    if (this.$__parent != null && this.$__parent.$__) {
+      this.$__parent.markModified(this.$__path + '.' + key);
+    }
+  }
+
+  toBSON() {
+    return new Map(this);
+  }
+
+  toJSON() {
+    let ret = {};
+    const keys = this.keys();
+    for (let key of keys) {
+      ret[key] = this.get(key);
+    }
+    return ret;
+  }
+
+  inspect() {
+    return new Map(this);
+  }
+
+  $__runDeferred() {
+    if (!this.$__deferred) {
+      return;
+    }
+    for (let i = 0; i < this.$__deferred.length; ++i) {
+      this.set(this.$__deferred[i].key, this.$__deferred[i].value);
+    }
+    this.$__deferred = null;
+  }
+}
+
+Object.defineProperty(MongooseMap.prototype, '$__parent', {
+  enumerable: false,
+  writable: true,
+  configurable: false
+});
+
+Object.defineProperty(MongooseMap.prototype, '$__path', {
+  enumerable: false,
+  writable: true,
+  configurable: false
+});
+
+Object.defineProperty(MongooseMap.prototype, '$__schemaType', {
+  enumerable: false,
+  writable: true,
+  configurable: false
+});
+
+Object.defineProperty(MongooseMap.prototype, '$isMongooseMap', {
+  enumerable: false,
+  writable: false,
+  configurable: false,
+  value: true
+});
+
+Object.defineProperty(MongooseMap.prototype, '$__deferredCalls', {
+  enumerable: false,
+  writable: false,
+  configurable: false,
+  value: true
+});
+
+module.exports = MongooseMap;

package/lib/types/objectid.js

@@ -10,4 +10,16 @@
 
 var ObjectId = require('../drivers').ObjectId;
 
+/*!
+ * Getter for convenience with populate, see gh-6115
+ */
+
+Object.defineProperty(ObjectId.prototype, '_id', {
+  enumerable: false,
+  configurable: true,
+  get: function() {
+    return this;
+  }
+});
+
 module.exports = ObjectId;

package/lib/types/subdocument.js

@@ -36,7 +36,20 @@ Subdocument.prototype.toBSON = function() {
  * @api private
  */
 
-Subdocument.prototype.save = function(fn) {
+Subdocument.prototype.save = function(options, fn) {
+  if (typeof options === 'function') {
+    fn = options;
+    options = {};
+  }
+  options = options || {};
+
+  if (!options.suppressWarning) {
+    console.warn('mongoose: calling `save()` on a subdoc does **not** save ' +
+      'the document to MongoDB, it only runs save middleware. ' +
+      'Use `subdoc.save({ suppressWarning: true })` to hide this warning ' +
+      'if you\'re sure this behavior is right for your app.');
+  }
+
   return utils.promiseOrCallback(fn, cb => {
     this.$__save(cb);
   });
@@ -67,6 +80,7 @@ Subdocument.prototype.$isValid = function(path) {
 
 Subdocument.prototype.markModified = function(path) {
   Document.prototype.markModified.call(this, path);
+
   if (this.$parent && this.$basePath) {
     if (this.$parent.isDirectModified(this.$basePath)) {
       return;
@@ -82,6 +96,10 @@ Subdocument.prototype.$markValid = function(path) {
   }
 };
 
+/*!
+ * ignore
+ */
+
 Subdocument.prototype.invalidate = function(path, err, val) {
   // Hack: array subdocuments' validationError is equal to the owner doc's,
   // so validating an array subdoc gives the top-level doc back. Temporary
@@ -97,6 +115,17 @@ Subdocument.prototype.invalidate = function(path, err, val) {
   }
 };
 
+/*!
+ * ignore
+ */
+
+Subdocument.prototype.$ignore = function(path) {
+  Document.prototype.$ignore.call(this, path);
+  if (this.$parent && this.$basePath) {
+    this.$parent.$ignore([this.$basePath, path].join('.'));
+  }
+};
+
 /**
  * Returns the top level document of this sub-document.
  *

package/lib/utils.js

@@ -137,6 +137,17 @@ exports.deepEqual = function deepEqual(a, b) {
   return true;
 };
 
+/*!
+ * Get the last element of an array
+ */
+
+exports.last = function(arr) {
+  if (arr.length > 0) {
+    return arr[arr.length - 1];
+  }
+  return void 0;
+};
+
 /*!
  * Object clone with Mongoose natives support.
  *
@@ -446,9 +457,11 @@ exports.isMongooseObject = function(v) {
   MongooseArray || (MongooseArray = require('./types').Array);
   MongooseBuffer || (MongooseBuffer = require('./types').Buffer);
 
-  return v instanceof Document ||
-      (v && v.isMongooseArray) ||
-      (v && v.isMongooseBuffer);
+  if (v == null) {
+    return false;
+  }
+
+  return v.$__ != null || v.isMongooseArray || v.isMongooseBuffer;
 };
 var isMongooseObject = exports.isMongooseObject;
 
@@ -508,6 +521,24 @@ exports.populate = function populate(path, select, model, match, options, subPop
   // necessary to keep backward compatibility (select could be
   // an array, string, or object literal).
 
+  function makeSingles(arr) {
+    let ret = [];
+    arr.forEach(function(obj) {
+      if (/[\s]/.test(obj.path)) {
+        let paths = obj.path.split(' ');
+        paths.forEach(function(p) {
+          let copy = Object.assign({}, obj);
+          copy.path = p;
+          ret.push(copy);
+        });
+      } else {
+        ret.push(obj);
+      }
+    });
+
+    return ret;
+  }
+
   // might have passed an object specifying all arguments
   if (arguments.length === 1) {
     if (path instanceof PopulateOptions) {
@@ -515,8 +546,20 @@ exports.populate = function populate(path, select, model, match, options, subPop
     }
 
     if (Array.isArray(path)) {
-      return path.map(function(o) {
-        return exports.populate(o)[0];
+      let singles = makeSingles(path);
+      return singles.map(function(o) {
+        if (o.populate && !o.match) {
+          return exports.populate(
+            o.path,
+            o.select,
+            o.model,
+            o.match,
+            o.options,
+            o.populate)[0];
+        } else {
+          return exports.populate(o)[0];
+        }
+
       });
     }
 
@@ -690,7 +733,7 @@ exports.array.unique = function(arr) {
   var ret = [];
   var length = arr.length;
   for (var i = 0; i < length; ++i) {
-    if (typeof arr[i] === 'number' || typeof arr[i] === 'string') {
+    if (typeof arr[i] === 'number' || typeof arr[i] === 'string' || arr[i] == null) {
       if (primitives[arr[i]]) {
         continue;
       }

package/migrating_to_5.md

@@ -100,7 +100,7 @@ const cursorWithOptions = MyModel.
 
 ### geoNear
 
-`Model.geoNear()` has been removed because the [MongoDB driver no longer supports it](https://github.com/mongodb/node-mongodb-native/blob/3.0.0/CHANGES_3.0.0.md#geonear-command-helper)
+`Model.geoNear()` has been removed because the [MongoDB driver no longer supports it](https://github.com/mongodb/node-mongodb-native/blob/master/CHANGES_3.0.0.md#geonear-command-helper)
 
 ### Required URI encoding of connection strings
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "5.0.17",
+  "version": "5.1.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -20,10 +20,10 @@
   "license": "MIT",
   "dependencies": {
     "async": "2.1.4",
-    "bson": "~1.0.4",
-    "kareem": "2.0.7",
+    "bson": "~1.0.5",
+    "kareem": "2.1.0",
     "lodash.get": "4.4.2",
-    "mongodb": "3.0.7",
+    "mongodb": "3.0.8",
     "mongoose-legacy-pluralize": "1.0.2",
     "mpath": "0.4.1",
     "mquery": "3.0.0",
@@ -32,7 +32,7 @@
     "sliced": "1.0.1"
   },
   "devDependencies": {
-    "acquit": "0.5.1",
+    "acquit": "0.6.3",
     "acquit-ignore": "0.0.3",
     "benchmark": "2.1.2",
     "bluebird": "3.5.0",