mongodb 6.19.0 → 6.20.0-dev.20250920.sha.e8a91a91

package/src/cmap/auth/mongodb_aws.ts

@@ -11,9 +11,7 @@ import { type AuthContext, AuthProvider } from './auth_provider';
 import {
   type AWSCredentialProvider,
   AWSSDKCredentialProvider,
-  type AWSTempCredentials,
-  AWSTemporaryCredentialProvider,
-  LegacyAWSTemporaryCredentialProvider
+  type AWSTempCredentials
 } from './aws_temporary_credentials';
 import { MongoCredentials } from './mongo_credentials';
 import { AuthMechanism } from './providers';
@@ -34,16 +32,11 @@ interface AWSSaslContinuePayload {
 }
 
 export class MongoDBAWS extends AuthProvider {
-  private credentialFetcher: AWSTemporaryCredentialProvider;
-  private credentialProvider?: AWSCredentialProvider;
+  private credentialFetcher: AWSSDKCredentialProvider;
 
   constructor(credentialProvider?: AWSCredentialProvider) {
     super();
-
-    this.credentialProvider = credentialProvider;
-    this.credentialFetcher = AWSTemporaryCredentialProvider.isAWSSDKInstalled
-      ? new AWSSDKCredentialProvider(credentialProvider)
-      : new LegacyAWSTemporaryCredentialProvider();
+    this.credentialFetcher = new AWSSDKCredentialProvider(credentialProvider);
   }
 
   override async auth(authContext: AuthContext): Promise<void> {
@@ -162,7 +155,7 @@ export class MongoDBAWS extends AuthProvider {
 
 async function makeTempCredentials(
   credentials: MongoCredentials,
-  awsCredentialFetcher: AWSTemporaryCredentialProvider
+  awsCredentialFetcher: AWSSDKCredentialProvider
 ): Promise<MongoCredentials> {
   function makeMongoCredentialsFromAWSTemp(creds: AWSTempCredentials) {
     // The AWS session token (creds.Token) may or may not be set.

package/src/cmap/connection.ts

@@ -284,6 +284,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
   private get supportsOpMsg(): boolean {
     return (
       this.description != null &&
+      // TODO(NODE-6672,NODE-6287): This guard is primarily for maxWireVersion = 0
       maxWireVersion(this) >= 6 &&
       !this.description.__nodejs_mock_server__
     );
@@ -880,12 +881,6 @@ export class CryptoConnection extends Connection {
       return await super.command<T>(ns, cmd, options, responseType);
     }
 
-    if (serverWireVersion < 8) {
-      throw new MongoCompatibilityError(
-        'Auto-encryption requires a minimum MongoDB version of 4.2'
-      );
-    }
-
     // Save sort or indexKeys based on the command being run
     // the encrypt API serializes our JS objects to BSON to pass to the native code layer
     // and then deserializes the encrypted result, the protocol level components

package/src/cmap/handshake/client_metadata.ts

@@ -2,13 +2,30 @@ import * as os from 'os';
 import * as process from 'process';
 
 import { BSON, type Document, Int32 } from '../../bson';
-import { MongoInvalidArgumentError, MongoRuntimeError } from '../../error';
-import type { MongoOptions } from '../../mongo_client';
+import { MongoInvalidArgumentError } from '../../error';
+import type { DriverInfo, MongoOptions } from '../../mongo_client';
 import { fileIsAccessible } from '../../utils';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const NODE_DRIVER_VERSION = require('../../../package.json').version;
 
+/** @internal */
+export function isDriverInfoEqual(info1: DriverInfo, info2: DriverInfo): boolean {
+  /** for equality comparison, we consider "" as unset */
+  const nonEmptyCmp = (s1: string | undefined, s2: string | undefined): boolean => {
+    s1 ||= undefined;
+    s2 ||= undefined;
+
+    return s1 === s2;
+  };
+
+  return (
+    nonEmptyCmp(info1.name, info2.name) &&
+    nonEmptyCmp(info1.platform, info2.platform) &&
+    nonEmptyCmp(info1.version, info2.version)
+  );
+}
+
 /**
  * @public
  * @deprecated This interface will be made internal in the next major release.
@@ -90,10 +107,7 @@ export class LimitedSizeDocument {
   }
 }
 
-type MakeClientMetadataOptions = Pick<
-  MongoOptions,
-  'appName' | 'driverInfo' | 'additionalDriverInfo'
->;
+type MakeClientMetadataOptions = Pick<MongoOptions, 'appName'>;
 /**
  * From the specs:
  * Implementors SHOULD cumulatively update fields in the following order until the document is under the size limit:
@@ -102,34 +116,28 @@ type MakeClientMetadataOptions = Pick<
  * 3. Omit the `env` document entirely.
  * 4. Truncate `platform`. -- special we do not truncate this field
  */
-export function makeClientMetadata(options: MakeClientMetadataOptions): ClientMetadata {
+export function makeClientMetadata(
+  driverInfoList: DriverInfo[],
+  { appName = '' }: MakeClientMetadataOptions
+): ClientMetadata {
   const metadataDocument = new LimitedSizeDocument(512);
 
-  const { appName = '' } = options;
   // Add app name first, it must be sent
   if (appName.length > 0) {
     const name =
       Buffer.byteLength(appName, 'utf8') <= 128
-        ? options.appName
+        ? appName
         : Buffer.from(appName, 'utf8').subarray(0, 128).toString('utf8');
     metadataDocument.ifItFitsItSits('application', { name });
   }
 
-  const { name = '', version = '', platform = '' } = options.driverInfo;
-
   const driverInfo = {
-    name: name.length > 0 ? `nodejs|${name}` : 'nodejs',
-    version: version.length > 0 ? `${NODE_DRIVER_VERSION}|${version}` : NODE_DRIVER_VERSION
+    name: 'nodejs',
+    version: NODE_DRIVER_VERSION
   };
 
-  if (options.additionalDriverInfo == null) {
-    throw new MongoRuntimeError(
-      'Client options `additionalDriverInfo` must always default to an empty array'
-    );
-  }
-
   // This is where we handle additional driver info added after client construction.
-  for (const { name: n = '', version: v = '' } of options.additionalDriverInfo) {
+  for (const { name: n = '', version: v = '' } of driverInfoList) {
     if (n.length > 0) {
       driverInfo.name = `${driverInfo.name}|${n}`;
     }
@@ -145,13 +153,10 @@ export function makeClientMetadata(options: MakeClientMetadataOptions): ClientMe
   }
 
   let runtimeInfo = getRuntimeInfo();
-  if (platform.length > 0) {
-    runtimeInfo = `${runtimeInfo}|${platform}`;
-  }
-
-  for (const { platform: p = '' } of options.additionalDriverInfo) {
-    if (p.length > 0) {
-      runtimeInfo = `${runtimeInfo}|${p}`;
+  // This is where we handle additional driver info added after client construction.
+  for (const { platform = '' } of driverInfoList) {
+    if (platform.length > 0) {
+      runtimeInfo = `${runtimeInfo}|${platform}`;
     }
   }
 
@@ -210,7 +215,9 @@ async function getContainerMetadata() {
  * Re-add each metadata value.
  * Attempt to add new env container metadata, but keep old data if it does not fit.
  */
-export async function addContainerMetadata(originalMetadata: ClientMetadata) {
+export async function addContainerMetadata(
+  originalMetadata: ClientMetadata
+): Promise<ClientMetadata> {
   const containerMetadata = await getContainerMetadata();
   if (Object.keys(containerMetadata).length === 0) return originalMetadata;
 
@@ -233,7 +240,7 @@ export async function addContainerMetadata(originalMetadata: ClientMetadata) {
     extendedMetadata.ifItFitsItSits('env', extendedEnvMetadata);
   }
 
-  return extendedMetadata.toObject();
+  return extendedMetadata.toObject() as ClientMetadata;
 }
 
 /**

package/src/cmap/wire_protocol/constants.ts

@@ -1,9 +1,11 @@
 export const MIN_SUPPORTED_SERVER_VERSION = '4.2';
-export const MAX_SUPPORTED_SERVER_VERSION = '8.0';
+export const MAX_SUPPORTED_SERVER_VERSION = '8.2';
 export const MIN_SUPPORTED_WIRE_VERSION = 8;
-export const MAX_SUPPORTED_WIRE_VERSION = 25;
+export const MAX_SUPPORTED_WIRE_VERSION = 27;
 export const MIN_SUPPORTED_QE_WIRE_VERSION = 21;
 export const MIN_SUPPORTED_QE_SERVER_VERSION = '7.0';
+export const MIN_SUPPORTED_RAW_DATA_WIRE_VERSION = 27;
+export const MIN_SUPPORTED_RAW_DATA_SERVER_VERSION = '8.2';
 export const OP_REPLY = 1;
 export const OP_UPDATE = 2001;
 export const OP_INSERT = 2002;

package/src/collection.ts

@@ -172,11 +172,17 @@ export class Collection<TSchema extends Document = Document> {
   /** @internal */
   client: MongoClient;
 
+  /**
+   * Get the database object for the collection.
+   */
+  readonly db: Db;
+
   /**
    * Create a new Collection instance
    * @internal
    */
   constructor(db: Db, name: string, options?: CollectionOptions) {
+    this.db = db;
     // Internal state
     this.s = {
       db,
@@ -228,7 +234,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get readConcern(): ReadConcern | undefined {
     if (this.s.readConcern == null) {
-      return this.s.db.readConcern;
+      return this.db.readConcern;
     }
     return this.s.readConcern;
   }
@@ -239,7 +245,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get readPreference(): ReadPreference | undefined {
     if (this.s.readPreference == null) {
-      return this.s.db.readPreference;
+      return this.db.readPreference;
     }
 
     return this.s.readPreference;
@@ -255,7 +261,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get writeConcern(): WriteConcern | undefined {
     if (this.s.writeConcern == null) {
-      return this.s.db.writeConcern;
+      return this.db.writeConcern;
     }
     return this.s.writeConcern;
   }
@@ -509,7 +515,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async drop(options?: DropCollectionOptions): Promise<boolean> {
-    return await this.s.db.dropCollection(this.collectionName, options);
+    return await this.db.dropCollection(this.collectionName, options);
   }
 
   /**
@@ -578,7 +584,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   async options(options?: OperationOptions): Promise<Document> {
     options = resolveOptions(this, options);
-    const [collection] = await this.s.db
+    const [collection] = await this.db
       .listCollections({ name: this.collectionName }, { ...options, nameOnly: false })
       .toArray();
 

package/src/connection_string.ts

@@ -5,7 +5,6 @@ import { URLSearchParams } from 'url';
 import type { Document } from './bson';
 import { MongoCredentials } from './cmap/auth/mongo_credentials';
 import { AUTH_MECHS_AUTH_SRC_EXTERNAL, AuthMechanism } from './cmap/auth/providers';
-import { addContainerMetadata, makeClientMetadata } from './cmap/handshake/client_metadata';
 import { Compressor, type CompressorName } from './cmap/wire_protocol/compression';
 import { Encrypter } from './encrypter';
 import {
@@ -535,16 +534,6 @@ export function parseOptions(
     }
   );
 
-  // Set the default for the additional driver info.
-  mongoOptions.additionalDriverInfo = [];
-
-  mongoOptions.metadata = makeClientMetadata(mongoOptions);
-
-  mongoOptions.extendedMetadata = addContainerMetadata(mongoOptions.metadata).then(
-    undefined,
-    squashError
-  ); // rejections will be handled later
-
   return mongoOptions;
 }
 

package/src/cursor/change_stream_cursor.ts

@@ -93,7 +93,7 @@ export class ChangeStreamCursor<
       } else {
         options.resumeAfter = this.resumeToken;
       }
-    } else if (this.startAtOperationTime != null && maxWireVersion(this.server) >= 7) {
+    } else if (this.startAtOperationTime != null) {
       options.startAtOperationTime = this.startAtOperationTime;
     }
 
@@ -145,8 +145,7 @@ export class ChangeStreamCursor<
     if (
       this.startAtOperationTime == null &&
       this.changeStreamCursorOptions.resumeAfter == null &&
-      this.changeStreamCursorOptions.startAfter == null &&
-      this.maxWireVersion >= 7
+      this.changeStreamCursorOptions.startAfter == null
     ) {
       this.startAtOperationTime = response.operationTime;
     }

package/src/db.ts

@@ -126,7 +126,10 @@ export class Db {
   /** @internal */
   s: DbPrivate;
 
-  /** @internal */
+  /**
+   * Gets the MongoClient associated with the Db.
+   * @public
+   */
   readonly client: MongoClient;
 
   public static SYSTEM_NAMESPACE_COLLECTION = CONSTANTS.SYSTEM_NAMESPACE_COLLECTION;

package/src/error.ts

@@ -1551,6 +1551,10 @@ export function isResumableError(error?: Error, wireVersion?: number): boolean {
     return true;
   }
 
+  if (error instanceof MongoServerSelectionError) {
+    return true;
+  }
+
   if (wireVersion != null && wireVersion >= 9) {
     // DRIVERS-1308: For 4.4 drivers running against 4.4 servers, drivers will add a special case to treat the CursorNotFound error code as resumable
     if (error.code === MONGODB_ERROR_CODES.CursorNotFound) {

package/src/mongo_client.ts

@@ -18,6 +18,7 @@ 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';
@@ -282,7 +283,10 @@ export interface MongoClientOptions extends BSONSerializeOptions, SupportedNodeC
    * If an internal MongoClient is created, it is configured with the same options as the parent MongoClient except minPoolSize is set to 0 and AutoEncryptionOptions is omitted.
    */
   autoEncryption?: AutoEncryptionOptions;
-  /** Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver */
+  /**
+   * Allows a wrapping driver to amend the client metadata generated by the driver to include information about the wrapping driver
+  /* @deprecated - Will be made internal in a future major release.
+   */
   driverInfo?: DriverInfo;
   /** Configures a Socks5 proxy host used for creating TCP connections. */
   proxyHost?: string;
@@ -430,12 +434,16 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
       | 'extendedMetadata'
     >;
 
+  private driverInfoList: DriverInfo[] = [];
+
   constructor(url: string, options?: MongoClientOptions) {
     super();
     this.on('error', noop);
 
     this.options = parseOptions(url, this, options);
 
+    this.appendMetadata(this.options.driverInfo);
+
     const shouldSetLogger = Object.values(this.options.mongoLoggerOptions.componentSeverities).some(
       value => value !== SeverityLevel.OFF
     );
@@ -492,8 +500,13 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
    * @param driverInfo - Information about the application or library.
    */
   appendMetadata(driverInfo: DriverInfo) {
-    this.options.additionalDriverInfo.push(driverInfo);
-    this.options.metadata = makeClientMetadata(this.options);
+    const isDuplicateDriverInfo = this.driverInfoList.some(info =>
+      isDriverInfoEqual(info, driverInfo)
+    );
+    if (isDuplicateDriverInfo) return;
+
+    this.driverInfoList.push(driverInfo);
+    this.options.metadata = makeClientMetadata(this.driverInfoList, this.options);
     this.options.extendedMetadata = addContainerMetadata(this.options.metadata)
       .then(undefined, squashError)
       .then(result => result ?? {}); // ensure Promise<Document>
@@ -1094,7 +1107,9 @@ export interface MongoOptions
   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 */
   autoEncrypter?: AutoEncrypter;

package/src/operations/aggregate.ts

@@ -1,17 +1,15 @@
-import { type Connection } from '..';
 import type { Document } from '../bson';
 import { CursorResponse, ExplainedCursorResponse } from '../cmap/wire_protocol/responses';
 import { type CursorTimeoutMode } from '../cursor/abstract_cursor';
 import { MongoInvalidArgumentError } from '../error';
 import { type ExplainOptions } from '../explain';
-import { maxWireVersion, type MongoDBNamespace } from '../utils';
+import { type MongoDBNamespace } from '../utils';
 import { WriteConcern } from '../write_concern';
 import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
 
 /** @internal */
 export const DB_AGGREGATE_COLLECTION = 1 as const;
-const MIN_WIRE_VERSION_$OUT_READ_CONCERN_SUPPORT = 8;
 
 /** @public */
 export interface AggregateOptions extends Omit<CommandOperationOptions, 'explain'> {
@@ -107,15 +105,10 @@ export class AggregateOperation extends CommandOperation<CursorResponse> {
     this.pipeline.push(stage);
   }
 
-  override buildCommandDocument(connection: Connection): Document {
+  override buildCommandDocument(): Document {
     const options = this.options;
-    const serverWireVersion = maxWireVersion(connection);
     const command: Document = { aggregate: this.target, pipeline: this.pipeline };
 
-    if (this.hasWriteStage && serverWireVersion < MIN_WIRE_VERSION_$OUT_READ_CONCERN_SUPPORT) {
-      this.readConcern = undefined;
-    }
-
     if (this.hasWriteStage && this.writeConcern) {
       WriteConcern.apply(command, this.writeConcern);
     }
@@ -161,5 +154,6 @@ defineAspects(AggregateOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,
   Aspect.EXPLAINABLE,
-  Aspect.CURSOR_CREATING
+  Aspect.CURSOR_CREATING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/client_bulk_write/client_bulk_write.ts

@@ -67,5 +67,6 @@ defineAspects(ClientBulkWriteOperation, [
   Aspect.SKIP_COLLATION,
   Aspect.CURSOR_CREATING,
   Aspect.RETRYABLE,
-  Aspect.COMMAND_BATCHING
+  Aspect.COMMAND_BATCHING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/command.ts

@@ -1,5 +1,6 @@
 import { type Connection } from '..';
 import type { BSONSerializeOptions, Document } from '../bson';
+import { MIN_SUPPORTED_RAW_DATA_WIRE_VERSION } from '../cmap/wire_protocol/constants';
 import { MongoInvalidArgumentError } from '../error';
 import {
   decorateWithExplain,
@@ -12,7 +13,7 @@ import type { ReadPreference } from '../read_preference';
 import type { ServerCommandOptions } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { type TimeoutContext } from '../timeout';
-import { commandSupportsReadConcern, MongoDBNamespace } from '../utils';
+import { commandSupportsReadConcern, maxWireVersion, MongoDBNamespace } from '../utils';
 import { WriteConcern, type WriteConcernOptions } from '../write_concern';
 import type { ReadConcernLike } from './../read_concern';
 import { AbstractOperation, Aspect, type OperationOptions } from './operation';
@@ -52,7 +53,11 @@ export interface CommandOperationOptions
    * In server versions 4.4 and above, 'comment' can be any valid BSON type.
    */
   comment?: unknown;
-  /** Should retry failed writes */
+  /**
+   * @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.
@@ -63,6 +68,14 @@ export interface CommandOperationOptions
    * 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.
+   * Only available on server versions 8.2 and above and is not meant for public use.
+   * @internal
+   * @sinceServerVersion 8.2
+   **/
+  rawData?: boolean;
 }
 
 /** @internal */
@@ -153,6 +166,14 @@ export abstract class CommandOperation<T> extends AbstractOperation<T> {
       command.maxTimeMS = this.options.maxTimeMS;
     }
 
+    if (
+      this.options.rawData != null &&
+      this.hasAspect(Aspect.SUPPORTS_RAW_DATA) &&
+      maxWireVersion(connection) >= MIN_SUPPORTED_RAW_DATA_WIRE_VERSION
+    ) {
+      command.rawData = this.options.rawData;
+    }
+
     if (this.hasAspect(Aspect.EXPLAINABLE) && this.explain) {
       return decorateWithExplain(command, this.explain);
     }

package/src/operations/count.ts

@@ -71,4 +71,4 @@ export class CountOperation extends CommandOperation<number> {
   }
 }
 
-defineAspects(CountOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE]);
+defineAspects(CountOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE, Aspect.SUPPORTS_RAW_DATA]);

package/src/operations/create_collection.ts

@@ -65,7 +65,7 @@ export interface ClusteredCollectionOptions extends Document {
 }
 
 /** @public */
-export interface CreateCollectionOptions extends CommandOperationOptions {
+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. */

package/src/operations/delete.ts

@@ -3,7 +3,7 @@ import { type Connection } from '../cmap/connection';
 import { MongoDBResponse } from '../cmap/wire_protocol/responses';
 import { MongoCompatibilityError, MongoServerError } from '../error';
 import type { ClientSession } from '../sessions';
-import { type MongoDBCollectionNamespace, type MongoDBNamespace } from '../utils';
+import { maxWireVersion, type MongoDBCollectionNamespace, type MongoDBNamespace } from '../utils';
 import { type WriteConcernOptions } from '../write_concern';
 import { type CollationOptions, CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects, type Hint } from './operation';
@@ -65,7 +65,7 @@ export class DeleteOperation extends CommandOperation<Document> {
     return this.statements.every(op => (op.limit != null ? op.limit > 0 : true));
   }
 
-  override buildCommandDocument(_connection: Connection, _session?: ClientSession): Document {
+  override buildCommandDocument(connection: Connection, _session?: ClientSession): Document {
     const options = this.options;
 
     const ordered = typeof options.ordered === 'boolean' ? options.ordered : true;
@@ -86,10 +86,11 @@ export class DeleteOperation extends CommandOperation<Document> {
     }
 
     const unacknowledgedWrite = this.writeConcern && this.writeConcern.w === 0;
-    if (unacknowledgedWrite) {
+    if (unacknowledgedWrite && maxWireVersion(connection) < 9) {
       if (this.statements.find((o: Document) => o.hint)) {
-        // TODO(NODE-3541): fix error for hint with unacknowledged writes
-        throw new MongoCompatibilityError(`hint is not supported with unacknowledged writes`);
+        throw new MongoCompatibilityError(
+          `hint for the delete command is only supported on MongoDB 4.4+`
+        );
       }
     }
 
@@ -162,15 +163,21 @@ export function makeDeleteStatement(
   return op;
 }
 
-defineAspects(DeleteOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION]);
+defineAspects(DeleteOperation, [
+  Aspect.RETRYABLE,
+  Aspect.WRITE_OPERATION,
+  Aspect.SUPPORTS_RAW_DATA
+]);
 defineAspects(DeleteOneOperation, [
   Aspect.RETRYABLE,
   Aspect.WRITE_OPERATION,
   Aspect.EXPLAINABLE,
-  Aspect.SKIP_COLLATION
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
 ]);
 defineAspects(DeleteManyOperation, [
   Aspect.WRITE_OPERATION,
   Aspect.EXPLAINABLE,
-  Aspect.SKIP_COLLATION
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/distinct.ts

@@ -84,4 +84,9 @@ export class DistinctOperation extends CommandOperation<any[] | Document> {
   }
 }
 
-defineAspects(DistinctOperation, [Aspect.READ_OPERATION, Aspect.RETRYABLE, Aspect.EXPLAINABLE]);
+defineAspects(DistinctOperation, [
+  Aspect.READ_OPERATION,
+  Aspect.RETRYABLE,
+  Aspect.EXPLAINABLE,
+  Aspect.SUPPORTS_RAW_DATA
+]);

package/src/operations/drop.ts

@@ -11,7 +11,7 @@ import { executeOperation } from './execute_operation';
 import { Aspect, defineAspects } from './operation';
 
 /** @public */
-export interface DropCollectionOptions extends CommandOperationOptions {
+export interface DropCollectionOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** @experimental */
   encryptedFields?: Document;
 }

package/src/operations/estimated_document_count.ts

@@ -56,5 +56,6 @@ export class EstimatedDocumentCountOperation extends CommandOperation<number> {
 defineAspects(EstimatedDocumentCountOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,
-  Aspect.CURSOR_CREATING
+  Aspect.CURSOR_CREATING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/find.ts

@@ -258,5 +258,6 @@ defineAspects(FindOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,
   Aspect.EXPLAINABLE,
-  Aspect.CURSOR_CREATING
+  Aspect.CURSOR_CREATING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/find_and_modify.ts

@@ -6,7 +6,7 @@ import { MongoCompatibilityError, MongoInvalidArgumentError } from '../error';
 import { ReadPreference } from '../read_preference';
 import type { ClientSession } from '../sessions';
 import { formatSort, type Sort, type SortForCmd } from '../sort';
-import { decorateWithCollation, hasAtomicOperators } from '../utils';
+import { decorateWithCollation, hasAtomicOperators, maxWireVersion } from '../utils';
 import { type WriteConcern, type WriteConcernSettings } from '../write_concern';
 import { CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects } from './operation';
@@ -146,7 +146,7 @@ export class FindAndModifyOperation extends CommandOperation<Document> {
   }
 
   override buildCommandDocument(
-    _connection: Connection,
+    connection: Connection,
     _session?: ClientSession
   ): Document & FindAndModifyCmdBase {
     const options = this.options;
@@ -188,13 +188,13 @@ export class FindAndModifyOperation extends CommandOperation<Document> {
       command.comment = options.comment;
     }
 
-    decorateWithCollation(command, this.collection, options);
+    decorateWithCollation(command, options);
 
     if (options.hint) {
       const unacknowledgedWrite = this.writeConcern?.w === 0;
-      if (unacknowledgedWrite) {
+      if (unacknowledgedWrite && maxWireVersion(connection) < 9) {
         throw new MongoCompatibilityError(
-          'The current topology does not support a hint on findAndModify commands'
+          'hint for the findAndModify command is only supported on MongoDB 4.4+'
         );
       }
 
@@ -314,5 +314,6 @@ export class FindOneAndUpdateOperation extends FindAndModifyOperation {
 defineAspects(FindAndModifyOperation, [
   Aspect.WRITE_OPERATION,
   Aspect.RETRYABLE,
-  Aspect.EXPLAINABLE
+  Aspect.EXPLAINABLE,
+  Aspect.SUPPORTS_RAW_DATA
 ]);