mongoose 6.2.1 → 6.2.4

package/lib/document.js

@@ -16,6 +16,7 @@ const StrictModeError = require('./error/strict');
 const ValidationError = require('./error/validation');
 const ValidatorError = require('./error/validator');
 const VirtualType = require('./virtualtype');
+const $__hasIncludedChildren = require('./helpers/projection/hasIncludedChildren');
 const promiseOrCallback = require('./helpers/promiseOrCallback');
 const cleanModifiedSubpaths = require('./helpers/document/cleanModifiedSubpaths');
 const compile = require('./helpers/document/compile').compile;
@@ -66,7 +67,7 @@ const specialProperties = utils.specialProperties;
  * @param {Object} [fields] optional object containing the fields which were selected in the query returning this document and any populated paths data
  * @param {Object} [options] various configuration options for the document
  * @param {Boolean} [options.defaults=true] if `false`, skip applying default values to this document.
- * @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 on a document after it has been retrieved from the db and fully hydrated by Mongoose.
  * @event `save`: Emitted when the document is successfully saved
  * @api private
@@ -96,6 +97,7 @@ function Document(obj, fields, skipId, options) {
   if ('priorDoc' in options) {
     this.$__.priorDoc = options.priorDoc;
   }
+
   if (skipId) {
     this.$__.skipId = skipId;
   }
@@ -140,7 +142,7 @@ function Document(obj, fields, skipId, options) {
 
   const hasIncludedChildren = exclude === false && fields ?
     $__hasIncludedChildren(fields) :
-    {};
+    null;
 
   if (this._doc == null) {
     this.$__buildDoc(obj, fields, skipId, exclude, hasIncludedChildren, false);
@@ -148,9 +150,7 @@ function Document(obj, fields, skipId, options) {
     // By default, defaults get applied **before** setting initial values
     // Re: gh-6155
     if (defaults) {
-      $__applyDefaults(this, fields, exclude, hasIncludedChildren, true, {
-        isNew: this.$isNew
-      });
+      $__applyDefaults(this, fields, exclude, hasIncludedChildren, true, null);
     }
   }
   if (obj) {
@@ -174,9 +174,7 @@ function Document(obj, fields, skipId, options) {
       this.$__.skipDefaults = options.skipDefaults;
     }
   } else if (defaults) {
-    $__applyDefaults(this, fields, exclude, hasIncludedChildren, false, options.skipDefaults, {
-      isNew: this.$isNew
-    });
+    $__applyDefaults(this, fields, exclude, hasIncludedChildren, false, options.skipDefaults);
   }
 
   this.$__._id = this._id;
@@ -417,33 +415,6 @@ Object.defineProperty(Document.prototype, '$op', {
   }
 });
 
-/*!
- * ignore
- */
-
-function $__hasIncludedChildren(fields) {
-  const hasIncludedChildren = {};
-  const keys = Object.keys(fields);
-
-  for (const key of keys) {
-    if (key.indexOf('.') === -1) {
-      hasIncludedChildren[key] = 1;
-      continue;
-    }
-    const parts = key.split('.');
-    let c = parts[0];
-
-    for (let i = 0; i < parts.length; ++i) {
-      hasIncludedChildren[c] = 1;
-      if (i + 1 < parts.length) {
-        c = c + '.' + parts[i + 1];
-      }
-    }
-  }
-
-  return hasIncludedChildren;
-}
-
 /*!
  * ignore
  */
@@ -479,9 +450,10 @@ function $__applyDefaults(doc, fields, exclude, hasIncludedChildren, isBeforeSet
           break;
         }
       } else if (exclude === false && fields && !included) {
-        if (curPath in fields || type.$isSingleNested && hasIncludedChildren[curPath]) {
+        const hasSubpaths = type.$isSingleNested || type.$isMongooseDocumentArray;
+        if (curPath in fields || (hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
           included = true;
-        } else if (!hasIncludedChildren[curPath]) {
+        } else if (hasIncludedChildren != null && !hasIncludedChildren[curPath]) {
           break;
         }
       }
@@ -775,7 +747,7 @@ Document.prototype.$__init = function(doc, opts) {
 
   const hasIncludedChildren = this.$__.exclude === false && this.$__.fields ?
     $__hasIncludedChildren(this.$__.fields) :
-    {};
+    null;
   $__applyDefaults(this, this.$__.fields, this.$__.exclude, hasIncludedChildren, false, this.$__.skipDefaults);
 
   return this;
@@ -914,9 +886,9 @@ Document.prototype.update = function update() {
  *
  * @see Model.updateOne #model_Model.updateOne
  * @param {Object} doc
- * @param {Object} [options] optional see [`Query.prototype.setOptions()`](http://mongoosejs.com/docs/api.html#query_Query-setOptions)
+ * @param {Object} [options] optional see [`Query.prototype.setOptions()`](https://mongoosejs.com/docs/api.html#query_Query-setOptions)
  * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](/docs/api.html#query_Query-lean) and the [Mongoose lean tutorial](/docs/tutorials/lean.html).
- * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](http://mongoosejs.com/docs/guide.html#strict)
+ * @param {Boolean|String} [options.strict] overwrites the schema's [strict mode option](https://mongoosejs.com/docs/guide.html#strict)
  * @param {Boolean} [options.timestamps=null] If set to `false` and [schema-level timestamps](/docs/guide.html#timestamps) are enabled, skip timestamps for this update. Note that this allows you to overwrite timestamps. Does nothing if schema-level timestamps are not set.
  * @param {Function} callback
  * @return {Query}
@@ -1119,7 +1091,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
 
     // `_skipMinimizeTopLevel` is because we may have deleted the top-level
     // nested key to ensure key order.
-    const _skipMinimizeTopLevel = get(options, '_skipMinimizeTopLevel', false);
+    const _skipMinimizeTopLevel = options._skipMinimizeTopLevel || false;
     if (len === 0 && _skipMinimizeTopLevel) {
       delete options._skipMinimizeTopLevel;
       if (val) {
@@ -1252,7 +1224,6 @@ Document.prototype.$set = function $set(path, val, type, options) {
       } else {
         this.markModified(path);
       }
-      cleanModifiedSubpaths(this, path, { skipDocArrays: true });
       return this;
     }
     this.invalidate(path, new MongooseError.CastError('Object', val, path));
@@ -1263,7 +1234,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
   const parts = path.indexOf('.') === -1 ? [path] : path.split('.');
 
   // Might need to change path for top-level alias
-  if (typeof this.$__schema.aliases[parts[0]] == 'string') {
+  if (typeof this.$__schema.aliases[parts[0]] === 'string') {
     parts[0] = this.$__schema.aliases[parts[0]];
   }
 
@@ -1407,8 +1378,9 @@ Document.prototype.$set = function $set(path, val, type, options) {
 
     let didPopulate = false;
     if (refMatches && val instanceof Document) {
-      this.$populated(path, val._id, { [populateModelSymbol]: val.constructor });
-      val.$__.wasPopulated = true;
+      const unpopulatedValue = (schema && schema.$isSingleNested) ? schema.cast(val, this) : val._id;
+      this.$populated(path, unpopulatedValue, { [populateModelSymbol]: val.constructor });
+      val.$__.wasPopulated = { value: unpopulatedValue };
       didPopulate = true;
     }
 
@@ -1422,7 +1394,7 @@ Document.prototype.$set = function $set(path, val, type, options) {
       this.$populated(path, val.map(function(v) { return v._id; }), popOpts);
 
       for (const doc of val) {
-        doc.$__.wasPopulated = true;
+        doc.$__.wasPopulated = { value: doc._id };
       }
       didPopulate = true;
     }
@@ -1787,7 +1759,7 @@ Document.prototype.get = function(path, type, options) {
   }
 
   // Might need to change path for top-level alias
-  if (typeof this.$__schema.aliases[pieces[0]] == 'string') {
+  if (typeof this.$__schema.aliases[pieces[0]] === 'string') {
     pieces[0] = this.$__schema.aliases[pieces[0]];
   }
 
@@ -2539,7 +2511,9 @@ function _getPathsToValidate(doc) {
         // To avoid potential performance issues, skip doc arrays whose children
         // are not required. `getPositionalPathType()` may be slow, so avoid
         // it unless we have a case of #6364
-        (!Array.isArray(_pathType) && _pathType.$isMongooseDocumentArray && !get(_pathType, 'schemaOptions.required'))) {
+        (!Array.isArray(_pathType) &&
+          _pathType.$isMongooseDocumentArray &&
+          !(_pathType && _pathType.schemaOptions && _pathType.schemaOptions.required))) {
       continue;
     }
 
@@ -2616,7 +2590,7 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
       (typeof options === 'object') &&
       ('validateModifiedOnly' in options);
 
-  const pathsToSkip = get(options, 'pathsToSkip', null);
+  const pathsToSkip = (options && options.pathsToSkip) || null;
 
   let shouldValidateModifiedOnly;
   if (hasValidateModifiedOnlyOption) {
@@ -2877,19 +2851,21 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
   }
   const validating = {};
 
-  paths.forEach(function(path) {
+  for (let i = 0, len = paths.length; i < len; ++i) {
+    const path = paths[i];
+
     if (validating[path]) {
-      return;
+      continue;
     }
 
     validating[path] = true;
 
     const p = _this.$__schema.path(path);
     if (!p) {
-      return;
+      continue;
     }
     if (!_this.$isValid(path)) {
-      return;
+      continue;
     }
 
     const val = _this.$__getValue(path);
@@ -2903,11 +2879,11 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
         p.$isArraySubdocument ||
         p.$isMongooseDocumentArray;
       if (isSubdoc && err instanceof ValidationError) {
-        return;
+        continue;
       }
       _this.invalidate(path, err, undefined, true);
     }
-  });
+  }
 
   const err = _this.$__.validationError;
   _this.$__.validationError = undefined;
@@ -3066,7 +3042,7 @@ function _checkImmutableSubpaths(subdoc, schematype, priorVal) {
  *
  * @param {Object} [options] options optional options
  * @param {Session} [options.session=null] the [session](https://docs.mongodb.com/manual/reference/server-sessions/) associated with this save operation. If not specified, defaults to the [document's associated session](api.html#document_Document-$session).
- * @param {Object} [options.safe] (DEPRECATED) overrides [schema's safe option](http://mongoosejs.com//docs/guide.html#safe). Use the `w` option instead.
+ * @param {Object} [options.safe] (DEPRECATED) overrides [schema's safe option](https://mongoosejs.com//docs/guide.html#safe). Use the `w` option instead.
  * @param {Boolean} [options.validateBeforeSave] set to false to save without validating.
  * @param {Boolean} [options.validateModifiedOnly=false] If `true`, Mongoose will only validate modified paths, as opposed to modified paths and `required` paths.
  * @param {Number|String} [options.w] set the [write concern](https://docs.mongodb.com/manual/reference/write-concern/#w-option). Overrides the [schema-level `writeConcern` option](/docs/guide.html#writeConcern)
@@ -3081,7 +3057,7 @@ function _checkImmutableSubpaths(subdoc, schematype, priorVal) {
  * @throws {DocumentNotFoundError} if this [save updates an existing document](api.html#document_Document-isNew) but the document doesn't exist in the database. For example, you will get this error if the document is [deleted between when you retrieved the document and when you saved it](documents.html#updating).
  * @return {Promise|undefined} Returns undefined if used with callback or a Promise otherwise.
  * @api public
- * @see middleware http://mongoosejs.com/docs/middleware.html
+ * @see middleware https://mongoosejs.com/docs/middleware.html
  */
 
 /**
@@ -3131,7 +3107,7 @@ Document.prototype.$__reset = function reset() {
       return _this.$__getValue(i);
     })
     .filter(function(val) {
-      return val && val instanceof Array && utils.isMongooseDocumentArray(val) && val.length;
+      return val && Array.isArray(val) && utils.isMongooseDocumentArray(val) && val.length;
     })
     .forEach(function(array) {
       let i = array.length;
@@ -3334,7 +3310,7 @@ Document.prototype.$__getArrayPathsToValidate = function() {
       return this.$__getValue(i);
     }.bind(this))
     .filter(function(val) {
-      return val && val instanceof Array && utils.isMongooseDocumentArray(val) && val.length;
+      return val && Array.isArray(val) && utils.isMongooseDocumentArray(val) && val.length;
     }).reduce(function(seed, array) {
       return seed.concat(array);
     }, [])
@@ -3455,8 +3431,11 @@ Document.prototype.$toObject = function(options, json) {
   };
 
   const path = json ? 'toJSON' : 'toObject';
-  const baseOptions = get(this, 'constructor.base.options.' + path, {});
-  const schemaOptions = get(this, '$__schema.options', {});
+  const baseOptions = this.constructor &&
+  this.constructor.base &&
+  this.constructor.base.options &&
+  get(this.constructor.base.options, path) || {};
+  const schemaOptions = this.$__schema && this.$__schema.options || {};
   // merge base default options with Schema's set default options if available.
   // `clone` is necessary here because `utils.options` directly modifies the second input.
   defaultOptions = utils.options(defaultOptions, clone(baseOptions));
@@ -3503,12 +3482,11 @@ Document.prototype.$toObject = function(options, json) {
   }
 
   const depopulate = options.depopulate ||
-    get(options, '_parentOptions.depopulate', false);
+    (options._parentOptions && options._parentOptions.depopulate || false);
   // _isNested will only be true if this is not the top level document, we
-  // should never depopulate
+  // should never depopulate the top-level document
   if (depopulate && options._isNested && this.$__.wasPopulated) {
-    // populated paths that we set to a document
-    return clone(this._id, cloneOptions);
+    return clone(this.$__.wasPopulated.value || this._id, cloneOptions);
   }
 
   // merge default options with input options.
@@ -3583,7 +3561,7 @@ Document.prototype.$toObject = function(options, json) {
 /**
  * Converts this document into a plain-old JavaScript object ([POJO](https://masteringjs.io/tutorials/fundamentals/pojo)).
  *
- * Buffers are converted to instances of [mongodb.Binary](http://mongodb.github.com/node-mongodb-native/api-bson-generated/binary.html) for proper storage.
+ * Buffers are converted to instances of [mongodb.Binary](https://mongodb.github.com/node-mongodb-native/api-bson-generated/binary.html) for proper storage.
  *
  * ####Options:
  *
@@ -3722,7 +3700,7 @@ Document.prototype.$toObject = function(options, json) {
  * @param {Boolean} [options.flattenMaps=false] if true, convert Maps to POJOs. Useful if you want to `JSON.stringify()` the result of `toObject()`.
  * @param {Boolean} [options.useProjection=false] - If true, omits fields that are excluded in this document's projection. Unless you specified a projection, this will omit any field that has `select: false` in the schema.
  * @return {Object} js object
- * @see mongodb.Binary http://mongodb.github.com/node-mongodb-native/api-bson-generated/binary.html
+ * @see mongodb.Binary https://mongodb.github.com/node-mongodb-native/api-bson-generated/binary.html
  * @api public
  * @memberOf Document
  * @instance
@@ -3780,7 +3758,9 @@ function applyVirtuals(self, json, options, toObjectOptions) {
   let assignPath;
   let cur = self._doc;
   let v;
-  const aliases = get(toObjectOptions, 'aliases', true);
+  const aliases = typeof (toObjectOptions && toObjectOptions.aliases) === 'boolean'
+    ? toObjectOptions.aliases
+    : true;
 
   let virtualsToApply = null;
   if (Array.isArray(options.virtuals)) {
@@ -3974,15 +3954,20 @@ function omitDeselectedFields(self, json) {
 }
 
 /**
- * The return value of this method is used in calls to JSON.stringify(doc).
+ * The return value of this method is used in calls to [`JSON.stringify(doc)`](https://thecodebarbarian.com/the-80-20-guide-to-json-stringify-in-javascript#the-tojson-function).
  *
  * This method accepts the same options as [Document#toObject](#document_Document-toObject). To apply the options to every document of your schema by default, set your [schemas](#schema_Schema) `toJSON` option to the same argument.
  *
- *     schema.set('toJSON', { virtuals: true })
+ *     schema.set('toJSON', { virtuals: true });
+ *
+ * There is one difference between `toJSON()` and `toObject()` options.
+ * When you call `toJSON()`, the [`flattenMaps` option](./document.html#document_Document-toObject) defaults to `true`, because `JSON.stringify()` doesn't convert maps to objects by default.
+ * When you call `toObject()`, the `flattenMaps` option is `false` by default.
  *
- * See [schema options](/docs/guide.html#toJSON) for details.
+ * See [schema options](/docs/guide.html#toJSON) for more information on setting `toJSON` option defaults.
  *
  * @param {Object} options
+ * @param {Boolean} [options.flattenMaps=true] if true, convert Maps to [POJOs](https://masteringjs.io/tutorials/fundamentals/pojo). Useful if you want to `JSON.stringify()` the result.
  * @return {Object}
  * @see Document#toObject #document_Document-toObject
  * @see JSON.stringify() in JavaScript https://thecodebarbarian.com/the-80-20-guide-to-json-stringify-in-javascript.html
@@ -4137,6 +4122,7 @@ Document.prototype.equals = function(doc) {
  * @param {Object} [match] Conditions for the population query
  * @param {Object} [options] Options for the population query (sort, etc)
  * @param {String} [options.path=null] The path to populate.
+ * @param {string|PopulateOptions} [options.populate=null] Recursively populate paths in the populated documents. See [deep populate docs](/docs/populate.html#deep-populate).
  * @param {boolean} [options.retainNullValues=false] by default, Mongoose removes null and undefined values from populated arrays. Use this option to make `populate()` retain `null` and `undefined` array entries.
  * @param {boolean} [options.getters=false] if true, Mongoose will call any getters defined on the `localField`. By default, Mongoose gets the raw value of `localField`. For example, you would need to set this option to `true` if you wanted to [add a `lowercase` getter to your `localField`](/docs/schematypes.html#schematype-options).
  * @param {boolean} [options.clone=false] When you do `BlogPost.find().populate('author')`, blog posts with the same author will share 1 copy of an `author` doc. Enable this option to make Mongoose clone populated docs before assigning them.
@@ -4317,7 +4303,7 @@ Document.prototype.depopulate = function(path) {
 
   let populatedIds;
   const virtualKeys = this.$$populatedVirtuals ? Object.keys(this.$$populatedVirtuals) : [];
-  const populated = get(this, '$__.populated', {});
+  const populated = this.$__ && this.$__.populated || {};
 
   if (arguments.length === 0) {
     // Depopulate all

package/lib/drivers/node-mongodb-native/collection.js

@@ -8,7 +8,6 @@ const MongooseCollection = require('../../collection');
 const MongooseError = require('../../error/mongooseError');
 const Collection = require('mongodb').Collection;
 const ObjectId = require('./objectid');
-const get = require('../../helpers/get');
 const getConstructorName = require('../../helpers/getConstructorName');
 const stream = require('stream');
 const util = require('util');
@@ -76,7 +75,11 @@ function iter(i) {
     const collection = this.collection;
     const args = Array.from(arguments);
     const _this = this;
-    const debug = get(_this, 'conn.base.options.debug');
+    const debug = _this &&
+      _this.conn &&
+      _this.conn.base &&
+      _this.conn.base.options &&
+      _this.conn.base.options.debug;
     const lastArg = arguments[arguments.length - 1];
     const opId = new ObjectId();
 
@@ -84,7 +87,7 @@ function iter(i) {
     if (this.conn.$wasForceClosed) {
       const error = new MongooseError('Connection was force closed');
       if (args.length > 0 &&
-          typeof args[args.length - 1] === 'function') {
+        typeof args[args.length - 1] === 'function') {
         args[args.length - 1](error);
         return;
       } else {
@@ -368,7 +371,12 @@ function format(obj, sub, color, shell) {
           formatDate(x, key, shell);
         } else if (_constructorName === 'ClientSession') {
           x[key] = inspectable('ClientSession("' +
-            get(x[key], 'id.id.buffer', '').toString('hex') + '")');
+            (
+              x[key] &&
+              x[key].id &&
+              x[key].id.id &&
+              x[key].id.id.buffer || ''
+            ).toString('hex') + '")');
         } else if (Array.isArray(x[key])) {
           x[key] = x[key].map(map);
         } else if (error != null) {

package/lib/drivers/node-mongodb-native/connection.js

@@ -137,6 +137,17 @@ NativeConnection.prototype.doClose = function(force, fn) {
     return this;
   }
 
+  let skipCloseClient = false;
+  if (force != null && typeof force === 'object') {
+    skipCloseClient = force.skipCloseClient;
+    force = force.force;
+  }
+
+  if (skipCloseClient) {
+    immediate(() => fn());
+    return this;
+  }
+
   this.client.close(force, (err, res) => {
     // Defer because the driver will wait at least 1ms before finishing closing
     // the pool, see https://github.com/mongodb-js/mongodb-core/blob/a8f8e4ce41936babc3b9112bf42d609779f03b39/lib/connection/pool.js#L1026-L1030.

package/lib/error/cast.js

@@ -5,7 +5,6 @@
  */
 
 const MongooseError = require('./mongooseError');
-const get = require('../helpers/get');
 const util = require('util');
 
 /**
@@ -111,7 +110,9 @@ function getValueType(value) {
 }
 
 function getMessageFormat(schemaType) {
-  const messageFormat = get(schemaType, 'options.cast', null);
+  const messageFormat = schemaType &&
+  schemaType.options &&
+  schemaType.options.cast || null;
   if (typeof messageFormat === 'string') {
     return messageFormat;
   }

package/lib/helpers/clone.js

@@ -41,15 +41,24 @@ function clone(obj, options, isArrayChild) {
     if (options && options._skipSingleNestedGetters && obj.$isSingleNested) {
       options = Object.assign({}, options, { getters: false });
     }
+    const isSingleNested = obj.$isSingleNested;
 
     if (utils.isPOJO(obj) && obj.$__ != null && obj._doc != null) {
       return obj._doc;
     }
 
+    let ret;
     if (options && options.json && typeof obj.toJSON === 'function') {
-      return obj.toJSON(options);
+      ret = obj.toJSON(options);
+    } else {
+      ret = obj.toObject(options);
     }
-    return obj.toObject(options);
+
+    if (options && options.minimize && isSingleNested && Object.keys(ret).length === 0) {
+      return undefined;
+    }
+
+    return ret;
   }
 
   const objConstructor = obj.constructor;

package/lib/helpers/cursor/eachAsync.js

@@ -27,16 +27,15 @@ module.exports = function eachAsync(next, fn, options, callback) {
   const enqueue = asyncQueue();
 
   return promiseOrCallback(callback, cb => {
+
     if (batchSize != null) {
       if (typeof batchSize !== 'number') {
         throw new TypeError('batchSize must be a number');
-      }
-      if (batchSize < 1) {
+      } else if (!Number.isInteger(batchSize)) {
+        throw new TypeError('batchSize must be an integer');
+      } else if (batchSize < 1) {
         throw new TypeError('batchSize must be at least 1');
       }
-      if (batchSize !== Math.floor(batchSize)) {
-        throw new TypeError('batchSize must be a positive integer');
-      }
     }
 
     iterate(cb);
@@ -71,7 +70,7 @@ module.exports = function eachAsync(next, fn, options, callback) {
           drained = true;
           if (handleResultsInProgress <= 0) {
             finalCallback(null);
-          } else if (batchSize != null && documentsBatch.length) {
+          } else if (batchSize && documentsBatch.length) {
             handleNextResult(documentsBatch, currentDocumentIndex++, handleNextResultCallBack);
           }
           return done();
@@ -83,20 +82,20 @@ module.exports = function eachAsync(next, fn, options, callback) {
         // make sure we know that we still have a result to handle re: #8422
         immediate(() => done());
 
-        if (batchSize != null) {
+        if (batchSize) {
           documentsBatch.push(doc);
         }
 
         // If the current documents size is less than the provided patch size don't process the documents yet
-        if (batchSize != null && documentsBatch.length !== batchSize) {
-          setTimeout(() => enqueue(fetch), 0);
+        if (batchSize && documentsBatch.length !== batchSize) {
+          immediate(() => enqueue(fetch));
           return;
         }
 
-        const docsToProcess = batchSize != null ? documentsBatch : doc;
+        const docsToProcess = batchSize ? documentsBatch : doc;
 
         function handleNextResultCallBack(err) {
-          if (batchSize != null) {
+          if (batchSize) {
             handleResultsInProgress -= documentsBatch.length;
             documentsBatch = [];
           } else {
@@ -110,7 +109,7 @@ module.exports = function eachAsync(next, fn, options, callback) {
             return finalCallback(null);
           }
 
-          setTimeout(() => enqueue(fetch), 0);
+          immediate(() => enqueue(fetch));
         }
 
         handleNextResult(docsToProcess, currentDocumentIndex++, handleNextResultCallBack);
@@ -139,7 +138,10 @@ function asyncQueue() {
   let id = 0;
 
   return function enqueue(fn) {
-    if (_queue.length === 0 && inProgress == null) {
+    if (
+      inProgress === null &&
+      _queue.length === 0
+    ) {
       inProgress = id++;
       return fn(_step);
     }
@@ -147,11 +149,12 @@ function asyncQueue() {
   };
 
   function _step() {
-    inProgress = null;
-    if (_queue.length > 0) {
+    if (_queue.length !== 0) {
       inProgress = id++;
       const fn = _queue.shift();
       fn(_step);
+    } else {
+      inProgress = null;
     }
   }
 }

package/lib/helpers/document/cleanModifiedSubpaths.js

@@ -12,6 +12,7 @@ module.exports = function cleanModifiedSubpaths(doc, path, options) {
   if (!doc) {
     return deleted;
   }
+
   for (const modifiedPath of Object.keys(doc.$__.activePaths.states.modify)) {
     if (skipDocArrays) {
       const schemaType = doc.$__schema.path(modifiedPath);

package/lib/helpers/document/compile.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const documentSchemaSymbol = require('../../helpers/symbols').documentSchemaSymbol;
-const get = require('../../helpers/get');
 const internalToObjectOptions = require('../../options').internalToObjectOptions;
 const utils = require('../../utils');
 
@@ -93,7 +92,11 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
             writable: false,
             value: function() {
               return utils.clone(_this.get(path, null, {
-                virtuals: get(this, 'schema.options.toObject.virtuals', null)
+                virtuals: this &&
+                  this.schema &&
+                  this.schema.options &&
+                  this.schema.options.toObject &&
+                  this.schema.options.toObject.virtuals || null
               }));
             }
           });
@@ -104,7 +107,7 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
             writable: false,
             value: function() {
               return _this.get(path, null, {
-                virtuals: get(this, 'schema.options.toObject.virtuals', null)
+                virtuals: this && this.schema && this.schema.options && this.schema.options.toObject && this.schema.options.toObject.virtuals || null
               });
             }
           });
@@ -115,7 +118,7 @@ function defineKey({ prop, subprops, prototype, prefix, options }) {
             writable: false,
             value: function() {
               return _this.get(path, null, {
-                virtuals: get(_this, 'schema.options.toJSON.virtuals', null)
+                virtuals: this && this.schema && this.schema.options && this.schema.options.toJSON && this.schema.options.toJSON.virtuals || null
               });
             }
           });

package/lib/helpers/indexes/decorateDiscriminatorIndexOptions.js

@@ -0,0 +1,14 @@
+'use strict';
+
+module.exports = function decorateDiscriminatorIndexOptions(schema, indexOptions) {
+  // If the model is a discriminator and has an index, add a
+  // partialFilterExpression by default so the index will only apply
+  // to that discriminator.
+  const discriminatorName = schema.discriminatorMapping && schema.discriminatorMapping.value;
+  if (discriminatorName && !('sparse' in indexOptions)) {
+    const discriminatorKey = schema.options.discriminatorKey;
+    indexOptions.partialFilterExpression = indexOptions.partialFilterExpression || {};
+    indexOptions.partialFilterExpression[discriminatorKey] = discriminatorName;
+  }
+  return indexOptions;
+};