test(NODE-4347): add coverage for auto connecting operations (#3299)

Author: nbbeeken

src/collection.ts

@@ -5,6 +5,7 @@ import { UnorderedBulkOperation } from './bulk/unordered';
 import { ChangeStream, ChangeStreamDocument, ChangeStreamOptions } from './change_stream';
 import { AggregationCursor } from './cursor/aggregation_cursor';
 import { FindCursor } from './cursor/find_cursor';
+import { ListIndexesCursor } from './cursor/list_indexes_cursor';
 import type { Db } from './db';
 import { MongoInvalidArgumentError } from './error';
 import type { Logger, LoggerOptions } from './logger';
@@ -57,7 +58,6 @@ import {
   IndexExistsOperation,
   IndexInformationOperation,
   IndexSpecification,
-  ListIndexesCursor,
   ListIndexesOptions
 } from './operations/indexes';
 import {

src/cursor/list_collections_cursor.ts

@@ -0,0 +1,52 @@
+import type { Document } from '../bson';
+import type { Db } from '../db';
+import { executeOperation, ExecutionResult } from '../operations/execute_operation';
+import {
+  CollectionInfo,
+  ListCollectionsOperation,
+  ListCollectionsOptions
+} from '../operations/list_collections';
+import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AbstractCursor } from './abstract_cursor';
+
+/** @public */
+export class ListCollectionsCursor<
+  T extends Pick<CollectionInfo, 'name' | 'type'> | CollectionInfo =
+    | Pick<CollectionInfo, 'name' | 'type'>
+    | CollectionInfo
+> extends AbstractCursor<T> {
+  parent: Db;
+  filter: Document;
+  options?: ListCollectionsOptions;
+
+  constructor(db: Db, filter: Document, options?: ListCollectionsOptions) {
+    super(db.s.client, db.s.namespace, options);
+    this.parent = db;
+    this.filter = filter;
+    this.options = options;
+  }
+
+  clone(): ListCollectionsCursor<T> {
+    return new ListCollectionsCursor(this.parent, this.filter, {
+      ...this.options,
+      ...this.cursorOptions
+    });
+  }
+
+  /** @internal */
+  _initialize(session: ClientSession | undefined, callback: Callback<ExecutionResult>): void {
+    const operation = new ListCollectionsOperation(this.parent, this.filter, {
+      ...this.cursorOptions,
+      ...this.options,
+      session
+    });
+
+    executeOperation(this.parent.s.client, operation, (err, response) => {
+      if (err || response == null) return callback(err);
+
+      // TODO: NODE-2882
+      callback(undefined, { server: operation.server, session, response });
+    });
+  }
+}

src/cursor/list_indexes_cursor.ts

@@ -0,0 +1,41 @@
+import type { Collection } from '../collection';
+import { executeOperation, ExecutionResult } from '../operations/execute_operation';
+import { ListIndexesOperation, ListIndexesOptions } from '../operations/indexes';
+import type { ClientSession } from '../sessions';
+import type { Callback } from '../utils';
+import { AbstractCursor } from './abstract_cursor';
+
+/** @public */
+export class ListIndexesCursor extends AbstractCursor {
+  parent: Collection;
+  options?: ListIndexesOptions;
+
+  constructor(collection: Collection, options?: ListIndexesOptions) {
+    super(collection.s.db.s.client, collection.s.namespace, options);
+    this.parent = collection;
+    this.options = options;
+  }
+
+  clone(): ListIndexesCursor {
+    return new ListIndexesCursor(this.parent, {
+      ...this.options,
+      ...this.cursorOptions
+    });
+  }
+
+  /** @internal */
+  _initialize(session: ClientSession | undefined, callback: Callback<ExecutionResult>): void {
+    const operation = new ListIndexesOperation(this.parent, {
+      ...this.cursorOptions,
+      ...this.options,
+      session
+    });
+
+    executeOperation(this.parent.s.db.s.client, operation, (err, response) => {
+      if (err || response == null) return callback(err);
+
+      // TODO: NODE-2882
+      callback(undefined, { server: operation.server, session, response });
+    });
+  }
+}

src/db.ts

@@ -4,6 +4,7 @@ import { ChangeStream, ChangeStreamDocument, ChangeStreamOptions } from './chang
 import { Collection, CollectionOptions } from './collection';
 import * as CONSTANTS from './constants';
 import { AggregationCursor } from './cursor/aggregation_cursor';
+import { ListCollectionsCursor } from './cursor/list_collections_cursor';
 import { MongoAPIError, MongoInvalidArgumentError } from './error';
 import { Logger, LoggerOptions } from './logger';
 import type { MongoClient, PkFactory } from './mongo_client';
@@ -26,11 +27,7 @@ import {
   IndexInformationOperation,
   IndexSpecification
 } from './operations/indexes';
-import {
-  CollectionInfo,
-  ListCollectionsCursor,
-  ListCollectionsOptions
-} from './operations/list_collections';
+import type { CollectionInfo, ListCollectionsOptions } from './operations/list_collections';
 import { ProfilingLevelOperation, ProfilingLevelOptions } from './operations/profiling_level';
 import { RemoveUserOperation, RemoveUserOptions } from './operations/remove_user';
 import { RenameOperation, RenameOptions } from './operations/rename';

src/index.ts

@@ -4,13 +4,13 @@ import { Collection } from './collection';
 import { AbstractCursor } from './cursor/abstract_cursor';
 import { AggregationCursor } from './cursor/aggregation_cursor';
 import { FindCursor } from './cursor/find_cursor';
+import { ListCollectionsCursor } from './cursor/list_collections_cursor';
+import { ListIndexesCursor } from './cursor/list_indexes_cursor';
 import { Db } from './db';
 import { GridFSBucket } from './gridfs';
 import { Logger } from './logger';
 import { MongoClient } from './mongo_client';
 import { CancellationToken } from './mongo_types';
-import { ListIndexesCursor } from './operations/indexes';
-import { ListCollectionsCursor } from './operations/list_collections';
 import { PromiseProvider } from './promise_provider';
 
 export {

src/operations/indexes.ts

@@ -1,6 +1,5 @@
 import type { Document } from '../bson';
 import type { Collection } from '../collection';
-import { AbstractCursor } from '../cursor/abstract_cursor';
 import type { Db } from '../db';
 import { MongoCompatibilityError, MONGODB_ERROR_CODES, MongoServerError } from '../error';
 import type { OneOrMore } from '../mongo_types';
@@ -15,7 +14,6 @@ import {
   OperationParent
 } from './command';
 import { indexInformation, IndexInformationOptions } from './common_functions';
-import { executeOperation, ExecutionResult } from './execute_operation';
 import { AbstractOperation, Aspect, defineAspects } from './operation';
 
 const VALID_INDEX_OPTIONS = new Set([
@@ -412,41 +410,6 @@ export class ListIndexesOperation extends CommandOperation<Document> {
   }
 }
 
-/** @public */
-export class ListIndexesCursor extends AbstractCursor {
-  parent: Collection;
-  options?: ListIndexesOptions;
-
-  constructor(collection: Collection, options?: ListIndexesOptions) {
-    super(collection.s.db.s.client, collection.s.namespace, options);
-    this.parent = collection;
-    this.options = options;
-  }
-
-  clone(): ListIndexesCursor {
-    return new ListIndexesCursor(this.parent, {
-      ...this.options,
-      ...this.cursorOptions
-    });
-  }
-
-  /** @internal */
-  _initialize(session: ClientSession | undefined, callback: Callback<ExecutionResult>): void {
-    const operation = new ListIndexesOperation(this.parent, {
-      ...this.cursorOptions,
-      ...this.options,
-      session
-    });
-
-    executeOperation(this.parent.s.db.s.client, operation, (err, response) => {
-      if (err || response == null) return callback(err);
-
-      // TODO: NODE-2882
-      callback(undefined, { server: operation.server, session, response });
-    });
-  }
-}
-
 /** @internal */
 export class IndexExistsOperation extends AbstractOperation<boolean> {
   override options: IndexInformationOptions;

src/operations/list_collections.ts

@@ -1,11 +1,9 @@
 import type { Binary, Document } from '../bson';
-import { AbstractCursor } from '../cursor/abstract_cursor';
 import type { Db } from '../db';
 import type { Server } from '../sdam/server';
 import type { ClientSession } from '../sessions';
 import { Callback, maxWireVersion } from '../utils';
 import { CommandOperation, CommandOperationOptions } from './command';
-import { executeOperation, ExecutionResult } from './execute_operation';
 import { Aspect, defineAspects } from './operation';
 
 /** @public */
@@ -86,47 +84,6 @@ export interface CollectionInfo extends Document {
   idIndex?: Document;
 }
 
-/** @public */
-export class ListCollectionsCursor<
-  T extends Pick<CollectionInfo, 'name' | 'type'> | CollectionInfo =
-    | Pick<CollectionInfo, 'name' | 'type'>
-    | CollectionInfo
-> extends AbstractCursor<T> {
-  parent: Db;
-  filter: Document;
-  options?: ListCollectionsOptions;
-
-  constructor(db: Db, filter: Document, options?: ListCollectionsOptions) {
-    super(db.s.client, db.s.namespace, options);
-    this.parent = db;
-    this.filter = filter;
-    this.options = options;
-  }
-
-  clone(): ListCollectionsCursor<T> {
-    return new ListCollectionsCursor(this.parent, this.filter, {
-      ...this.options,
-      ...this.cursorOptions
-    });
-  }
-
-  /** @internal */
-  _initialize(session: ClientSession | undefined, callback: Callback<ExecutionResult>): void {
-    const operation = new ListCollectionsOperation(this.parent, this.filter, {
-      ...this.cursorOptions,
-      ...this.options,
-      session
-    });
-
-    executeOperation(this.parent.s.client, operation, (err, response) => {
-      if (err || response == null) return callback(err);
-
-      // TODO: NODE-2882
-      callback(undefined, { server: operation.server, session, response });
-    });
-  }
-}
-
 defineAspects(ListCollectionsOperation, [
   Aspect.READ_OPERATION,
   Aspect.RETRYABLE,