mongodb 4.1.3 → 4.2.2

package/mongodb.d.ts

@@ -26,6 +26,7 @@ import { Readable } from 'stream';
 import type { serialize as serialize_2 } from 'bson';
 import type { SerializeOptions } from 'bson';
 import type { Socket } from 'net';
+import type { SrvRecord } from 'dns';
 import type { TcpNetConnectOpts } from 'net';
 import { Timestamp } from 'bson';
 import type { TLSSocket } from 'tls';
@@ -684,7 +685,7 @@ export { BSONRegExp }
  * BSON Serialization options.
  * @public
  */
-export declare interface BSONSerializeOptions extends Omit<SerializeOptions, 'index'>, Omit<DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index'> {
+export declare interface BSONSerializeOptions extends Omit<SerializeOptions, 'index'>, Omit<DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index' | 'validation'> {
     /** Return BSON filled buffers from operations */
     raw?: boolean;
 }
@@ -787,8 +788,10 @@ export declare abstract class BulkOperationBase {
     get bsonOptions(): BSONSerializeOptions;
     get writeConcern(): WriteConcern | undefined;
     get batches(): Batch[];
-    /** An internal helper method. Do not invoke directly. Will be going away in the future */
-    execute(options?: BulkWriteOptions, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
+    execute(options?: BulkWriteOptions): Promise<BulkWriteResult>;
+    execute(callback: Callback<BulkWriteResult>): void;
+    execute(options: BulkWriteOptions | undefined, callback: Callback<BulkWriteResult>): void;
+    execute(options?: BulkWriteOptions | Callback<BulkWriteResult>, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
     /* Excluded from this release type: handleWriteError */
     abstract addToOperationsList(batchType: BatchType, document: Document | UpdateStatement | DeleteStatement): this;
 }
@@ -909,7 +912,7 @@ export declare class CancellationToken extends TypedEventEmitter<{
  * Creates a new Change Stream instance. Normally created using {@link Collection#watch|Collection.watch()}.
  * @public
  */
-export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents> {
+export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents<TSchema>> {
     pipeline: Document[];
     options: ChangeStreamOptions;
     parent: MongoClient | Db | Collection;
@@ -950,7 +953,8 @@ export declare class ChangeStream<TSchema extends Document = Document> extends T
     /** The cached resume token that is used to resume after the most recently returned change. */
     get resumeToken(): ResumeToken;
     /** Check if there is any document still available in the Change Stream */
-    hasNext(callback?: Callback): Promise<void> | void;
+    hasNext(): Promise<boolean>;
+    hasNext(callback: Callback<boolean>): void;
     /** Get the next available document from the Change Stream. */
     next(): Promise<ChangeStreamDocument<TSchema>>;
     next(callback: Callback<ChangeStreamDocument<TSchema>>): void;
@@ -1027,14 +1031,14 @@ export declare interface ChangeStreamDocument<TSchema extends Document = Documen
 }
 
 /** @public */
-export declare type ChangeStreamEvents = {
+export declare type ChangeStreamEvents<TSchema extends Document = Document> = {
     resumeTokenChanged(token: ResumeToken): void;
-    init(response: Document): void;
-    more(response?: Document | undefined): void;
+    init(response: TSchema): void;
+    more(response?: TSchema | undefined): void;
     response(): void;
     end(): void;
     error(error: Error): void;
-    change(change: ChangeStreamDocument): void;
+    change(change: ChangeStreamDocument<TSchema>): void;
 } & AbstractCursorEvents;
 
 /**
@@ -1380,10 +1384,10 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema): Promise<UpdateResult | Document>;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, callback: Callback<UpdateResult | Document>): void;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, options: ReplaceOptions): Promise<UpdateResult | Document>;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, options: ReplaceOptions, callback: Callback<UpdateResult | Document>): void;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>): Promise<UpdateResult | Document>;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, callback: Callback<UpdateResult | Document>): void;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: ReplaceOptions): Promise<UpdateResult | Document>;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: ReplaceOptions, callback: Callback<UpdateResult | Document>): void;
     /**
      * Update multiple documents in a collection
      *
@@ -1449,12 +1453,12 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    findOne(): Promise<TSchema | null>;
-    findOne(callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<TSchema | null>): void;
+    findOne(): Promise<WithId<TSchema> | null>;
+    findOne(callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<WithId<TSchema> | null>): void;
     findOne<T = TSchema>(): Promise<T | null>;
     findOne<T = TSchema>(callback: Callback<T | null>): void;
     findOne<T = TSchema>(filter: Filter<TSchema>): Promise<T | null>;
@@ -1465,8 +1469,8 @@ export declare class Collection<TSchema extends Document = Document> {
      *
      * @param filter - The filter predicate. If unspecified, then all documents in the collection will match the predicate
      */
-    find(): FindCursor<TSchema>;
-    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<TSchema>;
+    find(): FindCursor<WithId<TSchema>>;
+    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<WithId<TSchema>>;
     find<T>(filter: Filter<TSchema>, options?: FindOptions): FindCursor<T>;
     /**
      * Returns the options of the collection.
@@ -1707,10 +1711,10 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document): Promise<ModifyResult<TSchema>>;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, callback: Callback<ModifyResult<TSchema>>): void;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, options: FindOneAndReplaceOptions): Promise<ModifyResult<TSchema>>;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, options: FindOneAndReplaceOptions, callback: Callback<ModifyResult<TSchema>>): void;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>): Promise<ModifyResult<TSchema>>;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, callback: Callback<ModifyResult<TSchema>>): void;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: FindOneAndReplaceOptions): Promise<ModifyResult<TSchema>>;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: FindOneAndReplaceOptions, callback: Callback<ModifyResult<TSchema>>): void;
     /**
      * Find a document and update it in one atomic operation. Requires a write lock for the duration of the operation.
      *
@@ -1741,6 +1745,7 @@ export declare class Collection<TSchema extends Document = Document> {
     /**
      * Run Map Reduce across a collection. Be aware that the inline option for out will return an array of results not a collection.
      *
+     * @deprecated collection.mapReduce is deprecated. Use the aggregation pipeline instead. Visit https://docs.mongodb.com/manual/reference/map-reduce-to-aggregation-pipeline for more information on how to translate map-reduce operations to the aggregation pipeline.
      * @param map - The mapping function.
      * @param reduce - The reduce function.
      * @param options - Optional settings for the command
@@ -2342,10 +2347,9 @@ export declare class Db {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    createCollection<TSchema extends Document = Document>(name: string): Promise<Collection<TSchema>>;
+    createCollection<TSchema extends Document = Document>(name: string, options?: CreateCollectionOptions): Promise<Collection<TSchema>>;
     createCollection<TSchema extends Document = Document>(name: string, callback: Callback<Collection<TSchema>>): void;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions): Promise<Collection<TSchema>>;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions, callback: Callback<Collection<TSchema>>): void;
+    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions | undefined, callback: Callback<Collection<TSchema>>): void;
     /**
      * Execute a command
      *
@@ -2733,8 +2737,8 @@ export declare type ExplainVerbosityLike = ExplainVerbosity | boolean;
 
 /** A MongoDB filter can be some portion of the schema or a set of operators @public */
 export declare type Filter<TSchema> = {
-    [P in keyof TSchema]?: Condition<TSchema[P]>;
-} & RootFilterOperators<TSchema>;
+    [P in keyof WithId<TSchema>]?: Condition<WithId<TSchema>[P]>;
+} & RootFilterOperators<WithId<TSchema>>;
 
 /** @public */
 export declare type FilterOperations<T> = T extends Record<string, any> ? {
@@ -3360,11 +3364,13 @@ export declare class HostAddress {
     socketPath: string | undefined;
     isIPv6: boolean | undefined;
     constructor(hostString: string);
+    inspect(): string;
     /**
      * @param ipv6Brackets - optionally request ipv6 bracket notation required for connection strings
      */
     toString(ipv6Brackets?: boolean): string;
     static fromString(s: string): HostAddress;
+    static fromSrvRecord({ name, port }: SrvRecord): HostAddress;
 }
 
 /** @public */
@@ -3602,6 +3608,8 @@ export declare class ListCollectionsCursor<T extends Pick<CollectionInfo, 'name'
 export declare interface ListCollectionsOptions extends CommandOperationOptions {
     /** Since 4.0: If true, will only return the collection name in the response, and will omit additional info */
     nameOnly?: boolean;
+    /** Since 4.0: If true and nameOnly is true, allows a user without the required privilege (i.e. listCollections action on the database) to run the command when access control is enforced. */
+    authorizedCollections?: boolean;
     /** The batchSize for the returned command cursor or if pre 2.8 the systems batch collection */
     batchSize?: number;
 }
@@ -4029,6 +4037,16 @@ export declare interface MongoClientOptions extends BSONSerializeOptions, Suppor
     compressors?: CompressorName[] | string;
     /** An integer that specifies the compression level if using zlib for network compression. */
     zlibCompressionLevel?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | undefined;
+    /** The maximum number of hosts to connect to when using an srv connection string, a setting of `0` means unlimited hosts */
+    srvMaxHosts?: number;
+    /**
+     * Modifies the srv URI to look like:
+     *
+     * `_{srvServiceName}._tcp.{hostname}.{domainname}`
+     *
+     * Querying this DNS URI is expected to respond with SRV records
+     */
+    srvServiceName?: string;
     /** The maximum number of connections in the connection pool. */
     maxPoolSize?: number;
     /** The minimum number of connections in the connection pool. */
@@ -4411,7 +4429,7 @@ export declare class MongoNotConnectedError extends MongoAPIError {
  * Mongo Client Options
  * @public
  */
-export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
+export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'srvMaxHosts' | 'srvServiceName' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
     hosts: HostAddress[];
     srvHost?: string;
     credentials?: MongoCredentials;
@@ -4619,6 +4637,7 @@ export declare interface OperationOptions extends BSONSerializeOptions {
     /** The preferred read preference (ReadPreference.primary, ReadPreference.primary_preferred, ReadPreference.secondary, ReadPreference.secondary_preferred, ReadPreference.nearest). */
     readPreference?: ReadPreferenceLike;
     /* Excluded from this release type: bypassPinningCheck */
+    omitReadPreference?: boolean;
 }
 
 /* Excluded from this release type: OperationParent */
@@ -4644,11 +4663,13 @@ export declare type OperationTime = Timestamp;
  * `TSchema['_id'] extends ObjectId` which translated to "Is the _id property ObjectId?"
  * we instead ask "Does ObjectId look like (have the same shape) as the _id?"
  */
-export declare type OptionalId<TSchema extends {
+export declare type OptionalId<TSchema> = TSchema extends {
     _id?: any;
-}> = ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+} ? ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+    _id?: InferIdType<TSchema>;
+} : WithId<TSchema> : EnhancedOmit<TSchema, '_id'> & {
     _id?: InferIdType<TSchema>;
-} : WithId<TSchema>;
+};
 
 /** @public */
 export declare class OrderedBulkOperation extends BulkOperationBase {
@@ -4906,7 +4927,7 @@ export declare interface ReplaceOneModel<TSchema extends Document = Document> {
     /** The filter to limit the replaced document. */
     filter: Filter<TSchema>;
     /** The document with which to replace the matched document. */
-    replacement: TSchema;
+    replacement: WithoutId<TSchema>;
     /** Specifies a collation. */
     collation?: CollationOptions;
     /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
@@ -5326,7 +5347,7 @@ export declare type TagSet = {
 export declare interface TimeSeriesCollectionOptions extends Document {
     timeField: string;
     metaField?: string;
-    granularity?: string;
+    granularity?: 'seconds' | 'minutes' | 'hours' | string;
 }
 
 export { Timestamp }
@@ -5428,6 +5449,8 @@ export declare class TopologyOpeningEvent {
 
 /** @public */
 export declare interface TopologyOptions extends BSONSerializeOptions, ServerOptions {
+    srvMaxHosts: number;
+    srvServiceName: string;
     hosts: HostAddress[];
     retryWrites: boolean;
     retryReads: boolean;
@@ -5500,7 +5523,7 @@ export declare class Transaction {
  */
 export declare interface TransactionOptions extends CommandOperationOptions {
     /** A default read concern for commands in this transaction */
-    readConcern?: ReadConcern;
+    readConcern?: ReadConcernLike;
     /** A default writeConcern for commands in this transaction */
     writeConcern?: WriteConcern;
     /** A default read preference for commands in this transaction */

package/mongodb.ts34.d.ts

@@ -25,6 +25,7 @@ import { Readable } from 'stream';
 import { serialize as serialize_2 } from 'bson';
 import { SerializeOptions } from 'bson';
 import { Socket } from 'net';
+import { SrvRecord } from 'dns';
 import { TcpNetConnectOpts } from 'net';
 import { Timestamp } from 'bson';
 import { TLSSocket } from 'tls';
@@ -649,7 +650,7 @@ export { BSONRegExp };
  * BSON Serialization options.
  * @public
  */
-export declare interface BSONSerializeOptions extends Pick<SerializeOptions, Exclude<keyof SerializeOptions, 'index'>>, Pick<DeserializeOptions, Exclude<keyof DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index'>> {
+export declare interface BSONSerializeOptions extends Pick<SerializeOptions, Exclude<keyof SerializeOptions, 'index'>>, Pick<DeserializeOptions, Exclude<keyof DeserializeOptions, 'evalFunctions' | 'cacheFunctions' | 'cacheFunctionsCrc32' | 'allowObjectSmallerThanBufferSize' | 'index' | 'validation'>> {
     /** Return BSON filled buffers from operations */
     raw?: boolean;
 }
@@ -746,8 +747,10 @@ export declare abstract class BulkOperationBase {
     readonly bsonOptions: BSONSerializeOptions;
     readonly writeConcern: WriteConcern | undefined;
     readonly batches: Batch[];
-    /** An internal helper method. Do not invoke directly. Will be going away in the future */
-    execute(options?: BulkWriteOptions, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
+    execute(options?: BulkWriteOptions): Promise<BulkWriteResult>;
+    execute(callback: Callback<BulkWriteResult>): void;
+    execute(options: BulkWriteOptions | undefined, callback: Callback<BulkWriteResult>): void;
+    execute(options?: BulkWriteOptions | Callback<BulkWriteResult>, callback?: Callback<BulkWriteResult>): Promise<BulkWriteResult> | void;
     /* Excluded from this release type: handleWriteError */
     abstract addToOperationsList(batchType: BatchType, document: Document | UpdateStatement | DeleteStatement): this;
 }
@@ -860,7 +863,7 @@ export declare class CancellationToken extends TypedEventEmitter<{
  * Creates a new Change Stream instance. Normally created using {@link Collection#watch|Collection.watch()}.
  * @public
  */
-export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents> {
+export declare class ChangeStream<TSchema extends Document = Document> extends TypedEventEmitter<ChangeStreamEvents<TSchema>> {
     pipeline: Document[];
     options: ChangeStreamOptions;
     parent: MongoClient | Db | Collection;
@@ -901,7 +904,8 @@ export declare class ChangeStream<TSchema extends Document = Document> extends T
     The cached resume token that is used to resume after the most recently returned change. */
     readonly resumeToken: ResumeToken;
     /** Check if there is any document still available in the Change Stream */
-    hasNext(callback?: Callback): Promise<void> | void;
+    hasNext(): Promise<boolean>;
+    hasNext(callback: Callback<boolean>): void;
     /** Get the next available document from the Change Stream. */
     next(): Promise<ChangeStreamDocument<TSchema>>;
     next(callback: Callback<ChangeStreamDocument<TSchema>>): void;
@@ -974,14 +978,14 @@ export declare interface ChangeStreamDocument<TSchema extends Document = Documen
     fullDocument?: TSchema;
 }
 /** @public */
-export declare type ChangeStreamEvents = {
+export declare type ChangeStreamEvents<TSchema extends Document = Document> = {
     resumeTokenChanged(token: ResumeToken): void;
-    init(response: Document): void;
-    more(response?: Document | undefined): void;
+    init(response: TSchema): void;
+    more(response?: TSchema | undefined): void;
     response(): void;
     end(): void;
     error(error: Error): void;
-    change(change: ChangeStreamDocument): void;
+    change(change: ChangeStreamDocument<TSchema>): void;
 } & AbstractCursorEvents;
 /**
  * Options that can be passed to a ChangeStream. Note that startAfter, resumeAfter, and startAtOperationTime are all mutually exclusive, and the server will error if more than one is specified.
@@ -1312,10 +1316,10 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema): Promise<UpdateResult | Document>;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, callback: Callback<UpdateResult | Document>): void;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, options: ReplaceOptions): Promise<UpdateResult | Document>;
-    replaceOne(filter: Filter<TSchema>, replacement: TSchema, options: ReplaceOptions, callback: Callback<UpdateResult | Document>): void;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>): Promise<UpdateResult | Document>;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, callback: Callback<UpdateResult | Document>): void;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: ReplaceOptions): Promise<UpdateResult | Document>;
+    replaceOne(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: ReplaceOptions, callback: Callback<UpdateResult | Document>): void;
     /**
      * Update multiple documents in a collection
      *
@@ -1381,12 +1385,12 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    findOne(): Promise<TSchema | null>;
-    findOne(callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, callback: Callback<TSchema | null>): void;
-    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<TSchema | null>;
-    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<TSchema | null>): void;
+    findOne(): Promise<WithId<TSchema> | null>;
+    findOne(callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, callback: Callback<WithId<TSchema> | null>): void;
+    findOne(filter: Filter<TSchema>, options: FindOptions): Promise<WithId<TSchema> | null>;
+    findOne(filter: Filter<TSchema>, options: FindOptions, callback: Callback<WithId<TSchema> | null>): void;
     findOne<T = TSchema>(): Promise<T | null>;
     findOne<T = TSchema>(callback: Callback<T | null>): void;
     findOne<T = TSchema>(filter: Filter<TSchema>): Promise<T | null>;
@@ -1397,8 +1401,8 @@ export declare class Collection<TSchema extends Document = Document> {
      *
      * @param filter - The filter predicate. If unspecified, then all documents in the collection will match the predicate
      */
-    find(): FindCursor<TSchema>;
-    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<TSchema>;
+    find(): FindCursor<WithId<TSchema>>;
+    find(filter: Filter<TSchema>, options?: FindOptions): FindCursor<WithId<TSchema>>;
     find<T>(filter: Filter<TSchema>, options?: FindOptions): FindCursor<T>;
     /**
      * Returns the options of the collection.
@@ -1639,10 +1643,10 @@ export declare class Collection<TSchema extends Document = Document> {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document): Promise<ModifyResult<TSchema>>;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, callback: Callback<ModifyResult<TSchema>>): void;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, options: FindOneAndReplaceOptions): Promise<ModifyResult<TSchema>>;
-    findOneAndReplace(filter: Filter<TSchema>, replacement: Document, options: FindOneAndReplaceOptions, callback: Callback<ModifyResult<TSchema>>): void;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>): Promise<ModifyResult<TSchema>>;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, callback: Callback<ModifyResult<TSchema>>): void;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: FindOneAndReplaceOptions): Promise<ModifyResult<TSchema>>;
+    findOneAndReplace(filter: Filter<TSchema>, replacement: WithoutId<TSchema>, options: FindOneAndReplaceOptions, callback: Callback<ModifyResult<TSchema>>): void;
     /**
      * Find a document and update it in one atomic operation. Requires a write lock for the duration of the operation.
      *
@@ -1673,6 +1677,7 @@ export declare class Collection<TSchema extends Document = Document> {
     /**
      * Run Map Reduce across a collection. Be aware that the inline option for out will return an array of results not a collection.
      *
+     * @deprecated collection.mapReduce is deprecated. Use the aggregation pipeline instead. Visit https://docs.mongodb.com/manual/reference/map-reduce-to-aggregation-pipeline for more information on how to translate map-reduce operations to the aggregation pipeline.
      * @param map - The mapping function.
      * @param reduce - The reduce function.
      * @param options - Optional settings for the command
@@ -2225,10 +2230,9 @@ export declare class Db {
      * @param options - Optional settings for the command
      * @param callback - An optional callback, a Promise will be returned if none is provided
      */
-    createCollection<TSchema extends Document = Document>(name: string): Promise<Collection<TSchema>>;
+    createCollection<TSchema extends Document = Document>(name: string, options?: CreateCollectionOptions): Promise<Collection<TSchema>>;
     createCollection<TSchema extends Document = Document>(name: string, callback: Callback<Collection<TSchema>>): void;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions): Promise<Collection<TSchema>>;
-    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions, callback: Callback<Collection<TSchema>>): void;
+    createCollection<TSchema extends Document = Document>(name: string, options: CreateCollectionOptions | undefined, callback: Callback<Collection<TSchema>>): void;
     /**
      * Execute a command
      *
@@ -2579,8 +2583,8 @@ export declare type ExplainVerbosity = string;
 export declare type ExplainVerbosityLike = ExplainVerbosity | boolean;
 /** A MongoDB filter can be some portion of the schema or a set of operators @public */
 export declare type Filter<TSchema> = {
-    [P in keyof TSchema]?: Condition<TSchema[P]>;
-} & RootFilterOperators<TSchema>;
+    [P in keyof WithId<TSchema>]?: Condition<WithId<TSchema>[P]>;
+} & RootFilterOperators<WithId<TSchema>>;
 /** @public */
 export declare type FilterOperations<T> = T extends Record<string, any> ? {
     [key in keyof T]?: FilterOperators<T[key]>;
@@ -3181,11 +3185,13 @@ export declare class HostAddress {
     socketPath: string | undefined;
     isIPv6: boolean | undefined;
     constructor(hostString: string);
+    inspect(): string;
     /**
      * @param ipv6Brackets - optionally request ipv6 bracket notation required for connection strings
      */
     toString(ipv6Brackets?: boolean): string;
     static fromString(s: string): HostAddress;
+    static fromSrvRecord({ name, port }: SrvRecord): HostAddress;
 }
 /** @public */
 export declare interface IndexDescription extends Pick<CreateIndexesOptions, 'background' | 'unique' | 'partialFilterExpression' | 'sparse' | 'hidden' | 'expireAfterSeconds' | 'storageEngine' | 'version' | 'weights' | 'default_language' | 'language_override' | 'textIndexVersion' | '2dsphereIndexVersion' | 'bits' | 'min' | 'max' | 'bucketSize' | 'wildcardProjection'> {
@@ -3366,6 +3372,8 @@ export declare class ListCollectionsCursor<T extends Pick<CollectionInfo, 'name'
 export declare interface ListCollectionsOptions extends CommandOperationOptions {
     /** Since 4.0: If true, will only return the collection name in the response, and will omit additional info */
     nameOnly?: boolean;
+    /** Since 4.0: If true and nameOnly is true, allows a user without the required privilege (i.e. listCollections action on the database) to run the command when access control is enforced. */
+    authorizedCollections?: boolean;
     /** The batchSize for the returned command cursor or if pre 2.8 the systems batch collection */
     batchSize?: number;
 }
@@ -3778,6 +3786,16 @@ export declare interface MongoClientOptions extends BSONSerializeOptions, Suppor
     compressors?: CompressorName[] | string;
     /** An integer that specifies the compression level if using zlib for network compression. */
     zlibCompressionLevel?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | undefined;
+    /** The maximum number of hosts to connect to when using an srv connection string, a setting of `0` means unlimited hosts */
+    srvMaxHosts?: number;
+    /**
+     * Modifies the srv URI to look like:
+     *
+     * `_{srvServiceName}._tcp.{hostname}.{domainname}`
+     *
+     * Querying this DNS URI is expected to respond with SRV records
+     */
+    srvServiceName?: string;
     /** The maximum number of connections in the connection pool. */
     maxPoolSize?: number;
     /** The minimum number of connections in the connection pool. */
@@ -4136,7 +4154,7 @@ export declare class MongoNotConnectedError extends MongoAPIError {
  * Mongo Client Options
  * @public
  */
-export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
+export declare interface MongoOptions extends Required<Pick<MongoClientOptions, 'autoEncryption' | 'connectTimeoutMS' | 'directConnection' | 'driverInfo' | 'forceServerObjectId' | 'minHeartbeatFrequencyMS' | 'heartbeatFrequencyMS' | 'keepAlive' | 'keepAliveInitialDelay' | 'localThresholdMS' | 'logger' | 'maxIdleTimeMS' | 'maxPoolSize' | 'minPoolSize' | 'monitorCommands' | 'noDelay' | 'pkFactory' | 'promiseLibrary' | 'raw' | 'replicaSet' | 'retryReads' | 'retryWrites' | 'serverSelectionTimeoutMS' | 'socketTimeoutMS' | 'srvMaxHosts' | 'srvServiceName' | 'tlsAllowInvalidCertificates' | 'tlsAllowInvalidHostnames' | 'tlsInsecure' | 'waitQueueTimeoutMS' | 'zlibCompressionLevel'>>, SupportedNodeConnectionOptions {
     hosts: HostAddress[];
     srvHost?: string;
     credentials?: MongoCredentials;
@@ -4321,6 +4339,8 @@ export declare interface OperationOptions extends BSONSerializeOptions {
     willRetryWrites?: boolean;
     /** The preferred read preference (ReadPreference.primary, ReadPreference.primary_preferred, ReadPreference.secondary, ReadPreference.secondary_preferred, ReadPreference.nearest). */
     readPreference?: ReadPreferenceLike;
+    /* Excluded from this release type: bypassPinningCheck */
+    omitReadPreference?: boolean;
 }
 /* Excluded from this release type: OperationParent */
 /**
@@ -4341,11 +4361,13 @@ export declare type OperationTime = Timestamp;
  * `TSchema['_id'] extends ObjectId` which translated to "Is the _id property ObjectId?"
  * we instead ask "Does ObjectId look like (have the same shape) as the _id?"
  */
-export declare type OptionalId<TSchema extends {
+export declare type OptionalId<TSchema> = TSchema extends {
     _id?: any;
-}> = ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+} ? ObjectId extends TSchema['_id'] ? EnhancedOmit<TSchema, '_id'> & {
+    _id?: InferIdType<TSchema>;
+} : WithId<TSchema> : EnhancedOmit<TSchema, '_id'> & {
     _id?: InferIdType<TSchema>;
-} : WithId<TSchema>;
+};
 /** @public */
 export declare class OrderedBulkOperation extends BulkOperationBase {
     constructor(collection: Collection, options: BulkWriteOptions);
@@ -4573,7 +4595,7 @@ export declare interface ReplaceOneModel<TSchema extends Document = Document> {
     /** The filter to limit the replaced document. */
     filter: Filter<TSchema>;
     /** The document with which to replace the matched document. */
-    replacement: TSchema;
+    replacement: WithoutId<TSchema>;
     /** Specifies a collation. */
     collation?: CollationOptions;
     /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
@@ -4936,7 +4958,7 @@ export declare type TagSet = {
 export declare interface TimeSeriesCollectionOptions extends Document {
     timeField: string;
     metaField?: string;
-    granularity?: string;
+    granularity?: 'seconds' | 'minutes' | 'hours' | string;
 }
 export { Timestamp };
 /* Excluded from this release type: Topology */
@@ -5025,6 +5047,8 @@ export declare class TopologyOpeningEvent {
 }
 /** @public */
 export declare interface TopologyOptions extends BSONSerializeOptions, ServerOptions {
+    srvMaxHosts: number;
+    srvServiceName: string;
     hosts: HostAddress[];
     retryWrites: boolean;
     retryReads: boolean;
@@ -5088,7 +5112,7 @@ export declare class Transaction {
  */
 export declare interface TransactionOptions extends CommandOperationOptions {
     /** A default read concern for commands in this transaction */
-    readConcern?: ReadConcern;
+    readConcern?: ReadConcernLike;
     /** A default writeConcern for commands in this transaction */
     writeConcern?: WriteConcern;
     /** A default read preference for commands in this transaction */