store bson options in single property

Author: HanaPearlman

src/operations/bulk_write.ts

@@ -27,7 +27,7 @@ export class BulkWriteOperation extends OperationBase<BulkWriteOptions, BulkWrit
     this.operations = operations;
 
     // Assign BSON serialize options to OperationBase, preferring options over collection options
-    Object.assign(this, inheritBSONOptions(options, collection.s.options, true));
+    this.bsonOptions = inheritBSONOptions(options, collection.s.options, true);
   }
 
   execute(server: Server, callback: Callback<BulkWriteResult>): void {

src/operations/command.ts

@@ -95,7 +95,7 @@ export abstract class CommandOperation<
     }
 
     // Assign BSON serialize options to OperationBase, preferring options over parent options.
-    Object.assign(this, inheritBSONOptions(options, parent?.s.options, true));
+    this.bsonOptions = inheritBSONOptions(options, parent?.s.options, true);
   }
 
   abstract execute(server: Server, callback: Callback<TResult>): void;

src/operations/find_one.ts

@@ -18,7 +18,7 @@ export class FindOneOperation extends OperationBase<FindOptions, Document> {
     this.query = query;
 
     // Assign BSON serialize options to OperationBase, preferring options over collection options
-    Object.assign(this, inheritBSONOptions(options, collection.s.options, true));
+    this.bsonOptions = inheritBSONOptions(options, collection.s.options, true);
   }
 
   execute(server: Server, callback: Callback<Document>): void {

src/operations/insert_many.ts

@@ -32,7 +32,7 @@ export class InsertManyOperation extends OperationBase<BulkWriteOptions, InsertM
     this.docs = docs;
 
     // Assign BSON serialize options to OperationBase, preferring options over collection options
-    Object.assign(this, inheritBSONOptions(options, collection.s.options, true));
+    this.bsonOptions = inheritBSONOptions(options, collection.s.options, true);
   }
 
   execute(server: Server, callback: Callback<InsertManyResult>): void {

src/operations/operation.ts

@@ -46,33 +46,13 @@ export abstract class OperationBase<
   fullResponse?: boolean;
 
   // BSON serialization options
-  fieldsAsRaw?: { [key: string]: boolean };
-  promoteValues?: boolean;
-  promoteBuffers?: boolean;
-  promoteLongs?: boolean;
-  serializeFunctions?: boolean;
-  ignoreUndefined?: boolean;
-  raw?: boolean;
+  bsonOptions?: BSONSerializeOptions;
 
   constructor(options: T = {} as T) {
     this.options = Object.assign({}, options);
     this.readPreference = ReadPreference.primary;
   }
 
-  // BSON serialization options
-  get bsonOptions(): BSONSerializeOptions {
-    const bsonOptions: Document = {
-      promoteBuffers: this.promoteBuffers,
-      promoteValues: this.promoteValues,
-      promoteLongs: this.promoteLongs,
-      raw: this.raw,
-      ignoreUndefined: this.ignoreUndefined,
-      serializeFunctions: this.serializeFunctions,
-      fieldsAsRaw: this.fieldsAsRaw
-    };
-    return bsonOptions;
-  }
-
   abstract execute(server: Server, callback: Callback<TResult>): void;
 
   hasAspect(aspect: symbol): boolean {