From ab1c21a5a07aabe1e7b673cc8b9b7b3de871d73c Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Fri, 13 Jan 2023 12:34:57 -0500 Subject: [PATCH 1/3] test(NODE-4918): missing mongodb imports --- src/collection.ts | 1 - test/integration/auth/mongodb_aws.test.ts | 2 +- test/integration/auth/scram_sha_1.test.ts | 2 +- test/integration/auth/ssl_x509_connect.test.js | 2 +- .../bson-decimal128/decimal128.test.js | 2 +- .../change-streams/change_stream.test.ts | 4 ++-- .../change_streams.prose.test.ts | 5 +++-- .../client-side-encryption/driver.test.ts | 2 +- .../collection-management/collection.test.ts | 3 +-- .../connection.test.ts | 4 +++- ...connections_survive_step_down.prose.test.ts | 2 +- test/integration/crud/bulk.test.ts | 2 +- test/integration/crud/crud.prose.test.js | 2 +- test/integration/crud/crud_api.test.ts | 2 +- test/integration/crud/explain.test.js | 2 +- test/integration/crud/find.test.js | 2 +- test/integration/crud/insert.test.js | 2 +- test/integration/crud/maxTimeMS.test.ts | 2 +- test/integration/crud/pk_factory.test.js | 2 +- test/integration/crud/server_errors.test.js | 2 +- .../enumerate_databases.prose.test.ts | 2 +- test/integration/enumerate_databases.test.ts | 2 +- test/integration/gridfs/gridfs.spec.test.js | 2 +- test/integration/gridfs/gridfs.test.ts | 2 +- test/integration/gridfs/gridfs_stream.test.js | 2 +- ...initial_dns_seedlist_discovery.spec.test.ts | 3 +-- .../max-staleness/max_staleness.test.js | 2 +- .../node-specific/abstract_cursor.test.ts | 2 +- .../node-specific/auto_connect.test.ts | 5 +++-- .../bson-options/ignore_undefined.test.js | 2 +- .../bson-options/promote_values.test.js | 2 +- .../node-specific/bson-options/raw.test.ts | 2 +- .../comment_with_falsy_values.test.ts | 2 +- .../node-specific/cursor_stream.test.js | 2 +- test/integration/node-specific/db.test.js | 2 +- .../examples/transactions.test.js | 2 +- .../node-specific/examples/versioned_api.js | 2 +- .../node-specific/feature_flags.test.ts | 3 +-- test/integration/node-specific/ipv6.test.ts | 2 +- .../node-specific/mongo_client.test.ts | 11 ++++++++--- .../node-specific/operation_examples.test.ts | 2 +- test/integration/objectid.test.js | 2 +- .../read-write-concern/write_concern.test.js | 2 +- .../retryable_reads.spec.prose.test.ts | 2 +- .../retryable_writes.spec.prose.test.ts | 6 +++--- .../retryable_writes.spec.test.ts | 2 +- ...rver_discovery_and_monitoring.prose.test.ts | 2 +- .../topology_description.test.ts | 3 +-- .../server-selection/operation_count.test.ts | 3 +-- .../server-selection/readpreference.test.js | 2 +- ...ver_selection.prose.operation_count.test.ts | 3 +-- test/integration/sessions/sessions.test.ts | 2 +- .../transactions/transactions.test.ts | 9 +++++++-- .../atlas_data_lake_testing.prose.js | 2 +- test/manual/atlas_connectivity.test.js | 2 +- test/manual/kerberos.test.js | 2 +- test/manual/ldap.test.js | 2 +- test/manual/ocsp_support.test.js | 2 +- test/manual/socks5.test.ts | 3 +-- test/manual/tls_support.test.js | 2 +- test/tools/cmap_spec_runner.ts | 5 ++++- test/tools/runner/config.ts | 10 ++++++++-- .../runner/filters/client_encryption_filter.js | 2 +- test/tools/runner/hooks/configuration.js | 2 +- test/tools/runner/hooks/legacy_crud_shims.ts | 2 +- test/tools/unified-spec-runner/match.ts | 18 ++++++++---------- test/tools/unified-spec-runner/operations.ts | 10 ++++------ test/tools/unified-spec-runner/schema.ts | 2 +- .../tools/unified-spec-runner/unified-utils.ts | 4 ++-- test/tools/uri_spec_runner.ts | 3 +-- test/unit/assorted/client.test.js | 2 +- test/unit/assorted/collations.test.js | 4 ++-- test/unit/assorted/imports.test.ts | 2 +- ..._records_for_mongos_discovery.prose.test.ts | 2 +- test/unit/assorted/scram_iterations.test.ts | 9 +++++++-- test/unit/assorted/sessions_client.test.js | 2 +- test/unit/assorted/sessions_collection.test.js | 2 +- test/unit/assorted/wire_version.test.js | 2 +- test/unit/assorted/write_concern.test.js | 2 +- test/unit/bson.test.js | 3 +-- test/unit/collection.test.ts | 3 +-- test/unit/cursor/abstract_cursor.test.ts | 12 ++++++++++-- test/unit/db.test.ts | 3 +-- test/unit/mongo_client.test.js | 2 +- test/unit/read_preference.test.ts | 2 +- test/unit/sdam/server.test.ts | 6 ++++-- test/unit/sdam/server_description.test.ts | 2 +- test/unit/sdam/topology.test.js | 2 +- test/unit/sessions.test.js | 2 +- test/unit/transactions.test.ts | 3 +-- 90 files changed, 151 insertions(+), 130 deletions(-) diff --git a/src/collection.ts b/src/collection.ts index 5babeaa8edc..75d597aa639 100644 --- a/src/collection.ts +++ b/src/collection.ts @@ -86,7 +86,6 @@ import { Callback, checkCollectionName, DEFAULT_PK_FACTORY, - emitWarningOnce, MongoDBNamespace, normalizeHintField, resolveOptions diff --git a/test/integration/auth/mongodb_aws.test.ts b/test/integration/auth/mongodb_aws.test.ts index 89dafe5d1eb..4f404ffa94f 100644 --- a/test/integration/auth/mongodb_aws.test.ts +++ b/test/integration/auth/mongodb_aws.test.ts @@ -3,7 +3,7 @@ import * as http from 'http'; import { performance } from 'perf_hooks'; import * as sinon from 'sinon'; -import { MongoAWSError, MongoClient, MongoServerError } from '../../../src'; +import { MongoAWSError, MongoClient, MongoServerError } from '../../mongodb'; import { removeAuthFromConnectionString } from '../../tools/utils'; describe('MONGODB-AWS', function () { diff --git a/test/integration/auth/scram_sha_1.test.ts b/test/integration/auth/scram_sha_1.test.ts index 3865b97ac6c..2d1ef2fb691 100644 --- a/test/integration/auth/scram_sha_1.test.ts +++ b/test/integration/auth/scram_sha_1.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import type { MongoClient } from '../../../src'; +import type { MongoClient } from '../../mongodb'; describe('SCRAM-SHA-1', function () { let client: MongoClient; diff --git a/test/integration/auth/ssl_x509_connect.test.js b/test/integration/auth/ssl_x509_connect.test.js index fb3ef69f3e0..307b682747e 100644 --- a/test/integration/auth/ssl_x509_connect.test.js +++ b/test/integration/auth/ssl_x509_connect.test.js @@ -3,7 +3,7 @@ const fs = require('fs'); const { format: f } = require('util'); const { test, setupDatabase } = require('../shared'); const { expect } = require('chai'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); describe('SSL (x509)', function () { before(function () { diff --git a/test/integration/bson-decimal128/decimal128.test.js b/test/integration/bson-decimal128/decimal128.test.js index 8aadf27757b..81b33ce6a46 100644 --- a/test/integration/bson-decimal128/decimal128.test.js +++ b/test/integration/bson-decimal128/decimal128.test.js @@ -2,7 +2,7 @@ const { assert: test } = require('../shared'); const { expect } = require('chai'); const { setupDatabase } = require('../shared'); -const { Decimal128 } = require('../../../src'); +const { Decimal128 } = require('../../mongodb'); describe('Decimal128', function () { before(function () { diff --git a/test/integration/change-streams/change_stream.test.ts b/test/integration/change-streams/change_stream.test.ts index 7c1b565b920..05074716af2 100644 --- a/test/integration/change-streams/change_stream.test.ts +++ b/test/integration/change-streams/change_stream.test.ts @@ -14,6 +14,7 @@ import { Collection, CommandStartedEvent, Db, + isHello, Long, MongoAPIError, MongoChangeStreamError, @@ -21,8 +22,7 @@ import { MongoServerError, ReadPreference, ResumeToken -} from '../../../src'; -import { isHello } from '../../mongodb'; +} from '../../mongodb'; import * as mock from '../../tools/mongodb-mock/index'; import { FailPoint, diff --git a/test/integration/change-streams/change_streams.prose.test.ts b/test/integration/change-streams/change_streams.prose.test.ts index e794e8cfc9d..2f8749bccbc 100644 --- a/test/integration/change-streams/change_streams.prose.test.ts +++ b/test/integration/change-streams/change_streams.prose.test.ts @@ -8,12 +8,13 @@ import { CommandStartedEvent, CommandSucceededEvent, Document, + isHello, + LEGACY_HELLO_COMMAND, Long, MongoNetworkError, ObjectId, Timestamp -} from '../../../src'; -import { isHello, LEGACY_HELLO_COMMAND } from '../../mongodb'; +} from '../../mongodb'; import * as mock from '../../tools/mongodb-mock/index'; import { setupDatabase } from '../shared'; diff --git a/test/integration/client-side-encryption/driver.test.ts b/test/integration/client-side-encryption/driver.test.ts index 23a559c5558..419327f8800 100644 --- a/test/integration/client-side-encryption/driver.test.ts +++ b/test/integration/client-side-encryption/driver.test.ts @@ -2,7 +2,7 @@ import { EJSON, UUID } from 'bson'; import { expect } from 'chai'; import * as crypto from 'crypto'; -import { Collection, CommandStartedEvent, MongoClient } from '../../../src'; +import { Collection, CommandStartedEvent, MongoClient } from '../../mongodb'; import * as BSON from '../../mongodb'; import { installNodeDNSWorkaroundHooks } from '../../tools/runner/hooks/configuration'; import { ClientEncryption } from '../../tools/unified-spec-runner/schema'; diff --git a/test/integration/collection-management/collection.test.ts b/test/integration/collection-management/collection.test.ts index f15d772b2d9..d7fba712315 100644 --- a/test/integration/collection-management/collection.test.ts +++ b/test/integration/collection-management/collection.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { Collection, Db, MongoClient } from '../../../src'; -import { isHello } from '../../mongodb'; +import { Collection, Db, isHello, MongoClient } from '../../mongodb'; import * as mock from '../../tools/mongodb-mock/index'; import { setupDatabase } from '../shared'; diff --git a/test/integration/connection-monitoring-and-pooling/connection.test.ts b/test/integration/connection-monitoring-and-pooling/connection.test.ts index 1e79bfb0f8c..4b0133892bd 100644 --- a/test/integration/connection-monitoring-and-pooling/connection.test.ts +++ b/test/integration/connection-monitoring-and-pooling/connection.test.ts @@ -1,12 +1,14 @@ import { expect } from 'chai'; -import { MongoClient, MongoServerError, ServerHeartbeatStartedEvent } from '../../../src'; import { connect, Connection, HostAddress, LEGACY_HELLO_COMMAND, + MongoClient, + MongoServerError, ns, + ServerHeartbeatStartedEvent, Topology } from '../../mongodb'; import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/configuration'; diff --git a/test/integration/connections-survive-step-down/connections_survive_step_down.prose.test.ts b/test/integration/connections-survive-step-down/connections_survive_step_down.prose.test.ts index 55f3f815eab..cdfaf608c06 100644 --- a/test/integration/connections-survive-step-down/connections_survive_step_down.prose.test.ts +++ b/test/integration/connections-survive-step-down/connections_survive_step_down.prose.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import type { Collection, Db, MongoClient } from '../../../src'; +import type { Collection, Db, MongoClient } from '../../mongodb'; import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/configuration'; function ignoreNsNotFound(err) { diff --git a/test/integration/crud/bulk.test.ts b/test/integration/crud/bulk.test.ts index 4e09d91fd13..e97a47b37c3 100644 --- a/test/integration/crud/bulk.test.ts +++ b/test/integration/crud/bulk.test.ts @@ -8,7 +8,7 @@ import { MongoClient, MongoDriverError, MongoInvalidArgumentError -} from '../../../src'; +} from '../../mongodb'; import { assert as test, ignoreNsNotFound } from '../shared'; const MAX_BSON_SIZE = 16777216; diff --git a/test/integration/crud/crud.prose.test.js b/test/integration/crud/crud.prose.test.js index 2c687f042cc..b4dd851e6de 100644 --- a/test/integration/crud/crud.prose.test.js +++ b/test/integration/crud/crud.prose.test.js @@ -1,6 +1,6 @@ const { expect } = require('chai'); const { once } = require('events'); -const { MongoBulkWriteError, MongoServerError } = require('../../../src'); +const { MongoBulkWriteError, MongoServerError } = require('../../mongodb'); describe('CRUD Prose Spec Tests', () => { let client; diff --git a/test/integration/crud/crud_api.test.ts b/test/integration/crud/crud_api.test.ts index 026c02d32e7..797f6118473 100644 --- a/test/integration/crud/crud_api.test.ts +++ b/test/integration/crud/crud_api.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { MongoClient, MongoError, ObjectId, ReturnDocument } from '../../../src'; +import { MongoClient, MongoError, ObjectId, ReturnDocument } from '../../mongodb'; import { assert as test } from '../shared'; // instanceof cannot be use reliably to detect the new models in js due to scoping and new diff --git a/test/integration/crud/explain.test.js b/test/integration/crud/explain.test.js index 2496ddf118a..f6f26d6711b 100644 --- a/test/integration/crud/explain.test.js +++ b/test/integration/crud/explain.test.js @@ -1,6 +1,6 @@ 'use strict'; const { setupDatabase } = require('../shared'); -const { MongoServerError } = require('../../../src'); +const { MongoServerError } = require('../../mongodb'); const chai = require('chai'); const expect = chai.expect; diff --git a/test/integration/crud/find.test.js b/test/integration/crud/find.test.js index 806bd0f1117..16a9d7cdd5f 100644 --- a/test/integration/crud/find.test.js +++ b/test/integration/crud/find.test.js @@ -3,7 +3,7 @@ const { assert: test } = require('../shared'); const { expect } = require('chai'); const sinon = require('sinon'); const { setTimeout } = require('timers'); -const { Code, ObjectId, Long, Binary, ReturnDocument } = require('../../../src'); +const { Code, ObjectId, Long, Binary, ReturnDocument } = require('../../mongodb'); describe('Find', function () { let client; diff --git a/test/integration/crud/insert.test.js b/test/integration/crud/insert.test.js index 7f19b52d1cc..268a282eb3e 100644 --- a/test/integration/crud/insert.test.js +++ b/test/integration/crud/insert.test.js @@ -19,7 +19,7 @@ const { Code, MongoBulkWriteError, ReturnDocument -} = require('../../../src'); +} = require('../../mongodb'); /** * Module for parsing an ISO 8601 formatted string into a Date object. diff --git a/test/integration/crud/maxTimeMS.test.ts b/test/integration/crud/maxTimeMS.test.ts index c7f97c05380..5cf709d7a79 100644 --- a/test/integration/crud/maxTimeMS.test.ts +++ b/test/integration/crud/maxTimeMS.test.ts @@ -8,7 +8,7 @@ import { MongoClient, MongoCursorExhaustedError, MongoServerError -} from '../../../src'; +} from '../../mongodb'; import { getSymbolFrom } from '../../tools/utils'; describe('MaxTimeMS', function () { diff --git a/test/integration/crud/pk_factory.test.js b/test/integration/crud/pk_factory.test.js index 80b614e2660..09c3cc1f667 100644 --- a/test/integration/crud/pk_factory.test.js +++ b/test/integration/crud/pk_factory.test.js @@ -1,7 +1,7 @@ 'use strict'; const { expect } = require('chai'); const { setupDatabase } = require('../../integration/shared'); -const { ObjectId } = require('../../../src'); +const { ObjectId } = require('../../mongodb'); describe('PkFactory', function () { before(function () { diff --git a/test/integration/crud/server_errors.test.js b/test/integration/crud/server_errors.test.js index 660c4473529..4e238cb04f5 100644 --- a/test/integration/crud/server_errors.test.js +++ b/test/integration/crud/server_errors.test.js @@ -4,7 +4,7 @@ const chai = require('chai'); const expect = chai.expect; const sinonChai = require('sinon-chai'); -const { MongoServerError } = require('../../../src'); +const { MongoServerError } = require('../../mongodb'); chai.use(sinonChai); diff --git a/test/integration/enumerate_databases.prose.test.ts b/test/integration/enumerate_databases.prose.test.ts index 4d3bad1e649..9528d68fada 100644 --- a/test/integration/enumerate_databases.prose.test.ts +++ b/test/integration/enumerate_databases.prose.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import type { MongoClient } from '../../src'; +import type { MongoClient } from '../mongodb'; const REQUIRED_DBS = ['admin', 'local', 'config']; const DB_NAME = 'listDatabasesTest'; diff --git a/test/integration/enumerate_databases.test.ts b/test/integration/enumerate_databases.test.ts index ba2663b3769..88c80c74f93 100644 --- a/test/integration/enumerate_databases.test.ts +++ b/test/integration/enumerate_databases.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { AddUserOptions, MongoClient, MongoServerError } from '../../src'; +import { AddUserOptions, MongoClient, MongoServerError } from '../mongodb'; import { TestBuilder, UnifiedTestSuiteBuilder } from '../tools/utils'; const metadata: MongoDBMetadataUI = { diff --git a/test/integration/gridfs/gridfs.spec.test.js b/test/integration/gridfs/gridfs.spec.test.js index 924596fc623..22028dab225 100644 --- a/test/integration/gridfs/gridfs.spec.test.js +++ b/test/integration/gridfs/gridfs.spec.test.js @@ -3,7 +3,7 @@ const { EJSON } = require('bson'); const { setupDatabase } = require('./../shared'); const { expect } = require('chai'); -const { GridFSBucket } = require('../../../src'); +const { GridFSBucket } = require('../../mongodb'); describe('GridFS spec', function () { before(function () { diff --git a/test/integration/gridfs/gridfs.test.ts b/test/integration/gridfs/gridfs.test.ts index e90aa98cf76..ac046f40f75 100644 --- a/test/integration/gridfs/gridfs.test.ts +++ b/test/integration/gridfs/gridfs.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { once } from 'events'; -import { type Db, type MongoClient, CommandStartedEvent, GridFSBucket } from '../../../src'; +import { type Db, type MongoClient, CommandStartedEvent, GridFSBucket } from '../../mongodb'; import { sleep } from '../../tools/utils'; describe('GridFS', () => { diff --git a/test/integration/gridfs/gridfs_stream.test.js b/test/integration/gridfs/gridfs_stream.test.js index 4ec41f0d386..414805d2232 100644 --- a/test/integration/gridfs/gridfs_stream.test.js +++ b/test/integration/gridfs/gridfs_stream.test.js @@ -4,7 +4,7 @@ const { Double } = require('bson'); const stream = require('stream'); const fs = require('fs'); const { expect } = require('chai'); -const { GridFSBucket, ObjectId } = require('../../../src'); +const { GridFSBucket, ObjectId } = require('../../mongodb'); const sinon = require('sinon'); const { sleep } = require('../../tools/utils'); diff --git a/test/integration/initial-dns-seedlist-discovery/initial_dns_seedlist_discovery.spec.test.ts b/test/integration/initial-dns-seedlist-discovery/initial_dns_seedlist_discovery.spec.test.ts index 34f037685c0..141c5d6fe58 100644 --- a/test/integration/initial-dns-seedlist-discovery/initial_dns_seedlist_discovery.spec.test.ts +++ b/test/integration/initial-dns-seedlist-discovery/initial_dns_seedlist_discovery.spec.test.ts @@ -4,8 +4,7 @@ import * as fs from 'fs'; import * as path from 'path'; import { promisify } from 'util'; -import { MongoClient } from '../../../src'; -import { HostAddress } from '../../mongodb'; +import { HostAddress, MongoClient } from '../../mongodb'; function makeTest(test, topology) { let client; diff --git a/test/integration/max-staleness/max_staleness.test.js b/test/integration/max-staleness/max_staleness.test.js index 2fa51543184..049e2714d73 100644 --- a/test/integration/max-staleness/max_staleness.test.js +++ b/test/integration/max-staleness/max_staleness.test.js @@ -2,7 +2,7 @@ const { Long } = require('bson'); const { expect } = require('chai'); const mock = require('../../tools/mongodb-mock/index'); -const { ReadPreference } = require('../../../src'); +const { ReadPreference } = require('../../mongodb'); const { isHello } = require('../../mongodb'); const test = {}; diff --git a/test/integration/node-specific/abstract_cursor.test.ts b/test/integration/node-specific/abstract_cursor.test.ts index 45941ab8b47..8df548b894f 100644 --- a/test/integration/node-specific/abstract_cursor.test.ts +++ b/test/integration/node-specific/abstract_cursor.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { inspect } from 'util'; -import { Collection, MongoAPIError, MongoClient } from '../../../src'; +import { Collection, MongoAPIError, MongoClient } from '../../mongodb'; const falseyValues = [0, 0n, NaN, '', false, undefined]; diff --git a/test/integration/node-specific/auto_connect.test.ts b/test/integration/node-specific/auto_connect.test.ts index 6b5e993f1f6..02124451b70 100644 --- a/test/integration/node-specific/auto_connect.test.ts +++ b/test/integration/node-specific/auto_connect.test.ts @@ -4,13 +4,14 @@ import { once } from 'events'; import { BSONType, ChangeStream, + ClientSession, Collection, MongoClient, MongoNotConnectedError, ProfilingLevel, + Topology, TopologyType -} from '../../../src'; -import { ClientSession, Topology } from '../../mongodb'; +} from '../../mongodb'; describe('When executing an operation for the first time', () => { let client: MongoClient; diff --git a/test/integration/node-specific/bson-options/ignore_undefined.test.js b/test/integration/node-specific/bson-options/ignore_undefined.test.js index 4919bcc423b..eb342e1121a 100644 --- a/test/integration/node-specific/bson-options/ignore_undefined.test.js +++ b/test/integration/node-specific/bson-options/ignore_undefined.test.js @@ -1,7 +1,7 @@ 'use strict'; const { expect } = require('chai'); const { assert: test, setupDatabase } = require('../../shared'); -const { ObjectId } = require('../../../../src'); +const { ObjectId } = require('../../../mongodb'); describe('Ignore Undefined', function () { before(function () { diff --git a/test/integration/node-specific/bson-options/promote_values.test.js b/test/integration/node-specific/bson-options/promote_values.test.js index d1cd7ef2c29..3ffed223648 100644 --- a/test/integration/node-specific/bson-options/promote_values.test.js +++ b/test/integration/node-specific/bson-options/promote_values.test.js @@ -1,6 +1,6 @@ 'use strict'; const { expect } = require('chai'); -const { Long, Int32, Double } = require('../../../../src'); +const { Long, Int32, Double } = require('../../../mongodb'); const { assert: test, setupDatabase } = require('../../shared'); describe('Promote Values', function () { diff --git a/test/integration/node-specific/bson-options/raw.test.ts b/test/integration/node-specific/bson-options/raw.test.ts index f4c68543d00..2f061f80a6b 100644 --- a/test/integration/node-specific/bson-options/raw.test.ts +++ b/test/integration/node-specific/bson-options/raw.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { Collection, MongoClient, MongoCompatibilityError, ObjectId } from '../../../../src'; +import { Collection, MongoClient, MongoCompatibilityError, ObjectId } from '../../../mongodb'; describe('raw bson support', () => { describe('raw', () => { diff --git a/test/integration/node-specific/comment_with_falsy_values.test.ts b/test/integration/node-specific/comment_with_falsy_values.test.ts index 9cc8950cec8..2d6b68e038b 100644 --- a/test/integration/node-specific/comment_with_falsy_values.test.ts +++ b/test/integration/node-specific/comment_with_falsy_values.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { Collection, CommandStartedEvent, Long, MongoClient } from '../../../src'; +import { Collection, CommandStartedEvent, Long, MongoClient } from '../../mongodb'; import { TestBuilder, UnifiedTestSuiteBuilder } from '../../tools/utils'; const falsyValues = [0, false, '', Long.ZERO, null, NaN] as const; diff --git a/test/integration/node-specific/cursor_stream.test.js b/test/integration/node-specific/cursor_stream.test.js index 1c0c65503c2..79096838fd1 100644 --- a/test/integration/node-specific/cursor_stream.test.js +++ b/test/integration/node-specific/cursor_stream.test.js @@ -1,6 +1,6 @@ 'use strict'; const { expect } = require('chai'); -const { Binary } = require('../../../src'); +const { Binary } = require('../../mongodb'); const { setTimeout, setImmediate } = require('timers'); describe('Cursor Streams', function () { diff --git a/test/integration/node-specific/db.test.js b/test/integration/node-specific/db.test.js index 01905f28651..f5102110fc0 100644 --- a/test/integration/node-specific/db.test.js +++ b/test/integration/node-specific/db.test.js @@ -2,7 +2,7 @@ const { setupDatabase, assert: test } = require(`../shared`); const { expect } = require('chai'); -const { Db, MongoClient } = require('../../../src'); +const { Db, MongoClient } = require('../../mongodb'); describe('Db', function () { before(function () { diff --git a/test/integration/node-specific/examples/transactions.test.js b/test/integration/node-specific/examples/transactions.test.js index af774ddeabd..4b72a88801c 100644 --- a/test/integration/node-specific/examples/transactions.test.js +++ b/test/integration/node-specific/examples/transactions.test.js @@ -1,6 +1,6 @@ 'use strict'; -const { MongoClient } = require('../../../../src'); +const { MongoClient } = require('../../../mongodb'); // Yes, we are shadowing a global here but we are not actually ever printing anything in this file // This just so the examples can use console.log to make for nice copy pasting diff --git a/test/integration/node-specific/examples/versioned_api.js b/test/integration/node-specific/examples/versioned_api.js index 22377ecf498..8a4d6e48103 100644 --- a/test/integration/node-specific/examples/versioned_api.js +++ b/test/integration/node-specific/examples/versioned_api.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../../../src'); +const { MongoClient } = require('../../../mongodb'); describe('examples.versionedApi:', function () { let uri; diff --git a/test/integration/node-specific/feature_flags.test.ts b/test/integration/node-specific/feature_flags.test.ts index e06d0bd5b55..88da73adbd2 100644 --- a/test/integration/node-specific/feature_flags.test.ts +++ b/test/integration/node-specific/feature_flags.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { MongoClient } from '../../../src'; -import { MongoLoggableComponent, SeverityLevel } from '../../mongodb'; +import { MongoClient, MongoLoggableComponent, SeverityLevel } from '../../mongodb'; describe('Feature Flags', () => { describe('@@mdb.skipPingOnConnect', () => { diff --git a/test/integration/node-specific/ipv6.test.ts b/test/integration/node-specific/ipv6.test.ts index 5fbc39a208c..358b26c66fd 100644 --- a/test/integration/node-specific/ipv6.test.ts +++ b/test/integration/node-specific/ipv6.test.ts @@ -3,7 +3,7 @@ import * as net from 'net'; import * as process from 'process'; import * as sinon from 'sinon'; -import { ConnectionCreatedEvent, MongoClient, ReadPreference, TopologyType } from '../../../src'; +import { ConnectionCreatedEvent, MongoClient, ReadPreference, TopologyType } from '../../mongodb'; describe('IPv6 Addresses', () => { let client: MongoClient; diff --git a/test/integration/node-specific/mongo_client.test.ts b/test/integration/node-specific/mongo_client.test.ts index f7ea9307cdc..4e0103b3490 100644 --- a/test/integration/node-specific/mongo_client.test.ts +++ b/test/integration/node-specific/mongo_client.test.ts @@ -6,12 +6,17 @@ import { CommandFailedEvent, CommandStartedEvent, CommandSucceededEvent, + Connection, + Db, + getTopology, + isHello, MongoClient, MongoNotConnectedError, MongoServerSelectionError, - ReadPreference -} from '../../../src'; -import { Connection, Db, getTopology, isHello, ServerDescription, Topology } from '../../mongodb'; + ReadPreference, + ServerDescription, + Topology +} from '../../mongodb'; import { runLater } from '../../tools/utils'; import { setupDatabase } from '../shared'; diff --git a/test/integration/node-specific/operation_examples.test.ts b/test/integration/node-specific/operation_examples.test.ts index d71762b18bf..6bd07837e5b 100644 --- a/test/integration/node-specific/operation_examples.test.ts +++ b/test/integration/node-specific/operation_examples.test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; import { format as f } from 'util'; -import { Code, ReturnDocument } from '../../../src'; import { ProfilingLevel } from '../../../src/operations/set_profiling_level'; import { enumToString } from '../../../src/utils'; +import { Code, ReturnDocument } from '../../mongodb'; import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/configuration'; import { sleep as delay } from '../../tools/utils'; import { setupDatabase } from '../shared'; diff --git a/test/integration/objectid.test.js b/test/integration/objectid.test.js index 1c7baf726f6..69f5eced092 100644 --- a/test/integration/objectid.test.js +++ b/test/integration/objectid.test.js @@ -1,7 +1,7 @@ 'use strict'; var test = require('./shared').assert; const { expect } = require('chai'); -const { ObjectId } = require('../../src'); +const { ObjectId } = require('../mongodb'); const { sleep } = require('../tools/utils'); describe('ObjectId', function () { diff --git a/test/integration/read-write-concern/write_concern.test.js b/test/integration/read-write-concern/write_concern.test.js index 2ac82442f7a..f0e17919bb0 100644 --- a/test/integration/read-write-concern/write_concern.test.js +++ b/test/integration/read-write-concern/write_concern.test.js @@ -4,7 +4,7 @@ const { expect } = require('chai'); const { LEGACY_HELLO_COMMAND } = require('../../mongodb'); const mock = require('../../tools/mongodb-mock/index'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); describe('Write Concern', function () { it('should respect writeConcern from uri', function (done) { diff --git a/test/integration/retryable-reads/retryable_reads.spec.prose.test.ts b/test/integration/retryable-reads/retryable_reads.spec.prose.test.ts index 98c96a399f6..533e702defb 100644 --- a/test/integration/retryable-reads/retryable_reads.spec.prose.test.ts +++ b/test/integration/retryable-reads/retryable_reads.spec.prose.test.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-non-null-assertion */ import { expect } from 'chai'; -import { Collection, MongoClient } from '../../../src'; +import { Collection, MongoClient } from '../../mongodb'; describe('Retryable Reads Spec Prose', () => { let client: MongoClient, failPointName; diff --git a/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts b/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts index bfb57ed17c5..165945e7605 100644 --- a/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts +++ b/test/integration/retryable-writes/retryable_writes.spec.prose.test.ts @@ -7,9 +7,9 @@ import { MongoClient, MongoError, MongoServerError, - MongoWriteConcernError -} from '../../../src'; -import { Server } from '../../mongodb'; + MongoWriteConcernError, + Server +} from '../../mongodb'; describe('Retryable Writes Spec Prose', () => { describe('1. Test that retryable writes raise an exception when using the MMAPv1 storage engine.', () => { diff --git a/test/integration/retryable-writes/retryable_writes.spec.test.ts b/test/integration/retryable-writes/retryable_writes.spec.test.ts index de506b79cf5..1b4b958dce9 100644 --- a/test/integration/retryable-writes/retryable_writes.spec.test.ts +++ b/test/integration/retryable-writes/retryable_writes.spec.test.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as path from 'path'; -import type { Collection, Db, MongoClient } from '../../../src'; +import type { Collection, Db, MongoClient } from '../../mongodb'; import { loadSpecTests } from '../../spec'; import { legacyRunOnToRunOnRequirement } from '../../tools/spec-runner'; import { runUnifiedSuite } from '../../tools/unified-spec-runner/runner'; diff --git a/test/integration/server-discovery-and-monitoring/server_discovery_and_monitoring.prose.test.ts b/test/integration/server-discovery-and-monitoring/server_discovery_and_monitoring.prose.test.ts index 5b6e3a57b20..81b8dbfd206 100644 --- a/test/integration/server-discovery-and-monitoring/server_discovery_and_monitoring.prose.test.ts +++ b/test/integration/server-discovery-and-monitoring/server_discovery_and_monitoring.prose.test.ts @@ -1,10 +1,10 @@ import { expect } from 'chai'; import { once } from 'events'; -import { MongoClient } from '../../../src'; import { CONNECTION_POOL_CLEARED, CONNECTION_POOL_READY, + MongoClient, SERVER_HEARTBEAT_FAILED, SERVER_HEARTBEAT_SUCCEEDED } from '../../mongodb'; diff --git a/test/integration/server-discovery-and-monitoring/topology_description.test.ts b/test/integration/server-discovery-and-monitoring/topology_description.test.ts index 7d6e8694d33..3c8a7500e8b 100644 --- a/test/integration/server-discovery-and-monitoring/topology_description.test.ts +++ b/test/integration/server-discovery-and-monitoring/topology_description.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { TopologyType } from '../../../src'; -import { getTopology, MongoClient, MongoClientOptions } from '../../mongodb'; +import { getTopology, MongoClient, MongoClientOptions, TopologyType } from '../../mongodb'; describe('TopologyDescription (integration tests)', function () { let client: MongoClient; diff --git a/test/integration/server-selection/operation_count.test.ts b/test/integration/server-selection/operation_count.test.ts index 40b44d2399c..3791d1d9f54 100644 --- a/test/integration/server-selection/operation_count.test.ts +++ b/test/integration/server-selection/operation_count.test.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import * as sinon from 'sinon'; -import { AbstractCursor, Collection, MongoClient } from '../../../src'; -import { ConnectionPool } from '../../mongodb'; +import { AbstractCursor, Collection, ConnectionPool, MongoClient } from '../../mongodb'; import { FailPoint, sleep } from '../../tools/utils'; const testMetadata: MongoDBMetadataUI = { diff --git a/test/integration/server-selection/readpreference.test.js b/test/integration/server-selection/readpreference.test.js index d5667a1fc42..41e8f052845 100644 --- a/test/integration/server-selection/readpreference.test.js +++ b/test/integration/server-selection/readpreference.test.js @@ -1,6 +1,6 @@ 'use strict'; -const { ReadPreference } = require('../../../src'); +const { ReadPreference } = require('../../mongodb'); const { Topology } = require('../../mongodb'); const chai = require('chai'); chai.use(require('chai-subset')); diff --git a/test/integration/server-selection/server_selection.prose.operation_count.test.ts b/test/integration/server-selection/server_selection.prose.operation_count.test.ts index f962945c2a9..5bd9db04f40 100644 --- a/test/integration/server-selection/server_selection.prose.operation_count.test.ts +++ b/test/integration/server-selection/server_selection.prose.operation_count.test.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import { on } from 'events'; -import { CommandStartedEvent } from '../../../src'; -import { Collection, HostAddress, MongoClient } from '../../mongodb'; +import { Collection, CommandStartedEvent, HostAddress, MongoClient } from '../../mongodb'; import { sleep } from '../../tools/utils'; const failPoint = { diff --git a/test/integration/sessions/sessions.test.ts b/test/integration/sessions/sessions.test.ts index fb296a25f9a..eb641df98aa 100644 --- a/test/integration/sessions/sessions.test.ts +++ b/test/integration/sessions/sessions.test.ts @@ -6,7 +6,7 @@ import type { CommandStartedEvent, CommandSucceededEvent, MongoClient -} from '../../../src'; +} from '../../mongodb'; import { LEGACY_HELLO_COMMAND, MongoCompatibilityError, MongoServerError } from '../../mongodb'; import type { TestConfiguration } from '../../tools/runner/config'; import { setupDatabase } from '../shared'; diff --git a/test/integration/transactions/transactions.test.ts b/test/integration/transactions/transactions.test.ts index 70f6db68b08..a10312f1e5e 100644 --- a/test/integration/transactions/transactions.test.ts +++ b/test/integration/transactions/transactions.test.ts @@ -1,7 +1,12 @@ import { expect } from 'chai'; -import { Collection, MongoClient, ServerSessionPool } from '../../../src'; -import { ClientSession, MongoNetworkError } from '../../mongodb'; +import { + ClientSession, + Collection, + MongoClient, + MongoNetworkError, + ServerSessionPool +} from '../../mongodb'; describe('Transactions', function () { describe('withTransaction', function () { diff --git a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js b/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js index cb3e5376088..27d7c42987f 100644 --- a/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js +++ b/test/manual/atlas-data-lake-testing/atlas_data_lake_testing.prose.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); // TODO(NODE-3880): These tests are not fully implemented per the spec describe('Atlas Data Lake - prose', function () { diff --git a/test/manual/atlas_connectivity.test.js b/test/manual/atlas_connectivity.test.js index ead429a3b0b..928e8ad3fbb 100644 --- a/test/manual/atlas_connectivity.test.js +++ b/test/manual/atlas_connectivity.test.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../src'); +const { MongoClient } = require('../mongodb'); const { LEGACY_HELLO_COMMAND } = require('../mongodb'); /** diff --git a/test/manual/kerberos.test.js b/test/manual/kerberos.test.js index b6e8740315c..20f7f6a8778 100644 --- a/test/manual/kerberos.test.js +++ b/test/manual/kerberos.test.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../src'); +const { MongoClient } = require('../mongodb'); const chai = require('chai'); const sinon = require('sinon'); const dns = require('dns'); diff --git a/test/manual/ldap.test.js b/test/manual/ldap.test.js index 5e683804749..6ef27377d47 100644 --- a/test/manual/ldap.test.js +++ b/test/manual/ldap.test.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../src'); +const { MongoClient } = require('../mongodb'); const { expect } = require('chai'); describe('LDAP', function () { diff --git a/test/manual/ocsp_support.test.js b/test/manual/ocsp_support.test.js index bc3096b9540..58fbb603e26 100644 --- a/test/manual/ocsp_support.test.js +++ b/test/manual/ocsp_support.test.js @@ -1,6 +1,6 @@ 'use strict'; -const MongoClient = require('../../src').MongoClient; +const MongoClient = require('../mongodb').MongoClient; const expect = require('chai').expect; const { LEGACY_HELLO_COMMAND } = require('../mongodb'); diff --git a/test/manual/socks5.test.ts b/test/manual/socks5.test.ts index 0cd899fa096..a37907aff69 100644 --- a/test/manual/socks5.test.ts +++ b/test/manual/socks5.test.ts @@ -1,8 +1,7 @@ import { expect } from 'chai'; import ConnectionString from 'mongodb-connection-string-url'; -import { MongoClient } from '../../src'; -import { LEGACY_HELLO_COMMAND, MongoParseError } from '../mongodb'; +import { LEGACY_HELLO_COMMAND, MongoClient, MongoParseError } from '../mongodb'; import { installNodeDNSWorkaroundHooks } from '../tools/runner/hooks/configuration'; /** diff --git a/test/manual/tls_support.test.js b/test/manual/tls_support.test.js index 98828e4e30b..f6bbca59ebf 100644 --- a/test/manual/tls_support.test.js +++ b/test/manual/tls_support.test.js @@ -1,5 +1,5 @@ 'use strict'; -const { MongoClient } = require('../../src'); +const { MongoClient } = require('../mongodb'); const { LEGACY_HELLO_COMMAND } = require('../mongodb'); const REQUIRED_ENV = ['MONGODB_URI', 'SSL_KEY_FILE', 'SSL_CA_FILE']; diff --git a/test/tools/cmap_spec_runner.ts b/test/tools/cmap_spec_runner.ts index 847e5fb02aa..3232c180aa4 100644 --- a/test/tools/cmap_spec_runner.ts +++ b/test/tools/cmap_spec_runner.ts @@ -3,12 +3,15 @@ import { EventEmitter } from 'events'; import { clearTimeout, setTimeout } from 'timers'; import { promisify } from 'util'; -import { Connection, HostAddress, MongoClient, Server } from '../../src'; import { CMAP_EVENTS, + Connection, ConnectionPool, ConnectionPoolOptions, + HostAddress, makeClientMetadata, + MongoClient, + Server, shuffle } from '../mongodb'; import { isAnyRequirementSatisfied } from './unified-spec-runner/unified-utils'; diff --git a/test/tools/runner/config.ts b/test/tools/runner/config.ts index 953662a1847..ff6f86eb7df 100644 --- a/test/tools/runner/config.ts +++ b/test/tools/runner/config.ts @@ -3,8 +3,14 @@ import ConnectionString from 'mongodb-connection-string-url'; import * as qs from 'querystring'; import * as url from 'url'; -import { AuthMechanism, WriteConcernSettings } from '../../../src'; -import { HostAddress, MongoClient, Topology, TopologyType } from '../../mongodb'; +import { + AuthMechanism, + HostAddress, + MongoClient, + Topology, + TopologyType, + WriteConcernSettings +} from '../../mongodb'; import { getEnvironmentalOptions } from '../utils'; interface ProxyParams { diff --git a/test/tools/runner/filters/client_encryption_filter.js b/test/tools/runner/filters/client_encryption_filter.js index e7ce15da824..2ab66c75cb7 100644 --- a/test/tools/runner/filters/client_encryption_filter.js +++ b/test/tools/runner/filters/client_encryption_filter.js @@ -1,6 +1,6 @@ 'use strict'; -const mongodb = require('../../../../src'); +const mongodb = require('../../../mongodb'); /** * Filter for whether or not a test needs / doesn't need Client Side Encryption diff --git a/test/tools/runner/hooks/configuration.js b/test/tools/runner/hooks/configuration.js index 708e1697043..096bbca0c42 100644 --- a/test/tools/runner/hooks/configuration.js +++ b/test/tools/runner/hooks/configuration.js @@ -6,7 +6,7 @@ require('source-map-support').install({ const path = require('path'); const fs = require('fs'); -const { MongoClient } = require('../../../../src'); +const { MongoClient } = require('../../../mongodb'); const { TestConfiguration } = require('../config'); const { getEnvironmentalOptions } = require('../../utils'); const mock = require('../../mongodb-mock/index'); diff --git a/test/tools/runner/hooks/legacy_crud_shims.ts b/test/tools/runner/hooks/legacy_crud_shims.ts index 357b0a6d503..28da4349658 100644 --- a/test/tools/runner/hooks/legacy_crud_shims.ts +++ b/test/tools/runner/hooks/legacy_crud_shims.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { Collection } from '../../../../src'; +import { Collection } from '../../../mongodb'; // Setup legacy shims for tests that use removed or changed APIs const legacyUsageCounts = { diff --git a/test/tools/unified-spec-runner/match.ts b/test/tools/unified-spec-runner/match.ts index 74ca01720b5..c43c3cdf741 100644 --- a/test/tools/unified-spec-runner/match.ts +++ b/test/tools/unified-spec-runner/match.ts @@ -5,15 +5,6 @@ import { inspect } from 'util'; import { Binary, BSONTypeAlias, - Document, - Long, - MongoError, - MongoServerError, - ObjectId, - OneOrMore, - ServerDescriptionChangedEvent -} from '../../../src'; -import { CommandFailedEvent, CommandStartedEvent, CommandSucceededEvent, @@ -27,7 +18,14 @@ import { ConnectionPoolClosedEvent, ConnectionPoolCreatedEvent, ConnectionPoolReadyEvent, - ConnectionReadyEvent + ConnectionReadyEvent, + Document, + Long, + MongoError, + MongoServerError, + ObjectId, + OneOrMore, + ServerDescriptionChangedEvent } from '../../mongodb'; import { ejson } from '../utils'; import { CmapEvent, CommandEvent, EntitiesMap, SdamEvent } from './entities'; diff --git a/test/tools/unified-spec-runner/operations.ts b/test/tools/unified-spec-runner/operations.ts index ec5f9681551..1c4a9550af3 100644 --- a/test/tools/unified-spec-runner/operations.ts +++ b/test/tools/unified-spec-runner/operations.ts @@ -5,20 +5,18 @@ import { expect } from 'chai'; import { AbstractCursor, Collection, + CommandStartedEvent, Db, Document, GridFSFile, MongoClient, ObjectId, - ServerType, - TopologyDescription, - TopologyType -} from '../../../src'; -import { - CommandStartedEvent, ReadConcern, ReadPreference, SERVER_DESCRIPTION_CHANGED, + ServerType, + TopologyDescription, + TopologyType, WriteConcern } from '../../mongodb'; import { getSymbolFrom, sleep } from '../../tools/utils'; diff --git a/test/tools/unified-spec-runner/schema.ts b/test/tools/unified-spec-runner/schema.ts index bb2811c504e..e46793e54a9 100644 --- a/test/tools/unified-spec-runner/schema.ts +++ b/test/tools/unified-spec-runner/schema.ts @@ -1,4 +1,3 @@ -import { FindCursor, MongoClient, ServerApiVersion } from '../../../src'; import type { Document, ObjectId, @@ -7,6 +6,7 @@ import type { TagSet, W } from '../../mongodb'; +import { FindCursor, MongoClient, ServerApiVersion } from '../../mongodb'; import { TestConfiguration } from '../runner/config'; import { UnifiedThread } from './entities'; diff --git a/test/tools/unified-spec-runner/unified-utils.ts b/test/tools/unified-spec-runner/unified-utils.ts index 09675410ae2..32089f9956f 100644 --- a/test/tools/unified-spec-runner/unified-utils.ts +++ b/test/tools/unified-spec-runner/unified-utils.ts @@ -9,10 +9,10 @@ import { CollectionOptions, DbOptions, Document, + getMongoDBClientEncryption, MongoClient, MongoMissingDependencyError -} from '../../../src'; -import { getMongoDBClientEncryption } from '../../mongodb'; +} from '../../mongodb'; import { shouldRunServerlessTest } from '../../tools/utils'; import { CmapEvent, CommandEvent, EntitiesMap } from './entities'; import { matchesEvents } from './match'; diff --git a/test/tools/uri_spec_runner.ts b/test/tools/uri_spec_runner.ts index 02c0197fd7e..12bf1fd75e8 100644 --- a/test/tools/uri_spec_runner.ts +++ b/test/tools/uri_spec_runner.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { MongoAPIError, MongoParseError, MongoRuntimeError } from '../../src'; -import { MongoClient } from '../mongodb'; +import { MongoAPIError, MongoClient, MongoParseError, MongoRuntimeError } from '../mongodb'; type HostObject = { type: 'ipv4' | 'ip_literal' | 'hostname' | 'unix'; diff --git a/test/unit/assorted/client.test.js b/test/unit/assorted/client.test.js index 2387c8a535b..1bfbf8b7836 100644 --- a/test/unit/assorted/client.test.js +++ b/test/unit/assorted/client.test.js @@ -2,7 +2,7 @@ const { expect } = require('chai'); const mock = require('../../tools/mongodb-mock/index'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); const { isHello } = require('../../mongodb'); describe('Client (unit)', function () { diff --git a/test/unit/assorted/collations.test.js b/test/unit/assorted/collations.test.js index 5ddd2374547..a89b6e1737a 100644 --- a/test/unit/assorted/collations.test.js +++ b/test/unit/assorted/collations.test.js @@ -1,9 +1,9 @@ 'use strict'; const mock = require('../../tools/mongodb-mock/index'); const { expect } = require('chai'); -const { Long } = require('../../../src'); +const { Long } = require('../../mongodb'); const { isHello } = require('../../mongodb'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); const testContext = {}; describe('Collation', function () { diff --git a/test/unit/assorted/imports.test.ts b/test/unit/assorted/imports.test.ts index 1e66b70eb7d..ab1a4a71416 100644 --- a/test/unit/assorted/imports.test.ts +++ b/test/unit/assorted/imports.test.ts @@ -16,7 +16,7 @@ function* walk(root) { } describe('importing mongodb driver', () => { - const sourceFiles = walk(path.resolve(__dirname, '../../../src')); + const sourceFiles = walk(path.resolve(__dirname, '../../mongodb')); for (const sourceFile of sourceFiles) { if (!sourceFile.endsWith('.ts')) { diff --git a/test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts b/test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts index 2e739bcee8f..8d8b2b8412c 100644 --- a/test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts +++ b/test/unit/assorted/polling_srv_records_for_mongos_discovery.prose.test.ts @@ -2,10 +2,10 @@ import { expect } from 'chai'; import * as dns from 'dns'; import * as sinon from 'sinon'; -import { MongoClient } from '../../../src'; import { HostAddress, isHello, + MongoClient, SrvPoller, SrvPollerOptions, SrvPollingEvent, diff --git a/test/unit/assorted/scram_iterations.test.ts b/test/unit/assorted/scram_iterations.test.ts index d45eaa4bbbc..a08274781ac 100644 --- a/test/unit/assorted/scram_iterations.test.ts +++ b/test/unit/assorted/scram_iterations.test.ts @@ -1,7 +1,12 @@ import { expect } from 'chai'; -import { MongoNetworkError, MongoRuntimeError } from '../../../src'; -import { isHello, MongoClient, MongoCredentials } from '../../mongodb'; +import { + isHello, + MongoClient, + MongoCredentials, + MongoNetworkError, + MongoRuntimeError +} from '../../mongodb'; import * as mock from '../../tools/mongodb-mock/index'; describe('SCRAM Iterations Tests', function () { diff --git a/test/unit/assorted/sessions_client.test.js b/test/unit/assorted/sessions_client.test.js index 7834fdf1970..099798071e0 100644 --- a/test/unit/assorted/sessions_client.test.js +++ b/test/unit/assorted/sessions_client.test.js @@ -4,7 +4,7 @@ const expect = require('chai').expect; const mock = require('../../tools/mongodb-mock/index'); const { ReplSetFixture } = require('../../tools/common'); const { isHello } = require('../../mongodb'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); const test = {}; describe('Sessions - client/unit', function () { diff --git a/test/unit/assorted/sessions_collection.test.js b/test/unit/assorted/sessions_collection.test.js index e72120a0023..4dc082cb2bf 100644 --- a/test/unit/assorted/sessions_collection.test.js +++ b/test/unit/assorted/sessions_collection.test.js @@ -3,7 +3,7 @@ const { Timestamp } = require('bson'); const { expect } = require('chai'); const mock = require('../../tools/mongodb-mock/index'); const { isHello } = require('../../mongodb'); -const { MongoClient } = require('../../../src'); +const { MongoClient } = require('../../mongodb'); const test = {}; describe('Sessions - unit/sessions', function () { diff --git a/test/unit/assorted/wire_version.test.js b/test/unit/assorted/wire_version.test.js index a5f9eca16b8..0995aa324cb 100644 --- a/test/unit/assorted/wire_version.test.js +++ b/test/unit/assorted/wire_version.test.js @@ -2,7 +2,7 @@ const mock = require('../../tools/mongodb-mock/index'); const { expect } = require('chai'); -const { MongoServerSelectionError, MongoClient } = require('../../../src'); +const { MongoServerSelectionError, MongoClient } = require('../../mongodb'); const { isHello } = require('../../mongodb'); const minCompatErrMsg = `minimum wire version ${ diff --git a/test/unit/assorted/write_concern.test.js b/test/unit/assorted/write_concern.test.js index b9f89ade8d3..46a33bdc592 100644 --- a/test/unit/assorted/write_concern.test.js +++ b/test/unit/assorted/write_concern.test.js @@ -1,7 +1,7 @@ 'use strict'; const mock = require('../../tools/mongodb-mock/index'); const { expect } = require('chai'); -const { ObjectId, MongoClient } = require('../../../src'); +const { ObjectId, MongoClient } = require('../../mongodb'); const { LEGACY_HELLO_COMMAND } = require('../../mongodb'); const { isHello } = require('../../mongodb'); diff --git a/test/unit/bson.test.js b/test/unit/bson.test.js index 465412f7be4..a555e24bb9e 100644 --- a/test/unit/bson.test.js +++ b/test/unit/bson.test.js @@ -81,7 +81,6 @@ describe('When importing BSON', function () { }); describe('MongoDB export', () => { - const mongodb = require('../../src'); it('should include ObjectId', () => - expect(mongodb).to.have.property('ObjectId').that.is.a('function')); + expect(BSON).to.have.property('ObjectId').that.is.a('function')); }); diff --git a/test/unit/collection.test.ts b/test/unit/collection.test.ts index 432fdd593b9..2a5b5762113 100644 --- a/test/unit/collection.test.ts +++ b/test/unit/collection.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { MongoClient } from '../../src'; -import { isHello } from '../mongodb'; +import { isHello, MongoClient } from '../mongodb'; import { cleanup, createServer, HELLO } from '../tools/mongodb-mock'; describe('Collection', function () { diff --git a/test/unit/cursor/abstract_cursor.test.ts b/test/unit/cursor/abstract_cursor.test.ts index 52a4be19792..b2bb254652b 100644 --- a/test/unit/cursor/abstract_cursor.test.ts +++ b/test/unit/cursor/abstract_cursor.test.ts @@ -1,7 +1,15 @@ import { expect } from 'chai'; -import { Callback, ExecutionResult, MongoClient, Server } from '../../../src'; -import { AbstractCursor, AbstractCursorOptions, ClientSession, ns } from '../../mongodb'; +import { + AbstractCursor, + AbstractCursorOptions, + Callback, + ClientSession, + ExecutionResult, + MongoClient, + ns, + Server +} from '../../mongodb'; /** Minimal do nothing cursor to focus on testing the base cusor behavior */ class ConcreteCursor extends AbstractCursor { diff --git a/test/unit/db.test.ts b/test/unit/db.test.ts index cf7dbceb6af..3342f605a7f 100644 --- a/test/unit/db.test.ts +++ b/test/unit/db.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { MongoClient } from '../../src'; -import { Db, DbOptions, ReadPreference } from '../mongodb'; +import { Db, DbOptions, MongoClient, ReadPreference } from '../mongodb'; describe('class Db', function () { describe('secondaryOk', function () { diff --git a/test/unit/mongo_client.test.js b/test/unit/mongo_client.test.js index 9256a761e67..77bbd9a2b42 100644 --- a/test/unit/mongo_client.test.js +++ b/test/unit/mongo_client.test.js @@ -9,7 +9,7 @@ const { WriteConcern } = require('../mongodb'); const { ReadPreference } = require('../mongodb'); const { Logger } = require('../mongodb'); const { MongoCredentials } = require('../mongodb'); -const { MongoClient, MongoParseError, ServerApiVersion } = require('../../src'); +const { MongoClient, MongoParseError, ServerApiVersion } = require('../mongodb'); const { MongoLogger } = require('../mongodb'); const sinon = require('sinon'); const { Writable } = require('stream'); diff --git a/test/unit/read_preference.test.ts b/test/unit/read_preference.test.ts index a569cc4e98e..c8e1dbbca9a 100644 --- a/test/unit/read_preference.test.ts +++ b/test/unit/read_preference.test.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; -import { ReadPreference } from '../../src'; +import { ReadPreference } from '../mongodb'; describe('class ReadPreference', function () { const maxStalenessSeconds = 1234; diff --git a/test/unit/sdam/server.test.ts b/test/unit/sdam/server.test.ts index 8b37c718b0d..36af2758d81 100644 --- a/test/unit/sdam/server.test.ts +++ b/test/unit/sdam/server.test.ts @@ -10,10 +10,12 @@ import { MongoNetworkError, MongoNetworkTimeoutError, ObjectId, + Server, + ServerDescription, ServerType, + Topology, TopologyType -} from '../../../src'; -import { Server, ServerDescription, Topology } from '../../mongodb'; +} from '../../mongodb'; import { sleep } from '../../tools/utils'; const handledErrors = [ diff --git a/test/unit/sdam/server_description.test.ts b/test/unit/sdam/server_description.test.ts index bc82dce6d46..01096535644 100644 --- a/test/unit/sdam/server_description.test.ts +++ b/test/unit/sdam/server_description.test.ts @@ -1,9 +1,9 @@ import { expect } from 'chai'; -import { MongoRuntimeError } from '../../../src'; import { compareTopologyVersion, Long, + MongoRuntimeError, ObjectId, ServerDescription, TopologyVersion diff --git a/test/unit/sdam/topology.test.js b/test/unit/sdam/topology.test.js index 7d490b8e58d..68c52b878ab 100644 --- a/test/unit/sdam/topology.test.js +++ b/test/unit/sdam/topology.test.js @@ -5,7 +5,7 @@ const mock = require('../../tools/mongodb-mock/index'); const { expect } = require('chai'); const sinon = require('sinon'); const net = require('net'); -const { MongoClient, MongoServerSelectionError, ReadPreference } = require('../../../src'); +const { MongoClient, MongoServerSelectionError, ReadPreference } = require('../../mongodb'); const { Topology } = require('../../mongodb'); const { Server } = require('../../mongodb'); const { ServerDescription } = require('../../mongodb'); diff --git a/test/unit/sessions.test.js b/test/unit/sessions.test.js index f1a84342d9c..2b8ff043b7b 100644 --- a/test/unit/sessions.test.js +++ b/test/unit/sessions.test.js @@ -9,7 +9,7 @@ const { getSymbolFrom } = require('../tools/utils'); const { Long } = require('../mongodb'); const { MongoRuntimeError } = require('../mongodb'); const sinon = require('sinon'); -const { MongoClient } = require('../../src'); +const { MongoClient } = require('../mongodb'); describe('Sessions - unit', function () { let client; diff --git a/test/unit/transactions.test.ts b/test/unit/transactions.test.ts index f693681fcef..789c0b1cb6f 100644 --- a/test/unit/transactions.test.ts +++ b/test/unit/transactions.test.ts @@ -1,7 +1,6 @@ import { expect } from 'chai'; -import { ReadPreference } from '../../src'; -import { Transaction } from '../mongodb'; +import { ReadPreference, Transaction } from '../mongodb'; describe('class Transaction', () => { describe('constructor()', () => { From 38832a4866bb348161e16a83c3f3a9e0e71531eb Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Fri, 13 Jan 2023 12:46:33 -0500 Subject: [PATCH 2/3] Fix linter import assertion --- .eslintrc.json | 14 ++++++++++++-- .../node-specific/operation_examples.test.ts | 4 +--- test/mongodb.ts | 1 + test/unit/error.test.ts | 3 +++ test/unit/index.test.ts | 2 ++ 5 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 7d5ab8a8275..2f0fadfa3a7 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -192,7 +192,18 @@ "rules": { "no-console": "off", "no-restricted-syntax": "off", - "typescript-eslint/ban-ts-comment": "off" + "typescript-eslint/ban-ts-comment": "off", + "no-restricted-imports": "off", + "@typescript-eslint/no-restricted-imports": [ + "error", + { + "patterns": [ + "**/../lib/**", + "**/../src/**", + "mongodb-mock-server" + ] + } + ] } }, { @@ -227,7 +238,6 @@ { "patterns": [ "**/../lib/**", - "**/../src/**", "mongodb-mock-server" ] } diff --git a/test/integration/node-specific/operation_examples.test.ts b/test/integration/node-specific/operation_examples.test.ts index 6bd07837e5b..eb092ce853f 100644 --- a/test/integration/node-specific/operation_examples.test.ts +++ b/test/integration/node-specific/operation_examples.test.ts @@ -1,9 +1,7 @@ import { expect } from 'chai'; import { format as f } from 'util'; -import { ProfilingLevel } from '../../../src/operations/set_profiling_level'; -import { enumToString } from '../../../src/utils'; -import { Code, ReturnDocument } from '../../mongodb'; +import { Code, enumToString, ProfilingLevel, ReturnDocument } from '../../mongodb'; import { skipBrokenAuthTestBeforeEachHook } from '../../tools/runner/hooks/configuration'; import { sleep as delay } from '../../tools/utils'; import { setupDatabase } from '../shared'; diff --git a/test/mongodb.ts b/test/mongodb.ts index cc037bb625a..539927b6634 100644 --- a/test/mongodb.ts +++ b/test/mongodb.ts @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-restricted-imports */ import * as fs from 'node:fs'; import * as path from 'node:path'; diff --git a/test/unit/error.test.ts b/test/unit/error.test.ts index 5e13ec07570..0a6b05cd99f 100644 --- a/test/unit/error.test.ts +++ b/test/unit/error.test.ts @@ -1,7 +1,10 @@ import { expect } from 'chai'; import { setTimeout } from 'timers'; +// Exception to the import from mongodb rule we're unit testing our public Errors API +// eslint-disable-next-line @typescript-eslint/no-restricted-imports import * as importsFromErrorSrc from '../../src/error'; +// eslint-disable-next-line @typescript-eslint/no-restricted-imports import * as importsFromEntryPoint from '../../src/index'; import { isHello, diff --git a/test/unit/index.test.ts b/test/unit/index.test.ts index 197aaad6896..0e0f1f68196 100644 --- a/test/unit/index.test.ts +++ b/test/unit/index.test.ts @@ -1,5 +1,7 @@ import { expect } from 'chai'; +// Exception to the import from mongodb rule we're unit testing our public API +// eslint-disable-next-line @typescript-eslint/no-restricted-imports import * as mongodb from '../../src/index'; import { byStrings, sorted } from '../tools/utils'; From 4693974929b8b51f68750072db51c7a91a8623b4 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Fri, 13 Jan 2023 13:32:33 -0500 Subject: [PATCH 3/3] fix imports unit test --- test/unit/assorted/imports.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/assorted/imports.test.ts b/test/unit/assorted/imports.test.ts index ab1a4a71416..1e66b70eb7d 100644 --- a/test/unit/assorted/imports.test.ts +++ b/test/unit/assorted/imports.test.ts @@ -16,7 +16,7 @@ function* walk(root) { } describe('importing mongodb driver', () => { - const sourceFiles = walk(path.resolve(__dirname, '../../mongodb')); + const sourceFiles = walk(path.resolve(__dirname, '../../../src')); for (const sourceFile of sourceFiles) { if (!sourceFile.endsWith('.ts')) {