handle NO_INHERIT_OPTIONS

Author: HanaPearlman

src/collection.ts

@@ -565,7 +565,9 @@ export class Collection implements OperationParent {
     callback?: Callback<Collection>
   ): Promise<Collection> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = resolveInheritedOptions(this, options);
+
+    // Intentionally, we do not inherit options from parent for this operation.
+    options = options || {};
     options.readPreference = ReadPreference.PRIMARY;
     return executeOperation(
       getTopology(this),

src/db.ts

@@ -281,7 +281,9 @@ export class Db implements OperationParent {
     callback?: Callback<Document>
   ): Promise<Document> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = resolveInheritedOptions(this, options);
+
+    // Intentionally, we do not inherit options from parent for this operation.
+    options = options || {};
 
     return executeOperation(
       getTopology(this),
@@ -455,7 +457,9 @@ export class Db implements OperationParent {
     callback?: Callback<Collection>
   ): Promise<Collection> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = resolveInheritedOptions(this, options);
+
+    // Intentionally, we do not inherit options from parent for this operation.
+    options = options || {};
     options.readPreference = ReadPreference.PRIMARY;
 
     // Add return new collection
@@ -555,7 +559,9 @@ export class Db implements OperationParent {
     callback?: Callback<void>
   ): Promise<void> | void {
     if (typeof options === 'function') (callback = options), (options = {});
-    options = resolveInheritedOptions(this, options);
+
+    // Intentionally, we do not inherit options from parent for this operation.
+    options = options || {};
 
     return executeOperation(
       getTopology(this),

src/operations/command.ts

@@ -73,7 +73,6 @@ export abstract class CommandOperation<
         : new MongoDBNamespace('admin', '$cmd');
     }
 
-    // todo what about this.hasAspect(Aspect.NO_INHERIT_OPTIONS)
     const readPref = ReadPreference.fromOptions(options);
     this.readPreference =
       this.hasAspect(Aspect.WRITE_OPERATION) || readPref === undefined

src/operations/operation.ts

@@ -7,8 +7,7 @@ import type { Server } from '../sdam/server';
 export const Aspect = {
   READ_OPERATION: Symbol('READ_OPERATION'),
   WRITE_OPERATION: Symbol('WRITE_OPERATION'),
-  RETRYABLE: Symbol('RETRYABLE'),
-  NO_INHERIT_OPTIONS: Symbol('NO_INHERIT_OPTIONS')
+  RETRYABLE: Symbol('RETRYABLE')
 } as const;
 
 /** @public */

src/operations/run_command.ts

@@ -1,5 +1,4 @@
 import { CommandOperation, CommandOperationOptions, OperationParent } from './command';
-import { defineAspects, Aspect } from './operation';
 import { MongoDBNamespace, Callback } from '../utils';
 import type { Server } from '../sdam/server';
 import type { Document } from '../bson';
@@ -34,6 +33,3 @@ export class RunAdminCommandOperation<
     this.ns = new MongoDBNamespace('admin');
   }
 }
-
-defineAspects(RunCommandOperation, [Aspect.NO_INHERIT_OPTIONS]);
-defineAspects(RunAdminCommandOperation, [Aspect.NO_INHERIT_OPTIONS]);

src/read_preference.ts

@@ -1,5 +1,4 @@
 import type { TagSet } from './sdam/server_description';
-import type { OperationParent } from './operations/command';
 import type { Document } from './bson';
 import type { ClientSession } from './sessions';
 

src/utils.ts

@@ -1189,9 +1189,6 @@ export function resolveInheritedOptions<T extends CommandOperationOptions>(
   }
 
   const bsonOptions = resolveBSONOptions(result, parent);
-  Object.assign(result, bsonOptions);
 
-  // todo: are there others?
-
-  return result;
+  return { ...result, ...bsonOptions };
 }