mongodb 6.19.0-dev.20250903.sha.98c5d830 → 6.19.0-dev.20250909.sha.43c85189

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;
@@ -192,9 +192,9 @@ export class FindAndModifyOperation extends CommandOperation<Document> {
 
     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
 ]);

package/src/operations/indexes.ts

@@ -368,7 +368,7 @@ export class ListIndexesOperation extends CommandOperation<CursorResponse> {
    * This allows typescript to delete the key but will
    * not allow a writeConcern to be assigned as a property on options.
    */
-  override options: ListIndexesOptions & { writeConcern?: never };
+  override options: ListIndexesOptions & { writeConcern?: never; rawData?: boolean };
   collectionNamespace: MongoDBNamespace;
 
   constructor(collection: Collection, options?: ListIndexesOptions) {
@@ -409,7 +409,8 @@ export class ListIndexesOperation extends CommandOperation<CursorResponse> {
 defineAspects(ListIndexesOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,
-  Aspect.CURSOR_CREATING
+  Aspect.CURSOR_CREATING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);
-defineAspects(CreateIndexesOperation, [Aspect.WRITE_OPERATION]);
-defineAspects(DropIndexOperation, [Aspect.WRITE_OPERATION]);
+defineAspects(CreateIndexesOperation, [Aspect.WRITE_OPERATION, Aspect.SUPPORTS_RAW_DATA]);
+defineAspects(DropIndexOperation, [Aspect.WRITE_OPERATION, Aspect.SUPPORTS_RAW_DATA]);

package/src/operations/insert.ts

@@ -96,5 +96,13 @@ export interface InsertManyResult<TSchema = Document> {
   insertedIds: { [key: number]: InferIdType<TSchema> };
 }
 
-defineAspects(InsertOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION]);
-defineAspects(InsertOneOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION]);
+defineAspects(InsertOperation, [
+  Aspect.RETRYABLE,
+  Aspect.WRITE_OPERATION,
+  Aspect.SUPPORTS_RAW_DATA
+]);
+defineAspects(InsertOneOperation, [
+  Aspect.RETRYABLE,
+  Aspect.WRITE_OPERATION,
+  Aspect.SUPPORTS_RAW_DATA
+]);

package/src/operations/list_collections.ts

@@ -103,5 +103,6 @@ export interface CollectionInfo extends Document {
 defineAspects(ListCollectionsOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,
-  Aspect.CURSOR_CREATING
+  Aspect.CURSOR_CREATING,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/list_databases.ts

@@ -16,7 +16,7 @@ export interface ListDatabasesResult {
 }
 
 /** @public */
-export interface ListDatabasesOptions extends CommandOperationOptions {
+export interface ListDatabasesOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** A query predicate that determines which databases are listed */
   filter?: Document;
   /** A flag to indicate whether the command should return just the database names, or return both database names and size information */

package/src/operations/operation.ts

@@ -16,7 +16,8 @@ export const Aspect = {
   SKIP_COLLATION: Symbol('SKIP_COLLATION'),
   CURSOR_CREATING: Symbol('CURSOR_CREATING'),
   MUST_SELECT_SAME_SERVER: Symbol('MUST_SELECT_SAME_SERVER'),
-  COMMAND_BATCHING: Symbol('COMMAND_BATCHING')
+  COMMAND_BATCHING: Symbol('COMMAND_BATCHING'),
+  SUPPORTS_RAW_DATA: Symbol('SUPPORTS_RAW_DATA')
 } as const;
 
 /** @public */

package/src/operations/profiling_level.ts

@@ -6,7 +6,7 @@ import { MongoUnexpectedServerResponseError } from '../error';
 import { CommandOperation, type CommandOperationOptions } from './command';
 
 /** @public */
-export type ProfilingLevelOptions = CommandOperationOptions;
+export type ProfilingLevelOptions = Omit<CommandOperationOptions, 'rawData'>;
 
 class ProfilingLevelResponse extends MongoDBResponse {
   get was() {

package/src/operations/remove_user.ts

@@ -6,7 +6,7 @@ import { CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects } from './operation';
 
 /** @public */
-export type RemoveUserOptions = CommandOperationOptions;
+export type RemoveUserOptions = Omit<CommandOperationOptions, 'rawData'>;
 
 /** @internal */
 export class RemoveUserOperation extends CommandOperation<boolean> {

package/src/operations/rename.ts

@@ -8,7 +8,7 @@ import { CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects } from './operation';
 
 /** @public */
-export interface RenameOptions extends CommandOperationOptions {
+export interface RenameOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** Drop the target name collection if it previously exists. */
   dropTarget?: boolean;
   /** Unclear */

package/src/operations/set_profiling_level.ts

@@ -19,7 +19,7 @@ export const ProfilingLevel = Object.freeze({
 export type ProfilingLevel = (typeof ProfilingLevel)[keyof typeof ProfilingLevel];
 
 /** @public */
-export type SetProfilingLevelOptions = CommandOperationOptions;
+export type SetProfilingLevelOptions = Omit<CommandOperationOptions, 'rawData'>;
 
 /** @internal */
 export class SetProfilingLevelOperation extends CommandOperation<ProfilingLevel> {

package/src/operations/stats.ts

@@ -6,7 +6,7 @@ import { CommandOperation, type CommandOperationOptions } from './command';
 import { Aspect, defineAspects } from './operation';
 
 /** @public */
-export interface DbStatsOptions extends CommandOperationOptions {
+export interface DbStatsOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** Divide the returned sizes by scale value. */
   scale?: number;
 }

package/src/operations/update.ts

@@ -1,7 +1,7 @@
 import type { Document } from '../bson';
 import { type Connection } from '../cmap/connection';
 import { MongoDBResponse } from '../cmap/wire_protocol/responses';
-import { MongoCompatibilityError, MongoInvalidArgumentError, MongoServerError } from '../error';
+import { MongoInvalidArgumentError, MongoServerError } from '../error';
 import type { InferIdType } from '../mongo_types';
 import type { ClientSession } from '../sessions';
 import { formatSort, type Sort, type SortForCmd } from '../sort';
@@ -121,14 +121,6 @@ export class UpdateOperation extends CommandOperation<Document> {
       command.comment = options.comment;
     }
 
-    const unacknowledgedWrite = this.writeConcern?.w === 0;
-    if (unacknowledgedWrite) {
-      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`);
-      }
-    }
-
     return command;
   }
 }
@@ -299,20 +291,28 @@ export function makeUpdateStatement(
   return op;
 }
 
-defineAspects(UpdateOperation, [Aspect.RETRYABLE, Aspect.WRITE_OPERATION, Aspect.SKIP_COLLATION]);
+defineAspects(UpdateOperation, [
+  Aspect.RETRYABLE,
+  Aspect.WRITE_OPERATION,
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
+]);
 defineAspects(UpdateOneOperation, [
   Aspect.RETRYABLE,
   Aspect.WRITE_OPERATION,
   Aspect.EXPLAINABLE,
-  Aspect.SKIP_COLLATION
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
 ]);
 defineAspects(UpdateManyOperation, [
   Aspect.WRITE_OPERATION,
   Aspect.EXPLAINABLE,
-  Aspect.SKIP_COLLATION
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
 ]);
 defineAspects(ReplaceOneOperation, [
   Aspect.RETRYABLE,
   Aspect.WRITE_OPERATION,
-  Aspect.SKIP_COLLATION
+  Aspect.SKIP_COLLATION,
+  Aspect.SUPPORTS_RAW_DATA
 ]);

package/src/operations/validate_collection.ts

@@ -7,7 +7,7 @@ import type { ClientSession } from '../sessions';
 import { CommandOperation, type CommandOperationOptions } from './command';
 
 /** @public */
-export interface ValidateCollectionOptions extends CommandOperationOptions {
+export interface ValidateCollectionOptions extends Omit<CommandOperationOptions, 'rawData'> {
   /** Validates a collection in the background, without interrupting read or write traffic (only in MongoDB 4.4+) */
   background?: boolean;
 }

package/src/utils.ts

@@ -359,34 +359,40 @@ export function uuidV4(): Buffer {
  * A helper function for determining `maxWireVersion` between legacy and new topology instances
  * @internal
  */
-export function maxWireVersion(topologyOrServer?: Connection | Topology | Server): number {
-  if (topologyOrServer) {
-    if (topologyOrServer.loadBalanced || topologyOrServer.serverApi?.version) {
-      // Since we do not have a monitor in the load balanced mode,
-      // we assume the load-balanced server is always pointed at the latest mongodb version.
-      // There is a risk that for on-prem deployments
-      // that don't upgrade immediately that this could alert to the
-      // application that a feature is available that is actually not.
-      // We also return the max supported wire version for serverAPI.
+export function maxWireVersion(handshakeAware?: Connection | Topology | Server): number {
+  if (handshakeAware) {
+    if (handshakeAware.hello) {
+      return handshakeAware.hello.maxWireVersion;
+    }
+
+    if (handshakeAware.serverApi?.version) {
+      // We return the max supported wire version for serverAPI.
       return MAX_SUPPORTED_WIRE_VERSION;
     }
-    if (topologyOrServer.hello) {
-      return topologyOrServer.hello.maxWireVersion;
+    // This is the fallback case for load balanced mode. If we are building commands the
+    // object being checked will be a connection, and we will have a hello response on
+    // it. For other cases, such as retryable writes, the object will be a server or
+    // topology, and there will be no hello response on those objects, so we return
+    // the max wire version so we support retryability. Once we have a min supported
+    // wire version of 9, then the needsRetryableWriteLabel() check can remove the
+    // usage of passing the wire version into it.
+    if (handshakeAware.loadBalanced) {
+      return MAX_SUPPORTED_WIRE_VERSION;
     }
 
-    if ('lastHello' in topologyOrServer && typeof topologyOrServer.lastHello === 'function') {
-      const lastHello = topologyOrServer.lastHello();
+    if ('lastHello' in handshakeAware && typeof handshakeAware.lastHello === 'function') {
+      const lastHello = handshakeAware.lastHello();
       if (lastHello) {
         return lastHello.maxWireVersion;
       }
     }
 
     if (
-      topologyOrServer.description &&
-      'maxWireVersion' in topologyOrServer.description &&
-      topologyOrServer.description.maxWireVersion != null
+      handshakeAware.description &&
+      'maxWireVersion' in handshakeAware.description &&
+      handshakeAware.description.maxWireVersion != null
     ) {
-      return topologyOrServer.description.maxWireVersion;
+      return handshakeAware.description.maxWireVersion;
     }
   }