chore(NODE-5247): update dependencies (#3657)

nbbeeken · web-flow · commit 536e6a148c23 · 2023-05-09T13:00:32.000-04:00
diff --git a/.evergreen/run-typescript.sh b/.evergreen/run-typescript.sh
@@ -31,7 +31,8 @@ function get_ts_version() {
 export TSC="./node_modules/typescript/bin/tsc"
 export TS_VERSION=$(get_ts_version)
 
-npm install --no-save --force typescript@"$TS_VERSION"
+# On old versions of TS we need to put the node types back to 18.11.19
+npm install --no-save --force typescript@"$TS_VERSION" "$(if [[ $TS_VERSION == '4.1.6' ]]; then echo "@types/node@18.11.19"; else echo ""; fi)"
 
 echo "Typescript $($TSC -v)"
 
diff --git a/etc/clean_definition_files.cjs b/etc/clean_definition_files.cjs
@@ -0,0 +1,27 @@
+#! /usr/bin/env node
+/* eslint-disable @typescript-eslint/no-var-requires */
+const fs = require('fs');
+const path = require('path');
+
+function* walk(root) {
+  const directoryContents = fs.readdirSync(root);
+  for (const filepath of directoryContents) {
+    const fullPath = path.join(root, filepath);
+    const stat = fs.statSync(fullPath);
+    if (stat.isDirectory()) {
+      yield* walk(fullPath);
+    } else if (stat.isFile()) {
+      yield fullPath;
+    }
+  }
+}
+
+const libPath = path.resolve(__dirname, '..', 'lib');
+if (fs.existsSync(libPath)) {
+  const definitionFiles = Array.from(walk(libPath)).filter(filePath => {
+    return filePath.endsWith('.d.ts') || filePath.endsWith('.d.ts.map');
+  });
+  for (const definitionFile of definitionFiles) {
+    fs.unlinkSync(definitionFile);
+  }
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -26,35 +26,35 @@
   },
   "dependencies": {
     "bson": "^4.7.2",
-    "mongodb-connection-string-url": "^2.5.4",
+    "mongodb-connection-string-url": "^2.6.0",
     "socks": "^2.7.1"
   },
   "devDependencies": {
     "@iarna/toml": "^2.2.5",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
-    "@microsoft/api-extractor": "^7.33.3",
+    "@microsoft/api-extractor": "^7.34.7",
     "@microsoft/tsdoc-config": "^0.16.2",
-    "@mongodb-js/zstd": "^1.0.0",
-    "@types/chai": "^4.3.3",
+    "@mongodb-js/zstd": "^1.1.0",
+    "@types/chai": "^4.3.5",
     "@types/chai-subset": "^1.3.3",
-    "@types/express": "^4.17.14",
+    "@types/express": "^4.17.17",
     "@types/kerberos": "^1.1.1",
-    "@types/mocha": "^10.0.0",
-    "@types/node": "^18.11.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "^18.16.3",
     "@types/saslprep": "^1.0.1",
-    "@types/semver": "^7.3.12",
-    "@types/sinon": "^10.0.13",
-    "@types/sinon-chai": "^3.2.8",
+    "@types/semver": "^7.3.13",
+    "@types/sinon": "^10.0.14",
+    "@types/sinon-chai": "^3.2.9",
     "@types/whatwg-url": "^11.0.0",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
     "bluebird": "^3.7.2",
-    "chai": "^4.3.6",
+    "chai": "^4.3.7",
     "chai-subset": "^1.6.0",
     "chalk": "^4.1.2",
-    "eslint": "^8.25.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint": "^8.39.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-simple-import-sort": "^8.0.0",
     "eslint-plugin-tsdoc": "^0.2.17",
@@ -63,20 +63,18 @@
     "mocha": "^9.2.2",
     "mocha-sinon": "^2.1.2",
     "nyc": "^15.1.0",
-    "prettier": "^2.7.1",
-    "rimraf": "^3.0.2",
-    "semver": "^7.3.8",
+    "prettier": "^2.8.8",
+    "semver": "^7.5.0",
     "sinon": "^13.0.1",
     "sinon-chai": "^3.7.0",
     "source-map-support": "^0.5.21",
     "standard-version": "^9.5.0",
     "ts-node": "^10.9.1",
-    "tsd": "^0.24.1",
+    "tsd": "^0.27.0",
     "typescript": "^4.8.4",
     "typescript-cached-transpile": "^0.0.6",
     "v8-heapsnapshot": "^1.2.0",
-    "xml2js": "^0.4.23",
-    "yargs": "^17.6.0"
+    "yargs": "^17.7.2"
   },
   "license": "Apache-2.0",
   "engines": {
@@ -93,7 +91,7 @@
   "scripts": {
     "build:evergreen": "node .evergreen/generate_evergreen_tasks.js",
     "build:ts": "node ./node_modules/typescript/bin/tsc",
-    "build:dts": "npm run build:ts && api-extractor run && rimraf 'lib/**/*.d.ts*'",
+    "build:dts": "npm run build:ts && api-extractor run && node etc/clean_definition_files.cjs",
     "build:docs": "./etc/docs/build.ts",
     "build:typedoc": "typedoc",
     "check:bench": "node test/benchmarks/driverBench",
diff --git a/src/bulk/common.ts b/src/bulk/common.ts
@@ -47,7 +47,7 @@ export const BatchType = Object.freeze({
 } as const);
 
 /** @public */
-export type BatchType = typeof BatchType[keyof typeof BatchType];
+export type BatchType = (typeof BatchType)[keyof typeof BatchType];
 
 /** @public */
 export interface InsertOneModel<TSchema extends Document = Document> {
diff --git a/src/cmap/auth/gssapi.ts b/src/cmap/auth/gssapi.ts
@@ -23,7 +23,7 @@ export const GSSAPICanonicalizationValue = Object.freeze({
 
 /** @public */
 export type GSSAPICanonicalizationValue =
-  typeof GSSAPICanonicalizationValue[keyof typeof GSSAPICanonicalizationValue];
+  (typeof GSSAPICanonicalizationValue)[keyof typeof GSSAPICanonicalizationValue];
 
 type MechanismProperties = {
   /** @deprecated use `CANONICALIZE_HOST_NAME` instead */
diff --git a/src/cmap/auth/providers.ts b/src/cmap/auth/providers.ts
@@ -11,7 +11,7 @@ export const AuthMechanism = Object.freeze({
 } as const);
 
 /** @public */
-export type AuthMechanism = typeof AuthMechanism[keyof typeof AuthMechanism];
+export type AuthMechanism = (typeof AuthMechanism)[keyof typeof AuthMechanism];
 
 /** @internal */
 export const AUTH_MECHS_AUTH_SRC_EXTERNAL = new Set<AuthMechanism>([
diff --git a/src/cmap/connect.ts b/src/cmap/connect.ts
@@ -348,7 +348,7 @@ function parseSslOptions(options: MakeConnectionOptions): TLSConnectionOpts {
 }
 
 const SOCKET_ERROR_EVENT_LIST = ['error', 'close', 'timeout', 'parseError'] as const;
-type ErrorHandlerEventName = typeof SOCKET_ERROR_EVENT_LIST[number] | 'cancel';
+type ErrorHandlerEventName = (typeof SOCKET_ERROR_EVENT_LIST)[number] | 'cancel';
 const SOCKET_ERROR_EVENTS = new Set(SOCKET_ERROR_EVENT_LIST);
 
 function makeConnection(options: MakeConnectionOptions, _callback: Callback<Stream>) {
diff --git a/src/cmap/connection_pool.ts b/src/cmap/connection_pool.ts
@@ -138,7 +138,7 @@ export type ConnectionPoolEvents = {
  */
 export class ConnectionPool extends TypedEventEmitter<ConnectionPoolEvents> {
   options: Readonly<ConnectionPoolOptions>;
-  [kPoolState]: typeof PoolState[keyof typeof PoolState];
+  [kPoolState]: (typeof PoolState)[keyof typeof PoolState];
   [kServer]: Server;
   [kLogger]: Logger;
   [kConnections]: List<Connection>;
diff --git a/src/cmap/wire_protocol/compression.ts b/src/cmap/wire_protocol/compression.ts
@@ -15,7 +15,7 @@ export const Compressor = Object.freeze({
 } as const);
 
 /** @public */
-export type Compressor = typeof Compressor[CompressorName];
+export type Compressor = (typeof Compressor)[CompressorName];
 
 /** @public */
 export type CompressorName = keyof typeof Compressor;
diff --git a/src/cursor/abstract_cursor.ts b/src/cursor/abstract_cursor.ts
@@ -74,7 +74,7 @@ export interface CursorStreamOptions {
 }
 
 /** @public */
-export type CursorFlag = typeof CURSOR_FLAGS[number];
+export type CursorFlag = (typeof CURSOR_FLAGS)[number];
 
 /** @public */
 export interface AbstractCursorOptions extends BSONSerializeOptions {
diff --git a/src/deps.ts b/src/deps.ts
@@ -209,7 +209,7 @@ export const AutoEncryptionLoggerLevel = Object.freeze({
 
 /** @public */
 export type AutoEncryptionLoggerLevel =
-  typeof AutoEncryptionLoggerLevel[keyof typeof AutoEncryptionLoggerLevel];
+  (typeof AutoEncryptionLoggerLevel)[keyof typeof AutoEncryptionLoggerLevel];
 
 /** @public */
 export interface AutoEncryptionTlsOptions {
diff --git a/src/error.ts b/src/error.ts
@@ -96,7 +96,7 @@ export const MongoErrorLabel = Object.freeze({
 } as const);
 
 /** @public */
-export type MongoErrorLabel = typeof MongoErrorLabel[keyof typeof MongoErrorLabel];
+export type MongoErrorLabel = (typeof MongoErrorLabel)[keyof typeof MongoErrorLabel];
 
 /** @public */
 export interface ErrorDescription extends Document {
diff --git a/src/logger.ts b/src/logger.ts
@@ -34,7 +34,7 @@ export const LoggerLevel = Object.freeze({
  * @public
  * @deprecated The Legacy Logger is deprecated and will be removed in the next major version.
  */
-export type LoggerLevel = typeof LoggerLevel[keyof typeof LoggerLevel];
+export type LoggerLevel = (typeof LoggerLevel)[keyof typeof LoggerLevel];
 
 /**
  * @public
diff --git a/src/mongo_client.ts b/src/mongo_client.ts
@@ -42,7 +42,7 @@ export const ServerApiVersion = Object.freeze({
 } as const);
 
 /** @public */
-export type ServerApiVersion = typeof ServerApiVersion[keyof typeof ServerApiVersion];
+export type ServerApiVersion = (typeof ServerApiVersion)[keyof typeof ServerApiVersion];
 
 /** @public */
 export interface ServerApi {
@@ -74,19 +74,19 @@ export interface PkFactory {
 /** @public */
 export type SupportedTLSConnectionOptions = Pick<
   TLSConnectionOptions,
-  Extract<keyof TLSConnectionOptions, typeof LEGAL_TLS_SOCKET_OPTIONS[number]>
+  Extract<keyof TLSConnectionOptions, (typeof LEGAL_TLS_SOCKET_OPTIONS)[number]>
 >;
 
 /** @public */
 export type SupportedTLSSocketOptions = Pick<
   TLSSocketOptions,
-  Extract<keyof TLSSocketOptions, typeof LEGAL_TLS_SOCKET_OPTIONS[number]>
+  Extract<keyof TLSSocketOptions, (typeof LEGAL_TLS_SOCKET_OPTIONS)[number]>
 >;
 
 /** @public */
 export type SupportedSocketOptions = Pick<
   TcpNetConnectOpts,
-  typeof LEGAL_TCP_SOCKET_OPTIONS[number]
+  (typeof LEGAL_TCP_SOCKET_OPTIONS)[number]
 >;
 
 /** @public */
@@ -308,7 +308,7 @@ export interface MongoClientPrivate {
 }
 
 /** @public */
-export type MongoClientEvents = Pick<TopologyEvents, typeof MONGO_CLIENT_EVENTS[number]> & {
+export type MongoClientEvents = Pick<TopologyEvents, (typeof MONGO_CLIENT_EVENTS)[number]> & {
   // In previous versions the open event emitted a topology, in an effort to no longer
   // expose internals but continue to expose this useful event API, it now emits a mongoClient
   open(mongoClient: MongoClient): void;
diff --git a/src/mongo_logger.ts b/src/mongo_logger.ts
@@ -17,7 +17,7 @@ export const SeverityLevel = Object.freeze({
 } as const);
 
 /** @internal */
-export type SeverityLevel = typeof SeverityLevel[keyof typeof SeverityLevel];
+export type SeverityLevel = (typeof SeverityLevel)[keyof typeof SeverityLevel];
 
 /** @internal */
 export const MongoLoggableComponent = Object.freeze({
@@ -29,7 +29,7 @@ export const MongoLoggableComponent = Object.freeze({
 
 /** @internal */
 export type MongoLoggableComponent =
-  typeof MongoLoggableComponent[keyof typeof MongoLoggableComponent];
+  (typeof MongoLoggableComponent)[keyof typeof MongoLoggableComponent];
 
 /** @internal */
 export interface MongoLoggerEnvOptions {
diff --git a/src/mongo_types.ts b/src/mongo_types.ts
@@ -188,7 +188,7 @@ export const BSONType = Object.freeze({
 } as const);
 
 /** @public */
-export type BSONType = typeof BSONType[keyof typeof BSONType];
+export type BSONType = (typeof BSONType)[keyof typeof BSONType];
 /** @public */
 export type BSONTypeAlias = keyof typeof BSONType;
 
diff --git a/src/operations/find_and_modify.ts b/src/operations/find_and_modify.ts
@@ -17,7 +17,7 @@ export const ReturnDocument = Object.freeze({
 } as const);
 
 /** @public */
-export type ReturnDocument = typeof ReturnDocument[keyof typeof ReturnDocument];
+export type ReturnDocument = (typeof ReturnDocument)[keyof typeof ReturnDocument];
 
 /** @public */
 export interface FindOneAndDeleteOptions extends CommandOperationOptions {
diff --git a/src/operations/set_profiling_level.ts b/src/operations/set_profiling_level.ts
@@ -16,7 +16,7 @@ export const ProfilingLevel = Object.freeze({
 } as const);
 
 /** @public */
-export type ProfilingLevel = typeof ProfilingLevel[keyof typeof ProfilingLevel];
+export type ProfilingLevel = (typeof ProfilingLevel)[keyof typeof ProfilingLevel];
 
 /** @public */
 export type SetProfilingLevelOptions = CommandOperationOptions;
diff --git a/src/read_concern.ts b/src/read_concern.ts
@@ -10,7 +10,7 @@ export const ReadConcernLevel = Object.freeze({
 } as const);
 
 /** @public */
-export type ReadConcernLevel = typeof ReadConcernLevel[keyof typeof ReadConcernLevel];
+export type ReadConcernLevel = (typeof ReadConcernLevel)[keyof typeof ReadConcernLevel];
 
 /** @public */
 export type ReadConcernLike = ReadConcern | { level: ReadConcernLevel } | ReadConcernLevel;
diff --git a/src/read_preference.ts b/src/read_preference.ts
@@ -16,7 +16,7 @@ export const ReadPreferenceMode = Object.freeze({
 } as const);
 
 /** @public */
-export type ReadPreferenceMode = typeof ReadPreferenceMode[keyof typeof ReadPreferenceMode];
+export type ReadPreferenceMode = (typeof ReadPreferenceMode)[keyof typeof ReadPreferenceMode];
 
 /** @public */
 export interface HedgeOptions {
diff --git a/src/sdam/common.ts b/src/sdam/common.ts
@@ -24,7 +24,7 @@ export const TopologyType = Object.freeze({
 } as const);
 
 /** @public */
-export type TopologyType = typeof TopologyType[keyof typeof TopologyType];
+export type TopologyType = (typeof TopologyType)[keyof typeof TopologyType];
 
 /**
  * An enumeration of server types we know about
@@ -44,7 +44,7 @@ export const ServerType = Object.freeze({
 } as const);
 
 /** @public */
-export type ServerType = typeof ServerType[keyof typeof ServerType];
+export type ServerType = (typeof ServerType)[keyof typeof ServerType];
 
 /** @internal */
 export type TimerQueue = Set<NodeJS.Timeout>;
diff --git a/src/transactions.ts b/src/transactions.ts
@@ -18,7 +18,7 @@ export const TxnState = Object.freeze({
 } as const);
 
 /** @internal */
-export type TxnState = typeof TxnState[keyof typeof TxnState];
+export type TxnState = (typeof TxnState)[keyof typeof TxnState];
 
 const stateMachine: { [state in TxnState]: TxnState[] } = {
   [TxnState.NO_TRANSACTION]: [TxnState.NO_TRANSACTION, TxnState.STARTING_TRANSACTION],
diff --git a/test/integration/crud/aggregation.test.ts b/test/integration/crud/aggregation.test.ts
@@ -725,7 +725,7 @@ describe('Aggregation', function () {
       // is executed
       const command = db.command.bind(db);
       // Validate the command
-      db.command = function (...args: Parameters<typeof db['command']>) {
+      db.command = function (...args: Parameters<(typeof db)['command']>) {
         const c = args[0];
         expect(err).to.not.exist;
         expect(c.maxTimeMS).to.equal(1000);
@@ -741,7 +741,7 @@ describe('Aggregation', function () {
         expect(result.authors).to.eql(['bob']);
 
         // Validate the command
-        db.command = function (...args: Parameters<typeof db['command']>) {
+        db.command = function (...args: Parameters<(typeof db)['command']>) {
           const c = args[0];
           expect(err).to.not.exist;
           expect(c.maxTimeMS).to.equal(1000);
@@ -792,7 +792,7 @@ describe('Aggregation', function () {
 
     const command = db.command.bind(db);
 
-    db.command = function (...args: Parameters<typeof db['command']>) {
+    db.command = function (...args: Parameters<(typeof db)['command']>) {
       const c = args[0];
       expect(c).to.be.an('object');
       expect(c.comment).to.be.a('string').and.to.equal('comment');
diff --git a/test/integration/crud/misc_cursors.test.js b/test/integration/crud/misc_cursors.test.js
@@ -3248,7 +3248,7 @@ describe('Cursor', function () {
   it('should tail cursor using maxAwaitTimeMS for 3.2 or higher', {
     // Add a tag that our runner can trigger on
     // in this case we are setting that node needs to be higher than 0.10.X to run
-    metadata: { requires: { topology: ['single'], mongodb: '>3.1.9' } },
+    metadata: { requires: { topology: ['single'], mongodb: '<7.0.0' } },
 
     test: function (done) {
       const configuration = this.configuration;
diff --git a/test/integration/node-specific/comment_with_falsy_values.test.ts b/test/integration/node-specific/comment_with_falsy_values.test.ts
@@ -4,7 +4,7 @@ import { Collection, CommandStartedEvent, Long, MongoClient } from '../../../src
 import { TestBuilder, UnifiedTestSuiteBuilder } from '../../tools/utils';
 
 const falsyValues = [0, false, '', Long.ZERO, null, NaN] as const;
-const falsyToString = (value: typeof falsyValues[number]) => {
+const falsyToString = (value: (typeof falsyValues)[number]) => {
   if (Number.isNaN(value)) {
     return 'NaN';
   }
diff --git a/test/tools/unified-spec-runner/schema.ts b/test/tools/unified-spec-runner/schema.ts
diff --git a/test/types/community/collection/insertX.test-d.ts b/test/types/community/collection/insertX.test-d.ts
diff --git a/test/unit/assorted/server_discovery_and_monitoring.spec.test.ts b/test/unit/assorted/server_discovery_and_monitoring.spec.test.ts

Original file line number	Diff line number	Diff line change
`@@ -348,7 +348,7 @@ function parseSslOptions(options: MakeConnectionOptions): TLSConnectionOpts {`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`const SOCKET_ERROR_EVENT_LIST = ['error', 'close', 'timeout', 'parseError'] as const;`
`351`		`-type ErrorHandlerEventName = typeof SOCKET_ERROR_EVENT_LIST[number] \| 'cancel';`
	`351`	`+type ErrorHandlerEventName = (typeof SOCKET_ERROR_EVENT_LIST)[number] \| 'cancel';`
`352`	`352`	`const SOCKET_ERROR_EVENTS = new Set(SOCKET_ERROR_EVENT_LIST);`
`353`	`353`
`354`	`354`	`function makeConnection(options: MakeConnectionOptions, _callback: Callback<Stream>) {`