mongodb 6.9.0-dev.20240918.sha.643a8755 → 6.9.0-dev.20240927.sha.681ddd8d

package/mongodb.d.ts

@@ -514,6 +514,13 @@ export declare type AnyBulkWriteOperation<TSchema extends Document = Document> =
     deleteMany: DeleteManyModel<TSchema>;
 };
 
+/**
+ * Used to represent any of the client bulk write models that can be passed as an array
+ * to MongoClient#bulkWrite.
+ * @public
+ */
+export declare type AnyClientBulkWriteModel = ClientInsertOneModel | ClientReplaceOneModel | ClientUpdateOneModel | ClientUpdateManyModel | ClientDeleteOneModel | ClientDeleteManyModel;
+
 /** @public */
 export declare type AnyError = MongoError | Error;
 
@@ -1480,6 +1487,100 @@ export declare interface ChangeStreamUpdateDocument<TSchema extends Document = D
     fullDocumentBeforeChange?: TSchema;
 }
 
+/** @public */
+export declare interface ClientBulkWriteOptions extends CommandOperationOptions {
+    /**
+     * If true, when an insert fails, don't execute the remaining writes.
+     * If false, continue with remaining inserts when one fails.
+     * @defaultValue `true` - inserts are ordered by default
+     */
+    ordered?: boolean;
+    /**
+     * Allow driver to bypass schema validation.
+     * @defaultValue `false` - documents will be validated by default
+     **/
+    bypassDocumentValidation?: boolean;
+    /** Map of parameter names and values that can be accessed using $$var (requires MongoDB 5.0). */
+    let?: Document;
+    /**
+     * Whether detailed results for each successful operation should be included in the returned
+     * BulkWriteResult.
+     */
+    verboseResults?: boolean;
+}
+
+/** @public */
+export declare interface ClientBulkWriteResult {
+    /**
+     * The total number of documents inserted across all insert operations.
+     */
+    insertedCount: number;
+    /**
+     * The total number of documents upserted across all update operations.
+     */
+    upsertedCount: number;
+    /**
+     * The total number of documents matched across all update operations.
+     */
+    matchedCount: number;
+    /**
+     * The total number of documents modified across all update operations.
+     */
+    modifiedCount: number;
+    /**
+     * The total number of documents deleted across all delete operations.
+     */
+    deletedCount: number;
+    /**
+     * The results of each individual insert operation that was successfully performed.
+     */
+    insertResults?: Map<number, ClientInsertOneResult>;
+    /**
+     * The results of each individual update operation that was successfully performed.
+     */
+    updateResults?: Map<number, ClientUpdateResult>;
+    /**
+     * The results of each individual delete operation that was successfully performed.
+     */
+    deleteResults?: Map<number, ClientDeleteResult>;
+}
+
+/** @public */
+export declare interface ClientDeleteManyModel extends ClientWriteModel {
+    name: 'deleteMany';
+    /**
+     * The filter used to determine if a document should be deleted.
+     * For a deleteMany operation, all matches are removed.
+     */
+    filter: Filter<Document>;
+    /** Specifies a collation. */
+    collation?: CollationOptions;
+    /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
+    hint?: Hint;
+}
+
+/** @public */
+export declare interface ClientDeleteOneModel extends ClientWriteModel {
+    name: 'deleteOne';
+    /**
+     * The filter used to determine if a document should be deleted.
+     * For a deleteOne operation, the first match is removed.
+     */
+    filter: Filter<Document>;
+    /** Specifies a collation. */
+    collation?: CollationOptions;
+    /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
+    hint?: Hint;
+}
+
+/** @public */
+export declare interface ClientDeleteResult {
+    /**
+     * The number of documents that were deleted.
+     */
+    deletedCount: number;
+}
+
 /**
  * @public
  * The public interface for explicit in-use encryption
@@ -1901,6 +2002,21 @@ export declare type ClientEncryptionSocketOptions = Pick<MongoClientOptions, 'au
  */
 export declare type ClientEncryptionTlsOptions = Pick<MongoClientOptions, 'tlsCAFile' | 'tlsCertificateKeyFile' | 'tlsCertificateKeyFilePassword'>;
 
