test(NODE-7179): migrate test/types/*

tadjik1 · tadjik1 · commit b84efcdaf027 · 2025-10-16T16:51:01.000+02:00
diff --git a/test/types/admin.test-d.ts b/test/types/admin.test-d.ts
@@ -1,6 +1,6 @@
 import { expectType } from 'tsd';
 
-import { type Document, MongoClient } from '../mongodb';
+import { type Document, MongoClient } from '../../src';
 
 const client = new MongoClient('');
 const admin = client.db().admin();
diff --git a/test/types/basic_schema.test-d.ts b/test/types/basic_schema.test-d.ts
@@ -1,6 +1,6 @@
 import { expectAssignable, expectNotAssignable, expectNotType, expectType } from 'tsd';
 
-import { Collection, Db, type Document, type InferIdType, MongoClient, ObjectId } from '../mongodb';
+import { Collection, Db, type Document, type InferIdType, MongoClient, ObjectId } from '../../src';
 
 const db = new Db(new MongoClient(''), '');
 
diff --git a/test/types/bson.test-d.ts b/test/types/bson.test-d.ts
@@ -1,6 +1,6 @@
 import { expectType } from 'tsd';
 
-import type { BSONSerializeOptions, Document } from '../mongodb';
+import type { BSONSerializeOptions, Document } from '../../src';
 
 const options: BSONSerializeOptions = {};
 
diff --git a/test/types/change_stream.test-d.ts b/test/types/change_stream.test-d.ts
@@ -27,7 +27,7 @@ import type {
   ServerSessionId,
   Timestamp,
   UpdateDescription
-} from '../mongodb';
+} from '../../src';
 
 declare const changeStreamOptions: ChangeStreamOptions;
 type ChangeStreamOperationType =
diff --git a/test/types/client-side-encryption.test-d.ts b/test/types/client-side-encryption.test-d.ts
@@ -10,7 +10,7 @@ import type {
   KMSProviders,
   RangeOptions
 } from '../..';
-import { Binary, type ClientEncryptionDataKeyProvider } from '../mongodb';
+import { Binary, type ClientEncryptionDataKeyProvider } from '../../src';
 
 type RequiredCreateEncryptedCollectionSettings = Parameters<
   ClientEncryption['createEncryptedCollection']
diff --git a/test/types/client_bulk_write.test-d.ts b/test/types/client_bulk_write.test-d.ts
@@ -15,7 +15,7 @@ import {
   type UpdateFilter,
   type UUID,
   type WithoutId
-} from '../mongodb';
+} from '../../src';
 
 declare const client: MongoClient;
 type Book = { title: string; released: Date };
diff --git a/test/types/community/bulk/bulk-operation-base.test-d.ts b/test/types/community/bulk/bulk-operation-base.test-d.ts
@@ -1,16 +1,15 @@
 import { expectType } from 'tsd';
 
 import {
-  Batch,
   type BatchType,
-  BulkOperationBase,
   type BulkWriteOptions,
   type BulkWriteResult,
   type DeleteStatement,
   type Document,
   MongoClient,
   type UpdateStatement
-} from '../../../mongodb';
+} from '../../../../src';
+import { Batch, BulkOperationBase } from '../../../../src/bulk/common';
 
 const client = new MongoClient('');
 const db = client.db('test');
diff --git a/test/types/community/client.test-d.ts b/test/types/community/client.test-d.ts
@@ -9,7 +9,7 @@ import {
   ReadPreference,
   type ReadPreferenceMode,
   type W
-} from '../../mongodb';
+} from '../../../src';
 
 // TODO(NODE-3348): Improve the tests to expectType assertions
 
diff --git a/test/types/community/collection/aggregate.test-d.ts b/test/types/community/collection/aggregate.test-d.ts
@@ -1,6 +1,6 @@
 import { expectNotType, expectType } from 'tsd';
 
-import { type AggregationCursor, type Document, MongoClient } from '../../../mongodb';
+import { type AggregationCursor, type Document, MongoClient } from '../../../../src';
 
 // collection.aggregate tests
 const client = new MongoClient('');
diff --git a/test/types/community/collection/bulkWrite.test-d.ts b/test/types/community/collection/bulkWrite.test-d.ts
@@ -6,7 +6,7 @@ import {
   type Document,
   MongoClient,
   ObjectId
-} from '../../../mongodb';
+} from '../../../../src';
 
 // TODO(NODE-3347): Improve these tests to use more expect assertions
 
diff --git a/test/types/community/collection/count.test-d.ts b/test/types/community/collection/count.test-d.ts
@@ -1,6 +1,6 @@
 import { expectDeprecated, expectType } from 'tsd';
 
-import { MongoClient } from '../../../mongodb';
+import { MongoClient } from '../../../../src';
 
 // test collection.countDocuments
 const client = new MongoClient('');
diff --git a/test/types/community/collection/distinct.test-d.ts b/test/types/community/collection/distinct.test-d.ts
@@ -1,6 +1,6 @@
 import { expectType } from 'tsd';
 
-import { MongoClient, type ObjectId } from '../../../mongodb';
+import { MongoClient, type ObjectId } from '../../../../src';
 
 // test collection.distinct functions
 interface Collection {
diff --git a/test/types/community/collection/updateX.test-d.ts b/test/types/community/collection/updateX.test-d.ts
@@ -19,7 +19,7 @@ import {
   type StrictUpdateFilter,
   type Timestamp,
   type UpdateFilter
-} from '../../../mongodb';
+} from '../../../../src';
 
 // MatchKeysAndValues - for basic mapping keys to their values, restricts that key types must be the same but optional, and permit dot array notation
 expectAssignable<MatchKeysAndValues<{ a: number; b: string; c: { d: boolean } }>>({
diff --git a/test/types/community/cursor.test-d.ts b/test/types/community/cursor.test-d.ts
@@ -1,7 +1,7 @@
 import type { Readable } from 'stream';
 import { expectNotType, expectType } from 'tsd';
 
-import { Db, type Document, type FindCursor, MongoClient } from '../../mongodb';
+import { Db, type Document, type FindCursor, MongoClient } from '../../../src';
 
 // TODO(NODE-3346): Improve these tests to use expect assertions more
 
diff --git a/test/types/community/db/createCollection.test-d.ts b/test/types/community/db/createCollection.test-d.ts
@@ -5,7 +5,7 @@ import {
   type CreateCollectionOptions,
   MongoClient,
   type ObjectId
-} from '../../../mongodb';
+} from '../../../../src';
 
 const client = new MongoClient('');
 const db = client.db('test');
diff --git a/test/types/community/transaction.test-d.ts b/test/types/community/transaction.test-d.ts
@@ -1,6 +1,6 @@
 import { expectType } from 'tsd';
 
-import { type ClientSession, type InsertOneResult, MongoClient, ReadConcern } from '../../mongodb';
+import { type ClientSession, type InsertOneResult, MongoClient, ReadConcern } from '../../../src';
 
 // TODO(NODE-3345): Improve these tests to use expect assertions more
 
diff --git a/test/types/connection.test-d.ts b/test/types/connection.test-d.ts
@@ -1,6 +1,8 @@
 import { expectError, expectType } from 'tsd';
 
-import { type Connection, type Document, MongoDBResponse, ns } from '../mongodb';
+import { type Connection, type Document } from '../../src';
+import { MongoDBResponse } from '../../src/cmap/wire_protocol/responses';
+import { ns } from '../../src/utils';
 
 declare const connection: Connection;
 
diff --git a/test/types/connection_pool_events.test-d.ts b/test/types/connection_pool_events.test-d.ts
@@ -1,7 +1,7 @@
 import { once } from 'events';
 import { expectType } from 'tsd';
 
-import { type ConnectionPoolCreatedEvent, MongoClient } from '../mongodb';
+import { type ConnectionPoolCreatedEvent, MongoClient } from '../../src';
 
 const client: MongoClient = new MongoClient('');
 const p = once(client, 'connectionPoolCreated');
diff --git a/test/types/encryption.test-d.ts b/test/types/encryption.test-d.ts
@@ -1,6 +1,6 @@
 import { expectAssignable } from 'tsd';
 
-import type { AutoEncryptionOptions } from '../mongodb';
+import type { AutoEncryptionOptions } from '../../src';
 
 // Empty credentials support on each provider
 expectAssignable<AutoEncryptionOptions>({
diff --git a/test/types/enum.test-d.ts b/test/types/enum.test-d.ts
@@ -18,7 +18,7 @@ import {
   ServerApiVersion,
   ServerType,
   TopologyType
-} from '../mongodb';
+} from '../../src';
 
 const num: number = Math.random();
 
diff --git a/test/types/example_schemas.ts b/test/types/example_schemas.ts
@@ -1,4 +1,4 @@
-import type { Double, Int32 } from '../mongodb';
+import type { Double, Int32 } from '../../src';
 
 export type MediaType = 'movie' | 'tv' | 'web series';
 
diff --git a/test/types/helper_types.test-d.ts b/test/types/helper_types.test-d.ts
@@ -16,7 +16,7 @@ import {
   type NumericType,
   type OneOrMore,
   type OnlyFieldsOfType
-} from '../mongodb';
+} from '../../src';
 
 expectType<IsAny<any, true, false>>(true);
 expectNotType<IsAny<number, true, false>>(true);
diff --git a/test/types/indexed_schema.test-d.ts b/test/types/indexed_schema.test-d.ts
@@ -1,6 +1,6 @@
 import { expectError, expectNotType, expectType } from 'tsd';
 
-import { Collection, Db, MongoClient, ObjectId } from '../mongodb';
+import { Collection, Db, MongoClient, ObjectId } from '../../src';
 
 const db = new Db(new MongoClient(''), '');
 
diff --git a/test/types/indexes_test-d.ts b/test/types/indexes_test-d.ts
@@ -1,7 +1,11 @@
 import { expectAssignable, expectType } from 'tsd';
 
-import { type IndexInformationOptions, MongoClient } from '../../src';
-import { type IndexDescriptionCompact, type IndexDescriptionInfo } from '../mongodb';
+import {
+  type IndexDescriptionCompact,
+  type IndexDescriptionInfo,
+  type IndexInformationOptions,
+  MongoClient
+} from '../../src';
 
 const client = new MongoClient('');
 const db = client.db('test');
diff --git a/test/types/list_collections.test-d.ts b/test/types/list_collections.test-d.ts
@@ -1,6 +1,6 @@
 import { expectNotType, expectType } from 'tsd';
 
-import { type CollectionInfo, type ListCollectionsCursor, MongoClient } from '../mongodb';
+import { type CollectionInfo, type ListCollectionsCursor, MongoClient } from '../../src';
 
 const db = new MongoClient('').db();
 
diff --git a/test/types/mongodb.test-d.ts b/test/types/mongodb.test-d.ts
@@ -1,22 +1,33 @@
 import type { Document } from 'bson';
 import { expectDeprecated, expectError, expectNotDeprecated, expectType } from 'tsd';
 
-import type { WithId, WriteConcern, WriteConcernSettings } from '../../src';
-import * as MongoDBDriver from '../../src';
 import {
+  type AbstractCursor,
+  type AbstractCursorOptions,
+  type AggregateOptions,
   type AggregationCursor,
   type ChangeStreamDocument,
   Collection,
+  type CommandOperationOptions,
+  type CountOptions,
+  type EstimatedDocumentCountOptions,
   FindCursor,
-  MongoClient
-} from '../mongodb';
+  MongoClient,
+  type MongoClientOptions,
+  ObjectId,
+  type RunCommandCursor,
+  type TransactionOptions,
+  type WithId,
+  type WriteConcern,
+  type WriteConcernSettings
+} from '../../src';
 
 // We wish to keep these APIs but continue to ensure they are marked as deprecated.
 expectDeprecated(Collection.prototype.count);
 expectDeprecated(FindCursor.prototype.count);
-expectNotDeprecated(MongoDBDriver.ObjectId);
+expectNotDeprecated(ObjectId);
 
-declare const options: MongoDBDriver.MongoClientOptions;
+declare const options: MongoClientOptions;
 expectDeprecated(options.w);
 expectDeprecated(options.journal);
 expectDeprecated(options.wtimeoutMS);
@@ -28,29 +39,29 @@ expectNotDeprecated(options.connectTimeoutMS);
 
 expectType<WriteConcernSettings | WriteConcern | undefined>(options.writeConcern);
 
-declare const estimatedDocumentCountOptions: MongoDBDriver.EstimatedDocumentCountOptions;
+declare const estimatedDocumentCountOptions: EstimatedDocumentCountOptions;
 // TODO(NODE-6491): expectDeprecated(estimatedDocumentCountOptions.maxTimeMS);
 
-declare const countOptions: MongoDBDriver.CountOptions;
+declare const countOptions: CountOptions;
 // TODO(NODE-6491): expectDeprecated(countOptions.maxTimeMS);
 
-declare const commandOptions: MongoDBDriver.CommandOperationOptions;
+declare const commandOptions: CommandOperationOptions;
 // TODO(NODE-6491): expectDeprecated(commandOptions.maxTimeMS);
 
-declare const aggregateOptions: MongoDBDriver.AggregateOptions;
+declare const aggregateOptions: AggregateOptions;
 // TODO(NODE-6491): expectDeprecated(aggregateOptions.maxTimeMS);
 
-declare const runCommandCursor: MongoDBDriver.RunCommandCursor;
+declare const runCommandCursor: RunCommandCursor;
 // TODO(NODE-6491): expectDeprecated(runCommandCursor.setMaxTimeMS);
 // TODO(NODE-6491): expectDeprecated(runCommandCursor.maxTimeMS);
 
-declare const cursorOptions: MongoDBDriver.AbstractCursorOptions;
+declare const cursorOptions: AbstractCursorOptions;
 // TODO(NODE-6491): expectDeprecated(cursorOptions.maxTimeMS);
 
-declare const abstractCursor: MongoDBDriver.AbstractCursor;
+declare const abstractCursor: AbstractCursor;
 // TODO(NODE-6491): expectDeprecated(abstractCursor.maxTimeMS);
 
-declare const txnOptions: MongoDBDriver.TransactionOptions;
+declare const txnOptions: TransactionOptions;
 // TODO(NODE-6491): expectDeprecated(txnOptions.maxCommitTimeMS);
 
 interface TSchema extends Document {
diff --git a/test/types/schema_helpers.test-d.ts b/test/types/schema_helpers.test-d.ts
@@ -1,15 +1,15 @@
 import { type Document, ObjectId } from 'bson';
 import { expectAssignable, expectError, expectNotType, expectType } from 'tsd';
 
-import type { Collection } from '../../src';
 import type {
+  Collection,
   EnhancedOmit,
   InferIdType,
   OptionalId,
   OptionalUnlessRequiredId,
   WithId,
   WithoutId
-} from '../mongodb';
+} from '../../src';
 
 /** ----------------------------------------------------------------------
  * InferIdType
diff --git a/test/types/sessions.test-d.ts b/test/types/sessions.test-d.ts
@@ -9,7 +9,7 @@ import {
   ReadConcern,
   ReadConcernLevel,
   type Timestamp
-} from '../mongodb';
+} from '../../src';
 
 // test mapped cursor types
 const client = new MongoClient('');
diff --git a/test/types/sort.test-d.ts b/test/types/sort.test-d.ts
@@ -6,7 +6,7 @@ import {
   type MongoClient,
   ObjectId,
   type Sort
-} from '../mongodb';
+} from '../../src';
 
 const sortFieldName: Sort = 'a';
 const sortFieldNameObject: Sort = { a: 1, b: -1 };
diff --git a/test/types/type_errors.test-d.ts b/test/types/type_errors.test-d.ts
@@ -1,4 +1,4 @@
-import { MongoClient } from '../mongodb';
+import { MongoClient } from '../../src';
 
 /**
  * This test file should contain examples of known compilation errors
diff --git a/test/types/union_schema.test-d.ts b/test/types/union_schema.test-d.ts
@@ -1,6 +1,6 @@
 import { expectAssignable, expectError, expectNotAssignable, expectNotType, expectType } from 'tsd';
 
-import { type Collection, type Document, ObjectId, type WithId } from '../mongodb';
+import { type Collection, type Document, ObjectId, type WithId } from '../../src';
 
 type InsertOneFirstParam<Schema extends Document> = Parameters<Collection<Schema>['insertOne']>[0];
 
diff --git a/test/types/write_concern.test-d.ts b/test/types/write_concern.test-d.ts
@@ -6,7 +6,7 @@ import type {
   ListCollectionsOptions,
   ListIndexesOptions,
   WriteConcern
-} from '../mongodb';
+} from '../../src';
 
 expectNotAssignable<FindOptions>({ writeConcern: { w: 0 } });
 expectNotAssignable<ListCollectionsOptions>({ writeConcern: { w: 0 } });
