Merge branch 'main' into NODE-6060/fire-and-forget

Author: aditi-khare-mongoDB

.github/workflows/build_docs.yml

@@ -2,7 +2,7 @@ name: Build and commit docs
 
 on:
   push:
-    branches: [main]
+    branches: ['main']
 
 permissions:
   contents: write

.github/workflows/release-5.x.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [5.x]
+    branches: ['5.x']
   workflow_dispatch: {}
 
 permissions:
@@ -19,7 +19,7 @@ jobs:
       - id: release
         uses: googleapis/release-please-action@v4
         with:
-          target-branch: 5.x
+          target-branch: '5.x'
 
   build:
     needs: [release_please]
@@ -75,7 +75,7 @@ jobs:
         with:
           release_version: ${{ env.package_version }}
           product_name: mongodb
-          sarif_report_target_ref: 5.x
+          sarif_report_target_ref: '5.x'
           third_party_dependency_tool: n/a
           dist_filenames: artifacts/*
           token: ${{ github.token }}

.github/workflows/release-6.8.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [6.8]
+    branches: ['6.8']
   workflow_dispatch: {}
 
 permissions:
@@ -19,11 +19,11 @@ jobs:
       - id: release
         uses: googleapis/release-please-action@v4
         with:
-          target-branch: 6.8
+          target-branch: '6.8'
 
   build:
     needs: [release_please]
-    name: "Perform any build or bundling steps, as necessary."
+    name: 'Perform any build or bundling steps, as necessary.'
     uses: ./.github/workflows/build.yml
 
   ssdlc:
@@ -75,7 +75,7 @@ jobs:
         with:
           release_version: ${{ env.package_version }}
           product_name: mongodb
-          sarif_report_target_ref: 6.8
+          sarif_report_target_ref: '6.8'
           third_party_dependency_tool: n/a
           dist_filenames: artifacts/*
           token: ${{ github.token }}

.github/workflows/release.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [main]
+    branches: ['main']
   workflow_dispatch: {}
 
 permissions:
@@ -19,7 +19,7 @@ jobs:
       - id: release
         uses: googleapis/release-please-action@v4
         with:
-          target-branch: main
+          target-branch: 'main'
 
   build:
     needs: [release_please]
@@ -75,7 +75,7 @@ jobs:
         with:
           release_version: ${{ env.package_version }}
           product_name: mongodb
-          sarif_report_target_ref: main
+          sarif_report_target_ref: 'main'
           third_party_dependency_tool: n/a
           dist_filenames: artifacts/*
           token: ${{ github.token }}

src/client-side-encryption/client_encryption.ts

@@ -611,8 +611,6 @@ export class ClientEncryption {
    *
    * Only supported when queryType is "range" and algorithm is "Range".
    *
-   * @experimental The Range algorithm is experimental only. It is not intended for production use. It is subject to breaking changes.
-   *
    * @param expression - a BSON document of one of the following forms:
    *  1. A Match Expression of this form:
    *      `{$and: [{<field>: {$gt: <value1>}}, {<field>: {$lt: <value2> }}]}`
@@ -769,13 +767,11 @@ export interface ClientEncryptionEncryptOptions {
   contentionFactor?: bigint | number;
 
   /**
-   * The query type supported.  Only the queryType `equality` is stable.
-   *
-   * @experimental Public Technical Preview: The queryType `rangePreview` is experimental.
+   * The query type.
    */
   queryType?: 'equality' | 'range';
 
-  /** @experimental Public Technical Preview: The index options for a Queryable Encryption field supporting "rangePreview" queries.*/
+  /** The index options for a Queryable Encryption field supporting "range" queries.*/
   rangeOptions?: RangeOptions;
 }
 
@@ -963,7 +959,7 @@ export interface ClientEncryptionRewrapManyDataKeyResult {
 
 /**
  * @public
- * RangeOptions specifies index options for a Queryable Encryption field supporting "rangePreview" queries.
+ * RangeOptions specifies index options for a Queryable Encryption field supporting "range" queries.
  * min, max, sparsity, trimFactor and range must match the values set in the encryptedFields of the destination collection.
  * For double and decimal128, min/max/precision must all be set, or all be unset.
  */

src/cmap/wire_protocol/on_demand/document.ts

@@ -1,15 +1,16 @@
 import {
   Binary,
-  BSON,
   type BSONElement,
   BSONError,
   type BSONSerializeOptions,
   BSONType,
+  deserialize,
   getBigInt64LE,
   getFloat64LE,
   getInt32LE,
   ObjectId,
   parseToElementsToArray,
+  pluckBSONSerializeOptions,
   Timestamp,
   toUTF8
 } from '../../../bson';
@@ -330,11 +331,23 @@ export class OnDemandDocument {
    * @param options - BSON deserialization options
    */
   public toObject(options?: BSONSerializeOptions): Record<string, any> {
-    return BSON.deserialize(this.bson, {
-      ...options,
+    const exactBSONOptions = {
+      ...pluckBSONSerializeOptions(options ?? {}),
+      validation: this.parseBsonSerializationOptions(options),
       index: this.offset,
       allowObjectSmallerThanBufferSize: true
-    });
+    };
+    return deserialize(this.bson, exactBSONOptions);
+  }
+
+  private parseBsonSerializationOptions(options?: { enableUtf8Validation?: boolean }): {
+    utf8: { writeErrors: false } | false;
+  } {
+    const enableUtf8Validation = options?.enableUtf8Validation;
+    if (enableUtf8Validation === false) {
+      return { utf8: false };
+    }
+    return { utf8: { writeErrors: false } };
   }
 
   /** Returns this document's bytes only */

src/cmap/wire_protocol/responses.ts

@@ -5,7 +5,6 @@ import {
   type Document,
   Long,
   parseToElementsToArray,
-  pluckBSONSerializeOptions,
   type Timestamp
 } from '../../bson';
 import { MongoUnexpectedServerResponseError } from '../../error';
@@ -166,24 +165,6 @@ export class MongoDBResponse extends OnDemandDocument {
     }
     return this.clusterTime ?? null;
   }
-
-  public override toObject(options?: BSONSerializeOptions): Record<string, any> {
-    const exactBSONOptions = {
-      ...pluckBSONSerializeOptions(options ?? {}),
-      validation: this.parseBsonSerializationOptions(options)
-    };
-    return super.toObject(exactBSONOptions);
-  }
-
-  private parseBsonSerializationOptions(options?: { enableUtf8Validation?: boolean }): {
-    utf8: { writeErrors: false } | false;
-  } {
-    const enableUtf8Validation = options?.enableUtf8Validation;
-    if (enableUtf8Validation === false) {
-      return { utf8: false };
-    }
-    return { utf8: { writeErrors: false } };
-  }
 }
 
 /** @internal */