mongodb 6.20.0 → 7.0.0-dev.20251107.sha.5db818c2

package/src/gridfs/download.ts

@@ -53,10 +53,6 @@ export interface GridFSFile {
   filename: string;
   metadata?: Document;
   uploadDate: Date;
-  /** @deprecated Will be removed in the next major version. */
-  contentType?: string;
-  /** @deprecated Will be removed in the next major version. */
-  aliases?: string[];
 }
 
 /** @internal */

package/src/gridfs/upload.ts

@@ -32,16 +32,6 @@ export interface GridFSBucketWriteStreamOptions extends WriteConcernOptions {
   id?: ObjectId;
   /** Object to store in the file document's `metadata` field */
   metadata?: Document;
-  /**
-   * String to store in the file document's `contentType` field.
-   * @deprecated Will be removed in the next major version. Add a contentType field to the metadata document instead.
-   */
-  contentType?: string;
-  /**
-   * Array of strings to store in the file document's `aliases` field.
-   * @deprecated Will be removed in the next major version. Add an aliases field to the metadata document instead.
-   */
-  aliases?: string[];
   /**
    * @experimental
    * Specifies the time an operation will run until it throws a timeout error
@@ -305,8 +295,6 @@ function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
       stream.length,
       stream.chunkSizeBytes,
       stream.filename,
-      stream.options.contentType,
-      stream.options.aliases,
       stream.options.metadata
     );
 
@@ -402,8 +390,6 @@ function createFilesDoc(
   length: number,
   chunkSize: number,
   filename: string,
-  contentType?: string,
-  aliases?: string[],
   metadata?: Document
 ): GridFSFile {
   const ret: GridFSFile = {
@@ -414,14 +400,6 @@ function createFilesDoc(
     filename
   };
 
-  if (contentType) {
-    ret.contentType = contentType;
-  }
-
-  if (aliases) {
-    ret.aliases = aliases;
-  }
-
   if (metadata) {
     ret.metadata = metadata;
   }

package/src/index.ts

@@ -87,7 +87,6 @@ export {
   MongoWriteConcernError,
   WriteConcernErrorResult
 } from './error';
-export { configureExplicitResourceManagement } from './resource_management';
 export {
   AbstractCursor,
   // Actual driver classes exported
@@ -224,7 +223,6 @@ export type {
   ChangeStreamSplitEvent,
   ChangeStreamUpdateDocument,
   OperationTime,
-  ResumeOptions,
   ResumeToken,
   UpdateDescription
 } from './change_stream';
@@ -307,7 +305,6 @@ export type {
   ProxyOptions
 } from './cmap/connection';
 export type {
-  CloseOptions,
   ConnectionPool,
   ConnectionPoolEvents,
   ConnectionPoolOptions,
@@ -315,7 +312,7 @@ export type {
   WaitQueueMember,
   WithConnectionCallback
 } from './cmap/connection_pool';
-export type { ClientMetadata, ClientMetadataOptions } from './cmap/handshake/client_metadata';
+export type { ClientMetadata } from './cmap/handshake/client_metadata';
 export type { ConnectionPoolMetrics } from './cmap/metrics';
 export type { StreamDescription, StreamDescriptionOptions } from './cmap/stream_description';
 export type { CompressorName } from './cmap/wire_protocol/compression';
@@ -368,8 +365,7 @@ export type {
 export type {
   AbstractCursorEvents,
   AbstractCursorOptions,
-  CursorFlag,
-  CursorStreamOptions
+  CursorFlag
 } from './cursor/abstract_cursor';
 export type {
   CursorTimeoutContext,
@@ -566,7 +562,6 @@ export type {
   ReadPreferenceLikeOptions,
   ReadPreferenceOptions
 } from './read_preference';
-export type { AsyncDisposable } from './resource_management';
 export type { ClusterTime } from './sdam/common';
 export type {
   Monitor,
@@ -598,7 +593,6 @@ export type { SrvPoller, SrvPollerEvents, SrvPollerOptions } from './sdam/srv_po
 export type {
   ConnectOptions,
   SelectServerOptions,
-  ServerCapabilities,
   ServerSelectionCallback,
   ServerSelectionRequest,
   Topology,

package/src/mongo_client.ts

@@ -2,7 +2,7 @@ import { promises as fs } from 'fs';
 import type { TcpNetConnectOpts } from 'net';
 import type { ConnectionOptions as TLSConnectionOptions, TLSSocketOptions } from 'tls';
 
-import { type ServerCommandOptions, type TimeoutContext } from '.';
+import { TopologyType } from '.';
 import { type BSONSerializeOptions, type Document, resolveBSONOptions } from './bson';
 import { ChangeStream, type ChangeStreamDocument, type ChangeStreamOptions } from './change_stream';
 import type { AutoEncrypter, AutoEncryptionOptions } from './client-side-encryption/auto_encrypter';
@@ -16,13 +16,11 @@ import { AuthMechanism } from './cmap/auth/providers';
 import type { LEGAL_TCP_SOCKET_OPTIONS, LEGAL_TLS_SOCKET_OPTIONS } from './cmap/connect';
 import type { Connection } from './cmap/connection';
 import {
-  addContainerMetadata,
   type ClientMetadata,
   isDriverInfoEqual,
   makeClientMetadata
 } from './cmap/handshake/client_metadata';
 import type { CompressorName } from './cmap/wire_protocol/compression';
-import { MongoDBResponse } from './cmap/wire_protocol/responses';
 import { parseOptions, resolveSRVRecord } from './connection_string';
 import { MONGO_CLIENT_EVENTS } from './constants';
 import { type AbstractCursor } from './cursor/abstract_cursor';
@@ -44,11 +42,10 @@ import {
   type ClientBulkWriteResult
 } from './operations/client_bulk_write/common';
 import { ClientBulkWriteExecutor } from './operations/client_bulk_write/executor';
+import { EndSessionsOperation } from './operations/end_sessions';
 import { executeOperation } from './operations/execute_operation';
-import { AbstractOperation } from './operations/operation';
 import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
 import { ReadPreference, type ReadPreferenceMode } from './read_preference';
-import { type AsyncDisposable, configureResourceManagement } from './resource_management';
 import type { ServerMonitoringMode } from './sdam/monitor';
 import type { TagSet } from './sdam/server_description';
 import { readPreferenceServerSelector } from './sdam/server_selection';
@@ -63,7 +60,7 @@ import {
   type HostAddress,
   hostMatchesWildcards,
   isHostMatch,
-  MongoDBNamespace,
+  type MongoDBNamespace,
   noop,
   ns,
   resolveOptions,
@@ -408,31 +405,12 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
    * The consolidate, parsed, transformed and merged options.
    */
   public readonly options: Readonly<
-    Omit<
-      MongoOptions,
-      | 'monitorCommands'
-      | 'ca'
-      | 'crl'
-      | 'key'
-      | 'cert'
-      | 'driverInfo'
-      | 'additionalDriverInfo'
-      | 'metadata'
-      | 'extendedMetadata'
-    >
+    Omit<MongoOptions, 'monitorCommands' | 'ca' | 'crl' | 'key' | 'cert' | 'driverInfo'>
   > &
-    Pick<
-      MongoOptions,
-      | 'monitorCommands'
-      | 'ca'
-      | 'crl'
-      | 'key'
-      | 'cert'
-      | 'driverInfo'
-      | 'additionalDriverInfo'
-      | 'metadata'
-      | 'extendedMetadata'
-    >;
+    Pick<MongoOptions, 'monitorCommands' | 'ca' | 'crl' | 'key' | 'cert' | 'driverInfo'> & {
+      /** @internal */
+      metadata: Promise<ClientMetadata>;
+    };
 
   private driverInfoList: DriverInfo[] = [];
 
@@ -485,13 +463,10 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 
   /**
-   * @beta
    * @experimental
    * An alias for {@link MongoClient.close|MongoClient.close()}.
    */
-  declare [Symbol.asyncDispose]: () => Promise<void>;
-  /** @internal */
-  async asyncDispose() {
+  async [Symbol.asyncDispose]() {
     await this.close();
   }
 
@@ -506,10 +481,9 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
     if (isDuplicateDriverInfo) return;
 
     this.driverInfoList.push(driverInfo);
-    this.options.metadata = makeClientMetadata(this.driverInfoList, this.options);
-    this.options.extendedMetadata = addContainerMetadata(this.options.metadata)
+    this.options.metadata = makeClientMetadata(this.driverInfoList, this.options)
       .then(undefined, squashError)
-      .then(result => result ?? {}); // ensure Promise<Document>
+      .then(result => result ?? ({} as ClientMetadata)); // ensure Promise<Document>
   }
 
   /** @internal */
@@ -594,20 +568,13 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 
   /**
-   * Connect to MongoDB using a url
+   * An optional method to verify a handful of assumptions that are generally useful at application boot-time before using a MongoClient.
+   * For detailed information about the connect process see the MongoClient.connect static method documentation.
    *
-   * @remarks
-   * Calling `connect` is optional since the first operation you perform will call `connect` if it's needed.
-   * `timeoutMS` will bound the time any operation can take before throwing a timeout error.
-   * However, when the operation being run is automatically connecting your `MongoClient` the `timeoutMS` will not apply to the time taken to connect the MongoClient.
-   * This means the time to setup the `MongoClient` does not count against `timeoutMS`.
-   * If you are using `timeoutMS` we recommend connecting your client explicitly in advance of any operation to avoid this inconsistent execution time.
-   *
-   * @remarks
-   * The driver will look up corresponding SRV and TXT records if the connection string starts with `mongodb+srv://`.
-   * If those look ups throw a DNS Timeout error, the driver will retry the look up once.
+   * @param url - The MongoDB connection string (supports `mongodb://` and `mongodb+srv://` schemes)
+   * @param options - Optional configuration options for the client
    *
-   * @see docs.mongodb.org/manual/reference/connection-string/
+   * @see https://www.mongodb.com/docs/manual/reference/connection-string/
    */
   async connect(): Promise<this> {
     if (this.connectionLock) {
@@ -795,40 +762,12 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
       return;
     }
 
-    // If we would attempt to select a server and get nothing back we short circuit
-    // to avoid the server selection timeout.
-    const selector = readPreferenceServerSelector(ReadPreference.primaryPreferred);
-    const topologyDescription = this.topology.description;
-    const serverDescriptions = Array.from(topologyDescription.servers.values());
-    const servers = selector(topologyDescription, serverDescriptions);
-    if (servers.length !== 0) {
-      const endSessions = Array.from(this.s.sessionPool.sessions, ({ id }) => id);
-      if (endSessions.length !== 0) {
-        try {
-          class EndSessionsOperation extends AbstractOperation<void> {
-            override ns = MongoDBNamespace.fromString('admin.$cmd');
-            override SERVER_COMMAND_RESPONSE_TYPE = MongoDBResponse;
-            override buildCommand(_connection: Connection, _session?: ClientSession): Document {
-              return {
-                endSessions
-              };
-            }
-            override buildOptions(timeoutContext: TimeoutContext): ServerCommandOptions {
-              return {
-                timeoutContext,
-                readPreference: ReadPreference.primaryPreferred,
-                noResponse: true
-              };
-            }
-            override get commandName(): string {
-              return 'endSessions';
-            }
-          }
-          await executeOperation(this, new EndSessionsOperation());
-        } catch (error) {
-          squashError(error);
-        }
-      }
+    const supportsSessions =
+      this.topology.description.type === TopologyType.LoadBalanced ||
+      this.topology.description.logicalSessionTimeoutMinutes != null;
+
+    if (supportsSessions) {
+      await endSessions(this, this.topology);
     }
 
     // clear out references to old topology
@@ -841,6 +780,27 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
     if (encrypter) {
       await encrypter.close(this);
     }
+
+    async function endSessions(
+      client: MongoClient,
+      { description: topologyDescription }: Topology
+    ) {
+      // If we would attempt to select a server and get nothing back we short circuit
+      // to avoid the server selection timeout.
+      const selector = readPreferenceServerSelector(ReadPreference.primaryPreferred);
+      const serverDescriptions = Array.from(topologyDescription.servers.values());
+      const servers = selector(topologyDescription, serverDescriptions);
+      if (servers.length !== 0) {
+        const endSessions = Array.from(client.s.sessionPool.sessions, ({ id }) => id);
+        if (endSessions.length !== 0) {
+          try {
+            await executeOperation(client, new EndSessionsOperation(endSessions));
+          } catch (error) {
+            squashError(error);
+          }
+        }
+      }
+    }
   }
 
   /**
@@ -868,21 +828,35 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 
   /**
-   * Connect to MongoDB using a url
+   * Creates a new MongoClient instance and immediately connects it to MongoDB.
+   * This convenience method combines `new MongoClient(url, options)` and `client.connect()` in a single step.
+   *
+   * Connect can be helpful to detect configuration issues early by validating:
+   * - **DNS Resolution**: Verifies that SRV records and hostnames in the connection string resolve DNS entries
+   * - **Network Connectivity**: Confirms that host addresses are reachable and ports are open
+   * - **TLS Configuration**: Validates SSL/TLS certificates, CA files, and encryption settings are correct
+   * - **Authentication**: Verifies that provided credentials are valid
+   * - **Server Compatibility**: Ensures the MongoDB server version is supported by this driver version
+   * - **Load Balancer Setup**: For load-balanced deployments, confirms the service is properly configured
+   *
+   * @returns A promise that resolves to the same MongoClient instance once connected
    *
    * @remarks
-   * Calling `connect` is optional since the first operation you perform will call `connect` if it's needed.
-   * `timeoutMS` will bound the time any operation can take before throwing a timeout error.
-   * However, when the operation being run is automatically connecting your `MongoClient` the `timeoutMS` will not apply to the time taken to connect the MongoClient.
-   * This means the time to setup the `MongoClient` does not count against `timeoutMS`.
-   * If you are using `timeoutMS` we recommend connecting your client explicitly in advance of any operation to avoid this inconsistent execution time.
+   * **Connection is Optional:** Calling `connect` is optional since any operation method (`find`, `insertOne`, etc.)
+   * will automatically perform these same validation steps if the client is not already connected.
+   * However, explicitly calling `connect` can make sense for:
+   * - **Fail-fast Error Detection**: Non-transient connection issues (hostname unresolved, port refused connection) are discovered immediately rather than during your first operation
+   * - **Predictable Performance**: Eliminates first connection overhead from your first database operation
    *
    * @remarks
-   * The programmatically provided options take precedence over the URI options.
+   * **Connection Pooling Impact:** Calling `connect` will populate the connection pool with one connection
+   * to a server selected by the client's configured `readPreference` (defaults to primary).
    *
    * @remarks
-   * The driver will look up corresponding SRV and TXT records if the connection string starts with `mongodb+srv://`.
-   * If those look ups throw a DNS Timeout error, the driver will retry the look up once.
+   * **Timeout Behavior:** When using `timeoutMS`, the connection establishment time does not count against
+   * the timeout for subsequent operations. This means `connect` runs without a `timeoutMS` limit, while
+   * your database operations will still respect the configured timeout. If you need predictable operation
+   * timing with `timeoutMS`, call `connect` explicitly before performing operations.
    *
    * @see https://www.mongodb.com/docs/manual/reference/connection-string/
    */
@@ -1037,8 +1011,6 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
   }
 }
 
