script and eslint updated

Author: PavelSafronov

.eslintrc.json

@@ -1,6 +1,9 @@
 {
   "root": true,
   "parser": "@typescript-eslint/parser",
+  "ignorePatterns": [
+    "test/tools/runner/bundle/**"
+  ],
   "parserOptions": {
     "ecmaVersion": 2023
   },
@@ -346,4 +349,4 @@
       }
     }
   ]
-}
+}

.evergreen/run-azure-kms-tests.sh

@@ -18,4 +18,6 @@ export MONGODB_URI="mongodb://localhost:27017"
 export EXPECTED_AZUREKMS_OUTCOME=${EXPECTED_AZUREKMS_OUTCOME:-omitted}
 export TEST_CSFLE=true
 
+npm run build:bundle
+
 npx mocha --config test/mocha_mongodb.js test/integration/client-side-encryption/client_side_encryption.prose.19.on_demand_azure.test.ts

.evergreen/run-gcp-kms-tests.sh

@@ -20,4 +20,6 @@ export MONGODB_URI="mongodb://localhost:27017"
 export EXPECTED_GCPKMS_OUTCOME=${EXPECTED_GCPKMS_OUTCOME:-omitted}
 export TEST_CSFLE=true
 
+npm run build:bundle
+
 npx mocha --config test/mocha_mongodb.js test/integration/client-side-encryption/client_side_encryption.prose.17.on_demand_gcp.test.ts

.evergreen/run-mongosh-scope-test.sh

@@ -13,4 +13,6 @@ export SCOPES=$(./node_modules/lerna/cli.js ls --all --json)
 
 cd -
 
+npm run build:bundle
+
 npx mocha --config test/manual/mocharc.json test/manual/mongosh_scopes.test.ts

package.json

@@ -132,32 +132,31 @@
     "check:bench": "npm --prefix test/benchmarks/driver_bench start",
     "check:coverage": "nyc npm run test:all",
     "check:integration-coverage": "nyc npm run check:test",
-    "check:lambda": "nyc mocha --config test/mocha_lambda.js test/integration/node-specific/examples/handler.test.js",
-    "check:lambda:aws": "nyc mocha --config test/mocha_lambda.js test/integration/node-specific/examples/aws_handler.test.js",
+    "check:lambda": "npm run build:bundle && nyc mocha --config test/mocha_lambda.js test/integration/node-specific/examples/handler.test.js",
+    "check:lambda:aws": "npm run build:bundle && nyc mocha --config test/mocha_lambda.js test/integration/node-specific/examples/aws_handler.test.js",
     "check:lint": "npm run build:dts && npm run check:dts && npm run check:eslint && npm run check:tsd",
     "check:eslint": "npm run build:dts && ESLINT_USE_FLAT_CONFIG=false eslint -v && ESLINT_USE_FLAT_CONFIG=false eslint --max-warnings=0 --ext '.js,.ts' src test",
     "check:tsd": "tsd --version && tsd",
-    "check:dependencies": "mocha test/action/dependency.test.ts",
+    "check:dependencies": "npm run build:bundle && mocha test/action/dependency.test.ts",
     "check:dts": "node ./node_modules/typescript/bin/tsc --target es2023 --module commonjs --noEmit mongodb.d.ts && tsd",
-    "check:search-indexes": "nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
+    "check:search-indexes": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/manual/search-index-management.prose.test.ts",
     "check:test": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/integration",
     "check:test-bundled": "MONGODB_BUNDLED=true npm run check:test",
     "check:unit": "npm run build:bundle && nyc mocha test/unit",
     "check:unit-bundled": "MONGODB_BUNDLED=true npm run check:unit",
     "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",
-    "check:aws": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts test/integration/auth/mongodb_aws.prose.test.ts",
-    "check:oidc-auth": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",
-    "check:oidc-test": "nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts",
-    "check:kerberos": "nyc mocha --config test/manual/mocharc.js test/manual/kerberos.test.ts",
-    "check:tls": "nyc mocha --config test/manual/mocharc.js test/manual/tls_support.test.ts",
-    "check:ldap": "nyc mocha --config test/manual/mocharc.js test/manual/ldap.test.ts",
-    "check:socks5": "nyc mocha --config test/manual/mocharc.js test/manual/socks5.test.ts",
-    "check:csfle": "nyc mocha --config test/mocha_mongodb.js test/integration/client-side-encryption",
-    "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:atlas": "npm run build:bundle && nyc mocha --config test/manual/mocharc.js test/manual/atlas_connectivity.test.ts",
+    "check:drivers-atlas-testing": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/atlas/drivers_atlas_testing.test.ts",
+    "check:aws": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_aws.test.ts test/integration/auth/mongodb_aws.prose.test.ts",
+    "check:oidc-auth": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/integration/auth/auth.spec.test.ts",
+    "check:oidc-test": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/integration/auth/mongodb_oidc.prose.test.ts",
+    "check:kerberos": "npm run build:bundle && nyc mocha --config test/manual/mocharc.js test/manual/kerberos.test.ts",
+    "check:tls": "npm run build:bundle && nyc mocha --config test/manual/mocharc.js test/manual/tls_support.test.ts",
+    "check:ldap": "npm run build:bundle && nyc mocha --config test/manual/mocharc.js test/manual/ldap.test.ts",
+    "check:socks5": "npm run build:bundle && nyc mocha --config test/manual/mocharc.js test/manual/socks5.test.ts",
+    "check:csfle": "npm run build:bundle && nyc mocha --config test/mocha_mongodb.js test/integration/client-side-encryption",
+    "check:snappy": "npm run build:bundle && nyc mocha test/unit/assorted/snappy.test.js",
+    "check:x509": "npm run build:bundle && nyc mocha test/manual/x509_auth.test.ts",
     "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",