+/** @public */
+export declare interface ClientInsertOneModel extends ClientWriteModel {
+    name: 'insertOne';
+    /** The document to insert. */
+    document: OptionalId<Document>;
+}
+
+/** @public */
+export declare interface ClientInsertOneResult {
+    /**
+     * The _id of the inserted document.
+     */
+    insertedId: any;
+}
+
 /**
  * @public
  * @see https://github.com/mongodb/specifications/blob/master/source/mongodb-handshake/handshake.rst#hello-command
@@ -1940,6 +2056,24 @@ export declare interface ClientMetadataOptions {
     appName?: string;
 }
 
+/** @public */
+export declare interface ClientReplaceOneModel extends ClientWriteModel {
+    name: 'replaceOne';
+    /**
+     * The filter used to determine if a document should be replaced.
+     * For a replaceOne operation, the first match is replaced.
+     */
+    filter: Filter<Document>;
+    /** The document with which to replace the matched document. */
+    replacement: WithoutId<Document>;
+    /** Specifies a collation. */
+    collation?: CollationOptions;
+    /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
+    hint?: Hint;
+    /** When true, creates a new document if no document matches the query. */
+    upsert?: boolean;
+}
+
 /**
  * A class representing a client session on the server
  *
@@ -2094,6 +2228,84 @@ export declare interface ClientSessionOptions {
     /* Excluded from this release type: initialClusterTime */
 }
 
