fix: utf

Author: nbbeeken

src/cmap/commands.ts

@@ -37,7 +37,6 @@ export type WriteProtocolMessageType = OpQueryRequest | OpMsgRequest;
 export interface OpQueryOptions extends CommandOptions {
   socketTimeoutMS?: number;
   session?: ClientSession;
-  documentsReturnedIn?: string;
   numberToSkip?: number;
   numberToReturn?: number;
   returnFieldSelector?: Document;
@@ -280,17 +279,12 @@ export interface MessageHeader {
   fromCompressed?: boolean;
 }
 
-/** @internal */
-export interface OpResponseOptions extends BSONSerializeOptions {
-  documentsReturnedIn?: string | null;
-}
-
 /** @internal */
 export class OpReply {
   parsed: boolean;
   raw: Buffer;
   data: Buffer;
-  opts: OpResponseOptions;
+  opts: BSONSerializeOptions;
   length: number;
   requestId: number;
   responseTo: number;
@@ -319,7 +313,7 @@ export class OpReply {
     message: Buffer,
     msgHeader: MessageHeader,
     msgBody: Buffer,
-    opts?: OpResponseOptions
+    opts?: BSONSerializeOptions
   ) {
     this.parsed = false;
     this.raw = message;
@@ -526,7 +520,7 @@ export class OpMsgResponse {
   parsed: boolean;
   raw: Buffer;
   data: Buffer;
-  opts: OpResponseOptions;
+  opts: BSONSerializeOptions;
   length: number;
   requestId: number;
   responseTo: number;
@@ -549,7 +543,7 @@ export class OpMsgResponse {
     message: Buffer,
     msgHeader: MessageHeader,
     msgBody: Buffer,
-    opts?: OpResponseOptions
+    opts?: BSONSerializeOptions
   ) {
     this.parsed = false;
     this.raw = message;

src/cmap/wire_protocol/responses.ts

@@ -81,19 +81,20 @@ export class MongoDBResponse extends OnDemandDocument {
 
   /** TODO improve the special case of enableUtf8Validation for writeErrors */
   public override toObject(options: BSONSerializeOptions = {}): Record<string, any> {
-    function parseBsonSerializationOptions({ enableUtf8Validation }: BSONSerializeOptions): {
-      utf8: { writeErrors: false } | false;
-    } {
-      if (enableUtf8Validation === false) {
-        return { utf8: false };
-      }
-
-      return { utf8: { writeErrors: false } };
-    }
     const optionsWithValidation = {
       ...options,
-      validation: parseBsonSerializationOptions(options)
+      validation: this.parseBsonSerializationOptions(options)
     };
     return super.toObject(optionsWithValidation);
   }
+
+  private parseBsonSerializationOptions({ enableUtf8Validation }: BSONSerializeOptions): {
+    utf8: { writeErrors: false } | false;
+  } {
+    if (enableUtf8Validation === false) {
+      return { utf8: false };
+    }
+
+    return { utf8: { writeErrors: false } };
+  }
 }

test/integration/node-specific/bson-options/raw.test.ts

@@ -7,7 +7,7 @@ import {
   ObjectId
 } from '../../../mongodb';
 
-describe.skip('raw bson support', () => {
+describe.only('raw bson support', () => {
   // TODO: Fix raw option
   describe('raw', () => {
     describe('option inheritance', () => {

test/integration/node-specific/bson-options/utf8_validation.test.ts

@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { OpMsgResponse } from '../../../mongodb';
+import { MongoDBResponse } from '../../../mongodb';
 
 const EXPECTED_VALIDATION_DISABLED_ARGUMENT = {
   utf8: false
@@ -13,11 +13,11 @@ const EXPECTED_VALIDATION_ENABLED_ARGUMENT = {
   }
 };
 
-describe('class OpMsgResponse', () => {
+describe('class MongoDBResponse', () => {
   let bsonSpy: sinon.SinonSpy;
 
   beforeEach(() => {
-    bsonSpy = sinon.spy(OpMsgResponse.prototype, 'parseBsonSerializationOptions');
+    bsonSpy = sinon.spy(MongoDBResponse.prototype, 'parseBsonSerializationOptions');
   });
 
   afterEach(() => {