respond to comments

Author: HanaPearlman

src/collection.ts

@@ -1309,13 +1309,11 @@ export class Collection implements OperationParent {
 
   /** Initiate an Out of order batch write operation. All operations will be buffered into insert/update/remove commands executed out of order. */
   initializeUnorderedBulkOp(options?: BulkWriteOptions): any {
-    options = options || {};
     return new UnorderedBulkOperation(this, options ?? {});
   }
 
   /** Initiate an In order bulk write operation. Operations will be serially executed in the order they are added, creating a new operation for each switch in types. */
   initializeOrderedBulkOp(options?: BulkWriteOptions): any {
-    options = options || {};
     return new OrderedBulkOperation(this, options ?? {});
   }
 

src/db.ts

@@ -284,7 +284,7 @@ export class Db implements OperationParent {
     // Intentionally, we do not inherit options from parent for this operation.
     return executeOperation(
       getTopology(this),
-      new RunCommandOperation(this, command, options || {}),
+      new RunCommandOperation(this, command, options ?? {}),
       callback
     );
   }
@@ -567,7 +567,7 @@ export class Db implements OperationParent {
     // Intentionally, we do not inherit options from parent for this operation.
     return executeOperation(
       getTopology(this),
-      new RunAdminCommandOperation(this, command, options || {}),
+      new RunAdminCommandOperation(this, command, options ?? {}),
       callback
     );
   }

src/operations/command.ts

@@ -73,10 +73,9 @@ export abstract class CommandOperation<
         : new MongoDBNamespace('admin', '$cmd');
     }
 
-    const readPref = ReadPreference.fromOptions(options) ?? ReadPreference.primary;
     this.readPreference = this.hasAspect(Aspect.WRITE_OPERATION)
       ? ReadPreference.primary
-      : readPref;
+      : ReadPreference.fromOptions(options) ?? ReadPreference.primary;
     this.readConcern = ReadConcern.fromOptions(options);
     this.writeConcern = WriteConcern.fromOptions(options);
     this.bsonOptions = resolveBSONOptions(options);

src/utils.ts

@@ -14,7 +14,7 @@ import { ReadConcern } from './read_concern';
 import type { Connection } from './cmap/connection';
 import { readFileSync } from 'fs';
 import { resolve } from 'path';
-import { Document, resolveBSONOptions } from './bson';
+import { BSONSerializeOptions, Document, resolveBSONOptions } from './bson';
 import type { IndexSpecification, IndexDirection } from './operations/indexes';
 import type { MongoClient } from './mongo_client';
 import type { Cursor } from './cursor/cursor';
@@ -1091,10 +1091,10 @@ export function resolveOptions<T extends CommandOperationOptions>(
   parent: OperationParent | undefined,
   options?: T
 ): T {
-  const result: T = Object.assign({}, options);
-  const session = options?.session;
+  const result: T = Object.assign({}, options, resolveBSONOptions(options, parent));
 
   // Users cannot pass a readConcern/writeConcern to operations in a transaction
+  const session = options?.session;
   if (!session?.inTransaction()) {
     const readConcern = ReadConcern.fromOptions(options) ?? parent?.readConcern;
     if (readConcern) {
@@ -1112,7 +1112,5 @@ export function resolveOptions<T extends CommandOperationOptions>(
     result.readPreference = readPreference;
   }
 
-  const bsonOptions = resolveBSONOptions(result, parent);
-
-  return { ...result, ...bsonOptions };
+  return result;
 }