remove generic default for AbstractOperation and CommandOperation

Author: mbroadst

src/operations/command.ts

@@ -48,7 +48,7 @@ export interface OperationParent {
 }
 
 /** @internal */
-export abstract class CommandOperation<TResult = Document> extends AbstractOperation {
+export abstract class CommandOperation<T> extends AbstractOperation<T> {
   options: CommandOperationOptions;
   ns: MongoDBNamespace;
   readConcern?: ReadConcern;
@@ -97,7 +97,7 @@ export abstract class CommandOperation<TResult = Document> extends AbstractOpera
     return true;
   }
 
-  abstract execute(server: Server, callback: Callback<TResult>): void;
+  abstract execute(server: Server, callback: Callback<T>): void;
 
   executeCommand(server: Server, cmd: Document, callback: Callback): void {
     // TODO: consider making this a non-enumerable property

src/operations/execute_operation.ts

@@ -91,10 +91,7 @@ export function executeOperation<
   return maybePromise(callback, cb => {
     function executeCallback(err?: AnyError, result?: TResult) {
       if (session && session.owner === owner) {
-        session.endSession();
-        if (operation.session === session) {
-          operation.clearSession();
-        }
+        return session.endSession(err2 => cb(err2 || err, result));
       }
 
       cb(err, result);
@@ -105,9 +102,6 @@ export function executeOperation<
     } catch (e) {
       if (session && session.owner === owner) {
         session.endSession();
-        if (operation.session === session) {
-          operation.clearSession();
-        }
       }
 
       throw e;

src/operations/operation.ts

@@ -37,7 +37,7 @@ const kSession = Symbol('session');
  * a specific aspect.
  * @internal
  */
-export abstract class AbstractOperation<T = Document> {
+export abstract class AbstractOperation<T> {
   ns!: MongoDBNamespace;
   cmd!: Document;
   readPreference: ReadPreference;
@@ -56,6 +56,10 @@ export abstract class AbstractOperation<T = Document> {
 
     // Pull the BSON serialize options from the already-resolved options
     this.bsonOptions = resolveBSONOptions(options);
+
+    if (options.session) {
+      this[kSession] = options.session;
+    }
   }
 
   abstract execute(server: Server, callback: Callback<T>): void;
@@ -77,10 +81,6 @@ export abstract class AbstractOperation<T = Document> {
     return this[kSession];
   }
 
-  clearSession(): void {
-    // this[kSession] = undefined;
-  }
-
   get canRetryRead(): boolean {
     return true;
   }

src/sdam/server.ts

@@ -261,11 +261,6 @@ export class Server extends EventEmitter {
       return;
     }
 
-    const error = basicReadValidations(this, options);
-    if (error) {
-      return callback(error);
-    }
-
     // Clone the options
     const finalOptions = Object.assign({}, options, { wireProtocolCommand: false });
 
@@ -424,12 +419,6 @@ function calculateRoundTripTime(oldRtt: number, duration: number): number {
   return alpha * duration + (1 - alpha) * oldRtt;
 }
 
-function basicReadValidations(server: Server, options?: CommandOptions) {
-  if (options?.readPreference && !(options.readPreference instanceof ReadPreference)) {
-    return new MongoError('readPreference must be an instance of ReadPreference');
-  }
-}
-
 function executeWriteOperation(
   args: { server: Server; op: string; ns: string; ops: Document[] | Document },
   options: WriteCommandOptions,

src/utils.ts

@@ -8,7 +8,7 @@ import type { Topology } from './sdam/topology';
 import type { EventEmitter } from 'events';
 import type { Db } from './db';
 import type { Collection } from './collection';
-import type { OperationOptions, AbstractOperation, Hint } from './operations/operation';
+import type { OperationOptions, Hint } from './operations/operation';
 import type { ClientSession } from './sessions';
 import { ReadConcern } from './read_concern';
 import type { Connection } from './cmap/connection';
@@ -232,7 +232,7 @@ export function filterOptions(options: AnyOptions, names: string[]): AnyOptions
  * @param args - Arguments to apply the provided operation
  * @param options - Options that modify the behavior of the method
  */
-export function executeLegacyOperation<T extends AbstractOperation>(
+export function executeLegacyOperation<T>(
   topology: Topology,
   operation: (...args: any[]) => void | Promise<Document>,
   args: any[],

test/functional/sessions.test.js

@@ -113,8 +113,10 @@ describe('Sessions', function () {
 
           return client
             .withSession(testCase.operation(client))
-            .catch(() => expect(client.topology.s.sessionPool.sessions).to.have.length(1))
-            .then(() => expect(client.topology.s.sessionPool.sessions).to.have.length(1))
+            .then(
+              () => expect(client.topology.s.sessionPool.sessions).to.have.length(1),
+              () => expect(client.topology.s.sessionPool.sessions).to.have.length(1)
+            )
             .then(() => client.close())
             .then(() => {
               // verify that the `endSessions` command was sent