include serialize fns and fields as raw in bson opts

Author: HanaPearlman

src/bson.ts

@@ -78,12 +78,13 @@ export function inheritOrDefaultBSONSerializableOptions(
 ): BSONSerializeOptions {
   // Merge the BSONSerializeOptions, preferring options over parentOptions, and substituting a
   // default for values not set.
-  // Note that we exclude fieldsAsRaw and serializeFunctions because I was not sure about their usage //TODO: serialize functions?
   return {
     raw: options?.raw ?? parentOptions?.raw ?? false,
     promoteLongs: options?.promoteLongs ?? parentOptions?.promoteLongs ?? true,
     promoteValues: options?.promoteValues ?? parentOptions?.promoteValues ?? true,
     promoteBuffers: options?.promoteBuffers ?? parentOptions?.promoteBuffers ?? false,
-    ignoreUndefined: options?.ignoreUndefined ?? parentOptions?.ignoreUndefined ?? false
+    ignoreUndefined: options?.ignoreUndefined ?? parentOptions?.ignoreUndefined ?? false,
+    serializeFunctions: options?.serializeFunctions ?? parentOptions?.serializeFunctions ?? false,
+    fieldsAsRaw: options?.fieldsAsRaw ?? parentOptions?.fieldsAsRaw ?? {}
   };
 }

src/operations/bulk_write.ts

@@ -33,7 +33,7 @@ export class BulkWriteOperation extends OperationBase<BulkWriteOptions, BulkWrit
   execute(server: Server, callback: Callback<BulkWriteResult>): void {
     const coll = this.collection;
     const operations = this.operations;
-    const options = this.options;
+    const options = Object.assign({}, this.options, this.bsonOptions);
 
     // Create the bulk operation
     const bulk: BulkOperationBase =
@@ -51,7 +51,7 @@ export class BulkWriteOperation extends OperationBase<BulkWriteOptions, BulkWrit
     }
 
     // Final options for retryable writes and write concern
-    let finalOptions = Object.assign({}, options, this.bsonOptions);
+    let finalOptions = Object.assign({}, options);
     finalOptions = applyRetryableWrites(finalOptions, coll.s.db);
     finalOptions = applyWriteConcern(finalOptions, { db: coll.s.db, collection: coll }, options);
 

src/operations/find_and_modify.ts

@@ -105,10 +105,6 @@ export class FindAndModifyOperation extends CommandOperation<FindAndModifyOption
       cmd.maxTimeMS = options.maxTimeMS;
     }
 
-    // Either use override on the function, or go back to default on either the collection
-    // level or db
-    options.serializeFunctions = options.serializeFunctions || coll.s.serializeFunctions;
-
     // No check on the documents
     options.checkKeys = false;
 

src/operations/insert_many.ts

@@ -46,9 +46,6 @@ export class InsertManyOperation extends OperationBase<BulkWriteOptions, InsertM
       );
     }
 
-    // If keep going set unordered
-    options['serializeFunctions'] = options['serializeFunctions'] || coll.s.serializeFunctions;
-
     docs = prepareDocs(coll, docs, options);
 
     // Generate the bulk write operations

src/operations/operation.ts

@@ -46,11 +46,11 @@ export abstract class OperationBase<
   fullResponse?: boolean;
 
   // BSON serialization options
-  // fieldsAsRaw?: { [key: string]: boolean };
+  fieldsAsRaw?: { [key: string]: boolean };
   promoteValues?: boolean;
   promoteBuffers?: boolean;
   promoteLongs?: boolean;
-  // serializeFunctions?: boolean;
+  serializeFunctions?: boolean;
   ignoreUndefined?: boolean;
   raw?: boolean;
 
@@ -60,14 +60,15 @@ export abstract class OperationBase<
   }
 
   // BSON serialization options
-  // Have omitted fieldsAsRaw and serializeFunctions because I am not sure if we want those used...
   get bsonOptions(): BSONSerializeOptions {
     const bsonOptions: Document = {
       promoteBuffers: this.promoteBuffers,
       promoteValues: this.promoteValues,
       promoteLongs: this.promoteLongs,
       raw: this.raw,
-      ignoreUndefined: this.ignoreUndefined
+      ignoreUndefined: this.ignoreUndefined,
+      serializeFunctions: this.serializeFunctions,
+      fieldsAsRaw: this.fieldsAsRaw
     };
     return bsonOptions;
   }