chore: move responses

Author: durran

src/cmap/wire_protocol/responses.ts

@@ -391,15 +391,3 @@ export class ClientBulkWriteCursorResponse extends CursorResponse {
     return this.get('writeConcernError', BSONType.object, false);
   }
 }
-
-export class ProfilingLevelResponse extends MongoDBResponse {
-  get was() {
-    return this.get('was', BSONType.int, true);
-  }
-}
-
-export class DistinctResponse extends MongoDBResponse {
-  get values() {
-    return this.get('values', BSONType.array, true);
-  }
-}

src/collection.ts

@@ -868,27 +868,31 @@ export class Collection<TSchema extends Document = Document> {
    */
   distinct<Key extends keyof WithId<TSchema>>(
     key: Key
-  ): Promise<Array<Flatten<WithId<TSchema>[Key]>>>;
+  ): Promise<Array<Flatten<WithId<TSchema>[Key]>> | Document>;
   distinct<Key extends keyof WithId<TSchema>>(
     key: Key,
     filter: Filter<TSchema>
-  ): Promise<Array<Flatten<WithId<TSchema>[Key]>>>;
+  ): Promise<Array<Flatten<WithId<TSchema>[Key]>> | Document>;
   distinct<Key extends keyof WithId<TSchema>>(
     key: Key,
     filter: Filter<TSchema>,
     options: DistinctOptions
-  ): Promise<Array<Flatten<WithId<TSchema>[Key]>>>;
+  ): Promise<Array<Flatten<WithId<TSchema>[Key]>> | Document>;
 
   // Embedded documents overload
-  distinct(key: string): Promise<any[]>;
-  distinct(key: string, filter: Filter<TSchema>): Promise<any[]>;
-  distinct(key: string, filter: Filter<TSchema>, options: DistinctOptions): Promise<any[]>;
+  distinct(key: string): Promise<any[] | Document>;
+  distinct(key: string, filter: Filter<TSchema>): Promise<any[] | Document>;
+  distinct(
+    key: string,
+    filter: Filter<TSchema>,
+    options: DistinctOptions
+  ): Promise<any[] | Document>;
 
   async distinct<Key extends keyof WithId<TSchema>>(
     key: Key,
     filter: Filter<TSchema> = {},
     options: DistinctOptions = {}
-  ): Promise<any[]> {
+  ): Promise<any[] | Document> {
     return await executeOperation(
       this.client,
       new DistinctOperation(

src/operations/distinct.ts

@@ -1,6 +1,6 @@
-import type { Document } from '../bson';
+import { BSONType, type Document, parseUtf8ValidationOption } from '../bson';
 import { type Connection } from '../cmap/connection';
-import { DistinctResponse } from '../cmap/wire_protocol/responses';
+import { MongoDBResponse } from '../cmap/wire_protocol/responses';
 import type { Collection } from '../collection';
 import { type CommandOperationOptions, ModernizedCommandOperation } from './command';
 import { Aspect, defineAspects } from './operation';
@@ -21,11 +21,17 @@ export type DistinctOptions = CommandOperationOptions & {
   hint?: Document | string;
 };
 
+class DistinctResponse extends MongoDBResponse {
+  get values() {
+    return this.get('values', BSONType.array, true);
+  }
+}
+
 /**
  * Return a list of distinct values for the given key across a collection.
  * @internal
  */
-export class DistinctOperation extends ModernizedCommandOperation<any[]> {
+export class DistinctOperation extends ModernizedCommandOperation<any[] | Document> {
   override SERVER_COMMAND_RESPONSE_TYPE = DistinctResponse;
   override options: DistinctOptions;
   collection: Collection;
@@ -63,8 +69,17 @@ export class DistinctOperation extends ModernizedCommandOperation<any[]> {
     };
   }
 
-  override handleOk(response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>): any[] {
-    this.explain ? response.toObject() : response.values;
+  override handleOk(
+    response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>
+  ): any[] | Document {
+    if (this.explain) {
+      return response.toObject(this.bsonOptions);
+    }
+    const values = response.values.toObject({
+      ...this.bsonOptions,
+      validation: parseUtf8ValidationOption(this.bsonOptions)
+    });
+    return Object.entries(values).map(([_key, val]) => val);
   }
 }
 

src/operations/profiling_level.ts

@@ -1,13 +1,19 @@
-import { type Document } from '../bson';
+import { BSONType, type Document } from '../bson';
 import { type Connection } from '../cmap/connection';
-import { ProfilingLevelResponse } from '../cmap/wire_protocol/responses';
+import { MongoDBResponse } from '../cmap/wire_protocol/responses';
 import type { Db } from '../db';
 import { MongoUnexpectedServerResponseError } from '../error';
 import { type CommandOperationOptions, ModernizedCommandOperation } from './command';
 
 /** @public */
 export type ProfilingLevelOptions = CommandOperationOptions;
 
+class ProfilingLevelResponse extends MongoDBResponse {
+  get was() {
+    return this.get('was', BSONType.int, true);
+  }
+}
+
 /** @internal */
 export class ProfilingLevelOperation extends ModernizedCommandOperation<string> {
   override SERVER_COMMAND_RESPONSE_TYPE = ProfilingLevelResponse;