mongoose 6.2.1 → 6.2.4

package/index.js

@@ -6,4 +6,8 @@
 
 'use strict';
 
-module.exports = require('./lib/');
+const mongoose = require('./lib/');
+
+module.exports = mongoose;
+module.exports.default = mongoose;
+module.exports.mongoose = mongoose;

package/lib/aggregate.js

@@ -42,8 +42,8 @@ const readConcern = Query.prototype.readConcern;
  *   new Aggregate([{ $match: { _id: new mongoose.Types.ObjectId('00000000000000000000000a') } }]);
  * ```
  *
- * @see MongoDB http://docs.mongodb.org/manual/applications/aggregation/
- * @see driver http://mongodb.github.com/node-mongodb-native/api-generated/collection.html#aggregate
+ * @see MongoDB https://docs.mongodb.org/manual/applications/aggregation/
+ * @see driver https://mongodb.github.com/node-mongodb-native/api-generated/collection.html#aggregate
  * @param {Array} [pipeline] aggregation pipeline as an array of objects
  * @param {Model} [model] the model to use with this aggregate.
  * @api public
@@ -174,15 +174,10 @@ Aggregate.prototype.append = function() {
  * @api public
  */
 Aggregate.prototype.addFields = function(arg) {
-  const fields = {};
-  if (typeof arg === 'object' && !Array.isArray(arg)) {
-    Object.keys(arg).forEach(function(field) {
-      fields[field] = arg[field];
-    });
-  } else {
+  if (typeof arg !== 'object' || arg === null || Array.isArray(arg)) {
     throw new Error('Invalid addFields() argument. Must be an object');
   }
-  return this.append({ $addFields: fields });
+  return this.append({ $addFields: Object.assign({}, arg) });
 };
 
 /**
@@ -212,7 +207,7 @@ Aggregate.prototype.addFields = function(arg) {
  *     aggregate.project({ salary_k: { $divide: [ "$salary", 1000 ] } });
  *
  * @param {Object|String} arg field specification
- * @see projection http://docs.mongodb.org/manual/reference/aggregation/project/
+ * @see projection https://docs.mongodb.org/manual/reference/aggregation/project/
  * @return {Aggregate}
  * @api public
  */
@@ -249,7 +244,7 @@ Aggregate.prototype.project = function(arg) {
  *
  *     aggregate.group({ _id: "$department" });
  *
- * @see $group http://docs.mongodb.org/manual/reference/aggregation/group/
+ * @see $group https://docs.mongodb.org/manual/reference/aggregation/group/
  * @method group
  * @memberOf Aggregate
  * @instance
@@ -265,7 +260,7 @@ Aggregate.prototype.project = function(arg) {
  *
  *     aggregate.match({ department: { $in: [ "sales", "engineering" ] } });
  *
- * @see $match http://docs.mongodb.org/manual/reference/aggregation/match/
+ * @see $match https://docs.mongodb.org/manual/reference/aggregation/match/
  * @method match
  * @memberOf Aggregate
  * @instance
@@ -281,7 +276,7 @@ Aggregate.prototype.project = function(arg) {
  *
  *     aggregate.skip(10);
  *
- * @see $skip http://docs.mongodb.org/manual/reference/aggregation/skip/
+ * @see $skip https://docs.mongodb.org/manual/reference/aggregation/skip/
  * @method skip
  * @memberOf Aggregate
  * @instance
@@ -297,7 +292,7 @@ Aggregate.prototype.project = function(arg) {
  *
  *     aggregate.limit(10);
  *
- * @see $limit http://docs.mongodb.org/manual/reference/aggregation/limit/
+ * @see $limit https://docs.mongodb.org/manual/reference/aggregation/limit/
  * @method limit
  * @memberOf Aggregate
  * @instance
@@ -325,7 +320,7 @@ Aggregate.prototype.project = function(arg) {
  *       num: 5
  *     });
  *
- * @see $geoNear http://docs.mongodb.org/manual/reference/aggregation/geoNear/
+ * @see $geoNear https://docs.mongodb.org/manual/reference/aggregation/geoNear/
  * @method near
  * @memberOf Aggregate
  * @instance
@@ -364,7 +359,7 @@ Aggregate.prototype.near = function(arg) {
  *     aggregate.unwind("a", "b", "c");
  *     aggregate.unwind({ path: '$tags', preserveNullAndEmptyArrays: true });
  *
- * @see $unwind http://docs.mongodb.org/manual/reference/aggregation/unwind/
+ * @see $unwind https://docs.mongodb.org/manual/reference/aggregation/unwind/
  * @param {String|Object} fields the field(s) to unwind, either as field names or as [objects with options](https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/#document-operand-with-options). If passing a string, prefixing the field name with '$' is optional. If passing an object, `path` must start with '$'.
  * @return {Aggregate}
  * @api public
@@ -554,7 +549,7 @@ Aggregate.prototype.sample = function(size) {
  *     aggregate.sort({ field: 'asc', test: -1 });
  *     aggregate.sort('field -test');
  *
- * @see $sort http://docs.mongodb.org/manual/reference/aggregation/sort/
+ * @see $sort https://docs.mongodb.org/manual/reference/aggregation/sort/
  * @param {Object|String} arg
  * @return {Aggregate} this
  * @api public
@@ -621,8 +616,8 @@ Aggregate.prototype.unionWith = function(options) {
  * @param {Array} [tags] optional tags for this query
  * @return {Aggregate} this
  * @api public
- * @see mongodb http://docs.mongodb.org/manual/applications/replication/#read-preference
- * @see driver http://mongodb.github.com/node-mongodb-native/driver-articles/anintroductionto1_1and2_2.html#read-preferences
+ * @see mongodb https://docs.mongodb.org/manual/applications/replication/#read-preference
+ * @see driver https://mongodb.github.com/node-mongodb-native/driver-articles/anintroductionto1_1and2_2.html#read-preferences
  */
 
 Aggregate.prototype.read = function(pref, tags) {
@@ -779,7 +774,7 @@ Aggregate.prototype.explain = function(verbosity, callback) {
  *
  * @param {Boolean} value Should tell server it can use hard drive to store data during aggregation.
  * @param {Array} [tags] optional tags for this query
- * @see mongodb http://docs.mongodb.org/manual/reference/command/aggregate/
+ * @see mongodb https://docs.mongodb.org/manual/reference/command/aggregate/
  */
 
 Aggregate.prototype.allowDiskUse = function(value) {
@@ -795,7 +790,7 @@ Aggregate.prototype.allowDiskUse = function(value) {
  *     Model.aggregate(..).hint({ qty: 1, category: 1 }).exec(callback)
  *
  * @param {Object|String} value a hint object or the index name
- * @see mongodb http://docs.mongodb.org/manual/reference/command/aggregate/
+ * @see mongodb https://docs.mongodb.org/manual/reference/command/aggregate/
  */
 
 Aggregate.prototype.hint = function(value) {
@@ -812,7 +807,7 @@ Aggregate.prototype.hint = function(value) {
  *     await Model.aggregate(..).session(session);
  *
  * @param {ClientSession} session
- * @see mongodb http://docs.mongodb.org/manual/reference/command/aggregate/
+ * @see mongodb https://docs.mongodb.org/manual/reference/command/aggregate/
  */
 
 Aggregate.prototype.session = function(session) {
@@ -837,7 +832,7 @@ Aggregate.prototype.session = function(session) {
  * @param [options.allowDiskUse] boolean if true, the MongoDB server will use the hard drive to store data during this aggregation
  * @param [options.collation] object see [`Aggregate.prototype.collation()`](./docs/api.html#aggregate_Aggregate-collation)
  * @param [options.session] ClientSession see [`Aggregate.prototype.session()`](./docs/api.html#aggregate_Aggregate-session)
- * @see mongodb http://docs.mongodb.org/manual/reference/command/aggregate/
+ * @see mongodb https://docs.mongodb.org/manual/reference/command/aggregate/
  * @return {Aggregate} this
  * @api public
  */
@@ -866,7 +861,7 @@ Aggregate.prototype.option = function(value) {
  * @param {Boolean} [options.useMongooseAggCursor] use experimental mongoose-specific aggregation cursor (for `eachAsync()` and other query cursor semantics)
  * @return {AggregationCursor} cursor representing this aggregation
  * @api public
- * @see mongodb http://mongodb.github.io/node-mongodb-native/2.0/api/AggregationCursor.html
+ * @see mongodb https://mongodb.github.io/node-mongodb-native/2.0/api/AggregationCursor.html
  */
 
 Aggregate.prototype.cursor = function(options) {
@@ -887,7 +882,7 @@ Aggregate.prototype.cursor = function(options) {
  * @param {Object} collation options
  * @return {Aggregate} this
  * @api public
- * @see mongodb http://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#aggregate
+ * @see mongodb https://mongodb.github.io/node-mongodb-native/2.2/api/Collection.html#aggregate
  */
 
 Aggregate.prototype.collation = function(collation) {
@@ -1105,13 +1100,13 @@ if (Symbol.asyncIterator != null) {
  */
 
 function isOperator(obj) {
-  if (typeof obj !== 'object') {
+  if (typeof obj !== 'object' || obj === null) {
     return false;
   }
 
   const k = Object.keys(obj);
 
-  return k.length === 1 && k.some(key => { return key[0] === '$'; });
+  return k.length === 1 && k[0][0] === '$';
 }
 
 /*!

package/lib/browserDocument.js

@@ -19,7 +19,7 @@ const isObject = require('./helpers/isObject');
  * @param {Object} obj the values to set
  * @param {Object} [fields] optional object containing the fields which were selected in the query returning this document and any populated paths data
  * @param {Boolean} [skipId] bool, should we auto create an ObjectId _id
- * @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 was retrieved from the db and fully hydrated by Mongoose.
  * @event `save`: Emitted when the document is successfully saved
  * @api private

package/lib/cast/number.js

@@ -3,12 +3,11 @@
 const assert = require('assert');
 
 /*!
- * Given a value, cast it to a number, or throw a `CastError` if the value
+ * Given a value, cast it to a number, or throw an `Error` if the value
  * cannot be casted. `null` and `undefined` are considered valid.
  *
  * @param {Any} value
- * @param {String} [path] optional the path to set on the CastError
- * @return {Boolean|null|undefined}
+ * @return {Number}
  * @throws {Error} if `value` is not one of the allowed values
  * @api private
  */

package/lib/cast.js

@@ -102,15 +102,18 @@ module.exports = function cast(schema, obj, options, context) {
           const pathFirstHalf = split.slice(0, j).join('.');
           const pathLastHalf = split.slice(j).join('.');
           const _schematype = schema.path(pathFirstHalf);
-          const discriminatorKey = get(_schematype, 'schema.options.discriminatorKey');
+          const discriminatorKey = _schematype &&
+            _schematype.schema &&
+            _schematype.schema.options &&
+            _schematype.schema.options.discriminatorKey;
 
           // gh-6027: if we haven't found the schematype but this path is
           // underneath an embedded discriminator and the embedded discriminator
           // key is in the query, use the embedded discriminator schema
           if (_schematype != null &&
-              get(_schematype, 'schema.discriminators') != null &&
-              discriminatorKey != null &&
-              pathLastHalf !== discriminatorKey) {
+            (_schematype.schema && _schematype.schema.discriminators) != null &&
+            discriminatorKey != null &&
+            pathLastHalf !== discriminatorKey) {
             const discriminatorVal = get(obj, pathFirstHalf + '.' + discriminatorKey);
             if (discriminatorVal != null) {
               schematype = _schematype.schema.discriminators[discriminatorVal].

package/lib/connection.js

@@ -41,7 +41,7 @@ const noPasswordAuthMechanisms = [
  * For practical reasons, a Connection equals a Db.
  *
  * @param {Mongoose} base a mongoose instance
- * @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 `connecting`: Emitted when `connection.openUri()` is executed on this connection.
  * @event `connected`: Emitted when this connection successfully connects to the db. May be emitted _multiple_ times in `reconnected` scenarios.
  * @event `open`: Emitted after we `connected` and `onOpen` is executed on all of this connection's models.
@@ -386,11 +386,11 @@ Connection.prototype.config;
  * with specified options. Used to create [capped collections](https://docs.mongodb.com/manual/core/capped-collections/)
  * and [views](https://docs.mongodb.com/manual/core/views/) from mongoose.
  *
- * Options are passed down without modification to the [MongoDB driver's `createCollection()` function](http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection)
+ * Options are passed down without modification to the [MongoDB driver's `createCollection()` function](https://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection)
  *
  * @method createCollection
  * @param {string} collection The collection to create
- * @param {Object} [options] see [MongoDB driver docs](http://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection)
+ * @param {Object} [options] see [MongoDB driver docs](https://mongodb.github.io/node-mongodb-native/2.2/api/Db.html#createCollection)
  * @param {Function} [callback]
  * @return {Promise}
  * @api public
@@ -407,7 +407,7 @@ Connection.prototype.createCollection = _wrapConnHelper(function createCollectio
 /**
  * _Requires MongoDB >= 3.6.0._ Starts a [MongoDB session](https://docs.mongodb.com/manual/release-notes/3.6/#client-sessions)
  * for benefits like causal consistency, [retryable writes](https://docs.mongodb.com/manual/core/retryable-writes/),
- * and [transactions](http://thecodebarbarian.com/a-node-js-perspective-on-mongodb-4-transactions.html).
+ * and [transactions](https://thecodebarbarian.com/a-node-js-perspective-on-mongodb-4-transactions.html).
  *
  * ####Example:
  *
@@ -422,7 +422,7 @@ Connection.prototype.createCollection = _wrapConnHelper(function createCollectio
  *
  *
  * @method startSession
- * @param {Object} [options] see the [mongodb driver options](http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#startSession)
+ * @param {Object} [options] see the [mongodb driver options](https://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#startSession)
  * @param {Boolean} [options.causalConsistency=true] set to false to disable causal consistency
  * @param {Function} [callback]
  * @return {Promise<ClientSession>} promise that resolves to a MongoDB driver `ClientSession`
@@ -444,7 +444,7 @@ Connection.prototype.startSession = _wrapConnHelper(function startSession(option
  * async function executes successfully and attempt to retry if
  * there was a retriable error.
  *
- * Calls the MongoDB driver's [`session.withTransaction()`](http://mongodb.github.io/node-mongodb-native/3.5/api/ClientSession.html#withTransaction),
+ * Calls the MongoDB driver's [`session.withTransaction()`](https://mongodb.github.io/node-mongodb-native/3.5/api/ClientSession.html#withTransaction),
  * but also handles resetting Mongoose document state as shown below.
  *
  * ####Example:
@@ -651,18 +651,18 @@ Connection.prototype.onOpen = function() {
  * Opens the connection with a URI using `MongoClient.connect()`.
  *
  * @param {String} uri The URI to connect with.
- * @param {Object} [options] Passed on to http://mongodb.github.io/node-mongodb-native/2.2/api/MongoClient.html#connect
- * @param {Boolean} [options.bufferCommands=true] Mongoose specific option. Set to false to [disable buffering](http://mongoosejs.com/docs/faq.html#callback_never_executes) on all models associated with this connection.
+ * @param {Object} [options] Passed on to https://mongodb.github.io/node-mongodb-native/2.2/api/MongoClient.html#connect
+ * @param {Boolean} [options.bufferCommands=true] Mongoose specific option. Set to false to [disable buffering](https://mongoosejs.com/docs/faq.html#callback_never_executes) on all models associated with this connection.
  * @param {Number} [options.bufferTimeoutMS=10000] Mongoose specific option. If `bufferCommands` is true, Mongoose will throw an error after `bufferTimeoutMS` if the operation is still buffered.
  * @param {String} [options.dbName] The name of the database we want to use. If not provided, use database name from connection string.
  * @param {String} [options.user] username for authentication, equivalent to `options.auth.user`. Maintained for backwards compatibility.
  * @param {String} [options.pass] password for authentication, equivalent to `options.auth.password`. Maintained for backwards compatibility.
- * @param {Number} [options.maxPoolSize=100] The maximum number of sockets the MongoDB driver will keep open for this connection. Keep in mind that MongoDB only allows one operation per socket at a time, so you may want to increase this if you find you have a few slow queries that are blocking faster queries from proceeding. See [Slow Trains in MongoDB and Node.js](http://thecodebarbarian.com/slow-trains-in-mongodb-and-nodejs).
- * @param {Number} [options.minPoolSize=0] The minimum number of sockets the MongoDB driver will keep open for this connection. Keep in mind that MongoDB only allows one operation per socket at a time, so you may want to increase this if you find you have a few slow queries that are blocking faster queries from proceeding. See [Slow Trains in MongoDB and Node.js](http://thecodebarbarian.com/slow-trains-in-mongodb-and-nodejs).
+ * @param {Number} [options.maxPoolSize=100] The maximum number of sockets the MongoDB driver will keep open for this connection. Keep in mind that MongoDB only allows one operation per socket at a time, so you may want to increase this if you find you have a few slow queries that are blocking faster queries from proceeding. See [Slow Trains in MongoDB and Node.js](https://thecodebarbarian.com/slow-trains-in-mongodb-and-nodejs).
+ * @param {Number} [options.minPoolSize=0] The minimum number of sockets the MongoDB driver will keep open for this connection. Keep in mind that MongoDB only allows one operation per socket at a time, so you may want to increase this if you find you have a few slow queries that are blocking faster queries from proceeding. See [Slow Trains in MongoDB and Node.js](https://thecodebarbarian.com/slow-trains-in-mongodb-and-nodejs).
  * @param {Number} [options.serverSelectionTimeoutMS] If `useUnifiedTopology = true`, the MongoDB driver will try to find a server to send any given operation to, and keep retrying for `serverSelectionTimeoutMS` milliseconds before erroring out. If not set, the MongoDB driver defaults to using `30000` (30 seconds).
  * @param {Number} [options.heartbeatFrequencyMS] If `useUnifiedTopology = true`, the MongoDB driver sends a heartbeat every `heartbeatFrequencyMS` to check on the status of the connection. A heartbeat is subject to `serverSelectionTimeoutMS`, so the MongoDB driver will retry failed heartbeats for up to 30 seconds by default. Mongoose only emits a `'disconnected'` event after a heartbeat has failed, so you may want to decrease this setting to reduce the time between when your server goes down and when Mongoose emits `'disconnected'`. We recommend you do **not** set this setting below 1000, too many heartbeats can lead to performance degradation.
  * @param {Boolean} [options.autoIndex=true] Mongoose-specific option. Set to false to disable automatic index creation for all models associated with this connection.
- * @param {Class} [options.promiseLibrary] Sets the [underlying driver's promise library](http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html).
+ * @param {Class} [options.promiseLibrary] Sets the [underlying driver's promise library](https://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html).
  * @param {Number} [options.connectTimeoutMS=30000] How long the MongoDB driver will wait before killing a socket due to inactivity _during initial connection_. Defaults to 30000. This option is passed transparently to [Node.js' `socket#setTimeout()` function](https://nodejs.org/api/net.html#net_socket_settimeout_timeout_callback).
  * @param {Number} [options.socketTimeoutMS=30000] How long the MongoDB driver will wait before killing a socket due to inactivity _after initial connection_. A socket may be inactive because of either no activity or a long-running operation. This is set to `30000` by default, you should set this to 2-3x your longest running operation if you expect some of your database operations to run longer than 20 seconds. This option is passed to [Node.js `socket#setTimeout()` function](https://nodejs.org/api/net.html#net_socket_settimeout_timeout_callback) after the MongoDB driver successfully completes.
  * @param {Number} [options.family=0] Passed transparently to [Node.js' `dns.lookup()`](https://nodejs.org/api/dns.html#dns_dns_lookup_hostname_options_callback) function. May be either `0, `4`, or `6`. `4` means use IPv4 only, `6` means use IPv6 only, `0` means try both.
@@ -682,7 +682,7 @@ Connection.prototype.openUri = function(uri, options, callback) {
     throw new MongooseError('Mongoose 5.x no longer supports ' +
       '`mongoose.connect(host, dbname, port)` or ' +
       '`mongoose.createConnection(host, dbname, port)`. See ' +
-      'http://mongoosejs.com/docs/connections.html for supported connection syntax');
+      'https://mongoosejs.com/docs/connections.html for supported connection syntax');
   }
 
   if (typeof uri !== 'string') {
@@ -787,6 +787,11 @@ Connection.prototype.openUri = function(uri, options, callback) {
       return reject(error);
     }
     _this.client = client;
+
+    for (const db of this.otherDbs) {
+      _setClient(db, client, {}, db.name);
+    }
+
     client.setMaxListeners(0);
     client.connect((error) => {
       if (error) {
@@ -832,9 +837,19 @@ function _setClient(conn, client, options, dbName) {
   const db = dbName != null ? client.db(dbName) : client.db();
   conn.db = db;
   conn.client = client;
-  conn.host = get(client, 's.options.hosts.0.host', void 0);
-  conn.port = get(client, 's.options.hosts.0.port', void 0);
-  conn.name = dbName != null ? dbName : get(client, 's.options.dbName', void 0);
+  conn.host = client &&
+    client.s &&
+    client.s.options &&
+    client.s.options.hosts &&
+    client.s.options.hosts[0] &&
+    client.s.options.hosts[0].host || void 0;
+  conn.port = client &&
+    client.s &&
+    client.s.options &&
+    client.s.options.hosts &&
+    client.s.options.hosts[0] &&
+    client.s.options.hosts[0].port || void 0;
+  conn.name = dbName != null ? dbName : client && client.s && client.s.options && client.s.options.dbName || void 0;
   conn._closeCalled = client._closeCalled;
 
   const _handleReconnect = () => {
@@ -850,7 +865,10 @@ function _setClient(conn, client, options, dbName) {
     }
   };
 
-  const type = get(client, 'topology.description.type', '');
+  const type = client &&
+  client.topology &&
+  client.topology.description &&
+  client.topology.description.type || '';
 
   if (type === 'Single') {
     client.on('serverDescriptionChanged', ev => {
@@ -898,7 +916,11 @@ Connection.prototype.close = function(force, callback) {
     force = false;
   }
 
-  this.$wasForceClosed = !!force;
+  if (force != null && typeof force === 'object') {
+    this.$wasForceClosed = !!force.force;
+  } else {
+    this.$wasForceClosed = !!force;
+  }
 
   return promiseOrCallback(callback, cb => {
     this._close(force, cb);
@@ -982,7 +1004,7 @@ Connection.prototype.onClose = function(force) {
   this.emit('close', force);
 
   for (const db of this.otherDbs) {
-    db.close(force);
+    db.close({ force: force, skipCloseClient: true });
   }
 };
 
@@ -1331,7 +1353,7 @@ Connection.prototype.optionsProvideAuthenticationData = function(options) {
 };
 
 /**
- * Returns the [MongoDB driver `MongoClient`](http://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html) instance
+ * Returns the [MongoDB driver `MongoClient`](https://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html) instance
  * that this connection uses to talk to MongoDB.
  *
  * ####Example:
@@ -1348,7 +1370,7 @@ Connection.prototype.getClient = function getClient() {
 };
 
 /**
- * Set the [MongoDB driver `MongoClient`](http://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html) instance
+ * Set the [MongoDB driver `MongoClient`](https://mongodb.github.io/node-mongodb-native/3.5/api/MongoClient.html) instance
  * that this connection uses to talk to MongoDB. This is useful if you already have a MongoClient instance, and want to
  * reuse it.
  *
@@ -1376,7 +1398,7 @@ Connection.prototype.setClient = function setClient(client) {
   }
 
   this._connectionString = client.s.url;
-  _setClient(this, client, { useUnifiedTopology: client.s.options.useUnifiedTopology }, client.s.options.dbName);
+  _setClient(this, client, {}, client.s.options.dbName);
 
   return this;
 };

package/lib/cursor/AggregationCursor.js

@@ -97,7 +97,7 @@ AggregationCursor.prototype._read = function() {
 
 if (Symbol.asyncIterator != null) {
   const msg = 'Mongoose does not support using async iterators with an ' +
-    'existing aggregation cursor. See http://bit.ly/mongoose-async-iterate-aggregation';
+    'existing aggregation cursor. See https://bit.ly/mongoose-async-iterate-aggregation';
 
   AggregationCursor.prototype[Symbol.asyncIterator] = function() {
     throw new MongooseError(msg);
@@ -137,10 +137,15 @@ if (Symbol.asyncIterator != null) {
  * @method map
  */
 
-AggregationCursor.prototype.map = function(fn) {
-  this._transforms.push(fn);
-  return this;
-};
+Object.defineProperty(AggregationCursor.prototype, 'map', {
+  value: function(fn) {
+    this._transforms.push(fn);
+    return this;
+  },
+  enumerable: true,
+  configurable: true,
+  writable: true
+});
 
 /*!
  * Marks this cursor as errored
@@ -160,7 +165,7 @@ AggregationCursor.prototype._markError = function(error) {
  * @api public
  * @method close
  * @emits close
- * @see MongoDB driver cursor#close http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
+ * @see MongoDB driver cursor#close https://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
  */
 
 AggregationCursor.prototype.close = function(callback) {
@@ -288,7 +293,7 @@ function _transformForAsyncIterator(doc) {
 }
 
 /**
- * Adds a [cursor flag](http://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#addCursorFlag).
+ * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#addCursorFlag).
  * Useful for setting the `noCursorTimeout` and `tailable` flags.
  *
  * @param {String} flag

package/lib/cursor/QueryCursor.js

@@ -141,10 +141,15 @@ QueryCursor.prototype._read = function() {
  * @method map
  */
 
-QueryCursor.prototype.map = function(fn) {
-  this._transforms.push(fn);
-  return this;
-};
+Object.defineProperty(QueryCursor.prototype, 'map', {
+  value: function(fn) {
+    this._transforms.push(fn);
+    return this;
+  },
+  enumerable: true,
+  configurable: true,
+  writable: true
+});
 
 /*!
  * Marks this cursor as errored
@@ -164,7 +169,7 @@ QueryCursor.prototype._markError = function(error) {
  * @api public
  * @method close
  * @emits close
- * @see MongoDB driver cursor#close http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
+ * @see MongoDB driver cursor#close https://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#close
  */
 
 QueryCursor.prototype.close = function(callback) {
@@ -247,7 +252,7 @@ QueryCursor.prototype.eachAsync = function(fn, opts, callback) {
 QueryCursor.prototype.options;
 
 /**
- * Adds a [cursor flag](http://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#addCursorFlag).
+ * Adds a [cursor flag](https://mongodb.github.io/node-mongodb-native/2.2/api/Cursor.html#addCursorFlag).
  * Useful for setting the `noCursorTimeout` and `tailable` flags.
  *
  * @param {String} flag