mongoose 8.16.5 → 8.17.0

package/lib/mongoose.js

@@ -855,6 +855,17 @@ Mongoose.prototype.nextConnectionId;
 
 Mongoose.prototype.Aggregate = Aggregate;
 
+/**
+ * The Base Mongoose Collection class. `mongoose.Collection` extends from this class.
+ *
+ * @memberOf Mongoose
+ * @instance
+ * @method Collection
+ * @api public
+ */
+
+Mongoose.prototype.BaseCollection = require('./collection');
+
 /**
  * The Mongoose Collection constructor
  *
@@ -895,6 +906,17 @@ Object.defineProperty(Mongoose.prototype, 'Connection', {
   }
 });
 
+/**
+ * The Base Mongoose Connection class. `mongoose.Connection` extends from this class.
+ *
+ * @memberOf Mongoose
+ * @instance
+ * @method Connection
+ * @api public
+ */
+
+Mongoose.prototype.BaseConnection = require('./connection');
+
 /**
  * The Mongoose version
  *

package/lib/schema/array.js

@@ -649,6 +649,14 @@ function cast$elemMatch(val, context) {
   return val;
 }
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$all` is the function Mongoose calls to cast `$all` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 const handle = SchemaArray.prototype.$conditionalHandlers = {};
 
 handle.$all = cast$all;

package/lib/schema/bigint.js

@@ -185,6 +185,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$in` is the function Mongoose calls to cast `$in` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaBigInt.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/boolean.js

@@ -237,6 +237,14 @@ SchemaBoolean.prototype.cast = function(value) {
 
 const $conditionalHandlers = { ...SchemaType.prototype.$conditionalHandlers };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$in` is the function Mongoose calls to cast `$in` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaBoolean.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/buffer.js

@@ -271,6 +271,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$exists` is the function Mongoose calls to cast `$exists` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaBuffer.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/date.js

@@ -397,6 +397,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$gte` is the function Mongoose calls to cast `$gte` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaDate.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/decimal128.js

@@ -222,6 +222,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$lte` is the function Mongoose calls to cast `$lte` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaDecimal128.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/documentArray.js

@@ -116,7 +116,19 @@ SchemaDocumentArray.options = { castNonArrays: true };
 SchemaDocumentArray.prototype = Object.create(SchemaArray.prototype);
 SchemaDocumentArray.prototype.constructor = SchemaDocumentArray;
 SchemaDocumentArray.prototype.OptionsConstructor = SchemaDocumentArrayOptions;
-SchemaDocumentArray.prototype.$conditionalHandlers = { ...SchemaArray.prototype.$conditionalHandlers };
+
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$size` is the function Mongoose calls to cast `$size` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
+Object.defineProperty(SchemaDocumentArray.prototype, '$conditionalHandlers', {
+  enumerable: false,
+  value: { ...SchemaArray.prototype.$conditionalHandlers }
+});
 
 /*!
  * ignore

package/lib/schema/double.js

@@ -205,6 +205,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$lt` is the function Mongoose calls to cast `$lt` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaDouble.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/int32.js

@@ -209,6 +209,14 @@ const $conditionalHandlers = {
   $bitsAnySet: handleBitwiseOperator
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$gt` is the function Mongoose calls to cast `$gt` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaInt32.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/number.js

@@ -413,6 +413,14 @@ const $conditionalHandlers = {
   $mod: handleArray
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$gte` is the function Mongoose calls to cast `$gte` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaNumber.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/objectId.js

@@ -268,6 +268,14 @@ const $conditionalHandlers = {
   $lte: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$in` is the function Mongoose calls to cast `$in` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaObjectId.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/string.js

@@ -660,6 +660,14 @@ const $conditionalHandlers = {
   $not: handleSingle
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$exists` is the function Mongoose calls to cast `$exists` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaString.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schema/subdocument.js

@@ -117,6 +117,11 @@ function _createConstructor(schema, baseClass, options) {
   return _embedded;
 }
 
+/*!
+ * ignore
+ */
+const $conditionalHandlers = { ...SchemaType.prototype.$conditionalHandlers };
+
 /**
  * Special case for when users use a common location schema to represent
  * locations for use with $geoWithin.
@@ -126,7 +131,7 @@ function _createConstructor(schema, baseClass, options) {
  * @api private
  */
 