-configureResourceManagement(MongoClient.prototype);
-
 /**
  * Parsed Mongo Client Options.
  *
@@ -1105,12 +1077,8 @@ export interface MongoOptions
   compressors: CompressorName[];
   writeConcern: WriteConcern;
   dbName: string;
-  /** @deprecated - Will be made internal in a future major release. */
-  metadata: ClientMetadata;
-  /** @deprecated - Will be made internal in a future major release. */
-  extendedMetadata: Promise<Document>;
-  /** @deprecated - Will be made internal in a future major release. */
-  additionalDriverInfo: DriverInfo[];
+  /** @internal */
+  metadata: Promise<ClientMetadata>;
   /** @internal */
   autoEncrypter?: AutoEncrypter;
   /** @internal */

package/src/mongo_client_auth_providers.ts

@@ -21,14 +21,6 @@ const AUTH_PROVIDERS = new Map<
     AuthMechanism.MONGODB_AWS,
     ({ AWS_CREDENTIAL_PROVIDER }) => new MongoDBAWS(AWS_CREDENTIAL_PROVIDER)
   ],
-  [
-    AuthMechanism.MONGODB_CR,
-    () => {
-      throw new MongoInvalidArgumentError(
-        'MONGODB-CR is no longer a supported auth mechanism in MongoDB 4.0+'
-      );
-    }
-  ],
   [AuthMechanism.MONGODB_GSSAPI, () => new GSSAPI()],
   [AuthMechanism.MONGODB_OIDC, properties => new MongoDBOIDC(getWorkflow(properties))],
   [AuthMechanism.MONGODB_PLAIN, () => new Plain()],

