comments

Author: baileympearson

src/beta.ts

@@ -1 +1,4 @@
-export * from './index';
+import * as contents from './index';
+import { configureExplicitResourceManagement } from './resource_management';
+
+export = { ...contents, configureExplicitResourceManagement };

src/change_stream.ts

@@ -995,6 +995,11 @@ export class ChangeStream<
 }
 
 Symbol.asyncDispose &&
-  (ChangeStream.prototype[Symbol.asyncDispose] = async function () {
-    await this.close();
+  Object.defineProperty(ChangeStream.prototype, Symbol.asyncDispose, {
+    value: async function asyncDispose(this: { close(): Promise<void> }) {
+      await this.close();
+    },
+    enumerable: false,
+    configurable: true,
+    writable: true
   });

src/cursor/abstract_cursor.ts

@@ -925,6 +925,11 @@ class ReadableCursorStream extends Readable {
 }
 
 Symbol.asyncDispose &&
-  (AbstractCursor.prototype[Symbol.asyncDispose] = async function () {
-    await this.close();
+  Object.defineProperty(AbstractCursor.prototype, Symbol.asyncDispose, {
+    value: async function asyncDispose(this: { close(): Promise<void> }) {
+      await this.close();
+    },
+    enumerable: false,
+    configurable: true,
+    writable: true
   });

src/mongo_client.ts

@@ -763,8 +763,13 @@ export class MongoClient extends TypedEventEmitter<MongoClientEvents> implements
 }
 
 Symbol.asyncDispose &&
-  (MongoClient.prototype[Symbol.asyncDispose] = async function () {
-    await this.close();
+  Object.defineProperty(MongoClient.prototype, Symbol.asyncDispose, {
+    value: async function asyncDispose(this: { close(): Promise<void> }) {
+      await this.close();
+    },
+    enumerable: false,
+    configurable: true,
+    writable: true
   });
 
 /**

src/resource_management.ts

@@ -1,4 +1,5 @@
-import { AbstractCursor, ChangeStream } from './beta';
+import { ChangeStream } from './change_stream';
+import { AbstractCursor } from './cursor/abstract_cursor';
 import { MongoClient } from './mongo_client';
 import { ClientSession } from './sessions';
 
@@ -12,7 +13,6 @@ export interface AsyncDisposable {
 }
 
 /**
- * @public
  * @beta
  *
  * Attaches `Symbol.asyncDispose` methods to the MongoClient, Cursors, sessions and change streams
@@ -26,7 +26,7 @@ export interface AsyncDisposable {
  * Example:
  *
  * ```typescript
- * import { load, MongoClient } from 'mongodb/beta';
+ * import { configureExplicitResourceManagement, MongoClient } from 'mongodb/lib/beta';
  *
  * Symbol.asyncDispose ??= Symbol('dispose');
  * load();
@@ -36,22 +36,42 @@ export interface AsyncDisposable {
  */
 export function configureExplicitResourceManagement() {
   Symbol.asyncDispose &&
-    (MongoClient.prototype[Symbol.asyncDispose] = async function () {
-      await this.close();
+    Object.defineProperty(MongoClient.prototype, Symbol.asyncDispose, {
+      value: async function asyncDispose(this: { close(): Promise<void> }) {
+        await this.close();
+      },
+      enumerable: false,
+      configurable: true,
+      writable: true
     });
 
   Symbol.asyncDispose &&
-    (ClientSession.prototype[Symbol.asyncDispose] = async function () {
-      await this.endSession({ force: true });
+    Object.defineProperty(AbstractCursor.prototype, Symbol.asyncDispose, {
+      value: async function asyncDispose(this: { close(): Promise<void> }) {
+        await this.close();
+      },
+      enumerable: false,
+      configurable: true,
+      writable: true
     });
 
   Symbol.asyncDispose &&
-    (AbstractCursor.prototype[Symbol.asyncDispose] = async function () {
-      await this.close();
+    Object.defineProperty(ChangeStream.prototype, Symbol.asyncDispose, {
+      value: async function asyncDispose(this: { close(): Promise<void> }) {
+        await this.close();
+      },
+      enumerable: false,
+      configurable: true,
+      writable: true
     });
 
   Symbol.asyncDispose &&
-    (ChangeStream.prototype[Symbol.asyncDispose] = async function () {
-      await this.close();
+    Object.defineProperty(ClientSession.prototype, Symbol.asyncDispose, {
+      value: async function asyncDispose(this: { endSession(): Promise<void> }) {
+        await this.endSession();
+      },
+      enumerable: false,
+      configurable: true,
+      writable: true
     });
 }

src/sessions.ts

@@ -491,8 +491,13 @@ export class ClientSession
 }
 
 Symbol.asyncDispose &&
-  (ClientSession.prototype[Symbol.asyncDispose] = async function () {
-    await this.endSession({ force: true });
+  Object.defineProperty(ClientSession.prototype, Symbol.asyncDispose, {
+    value: async function asyncDispose(this: { endSession(): Promise<void> }) {
+      await this.endSession();
+    },
+    enumerable: false,
+    configurable: true,
+    writable: true
   });
 
 const MAX_WITH_TRANSACTION_TIMEOUT = 120000;

test/explicit-resource-management/main.test.ts

@@ -7,9 +7,6 @@ import { Readable } from 'stream';
 import { pipeline } from 'stream/promises';
 import { setTimeout } from 'timers/promises';
 
-// @ts-expect-error Assigning readonly property.
-Symbol.asyncDispose ??= Symbol('dispose');
-
 async function setUpCollection(client: MongoClient) {
 	const collection = client.db('foo').collection<{ name: string }>('bar');
 	const documents: Array<{ name: string }> = Array.from({ length: 5 }).map(i => ({