address Neal's comments pt 2

Author: baileympearson

src/admin.ts

@@ -75,7 +75,7 @@ export class Admin {
    */
   async command(command: Document, options?: RunCommandOptions): Promise<Document> {
     return executeOperation(
-      this.s.db.s.client,
+      this.s.db.client,
       new RunCommandOperation(this.s.db, command, { dbName: 'admin', ...options })
     );
   }
@@ -138,7 +138,7 @@ export class Admin {
         : undefined;
     const password = typeof passwordOrOptions === 'string' ? passwordOrOptions : undefined;
     return executeOperation(
-      this.s.db.s.client,
+      this.s.db.client,
       new AddUserOperation(this.s.db, username, password, { dbName: 'admin', ...options })
     );
   }
@@ -151,7 +151,7 @@ export class Admin {
    */
   async removeUser(username: string, options?: RemoveUserOptions): Promise<boolean> {
     return executeOperation(
-      this.s.db.s.client,
+      this.s.db.client,
       new RemoveUserOperation(this.s.db, username, { dbName: 'admin', ...options })
     );
   }
@@ -167,7 +167,7 @@ export class Admin {
     options: ValidateCollectionOptions = {}
   ): Promise<Document> {
     return executeOperation(
-      this.s.db.s.client,
+      this.s.db.client,
       new ValidateCollectionOperation(this, collectionName, options)
     );
   }
@@ -178,7 +178,7 @@ export class Admin {
    * @param options - Optional settings for the command
    */
   async listDatabases(options?: ListDatabasesOptions): Promise<ListDatabasesResult> {
-    return executeOperation(this.s.db.s.client, new ListDatabasesOperation(this.s.db, options));
+    return executeOperation(this.s.db.client, new ListDatabasesOperation(this.s.db, options));
   }
 
   /**

src/bulk/common.ts

@@ -597,19 +597,19 @@ function executeCommands(
   try {
     if (isInsertBatch(batch)) {
       executeOperation(
-        bulkOperation.s.collection.s.db.s.client,
+        bulkOperation.s.collection.client,
         new InsertOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
     } else if (isUpdateBatch(batch)) {
       executeOperation(
-        bulkOperation.s.collection.s.db.s.client,
+        bulkOperation.s.collection.client,
         new UpdateOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
     } else if (isDeleteBatch(batch)) {
       executeOperation(
-        bulkOperation.s.collection.s.db.s.client,
+        bulkOperation.s.collection.client,
         new DeleteOperation(bulkOperation.s.namespace, batch.operations, finalOptions),
         resultHandler
       );
@@ -1222,7 +1222,7 @@ export abstract class BulkOperationBase {
     const finalOptions = { ...this.s.options, ...options };
     const operation = new BulkWriteShimOperation(this, finalOptions);
 
-    return executeOperation(this.s.collection.s.db.s.client, operation);
+    return executeOperation(this.s.collection.client, operation);
   }
 
   /**

src/change_stream.ts

@@ -818,9 +818,9 @@ export class ChangeStream<
       this.type === CHANGE_DOMAIN_TYPES.CLUSTER
         ? (this.parent as MongoClient)
         : this.type === CHANGE_DOMAIN_TYPES.DATABASE
-        ? (this.parent as Db).s.client
+        ? (this.parent as Db).client
         : this.type === CHANGE_DOMAIN_TYPES.COLLECTION
-        ? (this.parent as Collection).s.db.s.client
+        ? (this.parent as Collection).client
         : null;
 
     if (client == null) {

src/collection.ts

@@ -6,6 +6,10 @@ import { ChangeStream, ChangeStreamDocument, ChangeStreamOptions } from './chang
 import { AggregationCursor } from './cursor/aggregation_cursor';
 import { FindCursor } from './cursor/find_cursor';
 import { ListIndexesCursor } from './cursor/list_indexes_cursor';
+import {
+  ListSearchIndexesCursor,
+  ListSearchIndexesOptions
+} from './cursor/list_search_indexes_cursor';
 import type { Db } from './db';
 import { MongoInvalidArgumentError } from './error';
 import type { MongoClient, PkFactory } from './mongo_client';
@@ -75,10 +79,6 @@ import {
   SearchIndexDescription
 } from './operations/search_indexes/create';
 import { DropSearchIndexOperation } from './operations/search_indexes/drop';
-import {
-  ListSearchIndexesCursor,
-  ListSearchIndexesOptions
-} from './operations/search_indexes/list';
 import { UpdateSearchIndexOperation } from './operations/search_indexes/update';
 import { CollStats, CollStatsOperation, CollStatsOptions } from './operations/stats';
 import {
@@ -163,6 +163,9 @@ export class Collection<TSchema extends Document = Document> {
   /** @internal */
   s: CollectionPrivate;
 
+  /** @internal */
+  client: MongoClient;
+
   /**
    * Create a new Collection instance
    * @internal
@@ -181,11 +184,8 @@ export class Collection<TSchema extends Document = Document> {
       readConcern: ReadConcern.fromOptions(options),
       writeConcern: WriteConcern.fromOptions(options)
     };
-  }
 
-  /** @internal */
-  get client(): MongoClient {
-    return this.s.db.client;
+    this.client = db.client;
   }
 
   /**
@@ -1008,13 +1008,22 @@ export class Collection<TSchema extends Document = Document> {
    *
    * Returns all search indexes for the current collection.
    *
-   * @param indexName - Optional.  If specified, only indexes with matching index names will be returned.
    * @param options - The options for the list indexes operation.
    *
    * @remarks Only available when used against a 7.0+ Atlas cluster.
    */
   listSearchIndexes(options?: ListSearchIndexesOptions): ListSearchIndexesCursor;
-  listSearchIndexes(indexName: string, options?: ListSearchIndexesOptions): ListSearchIndexesCursor;
+  /**
+   * @internal
+   *
+   * Returns all search indexes for the current collection.
+   *
+   * @param name - The name of the index to search for.  Only indexes with matching index names will be returned.
+   * @param options - The options for the list indexes operation.
+   *
+   * @remarks Only available when used against a 7.0+ Atlas cluster.
+   */
+  listSearchIndexes(name: string, options?: ListSearchIndexesOptions): ListSearchIndexesCursor;
   listSearchIndexes(
     indexNameOrOptions?: string | ListSearchIndexesOptions,
     options?: ListSearchIndexesOptions
@@ -1028,7 +1037,7 @@ export class Collection<TSchema extends Document = Document> {
         ? null
         : indexNameOrOptions;
 
-    return ListSearchIndexesCursor.create(this, indexName, options);
+    return new ListSearchIndexesCursor(this as TODO_NODE_3286, indexName, options);
   }
 
   /**
@@ -1058,7 +1067,10 @@ export class Collection<TSchema extends Document = Document> {
    * @returns
    */
   async createSearchIndexes(descriptions: SearchIndexDescription[]): Promise<string[]> {
-    return executeOperation(this.client, new CreateSearchIndexesOperation(this, descriptions));
+    return executeOperation(
+      this.client,
+      new CreateSearchIndexesOperation(this as TODO_NODE_3286, descriptions)
+    );
   }
 
   /**
@@ -1071,7 +1083,10 @@ export class Collection<TSchema extends Document = Document> {
    * @remarks Only available when used against a 7.0+ Atlas cluster.
    */
   async dropSearchIndex(name: string): Promise<void> {
-    return executeOperation(this.client, new DropSearchIndexOperation(this, name));
+    return executeOperation(
+      this.client,
+      new DropSearchIndexOperation(this as TODO_NODE_3286, name)
+    );
   }
 
   /**
@@ -1085,6 +1100,9 @@ export class Collection<TSchema extends Document = Document> {
    * @remarks Only available when used against a 7.0+ Atlas cluster.
    */
   async updateSearchIndex(name: string, definition: Document): Promise<void> {
-    return executeOperation(this.client, new UpdateSearchIndexOperation(this, name, definition));
+    return executeOperation(
+      this.client,
+      new UpdateSearchIndexOperation(this as TODO_NODE_3286, name, definition)
+    );
   }
 }

src/cursor/list_collections_cursor.ts

@@ -21,7 +21,7 @@ export class ListCollectionsCursor<
   options?: ListCollectionsOptions;
 
   constructor(db: Db, filter: Document, options?: ListCollectionsOptions) {
-    super(db.s.client, db.s.namespace, options);
+    super(db.client, db.s.namespace, options);
     this.parent = db;
     this.filter = filter;
     this.options = options;
@@ -42,7 +42,7 @@ export class ListCollectionsCursor<
       session
     });
 
-    executeOperation(this.parent.s.client, operation, (err, response) => {
+    executeOperation(this.parent.client, operation, (err, response) => {
       if (err || response == null) return callback(err);
 
       // TODO: NODE-2882

src/cursor/list_indexes_cursor.ts

@@ -11,7 +11,7 @@ export class ListIndexesCursor extends AbstractCursor {
   options?: ListIndexesOptions;
 
   constructor(collection: Collection, options?: ListIndexesOptions) {
-    super(collection.s.db.s.client, collection.s.namespace, options);
+    super(collection.client, collection.s.namespace, options);
     this.parent = collection;
     this.options = options;
   }
@@ -31,7 +31,7 @@ export class ListIndexesCursor extends AbstractCursor {
       session
     });
 
-    executeOperation(this.parent.s.db.s.client, operation, (err, response) => {
+    executeOperation(this.parent.client, operation, (err, response) => {
       if (err || response == null) return callback(err);
 
       // TODO: NODE-2882

src/operations/search_indexes/list.ts renamed to src/cursor/list_search_indexes_cursor.ts

@@ -1,20 +1,20 @@
-import type { Collection } from '../../collection';
-import { AggregationCursor } from '../../cursor/aggregation_cursor';
-import type { AggregateOptions } from '../aggregate';
+import type { Collection } from '../collection';
+import type { AggregateOptions } from '../operations/aggregate';
+import { AggregationCursor } from './aggregation_cursor';
 
 /** @public */
 export type ListSearchIndexesOptions = AggregateOptions;
 
 /** @public */
 export class ListSearchIndexesCursor extends AggregationCursor<{ name: string }> {
   /** @internal */
-  static create(
+  constructor(
     { fullNamespace: ns, client }: Collection,
     name: string | null,
     options: ListSearchIndexesOptions = {}
-  ): ListSearchIndexesCursor {
+  ) {
     const pipeline =
       name == null ? [{ $listSearchIndexes: {} }] : [{ $listSearchIndexes: { name } }];
-    return new ListSearchIndexesCursor(client, ns, pipeline, options);
+    super(client, ns, pipeline, options);
   }
 }

src/db.ts

@@ -69,7 +69,6 @@ const DB_OPTIONS_ALLOW_LIST = [
 
 /** @internal */
 export interface DbPrivate {
-  client: MongoClient;
   options?: DbOptions;
   readPreference?: ReadPreference;
   pkFactory: PkFactory;
@@ -135,7 +134,12 @@ export class Db {
    * @param databaseName - The name of the database this instance represents.
    * @param options - Optional settings for Db construction
    */
-  constructor(client: MongoClient, databaseName: string, options?: DbOptions) {
+  constructor(
+    /** @internal */
+    readonly client: MongoClient,
+    databaseName: string,
+    options?: DbOptions
+  ) {
     options = options ?? {};
 
     // Filter the options
@@ -146,8 +150,6 @@ export class Db {
 
     // Internal state of the db object
     this.s = {
-      // Client
-      client,
       // Options
       options,
       // Unpack read preference
@@ -162,11 +164,8 @@ export class Db {
       // Namespace
       namespace: new MongoDBNamespace(databaseName)
     };
-  }
 
-  /** @internal */
-  get client(): MongoClient {
-    return this.s.client;
+    this.client = client;
   }
 
   get databaseName(): string {

src/index.ts

@@ -275,6 +275,7 @@ export type {
   ChangeStreamAggregateRawResult,
   ChangeStreamCursorOptions
 } from './cursor/change_stream_cursor';
+export type { ListSearchIndexesCursor, ListSearchIndexesOptions } from './cursor/list_search_indexes_cursor';
 export type { DbOptions, DbPrivate } from './db';
 export type { AutoEncrypter, AutoEncryptionOptions, AutoEncryptionTlsOptions } from './deps';
 export type { Encrypter, EncrypterOptions } from './encrypter';
@@ -416,10 +417,6 @@ export type { RemoveUserOptions } from './operations/remove_user';
 export type { RenameOptions } from './operations/rename';
 export type { RunCommandOptions } from './operations/run_command';
 export type { SearchIndexDescription } from './operations/search_indexes/create';
-export type {
-  ListSearchIndexesCursor,
-  ListSearchIndexesOptions
-} from './operations/search_indexes/list';
 export type { SetProfilingLevelOptions } from './operations/set_profiling_level';
 export type {
   CollStats,

src/operations/create_collection.ts

@@ -133,7 +133,7 @@ export class CreateCollectionOperation extends CommandOperation<Collection> {
 
       const encryptedFields: Document | undefined =
         options.encryptedFields ??
-        db.s.client.options.autoEncryption?.encryptedFieldsMap?.[`${db.databaseName}.${name}`];
+        db.client.options.autoEncryption?.encryptedFieldsMap?.[`${db.databaseName}.${name}`];
 
       if (encryptedFields) {
         // Creating a QE collection required min server of 7.0.0

src/operations/drop.ts

@@ -36,7 +36,7 @@ export class DropCollectionOperation extends CommandOperation<boolean> {
       const options = this.options;
       const name = this.name;
 
-      const encryptedFieldsMap = db.s.client.options.autoEncryption?.encryptedFieldsMap;
+      const encryptedFieldsMap = db.client.options.autoEncryption?.encryptedFieldsMap;
       let encryptedFields: Document | undefined =
         options.encryptedFields ?? encryptedFieldsMap?.[`${db.databaseName}.${name}`];
 

src/utils.ts

@@ -288,10 +288,8 @@ export function getTopology(provider: TopologyProvider): Topology {
   // MongoClient or ClientSession or AbstractCursor
   if ('topology' in provider && provider.topology) {
     return provider.topology;
-  } else if ('s' in provider && 'client' in provider.s && provider.s.client.topology) {
-    return provider.s.client.topology;
-  } else if ('s' in provider && 'db' in provider.s && provider.s.db.s.client.topology) {
-    return provider.s.db.s.client.topology;
+  } else if ('client' in provider && provider.client.topology) {
+    return provider.client.topology;
   }
 
   throw new MongoNotConnectedError('MongoClient must be connected to perform this operation');

test/unit/utils.test.ts

@@ -12,13 +12,14 @@ import {
   List,
   matchesParentDomain,
   maybeCallback,
+  MongoDBCollectionNamespace,
   MongoDBNamespace,
   MongoRuntimeError,
   ObjectId,
   shuffle
 } from '../mongodb';
 
-describe('driver utils', function () {
+describe.only('driver utils', function () {
   describe('.hostMatchesWildcards', function () {
     context('when using domains', function () {
       context('when using exact match', function () {
@@ -772,6 +773,21 @@ describe('driver utils', function () {
         expect(withCollectionNamespace).to.have.property('db', 'test');
         expect(withCollectionNamespace).to.have.property('collection', 'pets');
       });
+
+      it('returns a MongoDBCollectionNamespaceObject', () => {
+        expect(dbNamespace.withCollection('pets')).to.be.instanceOf(MongoDBCollectionNamespace);
+      });
+    });
+  });
+
+  describe('MongoDBCollectionNamespace', () => {
+    it('is a subclass of MongoDBNamespace', () => {
+      expect(new MongoDBCollectionNamespace('db', 'collection')).to.be.instanceOf(MongoDBNamespace);
+    });
+
+    it('does not enforce the collection property at runtime', () => {
+      // @ts-expect-error Intentionally calling constructor incorrectly.
+      expect(new MongoDBCollectionNamespace('db')).to.have.property('collection', undefined);
     });
   });