reverting unnecessary changes outside of unit tests

Author: PavelSafronov

test/action/dependency.test.ts

@@ -5,7 +5,7 @@ import * as path from 'node:path';
 import { expect } from 'chai';
 
 import { dependencies, peerDependencies, peerDependenciesMeta } from '../../package.json';
-import { setDifference } from '../../src/utils';
+import { setDifference } from '../mongodb';
 import { alphabetically, itInNodeProcess, sorted } from '../tools/utils';
 
 const EXPECTED_DEPENDENCIES = sorted(

test/integration/auth/auth.prose.test.ts

@@ -1,10 +1,7 @@
 import { expect } from 'chai';
 import * as sinon from 'sinon';
 
-import { ScramSHA256 } from '../../../src/cmap/auth/scram';
-import { Connection } from '../../../src/cmap/connection';
-import { LEGACY_HELLO_COMMAND } from '../../../src/constants';
-import { type MongoClient } from '../../../src/mongo_client';
+import { Connection, LEGACY_HELLO_COMMAND, type MongoClient, ScramSHA256 } from '../../mongodb';
 import { type TestConfiguration } from '../../tools/runner/config';
 
 function makeConnectionString(config, username, password) {

test/integration/auth/mongodb_aws.test.ts

@@ -1,24 +1,26 @@
 import * as process from 'node:process';
 
-import { type Document } from 'bson';
 import { expect } from 'chai';
 import * as http from 'http';
 import { performance } from 'perf_hooks';
 import * as sinon from 'sinon';
 
 import { refreshKMSCredentials } from '../../../src/client-side-encryption/providers';
-import { AWSSDKCredentialProvider } from '../../../src/cmap/auth/aws_temporary_credentials';
-import { MongoDBAWS } from '../../../src/cmap/auth/mongodb_aws';
-import { type CommandOptions, Connection } from '../../../src/cmap/connection';
-import { type MongoDBResponseConstructor } from '../../../src/cmap/wire_protocol/responses';
 import {
+  AWSSDKCredentialProvider,
+  type CommandOptions,
+  Connection,
+  type Document,
   MongoAWSError,
+  type MongoClient,
+  MongoDBAWS,
+  type MongoDBNamespace,
+  type MongoDBResponseConstructor,
   MongoMissingCredentialsError,
   MongoMissingDependencyError,
-  MongoServerError
-} from '../../../src/error';
-import { type MongoClient } from '../../../src/mongo_client';
-import { type MongoDBNamespace, setDifference } from '../../../src/utils';
+  MongoServerError,
+  setDifference
+} from '../../mongodb';
 
 const isMongoDBAWSAuthEnvironment = (process.env.MONGODB_URI ?? '').includes('MONGODB-AWS');
 

test/integration/client-side-encryption/client_side_encryption.prose.21.automatic_data_encryption_keys.test.ts

@@ -2,14 +2,12 @@ import { expect } from 'chai';
 
 import { ClientEncryption } from '../../../src/client-side-encryption/client_encryption';
 import { MongoCryptCreateEncryptedCollectionError } from '../../../src/client-side-encryption/errors';
-import { Collection } from '../../../src/collection';
-import { type Db } from '../../../src/db';
-import { MongoServerError } from '../../../src/error';
 import {
   getCSFLEKMSProviders,
   kmsCredentialsPresent,
   missingKeys
 } from '../../csfle-kms-providers';
+import { Collection, type Db, MongoServerError } from '../../mongodb';
 
 const metadata: MongoDBMetadataUI = {
   requires: {

test/integration/enumerate_databases.prose.test.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 
-import { type MongoClient } from '../../src/mongo_client';
+import type { MongoClient } from '../mongodb';
 
 const REQUIRED_DBS = ['admin', 'local', 'config'];
 const DB_NAME = 'listDatabasesTest';

test/integration/enumerate_databases.test.ts

@@ -1,8 +1,7 @@
 import { expect } from 'chai';
 import { once } from 'events';
 
-import { MongoServerError } from '../../src/error';
-import { type MongoClient } from '../../src/mongo_client';
+import { type MongoClient, MongoServerError } from '../mongodb';
 import { TestBuilder, UnifiedTestSuiteBuilder } from '../tools/unified_suite_builder';
 
 const metadata: MongoDBMetadataUI = {

test/integration/index_management.test.ts

@@ -1,13 +1,13 @@
 import { expect } from 'chai';
 
 import {
+  type Collection,
   type CommandStartedEvent,
-  type CommandSucceededEvent
-} from '../../src/cmap/command_monitoring_events';
-import { type Collection } from '../../src/collection';
-import { type Db } from '../../src/db';
-import { MongoServerError } from '../../src/error';
-import { type MongoClient } from '../../src/mongo_client';
+  type CommandSucceededEvent,
+  type Db,
+  type MongoClient,
+  MongoServerError
+} from '../mongodb';
 import { type FailCommandFailPoint } from '../tools/utils';
 import { assert as test, filterForCommands, setupDatabase } from './shared';
 

test/tools/mongodb-mock/index.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const { MockServer } = require('./src/server.js');
-const { LEGACY_HELLO_COMMAND } = require('../../../src/constants.ts');
+const { LEGACY_HELLO_COMMAND } = require('../../mongodb');
 
 let mockServers = [];
 

test/tools/runner/config.ts

@@ -1,19 +1,25 @@
 import * as util from 'node:util';
 import * as types from 'node:util/types';
 
-import { Double, Long, ObjectId } from 'bson';
 import { expect } from 'chai';
 import { type Context } from 'mocha';
 import ConnectionString from 'mongodb-connection-string-url';
 import { type CompressorName } from 'mongodb-legacy';
 import * as qs from 'querystring';
 import * as url from 'url';
 
-import { type AuthMechanism } from '../../../src/cmap/auth/providers';
-import { MongoClient, type MongoClientOptions, type ServerApi } from '../../../src/mongo_client';
-import { TopologyType } from '../../../src/sdam/common';
-import { HostAddress } from '../../../src/utils';
-import { type WriteConcernSettings } from '../../../src/write_concern';
+import {
+  type AuthMechanism,
+  Double,
+  HostAddress,
+  Long,
+  MongoClient,
+  type MongoClientOptions,
+  ObjectId,
+  type ServerApi,
+  TopologyType,
+  type WriteConcernSettings
+} from '../../mongodb';
 import { getEnvironmentalOptions } from '../utils';
 import { type Filter } from './filters/filter';
 import { flakyTests } from './flaky';

test/tools/runner/filters/filter.ts

@@ -1,4 +1,4 @@
-import { type MongoClient } from '../../../../src/mongo_client';
+import { type MongoClient } from '../../../mongodb';
 
 export abstract class Filter {
   async initializeFilter(_client: MongoClient, _context: Record<string, any>): Promise<void> {