mongoose 6.2.1 → 6.2.4

package/lib/queryhelpers.js

@@ -26,9 +26,9 @@ exports.preparePopulationOptions = function preparePopulationOptions(query, opti
 
   // lean options should trickle through all queries
   if (options.lean != null) {
-    pop.
-      filter(p => get(p, 'options.lean') == null).
-      forEach(makeLean(options.lean));
+    pop
+      .filter(p => (p && p.options && p.options.lean) == null)
+      .forEach(makeLean(options.lean));
   }
 
   pop.forEach(opts => {
@@ -53,12 +53,12 @@ exports.preparePopulationOptionsMQ = function preparePopulationOptionsMQ(query,
 
   // lean options should trickle through all queries
   if (options.lean != null) {
-    pop.
-      filter(p => get(p, 'options.lean') == null).
-      forEach(makeLean(options.lean));
+    pop
+      .filter(p => (p && p.options && p.options.lean) == null)
+      .forEach(makeLean(options.lean));
   }
 
-  const session = get(query, 'options.session', null);
+  const session = query && query.options && query.options.session || null;
   if (session != null) {
     pop.forEach(path => {
       if (path.options == null) {
@@ -272,7 +272,7 @@ exports.applyPaths = function applyPaths(fields, schema) {
     // Special case: if user has included a parent path of a discriminator key,
     // don't explicitly project in the discriminator key because that will
     // project out everything else under the parent path
-    if (!exclude && get(type, 'options.$skipDiscriminatorCheck', false)) {
+    if (!exclude && (type && type.options && type.options.$skipDiscriminatorCheck || false)) {
       let cur = '';
       for (let i = 0; i < pieces.length; ++i) {
         cur += (cur.length === 0 ? '' : '.') + pieces[i];
@@ -308,23 +308,3 @@ function makeLean(val) {
     option.options.lean = val;
   };
 }
-
-/*!
- * Handle the `WriteOpResult` from the server
- */
-
-exports.handleDeleteWriteOpResult = function handleDeleteWriteOpResult(callback) {
-  return function _handleDeleteWriteOpResult(error, res) {
-    if (error) {
-      return callback(error);
-    }
-    const mongooseResult = Object.assign({}, res.result);
-    if (get(res, 'result.n', null) != null) {
-      mongooseResult.deletedCount = res.result.n;
-    }
-    if (res.deletedCount != null) {
-      mongooseResult.deletedCount = res.deletedCount;
-    }
-    return callback(null, mongooseResult);
-  };
-};

package/lib/schema/SubdocumentPath.js

@@ -13,7 +13,6 @@ const $exists = require('./operators/exists');
 const castToNumber = require('./operators/helpers').castToNumber;
 const discriminator = require('../helpers/model/discriminator');
 const geospatial = require('./operators/geospatial');
-const get = require('../helpers/get');
 const getConstructor = require('../helpers/discriminator/getConstructor');
 const handleIdOption = require('../helpers/schema/handleIdOption');
 const internalToObjectOptions = require('../options').internalToObjectOptions;
@@ -164,7 +163,7 @@ SubdocumentPath.prototype.cast = function(val, doc, init, priorVal, options) {
   let subdoc;
 
   // Only pull relevant selected paths and pull out the base path
-  const parentSelected = get(doc, '$__.selected', {});
+  const parentSelected = doc && doc.$__ && doc.$__.selected || {};
   const path = this.path;
   const selected = Object.keys(parentSelected).reduce((obj, key) => {
     if (key.startsWith(path + '.')) {
@@ -240,7 +239,7 @@ SubdocumentPath.prototype.doValidate = function(value, fn, scope, options) {
   const Constructor = getConstructor(this.caster, value);
 
   if (value && !(value instanceof Constructor)) {
-    value = new Constructor(value, null, scope);
+    value = new Constructor(value, null, (scope != null && scope.$__ != null) ? scope : null);
   }
 
   if (options && options.skipSchemaValidators) {
@@ -301,7 +300,9 @@ SubdocumentPath.prototype.doValidateSync = function(value, scope, options) {
 SubdocumentPath.prototype.discriminator = function(name, schema, options) {
   options = options || {};
   const value = utils.isPOJO(options) ? options.value : options;
-  const clone = get(options, 'clone', true);
+  const clone = typeof options.clone === 'boolean'
+    ? options.clone
+    : true;
 
   if (schema.instanceOfSchema && clone) {
     schema = schema.clone();

package/lib/schema/array.js

@@ -13,7 +13,6 @@ const CastError = SchemaType.CastError;
 const Mixed = require('./mixed');
 const arrayDepth = require('../helpers/arrayDepth');
 const cast = require('../cast');
-const get = require('../helpers/get');
 const isOperator = require('../helpers/query/isOperator');
 const util = require('util');
 const utils = require('../utils');
@@ -218,7 +217,7 @@ SchemaArray.prototype.checkRequired = function checkRequired(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     SchemaArray.checkRequired();
 
@@ -236,7 +235,9 @@ SchemaArray.prototype.checkRequired = function checkRequired(value, doc) {
 SchemaArray.prototype.enum = function() {
   let arr = this;
   while (true) {
-    const instance = get(arr, 'caster.instance');
+    const instance = arr &&
+    arr.caster &&
+    arr.caster.instance;
     if (instance === 'Array') {
       arr = arr.caster;
       continue;
@@ -583,9 +584,15 @@ function cast$elemMatch(val) {
 
   // Is this an embedded discriminator and is the discriminator key set?
   // If so, use the discriminator schema. See gh-7449
-  const discriminatorKey = get(this,
-    'casterConstructor.schema.options.discriminatorKey');
-  const discriminators = get(this, 'casterConstructor.schema.discriminators', {});
+  const discriminatorKey = this &&
+    this.casterConstructor &&
+    this.casterConstructor.schema &&
+    this.casterConstructor.schema.options &&
+    this.casterConstructor.schema.options.discriminatorKey;
+  const discriminators = this &&
+  this.casterConstructor &&
+  this.casterConstructor.schema &&
+  this.casterConstructor.schema.discriminators || {};
   if (discriminatorKey != null &&
       val[discriminatorKey] != null &&
       discriminators[val[discriminatorKey]] != null) {

package/lib/schema/buffer.js

@@ -202,7 +202,7 @@ SchemaBuffer.prototype.cast = function(value, doc, init) {
 
 /**
  * Sets the default [subtype](https://studio3t.com/whats-new/best-practices-uuid-mongodb/)
- * for this buffer. You can find a [list of allowed subtypes here](http://api.mongodb.com/python/current/api/bson/binary.html).
+ * for this buffer. You can find a [list of allowed subtypes here](https://api.mongodb.com/python/current/api/bson/binary.html).
  *
  * ####Example:
  *

package/lib/schema/date.js

@@ -201,7 +201,7 @@ SchemaDate.prototype.checkRequired = function(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     SchemaDate.checkRequired();
   return _checkRequired(value);

package/lib/schema/decimal128.js

@@ -146,7 +146,7 @@ Decimal128.prototype.checkRequired = function checkRequired(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     Decimal128.checkRequired();
 

package/lib/schema/documentarray.js

@@ -11,7 +11,6 @@ const SchemaDocumentArrayOptions =
   require('../options/SchemaDocumentArrayOptions');
 const SchemaType = require('../schematype');
 const discriminator = require('../helpers/model/discriminator');
-const get = require('../helpers/get');
 const handleIdOption = require('../helpers/schema/handleIdOption');
 const util = require('util');
 const utils = require('../utils');
@@ -68,7 +67,9 @@ function DocumentArrayPath(key, schema, options, schemaOptions) {
 
   const parentSchemaType = this;
   this.$embeddedSchemaType = new SchemaType(key + '.$', {
-    required: get(this, 'schemaOptions.required', false)
+    required: this &&
+      this.schemaOptions &&
+      this.schemaOptions.required || false
   });
   this.$embeddedSchemaType.cast = function(value, doc, init) {
     return parentSchemaType.cast(value, doc, init)[0];
@@ -173,7 +174,7 @@ DocumentArrayPath.prototype.discriminator = function(name, schema, options) {
 
   options = options || {};
   const tiedValue = utils.isPOJO(options) ? options.value : options;
-  const clone = get(options, 'clone', true);
+  const clone = typeof options.clone === 'boolean' ? options.clone : true;
 
   if (schema.instanceOfSchema && clone) {
     schema = schema.clone();
@@ -364,6 +365,9 @@ DocumentArrayPath.prototype.getDefault = function(scope) {
   return ret;
 };
 
+const _toObjectOptions = Object.freeze({ transform: false, virtuals: false });
+const initDocumentOptions = Object.freeze({ skipId: true, willInit: true });
+
 /**
  * Casts contents
  *
@@ -383,7 +387,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
 
   let selected;
   let subdoc;
-  const _opts = { transform: false, virtuals: false };
+
   options = options || {};
 
   if (!Array.isArray(value)) {
@@ -413,9 +417,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   }
 
   const rawArray = utils.isMongooseDocumentArray(value) ? value.__array : value;
-
   const len = rawArray.length;
-  const initDocumentOptions = { skipId: true, willInit: true };
 
   for (let i = 0; i < len; ++i) {
     if (!rawArray[i]) {
@@ -463,7 +465,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
           subdoc = prev.id(rawArray[i]._id);
         }
 
-        if (prev && subdoc && utils.deepEqual(subdoc.toObject(_opts), rawArray[i])) {
+        if (prev && subdoc && utils.deepEqual(subdoc.toObject(_toObjectOptions), rawArray[i])) {
           // handle resetting doc with existing id and same data
           subdoc.set(rawArray[i]);
           // if set() is hooked it will have no return value

package/lib/schema/number.js

@@ -170,7 +170,7 @@ SchemaNumber.prototype.checkRequired = function checkRequired(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     SchemaNumber.checkRequired();
 

package/lib/schema/objectid.js

@@ -204,7 +204,7 @@ ObjectId.prototype.checkRequired = function checkRequired(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     ObjectId.checkRequired();
 

package/lib/schema/string.js

@@ -253,7 +253,7 @@ SchemaString.prototype.enum = function() {
 };
 
 /**
- * Adds a lowercase [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
+ * Adds a lowercase [setter](https://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * ####Example:
  *
@@ -291,7 +291,7 @@ SchemaString.prototype.lowercase = function(shouldApply) {
 };
 
 /**
- * Adds an uppercase [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
+ * Adds an uppercase [setter](https://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * ####Example:
  *
@@ -327,7 +327,7 @@ SchemaString.prototype.uppercase = function(shouldApply) {
 };
 
 /**
- * Adds a trim [setter](http://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
+ * Adds a trim [setter](https://mongoosejs.com/docs/api.html#schematype_SchemaType-set).
  *
  * The string value will be [trimmed](https://masteringjs.io/tutorials/fundamentals/trim-string) when set.
  *
@@ -566,7 +566,7 @@ SchemaString.prototype.checkRequired = function checkRequired(value, doc) {
 
   // `require('util').inherits()` does **not** copy static properties, and
   // plugins like mongoose-float use `inherits()` for pre-ES6.
-  const _checkRequired = typeof this.constructor.checkRequired == 'function' ?
+  const _checkRequired = typeof this.constructor.checkRequired === 'function' ?
     this.constructor.checkRequired() :
     SchemaString.checkRequired();
 

package/lib/schema.js

@@ -86,7 +86,7 @@ let id = 0;
  *
  * @param {Object|Schema|Array} [definition] Can be one of: object describing schema paths, or schema to copy, or array of objects and schemas
  * @param {Object} [options]
- * @inherits NodeJS EventEmitter http://nodejs.org/api/events.html#events_class_events_eventemitter
+ * @inherits NodeJS EventEmitter https://nodejs.org/api/events.html#events_class_events_eventemitter
  * @event `init`: Emitted after the schema is compiled into a `Model`.
  * @api public
  */
@@ -425,7 +425,7 @@ Schema.prototype.pick = function(paths, options) {
 
 Schema.prototype.defaultOptions = function(options) {
   this._userProvidedOptions = options == null ? {} : utils.clone(options);
-  const baseOptions = get(this, 'base.options', {});
+  const baseOptions = this.base && this.base.options || {};
 
   const strict = 'strict' in baseOptions ? baseOptions.strict : true;
   options = utils.options({
@@ -519,7 +519,7 @@ Schema.prototype.add = function add(obj, prefix) {
     if (key === '_id' && val === false) {
       continue;
     }
-    if (val instanceof VirtualType || get(val, 'constructor.name', null) === 'VirtualType') {
+    if (val instanceof VirtualType || (val.constructor && val.constructor.name || null) === 'VirtualType') {
       this.virtual(val);
       continue;
     }
@@ -1019,6 +1019,10 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         ? cast[options.typeKey]
         : cast;
 
+      if (Array.isArray(type)) {
+        return new MongooseTypes.Array(path, this.interpretAsType(path, type, options), obj);
+      }
+
       name = typeof type === 'string'
         ? type
         : type.schemaName || utils.getFunctionName(type);
@@ -1036,7 +1040,7 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
       if (!MongooseTypes.hasOwnProperty(name)) {
         throw new TypeError('Invalid schema configuration: ' +
           `\`${name}\` is not a valid type within the array \`${path}\`.` +
-          'See http://bit.ly/mongoose-schematypes for a list of valid schema types.');
+          'See https://bit.ly/mongoose-schematypes for a list of valid schema types.');
       }
     }
 
@@ -1076,7 +1080,7 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
   if (MongooseTypes[name] == null) {
     throw new TypeError(`Invalid schema configuration: \`${name}\` is not ` +
       `a valid type at path \`${path}\`. See ` +
-      'http://bit.ly/mongoose-schematypes for a list of valid schema types.');
+      'https://bit.ly/mongoose-schematypes for a list of valid schema types.');
   }
 
   const schemaType = new MongooseTypes[name](path, obj);
@@ -1471,8 +1475,8 @@ Schema.prototype.pre = function(name) {
  * @param {Boolean} [options.document] If `name` is a hook for both document and query middleware, set to `true` to run on document middleware.
  * @param {Boolean} [options.query] If `name` is a hook for both document and query middleware, set to `true` to run on query middleware.
  * @param {Function} fn callback
- * @see middleware http://mongoosejs.com/docs/middleware.html
- * @see kareem http://npmjs.org/package/kareem
+ * @see middleware https://mongoosejs.com/docs/middleware.html
+ * @see kareem https://npmjs.org/package/kareem
  * @api public
  */
 
@@ -1619,7 +1623,7 @@ Schema.prototype.static = function(name, fn) {
  *     schema.index({ first: 1, last: -1 })
  *
  * @param {Object} fields
- * @param {Object} [options] Options to pass to [MongoDB driver's `createIndex()` function](http://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#createIndex)
+ * @param {Object} [options] Options to pass to [MongoDB driver's `createIndex()` function](https://mongodb.github.io/node-mongodb-native/2.0/api/Collection.html#createIndex)
  * @param {String | number} [options.expires=null] Mongoose-specific syntactic sugar, uses [ms](https://www.npmjs.com/package/ms) to convert `expires` option into seconds for the `expireAfterSeconds` in the above link.
  * @api public
  */

package/lib/schematype.js

@@ -8,7 +8,6 @@ const MongooseError = require('./error/index');
 const SchemaTypeOptions = require('./options/SchemaTypeOptions');
 const $exists = require('./schema/operators/exists');
 const $type = require('./schema/operators/type');
-const get = require('./helpers/get');
 const handleImmutable = require('./helpers/schematype/handleImmutable');
 const isAsyncFunction = require('./helpers/isAsyncFunction');
 const immediate = require('./helpers/immediate');
@@ -788,7 +787,7 @@ SchemaType.prototype.get = function(fn) {
  *
  *     // make sure every value is equal to "something"
  *     function validator (val) {
- *       return val == 'something';
+ *       return val === 'something';
  *     }
  *     new Schema({ name: { type: String, validate: validator }});
  *
@@ -916,7 +915,7 @@ SchemaType.prototype.validate = function(obj, message, type) {
     if (!utils.isPOJO(arg)) {
       const msg = 'Invalid validator. Received (' + typeof arg + ') '
           + arg
-          + '. See http://mongoosejs.com/docs/api.html#schematype_SchemaType-validate';
+          + '. See https://mongoosejs.com/docs/api.html#schematype_SchemaType-validate';
 
       throw new Error(msg);
     }
@@ -1026,7 +1025,7 @@ SchemaType.prototype.required = function(required, message) {
   this.isRequired = true;
 
   this.requiredValidator = function(v) {
-    const cachedRequired = get(this, '$__.cachedRequired');
+    const cachedRequired = this && this.$__ && this.$__.cachedRequired;
 
     // no validation when this path wasn't selected in the query.
     if (cachedRequired != null && !this.$__isSelected(_this.path) && !this[documentIsModified](_this.path)) {
@@ -1251,10 +1250,10 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
     return fn(null);
   }
 
-  const _this = this;
-  validators.forEach(function(v) {
+  for (let i = 0, len = validators.length; i < len; ++i) {
+    const v = validators[i];
     if (err) {
-      return;
+      break;
     }
 
     const validator = v.validator;
@@ -1266,16 +1265,16 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
 
     if (validator instanceof RegExp) {
       validate(validator.test(value), validatorProperties);
-      return;
+      continue;
     }
 
     if (typeof validator !== 'function') {
-      return;
+      continue;
     }
 
-    if (value === undefined && validator !== _this.requiredValidator) {
+    if (value === undefined && validator !== this.requiredValidator) {
       validate(true, validatorProperties);
-      return;
+      continue;
     }
 
     try {
@@ -1304,8 +1303,7 @@ SchemaType.prototype.doValidate = function(value, fn, scope, options) {
     } else {
       validate(ok, validatorProperties);
     }
-
-  });
+  }
 
   function validate(ok, validatorProperties) {
     if (err) {
@@ -1477,7 +1475,7 @@ SchemaType.prototype._castRef = function _castRef(value, doc, init) {
   }
 
   if (value.$__ != null) {
-    value.$__.wasPopulated = true;
+    value.$__.wasPopulated = value.$__.wasPopulated || true;
     return value;
   }
 

package/lib/types/ArraySubdocument.js

@@ -31,7 +31,7 @@ function ArraySubdocument(obj, parentArr, skipId, fields, index) {
   this.$setIndex(index);
   this.$__parent = this[documentArrayParent];
 
-  Subdocument.call(this, obj, fields, this[documentArrayParent], void 0, { isNew: true });
+  Subdocument.call(this, obj, fields, this[documentArrayParent], skipId, { isNew: true });
 }
 
 /*!

package/lib/types/DocumentArray/index.js

@@ -25,7 +25,7 @@ const numberRE = /^\d+$/;
  * @api private
  * @return {MongooseDocumentArray}
  * @inherits MongooseArray
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
 
 function MongooseDocumentArray(values, path, doc) {

package/lib/types/array/index.js

@@ -25,7 +25,7 @@ const arraySchemaSymbol = require('../../helpers/symbols').arraySchemaSymbol;
  * @param {Document} doc parent document
  * @api private
  * @inherits Array
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
 const _basePush = Array.prototype.push;
 const numberRE = /^\d+$/;
@@ -51,7 +51,7 @@ function MongooseArray(values, path, doc, schematype) {
     } else {
       __array = new Array();
       for (let i = 0; i < len; ++i) {
-        _basePush.apply(__array, values[i]);
+        _basePush.call(__array, values[i]);
       }
     }
   } else {

package/lib/types/array/methods/index.js

@@ -5,7 +5,6 @@ const ArraySubdocument = require('../../ArraySubdocument');
 const MongooseError = require('../../../error/mongooseError');
 const ObjectId = require('../../objectid');
 const cleanModifiedSubpaths = require('../../../helpers/document/cleanModifiedSubpaths');
-const get = require('../../../helpers/get');
 const internalToObjectOptions = require('../../../options').internalToObjectOptions;
 const utils = require('../../../utils');
 
@@ -104,7 +103,7 @@ const methods = {
    * ####NOTE:
    *
    * _Calling this multiple times on an array before saving sends the same command as calling it once._
-   * _This update is implemented using the MongoDB [$pop](http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
+   * _This update is implemented using the MongoDB [$pop](https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
    *
    *      doc.array = [1,2,3];
    *
@@ -129,7 +128,7 @@ const methods = {
    * @memberOf MongooseArray
    * @instance
    * @method $shift
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
    */
 
   $shift() {
@@ -151,7 +150,7 @@ const methods = {
    * #### NOTE:
    *
    * _Calling this mulitple times on an array before saving sends the same command as calling it once._
-   * _This update is implemented using the MongoDB [$pop](http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
+   * _This update is implemented using the MongoDB [$pop](https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop) method which enforces this restriction._
    *
    *      doc.array = [1,2,3];
    *
@@ -176,7 +175,7 @@ const methods = {
    * @method $pop
    * @memberOf MongooseArray
    * @instance
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pop
    * @method $pop
    * @memberOf MongooseArray
    */
@@ -538,7 +537,7 @@ const methods = {
   /**
    * Pulls items from the array atomically. Equality is determined by casting
    * the provided value to an embedded document and comparing using
-   * [the `Document.equals()` function.](./api.html#document_Document-equals)
+   * [the `Document.equals()` function.](/docs/api.html#document_Document-equals)
    *
    * ####Examples:
    *
@@ -560,7 +559,7 @@ const methods = {
    * The first pull call will result in a atomic operation on the database, if pull is called repeatedly without saving the document, a $set operation is used on the complete array instead, overwriting possible changes that happened on the database in the meantime.
    *
    * @param {any} [args...]
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
    * @api public
    * @method pull
    * @memberOf MongooseArray
@@ -660,7 +659,7 @@ const methods = {
     if (isOverwrite) {
       atomic.$each = values;
 
-      if (get(atomics, '$push.$each.length', 0) > 0 &&
+      if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
           atomics.$push.$position != atomic.$position) {
         throw new MongooseError('Cannot call `Array#push()` multiple times ' +
           'with different `$position`');
@@ -673,7 +672,7 @@ const methods = {
         ret = [].push.apply(arr, values);
       }
     } else {
-      if (get(atomics, '$push.$each.length', 0) > 0 &&
+      if ((atomics.$push && atomics.$push.$each && atomics.$push.$each.length || 0) !== 0 &&
           atomics.$push.$position != null) {
         throw new MongooseError('Cannot call `Array#push()` multiple times ' +
           'with different `$position`');
@@ -691,7 +690,7 @@ const methods = {
    * Alias of [pull](#mongoosearray_MongooseArray-pull)
    *
    * @see MongooseArray#pull #types_array_MongooseArray-pull
-   * @see mongodb http://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
+   * @see mongodb https://www.mongodb.org/display/DOCS/Updating/#Updating-%24pull
    * @api public
    * @memberOf MongooseArray
    * @instance
@@ -926,7 +925,7 @@ function _isAllSubdocs(docs, ref) {
 function _checkManualPopulation(arr, docs) {
   const ref = arr == null ?
     null :
-    get(arr[arraySchemaSymbol], 'caster.options.ref', null);
+    arr[arraySchemaSymbol] && arr[arraySchemaSymbol].caster && arr[arraySchemaSymbol].caster.options && arr[arraySchemaSymbol].caster.options.ref || null;
   if (arr.length === 0 &&
       docs.length !== 0) {
     if (_isAllSubdocs(docs, ref)) {

package/lib/types/buffer.js

@@ -17,7 +17,7 @@ const utils = require('../utils');
  * @param {Number} offset
  * @api private
  * @inherits Buffer
- * @see http://bit.ly/f6CnZU
+ * @see https://bit.ly/f6CnZU
  */
 
 function MongooseBuffer(value, encode, offset) {
@@ -173,7 +173,7 @@ MongooseBuffer.mixin = {
  *
  *   doc.buffer.toObject(bson.BSON_BINARY_SUBTYPE_USER_DEFINED);
  *
- * @see http://bsonspec.org/#/specification
+ * @see https://bsonspec.org/#/specification
  * @param {Hex} [subtype]
  * @return {Binary}
  * @api public
@@ -245,7 +245,7 @@ MongooseBuffer.mixin.equals = function(other) {
  *
  *   doc.buffer.subtype(bson.BSON_BINARY_SUBTYPE_UUID);
  *
- * @see http://bsonspec.org/#/specification
+ * @see https://bsonspec.org/#/specification
  * @param {Hex} subtype
  * @api public
  * @method subtype

package/lib/types/map.js

@@ -4,7 +4,6 @@ const Mixed = require('../schema/mixed');
 const ObjectId = require('./objectid');
 const clone = require('../helpers/clone');
 const deepEqual = require('../utils').deepEqual;
-const get = require('../helpers/get');
 const getConstructorName = require('../helpers/getConstructorName');
 const handleSpreadDoc = require('../helpers/document/handleSpreadDoc');
 const util = require('util');
@@ -83,7 +82,7 @@ class MongooseMap extends Map {
       if (value.$__ == null) {
         value = new populated.options[populateModelSymbol](value);
       }
-      value.$__.wasPopulated = true;
+      value.$__.wasPopulated = { value: populated.value };
     } else {
       try {
         value = this.$__schemaType.
@@ -131,7 +130,7 @@ class MongooseMap extends Map {
   }
 
   toObject(options) {
-    if (get(options, 'flattenMaps')) {
+    if (options && options.flattenMaps) {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {
@@ -148,7 +147,7 @@ class MongooseMap extends Map {
   }
 
   toJSON(options) {
-    if (get(options, 'flattenMaps', true)) {
+    if (typeof (options && options.flattenMaps) === 'boolean' ? options.flattenMaps : true) {
       const ret = {};
       const keys = this.keys();
       for (const key of keys) {