feat(NODE-7125): add db and client properties to collection and database objects (mongodb#4640)

Author: durran

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

@@ -172,11 +172,17 @@ export class Collection<TSchema extends Document = Document> {
   /** @internal */
   client: MongoClient;
 
+  /**
+   * Get the database object for the collection.
+   */
+  readonly db: Db;
+
   /**
    * Create a new Collection instance
    * @internal
    */
   constructor(db: Db, name: string, options?: CollectionOptions) {
+    this.db = db;
     // Internal state
     this.s = {
       db,
@@ -228,7 +234,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;
   }
@@ -239,7 +245,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;
@@ -255,7 +261,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;
   }
@@ -509,7 +515,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);
   }
 
   /**
@@ -578,7 +584,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/db.ts

@@ -126,7 +126,10 @@ export class Db {
   /** @internal */
   s: DbPrivate;
 
-  /** @internal */
+  /**
+   * Gets the MongoClient associated with the Db.
+   * @public
+   */
   readonly client: MongoClient;
 
   public static SYSTEM_NAMESPACE_COLLECTION = CONSTANTS.SYSTEM_NAMESPACE_COLLECTION;

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/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) {