clean up

Author: HanaPearlman

src/collection.ts

@@ -567,8 +567,7 @@ export class Collection implements OperationParent {
     if (typeof options === 'function') (callback = options), (options = {});
 
     // Intentionally, we do not inherit options from parent for this operation.
-    options = options || {};
-    options.readPreference = ReadPreference.PRIMARY;
+    options = Object.assign({}, options, { readPreference: ReadPreference.PRIMARY });
     return executeOperation(
       getTopology(this),
       new RenameOperation(this, newName, options),
@@ -1317,7 +1316,7 @@ export class Collection implements OperationParent {
   /** 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 options.
+    // Give function's options precedence over session's options.
     if (options.ignoreUndefined == null) {
       options.ignoreUndefined = this.bsonOptions.ignoreUndefined;
     }

src/db.ts

@@ -459,8 +459,7 @@ export class Db implements OperationParent {
     if (typeof options === 'function') (callback = options), (options = {});
 
     // Intentionally, we do not inherit options from parent for this operation.
-    options = options || {};
-    options.readPreference = ReadPreference.PRIMARY;
+    options = Object.assign({}, options, { readPreference: ReadPreference.PRIMARY });
 
     // Add return new collection
     options.new_collection = true;

src/read_preference.ts

@@ -163,36 +163,6 @@ export class ReadPreference {
     return readPreference as ReadPreference;
   }
 
-  // /**
-  //  * Resolves a read preference based on well-defined inheritance rules. This method will not only
-  //  * determine the read preference (if there is one), but will also ensure the returned value is a
-  //  * properly constructed instance of `ReadPreference`.
-  //  *
-  //  * @param parent - The parent of the operation on which to determine the read preference, used for determining the inherited read preference.
-  //  * @param options - The options passed into the method, potentially containing a read preference
-  //  */
-  // static resolve(parent?: OperationParent, options?: ReadPreferenceFromOptions): ReadPreference {
-  //   options = options || {};
-  //   const session = options.session;
-
-  //   const inheritedReadPreference = parent?.readPreference;
-
-  //   let readPreference: ReadPreference = ReadPreference.primary;
-  //   if (options.readPreference) {
-  //     const readPrefFromOptions = ReadPreference.fromOptions(options);
-  //     readPreference = readPrefFromOptions ? readPrefFromOptions : readPreference;
-  //   } else if (session && session.inTransaction() && session.transaction.options.readPreference) {
-  //     // The transaction’s read preference MUST override all other user configurable read preferences.
-  //     readPreference = session.transaction.options.readPreference;
-  //   } else if (inheritedReadPreference != null) {
-  //     readPreference = inheritedReadPreference;
-  //   }
-
-  //   return typeof readPreference === 'string'
-  //     ? new ReadPreference(readPreference as ReadPreferenceMode)
-  //     : readPreference;
-  // }
-
   /**
    * Replaces options.readPreference with a ReadPreference instance
    */

src/utils.ts

@@ -215,45 +215,6 @@ export function filterOptions(options: AnyOptions, names: string[]): AnyOptions
   return filterOptions;
 }
 
-// /** @internal */
-// export function mergeOptionsAndWriteConcern(
-//   targetOptions: AnyOptions,
-//   sourceOptions: AnyOptions,
-//   keys: string[]
-// ): AnyOptions {
-//   // Mix in any allowed options
-//   for (let i = 0; i < keys.length; i++) {
-//     if (targetOptions[keys[i]] === undefined && sourceOptions[keys[i]] !== undefined) {
-//       targetOptions[keys[i]] = sourceOptions[keys[i]];
-//     }
-//   }
-
-//   // todo could do this with an object.assign and then pluck the keys, except this doesn't work w mergeWriteconcern
-//   // but we always set that to true so we're good!
-
-//   // Found no write Concern options
-//   let found = false;
-//   for (let i = 0; i < writeConcernKeys.length; i++) {
-//     if (targetOptions[writeConcernKeys[i]]) {
-//       found = true;
-//       break;
-//     }
-//   }
-
-//   // merge write concern keys iff none are found
-//   if (!found) {
-//     for (let i = 0; i < writeConcernKeys.length; i++) {
-//       if (sourceOptions[writeConcernKeys[i]]) {
-//         targetOptions[writeConcernKeys[i]] = sourceOptions[writeConcernKeys[i]];
-//       }
-//     }
-//   }
-
-//   results = resolveInheritedOptions(this, options);
-
-//   return targetOptions;
-// }
-
 /**
  * Executes the given operation with provided arguments.
  *