improve tooling and migrate timeout.test.ts to new format

Author: PavelSafronov

package.json

@@ -142,7 +142,7 @@
     "check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
     "check:test": "mocha --config test/mocha_mongodb.js test/integration",
     "check:unit": "nyc mocha test/unit",
-    "check:unit-bundled": "MONGODB_BUNDLED=true npm run build:bundle && npm run check:unit",
+    "check:unit-bundled": "npm run switch:to-bundled && npm run check:unit || npm run switch:to-unbundled",
     "check:ts": "node ./node_modules/typescript/bin/tsc -v && node ./node_modules/typescript/bin/tsc --noEmit",
     "check:atlas": "nyc mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
     "check:drivers-atlas-testing": "nyc mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
@@ -157,14 +157,16 @@
     "check:snappy": "nyc mocha test/unit/assorted/snappy.test.js",
     "check:x509": "nyc mocha test/manual/x509_auth.test.ts",
     "check:runtime-independence": "ts-node test/tools/runner/vm_context_helper.ts test/integration/change-streams/change_stream.test.ts",
-    "check:test-bundled": "MONGODB_BUNDLED=true npm run build:bundle && npm run check:test",
+    "check:test-bundled": "npm run switch:to-bundled && npm run check:test || npm run switch:to-unbundled",
     "build:bundle": "npm run bundle:driver && npm run bundle:types && npm run build:runtime-barrel",
     "build:runtime-barrel": "node etc/build-runtime-barrel.mjs",
     "bundle:driver": "node etc/bundle-driver.mjs",
     "bundle:types": "npx tsc --project ./tsconfig.json --declaration --emitDeclarationOnly --declarationDir test/tools/runner/bundle/types",
     "fix:eslint": "npm run check:eslint -- --fix",
     "prepare": "node etc/prepare.js",
     "preview:docs": "ts-node etc/docs/preview.ts",
+    "switch:to-bundled": "MONGODB_BUNDLED=true npm run build:runtime-barrel",
+    "switch:to-unbundled": "MONGODB_BUNDLED=false npm run build:runtime-barrel",
     "test": "npm run check:lint && npm run test:all",
     "test:all": "npm run check:unit && npm run check:test",
     "update:docs": "npm run build:docs -- --yes"

test/mongodb_bundled.ts

@@ -17,10 +17,12 @@ export const {
   CommandFailedEvent,
   CommandStartedEvent,
   CommandSucceededEvent,
+  CSOTTimeoutContext,
   Db,
   Double,
   HostAddress,
   isHello,
+  LegacyTimeoutContext,
   Long,
   MongoAPIError,
   MongoBulkWriteError,
@@ -31,6 +33,7 @@ export const {
   MongoLogger,
   MongoParseError,
   MongoServerError,
+  MongoRuntimeError,
   ObjectId,
   parseOptions,
   ReadConcern,
@@ -39,6 +42,9 @@ export const {
   ReturnDocument,
   ServerApiVersion,
   SeverityLevel,
+  Timeout,
+  TimeoutContext,
+  TimeoutError,
   TopologyType,
   WriteConcern
 } = exportSource;
@@ -61,6 +67,7 @@ import type {
   CommandSucceededEvent as _CommandSucceededEventType,
   HostAddress as _HostAddressType,
   MongoClient as _MongoClientType,
+  Timeout as _TimeoutType,
   TopologyType as _TopologyType
 } from './tools/runner/bundle/types/index';
 export type Collection = _CollectionType;
@@ -69,4 +76,5 @@ export type CommandStartedEvent = _CommandStartedEventType;
 export type CommandSucceededEvent = _CommandSucceededEventType;
 export type HostAddress = _HostAddressType;
 export type MongoClient = _MongoClientType;
+export type Timeout = _TimeoutType;
 export type TopologyType = _TopologyType;

test/mongodb_runtime-testing.ts

@@ -1,4 +1,4 @@
 // This file is auto-generated. Do not edit.
 // Run 'npm run build:runtime-barrel' to regenerate.
-export const runNodelessTests = true;
-export * from './mongodb_bundled';
+export const runNodelessTests = false;
+export * from './mongodb';

test/unit/timeout.test.ts

@@ -8,7 +8,7 @@ import {
   Timeout,
   TimeoutContext,
   TimeoutError
-} from '../mongodb';
+} from '../mongodb_runtime-testing';
 
 describe('Timeout', function () {
   let timeout: Timeout;