+/** @public */
+export declare interface ClientUpdateManyModel extends ClientWriteModel {
+    name: 'updateMany';
+    /**
+     * The filter used to determine if a document should be updated.
+     * For an updateMany operation, all matches are updated.
+     */
+    filter: Filter<Document>;
+    /**
+     * The modifications to apply. The value can be either:
+     * UpdateFilter<Document> - A document that contains update operator expressions,
+     * Document[] - an aggregation pipeline.
+     */
+    update: UpdateFilter<Document> | Document[];
+    /** A set of filters specifying to which array elements an update should apply. */
+    arrayFilters?: Document[];
+    /** Specifies a collation. */
+    collation?: CollationOptions;
+    /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
+    hint?: Hint;
+    /** When true, creates a new document if no document matches the query. */
+    upsert?: boolean;
+}
+
+/** @public */
+export declare interface ClientUpdateOneModel extends ClientWriteModel {
+    name: 'updateOne';
+    /**
+     * The filter used to determine if a document should be updated.
+     * For an updateOne operation, the first match is updated.
+     */
+    filter: Filter<Document>;
+    /**
+     * The modifications to apply. The value can be either:
+     * UpdateFilter<Document> - A document that contains update operator expressions,
+     * Document[] - an aggregation pipeline.
+     */
+    update: UpdateFilter<Document> | Document[];
+    /** A set of filters specifying to which array elements an update should apply. */
+    arrayFilters?: Document[];
+    /** Specifies a collation. */
+    collation?: CollationOptions;
+    /** The index to use. If specified, then the query system will only consider plans using the hinted index. */
+    hint?: Hint;
+    /** When true, creates a new document if no document matches the query. */
+    upsert?: boolean;
+}
+
+/** @public */
+export declare interface ClientUpdateResult {
+    /**
+     * The number of documents that matched the filter.
+     */
+    matchedCount: number;
+    /**
+     * The number of documents that were modified.
+     */
+    modifiedCount: number;
+    /**
+     * The _id field of the upserted document if an upsert occurred.
+     *
+     * It MUST be possible to discern between a BSON Null upserted ID value and this field being
+     * unset. If necessary, drivers MAY add a didUpsert boolean field to differentiate between
+     * these two cases.
+     */
+    upsertedId?: any;
+    /**
+     * Determines if the upsert did include an _id, which includes the case of the _id being null.
+     */
+    didUpsert: boolean;
+}
+
+/** @public */
+export declare interface ClientWriteModel {
+    /** The namespace for the write. */
+    namespace: string;
+}
+
 /**
  * @public
  * @deprecated This interface is deprecated and will be removed in a future release as it is not used
@@ -4894,6 +5106,28 @@ export declare class MongoBatchReExecutionError extends MongoAPIError {
     get name(): string;
 }
 
+/**
+ * An error indicating that an error occurred when processing bulk write results.
+ *
+ * @public
+ * @category Error
+ */
+export declare class MongoBulkWriteCursorError extends MongoRuntimeError {
+    /**
+     * **Do not use this constructor!**
+     *
+     * Meant for internal use only.
+     *
+     * @remarks
+     * This class is only meant to be constructed within the driver. This constructor is
+     * not subject to semantic versioning compatibility guarantees and may change at any time.
+     *
+     * @public
+     **/
+    constructor(message: string);
+    get name(): string;
+}
+
 /**
  * An error indicating an unsuccessful Bulk Write
  * @public
@@ -5001,6 +5235,15 @@ export declare class MongoClient extends TypedEventEmitter<MongoClientEvents> im
     get writeConcern(): WriteConcern | undefined;
     get readPreference(): ReadPreference;
     get bsonOptions(): BSONSerializeOptions;
+    /**
+     * Executes a client bulk write operation, available on server 8.0+.
+     * @param models - The client bulk write models.
+     * @param options - The client bulk write options.
+     * @returns A ClientBulkWriteResult for acknowledged writes and ok: 1 for unacknowledged writes.
+     */
+    bulkWrite(models: AnyClientBulkWriteModel[], options?: ClientBulkWriteOptions): Promise<ClientBulkWriteResult | {
+        ok: 1;
+    }>;
     /**
      * Connect to MongoDB using a url
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mongodb",
-  "version": "6.9.0-dev.20240918.sha.643a8755",
+  "version": "6.9.0-dev.20240927.sha.681ddd8d",
   "description": "The official MongoDB driver for Node.js",
   "main": "lib/index.js",
   "files": [

package/src/cmap/command_monitoring_events.ts

@@ -7,7 +7,12 @@ import {
   LEGACY_HELLO_COMMAND_CAMEL_CASE
 } from '../constants';
 import { calculateDurationInMs, deepCopy } from '../utils';
-import { OpMsgRequest, type OpQueryRequest, type WriteProtocolMessageType } from './commands';
+import {
+  DocumentSequence,
+  OpMsgRequest,
+  type OpQueryRequest,
+  type WriteProtocolMessageType
+} from './commands';
 import type { Connection } from './connection';
 
 /**
@@ -249,7 +254,16 @@ const OP_QUERY_KEYS = [
 /** Extract the actual command from the query, possibly up-converting if it's a legacy format */
 function extractCommand(command: WriteProtocolMessageType): Document {
   if (command instanceof OpMsgRequest) {
-    return deepCopy(command.command);
+    const cmd = deepCopy(command.command);
+    // For OP_MSG with payload type 1 we need to pull the documents
+    // array out of the document sequence for monitoring.
+    if (cmd.ops instanceof DocumentSequence) {
+      cmd.ops = cmd.ops.documents;
+    }
+    if (cmd.nsInfo instanceof DocumentSequence) {
+      cmd.nsInfo = cmd.nsInfo.documents;
+    }
+    return cmd;
   }
 
   if (command.query?.$query) {

package/src/cmap/commands.ts

@@ -544,10 +544,10 @@ export class OpMsgRequest {
     for (const [key, value] of Object.entries(document)) {
       if (value instanceof DocumentSequence) {
         // Document sequences starts with type 1 at the first byte.
-        const buffer = Buffer.allocUnsafe(1 + 4 + key.length);
+        const buffer = Buffer.allocUnsafe(1 + 4 + key.length + 1);
         buffer[0] = 1;
-        // Third part is the field name at offset 5.
-        encodeUTF8Into(buffer, key, 5);
+        // Third part is the field name at offset 5 with trailing null byte.
+        encodeUTF8Into(buffer, `${key}\0`, 5);
         chunks.push(buffer);
         // Fourth part are the documents' bytes.
         let docsLength = 0;
@@ -557,7 +557,7 @@ export class OpMsgRequest {
           chunks.push(docBson);
         }
         // Second part of the sequence is the length at offset 1;
-        buffer.writeInt32LE(key.length + docsLength, 1);
+        buffer.writeInt32LE(4 + key.length + 1 + docsLength, 1);
         // Why are we removing the field from the command? This is because it needs to be
         // removed in the OP_MSG request first section, and DocumentSequence is not a
         // BSON type and is specific to the MongoDB wire protocol so there's nothing

package/src/cmap/wire_protocol/responses.ts

@@ -329,3 +329,29 @@ export class ExplainedCursorResponse extends CursorResponse {
     return this.toObject(options);
   }
 }
+
+/**
+ * Client bulk writes have some extra metadata at the top level that needs to be
+ * included in the result returned to the user.
+ */
+export class ClientBulkWriteCursorResponse extends CursorResponse {
+  get insertedCount() {
+    return this.get('nInserted', BSONType.int, true);
+  }
+
+  get upsertedCount() {
+    return this.get('nUpserted', BSONType.int, true);
+  }
+
+  get matchedCount() {
+    return this.get('nMatched', BSONType.int, true);
+  }
+
+  get modifiedCount() {
+    return this.get('nModified', BSONType.int, true);
+  }
+
+  get deletedCount() {
+    return this.get('nDeleted', BSONType.int, true);
+  }
+}

package/src/cursor/client_bulk_write_cursor.ts

@@ -0,0 +1,73 @@
+import type { Document } from '../bson';
+import { type ClientBulkWriteCursorResponse } from '../cmap/wire_protocol/responses';
+import { MongoBulkWriteCursorError } from '../error';
+import type { MongoClient } from '../mongo_client';
+import { ClientBulkWriteOperation } from '../operations/client_bulk_write/client_bulk_write';
+import { type ClientBulkWriteOptions } from '../operations/client_bulk_write/common';
+import { executeOperation } from '../operations/execute_operation';
+import type { ClientSession } from '../sessions';
+import { mergeOptions, MongoDBNamespace } from '../utils';
+import {
+  AbstractCursor,
+  type AbstractCursorOptions,
+  type InitialCursorResponse
+} from './abstract_cursor';
+
+/** @public */
+export interface ClientBulkWriteCursorOptions
+  extends Omit<AbstractCursorOptions, 'maxAwaitTimeMS' | 'tailable' | 'awaitData'>,
+    ClientBulkWriteOptions {}
+
+/**
+ * This is the cursor that handles client bulk write operations. Note this is never
+ * exposed directly to the user and is always immediately exhausted.
+ * @internal
+ */
+export class ClientBulkWriteCursor extends AbstractCursor {
+  public readonly command: Document;
+  /** @internal */
+  private cursorResponse?: ClientBulkWriteCursorResponse;
+  /** @internal */
+  private clientBulkWriteOptions: ClientBulkWriteOptions;
+
+  /** @internal */
+  constructor(client: MongoClient, command: Document, options: ClientBulkWriteOptions = {}) {
+    super(client, new MongoDBNamespace('admin', '$cmd'), options);
+
+    this.command = command;
+    this.clientBulkWriteOptions = options;
+  }
+
+  /**
+   * We need a way to get the top level cursor response fields for
+   * generating the bulk write result, so we expose this here.
+   */
+  get response(): ClientBulkWriteCursorResponse {
+    if (this.cursorResponse) return this.cursorResponse;
+    throw new MongoBulkWriteCursorError(
+      'No client bulk write cursor response returned from the server.'
+    );
+  }
+
+  clone(): ClientBulkWriteCursor {
+    const clonedOptions = mergeOptions({}, this.clientBulkWriteOptions);
+    delete clonedOptions.session;
+    return new ClientBulkWriteCursor(this.client, this.command, {
+      ...clonedOptions
+    });
+  }
+
+  /** @internal */
+  async _initialize(session: ClientSession): Promise<InitialCursorResponse> {
+    const clientBulkWriteOperation = new ClientBulkWriteOperation(this.command, {
+      ...this.clientBulkWriteOptions,
+      ...this.cursorOptions,
+      session
+    });
+
+    const response = await executeOperation(this.client, clientBulkWriteOperation);
+    this.cursorResponse = response;
+
+    return { server: clientBulkWriteOperation.server, session, response };
+  }
+}

package/src/error.ts

@@ -616,6 +616,33 @@ export class MongoGCPError extends MongoOIDCError {
   }
 }
 
+/**
+ * An error indicating that an error occurred when processing bulk write results.
+ *
+ * @public
+ * @category Error
+ */
+export class MongoBulkWriteCursorError extends MongoRuntimeError {
+  /**
+   * **Do not use this constructor!**
+   *
+   * Meant for internal use only.
+   *
+   * @remarks
+   * This class is only meant to be constructed within the driver. This constructor is
+   * not subject to semantic versioning compatibility guarantees and may change at any time.
+   *
+   * @public
+   **/
+  constructor(message: string) {
+    super(message);
+  }
+
+  override get name(): string {
+    return 'MongoBulkWriteCursorError';
+  }
+}
+
 /**
  * An error generated when a ChangeStream operation fails to execute.
  *

package/src/index.ts

@@ -44,6 +44,7 @@ export {
   MongoAWSError,
   MongoAzureError,
   MongoBatchReExecutionError,
+  MongoBulkWriteCursorError,
   MongoChangeStreamError,
   MongoCompatibilityError,
   MongoCursorExhaustedError,
@@ -473,6 +474,21 @@ export type {
   AggregateOptions,
   DB_AGGREGATE_COLLECTION
 } from './operations/aggregate';
+export type {
+  AnyClientBulkWriteModel,
+  ClientBulkWriteOptions,
+  ClientBulkWriteResult,
+  ClientDeleteManyModel,
+  ClientDeleteOneModel,
+  ClientDeleteResult,
+  ClientInsertOneModel,
+  ClientInsertOneResult,
+  ClientReplaceOneModel,
+  ClientUpdateManyModel,
+  ClientUpdateOneModel,
+  ClientUpdateResult,
+  ClientWriteModel
+} from './operations/client_bulk_write/common';
 export type {
   CollationOptions,
   CommandOperation,

package/src/mongo_client.ts

@@ -30,6 +30,12 @@ import {
   SeverityLevel
 } from './mongo_logger';
 import { TypedEventEmitter } from './mongo_types';
+import {
+  type AnyClientBulkWriteModel,
+  type ClientBulkWriteOptions,
+  type ClientBulkWriteResult
+} from './operations/client_bulk_write/common';
+import { ClientBulkWriteExecutor } from './operations/client_bulk_write/executor';
 import { executeOperation } from './operations/execute_operation';
 import { RunAdminCommandOperation } from './operations/run_command';
 import type { ReadConcern, ReadConcernLevel, ReadConcernLike } from './read_concern';
@@ -477,6 +483,19 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
     return this.s.bsonOptions;
   }
 
+  /**
+   * Executes a client bulk write operation, available on server 8.0+.
+   * @param models - The client bulk write models.
+   * @param options - The client bulk write options.
+   * @returns A ClientBulkWriteResult for acknowledged writes and ok: 1 for unacknowledged writes.
+   */
+  async bulkWrite(
+    models: AnyClientBulkWriteModel[],
+    options?: ClientBulkWriteOptions
+  ): Promise<ClientBulkWriteResult | { ok: 1 }> {
+    return await new ClientBulkWriteExecutor(this, models, options).execute();
+  }
+
   /**
    * Connect to MongoDB using a url
    *

package/src/operations/client_bulk_write/client_bulk_write.ts

@@ -0,0 +1,45 @@
+import { type Document } from 'bson';
+
+import { ClientBulkWriteCursorResponse } from '../../cmap/wire_protocol/responses';
+import type { Server } from '../../sdam/server';
+import type { ClientSession } from '../../sessions';
+import { MongoDBNamespace } from '../../utils';
+import { CommandOperation } from '../command';
+import { Aspect, defineAspects } from '../operation';
+import { type ClientBulkWriteOptions } from './common';
+
+/**
+ * Executes a single client bulk write operation within a potential batch.
+ * @internal
+ */
+export class ClientBulkWriteOperation extends CommandOperation<ClientBulkWriteCursorResponse> {
+  command: Document;
+  override options: ClientBulkWriteOptions;
+
+  override get commandName() {
+    return 'bulkWrite' as const;
+  }
+
+  constructor(command: Document, options: ClientBulkWriteOptions) {
+    super(undefined, options);
+    this.command = command;
+    this.options = options;
+    this.ns = new MongoDBNamespace('admin', '$cmd');
+  }
+
+  /**
+   * Execute the command. Superclass will handle write concern, etc.
+   * @param server - The server.
+   * @param session - The session.
+   * @returns The response.
+   */
+  override async execute(
+    server: Server,
+    session: ClientSession | undefined
+  ): Promise<ClientBulkWriteCursorResponse> {
+    return await super.executeCommand(server, session, this.command, ClientBulkWriteCursorResponse);
+  }
+}
+
+// Skipping the collation as it goes on the individual ops.
+defineAspects(ClientBulkWriteOperation, [Aspect.WRITE_OPERATION, Aspect.SKIP_COLLATION]);