-SchemaSubdocument.prototype.$conditionalHandlers.$geoWithin = function handle$geoWithin(val, context) {
+$conditionalHandlers.$geoWithin = function handle$geoWithin(val, context) {
   return { $geometry: this.castForQuery(null, val.$geometry, context) };
 };
 
@@ -134,19 +139,32 @@ SchemaSubdocument.prototype.$conditionalHandlers.$geoWithin = function handle$ge
  * ignore
  */
 
-SchemaSubdocument.prototype.$conditionalHandlers.$near =
-SchemaSubdocument.prototype.$conditionalHandlers.$nearSphere = geospatial.cast$near;
+$conditionalHandlers.$near =
+$conditionalHandlers.$nearSphere = geospatial.cast$near;
 
-SchemaSubdocument.prototype.$conditionalHandlers.$within =
-SchemaSubdocument.prototype.$conditionalHandlers.$geoWithin = geospatial.cast$within;
+$conditionalHandlers.$within =
+$conditionalHandlers.$geoWithin = geospatial.cast$within;
 
-SchemaSubdocument.prototype.$conditionalHandlers.$geoIntersects =
+$conditionalHandlers.$geoIntersects =
   geospatial.cast$geoIntersects;
 
-SchemaSubdocument.prototype.$conditionalHandlers.$minDistance = castToNumber;
-SchemaSubdocument.prototype.$conditionalHandlers.$maxDistance = castToNumber;
+$conditionalHandlers.$minDistance = castToNumber;
+$conditionalHandlers.$maxDistance = castToNumber;
+
+$conditionalHandlers.$exists = $exists;
+
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$exists` is the function Mongoose calls to cast `$exists` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
 
-SchemaSubdocument.prototype.$conditionalHandlers.$exists = $exists;
+Object.defineProperty(SchemaSubdocument.prototype, '$conditionalHandlers', {
+  enumerable: false,
+  value: $conditionalHandlers
+});
 
 /**
  * Casts contents

package/lib/schema/uuid.js

@@ -258,6 +258,14 @@ const $conditionalHandlers = {
   $nin: handleArray
 };
 
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$exists` is the function Mongoose calls to cast `$exists` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
+ */
+
 Object.defineProperty(SchemaUUID.prototype, '$conditionalHandlers', {
   enumerable: false,
   value: $conditionalHandlers

package/lib/schemaType.js

@@ -1638,8 +1638,12 @@ function handle$in(val, context) {
   });
 }
 
-/*!
- * ignore
+/**
+ * Contains the handlers for different query operators for this schema type.
+ * For example, `$conditionalHandlers.$exists` is the function Mongoose calls to cast `$exists` filter operators.
+ *
+ * @property $conditionalHandlers
+ * @api public
  */
 
 SchemaType.prototype.$conditionalHandlers = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "8.16.5",
+  "version": "8.17.0",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -22,7 +22,7 @@
   "dependencies": {
     "bson": "^6.10.4",
     "kareem": "2.6.3",
-    "mongodb": "~6.17.0",
+    "mongodb": "~6.18.0",
     "mpath": "0.9.0",
     "mquery": "5.0.0",
     "ms": "2.1.3",

package/types/aggregate.d.ts

@@ -4,7 +4,7 @@ declare module 'mongoose' {
   /** Extract generic type from Aggregate class */
   type AggregateExtract<P> = P extends Aggregate<infer T> ? T : never;
 
-  interface AggregateOptions extends Omit<mongodb.AggregateOptions, 'session'>, SessionOption {
+  interface AggregateOptions extends Omit<mongodb.AggregateOptions & mongodb.Abortable, 'session'>, SessionOption {
     [key: string]: any;
   }
 

package/types/collection.d.ts

@@ -21,6 +21,8 @@ declare module 'mongoose' {
     name: string;
   }
 
+  export type BaseCollection<T extends mongodb.Document> = CollectionBase<T>;
+
   /*
    * section drivers/node-mongodb-native/collection.js
    */

package/types/connection.d.ts

@@ -71,6 +71,8 @@ declare module 'mongoose' {
       };
   }[keyof SchemaMap];
 
+  export type BaseConnection = Connection;
+
   class Connection extends events.EventEmitter implements SessionStarter {
     /** Runs a [db-level aggregate()](https://www.mongodb.com/docs/manual/reference/method/db.aggregate/) on this connection's underlying `db` */
     aggregate<ResultType = unknown>(pipeline?: PipelineStage[] | null, options?: AggregateOptions): Aggregate<Array<ResultType>>;

package/types/document.d.ts

@@ -18,7 +18,7 @@ declare module 'mongoose' {
    * *  TQueryHelpers - Object with any helpers that should be mixed into the Query type
    * *  DocType - the type of the actual Document created
    */
-  class Document<T = unknown, TQueryHelpers = any, DocType = any, TVirtuals = Record<string, any>> {
+  class Document<T = unknown, TQueryHelpers = any, DocType = any, TVirtuals = Record<string, any>, TSchemaOptions = {}> {
     constructor(doc?: any);
 
     /** This documents _id. */
@@ -256,23 +256,23 @@ declare module 'mongoose' {
     set(value: string | Record<string, any>): this;
 
     /** The return value of this method is used in calls to JSON.stringify(doc). */
-    toJSON(options: ToObjectOptions & { virtuals: true }): Default__v<Require_id<DocType & TVirtuals>>;
-    toJSON(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<Default__v<Require_id<DocType>>>;
-    toJSON(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<Default__v<Require_id<DocType>>>;
-    toJSON(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<Default__v<Require_id<DocType>>>>;
-    toJSON(options: ToObjectOptions & { flattenMaps: false }): Default__v<Require_id<DocType>>;
-    toJSON(options: ToObjectOptions & { flattenMaps: false; flattenObjectIds: true }): ObjectIdToString<Default__v<Require_id<DocType>>>;
-
-    toJSON<T = Default__v<Require_id<DocType>>>(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<T>;
-    toJSON<T = Default__v<Require_id<DocType>>>(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<T>;
-    toJSON<T = Default__v<Require_id<DocType>>>(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<T>>;
-    toJSON<T = Default__v<Require_id<DocType>>>(options: ToObjectOptions & { flattenMaps: false }): T;
-    toJSON<T = Default__v<Require_id<DocType>>>(options: ToObjectOptions & { flattenMaps: false; flattenObjectIds: true }): ObjectIdToString<T>;
+    toJSON(options: ToObjectOptions & { virtuals: true }): Default__v<Require_id<DocType & TVirtuals>, TSchemaOptions>;
+    toJSON(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<Default__v<Require_id<DocType>, TSchemaOptions>>;
+    toJSON(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<Default__v<Require_id<DocType>, TSchemaOptions>>;
+    toJSON(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<Default__v<Require_id<DocType>, TSchemaOptions>>>;
+    toJSON(options: ToObjectOptions & { flattenMaps: false }): Default__v<Require_id<DocType>, TSchemaOptions>;
+    toJSON(options: ToObjectOptions & { flattenMaps: false; flattenObjectIds: true }): ObjectIdToString<Default__v<Require_id<DocType>, TSchemaOptions>>;
+
+    toJSON<T = Default__v<Require_id<DocType>, TSchemaOptions>>(options?: ToObjectOptions & { flattenMaps?: true, flattenObjectIds?: false }): FlattenMaps<T>;
+    toJSON<T = Default__v<Require_id<DocType>, TSchemaOptions>>(options: ToObjectOptions & { flattenObjectIds: false }): FlattenMaps<T>;
+    toJSON<T = Default__v<Require_id<DocType>, TSchemaOptions>>(options: ToObjectOptions & { flattenObjectIds: true }): ObjectIdToString<FlattenMaps<T>>;
+    toJSON<T = Default__v<Require_id<DocType>, TSchemaOptions>>(options: ToObjectOptions & { flattenMaps: false }): T;
+    toJSON<T = Default__v<Require_id<DocType>, TSchemaOptions>>(options: ToObjectOptions & { flattenMaps: false, flattenObjectIds: true }): ObjectIdToString<T>;
 
     /** Converts this document into a plain-old JavaScript object ([POJO](https://masteringjs.io/tutorials/fundamentals/pojo)). */
-    toObject(options: ToObjectOptions & { virtuals: true }): Default__v<Require_id<DocType & TVirtuals>>;
-    toObject(options?: ToObjectOptions): Default__v<Require_id<DocType>>;
-    toObject<T>(options?: ToObjectOptions): Default__v<Require_id<T>>;
+    toObject(options: ToObjectOptions & { virtuals: true }): Default__v<Require_id<DocType & TVirtuals>, TSchemaOptions>;
+    toObject(options?: ToObjectOptions): Default__v<Require_id<DocType>, TSchemaOptions>;
+    toObject<T>(options?: ToObjectOptions): Default__v<Require_id<T>, TSchemaOptions>;
 
     /** Clears the modified state on the specified path. */
     unmarkModified<T extends keyof DocType>(path: T): void;

package/types/index.d.ts

@@ -91,7 +91,8 @@ declare module 'mongoose' {
       InferSchemaType<TSchema>,
       ObtainSchemaGeneric<TSchema, 'TVirtuals'> & ObtainSchemaGeneric<TSchema, 'TInstanceMethods'>,
       ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
-      ObtainSchemaGeneric<TSchema, 'TVirtuals'>
+      ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
+      ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>
     >,
     TSchema
   > & ObtainSchemaGeneric<TSchema, 'TStaticMethods'>;
@@ -139,7 +140,7 @@ declare module 'mongoose' {
     ? IfAny<U, T & { _id: Types.ObjectId }, T & Required<{ _id: U }>>
     : T & { _id: Types.ObjectId };
 
-  export type Default__v<T> = T extends { __v?: infer U }
+  export type Default__v<T, TSchemaOptions = {}> = TSchemaOptions extends { versionKey: false } ? T : T extends { __v?: infer U }
     ? T
     : T & { __v: number };
 
@@ -148,17 +149,18 @@ declare module 'mongoose' {
     DocType,
     TOverrides = {},
     TQueryHelpers = {},
-    TVirtuals = {}
+    TVirtuals = {},
+    TSchemaOptions = {}
   > = IfAny<
     DocType,
     any,
     TOverrides extends Record<string, never> ?
-      Document<unknown, TQueryHelpers, DocType, TVirtuals> & Default__v<Require_id<DocType>> :
+      Document<unknown, TQueryHelpers, DocType, TVirtuals, TSchemaOptions> & Default__v<Require_id<DocType>, TSchemaOptions> :
       IfAny<
         TOverrides,
-        Document<unknown, TQueryHelpers, DocType, TVirtuals> & Default__v<Require_id<DocType>>,
-        Document<unknown, TQueryHelpers, DocType, TVirtuals> & MergeType<
-          Default__v<Require_id<DocType>>,
+        Document<unknown, TQueryHelpers, DocType, TVirtuals, TSchemaOptions> & Default__v<Require_id<DocType>, TSchemaOptions>,
+        Document<unknown, TQueryHelpers, DocType, TVirtuals, TSchemaOptions> & MergeType<
+          Default__v<Require_id<DocType>, TSchemaOptions>,
           TOverrides
         >
       >
@@ -196,10 +198,11 @@ declare module 'mongoose' {
     >;
 
   export type HydratedDocumentFromSchema<TSchema extends Schema> = HydratedDocument<
-  InferSchemaType<TSchema>,
-  ObtainSchemaGeneric<TSchema, 'TInstanceMethods'> & ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
-  ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
-  ObtainSchemaGeneric<TSchema, 'TVirtuals'>
+    InferSchemaType<TSchema>,
+    ObtainSchemaGeneric<TSchema, 'TInstanceMethods'> & ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
+    ObtainSchemaGeneric<TSchema, 'TQueryHelpers'>,
+    ObtainSchemaGeneric<TSchema, 'TVirtuals'>,
+    ObtainSchemaGeneric<TSchema, 'TSchemaOptions'>
   >;
 
   export interface TagSet {
@@ -272,7 +275,7 @@ declare module 'mongoose' {
       ObtainDocumentType<any, RawDocType, ResolveSchemaOptions<TSchemaOptions>>,
       ResolveSchemaOptions<TSchemaOptions>
     >,
-    THydratedDocumentType = HydratedDocument<FlatRecord<DocType>, TVirtuals & TInstanceMethods, {}, TVirtuals>
+    THydratedDocumentType = HydratedDocument<FlatRecord<DocType>, TVirtuals & TInstanceMethods, {}, TVirtuals, ResolveSchemaOptions<TSchemaOptions>>
   >
     extends events.EventEmitter {
     /**
@@ -370,6 +373,8 @@ declare module 'mongoose' {
     /** Returns a new schema that has the `paths` from the original schema, minus the omitted ones. */
     omit<T = this>(paths: string[], options?: SchemaOptions): T;
 
+    options: SchemaOptions;
+
     /** Gets/sets schema paths. */
     path<ResultType extends SchemaType = SchemaType<any, THydratedDocumentType>>(path: string): ResultType;
     path<pathGeneric extends keyof RawDocType>(path: pathGeneric): SchemaType<RawDocType[pathGeneric]>;
@@ -602,7 +607,7 @@ declare module 'mongoose' {
     | typeof Schema.Types.UUID;
 
 
-  export type InferId<T> = T extends { _id?: any } ? T['_id'] : Types.ObjectId;
+  export type InferId<T> = mongodb.InferIdType<T>;
 
   export interface VirtualTypeOptions<HydratedDocType = Document, DocType = unknown> {
     /** If `ref` is not nullish, this becomes a populated virtual. */
@@ -897,11 +902,6 @@ declare module 'mongoose' {
 
   export type SchemaDefinitionType<T> = T extends Document ? Omit<T, Exclude<keyof Document, '_id' | 'id' | '__v'>> : T;
 
-  /**
-   * Helper to choose the best option between two type helpers
-   */
-  export type _pickObject<T1, T2, Fallback> = T1 extends false ? T2 extends false ? Fallback : T2 : T1;
-
   /* for ts-mongoose */
   export class mquery { }
 

package/types/models.d.ts

@@ -273,7 +273,6 @@ declare module 'mongoose' {
     THydratedDocumentType = HydratedDocument<TRawDocType, TVirtuals & TInstanceMethods, TQueryHelpers, TVirtuals>,
     TSchema = any> extends
     NodeJS.EventEmitter,
-    AcceptsDiscriminator,
     IndexManager,
     SessionStarter {
     new <DocType = Partial<TRawDocType>>(doc?: DocType, fields?: any | null, options?: boolean | AnyObject): THydratedDocumentType;
@@ -313,11 +312,11 @@ declare module 'mongoose' {
      * round trip to the MongoDB server.
      */
     bulkWrite<DocContents = TRawDocType>(
-      writes: Array<AnyBulkWriteOperation<DocContents extends Document ? any : (DocContents extends {} ? DocContents : any)>>,
+      writes: Array<AnyBulkWriteOperation<DocContents>>,
       options: MongooseBulkWriteOptions & { ordered: false }
     ): Promise<MongooseBulkWriteResult>;
     bulkWrite<DocContents = TRawDocType>(
-      writes: Array<AnyBulkWriteOperation<DocContents extends Document ? any : (DocContents extends {} ? DocContents : any)>>,
+      writes: Array<AnyBulkWriteOperation<DocContents>>,
       options?: MongooseBulkWriteOptions
     ): Promise<MongooseBulkWriteResult>;
 
@@ -334,7 +333,7 @@ declare module 'mongoose' {
     /** Creates a `countDocuments` query: counts the number of documents that match `filter`. */
     countDocuments(
       filter?: RootFilterQuery<TRawDocType>,
-      options?: (mongodb.CountOptions & MongooseBaseQueryOptions<TRawDocType>) | null
+      options?: (mongodb.CountOptions & MongooseBaseQueryOptions<TRawDocType> & mongodb.Abortable) | null
     ): QueryWithHelpers<
       number,
       THydratedDocumentType,
@@ -426,6 +425,28 @@ declare module 'mongoose' {
       TInstanceMethods & TVirtuals
     >;
 
+    /** Adds a discriminator type. */
+    discriminator<TDiscriminatorSchema extends Schema<any, any>>(
+      name: string | number,
+      schema: TDiscriminatorSchema,
+      value?: string | number | ObjectId | DiscriminatorOptions
+    ): Model<
+      TRawDocType & InferSchemaType<TDiscriminatorSchema>,
+      TQueryHelpers & ObtainSchemaGeneric<TDiscriminatorSchema, 'TQueryHelpers'>,
+      TInstanceMethods & ObtainSchemaGeneric<TDiscriminatorSchema, 'TInstanceMethods'>,
+      TVirtuals & ObtainSchemaGeneric<TDiscriminatorSchema, 'TVirtuals'>
+    > & ObtainSchemaGeneric<TDiscriminatorSchema, 'TStaticMethods'>;
+    discriminator<D>(
+      name: string | number,
+      schema: Schema,
+      value?: string | number | ObjectId | DiscriminatorOptions
+    ): Model<D>;
+    discriminator<T, U>(
+      name: string | number,
+      schema: Schema<T, U>,
+      value?: string | number | ObjectId | DiscriminatorOptions
+    ): U;
+
     /**
      * Delete an existing [Atlas search index](https://www.mongodb.com/docs/atlas/atlas-search/create-index/) by name.
      * This function only works when connected to MongoDB Atlas.
@@ -469,7 +490,7 @@ declare module 'mongoose' {
     findOne<ResultDoc = THydratedDocumentType>(
       filter: RootFilterQuery<TRawDocType>,
       projection: ProjectionType<TRawDocType> | null | undefined,
-      options: QueryOptions<TRawDocType> & { lean: true }
+      options: QueryOptions<TRawDocType> & { lean: true } & mongodb.Abortable
     ): QueryWithHelpers<
       GetLeanResultType<TRawDocType, TRawDocType, 'findOne'> | null,
       ResultDoc,
@@ -481,7 +502,7 @@ declare module 'mongoose' {
     findOne<ResultDoc = THydratedDocumentType>(
       filter?: RootFilterQuery<TRawDocType>,
       projection?: ProjectionType<TRawDocType> | null,
-      options?: QueryOptions<TRawDocType> | null
+      options?: QueryOptions<TRawDocType> & mongodb.Abortable | null
     ): QueryWithHelpers<ResultDoc | null, ResultDoc, TQueryHelpers, TRawDocType, 'findOne', TInstanceMethods & TVirtuals>;
     findOne<ResultDoc = THydratedDocumentType>(
       filter?: RootFilterQuery<TRawDocType>,
@@ -700,7 +721,7 @@ declare module 'mongoose' {
     find<ResultDoc = THydratedDocumentType>(
       filter: RootFilterQuery<TRawDocType>,
       projection: ProjectionType<TRawDocType> | null | undefined,
-      options: QueryOptions<TRawDocType> & { lean: true }
+      options: QueryOptions<TRawDocType> & { lean: true } & mongodb.Abortable
     ): QueryWithHelpers<
       GetLeanResultType<TRawDocType, TRawDocType[], 'find'>,
       ResultDoc,
@@ -712,7 +733,7 @@ declare module 'mongoose' {
     find<ResultDoc = THydratedDocumentType>(
       filter: RootFilterQuery<TRawDocType>,
       projection?: ProjectionType<TRawDocType> | null | undefined,
-      options?: QueryOptions<TRawDocType> | null | undefined
+      options?: QueryOptions<TRawDocType> & mongodb.Abortable | null | undefined
     ): QueryWithHelpers<Array<ResultDoc>, ResultDoc, TQueryHelpers, TRawDocType, 'find', TInstanceMethods & TVirtuals>;
     find<ResultDoc = THydratedDocumentType>(
       filter: RootFilterQuery<TRawDocType>,
@@ -885,7 +906,7 @@ declare module 'mongoose' {
     replaceOne<ResultDoc = THydratedDocumentType>(
       filter?: RootFilterQuery<TRawDocType>,
       replacement?: TRawDocType | AnyObject,
-      options?: (mongodb.ReplaceOptions & MongooseQueryOptions<TRawDocType>) | null
+      options?: (mongodb.ReplaceOptions & QueryOptions<TRawDocType>) | null
     ): QueryWithHelpers<UpdateWriteOpResult, ResultDoc, TQueryHelpers, TRawDocType, 'replaceOne', TInstanceMethods & TVirtuals>;
 
     /** Apply changes made to this model's schema after this model was compiled. */