test/mongodb_bundled.ts

@@ -11,7 +11,8 @@ try {
 }
 
 // Export public API from the contextified module
-// Hint: This list isn't automatically alphabetized, but VSCode's "Sort Lines Ascending" command can be used to keep it organized
+// Hint: This list IS NOT automatically alphabetized
+// To re-sort: Highlight the list and use VSCode's "Sort Lines Ascending" command
 export const {
   abortable,
   AbstractCursor,
@@ -378,11 +379,13 @@ export type {
   ConnectionOptions,
   ConnectionPoolOptions,
   ConnectOptions,
+  CreateIndexesOptions,
   DataKey,
   DbOptions,
   Document,
   DriverInfo,
   Filter,
+  IndexDirection,
   InferIdType,
   KMSProviders,
   Log,
@@ -399,8 +402,8 @@ export type {
   Runtime,
   ServerApi,
   ServerSessionId,
+  Sort,
   TagSet,
-  TopologyOptions,
   TopologyVersion,
   TransactionOptions,
   UpdateDescription,
@@ -425,32 +428,53 @@ import type {
   CommandStartedEvent as _CommandStartedEvent,
   CommandSucceededEvent as _CommandSucceededEvent,
   Connection as _Connection,
+  ConnectionCheckedInEvent as _ConnectionCheckedInEvent,
+  ConnectionCheckedOutEvent as _ConnectionCheckedOutEvent,
+  ConnectionCheckOutFailedEvent as _ConnectionCheckOutFailedEvent,
+  ConnectionCheckOutStartedEvent as _ConnectionCheckOutStartedEvent,
   ConnectionClosedEvent as _ConnectionClosedEvent,
+  ConnectionCreatedEvent as _ConnectionCreatedEvent,
   ConnectionPool as _ConnectionPool,
   ConnectionPoolClearedEvent as _ConnectionPoolClearedEvent,
+  ConnectionPoolClosedEvent as _ConnectionPoolClosedEvent,
+  ConnectionPoolCreatedEvent as _ConnectionPoolCreatedEvent,
+  ConnectionPoolReadyEvent as _ConnectionPoolReadyEvent,
+  ConnectionReadyEvent as _ConnectionReadyEvent,
   CSOTTimeoutContext as _CSOTTimeoutContext,
   CursorTimeoutContext as _CursorTimeoutContext,
   Db as _Db,
   FindCursor as _FindCursor,
   GridFSBucket as _GridFSBucket,
   HostAddress as _HostAddress,
   MongoClient as _MongoClient,
+  MongoCredentials as _MongoCredentials,
   MongoError as _MongoError,
   OnDemandDocument as _OnDemandDocument,
   Server as _Server,
+  ServerApiVersion as _ServerApiVersion,
+  ServerClosedEvent as _ServerClosedEvent,
   ServerDescription as _ServerDescription,
   ServerDescriptionChangedEvent as _ServerDescriptionChangedEvent,
+  ServerHeartbeatFailedEvent as _ServerHeartbeatFailedEvent,
+  ServerHeartbeatStartedEvent as _ServerHeartbeatStartedEvent,
+  ServerHeartbeatSucceededEvent as _ServerHeartbeatSucceededEvent,
+  ServerOpeningEvent as _ServerOpeningEvent,
+  ServerSessionPool as _ServerSessionPool,
   Timeout as _Timeout,
   TimeoutContext as _TimeoutContext,
   Topology as _Topology,
+  TopologyClosedEvent as _TopologyClosedEvent,
   TopologyDescription as _TopologyDescription,
   TopologyDescriptionChangedEvent as _TopologyDescriptionChangedEvent,
+  TopologyOpeningEvent as _TopologyOpeningEvent,
+  TopologyOptions as _TopologyOptions,
   TopologyType as _TopologyType,
   UUID as _UUID
 } from './tools/runner/bundle/types/index';
 
 // Export "clashing" types from the contextified module
-// Hint: This list IS NOT automatically alphabetized, but VSCode's "Sort Lines Ascending" command can be used to keep it organized
+// Hint: This list IS NOT automatically alphabetized
+// To re-sort: Highlight the list and use VSCode's "Sort Lines Ascending" command
 export type AbstractCursor = _AbstractCursor;
 export type AuthMechanism = _AuthMechanism;
 export type ChangeStream = _ChangeStream;
@@ -461,26 +485,46 @@ export type CommandFailedEvent = _CommandFailedEvent;
 export type CommandStartedEvent = _CommandStartedEvent;
 export type CommandSucceededEvent = _CommandSucceededEvent;
 export type Connection = _Connection;
+export type ConnectionCheckedInEvent = _ConnectionCheckedInEvent;
+export type ConnectionCheckedOutEvent = _ConnectionCheckedOutEvent;
+export type ConnectionCheckOutFailedEvent = _ConnectionCheckOutFailedEvent;
+export type ConnectionCheckOutStartedEvent = _ConnectionCheckOutStartedEvent;
 export type ConnectionClosedEvent = _ConnectionClosedEvent;
+export type ConnectionCreatedEvent = _ConnectionCreatedEvent;
 export type ConnectionPool = _ConnectionPool;
 export type ConnectionPoolClearedEvent = _ConnectionPoolClearedEvent;
+export type ConnectionPoolClosedEvent = _ConnectionPoolClosedEvent;
+export type ConnectionPoolCreatedEvent = _ConnectionPoolCreatedEvent;
+export type ConnectionPoolReadyEvent = _ConnectionPoolReadyEvent;
+export type ConnectionReadyEvent = _ConnectionReadyEvent;
 export type CSOTTimeoutContext = _CSOTTimeoutContext;
 export type CursorTimeoutContext = _CursorTimeoutContext;
 export type Db = _Db;
 export type FindCursor = _FindCursor;
 export type GridFSBucket = _GridFSBucket;
 export type HostAddress = _HostAddress;
 export type MongoClient = _MongoClient;
+export type MongoCredentials = _MongoCredentials;
 export type MongoError = _MongoError;
 export type OnDemandDocument = _OnDemandDocument;
 export type Server = _Server;
+export type ServerApiVersion = _ServerApiVersion;
+export type ServerClosedEvent = _ServerClosedEvent;
 export type ServerDescription = _ServerDescription;
 export type ServerDescriptionChangedEvent = _ServerDescriptionChangedEvent;
+export type ServerHeartbeatFailedEvent = _ServerHeartbeatFailedEvent;
+export type ServerHeartbeatStartedEvent = _ServerHeartbeatStartedEvent;
+export type ServerHeartbeatSucceededEvent = _ServerHeartbeatSucceededEvent;
+export type ServerOpeningEvent = _ServerOpeningEvent;
+export type ServerSessionPool = _ServerSessionPool;
 export type Timeout = _Timeout;
 export type TimeoutContext = _TimeoutContext;
 export type Topology = _Topology;
+export type TopologyClosedEvent = _TopologyClosedEvent;
 export type TopologyDescription = _TopologyDescription;
 export type TopologyDescriptionChangedEvent = _TopologyDescriptionChangedEvent;
+export type TopologyOpeningEvent = _TopologyOpeningEvent;
+export type TopologyOptions = _TopologyOptions;
 export type TopologyType = _TopologyType;
 export type UUID = _UUID;
 

test/tools/runner/vm_context_helper.ts

@@ -27,11 +27,11 @@ function createRestrictedRequire() {
       const methodAndFile = callStack.split('\n')[2];
       const match = methodAndFile.match(/at (.*) \((.*)\)/);
       const method = match ? match[1] : null;
-      const sourceFileAndLineNumbers = match ? match[2] : null;
+      const sourceFileAndLineNumbers = match ? match[2] : 'unknown';
       const sourceFile =
-        sourceFileAndLineNumbers.indexOf('.ts:') !== -1
-          ? sourceFileAndLineNumbers.substring(0, sourceFileAndLineNumbers.lastIndexOf('.ts:') + 3)
-          : sourceFileAndLineNumbers;
+        sourceFileAndLineNumbers.indexOf('.ts:') === -1
+          ? sourceFileAndLineNumbers
+          : sourceFileAndLineNumbers.substring(0, sourceFileAndLineNumbers.lastIndexOf('.ts:') + 3);
       const sourceFileName = correctPath.basename(sourceFile);
       const isAllowed = allowedRequesters.some(
         requester =>
@@ -145,8 +145,8 @@ export function loadContextifiedMongoDBModule() {
 
   const bundleCode = fs.readFileSync(bundlePath, 'utf8');
 
-  const exportsContainer = {};
-  const moduleContainer = { exports: exportsContainer };
+  const exportsContainer = { __proto__: null };
+  const moduleContainer = { __proto__: null, exports: exportsContainer };
 
   // Wrap the bundle in a CommonJS-style wrapper
   const wrapper = `(function(exports, module, require) {${bundleCode}})`;

test/tools/utils.ts

@@ -14,6 +14,7 @@ import { inspect, promisify } from 'util';
 import {
   type AnyClientBulkWriteModel,
   type Document,
+  EJSON,
   type HostAddress,
   MongoClient,
   type MongoClientOptions,