mongoose 4.11.8 → 4.11.12

package/History.md

@@ -1,3 +1,41 @@
+4.11.12 / 2017-09-18
+====================
+ * docs(model): asterisk should not render as markdown bullet #5644 [timkinnane](https://github.com/timkinnane)
+ * docs: use useMongoClient in connection example #5627 [GabrielNicolasAvellaneda](https://github.com/GabrielNicolasAvellaneda)
+ * fix(connection): call callback when initial connection failed #5626
+ * fix(query): apply select correctly if a given nested schema is used for 2 different paths #5603
+ * fix(document): add graceful fallback for setting a doc array value and `pull()`-ing a doc #3511
+
+4.11.11 / 2017-09-10
+====================
+ * fix(connection): properly set readyState in response to driver 'close' and 'reconnect' events #5604
+ * fix(document): ensure single embedded doc setters only get called once, with correct value #5601
+ * fix(timestamps): allow enabling updatedAt without createdAt #5598
+ * test: improve unique validator test by making create run before ensureIndex #5595 #5562
+ * fix(query): ensure find callback only gets called once when post init hook throws error #5592
+
+4.11.10 / 2017-09-03
+====================
+ * docs: add KeenIO tracking #5612
+ * fix(schema): ensure validators declared with `.validate()` get copied with clone() #5607
+ * fix: remove unnecessary jest warning #5480
+ * fix(discriminator): prevent implicit discriminator schema id from clobbering base schema custom id #5591
+ * fix(schema): hide schema objectid warning for non-hex strings of length 24 #5587
+ * docs(populate): use story schema defined key author instead of creator #5578 [dmric](https://github.com/dmric)
+ * docs(document): describe usage of `.set()` #5576
+ * fix(document): ensure correct scope in single nested validators #5569
+ * fix(populate): don't mark path as populated until populate() is done #5564
+ * fix(document): make push()-ing a doc onto an empty array act as manual population #5504
+ * fix(connection): emit timeout event on socket timeout #4513
+
+4.11.9 / 2017-08-27
+===================
+ * fix(error): avoid using arguments.callee because that breaks strict mode #5572
+ * docs(schematypes): fix spacing #5567
+ * fix(query): enforce binary subtype always propagates to mongodb #5551
+ * fix(query): only skip castForQuery for mongoose arrays #5536
+ * fix(browser): rely on browser entrypoint to decide whether to use BrowserDocument or NodeDocument #5480
+
 4.11.8 / 2017-08-23
 ===================
  * feat: add warning about using schema ObjectId as type ObjectId #5571 [efkan](https://github.com/efkan)

package/lib/browser.js

@@ -1,7 +1,10 @@
 /* eslint-env browser */
 
+var DocumentProvider = require('./document_provider.js');
 var PromiseProvider = require('./promise_provider');
 
+DocumentProvider.setBrowser(true);
+
 /**
  * The Mongoose [Promise](#promise_Promise) constructor.
  *
@@ -114,7 +117,7 @@ exports.utils = require('./utils.js');
  * @method Document
  * @api public
  */