package/src/mongo_logger.ts

@@ -240,7 +240,7 @@ export function createStdioLogger(stream: {
   write: NodeJS.WriteStream['write'];
 }): MongoDBLogWritable {
   return {
-    write: promisify((log: Log, cb: (error?: Error) => void): unknown => {
+    write: promisify((log: Log, cb: (error?: Error | null) => void): unknown => {
       const logLine = inspect(log, { compact: true, breakLength: Infinity });
       stream.write(`${logLine}\n`, 'utf-8', cb);
       return;

package/src/mongo_types.ts

@@ -473,8 +473,7 @@ export class TypedEventEmitter<Events extends EventsDescription> extends EventEm
 }
 
 /**
- * @public
- * @deprecated Will be removed in favor of `AbortSignal` in the next major release.
+ * @internal
  */
 export class CancellationToken extends TypedEventEmitter<{ cancel(): void }> {
   constructor(...args: any[]) {

package/src/operations/aggregate.ts

@@ -80,12 +80,6 @@ export class AggregateOperation extends CommandOperation<CursorResponse> {
       delete this.options.writeConcern;
     }
 
-    if (this.explain && this.writeConcern) {
-      throw new MongoInvalidArgumentError(
-        'Option "explain" cannot be used on an aggregate call with writeConcern'
-      );
-    }
-
     if (options?.cursor != null && typeof options.cursor !== 'object') {
       throw new MongoInvalidArgumentError('Cursor options must be an object');
     }

package/src/operations/command.ts

@@ -53,21 +53,9 @@ export interface CommandOperationOptions
    * In server versions 4.4 and above, 'comment' can be any valid BSON type.
    */
   comment?: unknown;
-  /**
-   * @deprecated
-   * This option is deprecated and will be removed in a future release as it is not used
-   * in the driver. Use MongoClientOptions or connection string parameters instead.
-   * */
-  retryWrites?: boolean;
-
   // Admin command overrides.
   dbName?: string;
   authdb?: string;
-  /**
-   * @deprecated
-   * This option is deprecated and will be removed in an upcoming major version.
-   */
-  noResponse?: boolean;
 
   /**
    * Used when the command needs to grant access to the underlying namespaces for time series collections.

package/src/operations/create_collection.ts

@@ -23,7 +23,6 @@ const ILLEGAL_COMMAND_FIELDS = new Set([
   'timeoutMS',
   'j',
   'fsync',
-  'autoIndexId',
   'pkFactory',
   'raw',
   'readPreference',
@@ -68,8 +67,6 @@ export interface ClusteredCollectionOptions extends Document {
 export interface CreateCollectionOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** Create a capped collection */
   capped?: boolean;
-  /** @deprecated Create an index on the _id field of the document. This option is deprecated in MongoDB 3.2+ and will be removed once no longer supported by the server. */
-  autoIndexId?: boolean;
   /** The size of the capped collection in bytes */
   size?: number;
   /** The maximum number of documents in the capped collection */

package/src/operations/drop.ts

@@ -1,4 +1,4 @@
-import { type Connection, MongoServerError } from '..';
+import { type Connection, type MongoError, MongoServerError } from '..';
 import type { Document } from '../bson';
 import { MongoDBResponse } from '../cmap/wire_protocol/responses';
 import { CursorTimeoutContext } from '../cursor/abstract_cursor';
@@ -40,6 +40,13 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
   override handleOk(_response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>): boolean {
     return true;
   }
+
+  override handleError(error: MongoError): boolean {
+    if (!(error instanceof MongoServerError)) throw error;
+    if (Number(error.code) !== MONGODB_ERROR_CODES.NamespaceNotFound) throw error;
+
+    return false;
+  }
 }
 
 export async function dropCollections(
@@ -83,16 +90,7 @@ export async function dropCollections(
     for (const collectionName of [escCollection, ecocCollection]) {
       // Drop auxilliary collections, ignoring potential NamespaceNotFound errors.
       const dropOp = new DropCollectionOperation(db, collectionName, options);
-      try {
-        await executeOperation(db.client, dropOp, timeoutContext);
-      } catch (err) {
-        if (
-          !(err instanceof MongoServerError) ||
-          err.code !== MONGODB_ERROR_CODES.NamespaceNotFound
-        ) {
-          throw err;
-        }
-      }
+      await executeOperation(db.client, dropOp, timeoutContext);
     }
   }
 

package/src/operations/end_sessions.ts

@@ -0,0 +1,44 @@
+import {
+  type ClientSession,
+  type Connection,
+  type ServerCommandOptions,
+  type ServerSessionId,
+  type TimeoutContext,
+  type WriteConcern
+} from '..';
+import { type Document } from '../bson';
+import { MongoDBResponse } from '../cmap/wire_protocol/responses';
+import { CommandOperation } from '../operations/command';
+import { ReadPreference } from '../read_preference';
+import { MongoDBNamespace } from '../utils';
+import { Aspect, defineAspects } from './operation';
+
+export class EndSessionsOperation extends CommandOperation<void> {
+  override writeConcern: WriteConcern = { w: 0 };
+  override ns = MongoDBNamespace.fromString('admin.$cmd');
+  override SERVER_COMMAND_RESPONSE_TYPE = MongoDBResponse;
+
+  private sessions: Array<ServerSessionId>;
+
+  constructor(sessions: Array<ServerSessionId>) {
+    super();
+    this.sessions = sessions;
+  }
+
+  override buildCommandDocument(_connection: Connection, _session?: ClientSession): Document {
+    return {
+      endSessions: this.sessions
+    };
+  }
+  override buildOptions(timeoutContext: TimeoutContext): ServerCommandOptions {
+    return {
+      timeoutContext,
+      readPreference: ReadPreference.primaryPreferred
+    };
+  }
+  override get commandName(): string {
+    return 'endSessions';
+  }
+}
+
+defineAspects(EndSessionsOperation, Aspect.WRITE_OPERATION);

package/src/operations/execute_operation.ts

@@ -1,3 +1,4 @@
+import { MIN_SUPPORTED_SNAPSHOT_READS_WIRE_VERSION } from '../cmap/wire_protocol/constants';
 import {
   isRetryableReadError,
   isRetryableWriteError,
@@ -25,7 +26,7 @@ import {
 import type { Topology } from '../sdam/topology';
 import type { ClientSession } from '../sessions';
 import { TimeoutContext } from '../timeout';
-import { abortable, supportsRetryableWrites } from '../utils';
+import { abortable, maxWireVersion, supportsRetryableWrites } from '../utils';
 import { AggregateOperation } from './aggregate';
 import { AbstractOperation, Aspect } from './operation';
 
@@ -81,7 +82,10 @@ export async function executeOperation<
     session = client.startSession({ owner, explicit: false });
   } else if (session.hasEnded) {
     throw new MongoExpiredSessionError('Use of expired sessions is not permitted');
-  } else if (session.snapshotEnabled && !topology.capabilities.supportsSnapshotReads) {
+  } else if (
+    session.snapshotEnabled &&
+    maxWireVersion(topology) < MIN_SUPPORTED_SNAPSHOT_READS_WIRE_VERSION
+  ) {
     throw new MongoCompatibilityError('Snapshot reads require MongoDB 5.0 or later');
   } else if (session.client !== client) {
     throw new MongoInvalidArgumentError('ClientSession must be from the same MongoClient');

package/src/operations/find.ts

@@ -12,10 +12,8 @@ import { Aspect, defineAspects, type Hint } from './operation';
 
 /**
  * @public
- * @typeParam TSchema - Unused schema definition, deprecated usage, only specify `FindOptions` with no generic
  */
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-export interface FindOptions<TSchema extends Document = Document>
+export interface FindOptions
   extends Omit<CommandOperationOptions, 'writeConcern' | 'explain'>,
     AbstractCursorOptions {
   /** Sets the limit of documents returned in the query. */
@@ -76,14 +74,7 @@ export interface FindOptions<TSchema extends Document = Document>
 }
 
 /** @public */
-export interface FindOneOptions extends FindOptions {
-  /** @deprecated Will be removed in the next major version. User provided value will be ignored. */
-  batchSize?: number;
-  /** @deprecated Will be removed in the next major version. User provided value will be ignored. */
-  limit?: number;
-  /** @deprecated Will be removed in the next major version. User provided value will be ignored. */
-  noCursorTimeout?: boolean;
-}
+export type FindOneOptions = Omit<FindOptions, 'batchSize' | 'limit' | 'noCursorTimeout'>;
 
 /** @internal */
 export class FindOperation extends CommandOperation<CursorResponse> {

package/src/read_preference.ts

@@ -63,10 +63,6 @@ export class ReadPreference {
   tags?: TagSet[];
   hedge?: HedgeOptions;
   maxStalenessSeconds?: number;
-  /**
-   * @deprecated This will be removed as dead code in the next major version.
-   */
-  minWireVersion?: number;
 
   public static PRIMARY = ReadPreferenceMode.primary;
   public static PRIMARY_PREFERRED = ReadPreferenceMode.primaryPreferred;
@@ -100,7 +96,6 @@ export class ReadPreference {
     this.tags = tags;
     this.hedge = options?.hedge;
     this.maxStalenessSeconds = undefined;
-    this.minWireVersion = undefined;
 
     options = options ?? {};
     if (options.maxStalenessSeconds != null) {
@@ -109,10 +104,6 @@ export class ReadPreference {
       }
 
       this.maxStalenessSeconds = options.maxStalenessSeconds;
-
-      // NOTE: The minimum required wire version is 5 for this read preference. If the existing
-      //       topology has a lower value then a MongoError will be thrown during server selection.
-      this.minWireVersion = 5;
     }
 
     if (this.mode === ReadPreference.PRIMARY) {