refactor: improve import structure and enhance MongoClient options

Author: nbbeeken

test/unit/client-side-encryption/auto_encrypter.test.ts

@@ -3,15 +3,15 @@ import * as fs from 'fs';
 import * as net from 'net';
 import * as sinon from 'sinon';
 
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { AutoEncrypter } from '../../../src/client-side-encryption/auto_encrypter';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { MongocryptdManager } from '../../../src/client-side-encryption/mongocryptd_manager';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { StateMachine } from '../../../src/client-side-encryption/state_machine';
-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
-import { MongoClient } from '../../../src/mongo_client';
-import { BSON, type DataKey } from '../../mongodb';
+import {
+  AutoEncrypter,
+  type AutoEncryptionOptions,
+  BSON,
+  type DataKey,
+  MongoClient,
+  MongocryptdManager,
+  StateMachine
+} from '../../mongodb';
 import * as requirements from './requirements.helper';
 
 const bson = BSON;
@@ -92,8 +92,7 @@ describe('AutoEncrypter', function () {
   describe('#constructor', function () {
     context('when using mongocryptd', function () {
       const client = new MockClient() as MongoClient;
-      const autoEncrypterOptions = {
-        mongocryptdBypassSpawn: true,
+      const autoEncrypterOptions: AutoEncryptionOptions = {
         keyVaultNamespace: 'admin.datakeys',
         options: {
           // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -102,6 +101,9 @@ describe('AutoEncrypter', function () {
         kmsProviders: {
           aws: { accessKeyId: 'example', secretAccessKey: 'example' },
           local: { key: Buffer.alloc(96) }
+        },
+        extraOptions: {
+          mongocryptdBypassSpawn: true
         }
       };
       const autoEncrypter = new AutoEncrypter(client, autoEncrypterOptions);

test/unit/mongo_client.test.ts

@@ -25,8 +25,11 @@ import {
 
 describe('MongoClient', function () {
   const client: MongoClient = {
-    listeners: () => []
-  } as MongoClient;
+    listeners: () => [],
+    on() {
+      return this;
+    }
+  } as unknown as MongoClient;
 
   it('programmatic options should override URI options', function () {
     const options = parseOptions('mongodb://localhost:27017/test?directConnection=true', client, {
@@ -76,34 +79,30 @@ describe('MongoClient', function () {
     expect(options).has.property('tls', true);
   });
 
-  const ALL_OPTIONS = {
+  const ALL_OPTIONS: MongoClientOptions = {
     appName: 'cats',
     auth: { username: 'username', password: 'password' },
     authMechanism: 'SCRAM-SHA-1',
     authMechanismProperties: { SERVICE_NAME: 'service name here' },
     authSource: 'refer to dbName',
-    autoEncryption: { bypassAutoEncryption: true },
+    autoEncryption: { bypassAutoEncryption: true, kmsProviders: { aws: {} } },
     checkKeys: true,
-    checkServerIdentity: false,
+    checkServerIdentity: () => undefined,
     compressors: 'snappy,zlib',
     connectTimeoutMS: 123,
     directConnection: true,
-    dbName: 'test',
     driverInfo: { name: 'MyDriver', platform: 'moonOS' },
     family: 6,
     fieldsAsRaw: { rawField: true },
     forceServerObjectId: true,
-    fsync: true,
     heartbeatFrequencyMS: 3,
     ignoreUndefined: false,
-    j: true,
-    journal: false,
+    journal: true,
     localThresholdMS: 3,
     maxConnecting: 5,
     maxIdleTimeMS: 3,
     maxPoolSize: 2,
     maxStalenessSeconds: 3,
-    minInternalBufferSize: 0,
     minPoolSize: 1,
     monitorCommands: true,
     noDelay: true,
@@ -136,7 +135,6 @@ describe('MongoClient', function () {
     w: 'majority',
     waitQueueTimeoutMS: 3,
     writeConcern: new WriteConcern(2),
-    wtimeout: 5,
     wtimeoutMS: 6,
     zlibCompressionLevel: 2
   };
@@ -150,7 +148,7 @@ describe('MongoClient', function () {
     // Check consolidated options
     expect(options).has.property('writeConcern');
     expect(options.writeConcern).has.property('w', 2);
-    expect(options.writeConcern).has.property('j', true);
+    expect(options.writeConcern).has.property('journal', true);
   });
 
   const allURIOptions =