chore: remove db from collection private

Author: durran

src/admin.ts

@@ -75,12 +75,12 @@ export class Admin {
    */
   async command(command: Document, options?: RunCommandOptions): Promise<Document> {
     return await executeOperation(
-      this.s.db.client,
+      this.db.client,
       new RunCommandOperation(new MongoDBNamespace('admin'), command, {
         ...resolveBSONOptions(options),
         session: options?.session,
         readPreference: options?.readPreference,
-        timeoutMS: options?.timeoutMS ?? this.s.db.timeoutMS
+        timeoutMS: options?.timeoutMS ?? this.db.timeoutMS
       })
     );
   }
@@ -129,8 +129,8 @@ export class Admin {
    */
   async removeUser(username: string, options?: RemoveUserOptions): Promise<boolean> {
     return await executeOperation(
-      this.s.db.client,
-      new RemoveUserOperation(this.s.db, username, { dbName: 'admin', ...options })
+      this.db.client,
+      new RemoveUserOperation(this.db, username, { dbName: 'admin', ...options })
     );
   }
 
@@ -145,7 +145,7 @@ export class Admin {
     options: ValidateCollectionOptions = {}
   ): Promise<Document> {
     return await executeOperation(
-      this.s.db.client,
+      this.db.client,
       new ValidateCollectionOperation(this, collectionName, options)
     );
   }
@@ -157,8 +157,8 @@ export class Admin {
    */
   async listDatabases(options?: ListDatabasesOptions): Promise<ListDatabasesResult> {
     return await executeOperation(
-      this.s.db.client,
-      new ListDatabasesOperation(this.s.db, { timeoutMS: this.s.db.timeoutMS, ...options })
+      this.db.client,
+      new ListDatabasesOperation(this.db, { timeoutMS: this.db.timeoutMS, ...options })
     );
   }
 

src/bulk/common.ts

@@ -900,7 +900,7 @@ export abstract class BulkOperationBase {
 
     // Final options for retryable writes
     let finalOptions = Object.assign({}, options);
-    finalOptions = applyRetryableWrites(finalOptions, collection.s.db);
+    finalOptions = applyRetryableWrites(finalOptions, collection.db);
 
     // Final results
     const bulkResult: BulkResult = {
@@ -1228,7 +1228,7 @@ export abstract class BulkOperationBase {
   private shouldForceServerObjectId(): boolean {
     return (
       this.s.options.forceServerObjectId === true ||
-      this.s.collection.s.db.options?.forceServerObjectId === true
+      this.s.collection.db.options?.forceServerObjectId === true
     );
   }
 }

src/change_stream.ts

@@ -674,7 +674,7 @@ export class ChangeStream<
 
     if (parent instanceof Collection) {
       this.type = CHANGE_DOMAIN_TYPES.COLLECTION;
-      serverSelectionTimeoutMS = parent.s.db.client.options.serverSelectionTimeoutMS;
+      serverSelectionTimeoutMS = parent.db.client.options.serverSelectionTimeoutMS;
     } else if (parent instanceof Db) {
       this.type = CHANGE_DOMAIN_TYPES.DATABASE;
       serverSelectionTimeoutMS = parent.client.options.serverSelectionTimeoutMS;

src/collection.ts

@@ -129,7 +129,6 @@ export interface CollectionOptions extends BSONSerializeOptions, WriteConcernOpt
 /** @internal */
 export interface CollectionPrivate {
   pkFactory: PkFactory;
-  db: Db;
   options: any;
   namespace: MongoDBCollectionNamespace;
   readPreference?: ReadPreference;
@@ -185,7 +184,6 @@ export class Collection<TSchema extends Document = Document> {
     this.db = db;
     // Internal state
     this.s = {
-      db,
       options,
       namespace: new MongoDBCollectionNamespace(db.databaseName, name),
       pkFactory: db.options?.pkFactory ?? DEFAULT_PK_FACTORY,
@@ -234,7 +232,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get readConcern(): ReadConcern | undefined {
     if (this.s.readConcern == null) {
-      return this.s.db.readConcern;
+      return this.db.readConcern;
     }
     return this.s.readConcern;
   }
@@ -245,7 +243,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get readPreference(): ReadPreference | undefined {
     if (this.s.readPreference == null) {
-      return this.s.db.readPreference;
+      return this.db.readPreference;
     }
 
     return this.s.readPreference;
@@ -261,7 +259,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   get writeConcern(): WriteConcern | undefined {
     if (this.s.writeConcern == null) {
-      return this.s.db.writeConcern;
+      return this.db.writeConcern;
     }
     return this.s.writeConcern;
   }
@@ -515,7 +513,7 @@ export class Collection<TSchema extends Document = Document> {
    * @param options - Optional settings for the command
    */
   async drop(options?: DropCollectionOptions): Promise<boolean> {
-    return await this.s.db.dropCollection(this.collectionName, options);
+    return await this.db.dropCollection(this.collectionName, options);
   }
 
   /**
@@ -584,7 +582,7 @@ export class Collection<TSchema extends Document = Document> {
    */
   async options(options?: OperationOptions): Promise<Document> {
     options = resolveOptions(this, options);
-    const [collection] = await this.s.db
+    const [collection] = await this.db
       .listCollections({ name: this.collectionName }, { ...options, nameOnly: false })
       .toArray();
 

src/gridfs/index.ts

@@ -160,13 +160,13 @@ export class GridFSBucket extends TypedEventEmitter<GridFSBucketEvents> {
    * @param id - The id of the file doc
    */
   async delete(id: ObjectId, options?: { timeoutMS: number }): Promise<void> {
-    const { timeoutMS } = resolveOptions(this.s.db, options);
+    const { timeoutMS } = resolveOptions(this.db, options);
     let timeoutContext: CSOTTimeoutContext | undefined = undefined;
 
     if (timeoutMS) {
       timeoutContext = new CSOTTimeoutContext({
         timeoutMS,
-        serverSelectionTimeoutMS: this.s.db.client.s.options.serverSelectionTimeoutMS
+        serverSelectionTimeoutMS: this.db.client.s.options.serverSelectionTimeoutMS
       });
     }
 
@@ -240,13 +240,13 @@ export class GridFSBucket extends TypedEventEmitter<GridFSBucketEvents> {
 
   /** Removes this bucket's files collection, followed by its chunks collection. */
   async drop(options?: { timeoutMS: number }): Promise<void> {
-    const { timeoutMS } = resolveOptions(this.s.db, options);
+    const { timeoutMS } = resolveOptions(this.db, options);
     let timeoutContext: CSOTTimeoutContext | undefined = undefined;
 
     if (timeoutMS) {
       timeoutContext = new CSOTTimeoutContext({
         timeoutMS,
-        serverSelectionTimeoutMS: this.s.db.client.s.options.serverSelectionTimeoutMS
+        serverSelectionTimeoutMS: this.db.client.s.options.serverSelectionTimeoutMS
       });
     }
 

src/gridfs/upload.ts

@@ -146,7 +146,7 @@ export class GridFSBucketWriteStream extends Writable {
     if (options.timeoutMS != null)
       this.timeoutContext = new CSOTTimeoutContext({
         timeoutMS: options.timeoutMS,
-        serverSelectionTimeoutMS: resolveTimeoutOptions(this.bucket.s.db.client, {})
+        serverSelectionTimeoutMS: resolveTimeoutOptions(this.bucket.db.client, {})
           .serverSelectionTimeoutMS
       });
   }

src/operations/rename.ts

@@ -48,7 +48,7 @@ export class RenameOperation extends CommandOperation<Document> {
   }
 
   override handleOk(_response: InstanceType<typeof this.SERVER_COMMAND_RESPONSE_TYPE>): Document {
-    return new Collection(this.collection.s.db, this.newName, this.collection.s.options);
+    return new Collection(this.collection.db, this.newName, this.collection.s.options);
   }
 }
 

src/operations/validate_collection.ts

@@ -19,7 +19,7 @@ export class ValidateCollectionOperation extends CommandOperation<Document> {
   collectionName: string;
 
   constructor(admin: Admin, collectionName: string, options: ValidateCollectionOptions) {
-    super(admin.s.db, options);
+    super(admin.db, options);
     this.options = options;
     this.collectionName = collectionName;
   }

src/utils.ts

@@ -1362,7 +1362,7 @@ export function maybeAddIdToDocuments(
   options: { forceServerObjectId?: boolean }
 ): Document {
   const forceServerObjectId =
-    options.forceServerObjectId ?? collection.s.db.options?.forceServerObjectId ?? false;
+    options.forceServerObjectId ?? collection.db.options?.forceServerObjectId ?? false;
 
   // no need to modify the docs if server sets the ObjectId
   if (forceServerObjectId) {