mongodb 6.7.0-dev.20240608.sha.0655c730 → 6.7.0-dev.20240614.sha.3ed6a2ad

package/src/cursor/change_stream_cursor.ts

@@ -1,4 +1,4 @@
-import type { Document, Long, Timestamp } from '../bson';
+import type { Document } from '../bson';
 import {
   ChangeStream,
   type ChangeStreamDocument,
@@ -6,15 +6,19 @@ import {
   type OperationTime,
   type ResumeToken
 } from '../change_stream';
+import { type CursorResponse } from '../cmap/wire_protocol/responses';
 import { INIT, RESPONSE } from '../constants';
 import type { MongoClient } from '../mongo_client';
-import type { TODO_NODE_3286 } from '../mongo_types';
 import { AggregateOperation } from '../operations/aggregate';
 import type { CollationOptions } from '../operations/command';
-import { executeOperation, type ExecutionResult } from '../operations/execute_operation';
+import { executeOperation } from '../operations/execute_operation';
 import type { ClientSession } from '../sessions';
 import { maxWireVersion, type MongoDBNamespace } from '../utils';
-import { AbstractCursor, type AbstractCursorOptions } from './abstract_cursor';
+import {
+  AbstractCursor,
+  type AbstractCursorOptions,
+  type InitialCursorResponse
+} from './abstract_cursor';
 
 /** @internal */
 export interface ChangeStreamCursorOptions extends AbstractCursorOptions {
@@ -26,25 +30,13 @@ export interface ChangeStreamCursorOptions extends AbstractCursorOptions {
   fullDocument?: string;
 }
 
-/** @internal */
-export type ChangeStreamAggregateRawResult<TChange> = {
-  $clusterTime: { clusterTime: Timestamp };
-  cursor: {
-    postBatchResumeToken: ResumeToken;
-    ns: string;
-    id: number | Long;
-  } & ({ firstBatch: TChange[] } | { nextBatch: TChange[] });
-  ok: 1;
-  operationTime: Timestamp;
-};
-
 /** @internal */
 export class ChangeStreamCursor<
   TSchema extends Document = Document,
   TChange extends Document = ChangeStreamDocument<TSchema>
 > extends AbstractCursor<TChange, ChangeStreamEvents> {
   private _resumeToken: ResumeToken;
-  private startAtOperationTime?: OperationTime;
+  private startAtOperationTime: OperationTime | null;
   private hasReceived?: boolean;
   private readonly changeStreamCursorOptions: ChangeStreamCursorOptions;
   private postBatchResumeToken?: ResumeToken;
@@ -68,7 +60,7 @@ export class ChangeStreamCursor<
     this.pipeline = pipeline;
     this.changeStreamCursorOptions = options;
     this._resumeToken = null;
-    this.startAtOperationTime = options.startAtOperationTime;
+    this.startAtOperationTime = options.startAtOperationTime ?? null;
 
     if (options.startAfter) {
       this.resumeToken = options.startAfter;
@@ -117,15 +109,13 @@ export class ChangeStreamCursor<
     this.hasReceived = true;
   }
 
-  _processBatch(response: ChangeStreamAggregateRawResult<TChange>): void {
-    const cursor = response.cursor;
-    if (cursor.postBatchResumeToken) {
-      this.postBatchResumeToken = response.cursor.postBatchResumeToken;
+  _processBatch(response: CursorResponse): void {
+    const { postBatchResumeToken } = response;
+    if (postBatchResumeToken) {
+      this.postBatchResumeToken = postBatchResumeToken;
 
-      const batch =
-        'firstBatch' in response.cursor ? response.cursor.firstBatch : response.cursor.nextBatch;
-      if (batch.length === 0) {
-        this.resumeToken = cursor.postBatchResumeToken;
+      if (response.batchSize === 0) {
+        this.resumeToken = postBatchResumeToken;
       }
     }
   }
@@ -136,17 +126,14 @@ export class ChangeStreamCursor<
     });
   }
 
-  async _initialize(session: ClientSession): Promise<ExecutionResult> {
+  async _initialize(session: ClientSession): Promise<InitialCursorResponse> {
     const aggregateOperation = new AggregateOperation(this.namespace, this.pipeline, {
       ...this.cursorOptions,
       ...this.changeStreamCursorOptions,
       session
     });
 
-    const response = await executeOperation<
-      TODO_NODE_3286,
-      ChangeStreamAggregateRawResult<TChange>
-    >(session.client, aggregateOperation);
+    const response = await executeOperation(session.client, aggregateOperation);
 
     const server = aggregateOperation.server;
     this.maxWireVersion = maxWireVersion(server);
@@ -165,15 +152,14 @@ export class ChangeStreamCursor<
     this.emit(INIT, response);
     this.emit(RESPONSE);
 
-    // TODO: NODE-2882
     return { server, session, response };
   }
 
-  override async getMore(batchSize: number): Promise<Document | null> {
+  override async getMore(batchSize: number): Promise<CursorResponse> {
     const response = await super.getMore(batchSize);
 
     this.maxWireVersion = maxWireVersion(this.server);
-    this._processBatch(response as ChangeStreamAggregateRawResult<TChange>);
+    this._processBatch(response);
 
     this.emit(ChangeStream.MORE, response);
     this.emit(ChangeStream.RESPONSE);

package/src/cursor/find_cursor.ts

@@ -5,13 +5,13 @@ import { type ExplainVerbosityLike } from '../explain';
 import type { MongoClient } from '../mongo_client';
 import type { CollationOptions } from '../operations/command';
 import { CountOperation, type CountOptions } from '../operations/count';
-import { executeOperation, type ExecutionResult } from '../operations/execute_operation';
+import { executeOperation } from '../operations/execute_operation';
 import { FindOperation, type FindOptions } from '../operations/find';
 import type { Hint } from '../operations/operation';
 import type { ClientSession } from '../sessions';
 import { formatSort, type Sort, type SortDirection } from '../sort';
 import { emitWarningOnce, mergeOptions, type MongoDBNamespace, squashError } from '../utils';
-import { AbstractCursor } from './abstract_cursor';
+import { AbstractCursor, type InitialCursorResponse } from './abstract_cursor';
 
 /** @public Flags allowed for cursor */
 export const FLAGS = [
@@ -62,7 +62,7 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
   }
 
   /** @internal */
-  async _initialize(session: ClientSession): Promise<ExecutionResult> {
+  async _initialize(session: ClientSession): Promise<InitialCursorResponse> {
     const findOperation = new FindOperation(this.namespace, this.cursorFilter, {
       ...this.findOptions, // NOTE: order matters here, we may need to refine this
       ...this.cursorOptions,
@@ -72,19 +72,13 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
     const response = await executeOperation(this.client, findOperation);
 
     // the response is not a cursor when `explain` is enabled
-    if (CursorResponse.is(response)) {
-      this.numReturned = response.batchSize;
-    } else {
-      // Can be an explain response, hence the ?. on everything
-      this.numReturned = this.numReturned + (response?.cursor?.firstBatch?.length ?? 0);
-    }
+    this.numReturned = response.batchSize;
 
-    // TODO: NODE-2882
     return { server: findOperation.server, session, response };
   }
 
   /** @internal */
-  override async getMore(batchSize: number): Promise<Document | null> {
+  override async getMore(batchSize: number): Promise<CursorResponse> {
     const numReturned = this.numReturned;
     if (numReturned) {
       // TODO(DRIVERS-1448): Remove logic to enforce `limit` in the driver
@@ -110,13 +104,9 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
       }
     }
 
-    const response = await super.getMore(batchSize, false);
+    const response = await super.getMore(batchSize);
     // TODO: wrap this in some logic to prevent it from happening if we don't need this support
-    if (CursorResponse.is(response)) {
-      this.numReturned = this.numReturned + response.batchSize;
-    } else {
-      this.numReturned = this.numReturned + (response?.cursor?.nextBatch?.length ?? 0);
-    }
+    this.numReturned = this.numReturned + response.batchSize;
 
     return response;
   }
@@ -144,14 +134,16 @@ export class FindCursor<TSchema = any> extends AbstractCursor<TSchema> {
 
   /** Execute the explain for the cursor */
   async explain(verbosity?: ExplainVerbosityLike): Promise<Document> {
-    return await executeOperation(
-      this.client,
-      new FindOperation(this.namespace, this.cursorFilter, {
-        ...this.findOptions, // NOTE: order matters here, we may need to refine this
-        ...this.cursorOptions,
-        explain: verbosity ?? true
-      })
-    );
+    return (
+      await executeOperation(
+        this.client,
+        new FindOperation(this.namespace, this.cursorFilter, {
+          ...this.findOptions, // NOTE: order matters here, we may need to refine this
+          ...this.cursorOptions,
+          explain: verbosity ?? true
+        })
+      )
+    ).shift(this.findOptions);
   }
 
   /** Set the cursor query */

package/src/cursor/list_collections_cursor.ts

@@ -1,13 +1,13 @@
 import type { Document } from '../bson';
 import type { Db } from '../db';
-import { executeOperation, type ExecutionResult } from '../operations/execute_operation';
+import { executeOperation } from '../operations/execute_operation';
 import {
   type CollectionInfo,
   ListCollectionsOperation,
   type ListCollectionsOptions
 } from '../operations/list_collections';
 import type { ClientSession } from '../sessions';
-import { AbstractCursor } from './abstract_cursor';
+import { AbstractCursor, type InitialCursorResponse } from './abstract_cursor';
 
 /** @public */
 export class ListCollectionsCursor<
@@ -34,7 +34,7 @@ export class ListCollectionsCursor<
   }
 
   /** @internal */
-  async _initialize(session: ClientSession | undefined): Promise<ExecutionResult> {
+  async _initialize(session: ClientSession | undefined): Promise<InitialCursorResponse> {
     const operation = new ListCollectionsOperation(this.parent, this.filter, {
       ...this.cursorOptions,
       ...this.options,
@@ -43,7 +43,6 @@ export class ListCollectionsCursor<
 
     const response = await executeOperation(this.parent.client, operation);
 
-    // TODO: NODE-2882
     return { server: operation.server, session, response };
   }
 }

package/src/cursor/list_indexes_cursor.ts

@@ -1,8 +1,8 @@
 import type { Collection } from '../collection';
-import { executeOperation, type ExecutionResult } from '../operations/execute_operation';
+import { executeOperation } from '../operations/execute_operation';
 import { ListIndexesOperation, type ListIndexesOptions } from '../operations/indexes';
 import type { ClientSession } from '../sessions';
-import { AbstractCursor } from './abstract_cursor';
+import { AbstractCursor, type InitialCursorResponse } from './abstract_cursor';
 
 /** @public */
 export class ListIndexesCursor extends AbstractCursor {
@@ -23,7 +23,7 @@ export class ListIndexesCursor extends AbstractCursor {
   }
 
   /** @internal */
-  async _initialize(session: ClientSession | undefined): Promise<ExecutionResult> {
+  async _initialize(session: ClientSession | undefined): Promise<InitialCursorResponse> {
     const operation = new ListIndexesOperation(this.parent, {
       ...this.cursorOptions,
       ...this.options,
@@ -32,7 +32,6 @@ export class ListIndexesCursor extends AbstractCursor {
 
     const response = await executeOperation(this.parent.client, operation);
 
-    // TODO: NODE-2882
     return { server: operation.server, session, response };
   }
 }

package/src/cursor/run_command_cursor.ts

@@ -1,14 +1,15 @@
-import type { BSONSerializeOptions, Document, Long } from '../bson';
+import type { BSONSerializeOptions, Document } from '../bson';
+import { CursorResponse } from '../cmap/wire_protocol/responses';
 import type { Db } from '../db';
-import { MongoAPIError, MongoUnexpectedServerResponseError } from '../error';
-import { executeOperation, type ExecutionResult } from '../operations/execute_operation';
+import { MongoAPIError } from '../error';
+import { executeOperation } from '../operations/execute_operation';
 import { GetMoreOperation } from '../operations/get_more';
 import { RunCommandOperation } from '../operations/run_command';
 import type { ReadConcernLike } from '../read_concern';
 import type { ReadPreferenceLike } from '../read_preference';
 import type { ClientSession } from '../sessions';
 import { ns } from '../utils';
-import { AbstractCursor } from './abstract_cursor';
+import { AbstractCursor, type InitialCursorResponse } from './abstract_cursor';
 
 /** @public */
 export type RunCursorCommandOptions = {
@@ -16,12 +17,6 @@ export type RunCursorCommandOptions = {
   session?: ClientSession;
 } & BSONSerializeOptions;
 
-/** @internal */
-type RunCursorCommandResponse = {
-  cursor: { id: bigint | Long | number; ns: string; firstBatch: Document[] };
-  ok: 1;
-};
-
 /** @public */
 export class RunCommandCursor extends AbstractCursor {
   public readonly command: Readonly<Record<string, any>>;
@@ -102,16 +97,16 @@ export class RunCommandCursor extends AbstractCursor {
   }
 
   /** @internal */
-  protected async _initialize(session: ClientSession): Promise<ExecutionResult> {
-    const operation = new RunCommandOperation<RunCursorCommandResponse>(this.db, this.command, {
+  protected async _initialize(session: ClientSession): Promise<InitialCursorResponse> {
+    const operation = new RunCommandOperation<CursorResponse>(this.db, this.command, {
       ...this.cursorOptions,
       session: session,
-      readPreference: this.cursorOptions.readPreference
+      readPreference: this.cursorOptions.readPreference,
+      responseType: CursorResponse
     });
+
     const response = await executeOperation(this.client, operation);
-    if (response.cursor == null) {
-      throw new MongoUnexpectedServerResponseError('Expected server to respond with cursor');
-    }
+
     return {
       server: operation.server,
       session,
@@ -120,13 +115,12 @@ export class RunCommandCursor extends AbstractCursor {
   }
 
   /** @internal */
-  override async getMore(_batchSize: number): Promise<Document> {
+  override async getMore(_batchSize: number): Promise<CursorResponse> {
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     const getMoreOperation = new GetMoreOperation(this.namespace, this.id!, this.server!, {
       ...this.cursorOptions,
       session: this.session,
-      ...this.getMoreOptions,
-      useCursorResponse: false
+      ...this.getMoreOptions
     });
 
     return await executeOperation(this.client, getMoreOperation);

package/src/error.ts

@@ -750,8 +750,8 @@ export class MongoUnexpectedServerResponseError extends MongoRuntimeError {
    *
    * @public
    **/
-  constructor(message: string) {
-    super(message);
+  constructor(message: string, options?: { cause?: Error }) {
+    super(message, options);
   }
 
   override get name(): string {
@@ -1157,27 +1157,14 @@ export class MongoServerSelectionError extends MongoSystemError {
   }
 }
 
-function makeWriteConcernResultObject(input: any) {
-  const output = Object.assign({}, input);
-
-  if (output.ok === 0) {
-    output.ok = 1;
-    delete output.errmsg;
-    delete output.code;
-    delete output.codeName;
-  }
-
-  return output;
-}
-
 /**
  * An error thrown when the server reports a writeConcernError
  * @public
  * @category Error
  */
 export class MongoWriteConcernError extends MongoServerError {
-  /** The result document (provided if ok: 1) */
-  result?: Document;
+  /** The result document */
+  result: Document;
 
   /**
    * **Do not use this constructor!**
@@ -1190,17 +1177,18 @@ export class MongoWriteConcernError extends MongoServerError {
    *
    * @public
    **/
-  constructor(message: ErrorDescription, result?: Document) {
-    if (result && Array.isArray(result.errorLabels)) {
-      message.errorLabels = result.errorLabels;
-    }
-
-    super(message);
-    this.errInfo = message.errInfo;
-
-    if (result != null) {
-      this.result = makeWriteConcernResultObject(result);
-    }
+  constructor(result: {
+    writeConcernError: {
+      code: number;
+      errmsg: string;
+      codeName?: string;
+      errInfo?: Document;
+    };
+    errorLabels?: string[];
+  }) {
+    super({ ...result, ...result.writeConcernError });
+    this.errInfo = result.writeConcernError.errInfo;
+    this.result = result;
   }
 
   override get name(): string {

package/src/index.ts

@@ -160,7 +160,7 @@ export { SrvPollingEvent } from './sdam/srv_polling';
 
 // type only exports below, these are removed from emitted JS
 export type { AdminPrivate } from './admin';
-export type { BSONSerializeOptions, Document } from './bson';
+export type { BSONElement, BSONSerializeOptions, Document } from './bson';
 export type { deserialize, serialize } from './bson';
 export type {
   BulkResult,
@@ -238,8 +238,13 @@ export {
 } from './client-side-encryption/errors';
 export type { MongocryptdManager } from './client-side-encryption/mongocryptd_manager';
 export type {
+  AWSKMSProviderConfiguration,
+  AzureKMSProviderConfiguration,
   ClientEncryptionDataKeyProvider,
-  KMSProviders
+  GCPKMSProviderConfiguration,
+  KMIPKMSProviderConfiguration,
+  KMSProviders,
+  LocalKMSProviderConfiguration
 } from './client-side-encryption/providers/index';
 export type {
   ClientEncryptionTlsOptions,
@@ -337,12 +342,12 @@ export type {
   CursorFlag,
   CursorStreamOptions
 } from './cursor/abstract_cursor';
-export type { InternalAbstractCursorOptions } from './cursor/abstract_cursor';
-export type { AggregationCursorOptions } from './cursor/aggregation_cursor';
 export type {
-  ChangeStreamAggregateRawResult,
-  ChangeStreamCursorOptions
-} from './cursor/change_stream_cursor';
+  InitialCursorResponse,
+  InternalAbstractCursorOptions
+} from './cursor/abstract_cursor';
+export type { AggregationCursorOptions } from './cursor/aggregation_cursor';
+export type { ChangeStreamCursorOptions } from './cursor/change_stream_cursor';
 export type {
   ListSearchIndexesCursor,
   ListSearchIndexesOptions
@@ -468,7 +473,6 @@ export type { DeleteOptions, DeleteResult, DeleteStatement } from './operations/
 export type { DistinctOptions } from './operations/distinct';
 export type { DropCollectionOptions, DropDatabaseOptions } from './operations/drop';
 export type { EstimatedDocumentCountOptions } from './operations/estimated_document_count';
-export type { ExecutionResult } from './operations/execute_operation';
 export type { FindOptions } from './operations/find';
 export type {
   FindOneAndDeleteOptions,

package/src/operations/aggregate.ts

@@ -1,6 +1,6 @@
 import type { Document } from '../bson';
+import { CursorResponse, ExplainedCursorResponse } from '../cmap/wire_protocol/responses';
 import { MongoInvalidArgumentError } from '../error';
-import { type TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { maxWireVersion, type MongoDBNamespace } from '../utils';
@@ -37,7 +37,7 @@ export interface AggregateOptions extends CommandOperationOptions {
 }
 
 /** @internal */
-export class AggregateOperation<T = Document> extends CommandOperation<T> {
+export class AggregateOperation extends CommandOperation<CursorResponse> {
   override options: AggregateOptions;
   target: string | typeof DB_AGGREGATE_COLLECTION;
   pipeline: Document[];
@@ -94,7 +94,10 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
     this.pipeline.push(stage);
   }
 
-  override async execute(server: Server, session: ClientSession | undefined): Promise<T> {
+  override async execute(
+    server: Server,
+    session: ClientSession | undefined
+  ): Promise<CursorResponse> {
     const options: AggregateOptions = this.options;
     const serverWireVersion = maxWireVersion(server);
     const command: Document = { aggregate: this.target, pipeline: this.pipeline };
@@ -134,8 +137,12 @@ export class AggregateOperation<T = Document> extends CommandOperation<T> {
       command.cursor.batchSize = options.batchSize;
     }
 
-    const res: TODO_NODE_3286 = await super.executeCommand(server, session, command);
-    return res;
+    return await super.executeCommand(
+      server,
+      session,
+      command,
+      this.explain ? ExplainedCursorResponse : CursorResponse
+    );
   }
 }
 

package/src/operations/bulk_write.ts

@@ -50,8 +50,7 @@ export class BulkWriteOperation extends AbstractOperation<BulkWriteResult> {
     }
 
     // Execute the bulk
-    const result = await bulk.execute({ ...options, session });
-    return result;
+    return await bulk.execute({ ...options, session });
   }
 }
 

package/src/operations/command.ts

@@ -1,4 +1,5 @@
 import type { BSONSerializeOptions, Document } from '../bson';
+import { type MongoDBResponseConstructor } from '../cmap/wire_protocol/responses';
 import { MongoInvalidArgumentError } from '../error';
 import { Explain, type ExplainOptions } from '../explain';
 import { ReadConcern } from '../read_concern';
@@ -106,12 +107,25 @@ export abstract class CommandOperation<T> extends AbstractOperation<T> {
     return true;
   }
 
-  async executeCommand(
+  public async executeCommand<T extends MongoDBResponseConstructor>(
+    server: Server,
+    session: ClientSession | undefined,
+    cmd: Document,
+    responseType: T | undefined
+  ): Promise<typeof responseType extends undefined ? Document : InstanceType<T>>;
+
+  public async executeCommand(
     server: Server,
     session: ClientSession | undefined,
     cmd: Document
+  ): Promise<Document>;
+
+  async executeCommand(
+    server: Server,
+    session: ClientSession | undefined,
+    cmd: Document,
+    responseType?: MongoDBResponseConstructor
   ): Promise<Document> {
-    // TODO: consider making this a non-enumerable property
     this.server = server;
 
     const options = {
@@ -152,6 +166,6 @@ export abstract class CommandOperation<T> extends AbstractOperation<T> {
       cmd = decorateWithExplain(cmd, this.explain);
     }
 
-    return await server.command(this.ns, cmd, options);
+    return await server.command(this.ns, cmd, options, responseType);
   }
 }

package/src/operations/count_documents.ts

@@ -1,5 +1,6 @@
 import type { Document } from '../bson';
 import type { Collection } from '../collection';
+import { type TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { AggregateOperation, type AggregateOptions } from './aggregate';
@@ -13,7 +14,7 @@ export interface CountDocumentsOptions extends AggregateOptions {
 }
 
 /** @internal */
-export class CountDocumentsOperation extends AggregateOperation<number> {
+export class CountDocumentsOperation extends AggregateOperation {
   constructor(collection: Collection, query: Document, options: CountDocumentsOptions) {
     const pipeline = [];
     pipeline.push({ $match: query });
@@ -31,16 +32,11 @@ export class CountDocumentsOperation extends AggregateOperation<number> {
     super(collection.s.namespace, pipeline, options);
   }
 
-  override async execute(server: Server, session: ClientSession | undefined): Promise<number> {
+  override async execute(
+    server: Server,
+    session: ClientSession | undefined
+  ): Promise<TODO_NODE_3286> {
     const result = await super.execute(server, session);
-
-    // NOTE: We're avoiding creating a cursor here to reduce the callstack.
-    const response = result as unknown as Document;
-    if (response.cursor == null || response.cursor.firstBatch == null) {
-      return 0;
-    }
-
-    const docs = response.cursor.firstBatch;
-    return docs.length ? docs[0].n : 0;
+    return result.shift()?.n ?? 0;
   }
 }

package/src/operations/delete.ts

@@ -4,8 +4,8 @@ import { MongoCompatibilityError, MongoServerError } from '../error';
 import { type TODO_NODE_3286 } from '../mongo_types';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
-import type { MongoDBNamespace } from '../utils';
-import type { WriteConcernOptions } from '../write_concern';
+import { 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';
 

package/src/operations/execute_operation.ts

@@ -1,5 +1,3 @@
-import type { Document } from '../bson';
-import { type CursorResponse } from '../cmap/wire_protocol/responses';
 import {
   isRetryableReadError,
   isRetryableWriteError,
@@ -18,7 +16,6 @@ import {
 } from '../error';
 import type { MongoClient } from '../mongo_client';
 import { ReadPreference } from '../read_preference';
-import type { Server } from '../sdam/server';
 import type { ServerDescription } from '../sdam/server_description';
 import {
   sameServerSelector,
@@ -38,16 +35,6 @@ type ResultTypeFromOperation<TOperation> = TOperation extends AbstractOperation<
   ? K
   : never;
 
-/** @internal */
-export interface ExecutionResult {
-  /** The server selected for the operation */
-  server: Server;
-  /** The session used for this operation, may be implicitly created */
-  session?: ClientSession;
-  /** The raw server response for the operation */
-  response: Document | CursorResponse;
-}
-
 /**
  * Executes the given operation with provided arguments.
  * @internal