mongoose 6.1.1 → 6.1.2

package/index.d.ts

@@ -68,6 +68,15 @@ declare module 'mongoose' {
   export function connect(uri: string, callback: CallbackWithoutResult): void;
   export function connect(uri: string, options?: ConnectOptions): Promise<Mongoose>;
 
+  /**
+     * Makes the indexes in MongoDB match the indexes defined in every model's
+     * schema. This function will drop any indexes that are not defined in
+     * the model's schema except the `_id` index, and build any indexes that
+     * are in your schema but not in MongoDB.
+     */
+  export function syncIndexes(options?: Record<string, unknown>): Promise<Array<string>>;
+  export function syncIndexes(options: Record<string, unknown> | null, callback: Callback<Array<string>>): void;
+
   /** The Mongoose module's default connection. Equivalent to `mongoose.connections[0]`, see [`connections`](#mongoose_Mongoose-connections). */
   export const connection: Connection;
 
@@ -420,6 +429,15 @@ declare module 'mongoose' {
     startSession(options?: mongodb.ClientSessionOptions): Promise<mongodb.ClientSession>;
     startSession(options: mongodb.ClientSessionOptions, cb: Callback<mongodb.ClientSession>): void;
 
+    /**
+     * Makes the indexes in MongoDB match the indexes defined in every model's
+     * schema. This function will drop any indexes that are not defined in
+     * the model's schema except the `_id` index, and build any indexes that
+     * are in your schema but not in MongoDB.
+     */
+    syncIndexes(options?: Record<string, unknown>): Promise<Array<string>>;
+    syncIndexes(options: Record<string, unknown> | null, callback: Callback<Array<string>>): void;
+
     /**
      * _Requires MongoDB >= 3.6.0._ Executes the wrapped async function
      * in a transaction. Mongoose will commit the transaction if the
@@ -785,7 +803,7 @@ declare module 'mongoose' {
 
     /** Creates a `countDocuments` query: counts the number of documents that match `filter`. */
     countDocuments(callback?: Callback<number>): QueryWithHelpers<number, HydratedDocument<T, TMethods, TVirtuals>, TQueryHelpers, T>;
-    countDocuments(filter: FilterQuery<T>, callback?: Callback<number>): QueryWithHelpers<number, HydratedDocument<T, TMethods, TVirtuals>, TQueryHelpers, T>;
+    countDocuments(filter: FilterQuery<T>, options?: QueryOptions, callback?: Callback<number>): QueryWithHelpers<number, HydratedDocument<T, TMethods, TVirtuals>, TQueryHelpers, T>;
 
     /** Creates a new document or documents */
     create(docs: (AnyKeys<T> | AnyObject)[], options?: SaveOptions): Promise<HydratedDocument<T, TMethods, TVirtuals>[]>;
@@ -1219,7 +1237,7 @@ declare module 'mongoose' {
     /** remove empty objects (defaults to true) */
     minimize?: boolean;
     /** if set, mongoose will call this function to allow you to transform the returned object */
-    transform?: (doc: any, ret: any, options: any) => any;
+    transform?: boolean | ((doc: any, ret: any, options: any) => any);
     /** if true, replace any conventionally populated paths with the original id in the output. Has no affect on virtual populated paths. */
     depopulate?: boolean;
     /** if false, exclude the version key (`__v` by default) from the output */
@@ -1380,14 +1398,19 @@ declare module 'mongoose' {
     virtualpath(name: string): VirtualType | null;
   }
 
+  type NumberSchemaDefinition = typeof Number | 'number' | 'Number' | typeof Schema.Types.Number;
+  type StringSchemaDefinition = typeof String | 'string' | 'String' | typeof Schema.Types.String;
+  type BooleanSchemaDefinition = typeof Boolean | 'boolean' | 'Boolean' | typeof Schema.Types.Boolean;
+  type DateSchemaDefinition = typeof NativeDate | 'date' | 'Date' | typeof Schema.Types.Date;
+
   type SchemaDefinitionWithBuiltInClass<T> = T extends number
-    ? (typeof Number | 'number' | 'Number' | typeof Schema.Types.Number)
+    ? NumberSchemaDefinition
     : T extends string
-    ? (typeof String | 'string' | 'String' | typeof Schema.Types.String)
+    ? StringSchemaDefinition
     : T extends boolean
-    ? (typeof Boolean | 'boolean' | 'Boolean' | typeof Schema.Types.Boolean)
+    ? BooleanSchemaDefinition
     : T extends NativeDate
-    ? (typeof NativeDate | 'date' | 'Date' | typeof Schema.Types.Date)
+    ? DateSchemaDefinition
     : (Function | string);
 
   type SchemaDefinitionProperty<T = undefined> = SchemaDefinitionWithBuiltInClass<T> |
@@ -1568,16 +1591,18 @@ declare module 'mongoose' {
 
   export class SchemaTypeOptions<T> {
     type?:
-      T extends string | number | boolean | NativeDate | Function ? SchemaDefinitionWithBuiltInClass<T> :
-      T extends Schema<any, any, any> ? T :
+      T extends string ? StringSchemaDefinition :
+      T extends number ? NumberSchemaDefinition :
+      T extends boolean ? BooleanSchemaDefinition :
+      T extends NativeDate ? DateSchemaDefinition :
       T extends Map<any, any> ? SchemaDefinition<typeof Map> :
       T extends Buffer ? SchemaDefinition<typeof Buffer> :
       T extends object[] ? (AnyArray<Schema<any, any, any>> | AnyArray<SchemaDefinition<Unpacked<T>>> | AnyArray<SchemaTypeOptions<Unpacked<T>>>) :
-      T extends string[] ? AnyArray<SchemaDefinitionWithBuiltInClass<string>> | AnyArray<SchemaTypeOptions<string>> :
-      T extends number[] ? AnyArray<SchemaDefinitionWithBuiltInClass<number>> | AnyArray<SchemaTypeOptions<number>> :
-      T extends boolean[] ? AnyArray<SchemaDefinitionWithBuiltInClass<boolean>> | AnyArray<SchemaTypeOptions<boolean>> :
-      T extends Function[] ? AnyArray<SchemaDefinitionWithBuiltInClass<Function>> | AnyArray<SchemaTypeOptions<Unpacked<T>>> :
-      T | typeof SchemaType | Schema<any, any, any> | SchemaDefinition<T>;
+      T extends string[] ? AnyArray<StringSchemaDefinition> | AnyArray<SchemaTypeOptions<string>> :
+      T extends number[] ? AnyArray<NumberSchemaDefinition> | AnyArray<SchemaTypeOptions<number>> :
+      T extends boolean[] ? AnyArray<BooleanSchemaDefinition> | AnyArray<SchemaTypeOptions<boolean>> :
+      T extends Function[] ? AnyArray<Function | string> | AnyArray<SchemaTypeOptions<Unpacked<T>>> :
+      T | typeof SchemaType | Schema<any, any, any> | SchemaDefinition<T> | Function | AnyArray<Function>;
 
     /** Defines a virtual with the given name that gets/sets this path. */
     alias?: string;
@@ -2157,7 +2182,7 @@ declare module 'mongoose' {
 
     /** Specifies this query as a `countDocuments` query. */
     countDocuments(callback?: Callback<number>): QueryWithHelpers<number, DocType, THelpers, RawDocType>;
-    countDocuments(criteria: FilterQuery<DocType>, callback?: Callback<number>): QueryWithHelpers<number, DocType, THelpers, RawDocType>;
+    countDocuments(criteria: FilterQuery<DocType>, options?: QueryOptions, callback?: Callback<number>): QueryWithHelpers<number, DocType, THelpers, RawDocType>;
 
     /**
      * Returns a wrapper around a [mongodb driver cursor](http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html).
@@ -2572,16 +2597,7 @@ declare module 'mongoose' {
     [key: string]: any;
   };
 
-  type ReadonlyPartial<TSchema> = {
-    [key in keyof TSchema]?: TSchema[key];
-  };
-
-  type MatchKeysAndValues<TSchema> = ReadonlyPartial<TSchema> & AnyObject;
-
-  type ApplyBasicQueryCasting<T> = T extends mongodb.ObjectId ? T | string | (T | string)[] : // Allow strings for ObjectIds
-    T extends string ? T | RegExp | T[] : // Allow RegExps for strings
-    T extends (infer U)[] ? T | U : // Allow single array elements for arrays
-    T | T[];
+  type ApplyBasicQueryCasting<T> = T | T[] | any;
   type Condition<T> = ApplyBasicQueryCasting<T> | QuerySelector<ApplyBasicQueryCasting<T>>;
 
   type _FilterQuery<T> = {
@@ -2604,30 +2620,26 @@ declare module 'mongoose' {
     $sort?: SortValues | Record<string, SortValues>;
   };
 
-  type OnlyFieldsOfType<TSchema, FieldType = any, AssignableType = FieldType> = {
-    [key in keyof TSchema]?: [Extract<TSchema[key], FieldType>] extends [never] ? never : AssignableType;
-  };
-
   type NumericTypes = number | Decimal128 | mongodb.Double | mongodb.Int32 | mongodb.Long;
 
   type _UpdateQuery<TSchema> = {
     /** @see https://docs.mongodb.com/manual/reference/operator/update-field/ */
-    $currentDate?: OnlyFieldsOfType<TSchema, NativeDate, true | { $type: 'date' | 'timestamp' }> & AnyObject;
-    $inc?: OnlyFieldsOfType<TSchema, NumericTypes | undefined> & AnyObject;
+    $currentDate?: AnyKeys<TSchema> & AnyObject;
+    $inc?: AnyKeys<TSchema> & AnyObject;
     $min?: AnyKeys<TSchema> & AnyObject;
     $max?: AnyKeys<TSchema> & AnyObject;
-    $mul?: OnlyFieldsOfType<TSchema, NumericTypes | undefined> & AnyObject;
+    $mul?: AnyKeys<TSchema> & AnyObject;
     $rename?: { [key: string]: string };
     $set?: AnyKeys<TSchema> & AnyObject;
     $setOnInsert?: AnyKeys<TSchema> & AnyObject;
     $unset?: AnyKeys<TSchema> & AnyObject;
 
     /** @see https://docs.mongodb.com/manual/reference/operator/update-array/ */
-    $addToSet?: OnlyFieldsOfType<TSchema, any[], any> & AnyObject;
-    $pop?: OnlyFieldsOfType<TSchema, ReadonlyArray<any>, 1 | -1> & AnyObject;
-    $pull?: OnlyFieldsOfType<TSchema, ReadonlyArray<any>, any> & AnyObject;
-    $push?: OnlyFieldsOfType<TSchema, ReadonlyArray<any>, any> & AnyObject;
-    $pullAll?: OnlyFieldsOfType<TSchema, ReadonlyArray<any>, any> & AnyObject;
+    $addToSet?: AnyKeys<TSchema> & AnyObject;
+    $pop?: AnyKeys<TSchema> & AnyObject;
+    $pull?: AnyKeys<TSchema> & AnyObject;
+    $push?: AnyKeys<TSchema> & AnyObject;
+    $pullAll?: AnyKeys<TSchema> & AnyObject;
 
     /** @see https://docs.mongodb.com/manual/reference/operator/update-bitwise/ */
     $bit?: {
@@ -2647,10 +2659,10 @@ declare module 'mongoose' {
     [Extract<T, mongodb.ObjectId>] extends [never] ? T :
     T | string;
   type _UpdateQueryDef<T> = {
-    [K in keyof T]: __UpdateDefProperty<T[K]>;
+    [K in keyof T]?: __UpdateDefProperty<T[K]>;
   };
 
-  export type UpdateQuery<T> = (_UpdateQuery<_UpdateQueryDef<T>> & MatchKeysAndValues<_UpdateQueryDef<DeepPartial<T>>>);
+  export type UpdateQuery<T> = _UpdateQuery<_UpdateQueryDef<T>> & AnyObject;
 
   export type DocumentDefinition<T> = {
     [K in keyof Omit<T, Exclude<keyof Document, '_id' | 'id' | '__v'>>]:
@@ -2846,7 +2858,7 @@ declare module 'mongoose' {
     redact(expression: any, thenExpr: string | any, elseExpr: string | any): this;
 
     /** Appends a new $replaceRoot operator to this aggregate pipeline. */
-    replaceRoot(newRoot: PipelineStage.ReplaceRoot['$replaceRoot'] | string): this;
+    replaceRoot(newRoot: PipelineStage.ReplaceRoot['$replaceRoot']['newRoot'] | string): this;
 
     /**
      * Helper for [Atlas Text Search](https://docs.atlas.mongodb.com/reference/atlas-search/tutorial/)'s
@@ -3177,7 +3189,7 @@ declare module 'mongoose' {
       /** [`$unionWith` reference](https://docs.mongodb.com/manual/reference/operator/aggregation/unionWith/) */
       $unionWith:
         | string
-        | { coll: string; pipeline?: Exclude<PipelineStage, PipelineStage.Out | PipelineStage.Merge> }
+        | { coll: string; pipeline?: Exclude<PipelineStage, PipelineStage.Out | PipelineStage.Merge>[] }
     }
 
     export interface Unset {

package/lib/aggregate.js

@@ -8,6 +8,7 @@ const AggregationCursor = require('./cursor/AggregationCursor');
 const Query = require('./query');
 const applyGlobalMaxTimeMS = require('./helpers/query/applyGlobalMaxTimeMS');
 const getConstructorName = require('./helpers/getConstructorName');
+const prepareDiscriminatorPipeline = require('./helpers/aggregate/prepareDiscriminatorPipeline');
 const promiseOrCallback = require('./helpers/promiseOrCallback');
 const stringifyFunctionOperators = require('./helpers/aggregate/stringifyFunctionOperators');
 const util = require('util');
@@ -722,7 +723,7 @@ Aggregate.prototype.explain = function(callback) {
       return cb(err);
     }
 
-    prepareDiscriminatorPipeline(this);
+    prepareDiscriminatorPipeline(this._pipeline, this._model.schema);
 
     model.hooks.execPre('aggregate', this, error => {
       if (error) {
@@ -978,7 +979,7 @@ Aggregate.prototype.exec = function(callback) {
   }
 
   return promiseOrCallback(callback, cb => {
-    prepareDiscriminatorPipeline(this);
+    prepareDiscriminatorPipeline(this._pipeline, this._model.schema);
     stringifyFunctionOperators(this._pipeline);
 
     model.hooks.execPre('aggregate', this, error => {
@@ -1109,42 +1110,6 @@ function isOperator(obj) {
 
 Aggregate._prepareDiscriminatorPipeline = prepareDiscriminatorPipeline;
 
-function prepareDiscriminatorPipeline(aggregate) {
-  const schema = aggregate._model.schema;
-  const discriminatorMapping = schema && schema.discriminatorMapping;
-
-  if (discriminatorMapping && !discriminatorMapping.isRoot) {
-    const originalPipeline = aggregate._pipeline;
-    const discriminatorKey = discriminatorMapping.key;
-    const discriminatorValue = discriminatorMapping.value;
-
-    // If the first pipeline stage is a match and it doesn't specify a `__t`
-    // key, add the discriminator key to it. This allows for potential
-    // aggregation query optimizations not to be disturbed by this feature.
-    if (originalPipeline[0] != null && originalPipeline[0].$match && !originalPipeline[0].$match[discriminatorKey]) {
-      originalPipeline[0].$match[discriminatorKey] = discriminatorValue;
-      // `originalPipeline` is a ref, so there's no need for
-      // aggregate._pipeline = originalPipeline
-    } else if (originalPipeline[0] != null && originalPipeline[0].$geoNear) {
-      originalPipeline[0].$geoNear.query =
-          originalPipeline[0].$geoNear.query || {};
-      originalPipeline[0].$geoNear.query[discriminatorKey] = discriminatorValue;
-    } else if (originalPipeline[0] != null && originalPipeline[0].$search) {
-      if (originalPipeline[1] && originalPipeline[1].$match != null) {
-        originalPipeline[1].$match[discriminatorKey] = originalPipeline[1].$match[discriminatorKey] || discriminatorValue;
-      } else {
-        const match = {};
-        match[discriminatorKey] = discriminatorValue;
-        originalPipeline.splice(1, 0, { $match: match });
-      }
-    } else {
-      const match = {};
-      match[discriminatorKey] = discriminatorValue;
-      aggregate._pipeline.unshift({ $match: match });
-    }
-  }
-}
-
 /*!
  * Exports
  */

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

@@ -71,6 +71,7 @@ NativeConnection.prototype.useDb = function(name, options) {
   newConn._closeCalled = this._closeCalled;
   newConn._hasOpened = this._hasOpened;
   newConn._listening = false;
+  newConn._parent = this;
 
   newConn.host = this.host;
   newConn.port = this.port;

package/lib/helpers/aggregate/prepareDiscriminatorPipeline.js

@@ -0,0 +1,37 @@
+'use strict';
+
+module.exports = function prepareDiscriminatorPipeline(pipeline, schema, prefix) {
+  const discriminatorMapping = schema && schema.discriminatorMapping;
+  prefix = prefix || '';
+
+  if (discriminatorMapping && !discriminatorMapping.isRoot) {
+    const originalPipeline = pipeline;
+    const filterKey = (prefix.length > 0 ? prefix + '.' : prefix) + discriminatorMapping.key;
+    const discriminatorValue = discriminatorMapping.value;
+
+    // If the first pipeline stage is a match and it doesn't specify a `__t`
+    // key, add the discriminator key to it. This allows for potential
+    // aggregation query optimizations not to be disturbed by this feature.
+    if (originalPipeline[0] != null && originalPipeline[0].$match && !originalPipeline[0].$match[filterKey]) {
+      originalPipeline[0].$match[filterKey] = discriminatorValue;
+      // `originalPipeline` is a ref, so there's no need for
+      // aggregate._pipeline = originalPipeline
+    } else if (originalPipeline[0] != null && originalPipeline[0].$geoNear) {
+      originalPipeline[0].$geoNear.query =
+          originalPipeline[0].$geoNear.query || {};
+      originalPipeline[0].$geoNear.query[filterKey] = discriminatorValue;
+    } else if (originalPipeline[0] != null && originalPipeline[0].$search) {
+      if (originalPipeline[1] && originalPipeline[1].$match != null) {
+        originalPipeline[1].$match[filterKey] = originalPipeline[1].$match[filterKey] || discriminatorValue;
+      } else {
+        const match = {};
+        match[filterKey] = discriminatorValue;
+        originalPipeline.splice(1, 0, { $match: match });
+      }
+    } else {
+      const match = {};
+      match[filterKey] = discriminatorValue;
+      originalPipeline.unshift({ $match: match });
+    }
+  }
+};

package/lib/helpers/populate/getModelsMapForPopulate.js

@@ -252,7 +252,7 @@ module.exports = function getModelsMapForPopulate(model, docs, options) {
           modelForCurrentDoc = discriminatorModel;
         } else {
           try {
-            modelForCurrentDoc = model.db.model(discriminatorValue);
+            modelForCurrentDoc = _getModelFromConn(model.db, discriminatorValue);
           } catch (error) {
             return error;
           }
@@ -491,7 +491,7 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
       Model = modelName;
     } else {
       try {
-        Model = connection.model(modelName);
+        Model = _getModelFromConn(connection, modelName);
       } catch (err) {
         if (ret !== void 0) {
           throw err;
@@ -558,6 +558,15 @@ function addModelNamesToMap(model, map, available, modelNames, options, data, re
   }
 }
 
+function _getModelFromConn(conn, modelName) {
+  /* If this connection has a parent from `useDb()`, bubble up to parent's models */
+  if (conn.models[modelName] == null && conn._parent != null) {
+    return _getModelFromConn(conn._parent, modelName);
+  }
+
+  return conn.model(modelName);
+}
+
 /*!
  * ignore
  */

package/lib/model.js

@@ -46,6 +46,7 @@ const isPathSelectedInclusive = require('./helpers/projection/isPathSelectedIncl
 const leanPopulateMap = require('./helpers/populate/leanPopulateMap');
 const modifiedPaths = require('./helpers/update/modifiedPaths');
 const parallelLimit = require('./helpers/parallelLimit');
+const prepareDiscriminatorPipeline = require('./helpers/aggregate/prepareDiscriminatorPipeline');
 const removeDeselectedForeignField = require('./helpers/populate/removeDeselectedForeignField');
 const util = require('util');
 const utils = require('./utils');
@@ -2263,7 +2264,7 @@ Model.findOne = function findOne(conditions, projection, options, callback) {
  *
  * ####Example:
  *
- *     const numAdventures = Adventure.estimatedDocumentCount();
+ *     const numAdventures = await Adventure.estimatedDocumentCount();
  *
  * @param {Object} [options]
  * @param {Function} [callback]
@@ -3197,6 +3198,8 @@ Model.watch = function(pipeline, options) {
   _checkContext(this, 'watch');
 
   const changeStreamThunk = cb => {
+    pipeline = pipeline || [];
+    prepareDiscriminatorPipeline(pipeline, this.schema, 'fullDocument');
     if (this.$__collection.buffer) {
       this.$__collection.addQueue(() => {
         if (this.closed) {

package/lib/query.js

@@ -2684,18 +2684,24 @@ Query.prototype.estimatedDocumentCount = function(options, callback) {
  * - `$nearSphere`: [`$geoWithin`](https://docs.mongodb.com/manual/reference/operator/query/geoWithin/) with [`$centerSphere`](https://docs.mongodb.com/manual/reference/operator/query/centerSphere/#op._S_centerSphere)
  *
  * @param {Object} [filter] mongodb selector
+ * @param {Object} [options]
  * @param {Function} [callback] optional params are (error, count)
  * @return {Query} this
  * @see countDocuments http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#countDocuments
  * @api public
  */
 
-Query.prototype.countDocuments = function(conditions, callback) {
+Query.prototype.countDocuments = function(conditions, options, callback) {
   this.op = 'countDocuments';
   this._validateOp();
   if (typeof conditions === 'function') {
     callback = conditions;
     conditions = undefined;
+    options = undefined;
+  }
+  if (typeof options === 'function') {
+    callback = options;
+    options = undefined;
   }
 
   conditions = utils.toObject(conditions);
@@ -2704,6 +2710,10 @@ Query.prototype.countDocuments = function(conditions, callback) {
     this.merge(conditions);
   }
 
+  if (typeof options === 'object' && options != null) {
+    this.setOptions(options);
+  }
+
   if (!callback) {
     return this;
   }
@@ -4444,7 +4454,7 @@ function _update(query, op, filter, doc, options, callback) {
  * Runs a function `fn` and treats the return value of `fn` as the new value
  * for the query to resolve to.
  *
- * Any functions you pass to `map()` will run **after** any post hooks.
+ * Any functions you pass to `transform()` will run **after** any post hooks.
  *
  * ####Example:
  *
@@ -4456,7 +4466,7 @@ function _update(query, op, filter, doc, options, callback) {
  *         Object.assign(res, { loadedAt: new Date() });
  *     });
  *
- * @method map
+ * @method transform
  * @memberOf Query
  * @instance
  * @param {Function} fn function to run to transform the query result
@@ -5180,9 +5190,12 @@ Query.prototype.maxscan = Query.base.maxScan;
  *
  * ####Example
  *
- *     query.tailable() // true
- *     query.tailable(true)
- *     query.tailable(false)
+ *     query.tailable(); // true
+ *     query.tailable(true);
+ *     query.tailable(false);
+ *
+ *     // Set both `tailable` and `awaitData` options
+ *     query.tailable({ awaitData: true });
  *
  * ####Note
  *
@@ -5190,15 +5203,15 @@ Query.prototype.maxscan = Query.base.maxScan;
  *
  * @param {Boolean} bool defaults to true
  * @param {Object} [opts] options to set
- * @param {Number} [opts.numberOfRetries] if cursor is exhausted, retry this many times before giving up
- * @param {Number} [opts.tailableRetryInterval] if cursor is exhausted, wait this many milliseconds before retrying
+ * @param {Boolean} [opts.awaitData] false by default. Set to true to keep the cursor open even if there's no data.
+ * @param {Number} [opts.maxAwaitTimeMS] the maximum amount of time for the server to wait on new documents to satisfy a tailable cursor query. Requires `tailable` and `awaitData` to be true
  * @see tailable http://docs.mongodb.org/manual/tutorial/create-tailable-cursor/
  * @api public
  */
 
 Query.prototype.tailable = function(val, opts) {
-  // we need to support the tailable({ awaitdata : true }) as well as the
-  // tailable(true, {awaitdata :true}) syntax that mquery does not support
+  // we need to support the tailable({ awaitData : true }) as well as the
+  // tailable(true, {awaitData :true}) syntax that mquery does not support
   if (val != null && typeof val.constructor === 'function' && val.constructor.name === 'Object') {
     opts = val;
     val = true;
@@ -5210,9 +5223,9 @@ Query.prototype.tailable = function(val, opts) {
 
   if (opts && typeof opts === 'object') {
     for (const key of Object.keys(opts)) {
-      if (key === 'awaitdata') {
+      if (key === 'awaitData' || key === 'awaitdata') { // backwards compat, see gh-10875
         // For backwards compatibility
-        this.options[key] = !!opts[key];
+        this.options['awaitData'] = !!opts[key];
       } else {
         this.options[key] = opts[key];
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.1.1",
+  "version": "6.1.2",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -21,7 +21,7 @@
   "dependencies": {
     "bson": "^4.2.2",
     "kareem": "2.3.2",
-    "mongodb": "4.2.1",
+    "mongodb": "4.2.2",
     "mpath": "0.8.4",
     "mquery": "4.0.0",
     "ms": "2.1.2",