clean up

Author: HanaPearlman

src/collection.ts

@@ -312,7 +312,7 @@ export class Collection implements OperationParent {
     callback?: Callback<InsertManyResult>
   ): Promise<InsertManyResult> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = options || {};
+    options = options ? Object.assign({}, options) : { ordered: true };
 
     return executeOperation(
       getTopology(this),
@@ -1305,22 +1305,12 @@ 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 || {};
-    // Give function's options precedence over session options.
-    if (options.ignoreUndefined == null) {
-      options.ignoreUndefined = this.bsonOptions.ignoreUndefined;
-    }
-
     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 || {};
-    // Give function's options precedence over session's options.
-    if (options.ignoreUndefined == null) {
-      options.ignoreUndefined = this.bsonOptions.ignoreUndefined;
-    }
-
     return new OrderedBulkOperation(this, options ?? {});
   }
 

src/utils.ts

@@ -1082,57 +1082,34 @@ export function hasAtomicOperators(doc: Document | Document[]): boolean {
   return keys.length > 0 && keys[0][0] === '$';
 }
 
-function resolveWriteConcern(
-  parent: OperationParent | undefined,
-  options: any
-): WriteConcern | undefined {
-  const session = options.session;
-  if (session && session.inTransaction()) {
-    // Users cannot pass a writeConcern to operations in a transaction
-    return;
-  }
-  return WriteConcern.fromOptions(options) || parent?.writeConcern;
-}
-
-function resolveReadConcern(
-  parent: OperationParent | undefined,
-  options: any
-): ReadConcern | undefined {
-  const session = options.session;
-  if (session && session.inTransaction()) {
-    // Users cannot pass a readConcern to operations in a transaction
-    return;
-  }
-  return ReadConcern.fromOptions(options) || parent?.readConcern;
-}
-
-function resolveReadPreference(
-  parent: OperationParent | undefined,
-  options: any
-): ReadPreference | undefined {
-  return ReadPreference.fromOptions(options) ?? parent?.readPreference;
-}
-
-/** @internal Prioritizes options from transaction, then from options, then from parent */
+/**
+ * Merge inherited properties from parent into options, prioritizing values from options,
+ * then values from parent.
+ * @internal
+ */
 export function resolveInheritedOptions<T extends CommandOperationOptions>(
   parent: OperationParent | undefined,
   options?: T
 ): T {
   const result: T = Object.assign({}, options);
+  const session = options?.session;
 
-  const readPreference = resolveReadPreference(parent, result);
-  if (readPreference) {
-    result.readPreference = readPreference;
-  }
+  // Users cannot pass a readConcern/writeConcern to operations in a transaction
+  if (!session?.inTransaction()) {
+    const readConcern = ReadConcern.fromOptions(options) ?? parent?.readConcern;
+    if (readConcern) {
+      result.readConcern = readConcern;
+    }
 
-  const readConcern = resolveReadConcern(parent, result);
-  if (readConcern) {
-    result.readConcern = readConcern;
+    const writeConcern = WriteConcern.fromOptions(options) ?? parent?.writeConcern;
+    if (writeConcern) {
+      result.writeConcern = writeConcern;
+    }
   }
 
-  const writeConcern = resolveWriteConcern(parent, result);
-  if (writeConcern) {
-    result.writeConcern = writeConcern;
+  const readPreference = ReadPreference.fromOptions(options) ?? parent?.readPreference;
+  if (readPreference) {
+    result.readPreference = readPreference;
   }
 
   const bsonOptions = resolveBSONOptions(result, parent);