refactor(NODE-4633): executeOperation to use maybeCallback (#3421)

Author: nbbeeken

.eslintrc.json

@@ -201,7 +201,9 @@
       ],
       "parser": "@typescript-eslint/parser",
       "parserOptions": {
-        "project": ["./tsconfig.json"]
+        "project": [
+          "./tsconfig.json"
+        ]
       },
       "extends": [
         "plugin:@typescript-eslint/recommended-requiring-type-checking"
@@ -212,9 +214,13 @@
         "@typescript-eslint/no-unsafe-assignment": "off",
         "@typescript-eslint/no-unsafe-return": "off",
         "@typescript-eslint/no-unsafe-call": "off",
-
         "@typescript-eslint/restrict-plus-operands": "off",
-        "@typescript-eslint/restrict-template-expressions": "off"
+        "@typescript-eslint/restrict-template-expressions": "off",
+        "no-return-await": "off",
+        "@typescript-eslint/return-await": [
+          "error",
+          "in-try-catch"
+        ]
       }
     },
     {

src/bulk/common.ts

@@ -1276,41 +1276,37 @@ export abstract class BulkOperationBase {
         : typeof options === 'function'
         ? options
         : undefined;
-    options = options != null && typeof options !== 'function' ? options : {};
+    return maybeCallback(async () => {
+      options = options != null && typeof options !== 'function' ? options : {};
 
-    if (this.s.executed) {
-      // eslint-disable-next-line @typescript-eslint/require-await
-      return maybeCallback(async () => {
+      if (this.s.executed) {
         throw new MongoBatchReExecutionError();
-      }, callback);
-    }
+      }
 
-    const writeConcern = WriteConcern.fromOptions(options);
-    if (writeConcern) {
-      this.s.writeConcern = writeConcern;
-    }
+      const writeConcern = WriteConcern.fromOptions(options);
+      if (writeConcern) {
+        this.s.writeConcern = writeConcern;
+      }
 
-    // If we have current batch
-    if (this.isOrdered) {
-      if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch);
-    } else {
-      if (this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
-      if (this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
-      if (this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
-    }
-    // If we have no operations in the bulk raise an error
-    if (this.s.batches.length === 0) {
-      // eslint-disable-next-line @typescript-eslint/require-await
-      return maybeCallback(async () => {
+      // If we have current batch
+      if (this.isOrdered) {
+        if (this.s.currentBatch) this.s.batches.push(this.s.currentBatch);
+      } else {
+        if (this.s.currentInsertBatch) this.s.batches.push(this.s.currentInsertBatch);
+        if (this.s.currentUpdateBatch) this.s.batches.push(this.s.currentUpdateBatch);
+        if (this.s.currentRemoveBatch) this.s.batches.push(this.s.currentRemoveBatch);
+      }
+      // If we have no operations in the bulk raise an error
+      if (this.s.batches.length === 0) {
         throw new MongoInvalidArgumentError('Invalid BulkOperation, Batch cannot be empty');
-      }, callback);
-    }
+      }
 
-    this.s.executed = true;
-    const finalOptions = { ...this.s.options, ...options };
-    const operation = new BulkWriteShimOperation(this, finalOptions);
+      this.s.executed = true;
+      const finalOptions = { ...this.s.options, ...options };
+      const operation = new BulkWriteShimOperation(this, finalOptions);
 
-    return executeOperation(this.s.collection.s.db.s.client, operation, callback);
+      return executeOperation(this.s.collection.s.db.s.client, operation);
+    }, callback);
   }
 
   /**

src/collection.ts

@@ -662,7 +662,7 @@ export class Collection<TSchema extends Document = Document> {
       new RenameOperation(this as TODO_NODE_3286, newName, {
         ...options,
         readPreference: ReadPreference.PRIMARY
-      }),
+      }) as TODO_NODE_3286,
       callback
     );
   }
@@ -1299,7 +1299,7 @@ export class Collection<TSchema extends Document = Document> {
 
     return executeOperation(
       this.s.db.s.client,
-      new CollStatsOperation(this as TODO_NODE_3286, options),
+      new CollStatsOperation(this as TODO_NODE_3286, options) as TODO_NODE_3286,
       callback
     );
   }

src/mongo_client.ts

@@ -590,7 +590,7 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> {
     return maybeCallback(async () => {
       options = typeof options !== 'function' ? options : undefined;
       const client = new this(url, options);
-      return await client.connect();
+      return client.connect();
     }, callback);
   }
 

src/operations/command.ts

@@ -117,12 +117,6 @@ export abstract class CommandOperation<T> extends AbstractOperation<T> {
     return true;
   }
 
-  abstract override execute(
-    server: Server,
-    session: ClientSession | undefined,
-    callback: Callback<T>
-  ): void;
-
   executeCommand(
     server: Server,
     session: ClientSession | undefined,

src/operations/delete.ts

@@ -44,7 +44,7 @@ export interface DeleteStatement {
 }
 
 /** @internal */
-export class DeleteOperation extends CommandOperation<Document> {
+export class DeleteOperation extends CommandOperation<DeleteResult> {
   override options: DeleteOptions;
   statements: DeleteStatement[];
 

src/operations/drop.ts

@@ -72,7 +72,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
         }
       }
 
-      return await this.executeWithoutEncryptedFieldsCheck(server, session);
+      return this.executeWithoutEncryptedFieldsCheck(server, session);
     })().then(
       result => callback(undefined, result),
       err => callback(err)