-exports.Document = require('./document_provider.js')();
+exports.Document = DocumentProvider();
 
 /*!
  * Module exports.

package/lib/connection.js

@@ -66,6 +66,7 @@ function Connection(base) {
   this.name = null;
   this.options = null;
   this.otherDbs = [];
+  this.states = STATES;
   this._readyState = STATES.disconnected;
   this._closeCalled = false;
   this._hasOpened = false;
@@ -760,14 +761,20 @@ Connection.prototype.openUri = function(uri, options, callback) {
         if (_this.listeners('error').length) {
           _this.emit('error', error);
         }
+        callback && callback(error);
         return reject(error);
       }
       // Backwards compat for mongoose 4.x
       db.on('reconnect', function() {
+        _this.readyState = STATES.connected;
         _this.emit('reconnected');
       });
       db.s.topology.on('close', function() {
-        _this.emit('disconnected');
+        // Implicitly emits 'disconnected'
+        _this.readyState = STATES.disconnected;
+      });
+      db.on('timeout', function() {
+        _this.emit('timeout');
       });
 
       _this.db = db;

package/lib/document.js

@@ -16,7 +16,10 @@ var isMongooseObject = utils.isMongooseObject;
 var inspect = require('util').inspect;
 var ValidationError = MongooseError.ValidationError;
 var InternalCache = require('./internal');
+var cleanModifiedSubpaths = require('./services/document/cleanModifiedSubpaths');
+var compile = require('./services/document/compile').compile;
 var deepEqual = utils.deepEqual;
+var defineKey = require('./services/document/compile').defineKey;
 var hooks = require('hooks-fixed');
 var PromiseProvider = require('./promise_provider');
 var DocumentArray;
@@ -498,12 +501,13 @@ Document.prototype.set = function(path, val, type, options) {
     type = undefined;
   }
 
-  var merge = options && options.merge,
-      adhoc = type && type !== true,
-      constructing = type === true,
-      adhocs;
+  options = options || {};
+  var merge = options.merge;
+  var adhoc = type && type !== true;
+  var constructing = type === true;
+  var adhocs;
 
-  var strict = options && 'strict' in options
+  var strict = 'strict' in options
       ? options.strict
       : this.$__.strictMode;
 
@@ -774,20 +778,6 @@ Document.prototype.set = function(path, val, type, options) {
   return this;
 };
 
-/*!
- * ignore
- */
-
-function cleanModifiedSubpaths(doc, path) {
-  var _modifiedPaths = Object.keys(doc.$__.activePaths.states.modify);
-  var _numModifiedPaths = _modifiedPaths.length;
-  for (var j = 0; j < _numModifiedPaths; ++j) {
-    if (_modifiedPaths[j].indexOf(path + '.') === 0) {
-      delete doc.$__.activePaths.states.modify[_modifiedPaths[j]];
-    }
-  }
-}
-
 /**
  * Determine if we should mark this change as modified.
  *
@@ -1833,158 +1823,6 @@ Document.prototype.$__dirty = function() {
   return minimal;
 };
 
-/*!
- * Compiles schemas.
- */
-
-function compile(tree, proto, prefix, options) {
-  var keys = Object.keys(tree);
-  var i = keys.length;
-  var len = keys.length;
-  var limb;
-  var key;
-
-  if (options.retainKeyOrder) {
-    for (i = 0; i < len; ++i) {
-      key = keys[i];
-      limb = tree[key];
-
-      defineKey(key,
-          ((utils.getFunctionName(limb.constructor) === 'Object'
-          && Object.keys(limb).length)
-          && (!limb[options.typeKey] || (options.typeKey === 'type' && limb.type.type))
-              ? limb
-              : null)
-          , proto
-          , prefix
-          , keys
-          , options);
-    }
-  } else {
-    while (i--) {
-      key = keys[i];
-      limb = tree[key];
-
-      defineKey(key,
-          ((utils.getFunctionName(limb.constructor) === 'Object'
-          && Object.keys(limb).length)
-          && (!limb[options.typeKey] || (options.typeKey === 'type' && limb.type.type))
-              ? limb
-              : null)
-          , proto
-          , prefix
-          , keys
-          , options);
-    }
-  }
-}
-
-// gets descriptors for all properties of `object`
-// makes all properties non-enumerable to match previous behavior to #2211
-function getOwnPropertyDescriptors(object) {
-  var result = {};
-
-  Object.getOwnPropertyNames(object).forEach(function(key) {
-    result[key] = Object.getOwnPropertyDescriptor(object, key);
-    result[key].enumerable = ['isNew', '$__', 'errors', '_doc'].indexOf(key) === -1;
-  });
-
-  return result;
-}
-
-/*!
- * Defines the accessor named prop on the incoming prototype.
- */
-
-function defineKey(prop, subprops, prototype, prefix, keys, options) {
-  var path = (prefix ? prefix + '.' : '') + prop;
-  prefix = prefix || '';
-
-  if (subprops) {
-    Object.defineProperty(prototype, prop, {
-      enumerable: true,
-      configurable: true,
-      get: function() {
-        var _this = this;
-        if (!this.$__.getters) {
-          this.$__.getters = {};
-        }
-
-        if (!this.$__.getters[path]) {
-          var nested = Object.create(Object.getPrototypeOf(this), getOwnPropertyDescriptors(this));
-
-          // save scope for nested getters/setters
-          if (!prefix) {
-            nested.$__.scope = this;
-          }
-
-          // shadow inherited getters from sub-objects so
-          // thing.nested.nested.nested... doesn't occur (gh-366)
-          var i = 0,
-              len = keys.length;
-
-          for (; i < len; ++i) {
-            // over-write the parents getter without triggering it
-            Object.defineProperty(nested, keys[i], {
-              enumerable: false,    // It doesn't show up.
-              writable: true,       // We can set it later.
-              configurable: true,   // We can Object.defineProperty again.
-              value: undefined      // It shadows its parent.
-            });
-          }
-
-          Object.defineProperty(nested, 'toObject', {
-            enumerable: false,
-            configurable: true,
-            writable: false,
-            value: function() {
-              return clone(_this.get(path), { retainKeyOrder: true });
-            }
-          });
-
-          Object.defineProperty(nested, 'toJSON', {
-            enumerable: false,
-            configurable: true,
-            writable: false,
-            value: function() {
-              return _this.get(path);
-            }
-          });
-
-          Object.defineProperty(nested, '$__isNested', {
-            enumerable: false,
-            configurable: true,
-            writable: false,
-            value: true
-          });
-
-          compile(subprops, nested, path, options);
-          this.$__.getters[path] = nested;
-        }
-
-        return this.$__.getters[path];
-      },
-      set: function(v) {
-        if (v instanceof Document) {
-          v = v.toObject({ transform: false });
-        }
-        return (this.$__.scope || this).set(path, v);
-      }
-    });
-  } else {
-    Object.defineProperty(prototype, prop, {
-      enumerable: true,
-      configurable: true,
-      get: function() {
-        return this.get.call(this.$__.scope || this, path);
-      },
-      set: function(v) {
-        return this.set.call(this.$__.scope || this, path, v);
-      }
-    });
-  }
-}
-
 /**
  * Assigns/compiles `schema` into this documents prototype.
  *

package/lib/document_provider.js

@@ -8,14 +8,23 @@
 var Document = require('./document.js');
 var BrowserDocument = require('./browserDocument.js');
 
+var isBrowser = false;
+
 /**
  * Returns the Document constructor for the current context
  *
  * @api private
  */
 module.exports = function() {
-  if (typeof window !== 'undefined' && typeof document !== 'undefined' && document === window.document) {
+  if (isBrowser) {
     return BrowserDocument;
   }
   return Document;
 };
+
+/*!
+ * ignore
+ */
+module.exports.setBrowser = function(flag) {
+  isBrowser = flag;
+};

package/lib/error/browserMissingSchema.js

@@ -15,7 +15,11 @@ function MissingSchemaError() {
           + 'Use mongoose.Document(name, schema)';
   MongooseError.call(this, msg);
   this.name = 'MissingSchemaError';
-  Error.captureStackTrace && Error.captureStackTrace(this, arguments.callee);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this);
+  } else {
+    this.stack = new Error().stack;
+  }
 }
 
 /*!

package/lib/error/divergentArray.js

@@ -24,7 +24,11 @@ function DivergentArrayError(paths) {
 
   MongooseError.call(this, msg);
   this.name = 'DivergentArrayError';
-  Error.captureStackTrace && Error.captureStackTrace(this, arguments.callee);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this);
+  } else {
+    this.stack = new Error().stack;
+  }
 }
 
 /*!

package/lib/error/missingSchema.js

@@ -16,7 +16,11 @@ function MissingSchemaError(name) {
           + 'Use mongoose.model(name, schema)';
   MongooseError.call(this, msg);
   this.name = 'MissingSchemaError';
-  Error.captureStackTrace && Error.captureStackTrace(this, arguments.callee);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this);
+  } else {
+    this.stack = new Error().stack;
+  }
 }
 
 /*!

package/lib/error/overwriteModel.js

@@ -14,7 +14,11 @@ var MongooseError = require('../error.js');
 function OverwriteModelError(name) {
   MongooseError.call(this, 'Cannot overwrite `' + name + '` model once compiled.');
   this.name = 'OverwriteModelError';
-  Error.captureStackTrace && Error.captureStackTrace(this, arguments.callee);
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this);
+  } else {
+    this.stack = new Error().stack;
+  }
 }
 
 /*!

package/lib/index.js

@@ -858,13 +858,3 @@ MongooseThenable.prototype.catch = function(onRejected) {
  */
 
 var mongoose = module.exports = exports = new Mongoose;
