refactor(NODE-4633): executeOperation to use maybeCallback

Author: nbbeeken

package-lock.json

@@ -41,7 +41,7 @@
     "@types/express": "^4.17.13",
     "@types/kerberos": "^1.1.1",
     "@types/mocha": "^9.1.1",
-    "@types/node": "^18.7.13",
+    "@types/node": "^18.7.22",
     "@types/saslprep": "^1.0.1",
     "@types/semver": "^7.3.12",
     "@types/sinon": "^10.0.11",

package.json

@@ -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 await executeOperation(this.s.collection.s.db.s.client, operation);
+    }, callback);
   }
 
   /**

src/bulk/common.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/collection.ts

@@ -119,12 +119,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/command.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[];