mongodb 6.8.0-dev.20240822.sha.f5254030 → 6.8.0-dev.20240829.sha.6d65ae77

package/src/change_stream.ts

@@ -44,7 +44,7 @@ const CHANGE_DOMAIN_TYPES = {
   CLUSTER: Symbol('Cluster')
 };
 
-const CHANGE_STREAM_EVENTS = [RESUME_TOKEN_CHANGED, END, CLOSE];
+const CHANGE_STREAM_EVENTS = [RESUME_TOKEN_CHANGED, END, CLOSE] as const;
 
 const NO_RESUME_TOKEN_ERROR =
   'A change stream document has been received that lacks a resume token (_id).';
@@ -680,7 +680,7 @@ export class ChangeStream<
     // Change streams must resume indefinitely while each resume event succeeds.
     // This loop continues until either a change event is received or until a resume attempt
     // fails.
-    // eslint-disable-next-line no-constant-condition
+
     while (true) {
       try {
         const hasNext = await this.cursor.hasNext();
@@ -706,7 +706,7 @@ export class ChangeStream<
     // Change streams must resume indefinitely while each resume event succeeds.
     // This loop continues until either a change event is received or until a resume attempt
     // fails.
-    // eslint-disable-next-line no-constant-condition
+
     while (true) {
       try {
         const change = await this.cursor.next();
@@ -735,7 +735,7 @@ export class ChangeStream<
     // Change streams must resume indefinitely while each resume event succeeds.
     // This loop continues until either a change event is received or until a resume attempt
     // fails.
-    // eslint-disable-next-line no-constant-condition
+
     while (true) {
       try {
         const change = await this.cursor.tryNext();
@@ -850,10 +850,10 @@ export class ChangeStream<
       this.type === CHANGE_DOMAIN_TYPES.CLUSTER
         ? (this.parent as MongoClient)
         : this.type === CHANGE_DOMAIN_TYPES.DATABASE
-        ? (this.parent as Db).client
-        : this.type === CHANGE_DOMAIN_TYPES.COLLECTION
-        ? (this.parent as Collection).client
-        : null;
+          ? (this.parent as Db).client
+          : this.type === CHANGE_DOMAIN_TYPES.COLLECTION
+            ? (this.parent as Collection).client
+            : null;
 
     if (client == null) {
       // This should never happen because of the assertion in the constructor
@@ -884,7 +884,6 @@ export class ChangeStream<
   private _closeEmitterModeWithError(error: AnyError): void {
     this.emit(ChangeStream.ERROR, error);
 
-    // eslint-disable-next-line github/no-then
     this.close().then(undefined, squashError);
   }
 
@@ -949,7 +948,7 @@ export class ChangeStream<
 
     if (isResumableError(changeStreamError, this.cursor.maxWireVersion)) {
       this._endStream();
-      // eslint-disable-next-line github/no-then
+
       this.cursor.close().then(undefined, squashError);
 
       const topology = getTopology(this.parent);
@@ -957,7 +956,7 @@ export class ChangeStream<
         .selectServer(this.cursor.readPreference, {
           operationName: 'reconnect topology in change stream'
         })
-        // eslint-disable-next-line github/no-then
+
         .then(
           () => {
             this.cursor = this._createChangeStreamCursor(this.cursor.resumeOptions);

package/src/client-side-encryption/mongocryptd_manager.ts

@@ -49,7 +49,7 @@ export class MongocryptdManager {
   async spawn(): Promise<void> {
     const cmdName = this.spawnPath || 'mongocryptd';
 
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const { spawn } = require('child_process') as typeof import('child_process');
 
     // Spawned with stdio: ignore and detached: true

package/src/cmap/auth/gssapi.ts

@@ -168,7 +168,7 @@ export async function performGSSAPICanonicalizeHostName(
       const results = await dns.promises.resolvePtr(address);
       // If the ptr did not error but had no results, return the host.
       return results.length > 0 ? results[0] : host;
-    } catch (error) {
+    } catch {
       // This can error as ptr records may not exist for all ips. In this case
       // fallback to a cname lookup as dns.lookup() does not return the
       // cname.

package/src/cmap/auth/mongodb_aws.ts

@@ -78,8 +78,8 @@ export class MongoDBAWS extends AuthProvider {
       accessKeyId && secretAccessKey && sessionToken
         ? { accessKeyId, secretAccessKey, sessionToken }
         : accessKeyId && secretAccessKey
-        ? { accessKeyId, secretAccessKey }
-        : undefined;
+          ? { accessKeyId, secretAccessKey }
+          : undefined;
 
     const db = credentials.source;
     const nonce = await randomBytes(32);

package/src/cmap/auth/mongodb_oidc/callback_workflow.ts

@@ -160,9 +160,9 @@ export abstract class CallbackWorkflow implements Workflow {
       // previous lock, only the current callback's value would get returned.
       await lock;
       lock = lock
-        // eslint-disable-next-line github/no-then
+
         .catch(() => null)
-        // eslint-disable-next-line github/no-then
+
         .then(async () => {
           const difference = Date.now() - this.lastExecutionTime;
           if (difference <= THROTTLE_MS) {

package/src/cmap/auth/mongodb_oidc/machine_workflow.ts

@@ -115,9 +115,9 @@ export abstract class MachineWorkflow implements Workflow {
       // previous lock, only the current callback's value would get returned.
       await lock;
       lock = lock
-        // eslint-disable-next-line github/no-then
+
         .catch(() => null)
-        // eslint-disable-next-line github/no-then
+
         .then(async () => {
           const difference = Date.now() - this.lastExecutionTime;
           if (difference <= THROTTLE_MS) {

package/src/cmap/commands.ts

@@ -75,7 +75,11 @@ export class OpQueryRequest {
   exhaust: boolean;
   partial: boolean;
 
-  constructor(public databaseName: string, public query: Document, options: OpQueryOptions) {
+  constructor(
+    public databaseName: string,
+    public query: Document,
+    options: OpQueryOptions
+  ) {
     // Basic options needed to be passed in
     // TODO(NODE-3483): Replace with MongoCommandError
     const ns = `${databaseName}.$cmd`;

package/src/cmap/connection.ts

@@ -332,7 +332,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
 
     this.socket.destroy();
     this.error = error;
-    // eslint-disable-next-line github/no-then
+
     this.dataEvents?.throw(error).then(undefined, squashError);
     this.closed = true;
     this.emit(Connection.CLOSE);
@@ -602,7 +602,7 @@ export class Connection extends TypedEventEmitter<ConnectionEvents> {
       }
       throw new MongoUnexpectedServerResponseError('Server ended moreToCome unexpectedly');
     };
-    // eslint-disable-next-line github/no-then
+
     exhaustLoop().then(undefined, replyListener);
   }
 

package/src/cmap/connection_pool.ts

@@ -638,7 +638,6 @@ export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
       new ConnectionCreatedEvent(this, { id: connectOptions.id })
     );
 
-    // eslint-disable-next-line github/no-then
     connect(connectOptions).then(
       connection => {
         // The pool might have closed since we started trying to create a connection

package/src/cmap/handshake/client_metadata.ts

@@ -6,7 +6,7 @@ import { MongoInvalidArgumentError } from '../../error';
 import type { MongoOptions } from '../../mongo_client';
 import { fileIsAccessible } from '../../utils';
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const NODE_DRIVER_VERSION = require('../../../package.json').version;
 
 /**

package/src/cmap/wire_protocol/shared.ts

@@ -1,6 +1,5 @@
 import { MongoInvalidArgumentError } from '../../error';
-import type { ReadPreferenceLike } from '../../read_preference';
-import { ReadPreference } from '../../read_preference';
+import { ReadPreference, type ReadPreferenceLike } from '../../read_preference';
 import { ServerType } from '../../sdam/common';
 import type { Server } from '../../sdam/server';
 import type { ServerDescription } from '../../sdam/server_description';

package/src/collection.ts

@@ -47,17 +47,18 @@ import {
   FindOneAndUpdateOperation,
   type FindOneAndUpdateOptions
 } from './operations/find_and_modify';
-import type {
-  CreateIndexesOptions,
-  DropIndexesOptions,
-  IndexDescription,
-  IndexDescriptionCompact,
-  IndexDescriptionInfo,
-  IndexInformationOptions,
-  IndexSpecification,
-  ListIndexesOptions
+import {
+  CreateIndexesOperation,
+  type CreateIndexesOptions,
+  type DropIndexesOptions,
+  DropIndexOperation,
+  type IndexDescription,
+  type IndexDescriptionCompact,
+  type IndexDescriptionInfo,
+  type IndexInformationOptions,
+  type IndexSpecification,
+  type ListIndexesOptions
 } from './operations/indexes';
-import { CreateIndexesOperation, DropIndexOperation } from './operations/indexes';
 import {
   InsertManyOperation,
   type InsertManyResult,
@@ -1121,8 +1122,8 @@ export class Collection<TSchema extends Document = Document> {
       indexNameOrOptions == null
         ? null
         : typeof indexNameOrOptions === 'object'
-        ? null
-        : indexNameOrOptions;
+          ? null
+          : indexNameOrOptions;
 
     return new ListSearchIndexesCursor(this as TODO_NODE_3286, indexName, options);
   }

package/src/connection_string.ts

@@ -73,7 +73,7 @@ export async function resolveSRVRecord(options: MongoOptions): Promise<HostAddre
   // the SRV record is resolved before starting a second DNS query.
   const lookupAddress = options.srvHost;
   const txtResolutionPromise = dns.promises.resolveTxt(lookupAddress);
-  // eslint-disable-next-line github/no-then
+
   txtResolutionPromise.then(undefined, squashError); // rejections will be handled later
 
   // Resolve the SRV record and use the result as the list of hosts to connect to.
@@ -552,7 +552,6 @@ export function parseOptions(
 
   mongoOptions.metadata = makeClientMetadata(mongoOptions);
 
-  // eslint-disable-next-line github/no-then
   mongoOptions.extendedMetadata = addContainerMetadata(mongoOptions.metadata).then(
     undefined,
     squashError

package/src/constants.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 export const SYSTEM_NAMESPACE_COLLECTION = 'system.namespaces';
 export const SYSTEM_INDEX_COLLECTION = 'system.indexes';
 export const SYSTEM_PROFILE_COLLECTION = 'system.profile';

package/src/cursor/abstract_cursor.ts

@@ -656,7 +656,6 @@ export abstract class AbstractCursor<
       // We only want to end this session if we created it, and it hasn't ended yet
       if (session.explicit === false) {
         if (!session.hasEnded) {
-          // eslint-disable-next-line github/no-then
           session.endSession().then(undefined, squashError);
         }
         this.cursorSession = this.cursorClient.startSession({ owner: this, explicit: false });
@@ -882,7 +881,6 @@ class ReadableCursorStream extends Readable {
   }
 
   override _destroy(error: Error | null, callback: (error?: Error | null) => void): void {
-    // eslint-disable-next-line github/no-then
     this._cursor.close().then(
       () => callback(error),
       closeError => callback(closeError)
@@ -895,13 +893,11 @@ class ReadableCursorStream extends Readable {
       return;
     }
 
-    // eslint-disable-next-line github/no-then
     this._cursor.next().then(
       result => {
         if (result == null) {
           this.push(null);
         } else if (this.destroyed) {
-          // eslint-disable-next-line github/no-then
           this._cursor.close().then(undefined, squashError);
         } else {
           if (this.push(result)) {
@@ -917,7 +913,6 @@ class ReadableCursorStream extends Readable {
         //       a client during iteration. Alternatively, we could do the "right" thing and
         //       propagate the error message by removing this special case.
         if (err.message.match(/server is closed/)) {
-          // eslint-disable-next-line github/no-then
           this._cursor.close().then(undefined, squashError);
           return this.push(null);
         }

package/src/cursor/aggregation_cursor.ts

@@ -5,10 +5,12 @@ import { AggregateOperation, type AggregateOptions } from '../operations/aggrega
 import { executeOperation } from '../operations/execute_operation';
 import type { ClientSession } from '../sessions';
 import type { Sort } from '../sort';
-import type { MongoDBNamespace } from '../utils';
-import { mergeOptions } from '../utils';
-import type { AbstractCursorOptions, InitialCursorResponse } from './abstract_cursor';
-import { AbstractCursor } from './abstract_cursor';
+import { mergeOptions, type MongoDBNamespace } from '../utils';
+import {
+  AbstractCursor,
+  type AbstractCursorOptions,
+  type InitialCursorResponse
+} from './abstract_cursor';
 
 /** @public */
 export interface AggregationCursorOptions extends AbstractCursorOptions, AggregateOptions {}

package/src/deps.ts

@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
 import { type Stream } from './cmap/connect';
 import { MongoMissingDependencyError } from './error';
 import type { Callback } from './utils';
@@ -24,6 +23,7 @@ export function getKerberos(): Kerberos {
   let kerberos: Kerberos;
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     kerberos = require('kerberos');
   } catch (error) {
     kerberos = makeErrorModule(
@@ -63,6 +63,7 @@ export type ZStandard = ZStandardLib | { kModuleError: MongoMissingDependencyErr
 export function getZstdLibrary(): ZStandardLib | { kModuleError: MongoMissingDependencyError } {
   let ZStandard: ZStandardLib | { kModuleError: MongoMissingDependencyError };
   try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     ZStandard = require('@mongodb-js/zstd');
   } catch (error) {
     ZStandard = makeErrorModule(
@@ -101,6 +102,7 @@ export function getAwsCredentialProvider():
   | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const credentialProvider = require('@aws-sdk/credential-providers');
     return credentialProvider;
   } catch (error) {
@@ -122,6 +124,7 @@ export type GcpMetadata =
 export function getGcpMetadata(): GcpMetadata {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const credentialProvider = require('gcp-metadata');
     return credentialProvider;
   } catch (error) {
@@ -153,6 +156,7 @@ export type SnappyLib = {
 export function getSnappy(): SnappyLib | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const value = require('snappy');
     return value;
   } catch (error) {
@@ -187,6 +191,7 @@ export type SocksLib = {
 export function getSocks(): SocksLib | { kModuleError: MongoMissingDependencyError } {
   try {
     // Ensure you always wrap an optional require in the try block NODE-3199
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     const value = require('socks');
     return value;
   } catch (error) {
@@ -244,6 +249,7 @@ export const aws4: AWS4 | { kModuleError: MongoMissingDependencyError } = loadAw
 function loadAws4() {
   let aws4: AWS4 | { kModuleError: MongoMissingDependencyError };
   try {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     aws4 = require('aws4');
   } catch (error) {
     aws4 = makeErrorModule(
@@ -267,6 +273,7 @@ export function getMongoDBClientEncryption():
     // NOTE(NODE-3199): Ensure you always wrap an optional require literally in the try block
     // Cannot be moved to helper utility function, bundlers search and replace the actual require call
     // in a way that makes this line throw at bundle time, not runtime, catching here will make bundling succeed
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
     mongodbClientEncryption = require('mongodb-client-encryption');
   } catch (error) {
     const kModuleError = new MongoMissingDependencyError(

package/src/error.ts

@@ -1255,9 +1255,8 @@ export function needsRetryableWriteLabel(
       // use original top-level code from server response
       return RETRYABLE_WRITE_ERROR_CODES.has(error.result.code ?? 0);
     }
-    return RETRYABLE_WRITE_ERROR_CODES.has(
-      error.result.writeConcernError.code ?? Number(error.code) ?? 0
-    );
+    const code = error.result.writeConcernError.code ?? Number(error.code);
+    return RETRYABLE_WRITE_ERROR_CODES.has(Number.isNaN(code) ? 0 : code);
   }
 
   if (error instanceof MongoError) {

package/src/gridfs/download.ts

@@ -216,7 +216,7 @@ function doRead(stream: GridFSBucketReadStream): void {
 
     if (!doc) {
       stream.push(null);
-      // eslint-disable-next-line github/no-then
+
       stream.s.cursor?.close().then(undefined, error => stream.destroy(error));
       return;
     }
@@ -288,7 +288,6 @@ function doRead(stream: GridFSBucketReadStream): void {
     return;
   };
 
-  // eslint-disable-next-line github/no-then
   stream.s.cursor.next().then(handleReadResult, error => {
     if (stream.destroyed) return;
     stream.destroy(error);
@@ -372,7 +371,6 @@ function init(stream: GridFSBucketReadStream): void {
     return;
   };
 
-  // eslint-disable-next-line github/no-then
   stream.s.files.findOne(stream.s.filter, findOneOptions).then(handleReadResult, error => {
     if (stream.destroyed) return;
     stream.destroy(error);

package/src/gridfs/upload.ts

@@ -1,7 +1,6 @@
 import { Writable } from 'stream';
 
-import type { Document } from '../bson';
-import { ObjectId } from '../bson';
+import { type Document, ObjectId } from '../bson';
 import type { Collection } from '../collection';
 import { MongoAPIError, MONGODB_ERROR_CODES, MongoError } from '../error';
 import { type Callback, squashError } from '../utils';
@@ -135,7 +134,6 @@ export class GridFSBucketWriteStream extends Writable {
     if (!this.bucket.s.calledOpenUploadStream) {
       this.bucket.s.calledOpenUploadStream = true;
 
-      // eslint-disable-next-line github/no-then
       checkIndexes(this).then(() => {
         this.bucket.s.checkedIndexes = true;
         this.bucket.emit('index');
@@ -272,7 +270,6 @@ function checkDone(stream: GridFSBucketWriteStream, callback: Callback): void {
       return;
     }
 
-    // eslint-disable-next-line github/no-then
     stream.files.insertOne(gridFSFile, { writeConcern: stream.writeConcern }).then(
       () => {
         stream.gridFSFile = gridFSFile;
@@ -396,7 +393,6 @@ function doWrite(
         return;
       }
 
-      // eslint-disable-next-line github/no-then
       stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
         () => {
           --stream.state.outstandingRequests;
@@ -437,7 +433,6 @@ function writeRemnant(stream: GridFSBucketWriteStream, callback: Callback): void
     return;
   }
 
-  // eslint-disable-next-line github/no-then
   stream.chunks.insertOne(doc, { writeConcern: stream.writeConcern }).then(
     () => {
       --stream.state.outstandingRequests;

package/src/mongo_logger.ts

@@ -839,9 +839,9 @@ export class MongoLogger {
 
     if (isPromiseLike(this.pendingLog)) {
       this.pendingLog = this.pendingLog
-        // eslint-disable-next-line github/no-then
+
         .then(() => this.logDestination.write(logMessage))
-        // eslint-disable-next-line github/no-then
+
         .then(this.clearPendingLog.bind(this), this.logWriteFailureHandler.bind(this));
       return;
     }
@@ -849,7 +849,6 @@ export class MongoLogger {
     try {
       const logResult = this.logDestination.write(logMessage);
       if (isPromiseLike(logResult)) {
-        // eslint-disable-next-line github/no-then
         this.pendingLog = logResult.then(
           this.clearPendingLog.bind(this),
           this.logWriteFailureHandler.bind(this)