move drop logic into Db class

Author: baileympearson

src/collection.ts

@@ -33,7 +33,7 @@ import {
   type DeleteResult
 } from './operations/delete';
 import { DistinctOperation, type DistinctOptions } from './operations/distinct';
-import { DropCollectionOperation, type DropCollectionOptions } from './operations/drop';
+import { type DropCollectionOptions } from './operations/drop';
 import {
   EstimatedDocumentCountOperation,
   type EstimatedDocumentCountOptions
@@ -491,10 +491,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async drop(options?: DropCollectionOptions): Promise<boolean> {
-    return await executeOperation(
-      this.client,
-      new DropCollectionOperation(this.s.db, this.collectionName, options)
-    );
+    return await this.s.db.dropCollection(this.collectionName, options);
   }
 
   /**

src/db.ts

@@ -3,10 +3,11 @@ import { type BSONSerializeOptions, type Document, resolveBSONOptions } from './
 import { ChangeStream, type ChangeStreamDocument, type ChangeStreamOptions } from './change_stream';
 import { Collection, type CollectionOptions } from './collection';
 import * as CONSTANTS from './constants';
+import { CursorTimeoutContext } from './cursor/abstract_cursor';
 import { AggregationCursor } from './cursor/aggregation_cursor';
 import { ListCollectionsCursor } from './cursor/list_collections_cursor';
 import { RunCommandCursor, type RunCursorCommandOptions } from './cursor/run_command_cursor';
-import { MongoInvalidArgumentError } from './error';
+import { MONGODB_ERROR_CODES, MongoInvalidArgumentError, MongoServerError } from './error';
 import type { MongoClient, PkFactory } from './mongo_client';
 import type { Abortable, TODO_NODE_3286 } from './mongo_types';
 import type { AggregateOptions } from './operations/aggregate';
@@ -43,6 +44,7 @@ import {
 import { DbStatsOperation, type DbStatsOptions } from './operations/stats';
 import { ReadConcern } from './read_concern';
 import { ReadPreference, type ReadPreferenceLike } from './read_preference';
+import { TimeoutContext } from './timeout';
 import { DEFAULT_PK_FACTORY, filterOptions, MongoDBNamespace, resolveOptions } from './utils';
 import { WriteConcern, type WriteConcernOptions } from './write_concern';
 
@@ -411,9 +413,60 @@ export class Db {
    * @param options - Optional settings for the command
    */
   async dropCollection(name: string, options?: DropCollectionOptions): Promise<boolean> {
+    options = resolveOptions(this, options);
+    options.session ??= this.client.startSession({ owner: Symbol(), explicit: false });
+
+    const timeoutContext = TimeoutContext.create({
+      session: options.session,
+      serverSelectionTimeoutMS: this.client.s.options.serverSelectionTimeoutMS,
+      waitQueueTimeoutMS: this.client.s.options.waitQueueTimeoutMS,
+      timeoutMS: options.timeoutMS
+    });
+
+    const encryptedFieldsMap = this.client.s.options.autoEncryption?.encryptedFieldsMap;
+    let encryptedFields: Document | undefined =
+      options.encryptedFields ?? encryptedFieldsMap?.[`${this.databaseName}.${name}`];
+
+    if (!encryptedFields && encryptedFieldsMap) {
+      // If the MongoClient was configured with an encryptedFieldsMap,
+      // and no encryptedFields config was available in it or explicitly
+      // passed as an argument, the spec tells us to look one up using
+      // listCollections().
+      const listCollectionsResult = await this.listCollections(
+        { name },
+        {
+          nameOnly: false,
+          session: options.session,
+          timeoutContext: new CursorTimeoutContext(timeoutContext, Symbol())
+        }
+      ).toArray();
+      encryptedFields = listCollectionsResult?.[0]?.options?.encryptedFields;
+    }
+
+    if (encryptedFields) {
+      const escCollection = encryptedFields.escCollection || `enxcol_.${name}.esc`;
+      const ecocCollection = encryptedFields.ecocCollection || `enxcol_.${name}.ecoc`;
+
+      for (const collectionName of [escCollection, ecocCollection]) {
+        // Drop auxilliary collections, ignoring potential NamespaceNotFound errors.
+        const dropOp = new DropCollectionOperation(this, collectionName, options);
+        try {
+          await executeOperation(this.client, dropOp, timeoutContext);
+        } catch (err) {
+          if (
+            !(err instanceof MongoServerError) ||
+            err.code !== MONGODB_ERROR_CODES.NamespaceNotFound
+          ) {
+            throw err;
+          }
+        }
+      }
+    }
+
     return await executeOperation(
       this.client,
-      new DropCollectionOperation(this, name, resolveOptions(this, options))
+      new DropCollectionOperation(this, name, options),
+      timeoutContext
     );
   }