mongoose 8.9.0 → 8.9.2

package/index.js

@@ -46,7 +46,6 @@ module.exports.Decimal128 = mongoose.Decimal128;
 module.exports.Mixed = mongoose.Mixed;
 module.exports.Date = mongoose.Date;
 module.exports.Number = mongoose.Number;
-module.exports.Double = mongoose.Double;
 module.exports.Error = mongoose.Error;
 module.exports.MongooseError = mongoose.MongooseError;
 module.exports.now = mongoose.now;

package/lib/aggregate.js

@@ -87,6 +87,24 @@ function Aggregate(pipeline, model) {
 
 Aggregate.prototype.options;
 
+/**
+ * Returns default options for this aggregate.
+ *
+ * @param {Model} model
+ * @api private
+ */
+
+Aggregate.prototype._optionsForExec = function() {
+  const options = this.options || {};
+
+  const asyncLocalStorage = this.model()?.db?.base.transactionAsyncLocalStorage?.getStore();
+  if (!options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
+    options.session = asyncLocalStorage.session;
+  }
+
+  return options;
+};
+
 /**
  * Get/set the model that this aggregation will execute on.
  *
@@ -914,6 +932,7 @@ Aggregate.prototype.option = function(value) {
  */
 
 Aggregate.prototype.cursor = function(options) {
+  this._optionsForExec();
   this.options.cursor = options || {};
   return new AggregationCursor(this); // return this;
 };
@@ -1022,10 +1041,7 @@ Aggregate.prototype.exec = async function exec() {
   applyGlobalMaxTimeMS(this.options, model.db.options, model.base.options);
   applyGlobalDiskUse(this.options, model.db.options, model.base.options);
 
-  const asyncLocalStorage = this.model()?.db?.base.transactionAsyncLocalStorage?.getStore();
-  if (!this.options.hasOwnProperty('session') && asyncLocalStorage?.session != null) {
-    this.options.session = asyncLocalStorage.session;
-  }
+  this._optionsForExec();
 
   if (this.options && this.options.cursor) {
     return new AggregationCursor(this);
@@ -1052,6 +1068,7 @@ Aggregate.prototype.exec = async function exec() {
   }
 
   const options = clone(this.options || {});
+
   let result;
   try {
     const cursor = await collection.aggregate(this._pipeline, options);

package/lib/connection.js

@@ -158,7 +158,7 @@ Object.defineProperty(Connection.prototype, 'readyState', {
  * @api public
  */
 
-Connection.prototype.get = function(key) {
+Connection.prototype.get = function getOption(key) {
   if (this.config.hasOwnProperty(key)) {
     return this.config[key];
   }
@@ -186,7 +186,7 @@ Connection.prototype.get = function(key) {
  * @api public
  */
 
-Connection.prototype.set = function(key, val) {
+Connection.prototype.set = function setOption(key, val) {
   if (this.config.hasOwnProperty(key)) {
     this.config[key] = val;
     return val;
@@ -663,7 +663,7 @@ Connection.prototype.withSession = async function withSession(executor) {
  *
  *     const session = await conn.startSession();
  *     let doc = await Person.findOne({ name: 'Ned Stark' }, null, { session });
- *     await doc.remove();
+ *     await doc.deleteOne();
  *     // `doc` will always be null, even if reading from a replica set
  *     // secondary. Without causal consistency, it is possible to
  *     // get a doc back from the below query if the query reads from a
@@ -925,7 +925,7 @@ Connection.prototype._shouldBufferCommands = function _shouldBufferCommands() {
  * @api private
  */
 
-Connection.prototype.error = function(err, callback) {
+Connection.prototype.error = function error(err, callback) {
   if (callback) {
     callback(err);
     return null;
@@ -939,6 +939,7 @@ Connection.prototype.error = function(err, callback) {
 /**
  * Called when the connection is opened
  *
+ * @emits "open"
  * @api private
  */
 
@@ -1043,11 +1044,21 @@ Connection.prototype.openUri = async function openUri(uri, options) {
   return this;
 };
 
-/*!
- * Treat `on('error')` handlers as handling the initialConnection promise
- * to avoid uncaught exceptions when using `on('error')`. See gh-14377.
+/**
+ * Listen to events in the Connection
+ *
+ * @param {String} event The event to listen on
+ * @param {Function} callback
+ * @see Connection#readyState https://mongoosejs.com/docs/api/connection.html#Connection.prototype.readyState
+ *
+ * @method on
+ * @instance
+ * @memberOf Connection
+ * @api public
  */
 
+// Treat `on('error')` handlers as handling the initialConnection promise
+// to avoid uncaught exceptions when using `on('error')`. See gh-14377.
 Connection.prototype.on = function on(event, callback) {
   if (event === 'error' && this.$initialConnection) {
     this.$initialConnection.catch(() => {});
@@ -1055,11 +1066,21 @@ Connection.prototype.on = function on(event, callback) {
   return EventEmitter.prototype.on.call(this, event, callback);
 };
 
-/*!
- * Treat `once('error')` handlers as handling the initialConnection promise
- * to avoid uncaught exceptions when using `on('error')`. See gh-14377.
+/**
+ * Listen to a event once in the Connection
+ *
+ * @param {String} event The event to listen on
+ * @param {Function} callback
+ * @see Connection#readyState https://mongoosejs.com/docs/api/connection.html#Connection.prototype.readyState
+ *
+ * @method once
+ * @instance
+ * @memberOf Connection
+ * @api public
  */
 
+// Treat `on('error')` handlers as handling the initialConnection promise
+// to avoid uncaught exceptions when using `on('error')`. See gh-14377.
 Connection.prototype.once = function on(event, callback) {
   if (event === 'error' && this.$initialConnection) {
     this.$initialConnection.catch(() => {});
@@ -1220,17 +1241,18 @@ Connection.prototype._close = async function _close(force, destroy) {
  * @api private
  */
 
-Connection.prototype.doClose = function() {
+Connection.prototype.doClose = function doClose() {
   throw new Error('Connection#doClose unimplemented by driver');
 };
 
 /**
  * Called when the connection closes
  *
+ * @emits "close"
  * @api private
  */
 
-Connection.prototype.onClose = function(force) {
+Connection.prototype.onClose = function onClose(force) {
   this.readyState = STATES.disconnected;
 
   // avoid having the collection subscribe to our event emitter
@@ -1334,7 +1356,7 @@ Connection.prototype.plugin = function(fn, opts) {
  * @api public
  */
 
-Connection.prototype.model = function(name, schema, collection, options) {
+Connection.prototype.model = function model(name, schema, collection, options) {
   if (!(this instanceof Connection)) {
     throw new MongooseError('`connection.model()` should not be run with ' +
       '`new`. If you are doing `new db.model(foo)(bar)`, use ' +
@@ -1454,7 +1476,7 @@ Connection.prototype.model = function(name, schema, collection, options) {
  * @return {Connection} this
  */
 
-Connection.prototype.deleteModel = function(name) {
+Connection.prototype.deleteModel = function deleteModel(name) {
   if (typeof name === 'string') {
     const model = this.model(name);
     if (model == null) {
@@ -1510,7 +1532,7 @@ Connection.prototype.deleteModel = function(name) {
  * @return {ChangeStream} mongoose-specific change stream wrapper, inherits from EventEmitter
  */
 
-Connection.prototype.watch = function(pipeline, options) {
+Connection.prototype.watch = function watch(pipeline, options) {
   const changeStreamThunk = cb => {
     immediate(() => {
       if (this.readyState === STATES.connecting) {
@@ -1559,7 +1581,7 @@ Connection.prototype.asPromise = async function asPromise() {
  * @return {String[]}
  */
 
-Connection.prototype.modelNames = function() {
+Connection.prototype.modelNames = function modelNames() {
   return Object.keys(this.models);
 };
 
@@ -1571,7 +1593,7 @@ Connection.prototype.modelNames = function() {
  * @api private
  * @return {Boolean} true if the connection should be authenticated after it is opened, otherwise false.
  */
-Connection.prototype.shouldAuthenticate = function() {
+Connection.prototype.shouldAuthenticate = function shouldAuthenticate() {
   return this.user != null &&
     (this.pass != null || this.authMechanismDoesNotRequirePassword());
 };
@@ -1584,7 +1606,7 @@ Connection.prototype.shouldAuthenticate = function() {
  * @return {Boolean} true if the authentication mechanism specified in the options object requires
  *  a password, otherwise false.
  */
-Connection.prototype.authMechanismDoesNotRequirePassword = function() {
+Connection.prototype.authMechanismDoesNotRequirePassword = function authMechanismDoesNotRequirePassword() {
   if (this.options && this.options.auth) {
     return noPasswordAuthMechanisms.indexOf(this.options.auth.authMechanism) >= 0;
   }
@@ -1602,7 +1624,7 @@ Connection.prototype.authMechanismDoesNotRequirePassword = function() {
  * @return {Boolean} true if the provided options object provides enough data to authenticate with,
  *   otherwise false.
  */
-Connection.prototype.optionsProvideAuthenticationData = function(options) {
+Connection.prototype.optionsProvideAuthenticationData = function optionsProvideAuthenticationData(options) {
   return (options) &&
       (options.user) &&
       ((options.pass) || this.authMechanismDoesNotRequirePassword());

package/lib/cursor/aggregationCursor.js

@@ -175,11 +175,10 @@ AggregationCursor.prototype._markError = function(error) {
  * Marks this cursor as closed. Will stop streaming and subsequent calls to
  * `next()` will error.
  *
- * @param {Function} callback
  * @return {Promise}
  * @api public
  * @method close
- * @emits close
+ * @emits "close"
  * @see AggregationCursor.close https://mongodb.github.io/node-mongodb-native/4.9/classes/AggregationCursor.html#close
  */
 

package/lib/document.js

@@ -831,7 +831,7 @@ function init(self, obj, doc, opts, prefix) {
  *
  * #### Example:
  *
- *     weirdCar.updateOne({$inc: {wheels:1}}, { w: 1 }, callback);
+ *     weirdCar.updateOne({$inc: {wheels:1}}, { w: 1 });
  *
  * #### Valid options:
  *
@@ -843,7 +843,6 @@ function init(self, obj, doc, opts, prefix) {
  * @param {Object} [options.lean] if truthy, mongoose will return the document as a plain JavaScript object rather than a mongoose document. See [`Query.lean()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.lean()) and the [Mongoose lean tutorial](https://mongoosejs.com/docs/tutorials/lean.html).
  * @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](https://mongoosejs.com/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}
  * @api public
  * @memberOf Document
@@ -1777,6 +1776,11 @@ Document.prototype.$__set = function(pathToMark, path, options, constructing, pa
  */
 
 Document.prototype.$__getValue = function(path) {
+  if (typeof path !== 'string' && !Array.isArray(path)) {
+    throw new TypeError(
+      `Invalid \`path\`. Must be either string or array. Got "${path}" (type ${typeof path})`
+    );
+  }
   return utils.getValue(path, this._doc);
 };
 
@@ -2353,17 +2357,17 @@ Document.prototype.$isDefault = function(path) {
 };
 
 /**
- * Getter/setter, determines whether the document was removed or not.
+ * Getter/setter, determines whether the document was deleted. The `Model.prototype.deleteOne()` method sets `$isDeleted` if the delete operation succeeded.
  *
  * #### Example:
  *
- *     const product = await product.remove();
+ *     const product = await product.deleteOne();
  *     product.$isDeleted(); // true
- *     product.remove(); // no-op, doesn't send anything to the db
+ *     product.deleteOne(); // no-op, doesn't send anything to the db
  *
  *     product.$isDeleted(false);
  *     product.$isDeleted(); // false
- *     product.remove(); // will execute a remove against the db
+ *     product.deleteOne(); // will execute a remove against the db
  *
  *
  * @param {Boolean} [val] optional, overrides whether mongoose thinks the doc is deleted
@@ -3439,12 +3443,11 @@ function _checkImmutableSubpaths(subdoc, schematype, priorVal) {
  * @param {Number} [options.wtimeout] sets a [timeout for the write concern](https://www.mongodb.com/docs/manual/reference/write-concern/#wtimeout). Overrides the [schema-level `writeConcern` option](https://mongoosejs.com/docs/guide.html#writeConcern).
  * @param {Boolean} [options.checkKeys=true] the MongoDB driver prevents you from saving keys that start with '$' or contain '.' by default. Set this option to `false` to skip that check. See [restrictions on field names](https://www.mongodb.com/docs/manual/reference/limits/#Restrictions-on-Field-Names)
  * @param {Boolean} [options.timestamps=true] if `false` and [timestamps](https://mongoosejs.com/docs/guide.html#timestamps) are enabled, skip timestamps for this `save()`.
- * @param {Function} [fn] optional callback
  * @method save
  * @memberOf Document
  * @instance
  * @throws {DocumentNotFoundError} if this [save updates an existing document](https://mongoosejs.com/docs/api/document.html#Document.prototype.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.
+ * @return {Promise}
  * @api public
  * @see middleware https://mongoosejs.com/docs/middleware.html
  */

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

@@ -454,7 +454,6 @@ function format(obj, sub, color, shell) {
 /**
  * Retrieves information about this collections indexes.
  *
- * @param {Function} callback
  * @method getIndexes
  * @api public
  */

package/lib/helpers/indexes/isIndexSpecEqual.js

@@ -0,0 +1,32 @@
+'use strict';
+
+/**
+ * Compares two index specifications to determine if they are equal.
+ *
+ * #### Example:
+ *     isIndexSpecEqual({ a: 1, b: 1 }, { a: 1, b: 1 }); // true
+ *     isIndexSpecEqual({ a: 1, b: 1 }, { b: 1, a: 1 }); // false
+ *     isIndexSpecEqual({ a: 1, b: -1 }, { a: 1, b: 1 }); // false
+ *
+ * @param {Object} spec1 The first index specification to compare.
+ * @param {Object} spec2 The second index specification to compare.
+ * @returns {Boolean} Returns true if the index specifications are equal, otherwise returns false.
+ */
+
+module.exports = function isIndexSpecEqual(spec1, spec2) {
+  const spec1Keys = Object.keys(spec1);
+  const spec2Keys = Object.keys(spec2);
+
+  if (spec1Keys.length !== spec2Keys.length) {
+    return false;
+  }
+
+  for (let i = 0; i < spec1Keys.length; i++) {
+    const key = spec1Keys[i];
+    if (key !== spec2Keys[i] || spec1[key] !== spec2[key]) {
+      return false;
+    }
+  }
+
+  return true;
+};

package/lib/helpers/model/discriminator.js

@@ -119,6 +119,7 @@ module.exports = function discriminator(model, name, schema, tiedValue, applyPlu
     // schema. `Schema.prototype.clone()` copies `obj` by reference, no cloning.
     schema.obj = { ...schema.obj };
     mergeDiscriminatorSchema(schema, baseSchema);
+    schema._gatherChildSchemas();
 
     // Clean up conflicting paths _after_ merging re: gh-6076
     for (const conflictingPath of conflictingPaths) {

package/lib/model.js

@@ -694,13 +694,20 @@ Model.prototype.$__where = function _where(where) {
 };
 
 /**
- * Delete this document from the db.
+ * Delete this document from the db. Returns a Query instance containing a `deleteOne` operation by this document's `_id`.
  *
  * #### Example:
  *
  *     await product.deleteOne();
  *     await Product.findById(product._id); // null
  *
+ * Since `deleteOne()` returns a Query, the `deleteOne()` will **not** execute unless you use either `await`, `.then()`, `.catch()`, or [`.exec()`](https://mongoosejs.com/docs/api/query.html#Query.prototype.exec())
+ *
+ * #### Example:
+ *
+ *     product.deleteOne(); // Doesn't do anything
+ *     product.deleteOne().exec(); // Deletes the document, returns a promise
+ *
  * @return {Query} Query
  * @api public
  */
@@ -1879,8 +1886,6 @@ Model.translateAliases = function translateAliases(fields, errorOnDuplicates) {
 /**
  * Deletes the first document that matches `conditions` from the collection.
  * It returns an object with the property `deletedCount` indicating how many documents were deleted.
- * Behaves like `remove()`, but deletes at most one document regardless of the
- * `single` option.
  *
  * #### Example:
  *
@@ -1914,8 +1919,6 @@ Model.deleteOne = function deleteOne(conditions, options) {
 /**
  * Deletes all of the documents that match `conditions` from the collection.
  * It returns an object with the property `deletedCount` containing the number of documents deleted.
- * Behaves like `remove()`, but deletes all documents that match `conditions`
- * regardless of the `single` option.
  *
  * #### Example:
  *
@@ -2231,7 +2234,7 @@ Model.$where = function $where() {
 /**
  * Issues a mongodb findOneAndUpdate command.
  *
- * Finds a matching document, updates it according to the `update` arg, passing any `options`, and returns the found document (if any) to the callback. The query executes if `callback` is passed else a Query object is returned.
+ * Finds a matching document, updates it according to the `update` arg, passing any `options`. A Query object is returned.
  *
  * #### Example:
  *
@@ -2729,7 +2732,7 @@ Model.create = async function create(doc, options) {
  *     //   operationType: 'delete',
  *     //   ns: { db: 'mydb', coll: 'Person' },
  *     //   documentKey: { _id: 5a51b125c5500f5aa094c7bd } }
- *     await doc.remove();
+ *     await doc.deleteOne();
  *
  * @param {Array} [pipeline]
  * @param {Object} [options] see the [mongodb driver options](https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#watch)
@@ -2777,7 +2780,7 @@ Model.watch = function(pipeline, options) {
  *
  *     const session = await Person.startSession();
  *     let doc = await Person.findOne({ name: 'Ned Stark' }, null, { session });
- *     await doc.remove();
+ *     await doc.deleteOne();
  *     // `doc` will always be null, even if reading from a replica set
  *     // secondary. Without causal consistency, it is possible to
  *     // get a doc back from the below query if the query reads from a
@@ -3643,7 +3646,11 @@ Model.castObject = function castObject(obj, options) {
   options = options || {};
   const ret = {};
 
-  const schema = this.schema;
+  let schema = this.schema;
+  const discriminatorKey = schema.options.discriminatorKey;
+  if (schema.discriminators != null && obj != null && obj[discriminatorKey] != null) {
+    schema = getSchemaDiscriminatorByValue(schema, obj[discriminatorKey]) || schema;
+  }
   const paths = Object.keys(schema.paths);
 
   for (const path of paths) {
@@ -3992,7 +3999,7 @@ function _update(model, op, conditions, doc, options) {
 /**
  * Performs [aggregations](https://www.mongodb.com/docs/manual/aggregation/) on the models collection.
  *
- * If a `callback` is passed, the `aggregate` is executed and a `Promise` is returned. If a callback is not passed, the `aggregate` itself is returned.
+ * The `aggregate` itself is returned.
  *
  * This function triggers the following middleware.
  *
@@ -4047,10 +4054,6 @@ Model.aggregate = function aggregate(pipeline, options) {
     aggregate.option(options);
   }
 
-  if (typeof callback === 'undefined') {
-    return aggregate;
-  }
-
   return aggregate;
 };
 
@@ -4238,7 +4241,6 @@ Model.validate = async function validate(obj, pathsOrOptions, context) {
  * @param {Object} [options.options=null] Additional options like `limit` and `lean`.
  * @param {Function} [options.transform=null] Function that Mongoose will call on every populated document that allows you to transform the populated document.
  * @param {Boolean} [options.forceRepopulate=true] Set to `false` to prevent Mongoose from repopulating paths that are already populated
- * @param {Function} [callback(err,doc)] Optional callback, executed upon completion. Receives `err` and the `doc(s)`.
  * @return {Promise}
  * @api public
  */

package/lib/mongoose.js

@@ -245,7 +245,7 @@ Mongoose.prototype.setDriver = function setDriver(driver) {
  * @api public
  */
 
-Mongoose.prototype.set = function(key, value) {
+Mongoose.prototype.set = function getsetOptions(key, value) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   if (arguments.length === 1 && typeof key !== 'object') {
@@ -376,7 +376,7 @@ Mongoose.prototype.get = Mongoose.prototype.set;
  * @api public
  */
 
-Mongoose.prototype.createConnection = function(uri, options) {
+Mongoose.prototype.createConnection = function createConnection(uri, options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   const Connection = _mongoose.__driver.Connection;
@@ -427,7 +427,6 @@ Mongoose.prototype.createConnection = function(uri, options) {
  * @param {Number} [options.socketTimeoutMS=0] 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. `socketTimeoutMS` defaults to 0, which means Node.js will not time out the socket due to inactivity. 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.
  * @param {Boolean} [options.autoCreate=false] Set to `true` to make Mongoose automatically call `createCollection()` on every model created on this connection.
- * @param {Function} [callback]
  * @see Mongoose#createConnection https://mongoosejs.com/docs/api/mongoose.html#Mongoose.prototype.createConnection()
  * @api public
  * @return {Promise} resolves to `this` if connection succeeded
@@ -479,12 +478,11 @@ Mongoose.prototype.disconnect = async function disconnect() {
  *
  * @param {Object} [options] see the [mongodb driver options](https://mongodb.github.io/node-mongodb-native/4.9/classes/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`
  * @api public
  */
 
-Mongoose.prototype.startSession = function() {
+Mongoose.prototype.startSession = function startSession() {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   return _mongoose.connection.startSession.apply(_mongoose.connection, arguments);
@@ -498,7 +496,7 @@ Mongoose.prototype.startSession = function() {
  * @api public
  */
 
-Mongoose.prototype.pluralize = function(fn) {
+Mongoose.prototype.pluralize = function pluralize(fn) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   if (arguments.length > 0) {
@@ -561,7 +559,7 @@ Mongoose.prototype.pluralize = function(fn) {
  * @api public
  */
 
-Mongoose.prototype.model = function(name, schema, collection, options) {
+Mongoose.prototype.model = function model(name, schema, collection, options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   if (typeof schema === 'string') {
@@ -572,7 +570,7 @@ Mongoose.prototype.model = function(name, schema, collection, options) {
   if (arguments.length === 1) {
     const model = _mongoose.models[name];
     if (!model) {
-      throw new MongooseError.MissingSchemaError(name);
+      throw new _mongoose.Error.MissingSchemaError(name);
     }
     return model;
   }
@@ -581,7 +579,7 @@ Mongoose.prototype.model = function(name, schema, collection, options) {
     schema = new Schema(schema);
   }
   if (schema && !(schema instanceof Schema)) {
-    throw new Error('The 2nd parameter to `mongoose.model()` should be a ' +
+    throw new _mongoose.Error('The 2nd parameter to `mongoose.model()` should be a ' +
       'schema or a POJO');
   }
 
@@ -632,7 +630,7 @@ Mongoose.prototype.model = function(name, schema, collection, options) {
  * ignore
  */
 
-Mongoose.prototype._model = function(name, schema, collection, options) {
+Mongoose.prototype._model = function _model(name, schema, collection, options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   let model;
@@ -707,7 +705,7 @@ Mongoose.prototype._model = function(name, schema, collection, options) {
  * @return {Mongoose} this
  */
 
-Mongoose.prototype.deleteModel = function(name) {
+Mongoose.prototype.deleteModel = function deleteModel(name) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   _mongoose.connection.deleteModel(name);
@@ -726,7 +724,7 @@ Mongoose.prototype.deleteModel = function(name) {
  * @return {Array}
  */
 
-Mongoose.prototype.modelNames = function() {
+Mongoose.prototype.modelNames = function modelNames() {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   const names = Object.keys(_mongoose.models);
@@ -740,7 +738,7 @@ Mongoose.prototype.modelNames = function() {
  * @api private
  */
 
-Mongoose.prototype._applyPlugins = function(schema, options) {
+Mongoose.prototype._applyPlugins = function _applyPlugins(schema, options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   options = options || {};
@@ -763,7 +761,7 @@ Mongoose.prototype._applyPlugins = function(schema, options) {
  * @api public
  */
 
-Mongoose.prototype.plugin = function(fn, opts) {
+Mongoose.prototype.plugin = function plugin(fn, opts) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
 
   _mongoose.plugins.push([fn, opts]);
@@ -1073,7 +1071,7 @@ Mongoose.prototype.ObjectId = SchemaTypes.ObjectId;
  * @api public
  */
 
-Mongoose.prototype.isValidObjectId = function(v) {
+Mongoose.prototype.isValidObjectId = function isValidObjectId(v) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
   return _mongoose.Types.ObjectId.isValid(v);
 };
@@ -1105,7 +1103,7 @@ Mongoose.prototype.isValidObjectId = function(v) {
  * @api public
  */
 
-Mongoose.prototype.isObjectIdOrHexString = function(v) {
+Mongoose.prototype.isObjectIdOrHexString = function isObjectIdOrHexString(v) {
   return isBsonType(v, 'ObjectId') || (typeof v === 'string' && objectIdHexRegexp.test(v));
 };
 
@@ -1117,7 +1115,7 @@ Mongoose.prototype.isObjectIdOrHexString = function(v) {
  * @param {Boolean} options.continueOnError `false` by default. If set to `true`, mongoose will not throw an error if one model syncing failed, and will return an object where the keys are the names of the models, and the values are the results/errors for each model.
  * @return {Promise} Returns a Promise, when the Promise resolves the value is a list of the dropped indexes.
  */
-Mongoose.prototype.syncIndexes = function(options) {
+Mongoose.prototype.syncIndexes = function syncIndexes(options) {
   const _mongoose = this instanceof Mongoose ? this : mongoose;
   return _mongoose.connection.syncIndexes(options);
 };
@@ -1192,8 +1190,8 @@ Mongoose.prototype.Number = SchemaTypes.Number;
  * @api public
  */
 
-Mongoose.prototype.Error = require('./error/index');
-Mongoose.prototype.MongooseError = require('./error/mongooseError');
+Mongoose.prototype.Error = MongooseError;
+Mongoose.prototype.MongooseError = MongooseError;
 
 /**
  * Mongoose uses this function to get the current time when setting
@@ -1218,7 +1216,7 @@ Mongoose.prototype.now = function now() { return new Date(); };
  * @api public
  */
 
-Mongoose.prototype.CastError = require('./error/cast');
+Mongoose.prototype.CastError = MongooseError.CastError;
 
 /**
  * The constructor used for schematype options