-
-/*!
- * ignore
- */
-
-if (typeof jest !== 'undefined' && typeof window !== 'undefined') {
-  console.warn('You are running mongoose with jest in the jsdom environment. ' +
-    'You probably do not want to do this. Switch to the node environment: ' +
-    'https://facebook.github.io/jest/docs/configuration.html#testenvironment-string');
-}

package/lib/model.js

@@ -865,7 +865,10 @@ for (var i in EventEmitter.prototype) {
 Model.init = function init() {
   if ((this.schema.options.autoIndex) ||
       (this.schema.options.autoIndex == null && this.db.config.autoIndex)) {
-    this.ensureIndexes({ __noPromise: true, _automatic: true });
+    var _this = this;
+    setImmediate(function() {
+      _this.ensureIndexes({ __noPromise: true, _automatic: true });
+    });
   }
 
   this.schema.emit('init', this);
@@ -1283,7 +1286,7 @@ Model.find = function find(conditions, projection, options, callback) {
  *
  * Note: `findById()` triggers `findOne` hooks.
  *
- * * Except for how it treats `undefined`. If you use `findOne()`, you'll see
+ * \* Except for how it treats `undefined`. If you use `findOne()`, you'll see
  * that `findOne(undefined)` and `findOne({ _id: undefined })` are equivalent
  * to `findOne({})` and return arbitrary documents. However, mongoose
  * translates `findById(undefined)` into `findOne({ _id: null })`.
@@ -1562,12 +1565,12 @@ Model.$where = function $where() {
  * ####Example:
  *
  *     var query = { name: 'borne' };
- *     Model.findOneAndUpdate(query, { name: 'jason borne' }, options, callback)
+ *     Model.findOneAndUpdate(query, { name: 'jason bourne' }, options, callback)
  *
  *     // is sent as
- *     Model.findOneAndUpdate(query, { $set: { name: 'jason borne' }}, options, callback)
+ *     Model.findOneAndUpdate(query, { $set: { name: 'jason bourne' }}, options, callback)
  *
- * This helps prevent accidentally overwriting your document with `{ name: 'jason borne' }`.
+ * This helps prevent accidentally overwriting your document with `{ name: 'jason bourne' }`.
  *
  * ####Note:
  *
@@ -1586,7 +1589,7 @@ Model.$where = function $where() {
  *
  *     Model.findById(id, function (err, doc) {
  *       if (err) ..
- *       doc.name = 'jason borne';
+ *       doc.name = 'jason bourne';
  *       doc.save(callback);
  *     });
  *
@@ -1676,12 +1679,12 @@ Model.findOneAndUpdate = function(conditions, update, options, callback) {
  *
  * ####Example:
  *
- *     Model.findByIdAndUpdate(id, { name: 'jason borne' }, options, callback)
+ *     Model.findByIdAndUpdate(id, { name: 'jason bourne' }, options, callback)
  *
  *     // is sent as
- *     Model.findByIdAndUpdate(id, { $set: { name: 'jason borne' }}, options, callback)
+ *     Model.findByIdAndUpdate(id, { $set: { name: 'jason bourne' }}, options, callback)
  *
- * This helps prevent accidentally overwriting your document with `{ name: 'jason borne' }`.
+ * This helps prevent accidentally overwriting your document with `{ name: 'jason bourne' }`.
  *
  * ####Note:
  *
@@ -1700,7 +1703,7 @@ Model.findOneAndUpdate = function(conditions, update, options, callback) {
  *
  *     Model.findById(id, function (err, doc) {
  *       if (err) ..
- *       doc.name = 'jason borne';
+ *       doc.name = 'jason bourne';
  *       doc.save(callback);
  *     });
  *
@@ -1775,7 +1778,7 @@ Model.findByIdAndUpdate = function(id, update, options, callback) {
  *
  *     Model.findById(id, function (err, doc) {
  *       if (err) ..
- *       doc.name = 'jason borne';
+ *       doc.name = 'jason bourne';
  *       doc.save(callback);
  *     });
  *
@@ -2325,13 +2328,13 @@ Model.hydrate = function(obj) {
  * ####Example:
  *
  *     var query = { name: 'borne' };
- *     Model.update(query, { name: 'jason borne' }, options, callback)
+ *     Model.update(query, { name: 'jason bourne' }, options, callback)
  *
  *     // is sent as
- *     Model.update(query, { $set: { name: 'jason borne' }}, options, callback)
+ *     Model.update(query, { $set: { name: 'jason bourne' }}, options, callback)
  *     // if overwrite option is false. If overwrite is true, sent without the $set wrapper.
  *
- * This helps prevent accidentally overwriting all documents in your collection with `{ name: 'jason borne' }`.
+ * This helps prevent accidentally overwriting all documents in your collection with `{ name: 'jason bourne' }`.
  *
  * ####Note:
  *
@@ -2356,7 +2359,7 @@ Model.hydrate = function(obj) {
  *
  *     Model.findOne({ name: 'borne' }, function (err, doc) {
  *       if (err) ..
- *       doc.name = 'jason borne';
+ *       doc.name = 'jason bourne';
  *       doc.save(callback);
  *     })
  *
@@ -3136,6 +3139,14 @@ function populate(model, docs, options, callback) {
     var key;
     var val;
 
+    // Clone because `assignRawDocsToIdStructure` will mutate the array
+    var allIds = [].concat(mod.allIds.map(function(v) {
+      if (Array.isArray(v)) {
+        return [].concat(v);
+      }
+      return v;
+    }));
+
     // optimization:
     // record the document positions as returned by
     // the query result.
@@ -3197,6 +3208,7 @@ function populate(model, docs, options, callback) {
     assignVals({
       originalModel: model,
       rawIds: mod.allIds,
+      allIds: allIds,
       localField: mod.localField,
       foreignField: mod.foreignField,
       rawDocs: rawDocs,
@@ -3205,7 +3217,8 @@ function populate(model, docs, options, callback) {
       path: options.path,
       options: assignmentOpts,
       justOne: mod.justOne,
-      isVirtual: mod.isVirtual
+      isVirtual: mod.isVirtual,
+      allOptions: mod
     });
   }
 }
@@ -3259,6 +3272,9 @@ function assignVals(o) {
         }
         cur = cur[parts[j]];
       }
+      if (docs[i].$__) {
+        docs[i].populated(o.path, o.allIds[i], o.allOptions);
+      }
       utils.setValue(o.path, rawIds[i], docs[i], setValue);
     }
   }
@@ -3454,9 +3470,6 @@ function getModelsMapForPopulate(model, docs, options) {
     var ret = convertTo_id(utils.getValue(localField, doc));
     var id = String(utils.getValue(foreignField, doc));
     options._docs[id] = Array.isArray(ret) ? ret.slice() : ret;
-    if (doc.$__) {
-      doc.populated(options.path, options._docs[id], options);
-    }
 
     var k = modelNames.length;
     while (k--) {

package/lib/query.js

@@ -1305,11 +1305,16 @@ function completeMany(model, docs, fields, userProvidedFields, pop, callback) {
   var arr = [];
   var count = docs.length;
   var len = count;
-  var opts = pop ?
-  {populated: pop}
-      : undefined;
-  function init(err) {
-    if (err) return callback(err);
+  var opts = pop ? { populated: pop } : undefined;
+  var error = null;
+  function init(_error) {
+    if (error != null) {
+      return;
+    }
+    if (_error != null) {
+      error = _error;
+      return callback(error);
+    }
     --count || callback(null, arr);
   }
   for (var i = 0; i < len; ++i) {

package/lib/queryhelpers.js

@@ -101,9 +101,9 @@ exports.applyPaths = function applyPaths(fields, schema) {
   // if selecting, apply default schematype select:true fields
   // if excluding, apply schematype select:false fields
 
-  var selected = [],
-      excluded = [],
-      seen = [];
+  var selected = [];
+  var excluded = [];
+  var stack = [];
 
   var analyzePath = function(path, type) {
     if (typeof type.selected !== 'boolean') return;
@@ -133,8 +133,10 @@ exports.applyPaths = function applyPaths(fields, schema) {
     prefix || (prefix = '');
 
     // avoid recursion
-    if (~seen.indexOf(schema)) return;
-    seen.push(schema);
+    if (stack.indexOf(schema) !== -1) {
+      return;
+    }
+    stack.push(schema);
 
     schema.eachPath(function(path, type) {
       if (prefix) path = prefix + '.' + path;
@@ -146,6 +148,8 @@ exports.applyPaths = function applyPaths(fields, schema) {
         analyzeSchema(type.schema, path);
       }
     });
+
+    stack.pop();
   };
 
   analyzeSchema(schema);

package/lib/schema/embedded.js

@@ -133,7 +133,13 @@ Embedded.prototype.cast = function(val, doc, init, priorVal) {
     }
 
     if (priorVal && priorVal.$isSingleNested) {
-      subdoc = new this.caster(priorVal.toObject(), doc ? doc.$__.selected : void 0, doc);
+      var _priorVal = priorVal.toObject({
+        minimize: true,
+        transform: false,
+        virtuals: false,
+        getters: false
+      });
+      subdoc = new this.caster(_priorVal, doc ? doc.$__.selected : void 0, doc);
     } else {
       subdoc = new this.caster(void 0, doc ? doc.$__.selected : void 0, doc);
     }

package/lib/schema/objectid.js

@@ -20,10 +20,14 @@ var SchemaType = require('../schematype'),
  */
 
 function ObjectId(key, options) {
-  if ((typeof key === 'string' && key.length === 24) || typeof key === 'undefined') {
-    console.warn('To create a new ObjectId please try ' +
+  var isKeyHexStr = typeof key === 'string' && /^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 ' +
       '`Mongoose.Types.ObjectId` instead of using ' +
-      '`Mongoose.Schema.ObjectId`.');
+      '`Mongoose.Schema.ObjectId`. Set the `suppressWarning` option if ' +
+      'you\'re trying to create a hex char path in your schema.');
+    console.trace();
   }
   SchemaType.call(this, key, options, 'ObjectID');
 }

package/lib/schema.js

@@ -277,7 +277,7 @@ Schema.prototype.tree;
  */
 
 Schema.prototype.clone = function() {
-  var s = new Schema(this.obj, this.options);
+  var s = new Schema(this.paths, this.options);
   // Clone the call queue
   s.callQueue = this.callQueue.map(function(f) { return f; });
   s.methods = utils.clone(this.methods);
@@ -531,6 +531,10 @@ Schema.prototype.path = function(path, obj) {
  */
 
 Schema.interpretAsType = function(path, obj, options) {
+  if (obj instanceof SchemaType) {
+    return obj;
+  }
+
   if (obj.constructor) {
     var constructorName = utils.getFunctionName(obj.constructor);
     if (constructorName !== 'Object') {
@@ -775,28 +779,35 @@ Schema.prototype.hasMixedParent = function(path) {
  */
 Schema.prototype.setupTimestamp = function(timestamps) {
   if (timestamps) {
-    var createdAt = timestamps.createdAt || 'createdAt';
-    var updatedAt = timestamps.updatedAt || 'updatedAt';
+    var createdAt = handleTimestampOption(timestamps, 'createdAt');
+    var updatedAt = handleTimestampOption(timestamps, 'updatedAt');
     var schemaAdditions = {};
 
-    var parts = createdAt.split('.');
+    var parts;
     var i;
-    var cur = schemaAdditions;
-    if (this.pathType(createdAt) === 'adhocOrUndefined') {
-      for (i = 0; i < parts.length; ++i) {
-        cur[parts[i]] = (i < parts.length - 1 ?
-          cur[parts[i]] || {} :
-          Date);
+    var cur;
+
+    if (createdAt != null) {
+      cur = schemaAdditions;
+      parts = createdAt.split('.');
+      if (this.pathType(createdAt) === 'adhocOrUndefined') {
+        for (i = 0; i < parts.length; ++i) {
+          cur[parts[i]] = (i < parts.length - 1 ?
+            cur[parts[i]] || {} :
+            Date);
+        }
       }
     }
 
-    parts = updatedAt.split('.');
-    cur = schemaAdditions;
-    if (this.pathType(createdAt) === 'adhocOrUndefined') {
-      for (i = 0; i < parts.length; ++i) {
-        cur[parts[i]] = (i < parts.length - 1 ?
-          cur[parts[i]] || {} :
-          Date);
+    if (updatedAt != null) {
+      parts = updatedAt.split('.');
+      cur = schemaAdditions;
+      if (this.pathType(createdAt) === 'adhocOrUndefined') {
+        for (i = 0; i < parts.length; ++i) {
+          cur[parts[i]] = (i < parts.length - 1 ?
+            cur[parts[i]] || {} :
+            Date);
+        }
       }
     }
 
@@ -806,12 +817,20 @@ Schema.prototype.setupTimestamp = function(timestamps) {
       var defaultTimestamp = new Date();
       var auto_id = this._id && this._id.auto;
 
-      if (!this.get(createdAt) && this.isSelected(createdAt)) {
+      if (createdAt != null && !this.get(createdAt) && this.isSelected(createdAt)) {
         this.set(createdAt, auto_id ? this._id.getTimestamp() : defaultTimestamp);
       }
 
-      if (this.isNew || this.isModified()) {
-        this.set(updatedAt, this.isNew ? this.get(createdAt) : defaultTimestamp);
+      if (updatedAt != null && (this.isNew || this.isModified())) {
+        var ts = defaultTimestamp;
+        if (this.isNew) {
+          if (createdAt != null) {
+            ts = this.get(createdAt);
+          } else if (auto_id) {
+            ts = this._id.getTimestamp();
+          }
+        }
+        this.set(updatedAt, ts);
       }
 
       next();
@@ -827,10 +846,10 @@ Schema.prototype.setupTimestamp = function(timestamps) {
           updates.$set = {};
           _updates = updates.$set;
         }
-        if (!currentUpdate[updatedAt]) {
+        if (updatedAt != null && !currentUpdate[updatedAt]) {
           _updates[updatedAt] = now;
         }
-        if (!currentUpdate[createdAt]) {
+        if (createdAt != null && !currentUpdate[createdAt]) {
           _updates[createdAt] = now;
         }
         return updates;
@@ -838,19 +857,22 @@ Schema.prototype.setupTimestamp = function(timestamps) {
       updates = { $set: {} };
       currentUpdate = currentUpdate || {};
 
-      if (!currentUpdate.$currentDate || !currentUpdate.$currentDate[updatedAt]) {
+      if (updatedAt != null &&
+          (!currentUpdate.$currentDate || !currentUpdate.$currentDate[updatedAt])) {
         updates.$set[updatedAt] = now;
       }
 
-      if (currentUpdate[createdAt]) {
-        delete currentUpdate[createdAt];
-      }
-      if (currentUpdate.$set && currentUpdate.$set[createdAt]) {
-        delete currentUpdate.$set[createdAt];
-      }
+      if (createdAt != null) {
+        if (currentUpdate[createdAt]) {
+          delete currentUpdate[createdAt];
+        }
+        if (currentUpdate.$set && currentUpdate.$set[createdAt]) {
+          delete currentUpdate.$set[createdAt];
+        }
 
-      updates.$setOnInsert = {};
-      updates.$setOnInsert[createdAt] = now;
+        updates.$setOnInsert = {};
+        updates.$setOnInsert[createdAt] = now;
+      }
 
       return updates;
     };
@@ -885,6 +907,23 @@ Schema.prototype.setupTimestamp = function(timestamps) {
   }
 };
 
+/*!
+ * ignore
+ */
+
+function handleTimestampOption(arg, prop) {
+  if (typeof arg === 'boolean') {
+    return prop;
+  }
+  if (typeof arg[prop] === 'boolean') {
+    return arg[prop] ? prop : null;
+  }
+  if (!(prop in arg)) {
+    return prop;
+  }
+  return arg[prop];
+}
+
 /*!
  * ignore
  */
@@ -912,16 +951,24 @@ function applyTimestampsToChildren(query) {
             $path.$isMongooseDocumentArray &&
             $path.schema.options.timestamps) {
           timestamps = $path.schema.options.timestamps;
-          createdAt = timestamps.createdAt || 'createdAt';
-          updatedAt = timestamps.updatedAt || 'updatedAt';
+          createdAt = handleTimestampOption(timestamps, 'createdAt');
+          updatedAt = handleTimestampOption(timestamps, 'updatedAt');
           if (update.$push[key].$each) {
             update.$push[key].$each.forEach(function(subdoc) {
-              subdoc[updatedAt] = now;
-              subdoc[createdAt] = now;
+              if (updatedAt != null) {
+                subdoc[updatedAt] = now;
+              }
+              if (createdAt != null) {
+                subdoc[createdAt] = now;
+              }
             });
           } else {
-            update.$push[key][updatedAt] = now;
-            update.$push[key][createdAt] = now;
+            if (updatedAt != null) {
+              update.$push[key][updatedAt] = now;
+            }
+            if (createdAt != null) {
+              update.$push[key][createdAt] = now;
+            }
           }
         }
       }
@@ -936,20 +983,28 @@ function applyTimestampsToChildren(query) {
           len = update.$set[key].length;
           timestamps = schema.path(key).schema.options.timestamps;
           if (timestamps) {
-            createdAt = timestamps.createdAt || 'createdAt';
-            updatedAt = timestamps.updatedAt || 'updatedAt';
+            createdAt = handleTimestampOption(timestamps, 'createdAt');
+            updatedAt = handleTimestampOption(timestamps, 'updatedAt');
             for (var i = 0; i < len; ++i) {
-              update.$set[key][i][updatedAt] = now;
-              update.$set[key][i][createdAt] = now;
+              if (updatedAt != null) {
+                update.$set[key][i][updatedAt] = now;
+              }
+              if (createdAt != null) {
+                update.$set[key][i][createdAt] = now;
+              }
             }
           }
         } else if (update.$set[key] && path.$isSingleNested) {
           timestamps = schema.path(key).schema.options.timestamps;
           if (timestamps) {
-            createdAt = timestamps.createdAt || 'createdAt';
-            updatedAt = timestamps.updatedAt || 'updatedAt';
-            update.$set[key][updatedAt] = now;
-            update.$set[key][createdAt] = now;
+            createdAt = handleTimestampOption(timestamps, 'createdAt');
+            updatedAt = handleTimestampOption(timestamps, 'updatedAt');
+            if (updatedAt != null) {
+              update.$set[key][updatedAt] = now;
+            }
+            if (createdAt != null) {
+              update.$set[key][createdAt] = now;
+            }
           }
         }
       }

package/lib/services/document/cleanModifiedSubpaths.js

@@ -0,0 +1,18 @@
+'use strict';
+
+/*!
+ * ignore
+ */
+
+module.exports = function cleanModifiedSubpaths(doc, path) {
+  var _modifiedPaths = Object.keys(doc.$__.activePaths.states.modify);
+  var _numModifiedPaths = _modifiedPaths.length;
+  var deleted = 0;
+  for (var j = 0; j < _numModifiedPaths; ++j) {
+    if (_modifiedPaths[j].indexOf(path + '.') === 0) {
+      delete doc.$__.activePaths.states.modify[_modifiedPaths[j]];
+      ++deleted;
+    }
+  }
+  return deleted;
+};

package/lib/services/document/compile.js

@@ -0,0 +1,165 @@
+'use strict';
+
+var Document;
+var utils = require('../../utils');
+
+/*!
+ * exports
+ */
+
+exports.compile = compile;
+exports.defineKey = defineKey;
+
+/*!
+ * Compiles schemas.
+ */
+
+function compile(tree, proto, prefix, options) {
+  Document = Document || require('../../document');
+  var keys = Object.keys(tree);
+  var i = keys.length;
+  var len = keys.length;
+  var limb;
+  var key;
+
+  if (options.retainKeyOrder) {
+    for (i = 0; i < len; ++i) {
+      key = keys[i];
+      limb = tree[key];
+
+      defineKey(key,
+          ((utils.getFunctionName(limb.constructor) === 'Object'
+          && Object.keys(limb).length)
+          && (!limb[options.typeKey] || (options.typeKey === 'type' && limb.type.type))
+              ? limb
+              : null)
+          , proto
+          , prefix
+          , keys
+          , options);
+    }
+  } else {
+    while (i--) {
+      key = keys[i];
+      limb = tree[key];
+
+      defineKey(key,
+          ((utils.getFunctionName(limb.constructor) === 'Object'
+          && Object.keys(limb).length)
+          && (!limb[options.typeKey] || (options.typeKey === 'type' && limb.type.type))
+              ? limb
+              : null)
+          , proto
+          , prefix
+          , keys
+          , options);
+    }
+  }
+}
+
+/*!
+ * Defines the accessor named prop on the incoming prototype.
+ */
+
+function defineKey(prop, subprops, prototype, prefix, keys, options) {
+  Document = Document || require('../../document');
+  var path = (prefix ? prefix + '.' : '') + prop;
+  prefix = prefix || '';
+
+  if (subprops) {
+    Object.defineProperty(prototype, prop, {
+      enumerable: true,
+      configurable: true,
+      get: function() {
+        var _this = this;
+        if (!this.$__.getters) {
+          this.$__.getters = {};
+        }
+
+        if (!this.$__.getters[path]) {
+          var nested = Object.create(Object.getPrototypeOf(this), getOwnPropertyDescriptors(this));
+
+          // save scope for nested getters/setters
+          if (!prefix) {
+            nested.$__.scope = this;
+          }
+
+          // shadow inherited getters from sub-objects so
+          // thing.nested.nested.nested... doesn't occur (gh-366)
+          var i = 0,
+              len = keys.length;
+
+          for (; i < len; ++i) {
+            // over-write the parents getter without triggering it
+            Object.defineProperty(nested, keys[i], {
+              enumerable: false,    // It doesn't show up.
+              writable: true,       // We can set it later.
+              configurable: true,   // We can Object.defineProperty again.
+              value: undefined      // It shadows its parent.
+            });
+          }
+
+          Object.defineProperty(nested, 'toObject', {
+            enumerable: false,
+            configurable: true,
+            writable: false,
+            value: function() {
+              return utils.clone(_this.get(path), { retainKeyOrder: true });
+            }
+          });
+
+          Object.defineProperty(nested, 'toJSON', {
+            enumerable: false,
+            configurable: true,
+            writable: false,
+            value: function() {
+              return _this.get(path);
+            }
+          });
+
+          Object.defineProperty(nested, '$__isNested', {
+            enumerable: false,
+            configurable: true,
+            writable: false,
+            value: true
+          });
+
+          compile(subprops, nested, path, options);
+          this.$__.getters[path] = nested;
+        }
+
+        return this.$__.getters[path];
+      },
+      set: function(v) {
+        if (v instanceof Document) {
+          v = v.toObject({ transform: false });
+        }
+        return (this.$__.scope || this).set(path, v);
+      }
+    });
+  } else {
+    Object.defineProperty(prototype, prop, {
+      enumerable: true,
+      configurable: true,
+      get: function() {
+        return this.get.call(this.$__.scope || this, path);
+      },
+      set: function(v) {
+        return this.set.call(this.$__.scope || this, path, v);
+      }
+    });
+  }
+}
+
+// gets descriptors for all properties of `object`
+// makes all properties non-enumerable to match previous behavior to #2211
+function getOwnPropertyDescriptors(object) {
+  var result = {};
+
+  Object.getOwnPropertyNames(object).forEach(function(key) {
+    result[key] = Object.getOwnPropertyDescriptor(object, key);
+    result[key].enumerable = ['isNew', '$__', 'errors', '_doc'].indexOf(key) === -1;
+  });
+
+  return result;
+}

package/lib/services/model/discriminator.js

@@ -35,6 +35,14 @@ module.exports = function discriminator(model, name, schema) {
   }
 
   function merge(schema, baseSchema) {
+    if (baseSchema.paths._id &&
+        baseSchema.paths._id.options &&
+        !baseSchema.paths._id.options.auto) {
+      var originalSchema = schema;
+      utils.merge(schema, originalSchema, { retainKeyOrder: true });
+      delete schema.paths._id;
+      delete schema.tree._id;
+    }
     utils.merge(schema, baseSchema, { retainKeyOrder: true });
 
     var obj = {};

package/lib/services/query/castUpdate.js

@@ -308,7 +308,7 @@ function castUpdateVal(schema, val, op, $conditional, context) {
     return schema.castForQueryWrapper({
       val: val,
       context: context,
-      $skipQueryCastForUpdate: val != null
+      $skipQueryCastForUpdate: val != null && schema.$isMongooseArray
     });
   }
 

package/lib/types/array.js

@@ -5,7 +5,9 @@
 var EmbeddedDocument = require('./embedded');
 var Document = require('../document');
 var ObjectId = require('./objectid');
+var cleanModifiedSubpaths = require('../services/document/cleanModifiedSubpaths');
 var utils = require('../utils');
+
 var isMongooseObject = utils.isMongooseObject;
 
 /**
@@ -103,7 +105,7 @@ MongooseArray.mixin = {
 
     if (populated && value !== null && value !== undefined) {
       // cast to the populated Models schema
-      Model = populated.options.model;
+      Model = populated.options.model || populated.options.Model;
 
       // only objects are permitted so we can safely assume that
       // non-objects are to be interpreted as _id
@@ -154,7 +156,7 @@ MongooseArray.mixin = {
         }
       }
 
-      parent.markModified(dirtyPath, elem);
+      parent.markModified(dirtyPath, arguments.length > 0 ? elem : parent);
     }
 
     return this;
@@ -306,9 +308,28 @@ MongooseArray.mixin = {
    */
 
   push: function() {
+    var ref = this._schema.caster.options && this._schema.caster.options.ref;
+    if (this.length === 0 &&
+        arguments.length) {
+      var allSubdocs = true;
+      for (var i = 0; i < arguments.length; ++i) {
+        var arg = arguments[i];
+        var model = arg.constructor;
+        allSubdocs = arg instanceof Document &&
+          ref &&
+          (model.modelName === ref || model.baseModelName === ref);
+        if (!allSubdocs) {
+          break;
+        }
+      }
+
+      if (allSubdocs) {
+        this._parent.populated(this._path, [], { model: arguments[0].constructor });
+      }
+    }
     var values = [].map.call(arguments, this._mapCast, this);
     values = this._schema.applySetters(values, this._parent, undefined,
-        undefined, {skipDocumentArrayCast: true});
+        undefined, { skipDocumentArrayCast: true });
     var ret = [].push.apply(this, values);
 
     // $pushAll might be fibbed (could be $push). But it makes it easier to
@@ -539,6 +560,15 @@ MongooseArray.mixin = {
     }
 
     this._markModified();
+
+    // Might have modified child paths and then pulled, like
+    // `doc.children[1].name = 'test';` followed by
+    // `doc.children.remove(doc.children[0]);`. In this case we fall back
+    // to a `$set` on the whole array. See #3511
+    if (cleanModifiedSubpaths(this._parent, this._path) > 0) {
+      this._registerAtomic('$set', this);
+    }
+
     return this;
   },
 

package/lib/types/buffer.js

@@ -203,6 +203,19 @@ MongooseBuffer.mixin.toObject = function(options) {
   return new Binary(this, subtype);
 };
 
+/**
+ * Converts this buffer for storage in MongoDB, including subtype
+ *
+ * @return {Binary}
+ * @api public
+ * @method toBSON
+ * @receiver MongooseBuffer
+ */
+
+MongooseBuffer.mixin.toBSON = function() {
+  return new Binary(this, this._subtype || 0);
+};
+
 /**
  * Determines if this buffer is equals to `other` buffer
  *

package/lib/types/subdocument.js

@@ -60,7 +60,7 @@ Subdocument.prototype.markModified = function(path) {
     if (this.$parent.isDirectModified(this.$basePath)) {
       return;
     }
-    this.$parent.markModified([this.$basePath, path].join('.'));
+    this.$parent.markModified([this.$basePath, path].join('.'), this);
   }
 };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "4.11.8",
+  "version": "4.11.12",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -55,6 +55,7 @@
     "tbd": "0.6.4",
     "uglify-js": "2.7.0",
     "uuid": "2.0.3",
+    "uuid-parse": "1.0.0",
     "validator": "5.4.0"
   },
   "browserDependencies": {